Add bobathon, optional compatibility with bob's mods

Makefile

@@ -1,4 +1,4 @@
-VERSION := 0.5.4
+VERSION := 0.6.0
 NAME := marathon
 
 all: clean build
@@ -8,7 +8,7 @@ build:
 	mkdir build/$(NAME)_$(VERSION)
 	cp info.json info.json.temp
 	sed -i -e 's/@VERSION@/$(VERSION)/' info.json
-	cp -R LICENSE README.md data.lua info.json prototypes migrations build/$(NAME)_$(VERSION)
+	cp -R LICENSE README.md data.lua data-updates.lua info.json prototypes migrations build/$(NAME)_$(VERSION)
 	cd build && zip -r $(NAME)_$(VERSION).zip $(NAME)_$(VERSION)
 	mv info.json.temp info.json
 

data-updates.lua

@@ -0,0 +1,12 @@
+if bobmods and bobmods.config then
+	require("prototypes.bobsmods.item")
+	require("prototypes.bobsmods.recipe-chemistry")
+	require("prototypes.bobsmods.recipe-circuit")
+	require("prototypes.bobsmods.recipe-intermediate")
+	require("prototypes.bobsmods.recipe-logistics")
+	require("prototypes.bobsmods.recipe-power")
+	require("prototypes.bobsmods.recipe-production")
+	require("prototypes.bobsmods.recipe-resource")
+	require("prototypes.bobsmods.recipe-smelting")
+	require("prototypes.bobsmods.recipe-turret")
+end

info.json

@@ -1,9 +1,24 @@
 {
   "name": "marathon",
-  "version": "0.5.4",
+  "version": "0.6.0",
   "title": "Marathon Mod",
   "author": "Benoit Girard & Afforess",
-  "homepage": " ",
+  "contributors": ["Wulfson", "KeepOnDigging", "gheift"],
+  "homepage": "http://www.factorioforums.com/forum/viewtopic.php?f=91&t=13567",
   "description": "Increases the resource costs of most recipes causing a marathon game. The will require the players to scale a larger factory and use rail to reach the end game.",
-  "dependencies": []
+  "dependencies": [
+    "? bobassembly >= 0.12.7",
+    "? bobconfig >= 0.12.2",
+    "? bobelectronics >= 0.12.6",
+    "? bobenemies >= 0.12.6",
+    "? boblibrary >= 0.12.3",
+    "? boblogistics >= 0.12.7",
+    "? bobmining >= 0.12.3",
+    "? bobmodules >= 0.12.9",
+    "? bobores >= 0.12.7",
+    "? bobplates >= 0.12.10",
+    "? bobpower >= 0.12.6",
+    "? bobtech >= 0.12.4",
+    "? bobwarfare >= 0.12.9"
+    ] 
 }

migrations/Marathon_0.6.0.lua

@@ -0,0 +1,3 @@
+for i, force in pairs(game.forces) do 
+    force.reset_recipes()
+end

prototypes/bobsmods/item.lua

@@ -0,0 +1,2 @@
+data.raw.item["carbon"].fuel_value = "2.5MJ"
+data.raw.item["liquid-fuel-canister"].fuel_value = "50MJ"

prototypes/bobsmods/recipe-chemistry.lua

@@ -0,0 +1,59 @@
+local temp
+
+temp = data.raw.recipe["alumina"]
+temp.energy_required = 6
+temp.result_count = 6
+temp.ingredients = {
+	{type="item", name="sodium-hydroxide", amount=10},
+	{type="item", name="bauxite-ore", amount=2},
+}
+
+if bobmods.config.plates.BatteryUpdate then
+	temp = data.raw.recipe["battery"]
+	temp.ingredients = {
+		{type="item", name="lead-plate", amount=4},
+		{type="fluid", name="sulfuric-acid", amount=4},
+		{type="item", name="plastic-bar", amount=2}
+	}
+end
+
+temp = data.raw.recipe["coal-cracking"]
+temp.energy_required = 6
+temp.ingredients = {
+	{type="item", name="coal", amount=3},
+	{type="fluid", name="water", amount=2}
+}
+temp.results = {
+	{type="fluid", name="heavy-oil", amount=0.8}
+}
+
+temp = data.raw.recipe["ferric-chloride-solution"]
+temp.energy_required = 5
+temp.results = {
+	{type="fluid", name="ferric-chloride-solution", amount=3}
+}
+
+temp = data.raw.recipe["liquid-fuel"]
+temp.energy_required = 3
+temp.ingredients = {
+	{type="fluid", name="light-oil", amount=3}
+}
+
+temp = data.raw.recipe["lithium-chloride"]
+temp.energy_required = 2
+temp.ingredients = {
+	{type="fluid", name="lithia-water", amount=5}
+}
+
+temp = data.raw.recipe["sulfur-2"]
+temp.energy_required = 1.5
+
+temp = data.raw.recipe["sulfuric-acid-2"]
+temp.ingredients = {
+	{type="fluid", name="water", amount=1},
+	{type="fluid", name="sulfur-dioxide", amount=1},
+}
+temp.results = {
+	{type="fluid", name="sulfuric-acid", amount=1}
+}
+

prototypes/bobsmods/recipe-circuit.lua

@@ -0,0 +1,175 @@
+local temp
+
+temp = data.raw.recipe["advanced-circuit"]
+temp.ingredients = {
+	{type="item", name="circuit-board", amount=1},
+	{type="item", name="basic-electronic-components", amount=6},
+	{type="item", name="electronic-components", amount=6},
+}
+
+temp = data.raw.recipe["advanced-processing-unit"]
+temp.energy_required = 25
+temp.ingredients = {
+	{"multi-layer-circuit-board", 1},
+	{"basic-electronic-components", 3},
+	{"electronic-components", 4},
+	{"intergrated-electronics", 6},
+	{"processing-electronics", 4},
+}
+
+temp = data.raw.recipe["basic-electronic-components"]
+temp.energy_required = 3
+temp.ingredients = {
+	{type="item", name="copper-cable", amount=1},
+	{type="item", name="coal", amount=2},
+}
+
+temp = data.raw.recipe["circuit-board"]
+temp.ingredients = {
+	{type="item", name="phenolic-board", amount=1},
+	{type="item", name="copper-plate", amount=4},
+	{type="fluid", name="ferric-chloride-solution", amount=1.5}
+}
+
+temp = data.raw.recipe["electronic-circuit"]
+temp.enabled = false
+temp.energy_required = 2.5
+temp.ingredients = {
+	{type="item", name="basic-circuit-board", amount=1},
+	{type="item", name="basic-electronic-components", amount=10},
+}
+
+temp = data.raw.recipe["electronic-components"]
+temp.energy_required = 7
+temp.ingredients = {
+	{type="item", name="copper-cable", amount=1},
+	{type="item", name="plastic-bar", amount=2},
+}
+
+temp = data.raw.recipe["fibreglass-board"]
+temp.result_count = 1
+
+temp = data.raw.recipe["intergrated-electronics"]
+temp.energy_required = 8
+temp.ingredients = {
+	{type="item", name="copper-cable", amount=4},
+	{type="item", name="plastic-bar", amount=3},
+	{type="fluid", name="sulfuric-acid", amount=1.5}
+}
+
+temp = data.raw.recipe["multi-layer-circuit-board"]
+temp.ingredients = {
+	{type="item", name="fibreglass-board", amount=1},
+	{type="item", name="copper-plate", amount=8},
+	{type="fluid", name="ferric-chloride-solution", amount=3}
+}
+
+temp = data.raw.recipe["phenolic-board"]
+temp.result_count = 1
+temp.ingredients = {
+	{type="item", name="wood", amount=1},
+	{type="item", name="resin", amount=3},
+}
+
+temp = data.raw.recipe["phenolic-board-synthetic"]
+temp.result_count = 1
+temp.ingredients = {
+	{type="item", name="synthetic-wood", amount=1},
+	{type="item", name="resin", amount=3},
+}
+
+temp = data.raw.recipe["processing-electronics"]
+temp.ingredients = {
+	{type="item", name="copper-cable", amount=4},
+	{type="item", name="plastic-bar", amount=3},
+	{type="fluid", name="sulfuric-acid", amount=1.5}
+}
+
+temp = data.raw.recipe["processing-unit"]
+temp.energy_required = 15
+temp.ingredients = {
+	{"superior-circuit-board", 1},
+	{"basic-electronic-components", 6},
+	{"electronic-components", 6},
+	{"intergrated-electronics", 4},
+}
+
+if data.raw.item["solder-alloy"] then
+	temp = data.raw.recipe["solder"]
+	temp.energy_required = 4
+	temp.result_count = 4
+end
+
+temp = data.raw.recipe["superior-circuit-board"]
+temp.ingredients = {
+	{type="item", name="fibreglass-board", amount=1},
+	{type="item", name="copper-plate", amount=4},
+	{type="fluid", name="ferric-chloride-solution", amount=1.5}
+}
+
+
+
+
+if data.raw.item["tinned-copper-cable"] then
+	bobmods.lib.replace_recipe_item("basic-electronic-components", "copper-cable", "tinned-copper-cable")
+	bobmods.lib.replace_recipe_item("electronic-components", "copper-cable", "tinned-copper-cable")
+	bobmods.lib.replace_recipe_item("intergrated-electronics", "copper-cable", "tinned-copper-cable")
+end
+
+if data.raw.item["carbon"] then
+	bobmods.lib.replace_recipe_item("basic-electronic-components", "coal", "carbon")
+end
+
+if data.raw.item["silicon-wafer"] then
+	bobmods.lib.add_recipe_item("electronic-components", {"silicon-wafer", 4})
+	bobmods.lib.add_recipe_item("intergrated-electronics", {"silicon-wafer", 6})
+	bobmods.lib.add_recipe_item("processing-electronics", {"silicon-wafer", 10})
+else
+	if data.raw.item["silicon"] then
+		bobmods.lib.add_recipe_item("electronic-components", {"silicon", 3})
+		bobmods.lib.add_recipe_item("intergrated-electronics", {"silicon", 4})
+		bobmods.lib.add_recipe_item("processing-electronics", {"silicon", 5})
+	else
+		bobmods.lib.add_recipe_item("electronic-components", {"copper-plate", 3})
+		bobmods.lib.add_recipe_item("intergrated-electronics", {"copper-plate", 5})
+		bobmods.lib.add_recipe_item("processing-electronics", {"copper-plate", 7})
+	end
+end
+
+if data.raw.item["gilded-copper-cable"] then
+	bobmods.lib.replace_recipe_item("processing-electronics", "copper-cable", "gilded-copper-cable")
+else
+	if data.raw.item["tinned-copper-cable"] then
+		bobmods.lib.replace_recipe_item("processing-electronics", "copper-cable", "tinned-copper-cable")
+	end
+end
+
+if data.raw.item["silicon-nitride"] then
+	bobmods.lib.replace_recipe_item("processing-electronics", "plastic-bar", "silicon-nitride")
+end
+
+if data.raw.item["tin-plate"] then
+	bobmods.lib.add_recipe_item("circuit-board", {"tin-plate", 2})
+else
+	bobmods.lib.add_recipe_item("circuit-board", {"copper-plate", 2})
+end
+
+if data.raw.item["gold-plate"] then
+	bobmods.lib.add_recipe_item("superior-circuit-board", {"gold-plate", 2})
+	bobmods.lib.add_recipe_item("multi-layer-circuit-board", {"gold-plate", 4})
+else
+	if data.raw.item["tin-plate"] then
+		bobmods.lib.add_recipe_item("superior-circuit-board", {"tin-plate", 2})
+		bobmods.lib.add_recipe_item("multi-layer-circuit-board", {"tin-plate", 4})
+	else
+		bobmods.lib.add_recipe_item("superior-circuit-board", {"copper-plate", 2})
+		bobmods.lib.add_recipe_item("multi-layer-circuit-board", {"copper-plate", 4})
+	end
+end
+
+if data.raw.item["solder"] then
+	bobmods.lib.add_recipe_item("electronic-circuit", {"solder", 2})
+	bobmods.lib.add_recipe_item("advanced-circuit", {"solder", 2})
+	bobmods.lib.add_recipe_item("processing-unit", {"solder", 3})
+	bobmods.lib.add_recipe_item("advanced-processing-unit", {"solder", 6})
+end

prototypes/bobsmods/recipe-intermediate.lua

@@ -0,0 +1,96 @@
+local temp
+
+if data.raw.item["brass-alloy"] then
+	temp = data.raw.recipe["brass-gear-wheel"]
+	temp.energy_required = 1.5
+	temp.ingredients = {
+		{type="item", name="brass-alloy", amount=5},
+	}
+end
+
+if data.raw.item["silicon-nitride"] then
+	temp = data.raw.recipe["ceramic-bearing"]
+	temp.energy_required = 1.5
+	temp.ingredients = {
+		{type="item", name="silicon-nitride", amount=3},
+		{type="item", name="ceramic-bearing-ball", amount=42},
+      {type="fluid", name="lubricant", amount=3}
+	}
+
+	temp = data.raw.recipe["ceramic-bearing-ball"]
+	temp.result_count = 8
+end
+
+temp = data.raw.recipe["lithium-ion-battery"]
+temp.energy_required = 1.5
+temp.ingredients = {
+	{type="item", name="lithium-perchlorate", amount=4},
+	{type="item", name="lithium-cobalt-oxide", amount=2},
+	{type="item", name="carbon", amount=2},
+	{type="item", name="plastic-bar", amount=2},
+}
+
+if data.raw.item["nitinol-alloy"] then
+	temp = data.raw.recipe["nitinol-bearing"]
+	temp.energy_required = 1.5
+	temp.ingredients = {
+		{type="item", name="nitinol-alloy", amount=3},
+		{type="item", name="nitinol-bearing-ball", amount=42},
+      {type="fluid", name="lubricant", amount=2}
+	}
+
+	temp = data.raw.recipe["nitinol-bearing-ball"]
+	temp.result_count = 8
+
+	temp = data.raw.recipe["nitinol-gear-wheel"]
+	temp.energy_required = 1.5
+	temp.ingredients = {
+		{type="item", name="nitinol-alloy", amount=5},
+	}
+end
+
+temp = data.raw.recipe["silver-zinc-battery"]
+temp.energy_required = 3
+
+temp = data.raw.recipe["steel-bearing"]
+temp.energy_required = 1.5
+temp.ingredients = {
+	{type="item", name="steel-plate", amount=3},
+	{type="item", name="steel-bearing-ball", amount=42},
+}
+
+temp = data.raw.recipe["steel-bearing-ball"]
+temp.result_count = 8
+
+temp = data.raw.recipe["steel-gear-wheel"]
+temp.energy_required = 1.5
+temp.ingredients = {
+	{type="item", name="steel-plate", amount=5},
+}
+
+if data.raw.item["titanium-plate"] then
+	temp = data.raw.recipe["titanium-bearing"]
+	temp.energy_required = 1.5
+	temp.ingredients = {
+		{type="item", name="titanium-plate", amount=3},
+		{type="item", name="titanium-bearing-ball", amount=42},
+      {type="fluid", name="lubricant", amount=2}
+	}
+
+	temp = data.raw.recipe["titanium-bearing-ball"]
+	temp.result_count = 8
+
+	temp = data.raw.recipe["titanium-gear-wheel"]
+	temp.energy_required = 1.5
+	temp.ingredients = {
+		{type="item", name="titanium-plate", amount=5},
+	}
+end
+
+if data.raw.item["tungsten-plate"] then
+	temp = data.raw.recipe["tungsten-gear-wheel"]
+	temp.energy_required = 1.5
+	temp.ingredients = {
+		{type="item", name="tungsten-plate", amount=5},
+	}
+end