Skip to content

Commit

Permalink
s
Browse files Browse the repository at this point in the history
  • Loading branch information
@SnolidIce
SnolidIce committed Apr 16, 2024
1 parent 4a1b653 commit fe6e671
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions worlds/legobatman1/Items.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class LegoBatman1Item(Item):
"Flight of the Bat": LegoBatman1ItemData("Levels", 45035996254, ItemClassification.progression),
"In the Dark Night": LegoBatman1ItemData("Levels", 45035996255, ItemClassification.progression),
"To the Top of the Tower": LegoBatman1ItemData("Levels", 45035996256, ItemClassification.progression),
"The Riddler Makes a Withdrawl": LegoBatman1ItemData("Levels", 45035996257, ItemClassification.progression),
"The Riddler Makes a Withdrawal": LegoBatman1ItemData("Levels", 45035996257, ItemClassification.progression),
"On the Rocks": LegoBatman1ItemData("Levels", 45035996258, ItemClassification.progression),
"Green Fingers": LegoBatman1ItemData("Levels", 45035996259, ItemClassification.progression),
"An Enterprising Theft": LegoBatman1ItemData("Levels", 45035996260, ItemClassification.progression),
Expand All @@ -92,8 +92,8 @@ class LegoBatman1Item(Item):
"Stealing the Show": LegoBatman1ItemData("Levels", 45035996263, ItemClassification.progression),
"Harboring a Grudge": LegoBatman1ItemData("Levels", 45035996264, ItemClassification.progression),
"A Daring Rescue": LegoBatman1ItemData("Levels", 45035996265, ItemClassification.progression),
"Artic World": LegoBatman1ItemData("Levels", 45035996266, ItemClassification.progression),
"A Surpise for the Commissioner": LegoBatman1ItemData("Levels", 45035996267, ItemClassification.progression),
"Arctic World": LegoBatman1ItemData("Levels", 45035996266, ItemClassification.progression),
"A Surprise for the Commissioner": LegoBatman1ItemData("Levels", 45035996267, ItemClassification.progression),
"Biplane Blast": LegoBatman1ItemData("Levels", 45035996268, ItemClassification.progression),
"The Joker's Masterpiece": LegoBatman1ItemData("Levels", 45035996269, ItemClassification.progression),
"The Lure of the Night": LegoBatman1ItemData("Levels", 45035996270, ItemClassification.progression),
Expand Down
2 changes: 1 addition & 1 deletion worlds/legobatman1/Locations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ def get_locations_by_category(category: str) -> Dict[str, LegoBatman1LocationDat
"PCP Hero #4 - Room 1, Double Jump from vending machine and blow up silver objects": LegoBatman1LocationData("Zoo's Company", 45035996097),
"PCP Hero #4 - Room 2, Build totem then grow plant": LegoBatman1LocationData("Zoo's Company", 45035996098),
"PCP Hero #4 - Room 2, Break silver rocks in lion enclosure": LegoBatman1LocationData("Zoo's Company", 45035996100),
"PCP Hero #4 - Room 2, Top right cornor of elephant enclosure": LegoBatman1LocationData("Zoo's Company", 45035996101),
"PCP Hero #4 - Room 2, Top right corner of elephant enclosure": LegoBatman1LocationData("Zoo's Company", 45035996101),
"PCP Hero #4 - Room 3, Jump on big lily pad behind boat": LegoBatman1LocationData("Zoo's Company", 45035996103),
"PCP Hero #4 - Room 3, Freeze water near waterfall and jump up": LegoBatman1LocationData("Zoo's Company", 45035996105),
"PCP Hero #4 - Room 3, Use strength thing near batman suit": LegoBatman1LocationData("Zoo's Company", 45035996104),
Expand Down
14 changes: 7 additions & 7 deletions worlds/legobatman1/Rules.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,14 @@ def set_rules(multiworld: MultiWorld, player: int, bool):

trrv1_red_brick = multiworld.get_location("TRR Villian #1 - Room 2, Climb magnet wall then double jump and bring down green sign, build it and bring it to crusher in sub room", player)
if self.options.story_pickups:
trrv1_red_brick.access_rule = lambda state: state.has_all(player, "The Ridler Makes a Withdrawal")
trrv1_red_brick.access_rule = lambda state: state.has_all(player, "The Riddler Makes a Withdrawal")
else if self.options.glitched:
trrv1_red_brick.access_rule = lambda state: state.has_all(player, "The Ridler Makes a Withdrawal", "Glide Suit", "Slam", has_batarang)
trrv1_red_brick.access_rule = lambda state: state.has_all(player, "The Riddler Makes a Withdrawal", "Glide Suit", "Slam", has_batarang)
else:
trrv1_red_brick.access_rule = lambda state: state.has_all(player, "The Ridler Makes a Withdrawal", "Magnet Suit", has_batarang)
trrv1_red_brick.access_rule = lambda state: state.has_all(player, "The Riddler Makes a Withdrawal", "Magnet Suit", has_batarang)

multiworld.get_location("Status Screen - The Ridler Makes a Withdrawal True Status", player).access_rule = lambda state: state.has_all(player, "The Ridler Makes a Withdrawal")
multiworld.get_location("Status Screen - The Ridler Makes a Withdrawal Completed", player).access_rule = lambda state: state.has_all(player, "The Ridler Makes a Withdrawal")
multiworld.get_location("Status Screen - The Riddler Makes a Withdrawal True Status", player).access_rule = lambda state: state.has_all(player, "The Ridler Makes a Withdrawal")
multiworld.get_location("Status Screen - The Riddler Makes a Withdrawal Completed", player).access_rule = lambda state: state.has_all(player, "The Ridler Makes a Withdrawal")

trrv2_red_brick = multiworld.get_location("TRR Villian #2 - Room 2, Break silver handle then go inside, break object, build switch, go across and build object", player)
if self.options.story_pickups:
Expand Down Expand Up @@ -340,8 +340,8 @@ def set_rules(multiworld: MultiWorld, player: int, bool):
multiworld.get_location("Status Screen - A Daring Rescue True Status", player).access_rule = lambda state: state.has_all(player, "A Daring Rescue")
multiworld.get_location("Status Screen - A Daring Rescue Completed", player).access_rule = lambda state: state.has_all(player, "A Daring Rescue")

multiworld.get_location("Status Screen - Arctic World True Status", player).access_rule = lambda state: state.has_all(player, "Breaking Blocks")
multiworld.get_location("Status Screen - Arctic World Completed", player).access_rule = lambda state: state.has_all(player, "Breaking Blocks")
multiworld.get_location("Status Screen - Arctic World True Status", player).access_rule = lambda state: state.has_all(player, "Arctic World")
multiworld.get_location("Status Screen - Arctic World Completed", player).access_rule = lambda state: state.has_all(player, "Arctic World")

multiworld.get_location("Status Screen - A Surprise for the Commissioner True Status", player).access_rule = lambda state: state.has_all(player, "A Surprise for the Commissioner")
multiworld.get_location("Status Screen - A Surprise for the Commissioner Completed", player).access_rule = lambda state: state.has_all(player, "A Surprise for the Commissioner")
Expand Down

0 comments on commit fe6e671

Please sign in to comment.