Commit Graph

120 Commits

Author SHA1 Message Date
aerinon
7030ff01be fix(ER): Links house on Dm won't allow a cave to be used twice anymore 2023-11-15 13:25:13 -07:00
aerinon
267e3214a7 Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	CLI.py
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	Rules.py
#	data/base2current.bps
#	source/classes/CustomSettings.py
#	source/tools/MysteryUtils.py
2023-09-29 11:44:23 -06:00
aerinon
915e7dc416 Ability to enemize fairies
Fix for blue square in caves
Lower limit for sprites on tiles that support it, to help with pot lifting
Swamp waterway enemies fixed to not drop
2023-09-26 08:59:31 -06:00
codemann8
70e1e7a28b Fixed Swapped ER so that remaining cave placements in mandatory exits cannot choose vanilla 2023-08-17 07:05:38 -05:00
codemann8
ed9585eef6 Fixed Swapped ER to prevent Old Man from being unretunable 2023-08-17 07:04:06 -05:00
aerinon
e6597a7ab9 Fixed inverted problem with experimental (logically assumed link's house was in the light world)
Fixed hint typo
2023-08-07 09:36:50 -06:00
aerinon
90f1629f0e Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	Main.py
#	MultiClient.py
#	Rom.py
#	data/base2current.bps
#	resources/app/gui/lang/en.json
#	resources/app/gui/randomize/item/widgets.json
#	source/gui/bottom.py
#	source/gui/widgets.py
2023-08-04 11:33:31 -06:00
codemann8
2c6af4e44c More Swapped ER fixes 2023-07-19 14:09:01 -05:00
codemann8
d4f33f50eb More code for Swapped ER implementation 2023-07-16 12:59:43 -05:00
codemann8
138bd2b41f Minor formatting 2023-07-16 01:12:12 -05:00
codemann8
4f5d268401 Adding new Swapped ER mode option 2023-07-16 01:07:17 -05:00
codemann8
84ecf22142 Disabling "LH on mountain" connector
Due to bug found/fixed in previous commit, it was found this was effectively disabled anyways for many months, seemingly without issue
2023-07-16 00:26:12 -05:00
codemann8
c2ec7c7491 Fixed a bad merge causing LH on mountain to not place a connector 2023-07-13 23:26:57 -05:00
codemann8
119e289512 Fixed issue with non crossworld ER modes not clearing out entrances from previous attempts 2023-07-13 16:53:15 -05:00
aerinon
5da0836d9f Fixed logic with mirror in west dark world 2023-06-16 09:15:06 -06:00
codemann8
a842939e92 Various region/rule reorganization to match DR 2023-06-13 18:36:16 -05:00
aerinon
503be6aa91 Enemizer refinement 2023-05-19 08:53:01 -06:00
aerinon
d5e69b28f2 Fix for Non-ER Inverted Experimental (Aga and GT weren't logically swapped)
Fix for customizer setting crystals to 0 for either GT/Ganon
2023-04-14 15:23:38 -06:00
codemann8
1359514dea Fixed default connections in Inverted to correctly swap AT/GT 2023-04-13 19:21:11 -05:00
aerinon
4af9419461 GUI cleanup
Fix Chest Game prize display
2023-04-07 16:01:08 -06:00
codemann8
793f3b30b0 Merged in DR v1.2.0.14 (2nd) 2023-04-07 12:04:12 -05:00
aerinon
50f92e7aee Release notes and minor cleanup 2023-04-05 15:55:30 -06:00
aerinon
09550cd546 Minor fix 2023-04-04 16:53:45 -06:00
aerinon
41a0751009 Merge branch 'WorldModelRefactor' into DoorDevUnstable 2023-03-31 16:07:31 -06:00
codemann8
c3266a904a Disallow some LH placements in DM in Lite/Lean ER 2023-03-22 18:38:26 -05:00
codemann8
7212284ba0 Fixed disconnected Dark Chapel Exit with Inverted + Vanilla ER 2023-03-22 16:00:37 -05:00
aerinon
f4524d8a87 Fix Snitch Lady (West) location on map 2023-03-13 16:28:11 -06:00
codemann8
4108370849 Adding Lean/Lite ER support for new Good Bee Cave location 2023-03-10 21:06:16 -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
da71e9ba12 Placing Sanc Drop in DW if HC in DW and non-crossworld 2023-03-06 15:16:23 -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
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
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
2b8b9156d9 Minor randomization consistency 2023-02-17 10:03:37 -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
ce5f58ec3c Added Lite/Lean support for Fixed Take-Any caves 2023-01-07 16:59:40 -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
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