monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V6: fix area cost always referencing last area cost, instead of current index (#348) 

* V6: fix area cost always referencing last area cost, instead of current index
* V6: autoformat Rules.py
* V6: correct a location name for rule application
This commit is contained in:
Fabian Dill 2022-03-26 10:16:28 +01:00 committed by GitHub
parent 3b128c8512
commit 3c2933d587
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
worlds/v6/Rules.py
View File

@ -5,7 +5,7 @@ from .Regions import connect_regions, v6areas
def _has_trinket_range(state, player, start, end) -> bool: def _has_trinket_range(state, player, start, end) -> bool:
for i in range(start, end): for i in range(start, end):
if (not state.has("Trinket " + str(i+1).zfill(2), player)): if not state.has("Trinket " + str(i + 1).zfill(2), player):
return False return False
return True return True
@ -22,7 +22,9 @@ def set_rules(world, player, area_connections: typing.Dict[int, int], area_cost_
area_cost_map.update({0: 0}) area_cost_map.update({0: 0})
for i in range(1, 5): for i in range(1, 5):
connect_regions(world, player, "Menu", v6areas[area_connections[i]-1], lambda state: _has_trinket_range(state,player,world.DoorCost[player].value*(area_cost_map[i]-1), connect_regions(world, player, "Menu", v6areas[area_connections[i] - 1],
lambda state, i=i: _has_trinket_range(state, player,
world.DoorCost[player].value * (area_cost_map[i] - 1),
world.DoorCost[player].value * area_cost_map[i])) world.DoorCost[player].value * area_cost_map[i]))
# Special Rule for V # Special Rule for V
@ -32,7 +34,8 @@ def set_rules(world, player, area_connections: typing.Dict[int, int], area_cost_
state.can_reach("Warp Zone", 'Region', player)) state.can_reach("Warp Zone", 'Region', player))
# Special Rule for NPC Trinket # Special Rule for NPC Trinket
add_rule(world.get_location("V",player), lambda state : state.can_reach("Laboratory",'Region',player) or add_rule(world.get_location("NPC Trinket", player),
lambda state: state.can_reach("Laboratory", 'Region', player) or
(state.can_reach("The Tower", 'Region', player) and (state.can_reach("The Tower", 'Region', player) and
state.can_reach("Space Station 2", 'Region', player) and state.can_reach("Space Station 2", 'Region', player) and
state.can_reach("Warp Zone", 'Region', player))) state.can_reach("Warp Zone", 'Region', player)))