Commit Graph

148 Commits

Author SHA1 Message Date
compiling
ad9db670a2 Merge branch 'master' into Dev-owg 2020-10-30 16:00:22 +11:00
compiling
cd062d2165 dungeonsfull logic fix - prevent the desert prize from being required to reach desert main (unless keysanity allows access to the keys). 2020-05-30 22:51:56 +10:00
compiling
6418a86c1b Require a weapon for Inverted Castle Tower 2020-04-28 20:16:14 +10:00
compiling
f391f0a3c1 Bunny revive is not possible in Sanctuary. 2020-04-28 20:16:13 +10:00
compiling
461db9d1ba Allow superbunny into tavern
Fix inverted Kings Grave logic
2020-04-28 20:16:06 +10:00
compiling
67a0afc6fa More moon pearl / superbunny fixes
Use the Catfish region properly, so Catfish Descent works.

# Conflicts:
#	InvertedRegions.py
2020-04-28 20:16:05 +10:00
compiling
f964175d64 Allow clipping into the GT entrance 2020-04-28 20:15:11 +10:00
compiling
21eea4277b Always require pearl for Swamp (Superbunny cannot do anything) 2020-04-28 20:15:10 +10:00
compiling
2decfd1f0b 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.
2020-04-28 20:15:10 +10:00
compiling
db811f198c Fix another bunny rule bug. 2020-04-28 20:15:09 +10:00
compiling
9c2dec9cec Fix OWG bunny rules 2020-04-28 20:15:09 +10:00
compiling
c8a30bb749 Dark Desert Teleporter requires the mitts 2020-04-28 20:15:09 +10:00
compiling
e8fef8fc7b Fix moon pearl checks to avoid requiring moon pearl for mirror accessible locations. 2020-04-28 20:15:08 +10:00
compiling
1f504d0a79 Inverted - make the blacksmith, purple chest, bottle merchant and master sword pedestal accessible without the moon pearl.
# Conflicts:
#	test/inverted/TestInvertedDarkWorld.py
#	test/inverted/TestInvertedLightWorld.py
2020-04-28 20:15:08 +10:00
compiling
3b979f4a57 Fix Waterfall entrance being inaccessible with the flippers.
Fix Spectacle Rock and Bombos Tablet requiring moon pearl
2020-04-28 20:14:56 +10:00
compiling
247137e43a Remove mirror clips from Inverted / No Glitches 2020-04-15 23:09:07 +10:00
compiling
8525f07e87 Set TR key rules last, so that entrance requirements are known. 2020-04-15 23:09:07 +10: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
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
59974c2fbe add zora ledge too 2020-02-26 15:19:56 -04:00
qadan
5b03cb82ba add kings grave area, waterwalk regions 2020-02-26 15:11:24 -04:00
qadan
45f8ec51b2 account for some more things 2020-02-21 20:30:23 -04:00
qadan
77b366d093 what's that doing there 2020-02-19 21:09:38 -04:00
qadan
2936dfcd93 fix mirror bunny stuff 2020-02-19 19:00:31 -04:00
qadan
6f38664a80 hecked a copy paste 2020-02-19 10:19:58 -04:00
qadan
0ed41f6b13 fixing bunny revival, and other bunny stuff 2020-02-18 20:22:33 -04:00
qadan
f8b6af472b copy paste error 2020-02-12 19:49:11 -04:00
qadan
5294524c25 rules for superbunny in TR/Hera 2020-02-12 19:38:42 -04:00
qadan
09a5b71a2d inverted issues 2020-02-11 18:39:49 -04:00
qadan
e94131ab1d bugfixes, starting boots 2020-02-11 18:25:09 -04:00
qadan
2ba2f48f92 overworld glitches ruleset 2020-02-11 18:07:38 -04:00
cassidoxa
2859acef7d Swordless rom writes and inverted fixes
* Update Swordless rom writes

* Remove swordless as possible mode in ItemList.py

* Fix inverted HC Ledge access
Added collection state helper methods for determining lw/dw access
Restricted locations where Link's House can be in inverted
Dark Sanc and Link's House can no longer be at the back of Skull Woods
Fixed minor error in inverted bunny rules

* Update Link's House Shuffling in inverted insanity

* More isolated entrances not to put Link's House at

* Fix Link's House in dungeons shuffles

* More dungeons shuffle stuff I forgot
2019-09-21 21:59:16 -04:00
cassidoxa
99a4ea17b0 Fix swordless vanilla shuffle TR keys issue 2019-09-14 10:02:38 -04:00
Kevin Cathcart
2bd2ae80de Remove obsolete comment 2019-08-25 22:35:03 -04:00
cassidoxa
fd1074d58a Adjust swordless rules for inverted 2019-08-25 22:31:51 -04:00
Kevin Cathcart
996bf8495c Implement new weapons modes
This also includes some partial additional cleanup of the item pool.
2019-08-10 16:10:54 -04:00
Kevin Cathcart
b8ea2eb4b1 Fix random weapons for Standard Mode
Now works roughly like VT, except that swords are somwhat more common
and bombs-only escape is not supported (because I don't want to make
'Bombs (10)' an advancement item)

Swordless Standard Mode should also work now

Assured and Vanilla weapons still need to be implemented.
2019-08-10 16:10:54 -04:00
Kevin Cathcart
ef7c3d4f06 New Item/Location accessibility options
Replaces existing check_only_beatable, which became the "none" option.

TR can run out of key placement options, with the 100% locations
option, but I really don't care enough. It exists mostly for people who
want to 100% a seed, or to point to if they ask about keys locked behind
themselves.
2019-08-10 16:10:54 -04:00
Kevin Cathcart
b0f4fa8cec Partial implementation of many V31 features
Partial support for Progressive bow
  - Still needs to be added to item pool
  - Silver hint handling remains TBD even for VT

Added weapons selection.
  - Vanilla needs to be implemented
  - Assured needs to be implemented
  - Inverted swordless is almost certainly messed up.
  - Swordless standard mode will likely softlock
  - Random weapon standard mode is currently treated as uncle assured

Deleted removed difficulties
  - Remaining difficulties still need to be adjusted

Added locked property to locations:
  - This is used for preplaced items etc so that multiworld balancing
    knows they cannot be moved.

Made a few of the difficulty changes from V31, but not all.

Added required text changes to handle crystals requirements
  - More changes will likely me made in future
  - Currently there is is no way to tell ganon requirement in
    Inverted mode
2019-08-10 16:10:47 -04:00
Kevin Cathcart
90e5f522d8 Partially implement variable crystal requirements 2019-08-03 16:48:31 -04:00
cassidoxa
18f1275050 Inverted Mode (#5)
Merging in Cassidoxa's inverted mode.

I've still not fully reviewed the logic used in this mode, so it should be considered experimental, pending an in depth review by either myself or AA.
2019-07-27 09:13:13 -04:00
Bonta-kun
1a62b1da28 Multiworld core implementation By Bonta0
Does not include the server/client code or the rom writes
specific to it. Indeed it cannot write multiworld roms at
all right now, pending addition future updates to support
the official ALTTPR Multiworld client.

Includes some GUI changes by Alaszun

Co-authored-by: Alaszun <koelze@google.com>
2019-07-11 20:39:08 -04:00
AmazingAmpharos
d6babfe222 Fix Fairy Ascension as bunny
A longstanding issue is that Fairy Ascension Cave has been treated as a simple two way connector, but in reality bunny cannot "logically" go through the cave in reverse as it requires lifting some pots with super bunny. This super bunny state is effectively unavoidable and can really only be lost if you have Boots and foolishly bonk before lifting a pot, but for logical consistency fixing this is the right thing to do. The logic should now correctly see that the cave is a two way connection with no particular item requirements in general but that the reverse direction isn't bunny transversable.
2019-04-22 16:41:33 -05:00
AmazingAmpharos
262e0e43c3 Fix GT Map Chest requirement
Forever in ER, erroneously, the Map Chest in Ganon's Tower erroneously required Hookshot instead of correctly accepting Hookshot or Boots like the item randomizer. The root cause involved how regional connections were strung together with the assumption Map Chest would have the same requirements as the four DMs Room chests. This fixes that and allows that chest to be accessed by logic with Boots.
2019-04-18 16:30:08 -05:00
AmazingAmpharos
4d16559fae TR Logic Fix
This update should fully fix the key logic for Turtle Rock. This involved fixing several longstanding bugs in the program we didn't realize we had until trying to really fix this issue. Notable inclusions are that now seeds generated with a count will be identical to similarly numbered seeds generated individually and that now the always allows actually work (key for key apparently actually never happened in ER before and we didn't notice!). This also required refactoring the item pool generation before rule setting and individually moving pendant/crystal placement out of item pool generation (it's not a separate step between rule setting and normal item fill). A few exotic seed generation fails are still possible involving multi-entrance dungeons being really, really inaccessible in non-keysanity, but they're now appropriately super rare instead of being as common as they were before.
2019-04-18 16:11:11 -05:00