Skip to content

Commit

Permalink
Fix Floria and treasure selling logic
Browse files Browse the repository at this point in the history
  • Loading branch information
yannl35133 committed Mar 13, 2024
1 parent 895faae commit 8d93861
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions logic/requirements/Faron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Faron Woods:
Great Tree - Near Underwater Hole: Water Dragon's Scale
Great Tree - Platforms: Clawshots
Clawshot Target Branch: Clawshots
Lake Floria Dive: Open Door to Lake Floria | Early Lake Floria Tricks
Lake Floria Dive: Open Door to Lake Floria | (Early Lake Floria - Fence Hop Trick & Practice Sword)
locations:
Unlock Viewing Platform Statue: Nothing
Unlock In the Woods Statue: Nothing
Expand Down Expand Up @@ -97,10 +97,10 @@ Faron Woods:
Unlock Statue: Nothing

Ledge to Lake Floria:
entrance: Push Log
entrance: Push Log | (Early Lake Floria - Fence Hop Trick & Practice Sword) | Early Lake Floria - Swordless Rope Floria Trick
exits:
Faron - Faron Woods: Nothing
Shortcut Exit to Floria Waterfall: Open Door to Lake Floria | Early Lake Floria Tricks
Shortcut Exit to Floria Waterfall: Nothing
locations:
Push Log: Nothing

Expand Down
2 changes: 2 additions & 0 deletions logic/requirements/Skyloft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,8 @@ Skyloft Village:

Rupin's House:
can-sleep: true
locations:
Can Sell Treasures: Night
exits:
Exit: Nothing

Expand Down
4 changes: 1 addition & 3 deletions logic/requirements/macros.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Can Afford 1600 Rupees:
Can High Rupee Farm & ((Big Wallet & 2 Extra Wallets) | Giant Wallet)

Can Medium Rupee Farm:
Sky - Clean Cut Minigame | Can High Rupee Farm
(Sky - Clean Cut Minigame & Skyloft - Rupin's House - Can Sell Treasures) | Can High Rupee Farm

Can High Rupee Farm:
Sky - Fun Fun Island Minigame | Eldin - Thrill Digger Minigame
Expand Down Expand Up @@ -238,8 +238,6 @@ Can Hit Timeshift Stone in Minecart:
Sword | Bomb Bag | Distance Activator
# I don't think Whip works when the stone is in a minecart

Early Lake Floria Tricks: (Early Lake Floria - Fence Hop Trick & Practice Sword) | Early Lake Floria - Swordless Rope Floria Trick

Can bypass Boko Base Watch Tower:
Bow | Bomb Bag | Slingshot

Expand Down

0 comments on commit 8d93861

Please sign in to comment.