From 8ac8cfa2d651301cb808cc75926880ee927d10c7 Mon Sep 17 00:00:00 2001
From: npc-strider <npc.strider@gmail.com>
Date: Thu, 3 Jan 2019 23:37:46 +0800
Subject: [PATCH] LDS separate recipe & remove from silo tech

---
 017_science/data-updates.lua                     |   1 +
 017_science/data.lua                             |  11 ++++++++++-
 017_science/graphics/icons/LDS.png               | Bin 0 -> 2456 bytes
 017_science/info.json                            |   2 +-
 .../migrations/2019-01-03_017_science_0.0.4.lua  |  14 ++++++++++++++
 017_science/migrations/migrations.lua            |   1 +
 017_science/recipe.lua                           |  10 ++++++----
 017_science_migration/migrations/migrations.json |   1 +
 mod-list.json                                    |   2 +-
 9 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 017_science/graphics/icons/LDS.png
 create mode 100644 017_science/migrations/2019-01-03_017_science_0.0.4.lua

diff --git a/017_science/data-updates.lua b/017_science/data-updates.lua
index 6732b7c..0070aad 100644
--- a/017_science/data-updates.lua
+++ b/017_science/data-updates.lua
@@ -10,6 +10,7 @@ for _, mod in pairs(data.raw.module) do
 					table.insert(limitation, "17-chemical-science-pack")
 					table.insert(limitation, "17-production-science-pack")
 					table.insert(limitation, "17-utility-science-pack")
+					table.insert(limitation, "17-low-density-structure")					
 				end
 			end
 		end
diff --git a/017_science/data.lua b/017_science/data.lua
index e94e019..01e0c83 100644
--- a/017_science/data.lua
+++ b/017_science/data.lua
@@ -4,4 +4,13 @@ table.insert(data.raw["technology"]["military-2"].effects, {type = "unlock-recip
 table.insert(data.raw["technology"]["advanced-electronics"].effects, {type = "unlock-recipe",recipe = "17-chemical-science-pack"})
 table.insert(data.raw["technology"]["advanced-material-processing-2"].effects, {type = "unlock-recipe",recipe = "17-production-science-pack"})
 table.insert(data.raw["technology"]["advanced-electronics-2"].effects, {type = "unlock-recipe",recipe = "17-utility-science-pack"})
-table.insert(data.raw["technology"]["advanced-electronics-2"].effects, {type = "unlock-recipe",recipe = "low-density-structure"}) --LDS unlock for pre-rocket bases
\ No newline at end of file
+
+table.insert(data.raw["technology"]["advanced-electronics-2"].effects, {type = "unlock-recipe",recipe = "low-density-structure"})
+table.insert(data.raw["technology"]["advanced-electronics-2"].effects, {type = "unlock-recipe",recipe = "17-low-density-structure"}) --LDS unlock for pre-rocket bases
+
+local effects = data.raw["technology"]["rocket-silo"].effects --remove the duplicate LDS effect in rocket-silo research
+for _=1, #effects do
+	if effects[_].type == "unlock-recipe" and effects[_].recipe == "low-density-structure" then
+		effects[_] = nil
+	end
+end
\ No newline at end of file
diff --git a/017_science/graphics/icons/LDS.png b/017_science/graphics/icons/LDS.png
new file mode 100644
index 0000000000000000000000000000000000000000..3327afb8392ad92106a52960ac218186581dfe3f
GIT binary patch
literal 2456
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
WjBI`a@`Aqr0000<MNUMnLSTaL%AWTC

literal 0
HcmV?d00001

diff --git a/017_science/info.json b/017_science/info.json
index fc02c4d..75d3095 100644
--- a/017_science/info.json
+++ b/017_science/info.json
@@ -1,6 +1,6 @@
 {
   "name": "017_science",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "factorio_version": "0.16",
   "title": "0.17 science conversion",
   "author": "npc_strider(morley376)",
diff --git a/017_science/migrations/2019-01-03_017_science_0.0.4.lua b/017_science/migrations/2019-01-03_017_science_0.0.4.lua
new file mode 100644
index 0000000..2471261
--- /dev/null
+++ b/017_science/migrations/2019-01-03_017_science_0.0.4.lua
@@ -0,0 +1,14 @@
+for i, force in pairs(game.forces) do 
+	if force.technologies["advanced-electronics-2"].researched then 
+		force.recipes["low-density-structure"].enabled = true
+		force.recipes["17-low-density-structure"].enabled = true
+	end
+end
+
+for i, force in pairs(game.forces) do 
+	force.reset_recipes()
+end
+
+for i, force in pairs(game.forces) do 
+	force.reset_technologies()
+end
\ No newline at end of file
diff --git a/017_science/migrations/migrations.lua b/017_science/migrations/migrations.lua
index a5c0820..50b1310 100644
--- a/017_science/migrations/migrations.lua
+++ b/017_science/migrations/migrations.lua
@@ -18,6 +18,7 @@ for i, force in pairs(game.forces) do
 	end
 	if force.technologies["advanced-electronics-2"].researched then 
 		force.recipes["low-density-structure"].enabled = true
+		force.recipes["17-low-density-structure"].enabled = true
 		force.recipes["17-utility-science-pack"].enabled = true
 	end
 end
\ No newline at end of file
diff --git a/017_science/recipe.lua b/017_science/recipe.lua
index e5dc7de..cd7a2c4 100644
--- a/017_science/recipe.lua
+++ b/017_science/recipe.lua
@@ -91,11 +91,11 @@ data:extend(
 	--LDS changes
 	{		
 		type = "recipe",
-		name = "low-density-structure",
+		name = "17-low-density-structure",
 		category = "crafting",
 		normal =
 		{
-			energy_required = 30,
+			energy_required = 20, --30
 			enabled = false,
 			ingredients =
 			{
@@ -107,7 +107,7 @@ data:extend(
 		},
 		expensive =
 		{
-			energy_required = 30,
+			energy_required = 20, --30
 			enabled = false,
 			ingredients =
 			{
@@ -116,6 +116,8 @@ data:extend(
 				{"plastic-bar", 10}
 			},
 			result= "low-density-structure"
-		}
+		},
+		icon = "__017_science__/graphics/icons/LDS.png",
+		icon_size = 32
 	}
 })
\ No newline at end of file
diff --git a/017_science_migration/migrations/migrations.json b/017_science_migration/migrations/migrations.json
index 60fd79c..9cc5f3a 100644
--- a/017_science_migration/migrations/migrations.json
+++ b/017_science_migration/migrations/migrations.json
@@ -5,5 +5,6 @@
 		["17-chemical-science-pack", "chemical-science-pack"],
 		["17-production-science-pack", "production-science-pack"],
 		["17-utility-science-pack", "utility-science-pack"]
+		["17-low-density-structure", "low-density-structure"]
 	]
 }
\ No newline at end of file
diff --git a/mod-list.json b/mod-list.json
index e8c7c66..6bd0812 100644
--- a/mod-list.json
+++ b/mod-list.json
@@ -10,7 +10,7 @@
     },
     {
       "name": "017_science_migration",
-      "enabled": true
+      "enabled": false
     }
   ]
 }