Commit Graph

307 Commits

Author SHA1 Message Date
aerinon
e1cd520ea9 Merge unstable into CrossGen 2020-04-10 15:17:31 -06:00
aerinon
09bd392fd0 Bugfix to map info
Bugfix to dungeon reminder on death
2020-04-10 11:19:05 -06:00
aerinon
acd430378d Minor fix to vanilla doors 2020-04-09 17:32:06 -06:00
aerinon
ff3577358d Version bump
Release notes updated
2020-04-09 17:14:42 -06:00
aerinon
8e7ed89723 Formatting
Json spoiler tied to jsonout arg
Fixed Default Link sprite button again
Removed odd return from local_path (need to test this with bundle)
2020-04-09 17:02:40 -06:00
aerinon
23e6c5b14d Merge branch 'dev' of https://github.com/miketrethewey/ALttPDoorRandomizer into miketrethewey-dev 2020-04-09 15:55:27 -06:00
aerinon
4fe97f9b7f Adjusted map info to be experimental
Moved mirror scroll to be standard in non-vanilla door shuffles
Fixed potential duplicate map issues
2020-04-08 15:56:03 -06:00
aerinon
114ed784f1 Torch keys counted like chest
Moved the total key counter to a count down on the left.
Added the BK indicator
Attempt to fix dungeon counters and fish error in Mystery.py
Removed double rom patch
AT map added.
5 chests min for all dungeons
2020-04-07 16:50:02 -06:00
Mike A. Trethewey
ab5f2ab521 JSON Spoiler output 2020-04-05 09:50:01 -07:00
aerinon
bb402ff7f2 Dungeon reminder added to hud for Crossed dungeons
Blinking red square added to hud and it indicates a boss room is close by. Only appears if you have the compass. (Basic & Crossed)
Key counters added to hud if you have found the map. (Crossed only)
2020-04-03 15:45:55 -06:00
aerinon
e30f66742b MirrorScroll block erase removed
Standard+Crossed ammo issue addressed
Fix for vitreous' eye dropping keys
Fix for vanilla linking doors (hc back hallway)
2020-04-02 13:15:08 -06:00
Mike A. Trethewey
599985e4b1 Use os.path more
Add Enemizer note
2020-03-28 19:03:08 -07:00
aerinon
e5a1c59f85 Fix for capacity shop and hobo splash interaction 2020-03-25 15:52:57 -06:00
Mike A. Trethewey
01a1190b58 Fix bugs 2020-03-24 01:26:14 -07:00
Mike A. Trethewey
406806a70b Outfilename shenanigans 2020-03-23 21:41:09 -07:00
aerinon
4fc15e84fc Bump version
Set shuffleganon to default to True
2020-03-23 14:15:17 -06:00
Mike A. Trethewey
e4311832a5 Merge branch 'DoorDev' into dev 2020-03-23 00:53:24 -07:00
Mike A. Trethewey
215a4d039f Pull in fixes from Multiworld 2020-03-22 16:32:15 -07:00
Mike A. Trethewey
8513b7f270 Fix var loading again
Update Deprecated Args
Parse CLI
Parse Settings
Fix defaults
Fix priority
Add Enemizer error
Fix Custom Item Array again
Make output more verbose
Fix double-negative options
2020-03-22 02:53:40 -07:00
aerinon
de2a3bf5c1 Version change and note for later 2020-03-20 12:24:36 -06:00
Mike A. Trethewey
d359ce4b07 Merge branch 'DoorDev' into ci-dev 2020-03-12 16:24:54 -07:00
aerinon
269de35590 Minor bugfix with Ice Tall Hint 2020-03-12 09:13:09 -06:00
Mike A. Trethewey
d8ea5b0fd0 Merge branch 'DoorDev' into ci-dev 2020-03-12 04:17:05 -07:00
aerinon
c67cd478a1 Fixed problem with Inverted+ER
Fixed problem with Vanilla doors+Retro
Fixed Keylock issue with Ice Cross
Merged in compiling's fix for keyshuffle
ER Infinite Loop detection
2020-03-11 12:25:49 -06:00
Mike A. Trethewey
3e9880a6db Merge branch 'translation' into ci-dev 2020-03-10 21:09:20 -07:00
Mike A. Trethewey
3338e96822 Add seed to end of output log per generation 2020-03-10 17:46:58 -07:00
Mike A. Trethewey
ff51821701 Moar translation
German
Refactor some English/Spanish
2020-03-09 04:51:57 -07:00
Mike A. Trethewey
37a1b70f3b Pass the fish better 2020-03-09 03:53:08 -07:00
Mike A. Trethewey
ca7fc4d0f6 Hack in Spanish 2020-03-09 02:25:25 -07:00
Mike A. Trethewey
04404714d9 Update wiki and ci stuff 2020-03-08 15:52:05 -07:00
Mike A. Trethewey
d5b80380f2 Merge branch 'DoorDev' into ci-dev 2020-03-07 14:42:43 -08:00
Mike A. Trethewey
a424719fbd Wiki Doors 2020-03-07 14:38:08 -08:00
aerinon
b0eb7fb85d Fixed problem with keyshuffle option without bigkeyshuffle 2020-03-07 09:19:38 -07:00
aerinon
c1783082d8 Lots of cross gen work 2020-03-05 16:47:57 -07:00
Mike A. Trethewey
061852cbd3 Merge branch 'DoorDev' into ci-dev 2020-03-04 14:05:49 -08:00
aerinon
39ea777cf9 Gui fixes for clocks/dungeon_counters
Map fix for settings
2020-03-04 13:57:29 -07:00
Mike A. Trethewey
4968e72a3b Document stuff, add a couple things
Add Retro World State (Open & Retro on)
Add SpriteSomething plug to sprite selector
Fix Custom Item Pool loading to use disct instead of list
2020-03-03 23:43:43 -08:00
aerinon
5e2a5f2e8e Bugfix for a key lock 2020-03-03 12:39:52 -07:00
aerinon
549607c72a Bugfix for rupee20
Bugfix for Triforce hunt
Bugfix for python issue
Mystery experimental option
Mystery open pyramid refined
Mirror Scroll turned off if door shuffle is vanilla (even if experimental)
2020-03-03 09:37:09 -07:00
aerinon
5aef551f7c More & better forced connection detection 2020-03-03 08:25:52 -07:00
aerinon
83a9c4bdcf Merge in latest door dev changes 2020-03-02 15:41:44 -07:00
aerinon
7ecb416c07 Increment version 2020-03-02 15:13:04 -07:00
aerinon
6daa436f08 Generation Fix
* Added step to adjust parity before complete neutralization
2020-02-28 15:00:02 -07:00
aerinon
06562ed3ea Generation Fixes
*  Entrance dead end and branch calculation fixed
*  Parity checks added to global
*  Forced dead end checks in split dungeons
2020-02-27 15:53:19 -07:00
Mike A. Trethewey
47f60b5612 Merge pull request #2 from aerinon/DoorDev
Update to DoorDev
2020-02-26 01:40:06 -08:00
aerinon
1dbd7e95e2 -Multiworld key rule fix
-Minor generation fix
2020-02-25 15:16:18 -07:00
aerinon
72a94e1e4f Vanilla fixes for 100% locations 2020-02-24 08:53:03 -07:00
Mike A. Trethewey
e898ae078b Try to fix some options 2020-02-22 01:43:39 -08:00
Mike A. Trethewey
1d0191e8b0 Merge pull request #1 from aerinon/DoorDev
Update to DoorDev
2020-02-22 00:59:19 -08:00
aerinon
e6b37af515 Version bump 2020-02-20 16:46:39 -07:00