Commit Graph

640 Commits

Author SHA1 Message Date
KrisDavie
6510968401 Support bunny pocket for SW back and voo hammer house 2023-12-22 22:48:42 +01:00
KrisDavie
7f5fb16453 Refactor hmg key logic 2023-12-22 22:48:42 +01:00
KrisDavie
e1f2369f13 Refactor OWG rules to use lists rather than generators 2023-12-22 22:48:42 +01:00
KrisDavie
dad1ee8336 Implement basic HMG logic
* Ice Palace Lobby Clip
* Kikiskip to Pod
* Mire -> Hera -> Swamp
  - Mire small door to rupee room is removed
  - Hera and Swamp keys are placed without logic
  - Swamp locked by vanilla rules or having all mire smalls
* Above as connectors in ER
2023-12-22 22:48:42 +01:00
aerinon
44d33ea629 fix: ganonhunt playthrough 2023-12-18 14:10:30 -07:00
codemann8
a6f244cd01 Implement Return Old Man already in starting inventory 2023-12-07 13:06:49 -06:00
codemann8
d9e515429a Undo bunny walking change due to infinite loop 2023-12-02 05:29:11 -06:00
codemann8
83831265dd Merged in DR v1.2.0.22 2023-11-18 17:49:41 -06:00
aerinon
94d05df72b fix(logic): Backwards to Lanmo 2 with Trinexx requires the cape 2023-11-15 16:38:19 -07:00
aerinon
ae3215ff9a fix(key logic): typo
fix(bunny logic): multiple paths considered
2023-11-15 15:01:21 -07:00
aerinon
71eadd051c fix(key logic): typo
fix(bunny logic): multiple paths considered
2023-11-14 14:42:25 -07:00
aerinon
14c0448fe7 fix(key logic): typo
fix(bunny logic): multiple paths considered
2023-11-13 15:43:27 -07:00
aerinon
b50cf16fbf Merge branch 'DoorDevUnstable' into DoorDevVolatile 2023-10-06 12:57:37 -06:00
aerinon
fd99620ac9 Standard: generation error fixed 2023-10-06 12:56:29 -06:00
aerinon
1434911727 Freeze fairy abyss/beam dash enemies
Fix original key drops on split supertiles (pokey 1)
Fix mystery/customizer boolean issue
Enemy bans
2023-10-06 10:47:22 -06:00
codemann8
929d24c818 Merged in DR v.1.2.0.21 2023-09-29 15:11:06 -05:00
aerinon
6c529cc7de Some more trap door exceptions (can be opened by trigger and should be bunny impassible) 2023-09-29 13:06:10 -06: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
e722a1129f Rule fix for zelda to throne room 2023-09-28 10:31:36 -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
aerinon
fa155a78f8 Baserom patch
Attempt to repair bee trap and other items
Some other minor fixes
2023-08-30 15:26:46 -06:00
aerinon
42bf2f3534 Bunch of fixes for the baserom changes 2023-08-24 16:18:49 -06:00
codemann8
06e3dc80d6 Merged in DR v1.2.0.20 2023-08-07 15:30:50 -05: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
aerinon
f442cff061 Logic added for openable trap doors 2023-08-03 15:06:54 -06:00
codemann8
a987e58fc9 Adding Flute Activation only if an activated flute cannot be found elsewhere 2023-07-17 02:13:16 -05:00
codemann8
4f5d268401 Adding new Swapped ER mode option 2023-07-16 01:07:17 -05:00
codemann8
e0bf8227fb Fixed issue with flipper rules not getting pearl rules added 2023-07-12 20:05:47 -05:00
aerinon
0c640bf9dd Fix for pyrmaid hole logic 2023-07-10 10:35:18 -06: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
codemann8
6d2e95e6ef Merged in DR v1.2.0.16 2023-04-14 16:00:21 -05:00
aerinon
ea8bd117fc Fix for partial key logic for vanilla mire
Fix for Kholdstare shell collision
2023-04-14 14:17:57 -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
codemann8
f13880eee9 Major GUI reorganization 2023-04-04 17:11:43 -06:00
codemann8
9406f408df Fix for HC dark rooms not getting correct lamp logic in partitioned DR 2023-04-03 08:25:14 -05:00
codemann8
3eeeda363b Fixed various Flute logic issues and improved logic efficiency 2023-04-01 07:59:13 -05:00
aerinon
41a0751009 Merge branch 'WorldModelRefactor' into DoorDevUnstable 2023-03-31 16:07:31 -06:00
codemann8
d216cb337b Adding missing bunny rule for Water D Leave 2023-03-30 22:52:44 -05:00
aerinon
6f18c4c4a5 Fix lamp logic in partitioned 2023-03-30 16:42:56 -06:00
aerinon
a0b781521f Big enemizer updates
Fix sheets
Health + damage rando
Logical kill rooms
2023-03-30 16:12:46 -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