diff --git a/Generate.py b/Generate.py index 8e44968d..e7876791 100644 --- a/Generate.py +++ b/Generate.py @@ -19,10 +19,8 @@ from worlds.alttp.EntranceRandomizer import parse_arguments from Main import main as ERmain from Main import get_seed, seeddigits import Options -from worlds.alttp.Items import item_table from worlds.alttp import Bosses from worlds.alttp.Text import TextTable -from worlds.alttp.Regions import location_table, key_drop_data from worlds.AutoWorld import AutoWorldRegister categories = set(AutoWorldRegister.world_types) diff --git a/worlds/factorio/Technologies.py b/worlds/factorio/Technologies.py index bacb1d0f..f6c69a4e 100644 --- a/worlds/factorio/Technologies.py +++ b/worlds/factorio/Technologies.py @@ -185,6 +185,10 @@ all_product_sources: Dict[str, Set[Recipe]] = {"character": set()} raw_recipes["uranium-ore"] = {"ingredients": {"sulfuric-acid": 1}, "products": {"uranium-ore": 1}, "category": "mining", "energy": 2} +# raw_recipes["iron-ore"] = {"ingredients": {}, "products": {"iron-ore": 1}, "category": "mining", "energy": 2} +# raw_recipes["copper-ore"] = {"ingredients": {}, "products": {"copper-ore": 1}, "category": "mining", "energy": 2} +# raw_recipes["coal-ore"] = {"ingredients": {}, "products": {"coal": 1}, "category": "mining", "energy": 2} + for recipe_name, recipe_data in raw_recipes.items(): # example: # "accumulator":{"ingredients":{"iron-plate":2,"battery":5},"products":{"accumulator":1},"category":"crafting"} @@ -473,6 +477,8 @@ def get_science_pack_pools() -> Dict[str, Set[str]]: if (science_pack != "automation-science-pack" or not recipe.recursive_unlocking_technologies) \ and get_estimated_difficulty(recipe) < current_difficulty: current |= set(recipe.products) + if science_pack == "automation-science-pack": + current |= {"iron-ore", "copper-ore", "coal"} current -= already_taken already_taken |= current current_difficulty *= 2