Merge pull request #38 from FactorioTrainwreck/master

0.18 update @FactorioTrainwreck

Author: mexmer

changelog.txt

@@ -1,4 +1,13 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.18.0
+Date: 2. 2. 2020
+  Changes:
+    - Factorio 0.18 update
+    - Add second flash fuel cell recipe to fix issues with recent base game oil changes
+  Bugfixes:
+    - Add bobtech dependency to fix lab accepting A.I. science pack
+    - Reset some overridden localization strings fixes ATMOS science pack name
+---------------------------------------------------------------------------------------------------
 Version: 0.17.10
 Date: 27. 5. 2019
   Changes:

info.json

@@ -1,11 +1,11 @@
 {
   "name": "ScienceCostTweakerM",
-  "version": "0.17.10",
-  "factorio_version":"0.17",
+  "version": "0.18.0",
+  "factorio_version":"0.18",
   "title": "ScienceCostTweaker Mod (mexmer)",
   "author": "mexmer",
-  "dependencies": ["base >= 0.17.0", "? omnimatter_science >= 3.0.3", "? pycoalprocessing >= 1.2.0" ],
+  "dependencies": ["base >= 0.17.0", "? omnimatter_science >= 3.0.3", "? pycoalprocessing >= 1.2.0", "? bobtech" ],
   "contact": "mexmer@github.com",
   "homepage": "https://github.com/mexmer/ScienceCostTweakerM",
-  "description": "Allows the cost of research to be tweaked, in terms of count, science packs and time. Edit its configs costs *.lua to tweak the multipliers. - Original mod made by UberWafe, this is adopted 0.17 version"
+  "description": "Allows the cost of research to be tweaked, in terms of count, science packs and time. Edit its configs costs *.lua to tweak the multipliers. - Original mod made by UberWafe, this is adopted 0.18 version"
 }

migrations/ScienceCostTweaker_0.18.00.lua

@@ -0,0 +1,6 @@
+for _, force in pairs(game.forces) do
+  if force.recipes['sct-t3-flash-fuel'].enabled then
+    force.recipes['sct-t3-flash-fuel2'].enabled = true
+  end
+end
+

prototypes/recipes/sciencepacks-intermediates.lua

@@ -495,6 +495,43 @@ data:extend({
 		},
 	},
 
+	{
+		type = "recipe",
+		name = "sct-t3-flash-fuel2",
+		category = "chemistry",
+		always_show_made_in = true,
+		subgroup = "sct-sciencepack-3",
+		order = "f[t3]-c[flashfuel2]",
+		expensive =
+		{
+			enabled = false,
+			energy_required = 6,
+			ingredients =
+			{
+				{type="fluid", name="petroleum-gas", amount=200},
+				{type="item", name="steel-plate", amount=2}
+			},
+			results =
+			{
+				{type="item", name="sct-t3-flash-fuel", amount=1},
+			},
+		},
+		normal =
+		{
+			enabled = false,
+			energy_required = 3,
+			ingredients =
+			{
+				{type="fluid", name="petroleum-gas", amount=100},
+				{type="item", name="steel-plate", amount=1}
+			},
+			results =
+			{
+				{type="item", name="sct-t3-flash-fuel", amount=1},
+			},
+		},
+	},
+
 	{
 		type = "recipe",
 		name = "sct-t3-laser-foci",

prototypes/technologies/labs.lua

@@ -119,6 +119,10 @@ data:extend({
 				type = "unlock-recipe",
 				recipe = "sct-t3-flash-fuel",
 			},
+			{
+				type = "unlock-recipe",
+				recipe = "sct-t3-flash-fuel2",
+			},
 			{
 				type = "unlock-recipe",
 				recipe = "sct-t3-laser-foci",

tweaks/bobsmods/0_initial.lua

@@ -10,3 +10,12 @@ if mods["boblogistics"] then
 		sctm.tech_dependency_add("sct-lab-t2", "electronics")
 	end
 end
+
+-- bobtech renames logistic science to transport science.
+-- Undo this so we use the "Single use ATMOS" localization string
+data.raw.tool["logistic-science-pack"].localised_name = nil
+data.raw.technology["logistic-science-pack"].localised_name = nil
+
+if data.raw.tool["advanced-logistic-science-pack"] then
+  data.raw.tool["advanced-logistic-science-pack"].localised_name = nil
+end