Commit Graph

188 Commits

Author SHA1 Message Date
aerinon
341a4f4631 District hint work 2022-03-08 08:13:49 -07:00
aerinon
fab5f5bb70 Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	Main.py
#	Rom.py
#	data/base2current.bps
2022-01-06 16:06:51 -07:00
aerinon
45bb92151f -Fix for Inverted Mode: Dark Lake Hylia shop sells a blue potion
-Fix for Ijwu's enemizer: Boss door in Thieves' Town no longer closes after the maiden hint
-AllowAccidentalMajorGlitches set for no logic
2022-01-04 22:10:42 -07:00
aerinon
61f659a511 Initial fill changes
Merge branch 'Bias' into DoorDevVolatile

# Conflicts:
#	Rom.py
2021-11-02 16:03:21 -06:00
aerinon
dc7d4940d9 Overworld map code 2021-10-21 16:29:09 -06:00
aerinon
ef998a2f7f Merge branch 'Ambrosia' into Bias 2021-09-10 09:18:49 -06:00
aerinon
91fbcd38da Fix shop hints in ER modes where shops are not located vanilla 2021-08-27 15:13:37 -06:00
aerinon
746a739339 Main structure for various biased fills
Lots of help around correctly reserving locations
2021-08-26 15:27:05 -06:00
StructuralMike
779c7d78c0 New hookshot cave region definitions 2021-07-24 17:22:48 +02:00
aerinon
8c5a4be480 Ranged crystal switch logic tweaked
Couple of minor bugs fixed
2021-06-22 13:04:37 -06:00
aerinon
a12ebfaf50 Merge branch 'StructuralMike-BombSwitchDevUnstable' into DoorDevVolatile 2021-05-04 16:30:27 -06:00
compiling
30baec65af Merge remote-tracking branch 'remotes/origin/Dev-owg' into DoorDevUnstable 2021-04-18 14:28:29 +10:00
StructuralMike
3f9b6234c2 Mire fishbone barrier bypass 2021-03-22 21:12:26 +01:00
StructuralMike
13c2022bc9 BombSwitchDev 2021-03-16 22:05:10 +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
e1ddd02097 Missing crystal in Hera Beetles 2021-03-12 14:03:19 +01:00
StructuralMike
f63d1f5470 SP Crystal room 0HKO consideration 2021-03-12 10:21:27 +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
f33d8a5279 Refined crystal rules 2021-03-09 09:40:50 +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
aerinon
8d22dd1a3d Bringing in Unstable2 changes 2021-02-18 13:19:08 -07:00
aerinon
352592bd00 Key logic error with odd_counter and child doors
Fix the Lone Pot doors (E/W) swapped
2021-02-13 21:09:57 -07:00
aerinon
09cae6e640 Shopsanity multiworld and rupee progression balancing 2021-02-03 10:49:29 -07:00
aerinon
f8a0ba1816 merge in inroom staircases 2021-02-01 10:07:53 -07:00
aerinon
b5f3c752e6 Shop work:
- Potion shop
- Cap Fairy blacklist
- Item counter increased over 255
- Inverted work
- Static sram for shops
- Price adjustments (and discounts)
2021-02-01 09:57:20 -07:00
Catobat
43b0f95877 Shuffle in-room stairs 2021-01-30 00:35:41 +01:00
aerinon
51affaf0ca Merge branch 'DoorDevUnstable' into ShopGenWork 2020-12-05 10:38:22 -07:00
aerinon
fc13549ccf Swamp Flooded Room logic re-work
Fix a minor bug
2020-12-05 10:37:58 -07:00
aerinon
e834fd85a1 Initial Shopsanity
Retro work
2020-12-03 16:25:51 -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
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
aerinon
cdf5f23b75 Potential multiworld fixes for keydropshuffle 2020-11-03 10:19:22 -07:00
compiling
ef294ab0d3 Fix copy world. 2020-10-31 10:05:28 +11:00
compiling
1bd3ccfdc5 Require flippers for returning to dark lake hylia from Ice Palace / Capacity Fairy. 2020-10-30 17:40:25 +11:00
compiling
b1853e2ad9 Refactor OWG rules to keep them separate from no glitches.
Add logic for superbunny access to Sahasrahla's closet (with boots)
Add logic for superbunny through Two Brother's House (with boots)
Fix superbunny logic for spiral cave and mini moldorm cave - requires a sword
Add logic for waterwalking into Waterfall Cave
Add clip to Ice Palace entrance (requires boots, pearl and flippers)
Add extra clips to inverted owg logic - PoD and Dark Lake Hylia Ledge are now in logic with just boots
Add clip to flute point 6 into inverted owg logic - some light world locations are now accessible with boots and mitts, but no pearl or mirror.
2020-10-30 17:04:36 +11:00
compiling
ad9db670a2 Merge branch 'master' into Dev-owg 2020-10-30 16:00:22 +11:00
aerinon
471ab3d50e Hint work (Lobby, Ganon, Keydropshuffle)
Preliminary multiworld work
2020-10-27 11:37:47 -06:00
aerinon
d89801c72c Key Hud redesign continued
Keydropshuffle prototype
2020-10-23 12:59:18 -06:00
aerinon
99f262cc72 Lobby logic improvements
Cutoff entrance rug re-work
2020-09-21 16:38:15 -06:00