From 2ba82873b9607a5586a89969ad0d6970c81e5efc Mon Sep 17 00:00:00 2001 From: Wyrrrd Date: Mon, 16 Mar 2020 00:13:12 +0100 Subject: [PATCH] Various fixes - Fixed some things still referring to rocket-turret-mk1 - Fixed recipe order - Improved readability --- README.md | 1 - changelog.txt | 5 +---- integrations/bobplates/data.lua | 11 +++++++++-- integrations/bobplates/prototypes/entity.lua | 4 ++++ integrations/bobplates/prototypes/recipe.lua | 7 ++++++- integrations/bobplates/prototypes/technology.lua | 2 +- prototypes/entity.lua | 2 +- prototypes/recipe.lua | 1 + 8 files changed, 23 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index a65d193..43aead3 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ This mod adds a rocket turret to make rockets great again™. Sadly you would on This mod should just work, but I specifically added compatibility for the following mods: + [Bob's Metals, Chemicals and Intermediates](https://mods.factorio.com/mod/bobplates) - more turrets (MK1-MK5) -+ [Informatron](https://mods.factorio.com/mod/informatron) - informational page to explain dangers ### Locale If you want to contribute by translating this mod, you can view the existing translations [here](https://github.com/Wyrrrd/Rocket_Turrets/tree/master/locale). I'd be happy to add your language and credits to the next release. diff --git a/changelog.txt b/changelog.txt index 9f18d9b..471c99e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.18.3 -Date: 2020-03-11 +Date: 2020-03-16 Changes: - Moved integrations into separate directory - Simplified check for bobplates @@ -10,10 +10,8 @@ Version: 0.18.2 Date: 2020-02-25 Changes: - Matched changelog file format to what Factorio expects - Graphics: - Added HR textures for vanilla rocket turret entity (now also in lame gray) - Locale: - Added translated mod description --------------------------------------------------------------------------------------------------- @@ -30,7 +28,6 @@ Date: 2020-02-18 - Added changelog file - Renamed mod for upload in mod portal - Matched versioning to Factorio versions - Locale: - Added german locale --------------------------------------------------------------------------------------------------- diff --git a/integrations/bobplates/data.lua b/integrations/bobplates/data.lua index 3c43347..8712284 100644 --- a/integrations/bobplates/data.lua +++ b/integrations/bobplates/data.lua @@ -8,12 +8,15 @@ if mods["bobplates"] then 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"].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"].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" @@ -24,16 +27,20 @@ if mods["bobplates"] then rocket_mk2_item, rocket_mk2_recipe, rocket_mk2_tech, + rocket_mk3_entity, rocket_mk3_item, rocket_mk3_recipe, rocket_mk3_tech, + rocket_mk4_entity, rocket_mk4_item, rocket_mk4_recipe, rocket_mk4_tech, + rocket_mk5_entity, rocket_mk5_item, + -- recipe below rocket_mk5_tech }) diff --git a/integrations/bobplates/prototypes/entity.lua b/integrations/bobplates/prototypes/entity.lua index 78c7e8e..ced3ec9 100644 --- a/integrations/bobplates/prototypes/entity.lua +++ b/integrations/bobplates/prototypes/entity.lua @@ -173,6 +173,7 @@ rocket_mk2_entity = { folding_animation = rocket_mk2_sheet{direction_count = 4, line_length = 1, run_mode = "backward"}, vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + fast_replaceable_group = "turret", attack_parameters = { @@ -233,6 +234,7 @@ rocket_mk3_entity = { folding_animation = rocket_mk3_sheet{direction_count = 4, line_length = 1, run_mode = "backward"}, vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + fast_replaceable_group = "turret", attack_parameters = { @@ -293,6 +295,7 @@ rocket_mk4_entity = { folding_animation = rocket_mk4_sheet{direction_count = 4, line_length = 1, run_mode = "backward"}, vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + fast_replaceable_group = "turret", attack_parameters = { @@ -353,6 +356,7 @@ rocket_mk5_entity = { folding_animation = rocket_mk5_sheet{direction_count = 4, line_length = 1, run_mode = "backward"}, vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + fast_replaceable_group = "turret", attack_parameters = { diff --git a/integrations/bobplates/prototypes/recipe.lua b/integrations/bobplates/prototypes/recipe.lua index 26b9e75..f50c706 100644 --- a/integrations/bobplates/prototypes/recipe.lua +++ b/integrations/bobplates/prototypes/recipe.lua @@ -7,13 +7,14 @@ rocket_mk2_recipe = { energy_required = 10, ingredients = { - {"rocket-turret-mk1", 1}, + {"rocket-turret", 1}, {"steel-gear-wheel", 10}, {"steel-plate", 20}, {"battery", 5}, {"electronic-circuit", 5}, }, result = "rocket-turret-mk2", + order = "c-a" } rocket_mk3_recipe = { @@ -29,6 +30,7 @@ rocket_mk3_recipe = { {"advanced-circuit", 20}, }, result = "rocket-turret-mk3", + order = "c-a" } rocket_mk4_recipe = { @@ -44,6 +46,7 @@ rocket_mk4_recipe = { {"processing-unit", 20}, }, result = "rocket-turret-mk4", + order = "c-a" } rocket_mk5_recipe1 = { @@ -59,6 +62,7 @@ rocket_mk5_recipe1 = { {"processing-unit", 20}, }, result = "rocket-turret-mk5", + order = "c-a" } rocket_mk5_recipe2 = { @@ -74,4 +78,5 @@ rocket_mk5_recipe2 = { {"advanced-processing-unit", 20}, }, result = "rocket-turret-mk5", + order = "c-a" } \ No newline at end of file diff --git a/integrations/bobplates/prototypes/technology.lua b/integrations/bobplates/prototypes/technology.lua index 8e178a6..6700648 100644 --- a/integrations/bobplates/prototypes/technology.lua +++ b/integrations/bobplates/prototypes/technology.lua @@ -12,7 +12,7 @@ rocket_mk2_tech = { }, prerequisites = { - "rocket-turret-mk1", + "rocket-turret", }, unit = { diff --git a/prototypes/entity.lua b/prototypes/entity.lua index d700b9a..7e836ea 100644 --- a/prototypes/entity.lua +++ b/prototypes/entity.lua @@ -44,7 +44,7 @@ rocket_entity = { icon = "__Rocket_Turrets__/graphics/icon/turret-rocket-icon.png", icon_size = 32, flags = {"placeable-player", "player-creation"}, - minable = {mining_time = 0.7, result = "rocket-turret-mk1"}, + minable = {mining_time = 0.7, result = "rocket-turret"}, max_health = 400, corpse = "small-remnants", collision_box = {{-0.7, -0.7 }, {0.7, 0.7}}, diff --git a/prototypes/recipe.lua b/prototypes/recipe.lua index 948b883..fe1c7e3 100644 --- a/prototypes/recipe.lua +++ b/prototypes/recipe.lua @@ -13,4 +13,5 @@ rocket_recipe = { {"advanced-circuit", 15}, }, result = "rocket-turret", + order = "c-a" } \ No newline at end of file