From 91b60f2e2177dace97ab63bf3fb23d5b20fb98b3 Mon Sep 17 00:00:00 2001 From: kindasneaki Date: Sat, 29 Apr 2023 01:07:42 -0600 Subject: [PATCH] [RoR2] Classic mode logic fix (#1775) --- worlds/ror2/Rules.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/worlds/ror2/Rules.py b/worlds/ror2/Rules.py index 02f6e8b2..90b72e81 100644 --- a/worlds/ror2/Rules.py +++ b/worlds/ror2/Rules.py @@ -67,20 +67,20 @@ def set_rules(multiworld: MultiWorld, player: int) -> None: if multiworld.goal[player] == "classic": # classic mode if divisions: - for i in range(1, divisions): # since divisions is the floor of total_locations / 25 - event_loc = multiworld.get_location(f"Pickup{i * event_location_step}", player) - set_rule(event_loc, - lambda state, i=i: state.can_reach(f"ItemPickup{i * event_location_step - 1}", "Location", player)) - for n in range(i * event_location_step, (i + 1) * event_location_step): # we want to create a rule for each of the 25 locations per division + for i in range(1, divisions + 1): # since divisions is the floor of total_locations / 25 + if i * event_location_step != total_locations: + event_loc = multiworld.get_location(f"Pickup{i * event_location_step}", player) + set_rule(event_loc, + lambda state, i=i: state.can_reach(f"ItemPickup{i * event_location_step - 1}", "Location", player)) + for n in range(i * event_location_step, (i + 1) * event_location_step + 1): # we want to create a rule for each of the 25 locations per division + if n > total_locations: + break if n == i * event_location_step: set_rule(multiworld.get_location(f"ItemPickup{n}", player), lambda state, event_item=event_loc.item.name: state.has(event_item, player)) else: set_rule(multiworld.get_location(f"ItemPickup{n}", player), lambda state, n=n: state.can_reach(f"ItemPickup{n - 1}", "Location", player)) - for i in range(divisions * event_location_step, total_locations+1): - set_rule(multiworld.get_location(f"ItemPickup{i}", player), - lambda state, i=i: state.can_reach(f"ItemPickup{i - 1}", "Location", player)) set_rule(multiworld.get_location("Victory", player), lambda state: state.can_reach(f"ItemPickup{total_locations}", "Location", player)) if total_revivals or multiworld.start_with_revive[player].value: