Merge branch 'experimental' into main

cybersyn/prototypes/tech.lua

@@ -1,8 +1,8 @@
 --By Mami
-combinator_recipe = flib.copy_prototype(data.raw["recipe"]["train-stop"], COMBINATOR_NAME)
+combinator_recipe = flib.copy_prototype(data.raw["recipe"]["arithmetic-combinator"], COMBINATOR_NAME)
 combinator_recipe.ingredients = {
-	{"copper-cable", 5},
-	{"advanced-circuit", 5},
+	{"copper-cable", 20},
+	{"electronic-circuit", 10},
 }
 combinator_recipe.enabled = false
 if (mods["nullius"]) then
@@ -19,38 +19,27 @@ if (mods["nullius"]) then
 	}
 end
 
-cybersyn_tech = {
-	type = "technology",
-	name = "cybersyn-train-network",
-	icon = "__cybersyn__/graphics/icons/tech.png",
-	icon_size = 256,
-	--icon_mipmaps = 4,
-	prerequisites = {
-		"automated-rail-transportation",
-		"circuit-network",
-		"advanced-electronics"
-	},
-	effects = {
-		{
-			type = "unlock-recipe",
-			recipe = COMBINATOR_NAME
-		},
-	},
-	unit = {
-		ingredients = {
-			{"automation-science-pack", 1},
-			{"logistic-science-pack", 1}
-		},
-		count = 250,
-		time = 30
-	},
-	order = "c-g-c"
+
+cybersyn_tech = flib.copy_prototype(data.raw["technology"]["automated-rail-transportation"], "cybersyn-train-network")
+
+cybersyn_tech.icon = "__cybersyn__/graphics/icons/tech.png"
+cybersyn_tech.icon_size = 256
+cybersyn_tech.prerequisites = {
+	"automated-rail-transportation",
+	"circuit-network",
 }
+cybersyn_tech.effects = {
+	{
+		type = "unlock-recipe",
+		recipe = COMBINATOR_NAME
+	},
+}
+cybersyn_tech.unit.count = 3*cybersyn_tech.unit.count
+cybersyn_tech.order = "c-g-c"
 
 if (mods["nullius"]) then
 	-- Enable technology
 	cybersyn_tech.order = "nullius-" .. (cybersyn_tech.order or "")
-	-- Use the same costs and requirements as for LTN
 	cybersyn_tech.unit = {
 		count = 100,
 		ingredients = {
@@ -61,4 +50,4 @@ if (mods["nullius"]) then
 	}
 	cybersyn_tech.prerequisites = { "nullius-checkpoint-optimization", "nullius-traffic-control" }
 	cybersyn_tech.ignore_tech_tech_cost_multiplier = true
-end
+end