Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LADX: Fix being forced to farm for money, fix set iteration #1924

Merged
merged 8 commits into from
Jul 4, 2023

Conversation

zig-for
Copy link
Collaborator

@zig-for zig-for commented Jul 2, 2023

What is this fixing or adding?

  1. Fixes needing to farm for money - rather than forcing rupee checks to only be in logic with the ability to farm, I was accidentally forcing farming as a possibility
    1a. Turned on counting of 20s and 50s as otherwise some spots weren't logically reachable
    1b. Added code for rupee overflow that's currently disabled - needs UI work otherwise it may be confusing
  2. Fixes iteration on set in dungeon fill code
  3. Fixes plando items causing broken generation

How was this tested?

Made a bunch of generations with swords in rupee locked places

If this makes graphical changes, please attach screenshots.

Enjoy this terrible spoiler

0: {

}
1: {
  Tarin's Gift (Mabe Village): Hookshot
}
2: {
  Sword on the Beach (Toronbo Shores): Magic Powder
}
3: {
  Bush Field (Mabe Village): 100 Rupees
  Can Play Trendy Game: Can Play Trendy Game
  First Switch Locked Chest (Bottle Grotto): Small Key (Bottle Grotto)
  Heart Piece of Shame (Koholint Prairie): Progressive Shield
  Toadstool (Mysterious Woods): 50 Rupees
  Two Stalfos Key (Bottle Grotto): Small Key (Bottle Grotto)
  Well Heart Piece (Mabe Village): Progressive Power Bracelet
}
4: {
  Entrance Chest (Bottle Grotto): Small Key (Bottle Grotto)
  Ghost House Barrel (Martha's Bay): 20 Rupees
  Lanmola (Yarna Desert): 50 Rupees
  Lone Bush (Martha's Bay): 50 Rupees
  Mad Batter (Mysterious Woods): Bomb
  Rock Seashell (Yarna Desert): Feather
  Two Zol, Moblin Chest (Mysterious Woods): 50 Rupees
}
5: {
  Ball and Chain Darknut Leaf (Kanalet Castle): 50 Rupees
  Boomerang Guy Item (Toronbo Shores): 50 Rupees
  Cave Under Lanmola (Yarna Desert): 50 Rupees
  Crow Rock Leaf (Kanalet Castle): Flippers
  Enemy Order Room Chest (Bottle Grotto): Small Key (Bottle Grotto)
  Mask-Mimic Key (Bottle Grotto): Ocarina
  Outside Boo Buddies Room Chest (Bottle Grotto): Small Key (Bottle Grotto)
  Second Switch Locked Chest (Bottle Grotto): Tail Key
  Vacuum Mouth Chest (Bottle Grotto): 50 Rupees
  Write Cave East (Goponga Swamp): 20 Rupees
}
6: {
  Boo Buddies Room Chest (Bottle Grotto): Nightmare Key (Bottle Grotto)
  Damp Cave Heart Piece (Tal Tal Heights): 50 Rupees
  Hardhat Beetles Key (Tail Cave): Small Key (Tail Cave)
  In the Moat Heart Piece (Kanalet Castle): Pegasus Boots
  Island Bush of Destiny (Martha's Bay): Slime Key
  Manbo's Mambo (Tal Tal Heights): 200 Rupees
  Mini-Moldorm Spawn Chest (Tail Cave): Small Key (Tail Cave)
  Outside D3 Island Bush (Ukuku Prairie): Magic Rod
  Pit Button Chest (Tail Cave): 200 Rupees
  Two Stalfos, Two Keese Chest (Tail Cave): Small Key (Tail Cave)
}
7: {
  Bomberman Meets Whack-a-mole Leaf (Kanalet Castle): 100 Rupees
  Boots Pit (Kanalet Castle): 50 Rupees
  Conch Horn (Bottle Grotto): Conch Horn
  East of Mabe Tree Bonk (Ukuku Prairie): Ballad of the Wind Fish
  Feather Chest (Tail Cave): Nightmare Key (Tail Cave)
  Four Zol Chest (Key Cavern): Small Key (Key Cavern)
  Genie Heart Container (Bottle Grotto): 200 Rupees
  Mad Batter (Martha's Bay): Shovel
  Two Bombite, Sword Stalfos, Zol Chest (Key Cavern): Small Key (Key Cavern)
  Two Stalfos, Zol Chest (Key Cavern): Small Key (Key Cavern)
  Vacuum Mouth Chest (Key Cavern): Small Key (Key Cavern)
}
8: {
  After Stairs Key (Key Cavern): Small Key (Key Cavern)
  Boots Chest (Key Cavern): Small Key (Key Cavern)
  Dog House Dig (Mabe Village): Boomerang
  Three Bombite Key (Key Cavern): Small Key (Key Cavern)
  Tile Arrow Ledge Chest (Key Cavern): Small Key (Key Cavern)
  Two Zol, Two Pairodd Key (Key Cavern): 50 Rupees
}
9: {
  North Key Room Key (Key Cavern): 100 Rupees
  South Key Room Key (Key Cavern): Nightmare Key (Key Cavern)
}
10: {
  Shop 980 Item (Mabe Village): Progressive Sword
}
11: {
  Crystal Key (Catfish's Maw): Small Key (Catfish's Maw)
  Full Moon Cello (Tail Cave): Full Moon Cello
  Sea Lily's Bell (Key Cavern): Sea Lily's Bell
}
12: {
  Flying Bomb Chest East (Catfish's Maw): Nightmare Key (Catfish's Maw)
  Flying Bomb Chest South (Catfish's Maw): Small Key (Catfish's Maw)
  Three Iron Mask Chest (Catfish's Maw): Small Key (Catfish's Maw)
}
13: {
  Wind Marimba (Catfish's Maw): Wind Marimba
}
14: {
  Windfish: An Alarm Clock
}

@ThePhar ThePhar changed the title Draft: Fix being forced to farm for money LADX: Draft: Fix being forced to farm for money Jul 2, 2023
@ThePhar ThePhar added the is: bug/fix Issues that are reporting bugs or pull requests that are fixing bugs. label Jul 2, 2023
@ThePhar
Copy link
Member

ThePhar commented Jul 2, 2023

If possible, I would recommend against opening a Draft PR unless the goal is to get feedback from the proposed changes to help shape the PR during development. I didn't see that implication in the description (no info in the description at the time of this writing).

@ThePhar ThePhar changed the title LADX: Draft: Fix being forced to farm for money LADX: Fix being forced to farm for money Jul 2, 2023
@zig-for zig-for changed the title LADX: Fix being forced to farm for money LADX: Fix being forced to farm for money, fix set iteration Jul 3, 2023
@zig-for zig-for marked this pull request as ready for review July 3, 2023 01:09
worlds/ladx/__init__.py Outdated Show resolved Hide resolved
zig-for and others added 2 commits July 2, 2023 18:58
Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
@Berserker66 Berserker66 merged commit 153125a into ArchipelagoMW:main Jul 4, 2023
11 checks passed
FlySniper pushed a commit to FlySniper/Archipelago that referenced this pull request Nov 14, 2023
Jouramie pushed a commit to Jouramie/Archipelago that referenced this pull request Feb 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
is: bug/fix Issues that are reporting bugs or pull requests that are fixing bugs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants