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

Factorio: fix single-player static node placement

This commit is contained in:
Fabian Dill 2021-06-06 16:08:17 +02:00
parent c095c28618
commit c71387ad00
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BaseClasses.py
View File

@ -1193,6 +1193,14 @@ class Location():
return True return True
return False return False
def place_locked_item(self, item: Item):
if self.item:
raise Exception(f"Location {self} already filled.")
self.item = item
self.event = item.advancement
self.item.world = self.parent_region.world
self.locked = True
def __repr__(self): def __repr__(self):
return self.__str__() return self.__str__()
@ -1497,8 +1505,6 @@ class Spoiler(object):
elif player in self.world.factorio_player_ids: elif player in self.world.factorio_player_ids:
for f_option in Options.factorio_options: for f_option in Options.factorio_options:
logging.info(f_option)
logging.info(getattr(self.world, f_option))
res = getattr(self.world, f_option)[player] res = getattr(self.world, f_option)[player]
outfile.write(f'{f_option+":":33}{bool_to_text(res) if type(res) == Options.Toggle else res.get_option_name()}\n') outfile.write(f'{f_option+":":33}{bool_to_text(res) if type(res) == Options.Toggle else res.get_option_name()}\n')

5
worlds/factorio/__init__.py
View File

@ -12,10 +12,7 @@ def gen_factorio(world: MultiWorld, player: int):
tech_id, player) tech_id, player)
tech_item.game = "Factorio" tech_item.game = "Factorio"
if tech_name in static_nodes: if tech_name in static_nodes:
loc = world.get_location(tech_name, player) world.get_location(tech_name, player).place_locked_item(tech_item)
loc.item = tech_item
loc.locked = True
loc.event = tech_item.advancement
else: else:
world.itempool.append(tech_item) world.itempool.append(tech_item)
world.custom_data[player]["custom_technologies"] = custom_technologies = set_custom_technologies(world, player) world.custom_data[player]["custom_technologies"] = custom_technologies = set_custom_technologies(world, player)