diff --git a/README.md b/README.md index ea25982..7f5adf6 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,14 @@ This mod adds a rocket turret to make rockets great again™. Sadly you would on ### Compatibility 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 (MK2-MK5) ++ [Bob's Warfare](https://mods.factorio.com/mod/bobplates) - more turrets (MK2-MK5) ++ [Bob's Metals, Chemicals and Intermediates](https://mods.factorio.com/mod/bobplates) - replace recipe ingredients similar to how Bob's Warfare depends on it + [Informatron](https://mods.factorio.com/mod/informatron) - informational page to explain functions and dangers + [Factorio Wiki Mod](https://mods.factorio.com/mod/wiki) - informational topic to explain functions and dangers ++ [Booktorio](https://mods.factorio.com/mod/Booktorio) - informational thread to explain functions and 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. Especially the polish translation is in need of a proper Informatron page. +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. Especially the polish translation is in need of a proper informational page. ### Credit - Thanks to [Kamsta99](https://mods.factorio.com/user/kamsta99) for the [original mod](https://mods.factorio.com/mod/RocketTurrets) and the [vanilla version](https://mods.factorio.com/mod/RocketTurretsNonBob). \ No newline at end of file diff --git a/changelog.txt b/changelog.txt index b51f1a6..a34f75e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,11 @@ --------------------------------------------------------------------------------------------------- +Version: 0.18.5 +Date: 2020-04-02 + Changes: + - Reworked integration with Bob's, now bobwarfare adds tiered turrets and bobplates replaces recipe ingredients (to be more in line with Bob's) + - Added Booktorio integration and dynamic informational page (also depending on bobwarfare) + - Moved some files around +--------------------------------------------------------------------------------------------------- Version: 0.18.4 Date: 2020-03-29 Features: diff --git a/control.lua b/control.lua index 493c1de..adf702e 100644 --- a/control.lua +++ b/control.lua @@ -1,4 +1,5 @@ --control.lua -require("integrations.info.informatron.control") -require("integrations.info.wiki.control") \ No newline at end of file +require("integrations.informatron.control") +require("integrations.wiki.control") +require("integrations.Booktorio.control") \ No newline at end of file diff --git a/data.lua b/data.lua index 480233e..dd1a57a 100644 --- a/data.lua +++ b/data.lua @@ -13,6 +13,8 @@ data:extend({ }) -- integrations +require("integrations.bobwarfare.data") require("integrations.bobplates.data") -require("integrations.info.informatron.data") -require("integrations.info.wiki.data") \ No newline at end of file +require("integrations.informatron.data") +require("integrations.wiki.data") +require("integrations.Booktorio.data") \ No newline at end of file diff --git a/integrations/bobplates/graphics/entity/hr-rocket-mk1-sheet.png b/graphics/entity/hr-rocket-mk1-sheet.png similarity index 100% rename from integrations/bobplates/graphics/entity/hr-rocket-mk1-sheet.png rename to graphics/entity/hr-rocket-mk1-sheet.png diff --git a/integrations/bobplates/graphics/entity/hr-rocket-mk2-sheet.png b/graphics/entity/hr-rocket-mk2-sheet.png similarity index 100% rename from integrations/bobplates/graphics/entity/hr-rocket-mk2-sheet.png rename to graphics/entity/hr-rocket-mk2-sheet.png diff --git a/integrations/bobplates/graphics/entity/hr-rocket-mk3-sheet.png b/graphics/entity/hr-rocket-mk3-sheet.png similarity index 100% rename from integrations/bobplates/graphics/entity/hr-rocket-mk3-sheet.png rename to graphics/entity/hr-rocket-mk3-sheet.png diff --git a/integrations/bobplates/graphics/entity/hr-rocket-mk4-sheet.png b/graphics/entity/hr-rocket-mk4-sheet.png similarity index 100% rename from integrations/bobplates/graphics/entity/hr-rocket-mk4-sheet.png rename to graphics/entity/hr-rocket-mk4-sheet.png diff --git a/integrations/bobplates/graphics/entity/hr-rocket-mk5-sheet.png b/graphics/entity/hr-rocket-mk5-sheet.png similarity index 100% rename from integrations/bobplates/graphics/entity/hr-rocket-mk5-sheet.png rename to graphics/entity/hr-rocket-mk5-sheet.png diff --git a/integrations/bobplates/graphics/entity/rocket-mk1-sheet.png b/graphics/entity/rocket-mk1-sheet.png similarity index 100% rename from integrations/bobplates/graphics/entity/rocket-mk1-sheet.png rename to graphics/entity/rocket-mk1-sheet.png diff --git a/integrations/bobplates/graphics/entity/rocket-mk2-sheet.png b/graphics/entity/rocket-mk2-sheet.png similarity index 100% rename from integrations/bobplates/graphics/entity/rocket-mk2-sheet.png rename to graphics/entity/rocket-mk2-sheet.png diff --git a/integrations/bobplates/graphics/entity/rocket-mk3-sheet.png b/graphics/entity/rocket-mk3-sheet.png similarity index 100% rename from integrations/bobplates/graphics/entity/rocket-mk3-sheet.png rename to graphics/entity/rocket-mk3-sheet.png diff --git a/integrations/bobplates/graphics/entity/rocket-mk4-sheet.png b/graphics/entity/rocket-mk4-sheet.png similarity index 100% rename from integrations/bobplates/graphics/entity/rocket-mk4-sheet.png rename to graphics/entity/rocket-mk4-sheet.png diff --git a/integrations/bobplates/graphics/entity/rocket-mk5-sheet.png b/graphics/entity/rocket-mk5-sheet.png similarity index 100% rename from integrations/bobplates/graphics/entity/rocket-mk5-sheet.png rename to graphics/entity/rocket-mk5-sheet.png diff --git a/integrations/bobplates/graphics/icon/turret-rocket-mk1-icon.png b/graphics/icon/turret-rocket-mk1-icon.png similarity index 100% rename from integrations/bobplates/graphics/icon/turret-rocket-mk1-icon.png rename to graphics/icon/turret-rocket-mk1-icon.png diff --git a/integrations/bobplates/graphics/icon/turret-rocket-mk2-icon.png b/graphics/icon/turret-rocket-mk2-icon.png similarity index 100% rename from integrations/bobplates/graphics/icon/turret-rocket-mk2-icon.png rename to graphics/icon/turret-rocket-mk2-icon.png diff --git a/integrations/bobplates/graphics/icon/turret-rocket-mk3-icon.png b/graphics/icon/turret-rocket-mk3-icon.png similarity index 100% rename from integrations/bobplates/graphics/icon/turret-rocket-mk3-icon.png rename to graphics/icon/turret-rocket-mk3-icon.png diff --git a/integrations/bobplates/graphics/icon/turret-rocket-mk4-icon.png b/graphics/icon/turret-rocket-mk4-icon.png similarity index 100% rename from integrations/bobplates/graphics/icon/turret-rocket-mk4-icon.png rename to graphics/icon/turret-rocket-mk4-icon.png diff --git a/integrations/bobplates/graphics/icon/turret-rocket-mk5-icon.png b/graphics/icon/turret-rocket-mk5-icon.png similarity index 100% rename from integrations/bobplates/graphics/icon/turret-rocket-mk5-icon.png rename to graphics/icon/turret-rocket-mk5-icon.png diff --git a/integrations/info/graphics/ammo.png b/graphics/info/ammo.png similarity index 100% rename from integrations/info/graphics/ammo.png rename to graphics/info/ammo.png diff --git a/integrations/info/graphics/cover.png b/graphics/info/cover.png similarity index 100% rename from integrations/info/graphics/cover.png rename to graphics/info/cover.png diff --git a/integrations/info/graphics/cover_bob.png b/graphics/info/cover_bob.png similarity index 100% rename from integrations/info/graphics/cover_bob.png rename to graphics/info/cover_bob.png diff --git a/integrations/info/graphics/turrets.png b/graphics/info/turrets.png similarity index 100% rename from integrations/info/graphics/turrets.png rename to graphics/info/turrets.png diff --git a/integrations/info/graphics/turrets_bob.png b/graphics/info/turrets_bob.png similarity index 100% rename from integrations/info/graphics/turrets_bob.png rename to graphics/info/turrets_bob.png diff --git a/integrations/bobplates/graphics/technology/rocket-turret-mk1.png b/graphics/technology/rocket-turret-mk1.png similarity index 100% rename from integrations/bobplates/graphics/technology/rocket-turret-mk1.png rename to graphics/technology/rocket-turret-mk1.png diff --git a/integrations/bobplates/graphics/technology/rocket-turret-mk2.png b/graphics/technology/rocket-turret-mk2.png similarity index 100% rename from integrations/bobplates/graphics/technology/rocket-turret-mk2.png rename to graphics/technology/rocket-turret-mk2.png diff --git a/integrations/bobplates/graphics/technology/rocket-turret-mk3.png b/graphics/technology/rocket-turret-mk3.png similarity index 100% rename from integrations/bobplates/graphics/technology/rocket-turret-mk3.png rename to graphics/technology/rocket-turret-mk3.png diff --git a/integrations/bobplates/graphics/technology/rocket-turret-mk4.png b/graphics/technology/rocket-turret-mk4.png similarity index 100% rename from integrations/bobplates/graphics/technology/rocket-turret-mk4.png rename to graphics/technology/rocket-turret-mk4.png diff --git a/integrations/bobplates/graphics/technology/rocket-turret-mk5.png b/graphics/technology/rocket-turret-mk5.png similarity index 100% rename from integrations/bobplates/graphics/technology/rocket-turret-mk5.png rename to graphics/technology/rocket-turret-mk5.png diff --git a/info.json b/info.json index 0af1477..cb75e40 100644 --- a/info.json +++ b/info.json @@ -1,12 +1,14 @@ { "name": "Rocket_Turrets", - "version": "0.18.4", + "version": "0.18.5", "title": "RocketTurrets", "author": "Wyrrrd", "factorio_version": "0.18", "dependencies": [ "base >= 0.18.0", "? bobplates >= 0.18.1", + "? bobwarfare >= 0.18.3", + "? Booktorio >= 1.0.0", "? informatron >= 0.1.5", "? wiki >= 0.18.01" ], diff --git a/integrations/Booktorio/control.lua b/integrations/Booktorio/control.lua new file mode 100644 index 0000000..711fefc --- /dev/null +++ b/integrations/Booktorio/control.lua @@ -0,0 +1,79 @@ +local rocketturrets_thread = +{ + name = {"rocketturrets.menu_rocketturrets"}, + specified_version = 0, + topics = + { + { + name = {"rocketturrets.title_rocketturrets"}, + topic = + { + {type = "image", spritename = "booktorio-cover"}, + {type = "text", text = "info.text_intro"} + } + }, + { + name = {"info.heading_turrets"}, + topic = + { + {type = "title", title = {"info.heading_turrets"}}, + {type = "image", spritename = "booktorio-turrets"}, + {type = "text", text = "info.text_turrets"} + } + }, + { + name = {"info.heading_ammo"}, + topic = + { + {type = "title", title = {"info.heading_ammo"}}, + {type = "image", spritename = "booktorio-ammo"}, + {type = "text", text = "info.text_ammo"} + } + } + } +} + +local rocketturrets_bob_thread = +{ + name = {"rocketturrets.menu_rocketturrets"}, + specified_version = 0, + topics = + { + { + name = {"rocketturrets.title_rocketturrets"}, + topic = + { + {type = "image", spritename = "booktorio-cover-bob"}, + {type = "text", text = "info.text_intro"} + } + }, + { + name = {"info.heading_turrets"}, + topic = + { + {type = "image", spritename = "booktorio-turrets-bob"}, + {type = "text", text = "info.text_turrets_bob"} + } + }, + { + name = {"info.heading_ammo"}, + topic = + { + {type = "image", spritename = "booktorio-ammo"}, + {type = "text", text = "info.text_ammo"} + } + } + } +} + +local function registerThread() + if remote.interfaces["Booktorio"] then + remote.call("Booktorio", "add_thread", rocketturrets_thread) + if script.active_mods["bobwarfare"] then + remote.call("Booktorio", "override_thread", rocketturrets_bob_thread) + end + end +end + +script.on_init(registerThread) +script.on_configuration_changed(registerThread) \ No newline at end of file diff --git a/integrations/Booktorio/data.lua b/integrations/Booktorio/data.lua new file mode 100644 index 0000000..61333d6 --- /dev/null +++ b/integrations/Booktorio/data.lua @@ -0,0 +1,45 @@ +if mods["Booktorio"] then + data:extend( + { + { + type = "sprite", + name = "booktorio-ammo", + filename = "__Rocket_Turrets__/graphics/info/ammo.png", + width = 104, + height = 64, + scale = 1 + }, + { + type = "sprite", + name = "booktorio-cover", + filename = "__Rocket_Turrets__/graphics/info/cover.png", + width = 360, + height = 264, + scale = 1 + }, + { + type = "sprite", + name = "booktorio-cover-bob", + filename = "__Rocket_Turrets__/graphics/info/cover_bob.png", + width = 360, + height = 264, + scale = 1 + }, + { + type = "sprite", + name = "booktorio-turrets", + filename = "__Rocket_Turrets__/graphics/info/turrets.png", + width = 154, + height = 154, + scale = 1 + }, + { + type = "sprite", + name = "booktorio-turrets-bob", + filename = "__Rocket_Turrets__/graphics/info/turrets_bob.png", + width = 698, + height = 154, + scale = 1 + } + }) +end \ No newline at end of file diff --git a/integrations/bobplates/data.lua b/integrations/bobplates/data.lua index 163b958..968d481 100644 --- a/integrations/bobplates/data.lua +++ b/integrations/bobplates/data.lua @@ -1,52 +1,22 @@ -require("integrations.bobplates.prototypes.entity") -require("integrations.bobplates.prototypes.item") -require("integrations.bobplates.prototypes.recipe") -require("integrations.bobplates.prototypes.technology") +require("integrations.bobplates.ingredients") -if mods["bobplates"] then - -- if bobplates enabled, modify mk1 turret +local add_prerequisite = function (tech, prereq) + table.insert(data.raw.technology[tech].prerequisites,prereq) +end + +if mods["bobplates"] and mods["bobwarfare"] then + -- if bobplates enabled, change tiered turret recipes and tech (if existing) - 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__/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" + data.raw.recipe["rocket-turret-mk2"].ingredients = rocket_mk2_ingred - -- if bobplates enabled, load tiered turrets - - data:extend({ - rocket_mk2_entity, - rocket_mk2_item, - rocket_mk2_recipe, - rocket_mk2_tech, + data.raw.recipe["rocket-turret-mk3"].ingredients = rocket_mk3_ingred + table.insert(data.raw.technology["rocket-turret-mk3"].prerequisites,"zinc-processing") + table.insert(data.raw.technology["rocket-turret-mk3"].prerequisites,"invar-processing") - rocket_mk3_entity, - rocket_mk3_item, - rocket_mk3_recipe, - rocket_mk3_tech, + data.raw.recipe["rocket-turret-mk4"].ingredients = rocket_mk4_ingred + table.insert(data.raw.technology["rocket-turret-mk4"].prerequisites,"titanium-processing") - rocket_mk4_entity, - rocket_mk4_item, - rocket_mk4_recipe, - rocket_mk4_tech, + data.raw.recipe["rocket-turret-mk5"].ingredients = rocket_mk5_ingred + table.insert(data.raw.technology["rocket-turret-mk5"].prerequisites,"nitinol-processing") - rocket_mk5_entity, - rocket_mk5_item, - -- recipe below - rocket_mk5_tech - }) - - if data.raw.item["advanced-processing-unit"] then - data:extend({rocket_mk5_recipe2}) - else - data:extend({rocket_mk5_recipe1}) - end end \ No newline at end of file diff --git a/integrations/bobplates/ingredients.lua b/integrations/bobplates/ingredients.lua new file mode 100644 index 0000000..48eb804 --- /dev/null +++ b/integrations/bobplates/ingredients.lua @@ -0,0 +1,32 @@ +--ingredients + +rocket_mk2_ingred = { + {"rocket-turret", 1}, + {"steel-gear-wheel", 10}, + {"steel-plate", 20}, + {"advanced-circuit", 20}, +} + +rocket_mk3_ingred = { + {"rocket-turret-mk2", 1}, + {"brass-gear-wheel", 10}, + {"invar-alloy", 20}, + {"steel-bearing",10}, + {"advanced-circuit", 20}, +} + +rocket_mk4_ingred = { + {"rocket-turret-mk3", 1}, + {"titanium-gear-wheel", 10}, + {"titanium-plate", 20}, + {"titanium-bearing",10}, + {"processing-unit", 20}, +} + +rocket_mk5_ingred = { + {"rocket-turret-mk4", 1}, + {"nitinol-gear-wheel", 10}, + {"nitinol-alloy", 20}, + {"nitinol-bearing", 10}, + {"advanced-processing-unit", 20}, +} \ No newline at end of file diff --git a/integrations/bobwarfare/data.lua b/integrations/bobwarfare/data.lua new file mode 100644 index 0000000..3956018 --- /dev/null +++ b/integrations/bobwarfare/data.lua @@ -0,0 +1,46 @@ +require("integrations.bobwarfare.prototypes.entity") +require("integrations.bobwarfare.prototypes.item") +require("integrations.bobwarfare.prototypes.recipe") +require("integrations.bobwarfare.prototypes.technology") + +if mods["bobwarfare"] then + -- if bobwarfare enabled, modify vanilla turret to be 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"].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" + + -- if bobwarfare enabled, load tiered turrets + + data:extend({ + rocket_mk2_entity, + 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, + rocket_mk5_recipe, + rocket_mk5_tech, + }) +end \ No newline at end of file diff --git a/integrations/bobplates/prototypes/entity.lua b/integrations/bobwarfare/prototypes/entity.lua similarity index 89% rename from integrations/bobplates/prototypes/entity.lua rename to integrations/bobwarfare/prototypes/entity.lua index e97de3e..ced3ec9 100644 --- a/integrations/bobplates/prototypes/entity.lua +++ b/integrations/bobwarfare/prototypes/entity.lua @@ -6,7 +6,7 @@ return layers = { { - filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk2-sheet.png", + filename = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/entity/hr-rocket-mk2-sheet.png", + filename = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk2-sheet.png", priority = "medium", scale = 0.5, width = 144, @@ -42,7 +42,7 @@ return layers = { { - filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk3-sheet.png", + filename = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/entity/hr-rocket-mk3-sheet.png", + filename = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk3-sheet.png", priority = "medium", scale = 0.5, width = 144, @@ -78,7 +78,7 @@ return layers = { { - filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk4-sheet.png", + filename = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/entity/hr-rocket-mk4-sheet.png", + filename = "__Rocket_Turrets__/graphics/entity/hr-rocket-mk4-sheet.png", priority = "medium", scale = 0.5, width = 144, @@ -114,7 +114,7 @@ return layers = { { - filename = "__Rocket_Turrets__/integrations/bobplates/graphics/entity/rocket-mk5-sheet.png", + filename = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/entity/hr-rocket-mk5-sheet.png", + filename = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/icon/turret-rocket-mk2-icon.png", + icon = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/icon/turret-rocket-mk3-icon.png", + icon = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/icon/turret-rocket-mk4-icon.png", + icon = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/icon/turret-rocket-mk5-icon.png", + icon = "__Rocket_Turrets__/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/bobwarfare/prototypes/item.lua similarity index 70% rename from integrations/bobplates/prototypes/item.lua rename to integrations/bobwarfare/prototypes/item.lua index f441e15..883e693 100644 --- a/integrations/bobplates/prototypes/item.lua +++ b/integrations/bobwarfare/prototypes/item.lua @@ -3,7 +3,7 @@ rocket_mk2_item = { type = "item", name = "rocket-turret-mk2", - icon = "__Rocket_Turrets__/integrations/bobplates/graphics/icon/turret-rocket-mk2-icon.png", + icon = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/icon/turret-rocket-mk3-icon.png", + icon = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/icon/turret-rocket-mk4-icon.png", + icon = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/icon/turret-rocket-mk5-icon.png", + icon = "__Rocket_Turrets__/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/recipe.lua b/integrations/bobwarfare/prototypes/recipe.lua similarity index 62% rename from integrations/bobplates/prototypes/recipe.lua rename to integrations/bobwarfare/prototypes/recipe.lua index f50c706..9ee654b 100644 --- a/integrations/bobplates/prototypes/recipe.lua +++ b/integrations/bobwarfare/prototypes/recipe.lua @@ -8,10 +8,9 @@ rocket_mk2_recipe = { ingredients = { {"rocket-turret", 1}, - {"steel-gear-wheel", 10}, + {"iron-gear-wheel", 10}, {"steel-plate", 20}, - {"battery", 5}, - {"electronic-circuit", 5}, + {"advanced-circuit", 20}, }, result = "rocket-turret-mk2", order = "c-a" @@ -25,8 +24,8 @@ rocket_mk3_recipe = { ingredients = { {"rocket-turret-mk2", 1}, - {"steel-bearing", 10}, - {"invar-alloy", 20}, + {"iron-gear-wheel", 10}, + {"steel-plate", 20}, {"advanced-circuit", 20}, }, result = "rocket-turret-mk3", @@ -41,15 +40,15 @@ rocket_mk4_recipe = { ingredients = { {"rocket-turret-mk3", 1}, - {"titanium-gear-wheel", 10}, - {"titanium-plate", 20}, + {"iron-gear-wheel", 10}, + {"steel-plate", 20}, {"processing-unit", 20}, }, result = "rocket-turret-mk4", order = "c-a" } -rocket_mk5_recipe1 = { +rocket_mk5_recipe = { type = "recipe", name = "rocket-turret-mk5", enabled = false, @@ -57,26 +56,10 @@ rocket_mk5_recipe1 = { ingredients = { {"rocket-turret-mk4", 1}, - {"nitinol-gear-wheel", 10}, - {"nitinol-alloy", 20}, + {"iron-gear-wheel", 10}, + {"steel-plate", 20}, {"processing-unit", 20}, }, result = "rocket-turret-mk5", order = "c-a" -} - -rocket_mk5_recipe2 = { - type = "recipe", - name = "rocket-turret-mk5", - enabled = false, - energy_required = 10, - ingredients = - { - {"rocket-turret-mk4", 1}, - {"nitinol-gear-wheel", 10}, - {"nitinol-alloy", 20}, - {"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/bobwarfare/prototypes/technology.lua similarity index 79% rename from integrations/bobplates/prototypes/technology.lua rename to integrations/bobwarfare/prototypes/technology.lua index 0449290..991500f 100644 --- a/integrations/bobplates/prototypes/technology.lua +++ b/integrations/bobwarfare/prototypes/technology.lua @@ -1,7 +1,7 @@ rocket_mk2_tech = { type = "technology", name = "rocket-turret-mk2", - icon = "__Rocket_Turrets__/integrations/bobplates/graphics/technology/rocket-turret-mk2.png", + icon = "__Rocket_Turrets__/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__/integrations/bobplates/graphics/technology/rocket-turret-mk3.png", + icon = "__Rocket_Turrets__/graphics/technology/rocket-turret-mk3.png", icon_size = 128, effects = { @@ -44,7 +44,6 @@ rocket_mk3_tech = { prerequisites = { "rocket-turret-mk2", - "invar-processing", }, unit = { @@ -64,7 +63,7 @@ rocket_mk3_tech = { rocket_mk4_tech = { type = "technology", name = "rocket-turret-mk4", - icon = "__Rocket_Turrets__/integrations/bobplates/graphics/technology/rocket-turret-mk4.png", + icon = "__Rocket_Turrets__/graphics/technology/rocket-turret-mk4.png", icon_size = 128, effects = { @@ -76,7 +75,6 @@ rocket_mk4_tech = { prerequisites = { "rocket-turret-mk3", - "titanium-processing", }, unit = { @@ -96,7 +94,7 @@ rocket_mk4_tech = { rocket_mk5_tech = { type = "technology", name = "rocket-turret-mk5", - icon = "__Rocket_Turrets__/integrations/bobplates/graphics/technology/rocket-turret-mk5.png", + icon = "__Rocket_Turrets__/graphics/technology/rocket-turret-mk5.png", icon_size = 128, effects = { @@ -108,7 +106,6 @@ rocket_mk5_tech = { prerequisites = { "rocket-turret-mk4", - "nitinol-processing", }, unit = { diff --git a/integrations/info/informatron/control.lua b/integrations/info/informatron/control.lua deleted file mode 100644 index 5c5d378..0000000 --- a/integrations/info/informatron/control.lua +++ /dev/null @@ -1,36 +0,0 @@ -if script.active_mods["informatron"] then - remote.add_interface("rocketturrets", { - informatron_menu = function(data) - return rocketturrets_menu(data.player_index) - end, - informatron_page_content = function(data) - return rocketturrets_page_content(data.page_name, data.player_index, data.element) - end - }) -end - -function rocketturrets_menu(player_index) - return {} -end - -function rocketturrets_page_content(page_name, player_index, element) - if page_name == "rocketturrets" then - if script.active_mods["bobplates"] then - element.add{type="button", name="image_cover", style="rocketturrets_cover_bob"} - element.add{type="label", name="text_intro", caption={"rocketturrets.text_intro"}} - element.add{type="label", name="heading_turrets", caption={"rocketturrets.heading_turrets"}, style="heading_1_label"} - element.add{type="button", name="image_turrets", style="rocketturrets_turrets_bob"} - element.add{type="label", name="text_turrets", caption={"rocketturrets.text_turrets_bob"}} - else - element.add{type="button", name="image_cover", style="rocketturrets_cover"} - element.add{type="label", name="text_intro", caption={"rocketturrets.text_intro"}} - element.add{type="label", name="heading_turrets", caption={"rocketturrets.heading_turrets"}, style="heading_1_label"} - element.add{type="button", name="image_turrets", style="rocketturrets_turrets"} - element.add{type="label", name="text_turrets", caption={"rocketturrets.text_turrets"}} - end - -- the following is the same with and without bobplates - element.add{type="label", name="heading_ammo", caption={"rocketturrets.heading_ammo"}, style="heading_1_label"} - element.add{type="button", name="image_ammo", style="rocketturrets_ammo"} - element.add{type="label", name="text_ammo", caption={"rocketturrets.text_ammo"}} - end -end \ No newline at end of file diff --git a/integrations/info/informatron/data.lua b/integrations/info/informatron/data.lua deleted file mode 100644 index 040357a..0000000 --- a/integrations/info/informatron/data.lua +++ /dev/null @@ -1,7 +0,0 @@ -if mods["informatron"] then - informatron_make_image("rocketturrets_cover", "__Rocket_Turrets__/integrations/info/graphics/cover.png", 380, 264) - informatron_make_image("rocketturrets_cover_bob", "__Rocket_Turrets__/integrations/info/graphics/cover_bob.png", 380, 264) - informatron_make_image("rocketturrets_turrets", "__Rocket_Turrets__/integrations/info/graphics/turrets.png", 154, 154) - informatron_make_image("rocketturrets_turrets_bob", "__Rocket_Turrets__/integrations/info/graphics/turrets_bob.png", 698, 154) - informatron_make_image("rocketturrets_ammo", "__Rocket_Turrets__/integrations/info/graphics/ammo.png", 104, 64) -end \ No newline at end of file diff --git a/integrations/info/wiki/wiki.lua b/integrations/info/wiki/wiki.lua deleted file mode 100644 index 2cdabcf..0000000 --- a/integrations/info/wiki/wiki.lua +++ /dev/null @@ -1,43 +0,0 @@ -rocketturrets_wiki = -{ - name = "Rocket_Turrets", - title = {"rocketturrets.menu_rocketturrets"}, - mod_path = "__Rocket_Turrets__", - { - name = {"rocketturrets.title_rocketturrets"}, - topic = { - {type = "image", name = "image_cover", filepath = "__Rocket_Turrets__/integrations/info/graphics/cover.png", width = 380, height = 264, scale = 0.95}, - {type = "text", text = {"rocketturrets.text_intro"} }, - {type = "line"}, - {type = "title", title = {"rocketturrets.heading_turrets"} }, - {type = "image", name = "image_turrets", filepath = "__Rocket_Turrets__/integrations/info/graphics/turrets.png", width = 154, height = 154, scale = 0.516}, - {type = "text", text = {"rocketturrets.text_turrets"} }, - {type = "line"}, - {type = "title", title = {"rocketturrets.heading_ammo"} }, - {type = "image", name = "image_ammo", filepath = "__Rocket_Turrets__/integrations/info/graphics/ammo.png", width = 104, height = 64, scale = 1}, - {type = "text", text = {"rocketturrets.text_ammo"} }, - } - } -} - -rocketturrets_bob_wiki = -{ - name = "Rocket_Turrets", - title = {"rocketturrets.menu_rocketturrets"}, - mod_path = "__Rocket_Turrets__", - { - name = {"rocketturrets.title_rocketturrets"}, - topic = { - {type = "image", name = "image_cover", filepath = "__Rocket_Turrets__/integrations/info/graphics/cover_bob.png", width = 380, height = 264, scale = 0.95}, - {type = "text", text = {"rocketturrets.text_intro"} }, - {type = "line"}, - {type = "title", title = {"rocketturrets.heading_turrets"} }, - {type = "image", name = "image_turrets", filepath = "__Rocket_Turrets__/integrations/info/graphics/turrets_bob.png", width = 698, height = 154, scale = 0.516}, - {type = "text", text = {"rocketturrets.text_turrets_bob"} }, - {type = "line"}, - {type = "title", title = {"rocketturrets.heading_ammo"} }, - {type = "image", name = "image_ammo", filepath = "__Rocket_Turrets__/integrations/info/graphics/ammo.png", width = 104, height = 64, scale = 1}, - {type = "text", text = {"rocketturrets.text_ammo"} }, - } - } -} \ No newline at end of file diff --git a/integrations/informatron/control.lua b/integrations/informatron/control.lua new file mode 100644 index 0000000..625ff51 --- /dev/null +++ b/integrations/informatron/control.lua @@ -0,0 +1,36 @@ +if script.active_mods["informatron"] then + remote.add_interface("rocketturrets", { + informatron_menu = function(data) + return rocketturrets_menu(data.player_index) + end, + informatron_page_content = function(data) + return rocketturrets_page_content(data.page_name, data.player_index, data.element) + end + }) +end + +function rocketturrets_menu(player_index) + return {} +end + +function rocketturrets_page_content(page_name, player_index, element) + if page_name == "rocketturrets" then + if script.active_mods["bobwarfare"] then + element.add{type="button", name="image_cover", style="informatron-cover-bob"} + element.add{type="label", name="text_intro", caption={"info.text_intro"}} + element.add{type="label", name="heading_turrets", caption={"info.heading_turrets"}, style="heading_1_label"} + element.add{type="button", name="image_turrets", style="informatron-turrets-bob"} + element.add{type="label", name="text_turrets", caption={"info.text_turrets_bob"}} + else + element.add{type="button", name="image_cover", style="informatron-cover"} + element.add{type="label", name="text_intro", caption={"info.text_intro"}} + element.add{type="label", name="heading_turrets", caption={"info.heading_turrets"}, style="heading_1_label"} + element.add{type="button", name="image_turrets", style="informatron-turrets"} + element.add{type="label", name="text_turrets", caption={"info.text_turrets"}} + end + -- the following is the same with and without bobplates + element.add{type="label", name="heading_ammo", caption={"info.heading_ammo"}, style="heading_1_label"} + element.add{type="button", name="image_ammo", style="informatron-ammo"} + element.add{type="label", name="text_ammo", caption={"info.text_ammo"}} + end +end \ No newline at end of file diff --git a/integrations/informatron/data.lua b/integrations/informatron/data.lua new file mode 100644 index 0000000..00aaa81 --- /dev/null +++ b/integrations/informatron/data.lua @@ -0,0 +1,7 @@ +if mods["informatron"] then + informatron_make_image("informatron-cover", "__Rocket_Turrets__/graphics/info/cover.png", 380, 264) + informatron_make_image("informatron-cover-bob", "__Rocket_Turrets__/graphics/info/cover_bob.png", 380, 264) + informatron_make_image("informatron-turrets", "__Rocket_Turrets__/graphics/info/turrets.png", 154, 154) + informatron_make_image("informatron-turrets-bob", "__Rocket_Turrets__/graphics/info/turrets_bob.png", 698, 154) + informatron_make_image("informatron-ammo", "__Rocket_Turrets__/graphics/info/ammo.png", 104, 64) +end \ No newline at end of file diff --git a/integrations/info/informatron/sample.png b/integrations/informatron/sample.png similarity index 100% rename from integrations/info/informatron/sample.png rename to integrations/informatron/sample.png diff --git a/integrations/info/wiki/control.lua b/integrations/wiki/control.lua similarity index 61% rename from integrations/info/wiki/control.lua rename to integrations/wiki/control.lua index 87a1e56..ee190d8 100644 --- a/integrations/info/wiki/control.lua +++ b/integrations/wiki/control.lua @@ -1,8 +1,8 @@ -require("integrations.info.wiki.wiki") +require("integrations.wiki.wiki") if script.active_mods["wiki"] then local initialize_wiki - if script.active_mods["bobplates"] then + if script.active_mods["bobwarfare"] then initialize_wiki = function() remote.call("wiki","register_mod_wiki",rocketturrets_bob_wiki) end @@ -12,6 +12,6 @@ if script.active_mods["wiki"] then end end - script.on_init(function() initialize_wiki() end) - script.on_load(function() initialize_wiki() end) + script.on_init(initialize_wiki) + script.on_load(initialize_wiki) end \ No newline at end of file diff --git a/integrations/info/wiki/data.lua b/integrations/wiki/data.lua similarity index 66% rename from integrations/info/wiki/data.lua rename to integrations/wiki/data.lua index 8e4bc22..94f9007 100644 --- a/integrations/info/wiki/data.lua +++ b/integrations/wiki/data.lua @@ -1,7 +1,7 @@ -require("integrations.info.wiki.wiki") +require("integrations.wiki.wiki") if mods["wiki"] then - if mods["bobplates"] then + if mods["bobwarfare"] then wiki_register_mod_wiki(rocketturrets_bob_wiki) else wiki_register_mod_wiki(rocketturrets_wiki) diff --git a/integrations/wiki/wiki.lua b/integrations/wiki/wiki.lua new file mode 100644 index 0000000..d0711e4 --- /dev/null +++ b/integrations/wiki/wiki.lua @@ -0,0 +1,43 @@ +rocketturrets_wiki = +{ + name = "Rocket_Turrets", + title = {"rocketturrets.menu_rocketturrets"}, + mod_path = "__Rocket_Turrets__", + { + name = {"rocketturrets.title_rocketturrets"}, + topic = { + {type = "image", name = "image_cover", filepath = "__Rocket_Turrets__/graphics/info/cover.png", width = 380, height = 264, scale = 0.95}, + {type = "text", text = {"info.text_intro"} }, + {type = "line"}, + {type = "title", title = {"info.heading_turrets"} }, + {type = "image", name = "image_turrets", filepath = "__Rocket_Turrets__/graphics/info/turrets.png", width = 154, height = 154, scale = 0.516}, + {type = "text", text = {"info.text_turrets"} }, + {type = "line"}, + {type = "title", title = {"info.heading_ammo"} }, + {type = "image", name = "image_ammo", filepath = "__Rocket_Turrets__/graphics/info/ammo.png", width = 104, height = 64, scale = 1}, + {type = "text", text = {"info.text_ammo"} }, + } + } +} + +rocketturrets_bob_wiki = +{ + name = "Rocket_Turrets", + title = {"rocketturrets.menu_rocketturrets"}, + mod_path = "__Rocket_Turrets__", + { + name = {"rocketturrets.title_rocketturrets"}, + topic = { + {type = "image", name = "image_cover", filepath = "__Rocket_Turrets__/graphics/info/cover_bob.png", width = 380, height = 264, scale = 0.95}, + {type = "text", text = {"info.text_intro"} }, + {type = "line"}, + {type = "title", title = {"info.heading_turrets"} }, + {type = "image", name = "image_turrets", filepath = "__Rocket_Turrets__/graphics/info/turrets_bob.png", width = 698, height = 154, scale = 0.516}, + {type = "text", text = {"info.text_turrets_bob"} }, + {type = "line"}, + {type = "title", title = {"info.heading_ammo"} }, + {type = "image", name = "image_ammo", filepath = "__Rocket_Turrets__/graphics/info/ammo.png", width = 104, height = 64, scale = 1}, + {type = "text", text = {"info.text_ammo"} }, + } + } +} \ No newline at end of file diff --git a/locale/de/locale.cfg b/locale/de/locale.cfg index b0c1996..d0d7ec8 100644 --- a/locale/de/locale.cfg +++ b/locale/de/locale.cfg @@ -25,6 +25,8 @@ rocket-turret-mk5=Raketen-Geschützturm MK5 [rocketturrets] menu_rocketturrets=Rocket Turrets title_rocketturrets=Rocket Turrets + +[info] text_intro=Raketen waren in Factorio schon immer das hässliche Entlein, das dritte Rad am Wagen der Basisverteidigung. Für manuellen Beschuss eignen sich andere Methoden besser, und automatischer Beschuss war lange nicht möglich. Doch nun hast du deine Badonkadonks in einen Geschützturm geschraubt, um Chaos und Explosionen auf Beißer und Speier regnen zu lassen. heading_turrets=Neue Geschütztürme text_turrets=Du hast neue Geschützturm entwickelt. Leider hattest du nur noch diese Farbe auf Lager. Jetzt sehen die Geschütztürme zwar etwas trist aus, aber sie verschießen Raketen, die ihren üblichen Schaden anrichten. diff --git a/locale/en/locale.cfg b/locale/en/locale.cfg index 7c70d9b..14b4d14 100644 --- a/locale/en/locale.cfg +++ b/locale/en/locale.cfg @@ -25,6 +25,8 @@ rocket-turret-mk5=Rocket turret MK5 [rocketturrets] menu_rocketturrets=Rocket Turrets title_rocketturrets=Rocket Turrets + +[info] text_intro=Rockets have always been the lame duck, the third wheel of base defense in Factorio. For manual fire, other methods are more effective, and automatic fire was not possible for a long time. But now, you screwed your badonkadonks on a turret socket to make mayhem and explosions rain on biters and spitters. heading_turrets=New Turrets text_turrets=You developed new turrets. Sadly, you only had one colour available to paint them. Now the turrets look a bit depressing, but they launch rockets dealing their usual damage. diff --git a/locale/pl/locale.cfg b/locale/pl/locale.cfg index 1f384e4..39f8e86 100644 --- a/locale/pl/locale.cfg +++ b/locale/pl/locale.cfg @@ -25,6 +25,8 @@ rocket-turret-mk5=Działko rakietowe MK5 [rocketturrets] menu_rocketturrets=Rocket Turrets title_rocketturrets=Rocket Turrets + +[info] text_intro=Rockets have always been the lame duck, the third wheel of base defense in Factorio. For manual fire, other methods are more effective, and automatic fire was not possible for a long time. But now, you screwed your badonkadonks on a turret socket to make mayhem and explosions rain on biters and spitters. heading_turrets=New Turrets text_turrets=You developed new turrets. Sadly, you only had one colour available to paint them. Now the turrets look a bit depressing, but they launch rockets dealing their usual damage. diff --git a/prototypes/recipe.lua b/prototypes/recipe.lua index fe1c7e3..1fdfd70 100644 --- a/prototypes/recipe.lua +++ b/prototypes/recipe.lua @@ -8,9 +8,9 @@ rocket_recipe = { ingredients = { {"rocket-launcher", 10}, - {"iron-gear-wheel", 5}, + {"iron-gear-wheel", 10}, {"steel-plate", 20}, - {"advanced-circuit", 15}, + {"electronic-circuit", 20}, }, result = "rocket-turret", order = "c-a"