From 83877d5de884bd01d84ad081d5abea0d0161abde Mon Sep 17 00:00:00 2001 From: eso Date: Fri, 26 Apr 2019 18:26:18 -0700 Subject: [PATCH] Remove references to `lightstrip_dead` in mainlined mods --- data/json/items/migration.json | 5 +++++ .../Hydroponics/Hydroponics/construction.json | 20 +++++++++---------- .../Hydroponics/Hydroponics/item_groups.json | 4 ++-- data/mods/Modular_Turrets/uncraft.json | 8 ++++---- data/mods/Modular_Turrets/uncraft_corpse.json | 6 +++--- data/mods/Salvaged_Robots/recipe.json | 8 ++++---- data/mods/Salvaged_Robots/uncraft_corpse.json | 10 +++++----- 7 files changed, 33 insertions(+), 28 deletions(-) diff --git a/data/json/items/migration.json b/data/json/items/migration.json index e55f821612e84..27978e5c2bb6b 100644 --- a/data/json/items/migration.json +++ b/data/json/items/migration.json @@ -530,5 +530,10 @@ "id": "potato_raw", "type": "MIGRATION", "replace": "potato" + }, + { + "id": "lightstrip_dead", + "type": "MIGRATION", + "replace": "lightstrip_inactive" } ] diff --git a/data/mods/Hydroponics/Hydroponics/construction.json b/data/mods/Hydroponics/Hydroponics/construction.json index f1e92db1277ec..a2b74b86e8b45 100644 --- a/data/mods/Hydroponics/Hydroponics/construction.json +++ b/data/mods/Hydroponics/Hydroponics/construction.json @@ -14,7 +14,7 @@ [ [ "small_storage_battery", 1 ] ], [ [ "plut_cell", 1 ] ], [ [ "e_scrap", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "circuit", 1 ] ], [ [ "fertilizer_commercial", 1 ] ], [ [ "water", 100 ] ], @@ -38,7 +38,7 @@ [ [ "small_storage_battery", 1 ] ], [ [ "plut_cell", 1 ] ], [ [ "e_scrap", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "circuit", 1 ] ], [ [ "fertilizer_commercial", 1 ] ], [ [ "water", 100 ] ], @@ -62,7 +62,7 @@ [ [ "small_storage_battery", 1 ] ], [ [ "plut_cell", 1 ] ], [ [ "e_scrap", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "circuit", 1 ] ], [ [ "fertilizer_commercial", 1 ] ], [ [ "water", 100 ] ], @@ -86,7 +86,7 @@ [ [ "small_storage_battery", 1 ] ], [ [ "plut_cell", 1 ] ], [ [ "e_scrap", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "circuit", 1 ] ], [ [ "fertilizer_commercial", 1 ] ], [ [ "water", 100 ] ], @@ -110,7 +110,7 @@ [ [ "small_storage_battery", 1 ] ], [ [ "plut_cell", 1 ] ], [ [ "e_scrap", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "circuit", 1 ] ], [ [ "fertilizer_commercial", 1 ] ], [ [ "water", 100 ] ], @@ -134,7 +134,7 @@ [ [ "small_storage_battery", 1 ] ], [ [ "plut_cell", 1 ] ], [ [ "e_scrap", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "circuit", 1 ] ], [ [ "fertilizer_commercial", 1 ] ], [ [ "water", 100 ] ], @@ -158,7 +158,7 @@ [ [ "small_storage_battery", 1 ] ], [ [ "plut_cell", 1 ] ], [ [ "e_scrap", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "circuit", 1 ] ], [ [ "fertilizer_commercial", 1 ] ], [ [ "water", 100 ] ], @@ -182,7 +182,7 @@ [ [ "small_storage_battery", 1 ] ], [ [ "plut_cell", 1 ] ], [ [ "e_scrap", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "circuit", 1 ] ], [ [ "fertilizer_commercial", 1 ] ], [ [ "water", 100 ] ], @@ -206,7 +206,7 @@ [ [ "small_storage_battery", 1 ] ], [ [ "plut_cell", 1 ] ], [ [ "e_scrap", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "circuit", 1 ] ], [ [ "fertilizer_commercial", 1 ] ], [ [ "water", 100 ] ], @@ -230,7 +230,7 @@ [ [ "small_storage_battery", 1 ] ], [ [ "plut_cell", 1 ] ], [ [ "e_scrap", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "circuit", 1 ] ], [ [ "fertilizer_commercial", 1 ] ], [ [ "water", 100 ] ], diff --git a/data/mods/Hydroponics/Hydroponics/item_groups.json b/data/mods/Hydroponics/Hydroponics/item_groups.json index 5b74fe8361844..4449d2e073016 100644 --- a/data/mods/Hydroponics/Hydroponics/item_groups.json +++ b/data/mods/Hydroponics/Hydroponics/item_groups.json @@ -10,7 +10,7 @@ { "item": "metal_tank_little", "count": 2 }, { "item": "cu_pipe", "count": 4 }, { "item": "e_scrap", "count": 2 }, - { "item": "lightstrip_dead", "count": 2 }, + { "item": "lightstrip_inactive", "count": 2 }, { "item": "circuit", "count": 1 }, { "item": "small_storage_battery" }, { "item": "scrap", "count": [ 1, 2 ] }, @@ -28,7 +28,7 @@ { "item": "metal_tank_little", "count": [ 0, 2 ], "damage": [ 1, 3 ] }, { "item": "cu_pipe", "count": [ 0, 2 ] }, { "item": "e_scrap", "count": 2 }, - { "item": "lightstrip_dead", "count": 2 }, + { "item": "lightstrip_inactive", "count": 2 }, { "item": "circuit", "count": [ 0, 1 ] }, { "item": "small_storage_battery", "count": [ 0, 1 ], "damage": [ 1, 3 ] }, { "item": "scrap", "count": [ 3, 6 ] }, diff --git a/data/mods/Modular_Turrets/uncraft.json b/data/mods/Modular_Turrets/uncraft.json index a5a70b393fd53..3841c53b5d785 100644 --- a/data/mods/Modular_Turrets/uncraft.json +++ b/data/mods/Modular_Turrets/uncraft.json @@ -27,7 +27,7 @@ "components": [ [ [ "power_supply", 3 ] ], [ [ "lens", 1 ] ], - [ [ "lightstrip_dead", 8 ] ], + [ [ "lightstrip_inactive", 8 ] ], [ [ "scrap", 2 ] ], [ [ "e_scrap", 1 ] ], [ [ "cable", 1 ] ] @@ -309,7 +309,7 @@ "skill_used": "electronics", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "lightstrip_dead", 3 ] ], + [ [ "lightstrip_inactive", 3 ] ], [ [ "lens", 3 ] ], [ [ "processor", 1 ] ], [ [ "RAM", 1 ] ], @@ -326,7 +326,7 @@ "skill_used": "electronics", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "lightstrip_dead", 3 ] ], + [ [ "lightstrip_inactive", 3 ] ], [ [ "lens", 3 ] ], [ [ "processor", 2 ] ], [ [ "RAM", 2 ] ], @@ -343,7 +343,7 @@ "skill_used": "electronics", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "lightstrip_dead", 3 ] ], + [ [ "lightstrip_inactive", 3 ] ], [ [ "lens", 3 ] ], [ [ "processor", 3 ] ], [ [ "RAM", 4 ] ], diff --git a/data/mods/Modular_Turrets/uncraft_corpse.json b/data/mods/Modular_Turrets/uncraft_corpse.json index 0279ebb42ed38..a58467aa86011 100644 --- a/data/mods/Modular_Turrets/uncraft_corpse.json +++ b/data/mods/Modular_Turrets/uncraft_corpse.json @@ -92,7 +92,7 @@ "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "lightstrip_dead", 3 ] ], + [ [ "lightstrip_inactive", 3 ] ], [ [ "plut_cell", 1 ] ], [ [ "lens", 2 ] ], [ [ "processor", 2 ] ], @@ -111,7 +111,7 @@ "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "lightstrip_dead", 3 ] ], + [ [ "lightstrip_inactive", 3 ] ], [ [ "plut_cell", 1 ] ], [ [ "lens", 2 ] ], [ [ "processor", 2 ] ], @@ -130,7 +130,7 @@ "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "lightstrip_dead", 3 ] ], + [ [ "lightstrip_inactive", 3 ] ], [ [ "plut_cell", 1 ] ], [ [ "lens", 2 ] ], [ [ "processor", 2 ] ], diff --git a/data/mods/Salvaged_Robots/recipe.json b/data/mods/Salvaged_Robots/recipe.json index e5b4fd5b5572a..4d79e57aee49e 100644 --- a/data/mods/Salvaged_Robots/recipe.json +++ b/data/mods/Salvaged_Robots/recipe.json @@ -125,7 +125,7 @@ "book_learn": [ [ "recipe_lab_elec", 3 ], [ "mag_robotics", 3 ], [ "textbook_robots", 3 ] ], "components": [ [ [ "bot_manhack", 1 ], [ "broken_manhack", 1 ], [ "broken_light_hack", 1 ] ], - [ [ "lightstrip_dead", 4 ] ], + [ [ "lightstrip_inactive", 4 ] ], [ [ "processor", 1 ] ], [ [ "power_supply", 1 ] ], [ [ "e_scrap", 1 ] ] @@ -138,7 +138,7 @@ "book_learn": [ [ "recipe_lab_elec", 3 ], [ "mag_robotics", 3 ], [ "textbook_robots", 3 ] ], "components": [ [ [ "bot_manhack", 1 ], [ "broken_manhack", 1 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "pilot_light", 1 ] ], [ [ "element", 2 ] ], [ [ "processor", 1 ] ], @@ -566,7 +566,7 @@ "components": [ [ [ "broken_medibot_disarmed", 1 ] ], [ [ "robopart_pharma", 1 ] ], - [ [ "lightstrip_dead", 4 ] ], + [ [ "lightstrip_inactive", 4 ] ], [ [ "plastic_chunk", 4 ] ], [ [ "RAM", 2 ] ], [ [ "processor", 2 ] ], @@ -1047,7 +1047,7 @@ [ [ "robopart_microreactor", 2 ] ], [ [ "small_storage_battery", 4 ] ], [ [ "lens", 4 ] ], - [ [ "lightstrip_dead", 8 ] ], + [ [ "lightstrip_inactive", 8 ] ], [ [ "RAM", 2 ] ], [ [ "processor", 2 ] ], [ [ "cable", 1 ] ], diff --git a/data/mods/Salvaged_Robots/uncraft_corpse.json b/data/mods/Salvaged_Robots/uncraft_corpse.json index dc2eadb1bdd03..42696c2fd6aca 100644 --- a/data/mods/Salvaged_Robots/uncraft_corpse.json +++ b/data/mods/Salvaged_Robots/uncraft_corpse.json @@ -19,7 +19,7 @@ "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "processor", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "RAM", 1 ] ], [ [ "scrap", 2 ] ], [ [ "e_scrap", 1 ] ], @@ -37,7 +37,7 @@ "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "processor", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "RAM", 1 ] ], [ [ "scrap", 2 ] ], [ [ "e_scrap", 1 ] ], @@ -55,7 +55,7 @@ "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "processor", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "RAM", 1 ] ], [ [ "scrap", 2 ] ], [ [ "e_scrap", 1 ] ], @@ -73,7 +73,7 @@ "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "processor", 2 ] ], - [ [ "lightstrip_dead", 2 ] ], + [ [ "lightstrip_inactive", 2 ] ], [ [ "RAM", 1 ] ], [ [ "scrap", 2 ] ], [ [ "e_scrap", 1 ] ], @@ -327,7 +327,7 @@ [ [ "robopart_pharma", 1 ] ], [ [ "metal_tank_little", 1 ] ], [ [ "e_scrap", 1 ] ], - [ [ "lightstrip_dead", 10 ] ], + [ [ "lightstrip_inactive", 10 ] ], [ [ "scrap", 3 ] ] ] },