From e6bf131d290b1e03a1aa8c4e7492e3c7a8019f75 Mon Sep 17 00:00:00 2001 From: Wyrrrd Date: Mon, 16 Mar 2020 12:30:18 +0100 Subject: [PATCH] Moved graphics The turret mk1-5 graphics belong into the bobplates integration folder --- integrations/bobplates/data.lua | 24 +++++++++--------- .../graphics}/entity/hr-rocket-mk1-sheet.png | Bin .../graphics}/entity/hr-rocket-mk2-sheet.png | Bin .../graphics}/entity/hr-rocket-mk3-sheet.png | Bin .../graphics}/entity/hr-rocket-mk4-sheet.png | Bin .../graphics}/entity/hr-rocket-mk5-sheet.png | Bin .../graphics}/entity/rocket-mk1-sheet.png | Bin .../graphics}/entity/rocket-mk2-sheet.png | Bin .../graphics}/entity/rocket-mk3-sheet.png | Bin .../graphics}/entity/rocket-mk4-sheet.png | Bin .../graphics}/entity/rocket-mk5-sheet.png | Bin .../graphics}/icon/turret-rocket-mk1-icon.png | Bin .../graphics}/icon/turret-rocket-mk2-icon.png | Bin .../graphics}/icon/turret-rocket-mk3-icon.png | Bin .../graphics}/icon/turret-rocket-mk4-icon.png | Bin .../graphics}/icon/turret-rocket-mk5-icon.png | Bin .../technology/rocket-turret-mk1.png | Bin .../technology/rocket-turret-mk2.png | Bin .../technology/rocket-turret-mk3.png | Bin .../technology/rocket-turret-mk4.png | Bin .../technology/rocket-turret-mk5.png | Bin integrations/bobplates/prototypes/entity.lua | 24 +++++++++--------- integrations/bobplates/prototypes/item.lua | 8 +++--- .../bobplates/prototypes/technology.lua | 8 +++--- 24 files changed, 32 insertions(+), 32 deletions(-) rename {graphics => integrations/bobplates/graphics}/entity/hr-rocket-mk1-sheet.png (100%) rename {graphics => integrations/bobplates/graphics}/entity/hr-rocket-mk2-sheet.png (100%) rename {graphics => integrations/bobplates/graphics}/entity/hr-rocket-mk3-sheet.png (100%) rename {graphics => integrations/bobplates/graphics}/entity/hr-rocket-mk4-sheet.png (100%) rename {graphics => integrations/bobplates/graphics}/entity/hr-rocket-mk5-sheet.png (100%) rename {graphics => integrations/bobplates/graphics}/entity/rocket-mk1-sheet.png (100%) rename {graphics => integrations/bobplates/graphics}/entity/rocket-mk2-sheet.png (100%) rename {graphics => integrations/bobplates/graphics}/entity/rocket-mk3-sheet.png (100%) rename {graphics => integrations/bobplates/graphics}/entity/rocket-mk4-sheet.png (100%) rename {graphics => integrations/bobplates/graphics}/entity/rocket-mk5-sheet.png (100%) rename {graphics => integrations/bobplates/graphics}/icon/turret-rocket-mk1-icon.png (100%) rename {graphics => integrations/bobplates/graphics}/icon/turret-rocket-mk2-icon.png (100%) rename {graphics => integrations/bobplates/graphics}/icon/turret-rocket-mk3-icon.png (100%) rename {graphics => integrations/bobplates/graphics}/icon/turret-rocket-mk4-icon.png (100%) rename {graphics => integrations/bobplates/graphics}/icon/turret-rocket-mk5-icon.png (100%) rename {graphics => integrations/bobplates/graphics}/technology/rocket-turret-mk1.png (100%) rename {graphics => integrations/bobplates/graphics}/technology/rocket-turret-mk2.png (100%) rename {graphics => integrations/bobplates/graphics}/technology/rocket-turret-mk3.png (100%) rename {graphics => integrations/bobplates/graphics}/technology/rocket-turret-mk4.png (100%) rename {graphics => integrations/bobplates/graphics}/technology/rocket-turret-mk5.png (100%) diff --git a/integrations/bobplates/data.lua b/integrations/bobplates/data.lua index 8712284..163b958 100644 --- a/integrations/bobplates/data.lua +++ b/integrations/bobplates/data.lua @@ -6,19 +6,19 @@ require("integrations.bobplates.prototypes.technology") if mods["bobplates"] then -- if bobplates enabled, modify mk1 turret - data.raw["ammo-turret"]["rocket-turret"].folded_animation.layers[1].filename = "__Rocket_Turrets__/graphics/entity/rocket-mk1-sheet.png" - data.raw["ammo-turret"]["rocket-turret"].folded_animation.layers[1].hr_version["filename"] = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk1-sheet.png" - data.raw["ammo-turret"]["rocket-turret"].folding_animation.layers[1].filename = "__Rocket_Turrets__/graphics/entity/rocket-mk1-sheet.png" - data.raw["ammo-turret"]["rocket-turret"].folding_animation.layers[1].hr_version["filename"] = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk1-sheet.png" - data.raw["ammo-turret"]["rocket-turret"].prepared_animation.layers[1].filename = "__Rocket_Turrets__/graphics/entity/rocket-mk1-sheet.png" - data.raw["ammo-turret"]["rocket-turret"].prepared_animation.layers[1].hr_version["filename"] = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk1-sheet.png" - data.raw["ammo-turret"]["rocket-turret"].preparing_animation.layers[1].filename = "__Rocket_Turrets__/graphics/entity/rocket-mk1-sheet.png" - data.raw["ammo-turret"]["rocket-turret"].preparing_animation.layers[1].hr_version["filename"] = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk1-sheet.png" - data.raw["ammo-turret"]["rocket-turret"].attacking_animation.layers[1].filename = "__Rocket_Turrets__/graphics/entity/rocket-mk1-sheet.png" - data.raw["ammo-turret"]["rocket-turret"].attacking_animation.layers[1].hr_version["filename"] = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk1-sheet.png" + data.raw["ammo-turret"]["rocket-turret"].folded_animation.layers[1].filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk1-sheet.png" + data.raw["ammo-turret"]["rocket-turret"].folded_animation.layers[1].hr_version["filename"] = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/hr-rocket-mk1-sheet.png" + data.raw["ammo-turret"]["rocket-turret"].folding_animation.layers[1].filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk1-sheet.png" + data.raw["ammo-turret"]["rocket-turret"].folding_animation.layers[1].hr_version["filename"] = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/hr-rocket-mk1-sheet.png" + data.raw["ammo-turret"]["rocket-turret"].prepared_animation.layers[1].filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk1-sheet.png" + data.raw["ammo-turret"]["rocket-turret"].prepared_animation.layers[1].hr_version["filename"] = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/hr-rocket-mk1-sheet.png" + data.raw["ammo-turret"]["rocket-turret"].preparing_animation.layers[1].filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk1-sheet.png" + data.raw["ammo-turret"]["rocket-turret"].preparing_animation.layers[1].hr_version["filename"] = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/hr-rocket-mk1-sheet.png" + data.raw["ammo-turret"]["rocket-turret"].attacking_animation.layers[1].filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk1-sheet.png" + data.raw["ammo-turret"]["rocket-turret"].attacking_animation.layers[1].hr_version["filename"] = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/hr-rocket-mk1-sheet.png" data.raw["ammo-turret"]["rocket-turret"].fast_replaceable_group = "turret" - data.raw["item"]["rocket-turret"].icon = "__Rocket_Turrets__/graphics/icon/turret-rocket-mk1-icon.png" - data.raw["technology"]["rocket-turret"].icon = "__Rocket_Turrets__/graphics/technology/rocket-turret-mk1.png" + data.raw["item"]["rocket-turret"].icon = "__Rocket_Turrets__/integrations/bobplates/graphics/icon/turret-rocket-mk1-icon.png" + data.raw["technology"]["rocket-turret"].icon = "__Rocket_Turrets__/integrations/bobplates/graphics/technology/rocket-turret-mk1.png" -- if bobplates enabled, load tiered turrets diff --git a/graphics/entity/hr-rocket-mk1-sheet.png b/integrations/bobplates/graphics/entity/hr-rocket-mk1-sheet.png similarity index 100% rename from graphics/entity/hr-rocket-mk1-sheet.png rename to integrations/bobplates/graphics/entity/hr-rocket-mk1-sheet.png diff --git a/graphics/entity/hr-rocket-mk2-sheet.png b/integrations/bobplates/graphics/entity/hr-rocket-mk2-sheet.png similarity index 100% rename from graphics/entity/hr-rocket-mk2-sheet.png rename to integrations/bobplates/graphics/entity/hr-rocket-mk2-sheet.png diff --git a/graphics/entity/hr-rocket-mk3-sheet.png b/integrations/bobplates/graphics/entity/hr-rocket-mk3-sheet.png similarity index 100% rename from graphics/entity/hr-rocket-mk3-sheet.png rename to integrations/bobplates/graphics/entity/hr-rocket-mk3-sheet.png diff --git a/graphics/entity/hr-rocket-mk4-sheet.png b/integrations/bobplates/graphics/entity/hr-rocket-mk4-sheet.png similarity index 100% rename from graphics/entity/hr-rocket-mk4-sheet.png rename to integrations/bobplates/graphics/entity/hr-rocket-mk4-sheet.png diff --git a/graphics/entity/hr-rocket-mk5-sheet.png b/integrations/bobplates/graphics/entity/hr-rocket-mk5-sheet.png similarity index 100% rename from graphics/entity/hr-rocket-mk5-sheet.png rename to integrations/bobplates/graphics/entity/hr-rocket-mk5-sheet.png diff --git a/graphics/entity/rocket-mk1-sheet.png b/integrations/bobplates/graphics/entity/rocket-mk1-sheet.png similarity index 100% rename from graphics/entity/rocket-mk1-sheet.png rename to integrations/bobplates/graphics/entity/rocket-mk1-sheet.png diff --git a/graphics/entity/rocket-mk2-sheet.png b/integrations/bobplates/graphics/entity/rocket-mk2-sheet.png similarity index 100% rename from graphics/entity/rocket-mk2-sheet.png rename to integrations/bobplates/graphics/entity/rocket-mk2-sheet.png diff --git a/graphics/entity/rocket-mk3-sheet.png b/integrations/bobplates/graphics/entity/rocket-mk3-sheet.png similarity index 100% rename from graphics/entity/rocket-mk3-sheet.png rename to integrations/bobplates/graphics/entity/rocket-mk3-sheet.png diff --git a/graphics/entity/rocket-mk4-sheet.png b/integrations/bobplates/graphics/entity/rocket-mk4-sheet.png similarity index 100% rename from graphics/entity/rocket-mk4-sheet.png rename to integrations/bobplates/graphics/entity/rocket-mk4-sheet.png diff --git a/graphics/entity/rocket-mk5-sheet.png b/integrations/bobplates/graphics/entity/rocket-mk5-sheet.png similarity index 100% rename from graphics/entity/rocket-mk5-sheet.png rename to integrations/bobplates/graphics/entity/rocket-mk5-sheet.png diff --git a/graphics/icon/turret-rocket-mk1-icon.png b/integrations/bobplates/graphics/icon/turret-rocket-mk1-icon.png similarity index 100% rename from graphics/icon/turret-rocket-mk1-icon.png rename to integrations/bobplates/graphics/icon/turret-rocket-mk1-icon.png diff --git a/graphics/icon/turret-rocket-mk2-icon.png b/integrations/bobplates/graphics/icon/turret-rocket-mk2-icon.png similarity index 100% rename from graphics/icon/turret-rocket-mk2-icon.png rename to integrations/bobplates/graphics/icon/turret-rocket-mk2-icon.png diff --git a/graphics/icon/turret-rocket-mk3-icon.png b/integrations/bobplates/graphics/icon/turret-rocket-mk3-icon.png similarity index 100% rename from graphics/icon/turret-rocket-mk3-icon.png rename to integrations/bobplates/graphics/icon/turret-rocket-mk3-icon.png diff --git a/graphics/icon/turret-rocket-mk4-icon.png b/integrations/bobplates/graphics/icon/turret-rocket-mk4-icon.png similarity index 100% rename from graphics/icon/turret-rocket-mk4-icon.png rename to integrations/bobplates/graphics/icon/turret-rocket-mk4-icon.png diff --git a/graphics/icon/turret-rocket-mk5-icon.png b/integrations/bobplates/graphics/icon/turret-rocket-mk5-icon.png similarity index 100% rename from graphics/icon/turret-rocket-mk5-icon.png rename to integrations/bobplates/graphics/icon/turret-rocket-mk5-icon.png diff --git a/graphics/technology/rocket-turret-mk1.png b/integrations/bobplates/graphics/technology/rocket-turret-mk1.png similarity index 100% rename from graphics/technology/rocket-turret-mk1.png rename to integrations/bobplates/graphics/technology/rocket-turret-mk1.png diff --git a/graphics/technology/rocket-turret-mk2.png b/integrations/bobplates/graphics/technology/rocket-turret-mk2.png similarity index 100% rename from graphics/technology/rocket-turret-mk2.png rename to integrations/bobplates/graphics/technology/rocket-turret-mk2.png diff --git a/graphics/technology/rocket-turret-mk3.png b/integrations/bobplates/graphics/technology/rocket-turret-mk3.png similarity index 100% rename from graphics/technology/rocket-turret-mk3.png rename to integrations/bobplates/graphics/technology/rocket-turret-mk3.png diff --git a/graphics/technology/rocket-turret-mk4.png b/integrations/bobplates/graphics/technology/rocket-turret-mk4.png similarity index 100% rename from graphics/technology/rocket-turret-mk4.png rename to integrations/bobplates/graphics/technology/rocket-turret-mk4.png diff --git a/graphics/technology/rocket-turret-mk5.png b/integrations/bobplates/graphics/technology/rocket-turret-mk5.png similarity index 100% rename from graphics/technology/rocket-turret-mk5.png rename to integrations/bobplates/graphics/technology/rocket-turret-mk5.png diff --git a/integrations/bobplates/prototypes/entity.lua b/integrations/bobplates/prototypes/entity.lua index ced3ec9..e97de3e 100644 --- a/integrations/bobplates/prototypes/entity.lua +++ b/integrations/bobplates/prototypes/entity.lua @@ -6,7 +6,7 @@ return layers = { { - filename = "__Rocket_Turrets__/graphics/entity/rocket-mk2-sheet.png", + filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk2-sheet.png", priority = "medium", scale = 1, width = 72, @@ -19,7 +19,7 @@ return shift = { 0.25, -0.5 }, hr_version = { - filename = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk2-sheet.png", + filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/hr-rocket-mk2-sheet.png", priority = "medium", scale = 0.5, width = 144, @@ -42,7 +42,7 @@ return layers = { { - filename = "__Rocket_Turrets__/graphics/entity/rocket-mk3-sheet.png", + filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk3-sheet.png", priority = "medium", scale = 1, width = 72, @@ -55,7 +55,7 @@ return shift = { 0.25, -0.5 }, hr_version = { - filename = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk3-sheet.png", + filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/hr-rocket-mk3-sheet.png", priority = "medium", scale = 0.5, width = 144, @@ -78,7 +78,7 @@ return layers = { { - filename = "__Rocket_Turrets__/graphics/entity/rocket-mk4-sheet.png", + filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk4-sheet.png", priority = "medium", scale = 1, width = 72, @@ -91,7 +91,7 @@ return shift = { 0.25, -0.5 }, hr_version = { - filename = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk4-sheet.png", + filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/hr-rocket-mk4-sheet.png", priority = "medium", scale = 0.5, width = 144, @@ -114,7 +114,7 @@ return layers = { { - filename = "__Rocket_Turrets__/graphics/entity/rocket-mk5-sheet.png", + filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk5-sheet.png", priority = "medium", scale = 1, width = 72, @@ -127,7 +127,7 @@ return shift = { 0.25, -0.5 }, hr_version = { - filename = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk5-sheet.png", + filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/hr-rocket-mk5-sheet.png", priority = "medium", scale = 0.5, width = 144, @@ -150,7 +150,7 @@ end rocket_mk2_entity = { type = "ammo-turret", name = "rocket-turret-mk2", - icon = "__Rocket_Turrets__/graphics/icon/turret-rocket-mk2-icon.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/icon/turret-rocket-mk2-icon.png", icon_size = 32, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.7, result = "rocket-turret-mk2"}, @@ -211,7 +211,7 @@ rocket_mk2_entity = { rocket_mk3_entity = { type = "ammo-turret", name = "rocket-turret-mk3", - icon = "__Rocket_Turrets__/graphics/icon/turret-rocket-mk3-icon.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/icon/turret-rocket-mk3-icon.png", icon_size = 32, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.7, result = "rocket-turret-mk3"}, @@ -272,7 +272,7 @@ rocket_mk3_entity = { rocket_mk4_entity = { type = "ammo-turret", name = "rocket-turret-mk4", - icon = "__Rocket_Turrets__/graphics/icon/turret-rocket-mk4-icon.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/icon/turret-rocket-mk4-icon.png", icon_size = 32, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.7, result = "rocket-turret-mk4"}, @@ -333,7 +333,7 @@ rocket_mk4_entity = { rocket_mk5_entity = { type = "ammo-turret", name = "rocket-turret-mk5", - icon = "__Rocket_Turrets__/graphics/icon/turret-rocket-mk5-icon.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/icon/turret-rocket-mk5-icon.png", icon_size = 32, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.7, result = "rocket-turret-mk5"}, diff --git a/integrations/bobplates/prototypes/item.lua b/integrations/bobplates/prototypes/item.lua index 883e693..f441e15 100644 --- a/integrations/bobplates/prototypes/item.lua +++ b/integrations/bobplates/prototypes/item.lua @@ -3,7 +3,7 @@ rocket_mk2_item = { type = "item", name = "rocket-turret-mk2", - icon = "__Rocket_Turrets__/graphics/icon/turret-rocket-mk2-icon.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/icon/turret-rocket-mk2-icon.png", icon_size = 32, subgroup = "defensive-structure", order = "b[turret]-c[base]-d[rocket-mk2]", @@ -14,7 +14,7 @@ rocket_mk2_item = { rocket_mk3_item = { type = "item", name = "rocket-turret-mk3", - icon = "__Rocket_Turrets__/graphics/icon/turret-rocket-mk3-icon.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/icon/turret-rocket-mk3-icon.png", icon_size = 32, subgroup = "defensive-structure", order = "b[turret]-c[base]-d[rocket-mk3]", @@ -25,7 +25,7 @@ rocket_mk3_item = { rocket_mk4_item = { type = "item", name = "rocket-turret-mk4", - icon = "__Rocket_Turrets__/graphics/icon/turret-rocket-mk4-icon.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/icon/turret-rocket-mk4-icon.png", icon_size = 32, subgroup = "defensive-structure", order = "b[turret]-c[base]-d[rocket-mk4]", @@ -36,7 +36,7 @@ rocket_mk4_item = { rocket_mk5_item = { type = "item", name = "rocket-turret-mk5", - icon = "__Rocket_Turrets__/graphics/icon/turret-rocket-mk5-icon.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/icon/turret-rocket-mk5-icon.png", icon_size = 32, subgroup = "defensive-structure", order = "b[turret]-c[base]-d[rocket-mk5]", diff --git a/integrations/bobplates/prototypes/technology.lua b/integrations/bobplates/prototypes/technology.lua index 6700648..0449290 100644 --- a/integrations/bobplates/prototypes/technology.lua +++ b/integrations/bobplates/prototypes/technology.lua @@ -1,7 +1,7 @@ rocket_mk2_tech = { type = "technology", name = "rocket-turret-mk2", - icon = "__Rocket_Turrets__/graphics/technology/rocket-turret-mk2.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/technology/rocket-turret-mk2.png", icon_size = 128, effects = { @@ -32,7 +32,7 @@ rocket_mk2_tech = { rocket_mk3_tech = { type = "technology", name = "rocket-turret-mk3", - icon = "__Rocket_Turrets__/graphics/technology/rocket-turret-mk3.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/technology/rocket-turret-mk3.png", icon_size = 128, effects = { @@ -64,7 +64,7 @@ rocket_mk3_tech = { rocket_mk4_tech = { type = "technology", name = "rocket-turret-mk4", - icon = "__Rocket_Turrets__/graphics/technology/rocket-turret-mk4.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/technology/rocket-turret-mk4.png", icon_size = 128, effects = { @@ -96,7 +96,7 @@ rocket_mk4_tech = { rocket_mk5_tech = { type = "technology", name = "rocket-turret-mk5", - icon = "__Rocket_Turrets__/graphics/technology/rocket-turret-mk5.png", + icon = "__Rocket_Turrets__/integrations/bobplates/graphics/technology/rocket-turret-mk5.png", icon_size = 128, effects = {