Bumper Stickers - logic fixes for "off-by-one" errors

worlds/bumpstik/__init__.py

@@ -116,12 +116,12 @@ def create_items(self):
         self.multiworld.itempool += item_pool
 
     def set_rules(self):
-        for x in range(1, 32):
-            self.multiworld.get_location(f"Treasure Bumper {x + 1}", self.player).access_rule = \
-                lambda state, x = x: state.has("Treasure Bumper", self.player, x)
-        for x in range(1, 5):
-            self.multiworld.get_location(f"Bonus Booster {x + 1}", self.player).access_rule = \
-                lambda state, x = x: state.has("Booster Bumper", self.player, x)
+        for treasure_count in range(1, 33):
+            self.multiworld.get_location(f"Treasure Bumper {treasure_count}", self.player).access_rule = \
+                lambda state, treasure_held = treasure_count: state.has("Treasure Bumper", self.player, treasure_held)
+        for booster_count in range(1, 6):
+            self.multiworld.get_location(f"Bonus Booster {booster_count}", self.player).access_rule = \
+                lambda state, booster_held = booster_count: state.has("Booster Bumper", self.player, booster_held)
         self.multiworld.get_location("Level 5 - Cleared all Hazards", self.player).access_rule = \
             lambda state: state.has("Hazard Bumper", self.player, 25)
 

worlds/bumpstik/test/TestLogic.py

@@ -3,36 +3,38 @@
 
 class TestRuleLogic(BumpStikTestBase):
     def testLogic(self):
-        for x in range(1, 33):
-            if x == 32:
+        for treasure_bumpers_held in range(1, 33):
+            if treasure_bumpers_held == 32:
                 self.assertFalse(self.can_reach_location("Level 5 - Cleared all Hazards"))
 
             self.collect(self.get_item_by_name("Treasure Bumper"))
-            if x % 8 == 0:
-                bb_count = round(x / 8)
+            if treasure_bumpers_held % 8 == 0:
+                bb_count = round(treasure_bumpers_held / 8)
 
                 if bb_count < 4:
-                    self.assertFalse(self.can_reach_location(f"Treasure Bumper {x + 1}"))
+                    self.assertFalse(self.can_reach_location(f"Treasure Bumper {treasure_bumpers_held + 1}"))
+                    # Can't reach Treasure Bumper 9 check until level 2 is unlocked, etc.
+                    # But we don't have enough Treasure Bumpers to reach this check anyway??
                 elif bb_count == 4:
                     bb_count += 1
+                    # Level 4 has two new Bonus Booster checks; need to check both
 
-                for y in range(self.count("Booster Bumper"), bb_count):
-                    self.assertTrue(self.can_reach_location(f"Bonus Booster {y + 1}"),
-                                    f"BB {y + 1} check not reachable with {self.count('Booster Bumper')} BBs")
-                    if y < 4:
-                        self.assertFalse(self.can_reach_location(f"Bonus Booster {y + 2}"),
-                                         f"BB {y + 2} check reachable with {self.count('Treasure Bumper')} TBs")
-                    self.collect(self.get_item_by_name("Booster Bumper"))
+                for booster_bumpers_held in range(self.count("Booster Bumper"), bb_count + 1):
+                    if booster_bumpers_held > 0:
+                        self.assertTrue(self.can_reach_location(f"Bonus Booster {booster_bumpers_held}"),
+                                    f"Bonus Booster {booster_bumpers_held} check not reachable with {self.count('Booster Bumper')} Booster Bumpers")
+                    if booster_bumpers_held < 5:
+                        self.assertFalse(self.can_reach_location(f"Bonus Booster {booster_bumpers_held + 1}"),
+                                         f"Bonus Booster {booster_bumpers_held + 1} check reachable with {self.count('Treasure Bumper')} Treasure Bumpers and {self.count('Booster Bumper')} Booster Bumpers")
+                    if booster_bumpers_held < bb_count:
+                        self.collect(self.get_item_by_name("Booster Bumper"))
 
-            if x < 31:
-                self.assertFalse(self.can_reach_location(f"Treasure Bumper {x + 2}"))
-            elif x == 31:
-                self.assertFalse(self.can_reach_location("Level 5 - 50,000+ Total Points"))
+            self.assertTrue(self.can_reach_location(f"Treasure Bumper {treasure_bumpers_held}"),
+                            f"Treasure Bumper {treasure_bumpers_held} check not reachable with {self.count('Treasure Bumper')} Treasure Bumpers")
 
-            if x < 32:
-                self.assertTrue(self.can_reach_location(f"Treasure Bumper {x + 1}"),
-                                f"TB {x + 1} check not reachable with {self.count('Treasure Bumper')} TBs")
-            elif x == 32:
+            if treasure_bumpers_held < 32:
+                self.assertFalse(self.can_reach_location(f"Treasure Bumper {treasure_bumpers_held + 1}"))
+            elif treasure_bumpers_held == 32:
                 self.assertTrue(self.can_reach_location("Level 5 - 50,000+ Total Points"))
                 self.assertFalse(self.can_reach_location("Level 5 - Cleared all Hazards"))
                 self.collect(self.get_items_by_name("Hazard Bumper"))