Commit Graph

199 Commits

Author SHA1 Message Date
compiling 5b268ef8ae Combine bunny rules calculation for inverted and normal. 2020-05-07 20:00:29 +10:00
compiling a526d71fe0 Fix inverted bomb shop rules for Lake Hylia Island (also added King's Tomb rules). 2020-05-07 19:04:34 +10:00
compiling 3740450845 Require moon pearl and flippers to exit the Waterfall of Wishing cave in inverted. 2020-05-07 18:58:57 +10:00
compiling 441f59d6ea 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-05-07 18:07:53 +10:00
compiling 477c7bc596 Place an extra key in TR instead of breaking 100% locations 2020-04-30 12:10:28 +10:00
compiling a5a035d86b Don't violate 100% locations if bigkeyshuffle is on and the big chest is available 2020-04-30 00:19:49 +10:00
compiling 444dd5b46b Modify TR key rules:
* Front to Middle requires 3 keys, or only 2 if the back is inaccessible
* Middle to Front requires 4 keys, or only 2 if the back is inaccessible and the TR Big Key is in the front
* Back to Middle requires 0 keys
* Middle to Back requires 3 keys
TR will violate 100% locations accessibility if it is only accessible via the middle section - this is required to have enough keys for the rest of the dungeon.
2020-04-30 00:19:49 +10:00
compiling 0924a2461a dungeonsfull logic fix - prevent the desert prize from being required to reach desert main (unless keysanity allows access to the keys). 2020-04-30 00:19:48 +10:00
compiling 4851a905cf
OWG fixes (#79)
* Fix Waterfall entrance being inaccessible with the flippers.
Fix Spectacle Rock and Bombos Tablet requiring moon pearl

* Inverted - make the blacksmith, purple chest, bottle merchant and master sword pedestal accessible without the moon pearl.

* Fix moon pearl checks to avoid requiring moon pearl for mirror accessible locations.

* Dark Desert Teleporter requires the mitts

* Fix OWG bunny rules

* Fix another bunny rule bug.

* Separate superbunny cave into 2 regions.
For OWG, allow superbunny in superbunny cave with no mirror when entering from the bottom
Fix boots clip logic to desert teleporter ledge and TR teleporter
Fix mirror wrap logic for pyramid fairy
For insanity shuffle, exiting Superbunny Cave bottom is now in logic.

* Always require pearl for Swamp (Superbunny cannot do anything)

* Allow clipping into the GT entrance

* Add OWG tests from vt_randomizer

* Add some extra vanilla test cases

* Allow superbunny into the Blind's Hideout entrance.

* More moon pearl / superbunny fixes
Use the Catfish region properly, so Catfish Descent works.

* Allow superbunny into tavern
Fix inverted Kings Grave logic

* Inverted OWG tests

* Update unit tests for King's Tomb clip.

* All superbunny to spiral cave item (with sword)

* Bunny revive is not possible in Sanctuary.

* More inverted tests

* Add/fix test cases

* Fix logic for Magic Bat

* Fix merge to multiworld

* Fix Floodgate superbunny rule

* Require bunny revival for all dungeons except for Swamp/TR Main/Hera/Sanctuary, which have extra requirements

* Require a weapon for Castle Tower.

* Test case fixes

* Update test case - superbunny into Kakariko Tavern is in logic
2020-04-28 17:34:30 +02:00
Fabian Dill c5fbaeb51c re-rename all ocarinas and fix one inverted rule that way 2020-04-26 00:47:57 +02:00
Fabian Dill 2c32010203 Merge branch 'pull/66' into owg_test 2020-04-15 16:59:47 +02:00
compiling 5e1df5dc36 Remove mirror clips from Inverted / No Glitches 2020-04-15 21:35:27 +10:00
compiling 9341546159 Set TR key rules last, so that entrance requirements are known. 2020-04-15 20:24:18 +10:00
Fabian Dill 659cfd5c3f slightly reduce cache-memory use of OWG rules to recoup some of the lost performance to additional logic rules 2020-04-10 21:13:16 +02:00
Fabian Dill 5254b5588e fix two region rules 2020-04-10 20:53:19 +02:00
Fabian Dill 95d51d48bf Merge branch 'pull/23'
# Conflicts:
#	BaseClasses.py
#	EntranceShuffle.py
#	ItemList.py
#	Mystery.py
#	Rules.py
2020-04-08 15:07:19 +02:00
Fabian Dill 94e5b5962f Merge branch 'pull/58' into compilingERupdate
# Conflicts:
#	EntranceShuffle.py
#	Rom.py
#	Rules.py
2020-04-05 19:06:15 +02:00
compiling 11a91b96c6 Set inverted blacksmith to require light world access using the mirror or a portal (via starting in Link's House / Old Man Cave doesn't work).
Set the flag allowing the blacksmith to visit Link's House in simple inverted shuffle.
2020-04-05 21:12:26 +10:00
Fabian Dill 42f98da399 remove post-merge duplicate rules 2020-04-04 09:23:10 +02:00
Fabian Dill f89c28d5c2 Merge branch 'master' into pull/58
# Conflicts:
#	AdjusterMain.py
#	BaseClasses.py
#	EntranceShuffle.py
#	Gui.py
#	InvertedRegions.py
#	ItemList.py
#	Main.py
#	Plando.py
#	Rom.py
#	Rules.py
2020-04-04 09:16:39 +02:00
compiling 6003d40ce2 Update inverted big bomb rules.
Add checks that will not allow unexpected entrances to get east dark world logic.
2020-03-19 21:54:13 +11:00
compiling e8ee3de083 Mire key logic update - it is impossible to access the Map Chest key door without hitting a colour switch (or clipping through a rail). 2020-03-15 21:03:43 +11:00
compiling 5c0d34a65d Require a weapon for Castle Tower. 2020-03-15 11:04:08 +11:00
compiling 49e48eba1d Add warp between Waterfall Cave and Lake Hylia into inverted logic. 2020-03-14 13:37:21 +11:00
compiling 6197b915a5 Fix inverted rule for old man house. 2020-03-14 00:39:29 +11:00
compiling 583380cad6 Support vanilla key layout in GT (copy item rando logic - firesnake room needs 2 keys if it contains a small key). 2020-03-09 09:59:54 +11:00
qadan 52982a5e13 kings grave area, waterwalk regions 2020-02-26 15:18:49 -04:00
qadan ea4340b796 fixing mirror bunny stuff 2020-02-19 19:06:48 -04:00
qadan 3015133abd some copypasta goofs 2020-02-19 10:18:09 -04:00
qadan 2b2b97d18a fixing bunny revival and other bunny things 2020-02-18 20:28:33 -04:00
Fabian Dill 95aea8c4b4 rename ocarina to flute. 2020-02-17 10:08:03 +01:00
qadan 43801e8110 you goose 2020-02-12 19:50:23 -04:00
qadan 3d021356b8 hera and tr superbunny logic 2020-02-12 19:48:36 -04:00
qadan 3533f8cbb3 non required exits 2020-02-11 14:11:50 -04:00
qadan 720ce8c492 fixing dungeon bunny revive 2020-02-11 13:01:47 -04:00
qadan 722dfa2b69 fixing up inverted too 2020-02-11 01:14:57 -04:00
qadan aa569d1c3d rework as region connectors (inverted will be broken) 2020-02-10 23:54:35 -04:00
qadan 8db19e544e bomb jump rules, don't redo lamp rules 2020-02-10 09:55:06 -04:00
qadan 3ba3fcf2db dm room chest moved to global. ensuring base rules for owg 2020-02-10 01:02:27 -04:00
qadan ff3b879a02 more idiomatic, bugfix too 2020-02-10 00:38:55 -04:00
qadan 8d5fc3051e adding to inverted 2020-02-09 18:57:55 -04:00
qadan 50687131e8 oh yeah 2020-02-09 18:53:22 -04:00
qadan 36333b3a49 not sure where this went 2020-02-09 18:52:07 -04:00
qadan a5f585ce7c fix bunny logic 2020-02-09 18:43:15 -04:00
qadan 79339a5fdf thats not where that is 2020-02-09 15:14:15 -04:00
qadan 08d908b9fc fixing bunny dmd stuff 2020-02-09 15:06:55 -04:00
qadan a8a12d14ba wip stuff 2020-02-09 13:54:59 -04:00
qadan e4ab046027 ensure inverted runs 2020-02-08 19:00:21 -04:00
qadan c6cf8c1ebe fix bunny rules n stuff 2020-02-08 15:18:17 -04:00
qadan c20fe90c0f maybe broken stuff oh boy 2020-02-08 12:29:55 -04:00