morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
worlds/v6/Rules.py
View File

@@ -3,9 +3,9 @@ from ..generic.Rules import add_rule
from .Regions import connect_regions, v6areas
def _has_trinket_range(state,player,start,end) -> bool:
for i in range(start,end):
if (not state.has("Trinket " + str(i+1).zfill(2), player)):
def _has_trinket_range(state, player, start, end) -> bool:
for i in range(start, end):
if not state.has("Trinket " + str(i + 1).zfill(2), player):
return False
return True
@@ -14,27 +14,30 @@ def set_rules(world, player, area_connections: typing.Dict[int, int], area_cost_
areashuffle = list(range(len(v6areas)))
if world.AreaRandomizer[player].value:
world.random.shuffle(areashuffle)
area_connections.update({(index+1): (value+1) for index, value in enumerate(areashuffle)})
area_connections.update({0:0})
area_connections.update({(index + 1): (value + 1) for index, value in enumerate(areashuffle)})
area_connections.update({0: 0})
if world.AreaCostRandomizer[player].value:
world.random.shuffle(areashuffle)
area_cost_map.update({(index+1): (value+1) for index, value in enumerate(areashuffle)})
area_cost_map.update({0:0})
area_cost_map.update({(index + 1): (value + 1) for index, value in enumerate(areashuffle)})
area_cost_map.update({0: 0})
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),
world.DoorCost[player].value*area_cost_map[i]))
for i in range(1, 5):
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]))
#Special Rule for V
add_rule(world.get_location("V",player), lambda state : state.can_reach("Laboratory",'Region',player) and
state.can_reach("The Tower",'Region',player) and
state.can_reach("Space Station 2",'Region',player) and
state.can_reach("Warp Zone",'Region',player))
# Special Rule for V
add_rule(world.get_location("V", player), lambda state: state.can_reach("Laboratory", 'Region', player) and
state.can_reach("The Tower", 'Region', player) and
state.can_reach("Space Station 2", 'Region', player) and
state.can_reach("Warp Zone", 'Region', player))
#Special Rule for NPC Trinket
add_rule(world.get_location("V",player), lambda state : state.can_reach("Laboratory",'Region',player) or
( state.can_reach("The Tower",'Region',player) and
state.can_reach("Space Station 2",'Region',player) and
state.can_reach("Warp Zone",'Region',player) ))
# Special Rule for NPC Trinket
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("Space Station 2", 'Region', player) and
state.can_reach("Warp Zone", 'Region', player)))
world.completion_condition[player] = lambda state: state.can_reach("V",'Location',player)
world.completion_condition[player] = lambda state: state.can_reach("V", 'Location', player)