Finish updating bobathon recipes

Makefile

@@ -1,4 +1,4 @@
-VERSION := 0.6.0
+VERSION := 1.0.0
 NAME := marathon
 
 all: clean build install_mod

data-updates.lua

@@ -17,4 +17,10 @@ if bobmods and bobmods.config then
 	require("prototypes.bobsmods.recipe-resource")
 	require("prototypes.bobsmods.recipe-smelting")
 	require("prototypes.bobsmods.recipe-turret")
+
+	print("Debug marathon")
+	print("Num recipes: " .. #data.raw.recipe)
+	for name, recipe in pairs(data.raw.recipe) do
+		print("recipe: " .. name .. " | " .. serpent.line(recipe))
+	end
 end

info.json

@@ -1,6 +1,6 @@
 {
   "name": "marathon",
-  "version": "0.6.0",
+  "version": "1.0.0",
   "title": "Marathon Mod",
   "author": "Benoit Girard & Afforess",
   "contributors": ["Wulfson", "KeepOnDigging", "gheift"],

prototypes/bobsmods/recipe-chemistry.lua

@@ -8,6 +8,7 @@ update_recipe("alumina",
 		{type="item", name="bauxite-ore", amount=2},
 	}
 })
+
 if bobmods.config.plates.BatteryUpdate then
 	update_recipe("battery",
 	{
@@ -18,6 +19,7 @@ if bobmods.config.plates.BatteryUpdate then
 		}
 	})
 end
+
 update_recipe("coal-cracking",
 {
 	energy_required = 6,
@@ -29,38 +31,36 @@ update_recipe("coal-cracking",
 		{type="fluid", name="heavy-oil", amount=0.8}
 	}
 })
+
 update_recipe("ferric-chloride-solution",
 {
 	energy_required = 5,
 	results = {
 		{type="fluid", name="ferric-chloride-solution", amount=3}
 	}
 })
+
 update_recipe("liquid-fuel",
 {
 	energy_required = 3,
-	results = {
+	ingredients = {
 		{type="fluid", name="light-oil", amount=3}
 	}
 })
+
 update_recipe("lithium-chloride",
 {
 	energy_required = 2,
-	results = {
-		{type="fluid", name="lithia-water", amount=5}
-	}
-})
-update_recipe("lithium-chloride",
-{
-	energy_required = 2,
-	results = {
+	ingredients = {
 		{type="fluid", name="lithia-water", amount=5}
 	}
 })
+
 update_recipe("sulfur-2",
 {
 	energy_required = 1.5
 })
+
 update_recipe("sulfuric-acid-2",
 {
 	ingredients = {

prototypes/bobsmods/recipe-circuit.lua

@@ -27,7 +27,6 @@ update_recipe("basic-electronic-components",
 })
 update_recipe("circuit-board",
 {
-	energy_required = 3,
 	ingredients = {
 		{type="item", name="phenolic-board", amount=1},
 		{type="item", name="copper-plate", amount=4},
@@ -43,7 +42,7 @@ update_recipe("electronic-circuit",
 		{type="item", name="basic-electronic-components", amount=10},
 	}
 })
-update_recipe("electronic-circuit",
+update_recipe("electronic-components",
 {
 	energy_required = 7,
 	ingredients = {
@@ -106,11 +105,15 @@ update_recipe("processing-unit",
 		{"intergrated-electronics", 4},
 	}
 })
-update_recipe("solder-alloy",
-{
-	energy_required = 4,
-	result_count = 4
-})
+
+if data.raw.item["solder-alloy"] then
+	update_recipe("solder",
+	{
+		energy_required = 4,
+		result_count = 4
+	})
+end
+
 update_recipe("superior-circuit-board",
 {
 	ingredients = {

prototypes/bobsmods/recipe-intermediate.lua

@@ -1,96 +1,125 @@
-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},
-	}
+	update_recipe("brass-gear-wheel",
+	{
+		energy_required = 1.5,
+		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}
-	}
+	update_recipe("ceramic-bearing",
+	{
+		energy_required = 1.5,
+		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
+	update_recipe("ceramic-bearing-ball",
+	{
+		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}
+update_recipe("lithium-ion-battery",
+{
+	energy_required = 1.5,
+	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},
 	}
+})
 
-	temp = data.raw.recipe["nitinol-bearing-ball"]
-	temp.result_count = 8
+if data.raw.item["nitinol-alloy"] then
+
+	update_recipe("nitinol-bearing",
+	{
+		energy_required = 1.5,
+		ingredients = {
+			{type="item", name="nitinol-alloy", amount=3},
+			{type="item", name="nitinol-bearing-ball", amount=42},
+		  	{type="fluid", name="lubricant", amount=2}
+		}
+	})
+
+	update_recipe("nitinol-bearing-ball",
+	{
+		result_count = 8
+	})
 
-	temp = data.raw.recipe["nitinol-gear-wheel"]
-	temp.energy_required = 1.5
-	temp.ingredients = {
-		{type="item", name="nitinol-alloy", amount=5},
-	}
+	update_recipe("nitinol-gear-wheel",
+	{
+		energy_required = 1.5,
+		ingredients = {
+			{type="item", name="nitinol-alloy", amount=5},
+		}
+	})
 end
 
-temp = data.raw.recipe["silver-zinc-battery"]
-temp.energy_required = 3
+update_recipe("silver-zinc-battery",
+{
+	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},
-}
+update_recipe("steel-bearing",
+{
+	energy_required = 1.5,
+	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
+update_recipe("steel-bearing-ball",
+{
+	result_count = 8
+})
 
-temp = data.raw.recipe["steel-gear-wheel"]
-temp.energy_required = 1.5
-temp.ingredients = {
-	{type="item", name="steel-plate", amount=5},
-}
+update_recipe("steel-gear-wheel",
+{
+	energy_required = 1.5,
+	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}
-	}
+	update_recipe("titanium-bearing",
+	{
+		energy_required = 1.5,
+		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
+	update_recipe("titanium-bearing-ball",
+	{
+		result_count = 8
+	})
 
-	temp = data.raw.recipe["titanium-gear-wheel"]
-	temp.energy_required = 1.5
-	temp.ingredients = {
-		{type="item", name="titanium-plate", amount=5},
-	}
+	update_recipe("titanium-gear-wheel",
+	{
+		energy_required = 1.5,
+		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},
-	}
+	update_recipe("tungsten-gear-wheel",
+	{
+		energy_required = 1.5,
+		ingredients = {
+			{type="item", name="tungsten-plate", amount=5},
+		}
+	})
 end