LADX: upstream logic updates

[threeandthreee]

What is this fixing or adding?

Updates logic from upstream. Also had to correct a logic test.

Changelog

Upstream has changed their logic files to indicate the technique rather than the items, most changes are simply that, listed below are the actual changes to logic:

D1

• The Three of a Kind with Bomb is moved from Normal to Hard Logic

D3

• Adds killing the enemies in the North Room with a Pot in Hard Logic

D4

• Hard logic: Removes Feather requirement from grabbing the Pit Key
• Hell logic: new hookshot clip (line 64)
• Hell logic: hookshot spam over the first pit of crossroads, then buffer down (line 69)
• Hell logic: push block left of keyblock up, then shaq jump off the left wall and pause buffer to land on keyblock.
• Hell logic: split zol for more entities, and clip through the block left of keyblock by hookshot spam

D5

• Hell logic: use zoomerang dashing left to get an unclipped boots superjump off the right wall over the block. reverse is push block (line 69)

D6

• Hard logic: allow damage boosting past the mini thwomps
• Glitched logic: bomb triggering elephants in two cases

D7

• Hard logic: Three of a King with bombs only

D8

• Hard logic: allows to drop the Gibdos into holes as a way to kill them
• Glitched logic: underground section with fire balls jumping up out of lava. Use boots superjump off left wall to jump over the pot blocking the way

D0

• Normal logic: Karakoros now need power bracelet to put them into their holes
• Hard logic: Karakoros without power bracelet but with weapon
• Hell logic: Karakoros with only bombs

Overworld

• Normal logic: requires hookshot or shield to traverse Armos Cave
• Hard logic: Traverse Armos Cave with nothing (formerly normal logic)
• Hard logic: get the animal village bomb cave check with jump and boomerang
• Hard logic: use rooster to go to D7
• Glitched logic: Bomb triggering Yoshi Trade
• Lots of Jesus Rooster Jumps

How was this tested?

Generating, light playtesting

[kbranch]

I'm not an AP dev, but I've done some work upstream and am pretty familiar with its logic. All of this looks pretty independent of the AP internals, so I think I'm reasonably qualified to review it.

I carefully combed through a diff of this vs. upstream - I found a couple spots that I'd expect to throw runtime errors with higher logic levels, but otherwise it looks pretty good.

Anywhere I say "upstream does ..." is just a suggestion. I think they're all useful suggestions, but leaving them out shouldn't cause problems.

I couldn't get GitHub to let me add comments to the exact lines for everything below, in overworld.py. I'm guessing they happened after the AP fork, but before the time frame where PRs were looked at for this update.

upstream includes this below line 135:
graveyard.connect(forest_heartpiece, OR(BOOMERANG, HOOKSHOT), one_way=True) # grab the heart piece surrounded by pits from the north

below line 243:
self._addEntranceRequirementExit("castle_secret_entrance", None) # leaving doesn't require pit_bush

line 251 has the r.bush requirement removed:
self._addEntrance("castle_main_entrance", castle_frontdoor, castle_inside, None)

below line 280:
self._addEntranceRequirementExit("prairie_to_animal_connector", None) # leaving doesn't require pit_bush

below line 394:
multichest_cave.connect(multichest_cave_secret, BOMB, one_way=True)

below line 472 (doctored on the fly a bit to fit the AP version, take with a grain of salt):
self._addEntranceRequirementExit("d2", r.wall_clip) # Clip out at d2 entrance door

[threeandthreee]

Thanks for going over this, and yeah I failed to test higher logic levels, palex ended up having to fix some of this on the spot to generate the async this morning.

[kbranch]

Looks good to me with the new changes

[SushiKishi]

Seeds with these changes have generated as expected. The proposed changes seem reasonable for the difficulty settings.

[palex00]

This PR was tested as part of a Beta apworld that was used in three dedicated Test Asyncs, as well as dozen of normal Syncs. I have also personally run 200 test generations which succeeded.

We have also done polling on what users want, etc. which can be found here

The new feature has worked as expected and other stuff does not seem impacted.

[NewSoupVi]

Just a bunch of logic changes. As always with logic: I'm gonna trust the previous reviewers that the changes are correct.

[NewSoupVi]

There are conflicts now though, and these aren't simple enough where I could figure out how to resolve them myself. @threeandthreee