464 Commits

Author SHA1 Message Date
codemann8
6d2e95e6ef Merged in DR v1.2.0.16 2023-04-14 16:00:21 -05:00
aerinon
2abfc6ea80 Swap E/W on Mire Torches/Mire Attic Hint 2023-04-13 16:19:18 -06:00
codemann8
8e7a4fcd8e Merged in DR v1.2.0.15 2023-04-07 13:22:53 -05:00
codemann8
793f3b30b0 Merged in DR v1.2.0.14 (2nd) 2023-04-07 12:04:12 -05:00
aerinon
10eac87922 Logic fix: hookshot needed for pots in GT conveyor cross 2023-04-06 11:23:04 -06:00
aerinon
3c18dc6e3a Re-vamp multiple settings as buttons.
Minor logic clean up.
2023-04-06 11:22:12 -06:00
aerinon
187478eb24 Merge branch 'DoorDevUnstable' into Sandbox
# Conflicts:
#	Gui.py
#	Main.py
#	Rom.py
#	Rules.py
#	data/base2current.bps
#	resources/app/gui/lang/en.json
#	resources/app/gui/randomize/dungeon/widgets.json
2023-04-05 16:26:26 -06:00
aerinon
17f9efb230 Merge remote-tracking branch 'origin/DoorDevUnstable' into DoorDevUnstable
# Conflicts:
#	RELEASENOTES.md
2023-04-05 15:56:17 -06:00
aerinon
41a0751009 Merge branch 'WorldModelRefactor' into DoorDevUnstable 2023-03-31 16:07:31 -06:00
codemann8
f4f0ff1018 Merge branch 'DoorDevUnstable' into OverworldShuffleDev 2023-03-22 16:15:38 -05:00
aerinon
c9c510ae21 Minor fixes for customized vanilla doors 2023-03-22 14:58:07 -06:00
codemann8
57b39993b9 Merged in DR v1.2.0.13 2023-03-14 17:48:42 -05:00
aerinon
02c7a5279c Fix some paired doors 2023-03-13 20:40:45 -06:00
aerinon
4aae603462 Merge branch 'DoorDevUnstable' into Sandbox
# Conflicts:
#	ItemList.py
#	Items.py
#	Main.py
#	Rom.py
#	data/base2current.bps
2023-03-10 13:43:38 -07:00
aerinon
1a1c60f84a Merge branch 'SynthesisOWRMerge' of github.com:codemann8/ALttPDoorRandomizer into codemann8-SynthesisOWRMerge
# Conflicts:
#	Rules.py
#	source/overworld/EntranceShuffle2.py
2023-03-09 11:29:03 -07:00
codemann8
90c6854919 Initial OWR/ER2 merge 2023-02-26 13:44:30 -06:00
codemann8
4caee1cbec Merged in DR v1.2.0.9 2023-02-24 16:14:00 -06:00
aerinon
409f7d50d5 Rom changes (see that commmit message or release notes)
Customizer improvements:
- Better logic around customized lobbies
- Better logic around customized door types
Fix to key doors that was causing extra key doors
Generation improvement around crystal switches
Fix bug in dungeon_only that wasn't using pot key locations (known issue still exists in pottery modes)
Fixes an issue when keys are found in own dungeon for another player when using the bizhawk plugin
2023-02-24 14:25:04 -07:00
codemann8
4d62a2c7c4 Suppressing console output for unconnected exits 2023-02-18 21:22:31 -06:00
codemann8
ab5f348f77 Merged in DR v1.2.0.8 2023-02-18 19:33:15 -06:00
codemann8
f493709cfe Merged in DR v1.2.0.7 2023-02-18 18:50:21 -06:00
aerinon
9a71e56546 Trap door refinement with "optional" value versus "vanilla"
Slight balance of chaos mode
Warping Pool trap no longer shuffled
2023-02-17 16:55:35 -07:00
aerinon
77c4babca1 Potential fix for vanilla door + ER key logic 2023-02-16 15:40:13 -07:00
aerinon
f0101c9854 Trap door mode initial work 2023-02-16 11:49:29 -07:00
aerinon
142b82a261 BK door fix 2023-02-10 13:47:58 -07:00
aerinon
fb13785abc Minor standard generation fix
Minor ER + Partitioned fix
2023-02-06 13:46:25 -07:00
Cody Bailey
5cde789b43 Potential fix for duped HC/AT Maps/Compasses 2023-01-19 20:02:49 -05:00
codemann8
96806f2b5e Merged DR v1.2.0.5 2023-01-19 08:18:22 -06:00
aerinon
4547a0a43b Logic fix for sanc mirror route
Minor updates to customizer
Minor update to new ER (seed duplication issue)
2023-01-18 08:02:32 -07:00
codemann8
904ff5ec85 Merged in DR v1.2.0.4 2023-01-13 04:08:10 -06:00
aerinon
22dfeeecca Starting inventory updates
Logic fix for skull woods star tile logic
Standard logic improvement
2023-01-12 15:32:49 -07:00
aerinon
4d1b5f58c0 Minor naming convention fixed 2023-01-06 16:57:52 -07:00
codemann8
245b4744bb Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffleDev 2022-12-22 04:27:59 -06:00
codemann8
0324017c2d Merge remote-tracking branch 'upstream/DoorDevUnstable' into SynthesisOWRMerge 2022-12-22 03:47:30 -06:00
aerinon
8f9f9e03c1 Fixed an issue with certain trap doors
DR Hint reference started
2022-12-21 16:57:25 -07:00
codemann8
55a91f8d17 Merged in DRUnstable v1.2.0.1 2022-12-16 18:18:07 -06:00
codemann8
a4120e0cb5 Merged in DR v1.2.0.1 2022-12-16 18:14:27 -06:00
aerinon
ccb35fd1b1 Small key door limit per dungeon
RainPrevention fix
2022-12-16 15:56:53 -07:00
aerinon
99f92f3d79 Merge remote-tracking branch 'origin/DoorDevUnstable' into DoorDevUnstable 2022-12-16 14:25:42 -07:00
Elia Robyn Lake
8d12f15d6f Fix standard + partitioned door shuffle
Also includes a fix to the case where it would try to generate a
negative number of bomb doors or dash doors.
2022-12-16 02:33:11 -05:00
codemann8
2d26954422 Final fixes and reorganization to Inverted Region merging 2022-12-15 17:26:02 -06:00
codemann8
f8bba4176b Reorganized and renamed regions, rules, and lists 2022-12-14 04:12:17 -06:00
codemann8
8e08f336d0 Merging Regions and Rulesets 2022-12-13 01:40:44 -06:00
aerinon
e67ff4d5dc Completionist fixes 2022-12-07 15:57:51 -07:00
codemann8
bd53400fec Replaced all references of Inverted-variant regions/exits 2022-12-06 22:21:35 -06:00
codemann8
e5afe70bcb Merged DR v1.2.0.0 2022-12-03 01:52:22 -06:00
aerinon
9bf0391e60 Cleanup and generation fix 2022-12-01 16:23:11 -07:00
aerinon
249fae39a0 Fix for certain Standard key layouts
Valid key door logic fix
2022-12-01 08:30:27 -07:00
aerinon
fa75d2b4e9 Possible fix for standing items weirdness
Generation fix for Bumper Cave
Chaos door type fix
Minor fix for universal keys
Relaase notes update
2022-11-10 14:14:54 -07:00
aerinon
9fafa8981e Big Key Door fix for when big key double sided is off
Fix for basic issues - key total doesn't change
Potential key lock logic fix
2022-10-28 12:47:43 -06:00