From b950af09a6368a9923ab0caf77b96ea4e6deac84 Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Mon, 24 Apr 2023 01:58:26 +0200
Subject: [PATCH] Factorio: remove tech_tree_layout_prerequisites from core

---
 BaseClasses.py              | 1 -
 worlds/factorio/Mod.py      | 2 +-
 worlds/factorio/Shapes.py   | 2 +-
 worlds/factorio/__init__.py | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 35761bc2..68407ee0 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -135,7 +135,6 @@ class MultiWorld():
             def set_player_attr(attr, val):
                 self.__dict__.setdefault(attr, {})[player] = val
 
-            set_player_attr('tech_tree_layout_prerequisites', {})
             set_player_attr('_region_cache', {})
             set_player_attr('shuffle', "vanilla")
             set_player_attr('logic', "noglitches")
diff --git a/worlds/factorio/Mod.py b/worlds/factorio/Mod.py
index 4f1f3fd9..270e7dac 100644
--- a/worlds/factorio/Mod.py
+++ b/worlds/factorio/Mod.py
@@ -120,7 +120,7 @@ def generate_mod(world: "Factorio", output_directory: str):
         "mod_name": mod_name,
         "allowed_science_packs": multiworld.max_science_pack[player].get_allowed_packs(),
         "custom_technologies": multiworld.worlds[player].custom_technologies,
-        "tech_tree_layout_prerequisites": multiworld.tech_tree_layout_prerequisites[player],
+        "tech_tree_layout_prerequisites": world.tech_tree_layout_prerequisites,
         "slot_name": multiworld.player_name[player], "seed_name": multiworld.seed_name,
         "slot_player": player,
         "starting_items": multiworld.starting_items[player], "recipes": recipes,
diff --git a/worlds/factorio/Shapes.py b/worlds/factorio/Shapes.py
index 84bcb06c..d40871f7 100644
--- a/worlds/factorio/Shapes.py
+++ b/worlds/factorio/Shapes.py
@@ -247,5 +247,5 @@ def get_shapes(factorio_world: "Factorio") -> Dict["FactorioScienceLocation", Se
     else:
         raise NotImplementedError(f"Layout {layout} is not implemented.")
 
-    world.tech_tree_layout_prerequisites[player] = prerequisites
+    factorio_world.tech_tree_layout_prerequisites = prerequisites
     return prerequisites
diff --git a/worlds/factorio/__init__.py b/worlds/factorio/__init__.py
index 269ec455..10dda905 100644
--- a/worlds/factorio/__init__.py
+++ b/worlds/factorio/__init__.py
@@ -69,6 +69,7 @@ class Factorio(World):
     required_client_version = (0, 4, 0)
 
     ordered_science_packs: typing.List[str] = MaxSciencePack.get_ordered_science_packs()
+    tech_tree_layout_prerequisites: typing.Dict[FactorioScienceLocation, typing.Set[FactorioScienceLocation]]
     tech_mix: int = 0
     skip_silo: bool = False
     science_locations: typing.List[FactorioScienceLocation]
@@ -78,6 +79,7 @@ class Factorio(World):
         self.advancement_technologies = set()
         self.custom_recipes = {}
         self.science_locations = []
+        self.tech_tree_layout_prerequisites = {}
 
     generate_output = generate_mod