Commit Graph

489 Commits

Author SHA1 Message Date
codemann8
8362886cc1 Merged in DR v1.2.0.17 2023-06-16 12:14:16 -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
0ab54def8b Removed backup locations for Dungeon Only and Major Only algorithms. If item cannot be placed in the appropriate location, the seed will fail to generate instead. 2023-06-08 10:25:05 -06:00
aerinon
503be6aa91 Enemizer refinement 2023-05-19 08:53:01 -06:00
codemann8
393cbdd0ab Apples/BeeTraps/Fairies now spawn automatically under pots 2023-05-08 05:03:53 -05: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
6d2e95e6ef Merged in DR v1.2.0.16 2023-04-14 16:00:21 -05:00
codemann8
1359514dea Fixed default connections in Inverted to correctly swap AT/GT 2023-04-13 19:21:11 -05:00
aerinon
907639b984 any_enemy_logic option added 2023-04-10 09:07:01 -06:00
aerinon
4af9419461 GUI cleanup
Fix Chest Game prize display
2023-04-07 16:01:08 -06:00
codemann8
b0eefd36b0 Merge branch 'DoorDevUnstable' into OverworldShuffleDev 2023-04-07 16:03:10 -05:00
aerinon
546f5ca10c Fix for gui 2023-04-07 15:00:14 -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
5d86ed4055 start of any enemy logic option 2023-04-06 16:57:15 -06:00
aerinon
85afd0c09e Add collection_rate to customizer 2023-04-06 11:23:54 -06:00
aerinon
3c18dc6e3a Re-vamp multiple settings as buttons.
Minor logic clean up.
2023-04-06 11:22:12 -06:00
aerinon
ddfbece2bd Clean up enemizer cli argument and gui code 2023-04-05 16:38:17 -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
50f92e7aee Release notes and minor cleanup 2023-04-05 15:55:30 -06:00
codemann8
f13880eee9 Major GUI reorganization 2023-04-04 17:11:43 -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
aerinon
a0b781521f Big enemizer updates
Fix sheets
Health + damage rando
Logical kill rooms
2023-03-30 16:12:46 -06:00
codemann8
f1f75ec760 Major GUI reorganization 2023-03-29 10:19:36 -05: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
aerinon
d85a63ece1 Damage table start 2023-03-13 11:11:59 -06:00
codemann8
6811ab29b2 Adding bonk drops to Customizer settings 2023-03-12 03:33:18 -05:00
codemann8
4108370849 Adding Lean/Lite ER support for new Good Bee Cave location 2023-03-10 21:06:16 -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
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