diff --git a/cybersyn/changelog.txt b/cybersyn/changelog.txt index d19acad..8d28481 100644 --- a/cybersyn/changelog.txt +++ b/cybersyn/changelog.txt @@ -2,8 +2,9 @@ Version: 1.1.5 Date: 2022-12-16 Changes: - - Added Nullius compat - Replaced lost train alert with more detailed alerts + - Added Nullius compat + - Added Pyanodon's compat --------------------------------------------------------------------------------------------------- Version: 1.1.4 Date: 2022-12-9 diff --git a/cybersyn/info.json b/cybersyn/info.json index ff96549..c3754a0 100644 --- a/cybersyn/info.json +++ b/cybersyn/info.json @@ -1,6 +1,6 @@ { "name": "cybersyn", - "version": "1.1.4", + "version": "1.1.5", "title": "Project Cybersyn", "author": "Mami", "factorio_version": "1.1", @@ -9,6 +9,8 @@ "base", "flib >= 0.6.0", "? space-exploration >= 0.6.90", - "? miniloader" + "? miniloader", + "? nullius", + "? pypostprocessing" ] } diff --git a/cybersyn/prototypes/item.lua b/cybersyn/prototypes/item.lua index c2bf98d..a14d55a 100644 --- a/cybersyn/prototypes/item.lua +++ b/cybersyn/prototypes/item.lua @@ -3,9 +3,10 @@ combinator_item = flib.copy_prototype(data.raw["item"]["arithmetic-combinator"], combinator_item.icon = "__cybersyn__/graphics/icons/cybernetic-combinator.png" combinator_item.icon_size = 64 combinator_item.icon_mipmaps = 4 -combinator_item.order = data.raw["item"]["decider-combinator"].order.."-b" +combinator_item.subgroup = data.raw["item"]["train-stop"].subgroup +combinator_item.order = data.raw["item"]["train-stop"].order.."-b" combinator_item.place_result = COMBINATOR_NAME -if (mods["nullius"]) then +if mods["nullius"] then -- Enable item in Nullius and place next to the regular train stop combinator_item.order = "nullius-eca" -end \ No newline at end of file +end diff --git a/cybersyn/prototypes/tech.lua b/cybersyn/prototypes/tech.lua index a2776ce..b179b28 100644 --- a/cybersyn/prototypes/tech.lua +++ b/cybersyn/prototypes/tech.lua @@ -5,6 +5,7 @@ combinator_recipe.ingredients = { {"electronic-circuit", 10}, } combinator_recipe.enabled = false +combinator_recipe.subgroup = data.raw["recipe"]["train-stop"].subgroup cybersyn_tech = flib.copy_prototype(data.raw["technology"]["automated-rail-transportation"], "cybersyn-train-network") @@ -20,11 +21,19 @@ cybersyn_tech.effects = { recipe = COMBINATOR_NAME }, } -cybersyn_tech.unit.count = 3*cybersyn_tech.unit.count +cybersyn_tech.unit.ingredients = { + { "automation-science-pack", 1, }, + { "logistic-science-pack", 1, } +} +cybersyn_tech.unit.count = 200 cybersyn_tech.order = "c-g-c" -if (mods["nullius"]) then +if mods["pypostprocessing"] then + cybersyn_tech.unit.ingredients[2] = nil +end + +if mods["nullius"] then -- Enable recipe and place it just after regular station combinator_recipe.order = "nullius-eca" -- In Nullius, most combinators are tiny crafts @@ -36,7 +45,7 @@ if (mods["nullius"]) then {"copper-cable", 10} } -- Enable technology - cybersyn_tech.order = "nullius-" .. (cybersyn_tech.order or "") + cybersyn_tech.order = "nullius-"..cybersyn_tech.order cybersyn_tech.unit = { count = 100, ingredients = { @@ -44,6 +53,6 @@ if (mods["nullius"]) then }, time = 25 } - cybersyn_tech.prerequisites = { "nullius-checkpoint-optimization", "nullius-traffic-control" } + cybersyn_tech.prerequisites = {"nullius-checkpoint-optimization", "nullius-traffic-control"} cybersyn_tech.ignore_tech_tech_cost_multiplier = true end