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

v6: Mitigate Generation Problems

This commit is contained in:
N00byKing 2022-01-25 23:17:22 +01:00 committed by Fabian Dill
parent c2be70b61d
commit 954d2e64ef
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/v6/Options.py
View File

@ -4,7 +4,7 @@ from Options import Option, DeathLink, Range
class DoorCost(Range): class DoorCost(Range):
"""Amount of Trinkets required to enter Areas. Set to 0 to disable artificial locks.""" """Amount of Trinkets required to enter Areas. Set to 0 to disable artificial locks."""
range_start = 0 range_start = 0
range_end = 5 range_end = 3
default = 3 default = 3
class DeathLinkAmnesty(Range): class DeathLinkAmnesty(Range):

16
worlds/v6/Rules.py
View File

@ -2,18 +2,13 @@ import typing
from ..generic.Rules import add_rule from ..generic.Rules import add_rule
from .Regions import connect_regions from .Regions import connect_regions
def _has_trinket_range(state,player,start,end): def _has_trinket_range(state,player,start,end) -> bool:
for i in range(start+1,end+1): for i in range(start,end):
if (not state.has("Trinket " + str(i).zfill(2), player)): if (not state.has("Trinket " + str(i+1).zfill(2), player)):
return False return False
return True return True
def create_npctrinket_rules(world,location,player):
add_rule(location, lambda state: state.can_reach("Laboratory",'Region',player) or
state.can_reach("Space Station 2",'Region',player))
def set_rules(world,player): def set_rules(world,player):
if (world.DoorCost[player].value == 0): pass
connect_regions(world, player, "Menu", "Laboratory", lambda state: _has_trinket_range(state,player,0,world.DoorCost[player].value)) connect_regions(world, player, "Menu", "Laboratory", lambda state: _has_trinket_range(state,player,0,world.DoorCost[player].value))
connect_regions(world, player, "Menu", "The Tower", lambda state: _has_trinket_range(state,player,world.DoorCost[player].value,world.DoorCost[player].value*2)) connect_regions(world, player, "Menu", "The Tower", lambda state: _has_trinket_range(state,player,world.DoorCost[player].value,world.DoorCost[player].value*2))
connect_regions(world, player, "Menu", "Space Station 2", lambda state: _has_trinket_range(state,player,world.DoorCost[player].value*2,world.DoorCost[player].value*3)) connect_regions(world, player, "Menu", "Space Station 2", lambda state: _has_trinket_range(state,player,world.DoorCost[player].value*2,world.DoorCost[player].value*3))
@ -25,10 +20,13 @@ def set_rules(world,player):
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))
#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("Space Station 2",'Region',player))
connect_regions(world, player, "Laboratory", "Menu", lambda state: True) connect_regions(world, player, "Laboratory", "Menu", lambda state: True)
connect_regions(world, player, "The Tower", "Menu", lambda state: True) connect_regions(world, player, "The Tower", "Menu", lambda state: True)
connect_regions(world, player, "Space Station 2", "Menu", lambda state: True) connect_regions(world, player, "Space Station 2", "Menu", lambda state: True)
connect_regions(world, player, "Warp Zone", "Menu", lambda state: True) connect_regions(world, player, "Warp Zone", "Menu", lambda state: True)
create_npctrinket_rules(world,world.get_location("NPC Trinket",player),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)

4
worlds/v6/__init__.py
View File

@ -32,9 +32,7 @@ class V6World(World):
set_rules(self.world,self.player) set_rules(self.world,self.player)
def create_item(self, name: str) -> Item: def create_item(self, name: str) -> Item:
item_id = item_table[name] return V6Item(name, True, item_table[name], self.player)
item = V6Item(name, True, item_id, self.player)
return item
def generate_basic(self): def generate_basic(self):
self.world.itempool += [self.create_item(name) for name in self.item_names] self.world.itempool += [self.create_item(name) for name in self.item_names]