Commit Graph

350 Commits

Author SHA1 Message Date
StructuralMike
16ba877e86 Merge branch 'DoorDevUnstable' into BombSwitchDevUnstable 2021-03-18 17:19:52 +01:00
StructuralMike
ced093fe32 PoD Bow statue crystal fix 2021-03-18 09:29:31 +01:00
randall.rupper
7b9deb2190 Merge branch 'DoorDevUnstable' of https://github.com/Fouton/ALttPDoorRandomizer into Fouton-DoorDevUnstable
some refinements too

# Conflicts:
#	ItemList.py
2021-03-16 15:15:48 -06:00
StructuralMike
763bb6c36d Update Rules.py 2021-03-16 22:15:18 +01:00
StructuralMike
13c2022bc9 BombSwitchDev 2021-03-16 22:05:10 +01:00
randall.rupper
7ef186134a Merge branch 'StructuralMike-TFH-fix' into DoorDevUnstable 2021-03-16 14:14:35 -06:00
StructuralMike
6bf3479e08 TFH playthrough fix
copy_world overwrites Murahdahla's logic and either needs to be reset through set_rules to work properly.
2021-03-16 14:15:56 +01:00
StructuralMike
82220b40d6 Small error 2021-03-13 18:42:44 +01:00
StructuralMike
77e4102ab6 Small error 2021-03-13 14:00:14 +01:00
StructuralMike
b3da0bcbcf Updated rules for killrooms and killdrops with bomb-logic in mind 2021-03-12 23:43:57 +01:00
StructuralMike
8689bd6a4c Crystals that can be hit with pots
Moved the can_hit_crystal() function to rules where it belongs, and applied it to all instances of crystals in rooms that don't have pots.
2021-03-12 17:07:17 +01:00
StructuralMike
89be12ee3d Update Rules.py 2021-03-12 11:48:08 +01:00
StructuralMike
f63d1f5470 SP Crystal room 0HKO consideration 2021-03-12 10:21:27 +01:00
StructuralMike
4d1b6a3420 more Double Switch shenanigans 2021-03-11 17:08:07 +01:00
StructuralMike
f60764f062 Double Switch Room being obnoxious 2021-03-11 15:13:15 +01:00
StructuralMike
eb6c71798c Tidying up and adding final(?) interaction points 2021-03-11 12:33:46 +01:00
StructuralMike
2e998af865 Mainly double switch room logic 2021-03-10 23:49:16 +01:00
StructuralMike
7f36036ced Removed unneccesery PoD Arena crystal 2021-03-09 13:08:56 +01:00
StructuralMike
f66245149b Pod Main crystal always in logic with pots 2021-03-09 12:11:26 +01:00
StructuralMike
f33d8a5279 Refined crystal rules 2021-03-09 09:40:50 +01:00
StructuralMike
6f62c41ec3 Removed futuro-stuff 2021-03-08 22:07:01 +01:00
StructuralMike
5298a7f210 TR Crystal Maze 2021-03-08 20:58:22 +01:00
StructuralMike
5534cab01b Minor typos 2021-03-08 17:19:31 +01:00
StructuralMike
e8a51ffb3a GT Crystal rooms 2021-03-08 14:45:00 +01:00
StructuralMike
8eca5bf79e Some more Hera Lobby
Also, Hookshot cave reverted as it doesnt work that way...
2021-03-08 11:20:07 +01:00
StructuralMike
3a75b2dafd lots of PoD crystal logic 2021-03-07 17:28:12 +01:00
StructuralMike
5c5cb7f531 1xPoD and 1xTR crystal room 2021-03-07 12:35:28 +01:00
StructuralMike
bf78758ade Tower of Hera crystal regions working 2021-03-06 19:38:12 +01:00
StructuralMike
5ef1ceb136 ToH Crystal Switch Region WIP 2021-03-06 17:56:45 +01:00
StructuralMike
aeda137498 Simple switch rules 2021-03-05 21:43:41 +01:00
StructuralMike
06b172ee32 Initial full rules commit 2021-03-05 20:10:21 +01:00
StructuralMike
e46b382ed1 Initial dungeon bomb rules 2021-03-05 14:40:42 +01:00
aerinon
af441a8e9b Merging in base er changes 2021-02-25 15:26:29 -07:00
cassidoxa
9ae6829b0d Add flippers requirement for no glitches inverted E Dark World Pier
Remove flippers from E Dark World River Pier base rule and add them back
in no glitches rules. This puts qirn jump into glitches logic.
2021-02-19 19:42:28 -05:00
cassidoxa
fda228935f Add pearl requirement for Ice Rod Cave entrance 2021-02-19 19:42:28 -05:00
aerinon
2caf5abe4a Update item counter for mystery
Fixed bug with door restart
Made retro keys more lenient with door shuffle
2021-02-13 20:58:59 -07:00
Catobat
43b0f95877 Shuffle in-room stairs 2021-01-30 00:35:41 +01:00
aerinon
fc13549ccf Swamp Flooded Room logic re-work
Fix a minor bug
2020-12-05 10:37:58 -07:00
aerinon
32e7544775 Generation improvements 2020-12-01 15:00:53 -07:00
aerinon
ad00c2aea7 Merge branch 'error' into DoorDevUnstable 2020-11-30 15:57:18 -07:00
aerinon
1b060f893b Prevent HUD from showing key counter when in the overworld. (Aga 2 doesn't always clear the dungeon indicator)
Fixed key logic regarding certain isolated "important" locations
Fixed a problem with keydropshuffle thinking certain progression items are keys
A couple of inverted rules fixed (from an outstanding ER pull request)
A more accurate count of which locations are blocked by the big key in Ganon's Tower
Updated base rom to 31.0.7 (includes potential hera basement cage fix)
2020-11-30 15:54:39 -07:00
aerinon
5b9919153e Merging of pot shuffle 2020-11-24 12:57:11 -07:00
aerinon
22f749e767 Keysanity menu bugfix
Inverted ER + intensity 3 fix
Swamp Trench 1 locking flippers fix
Fix for lobbies overwriting logic in TR Hub (and elsewhere)
Repaired exits that were wrongly affected by entrance fixes
2020-11-20 14:00:40 -07:00
aerinon
f5327bc0e6 Fix trock entrances when intensity >= 3
Keysanity menu countdowns
Standard rain state
Multi-entrance dungeon bosses
This dungeon/universl key drops skip pose
More rupee candidates to remove for retro
2020-11-19 16:26:45 -07:00
aerinon
4dda394a90 Added option to keep original palettes in crossed dungeon mode
If sanc if in a DW dungeon because of crossed+ ER, then you start in bunny form
Mirroring from sanc to the portal is now in logic
Another fix for animated tiles (fairy fountains)
GT Big Key stat changed on credits

Some standard logic fixes for lobbies (more outstanding)
2020-11-16 10:51:26 -07:00
aerinon
11154e1544 Crossed dungeon palette refinement
Fixed some entrances that require reset otherwise
Fixed TR lobbies that need to be bombed
Fixed animated tiles in lobbies
Fixed wallmaster+lamp problem
Fixed some key rules that caused item requirements to be ignored
Fixed Old Man cave to be properly one-way in the graph
Fixed some odd key logic issues
2020-11-12 12:18:00 -07:00
compiling
078b5eeb85 Merge remote-tracking branch 'remotes/origin/DoorDevUnstable' into DoorDevUnstable 2020-11-07 18:48:26 +11:00
compiling
3e1b5a03a0 Make standard x retro work
Fix no logic generation
Remove a duplicate function in Main.py
2020-10-31 15:10:11 +11:00
compiling
c6c4b58c93 Remove dead code.
Fix imports.
2020-10-31 10:40:12 +11:00
compiling
e62d095d28 Connect hyrule_castle_exits to light world exits in standard dungeonsfull shuffle when there are no mandatory exits.
Fix GT key logic to only allow placing a small key in the map room when the playthrough algorithm can reach it (due to limitations of the key logic).
2020-10-31 10:22:43 +11:00