train-overhaul/data.lua

@@ -1,3 +1,2 @@
-require("__cf-lib__/util")
+require("prototypes/integrations/data")
-
+require("prototypes/compatibility/data")
-require("prototypes/data")

train-overhaul/info.json

@@ -10,13 +10,12 @@
         "base",
         "space-age",
         "cf-lib",
-        "DoubleWagons",
+        "Mini-Trains-Lead-the-Way",
-        "Mini_Trains",
-        "quality-wagon",
         "steamtrain-redux-redux",
-        "wagons-quality-raises-capacity",
+        "DoubleWagons",
+        "elevated-rails-recolor",
+        "quality-wagon",
         "?aai-industry",
-        "?lignumis",
+        "?lignumis"
-        "!Mini-Trains-Lead-the-Way"
     ]
 }

train-overhaul/prototypes/compatibility/lignumis.lua

@@ -3,12 +3,14 @@ local Recipe = require("__cf-lib__/data/Recipe")
 if not mods["lignumis"] then return end
 
 Recipe:new("mini-locomotive")
-    :replaceIngredient("steel-plate", "lumber", 10)
+    :replaceIngredient("steel-plate", 10)
-    :addIngredient("iron-plate", 20)
+    :addIngredient("lumber", 10)
 
 Recipe:new("mini-cargo-wagon")
-    :replaceIngredient("steel-plate", "lumber", 5)
+    :replaceIngredient("steel-plate", 5)
+    :addIngredient("lumber", 5)
 
 Recipe:new("mini-fluid-wagon")
-    :replaceIngredient("steel-plate", "lumber", 5)
+    :replaceIngredient("steel-plate", 5)
+    :addIngredient("lumber", 5)
     :addIngredient("iron-plate", 10)

train-overhaul/prototypes/data.lua

@@ -1,5 +0,0 @@
-require("tier1")
-require("tier2")
-require("tier3")
-
-require("compatibility/data")

train-overhaul/prototypes/integrations/data.lua

@@ -0,0 +1 @@
+require("mini-trains")

train-overhaul/prototypes/integrations/mini-trains.lua

@@ -0,0 +1,29 @@
+local locomotive = data.raw["locomotive"]["mini-locomotive"]
+local cargo_wagon = data.raw["cargo-wagon"]["mini-cargo-wagon"]
+local fluid_wagon = data.raw["fluid-wagon"]["mini-fluid-wagon"]
+
+table.merge(locomotive, {
+    max_power = "230kW",
+    max_speed = 0.35,
+    friction_force = 0.20,
+    braking_force = 1,
+    energy_source = {
+        fuel_inventory_size = 2
+    }
+})
+
+table.merge(cargo_wagon, {
+    max_speed = 0.35,
+    friction_force = 0.1,
+    braking_force = 0.5
+})
+
+table.merge(fluid_wagon, {
+    max_speed = 0.35,
+    friction_force = 0.1,
+    braking_force = 0.5
+})
+
+data.raw.item["mini-locomotive"].stack_size = 10
+data.raw.item["mini-cargo-wagon"].stack_size = 10
+data.raw.item["mini-fluid-wagon"].stack_size = 10

train-overhaul/prototypes/tier1.lua

@@ -1,85 +0,0 @@
-local Recipe = require("__cf-lib__/data/Recipe")
-local Technology = require("__cf-lib__/data/Technology")
-
--- Entities
-
-table.merge(data.raw["locomotive"]["mini-locomotive"], {
-    max_power = "230kW",
-    max_speed = 0.35,
-    friction_force = 0.20,
-    braking_force = 1,
-    energy_source = {
-        fuel_inventory_size = 2
-    }
-})
-
-table.merge(data.raw["cargo-wagon"]["mini-cargo-wagon"], {
-    max_speed = 0.35,
-    friction_force = 0.1,
-    braking_force = 0.5
-})
-
-table.merge(data.raw["fluid-wagon"]["mini-fluid-wagon"], {
-    max_speed = 0.35,
-    friction_force = 0.1,
-    braking_force = 0.5,
-    capacity = 25000
-})
-
-
--- Items
-
-table.assign(data.raw.item["mini-locomotive"], {
-    stack_size = 10,
-    order = "c[rolling-stock]-a[tier1]-a[locomotive]",
-    subgroup = "train-transport"
-})
-table.assign(data.raw.item["mini-cargo-wagon"], {
-    stack_size = 10,
-    order = "c[rolling-stock]-a[tier1]-b[cargo-wagon]",
-    subgroup = "train-transport"
-})
-table.assign(data.raw.item["mini-fluid-wagon"], {
-    stack_size = 10,
-    order = "c[rolling-stock]-a[tier1]-c[fluid-wagon]",
-    subgroup = "train-transport"
-})
-
-
--- Recipes
-
-Recipe:new("mini-locomotive")
-    :replaceIngredient("engine-unit", "iron-gear-wheel", 10)
-
-
--- Technologies
-
-Technology:new("railway")
-    :setPrerequisites({ "logistics", "steel-processing" })
-    :removeIngredient("logistic-science-pack")
-    :removeRecipe("locomotive")
-    :removeRecipe("cargo-wagon")
-    :addRecipe("mini-locomotive")
-    :addRecipe("mini-cargo-wagon")
-    :assign({
-        icon = "__Mini_Trains__/data/icons/tech256.png",
-        icon_size = 256
-    })
-
-Technology:new("automated-rail-transportation")
-    :removeIngredient("logistic-science-pack")
-    :merge({
-        unit = {
-            count = 75
-        }
-    })
-
-Technology:new("fluid-wagon")
-    :removeRecipe("fluid-wagon")
-    :addRecipe("mini-fluid-wagon")
-    :assign({
-        icon = "__Mini_Trains__/data/icons/fluid256.png",
-        icon_size = 256
-    })
-
-data.raw.technology["mini-trains"] = nil

train-overhaul/prototypes/tier2.lua

@@ -1,60 +0,0 @@
-local Recipe = require("__cf-lib__/data/Recipe")
-local Technology = require("__cf-lib__/data/Technology")
-
--- Entities
-
-table.merge(data.raw["locomotive"]["rtc-steam-locomotive"], {
-    weight = 4000,
-    max_power = "690kW",
-    max_speed = 0.8,
-    friction_force = 0.50,
-    braking_force = 10,
-    air_resistance = 0.01
-})
-
-
--- Items
-
-table.assign(data.raw.item["rtc-steam-locomotive-item"], {
-    stack_size = 10,
-    order = "c[rolling-stock]-b[tier2]-a[locomotive]",
-    subgroup = "train-transport"
-})
-table.assign(data.raw["item-with-entity-data"]["cargo-wagon"], {
-    stack_size = 10,
-    order = "c[rolling-stock]-b[tier2]-b[cargo-wagon]",
-    subgroup = "train-transport"
-})
-table.assign(data.raw["item-with-entity-data"]["fluid-wagon"], {
-    stack_size = 10,
-    order = "c[rolling-stock]-b[tier2]-c[fluid-wagon]",
-    subgroup = "train-transport"
-})
-
-
--- Recipes
-
-Recipe:new("rtc-steam-locomotive-recipe")
-    :addIngredient("holmium-plate", 20)
-
-Recipe:new("cargo-wagon")
-    :replaceIngredient("iron-plate", "holmium-plate", 10)
-
-Recipe:new("fluid-wagon")
-    :replaceIngredient("pipe", "holmium-plate", 10)
-
-
--- Technologies
-
-Technology:new("rtc-steam-locomotion-technology")
-    :setPrerequisites({ "electromagnetic-science-pack", "fluid-wagon" })
-    :addRecipe("cargo-wagon")
-    :addRecipe("fluid-wagon")
-    :assign({
-        research_trigger = {
-            type = "craft-item",
-            item = "electromagnetic-science-pack",
-            count = 10
-        }
-    })
-    .prototype.unit = nil

train-overhaul/prototypes/tier3.lua

@@ -1,95 +0,0 @@
-local Recipe = require("__cf-lib__/data/Recipe")
-local Technology = require("__cf-lib__/data/Technology")
-
--- Entities
-
-table.merge(data.raw["locomotive"]["locomotive"], {
-    weight = 4000,
-    max_power = "1150kW",
-    max_speed = 1.25,
-    friction_force = 0.50,
-    braking_force = 15
-})
-
-table.merge(data.raw["cargo-wagon"]["black-cargo-wagon"], {
-    weight = 1500,
-    max_speed = 2,
-    friction_force = 0.5,
-    braking_force = 4,
-    inventory_size = 60
-})
-
-table.merge(data.raw["fluid-wagon"]["black-fluid-wagon"], {
-    weight = 1500,
-    max_speed = 2,
-    friction_force = 0.5,
-    braking_force = 4,
-    capacity = 75000
-})
-
-
--- Items
-
-table.assign(data.raw["item-with-entity-data"]["locomotive"], {
-    stack_size = 10,
-    order = "c[rolling-stock]-c[tier3]-a[locomotive]",
-    subgroup = "train-transport"
-})
-table.assign(data.raw["item-with-entity-data"]["black-cargo-wagon"], {
-    stack_size = 10,
-    order = "c[rolling-stock]-c[tier3]-b[cargo-wagon]",
-    subgroup = "train-transport"
-})
-table.assign(data.raw["item-with-entity-data"]["black-fluid-wagon"], {
-    stack_size = 10,
-    order = "c[rolling-stock]-c[tier3]-c[fluid-wagon]",
-    subgroup = "train-transport"
-})
-
-
--- Recipes
-
-Recipe:new("locomotive")
-    :replaceIngredient("electronic-circuit", "processing-unit")
-    :replaceIngredient("steel-plate", "tungsten-plate")
-    :replaceIngredient("engine-unit", "electric-engine-unit")
-    :addIngredient("holmium-plate", 20)
-    :addIngredient("lithium-plate", 10)
-
-Recipe:new("black-cargo-wagon")
-    :replaceIngredient("iron-plate", "tungsten-plate")
-    :replaceIngredient("iron-gear-wheel", "holmium-plate", 10)
-    :replaceIngredient("cargo-wagon", "carbon-fiber", 10)
-
-Recipe:new("black-fluid-wagon")
-    :replaceIngredient("iron-plate", "tungsten-plate")
-    :replaceIngredient("iron-gear-wheel", "holmium-plate", 10)
-    :replaceIngredient("fluid-wagon", "carbon-fiber", 10)
-    :addIngredient("storage-tank", 2)
-
-
--- Technologies
-
-Technology:new("black-cargo-wagon")
-    :setPrerequisites({ "rtc-steam-locomotion-technology", "cryogenic-science-pack" })
-    :setIngredients({
-        "automation-science-pack",
-        "logistic-science-pack",
-        "chemical-science-pack",
-        "utility-science-pack",
-        "production-science-pack",
-        "space-science-pack",
-        "metallurgic-science-pack",
-        "electromagnetic-science-pack",
-        "cryogenic-science-pack"
-    })
-    :addRecipe("black-fluid-wagon")
-    :addRecipe("locomotive")
-    :merge({
-        unit = {
-            count = 2000,
-            time = 60
-        }
-    })
-
-data.raw.technology["black-fluid-wagon"] = nil

train-overhaul/settings-updates.lua

@@ -1,6 +1,21 @@
 require("__cf-lib__/util")
 
-table.assign(data.raw["bool-setting"]["double-cargo-capacity"], {
+table.assign(data.raw["bool-setting"]["mtlw-add-mini-to-regular"], {
+    hidden = true,
+    force_value = true
+})
+
+table.assign(data.raw["bool-setting"]["mtlw-move-regular-to-vulcanus"], {
+    hidden = true,
+    force_value = true
+})
+
+table.assign(data.raw["bool-setting"]["mtlw-replace-some-steel-with-lumber"], {
+    hidden = true,
+    force_value = true
+})
+
+table.assign(data.raw["bool-setting"]["mtlw-nerf-mini-trains"], {
     hidden = true,
     force_value = false
 })