Skip to content

Commit

Permalink
Add coin blocks to LocationName
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesbrq
jamesbrq committed May 2, 2024
1 parent 6eb4b53 commit 6883b98
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 26 deletions.
22 changes: 22 additions & 0 deletions worlds/mlss/Names/LocationName.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,3 +534,25 @@ class LocationName:
BadgeShopMomPiranhaFlag3 = "Badge Shop Mom Piranha Flag 3"
HarhallsPants = "Harhall's Pants"
HoohooMountainBaseBooStatueCaveCoinBlock1 = "Hoohoo Mountain Base Boo Statue Cave Coin Block 1"
HoohooMountainBaseBooStatueCaveCoinBlock2 = "Hoohoo Mountain Base Boo Statue Cave Coin Block 2"
HoohooMountainBaseBooStatueCaveCoinBlock3 = "Hoohoo Mountain Base Boo Statue Cave Coin Block 3"
BeanbeanOutskirtsNWCoinBlock = "Beanbean Outskirts NW Coin Block"
BeanbeanOutskirtsSRoom1CoinBlock = "Beanbean Outskirts S Room 1 Coin Block"
BeanbeanOutskirtsSRoom2CoinBlock = "Beanbean Outskirts S Room 2 Coin Block"
ChateauPoppleRoomCoinBlock1 = "Chateau Popple Room Coin Block 1"
ChateauPoppleRoomCoinBlock2 = "Chateau Popple Room Coin Block 2"
ChucklehuckWoodsCaveRoom1CoinBlock = "Chuck Woods Cave Room 1 Coin Block"
ChucklehuckWoodsCaveRoom2CoinBlock = "Chuck Woods Cave Room 2 Coin Block"
ChucklehuckWoodsCaveRoom3CoinBlock = "Chuck Woods Cave Room 3 Coin Block"
ChucklehuckWoodsPipe5RoomCoinBlock = "Chucklehuck Woods Pipe 5 Room Coin Block"
ChucklehuckWoodsRoom7CoinBlock = "Chucklehuck Woods Room 7 Coin Block"
ChucklehuckWoodsAfterChucklerootCoinBlock = "Chucklehuck Woods After Chuckleroot Coin Block"
ChucklehuckWoodsKoopaRoomCoinBlock = "Chucklehuck Woods Koopa Room Coin Block"
ChucklehuckWoodsWinkleAreaCaveCoinBlock = "Chucklehuck Woods Winkle Area Cave Coin Block"
SewersPrisonRoomCoinBlock = "Sewers Prison Room Coin Block"
TeeheeValleyPastUltraHammerRocksCoinBlock = "Teehee Valley Past Ultra Hammer Rocks Coin Block"
SSChuckolaStorageRoomCoinBlock1 = "S.S. Chuckola Storage Room Coin Block 1"
SSChuckolaStorageRoomCoinBlock2 = "S.S. Chuckola Storage Room Coin Block 2"
GwarharLagoonFirstUnderwaterAreaRoom2CoinBlock = "Gwarhar Lagoon First Underwater Area Room 2 Coin Block"
JokesEndSecondFloorWestRoomCoinBlock = "Joke's End Second Floor West Room Coin Block"
JokesEndNorthofBridgeRoomCoinBlock = "Joke's End North of Bridge Room Coin Block"
52 changes: 26 additions & 26 deletions worlds/mlss/Rules.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,88 +468,88 @@ def set_rules(world: "MLSSWorld", excluded):
lambda state: StateLogic.canCrash(state, world.player) or StateLogic.super(state, world.player),
)
add_rule(
world.multiworld.get_location("Hoohoo Mountain Base Boo Statue Cave Coin Block 2", world.player),
world.multiworld.get_location(LocationName.HoohooMountainBaseBooStatueCaveCoinBlock2, world.player),
lambda state: StateLogic.canCrash(state, world.player) or StateLogic.super(state, world.player),
)
add_rule(
world.multiworld.get_location("Hoohoo Mountain Base Boo Statue Cave Coin Block 3", world.player),
world.multiworld.get_location(LocationName.HoohooMountainBaseBooStatueCaveCoinBlock3, world.player),
lambda state: StateLogic.canCrash(state, world.player) or StateLogic.super(state, world.player),
)
add_rule(
world.multiworld.get_location("Beanbean Outskirts NW Coin Block", world.player),
world.multiworld.get_location(LocationName.BeanbeanOutskirtsNWCoinBlock, world.player),
lambda state: StateLogic.super(state, world.player),
)
add_rule(
world.multiworld.get_location("Beanbean Outskirts S Room 1 Coin Block", world.player),
world.multiworld.get_location(LocationName.BeanbeanOutskirtsSRoom1CoinBlock, world.player),
lambda state: StateLogic.ultra(state, world.player) and StateLogic.thunder(state, world.player),
)
add_rule(
world.multiworld.get_location("Beanbean Outskirts S Room 2 Coin Block", world.player),
world.multiworld.get_location(LocationName.BeanbeanOutskirtsSRoom2CoinBlock, world.player),
lambda state: StateLogic.canCrash(state, world.player),
)
add_rule(
world.multiworld.get_location("Chateau Popple Room Coin Block 1", world.player),
world.multiworld.get_location(LocationName.ChateauPoppleRoomCoinBlock1, world.player),
lambda state: StateLogic.brooch(state, world.player),
)
add_rule(
world.multiworld.get_location("Chateau Popple Room Coin Block 2", world.player),
world.multiworld.get_location(LocationName.ChateauPoppleRoomCoinBlock2, world.player),
lambda state: StateLogic.brooch(state, world.player),
)
add_rule(
world.multiworld.get_location("Chucklehuck Woods Cave Room 1 Coin Block", world.player),
world.multiworld.get_location(LocationName.ChucklehuckWoodsCaveRoom1CoinBlock, world.player),
lambda state: StateLogic.brooch(state, world.player),
)
add_rule(
world.multiworld.get_location("Chucklehuck Woods Cave Room 2 Coin Block", world.player),
world.multiworld.get_location(LocationName.ChucklehuckWoodsCaveRoom2CoinBlock, world.player),
lambda state: StateLogic.brooch(state, world.player),
)
add_rule(
world.multiworld.get_location("Chucklehuck Woods Cave Room 3 Coin Block", world.player),
world.multiworld.get_location(LocationName.ChucklehuckWoodsCaveRoom3CoinBlock, world.player),
lambda state: StateLogic.brooch(state, world.player),
)
add_rule(
world.multiworld.get_location("Chucklehuck Woods Pipe 5 Room Coin Block", world.player),
world.multiworld.get_location(LocationName.ChucklehuckWoodsPipe5RoomCoinBlock, world.player),
lambda state: StateLogic.brooch(state, world.player) and StateLogic.hammers(state, world.player),
)
add_rule(
world.multiworld.get_location("Chucklehuck Woods Room 7 Coin Block", world.player),
world.multiworld.get_location(LocationName.ChucklehuckWoodsRoom7CoinBlock, world.player),
lambda state: StateLogic.brooch(state, world.player) and StateLogic.hammers(state, world.player),
)
add_rule(
world.multiworld.get_location("Chucklehuck Woods After Chuckleroot Coin Block", world.player),
world.multiworld.get_location(LocationName.ChucklehuckWoodsAfterChucklerootCoinBlock, world.player),
lambda state: StateLogic.brooch(state, world.player) and StateLogic.fruits(state, world.player),
)
add_rule(
world.multiworld.get_location("Chucklehuck Woods Koopa Room Coin Block", world.player),
world.multiworld.get_location(LocationName.ChucklehuckWoodsKoopaRoomCoinBlock, world.player),
lambda state: StateLogic.brooch(state, world.player),
)
add_rule(
world.multiworld.get_location("Chucklehuck Woods Winkle Area Cave Coin Block", world.player),
world.multiworld.get_location(LocationName.ChucklehuckWoodsWinkleAreaCaveCoinBlock, world.player),
lambda state: StateLogic.brooch(state, world.player) and StateLogic.canDash(state, world.player),
)
add_rule(
world.multiworld.get_location("Sewers Prison Room Coin Block", world.player),
world.multiworld.get_location(LocationName.SewersPrisonRoomCoinBlock, world.player),
lambda state: StateLogic.rose(state, world.player),
)
add_rule(
world.multiworld.get_location("Teehee Valley Past Ultra Hammer Rocks Coin Block", world.player),
world.multiworld.get_location(LocationName.TeeheeValleyPastUltraHammerRocksCoinBlock, world.player),
lambda state: StateLogic.ultra(state, world.player),
)
add_rule(
world.multiworld.get_location("S.S. Chuckola Storage Room Coin Block 1", world.player),
world.multiworld.get_location(LocationName.SSChuckolaStorageRoomCoinBlock1, world.player),
lambda state: StateLogic.super(state, world.player) or StateLogic.canDash(state, world.player),
)
add_rule(
world.multiworld.get_location("Gwarhar Lagoon First Underwater Area Room 2 Coin Block", world.player),
lambda state: StateLogic.canDash(state, world.player)
and (StateLogic.membership(state, world.player) or StateLogic.surfable(state, world.player)),
world.multiworld.get_location(LocationName.SSChuckolaStorageRoomCoinBlock2, world.player),
lambda state: StateLogic.super(state, world.player) or StateLogic.canDash(state, world.player),
)
add_rule(
world.multiworld.get_location("S.S. Chuckola Storage Room Coin Block 2", world.player),
lambda state: StateLogic.super(state, world.player) or StateLogic.canDash(state, world.player),
world.multiworld.get_location(LocationName.GwarharLagoonFirstUnderwaterAreaRoom2CoinBlock, world.player),
lambda state: StateLogic.canDash(state, world.player)
and (StateLogic.membership(state, world.player) or StateLogic.surfable(state, world.player)),
)
add_rule(
world.multiworld.get_location("Joke's End Second Floor West Room Coin Block", world.player),
world.multiworld.get_location(LocationName.JokesEndSecondFloorWestRoomCoinBlock, world.player),
lambda state: StateLogic.ultra(state, world.player)
and StateLogic.fire(state, world.player)
and (
Expand All @@ -558,14 +558,14 @@ def set_rules(world: "MLSSWorld", excluded):
),
)
add_rule(
world.multiworld.get_location("Joke's End North of Bridge Room Coin Block", world.player),
world.multiworld.get_location(LocationName.JokesEndNorthofBridgeRoomCoinBlock, world.player),
lambda state: StateLogic.ultra(state, world.player)
and StateLogic.fire(state, world.player)
and StateLogic.canDig(state, world.player)
and (StateLogic.membership(state, world.player) or StateLogic.canMini(state, world.player)),
)
if not world.options.difficult_logic:
add_rule(
world.multiworld.get_location("Joke's End North of Bridge Room Coin Block", world.player),
world.multiworld.get_location(LocationName.JokesEndNorthofBridgeRoomCoinBlock, world.player),
lambda state: StateLogic.canCrash(state, world.player),
)

0 comments on commit 6883b98

Please sign in to comment.