Commit Graph

507 Commits

Author SHA1 Message Date
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
codemann8
93eea0b40f Added Cold Fairy Statue to bonkable locations 2023-03-09 20:35:39 -06:00
aerinon
affd7568cb Minor adjustments to world model refactor 2023-03-09 16:48:14 -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
d549a2c323 Adding OWR modes to Customizer settings 2023-03-08 16:19:29 -06:00
codemann8
b6da5e51fd Merged in DR v1.2.0.12 2023-03-08 16:16:04 -06:00
codemann8
e6a1476244 Merged in DR v1.2.0.11 2023-03-07 18:58:08 -06:00
aerinon
14ced2435c Update for enemizer bits 2023-03-06 16:29:58 -07:00
codemann8
da71e9ba12 Placing Sanc Drop in DW if HC in DW and non-crossworld 2023-03-06 15:16:23 -06:00
codemann8
cc84c4e9b4 Adding OWR Tile Flip to Customizer 2023-03-05 19:24:17 -06:00
codemann8
2f61dceb0e Placing Sanc Drop in DW if HC in DW and non-crossworld 2023-03-04 13:44:23 -06:00
aerinon
a5da504b90 Fix for district shuffle's placeholder issue 2023-03-03 16:53:50 -07:00
codemann8
d1b4d9e044 Merged in DR v1.2.0.10 2023-03-02 19:07:04 -06:00
aerinon
a75b36e2eb ER2 Minor issues 2023-03-01 16:23:03 -07:00
codemann8
90c6854919 Initial OWR/ER2 merge 2023-02-26 13:44:30 -06:00
aerinon
6c0da515b4 Fix dungeon_only + pottery modes 2023-02-24 17:00:25 -07:00
aerinon
7397d779ad Changing colorizing pots defaults 2023-02-24 16:20:29 -07: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
4ea0eda0b9 Initializing districts after OWR so ER can use them 2023-02-22 17:37:27 -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
d7c15ae22c Strict and Partial key logic implementations with new test suite utility 2023-02-17 10:07:43 -07:00
aerinon
2b8b9156d9 Minor randomization consistency 2023-02-17 10:03:37 -07:00
aerinon
f0101c9854 Trap door mode initial work 2023-02-16 11:49:29 -07:00
aerinon
0e82dd73b7 Merge branch 'DoorDev' into DoorDevUnstable
# Conflicts:
#	Doors.py
#	Main.py
#	RELEASENOTES.md
2023-02-15 14:27:26 -07:00
aerinon
a304fd31ac Standard keysanity distribution and generation fixes
Includes new S&Q safety
2023-02-14 15:58:52 -07:00
aerinon
fb13785abc Minor standard generation fix
Minor ER + Partitioned fix
2023-02-06 13:46:25 -07:00
aerinon
7c75053cc1 Fix for vanilla mire key logic 2023-01-30 15:32:26 -07: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
codemann8
ce5f58ec3c Added Lite/Lean support for Fixed Take-Any caves 2023-01-07 16:59:40 -06:00
Thomas Prescott
beb7f8074b remove hard requirement of tkinter when using CLI 2023-01-07 14:58:24 -06:00
codemann8
c98300e2ff Merged in DR v1.2.0.3 2023-01-06 21:37:28 -06:00
aerinon
9ca3d179f9 Fix for randomization replication issue 2023-01-06 15:01:24 -07:00
aerinon
8839926a97 Race flag on GUI
Async Doors League presets
Take into account starting inventory with default item pool
2023-01-06 13:56:18 -07:00
aerinon
c2da20207b Fix for experimental inverted + vanilla ER 2023-01-03 16:10:32 -07:00
codemann8
118adabeb1 Changing mirror exits to be dynamically created 2022-12-30 06:17:54 -06:00
codemann8
c6d0df5f4f Modeling Fairy Ascension Mirror Spot more correctly 2022-12-29 23:46:15 -06:00
codemann8
ca28a9654f Renaming Bombos Tablet Ledge Mirror Spot to match new naming convention 2022-12-26 06:21:45 -06:00
codemann8
196de5a08e Changing mirror exits to be dynamically created 2022-12-26 05:09:27 -06:00
codemann8
6240061a65 Final fixes and reorganization to Inverted Region merging 2022-12-16 18:26:05 -06: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
codemann8
2d26954422 Final fixes and reorganization to Inverted Region merging 2022-12-15 17:26:02 -06:00
codemann8
86c8fd37e7 Reorganized and renamed regions, rules, and lists 2022-12-14 05:36:36 -06:00