Forgot credits

fr trans

README.md

@@ -7,11 +7,15 @@ 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.
 
-### Credits
-- 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).
+### 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).
+- Thanks to [Friendch](https://mods.factorio.com/user/Friendch) for the french translation.

changelog.txt

@@ -1,4 +1,26 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.1
+Date: 2021-09-06
+  Locale:
+    - Added french locale (thanks to Friendch)
+---------------------------------------------------------------------------------------------------
+Version: 1.1.0
+Date: 2020-11-19
+  Changes:
+    - Integrated 1.1 base game technology rename for gun turrets
+---------------------------------------------------------------------------------------------------
+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:
+    - Added Factorio Wiki Mod integration and dynamic informational page (also depending on bobplates)
+---------------------------------------------------------------------------------------------------
 Version: 0.18.3
 Date: 2020-03-16
   Features:

control.lua

@@ -1,3 +1,5 @@
 --control.lua
 
-require("integrations.informatron.control")
+require("integrations.informatron.control")
+require("integrations.wiki.control")
+require("integrations.Booktorio.control")

data.lua

@@ -13,5 +13,8 @@ data:extend({
 })
 
 -- integrations
+require("integrations.bobwarfare.data")
 require("integrations.bobplates.data")
-require("integrations.informatron.data")
+require("integrations.informatron.data")
+require("integrations.wiki.data")
+require("integrations.Booktorio.data")

info.json

@@ -1,13 +1,16 @@
 {
     "name": "Rocket_Turrets",
-    "version": "0.18.3",
+    "version": "1.1.1",
     "title": "RocketTurrets",
     "author": "Wyrrrd",
-    "factorio_version": "0.18",
+    "factorio_version": "1.1",
     "dependencies": [
-        "base >= 0.18.0",
+        "base >= 1.1.0",
         "? bobplates >= 0.18.1",
-        "? informatron >= 0.1.5"
+        "? bobwarfare >= 0.18.3",
+        "? Booktorio >= 1.0.0",
+        "? informatron >= 0.1.5",
+        "? wiki >= 0.18.01"
 	],
     "description": "Adds rocket turrets"
 }

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)

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

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

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},
+}

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

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"},

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]",

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"
 }

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 =
 	{

integrations/informatron/control.lua

@@ -15,22 +15,22 @@ 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"}}
+	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="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"}}
+		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={"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"}}
+	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

integrations/informatron/data.lua

@@ -1,7 +1,7 @@
 if mods["informatron"] then
-	informatron_make_image("rocketturrets_cover", "__Rocket_Turrets__/integrations/informatron/graphics/cover.png", 380, 264)
-	informatron_make_image("rocketturrets_cover_bob", "__Rocket_Turrets__/integrations/informatron/graphics/cover_bob.png", 380, 264)
-	informatron_make_image("rocketturrets_turrets", "__Rocket_Turrets__/integrations/informatron/graphics/turrets.png", 154, 154)
-	informatron_make_image("rocketturrets_turrets_bob", "__Rocket_Turrets__/integrations/informatron/graphics/turrets_bob.png", 698, 154)
-	informatron_make_image("rocketturrets_ammo", "__Rocket_Turrets__/integrations/informatron/graphics/ammo.png", 104, 64)
+	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

integrations/wiki/control.lua

@@ -0,0 +1,17 @@
+require("integrations.wiki.wiki")
+
+if script.active_mods["wiki"] then
+  local initialize_wiki
+  if script.active_mods["bobwarfare"] then
+    initialize_wiki = function()
+      remote.call("wiki","register_mod_wiki",rocketturrets_bob_wiki)
+    end
+  else
+    initialize_wiki = function()
+      remote.call("wiki","register_mod_wiki",rocketturrets_wiki)
+    end
+  end
+    
+  script.on_init(initialize_wiki)
+  script.on_load(initialize_wiki) 
+end

integrations/wiki/data.lua

@@ -0,0 +1,9 @@
+require("integrations.wiki.wiki")
+
+if mods["wiki"] then
+	if mods["bobwarfare"] then
+		wiki_register_mod_wiki(rocketturrets_bob_wiki)
+	else
+		wiki_register_mod_wiki(rocketturrets_wiki)
+	end
+end

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"} },
+    }
+  }
+}

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.

locale/en/locale.cfg

@@ -25,9 +25,11 @@ 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.
 text_turrets_bob=You developed new turrets, which are glistening in (almost) every colours of the rainbow. The yellow rocket turret deals the rocket's usual damage. Every improvement (MK2-5) increases damage by 25% and range by 2. The turrets MK4-5 can each handle an additional stack of ammunition, too.
 heading_ammo=Ammunition
-text_ammo=All rockets can be loaded into the rocket turrets. To prevent them from self-destroying, rocket turrets cannot attack enemies inside a radius of 15 around them. Additional care should be taken when using atom bombs, since the explosion has a far greater radius than that and may therefore cause mayhem over your very own base defenses.
+text_ammo=All rockets can be loaded into the rocket turrets. To prevent them from self-destroying, rocket turrets cannot attack enemies inside a radius of 15 around them. Additional care should be taken when using atomic bombs, since the explosion has a far greater radius than that and may therefore cause mayhem over your very own base defenses.

locale/fr/locale.cfg

@@ -0,0 +1,35 @@
+[mod-description]
+Rocket_Turrets=Ajoute des tourelles lance-missiles
+
+[item-name]
+rocket-turret=Tourelle lance-missiles
+rocket-turret-mk2=Tourelle lance-missiles MK2
+rocket-turret-mk3=Tourelle lance-missiles MK3
+rocket-turret-mk4=Tourelle lance-missiles MK4
+rocket-turret-mk5=Tourelle lance-missiles MK5
+
+[entity-name]
+rocket-turret=Tourelle lance-missiles 
+rocket-turret-mk2=Tourelle lance-missiles MK2
+rocket-turret-mk3=Tourelle lance-missiles MK3
+rocket-turret-mk4=Tourelle lance-missiles MK4
+rocket-turret-mk5=Tourelle lance-missiles MK5
+
+[technology-name]
+rocket-turret=Tourelle lance-missiles 
+rocket-turret-mk2=Tourelle lance-missiles MK2
+rocket-turret-mk3=Tourelle lance-missiles MK3
+rocket-turret-mk4=Tourelle lance-missiles MK4
+rocket-turret-mk5=Tourelle lance-missiles MK5
+
+[rocketturrets]
+menu_rocketturrets=Rocket Turrets
+title_rocketturrets=Rocket Turrets
+
+[info]
+text_intro=Les missiles ont toujours été le vilain petit canard, la cinquième roue du carrosse quant à la défense dans Factorio. En artillerie légère d'autres méthodes sont plus efficaces, et en lourde ça n'existait simplement pas... Mais voilà, maintenant vous pouvez visser votre Bazooka sur une tourelle et faire pleuvoir l'enfer sur vos ennemis !
+heading_turrets=Nouvelles tourelles
+text_turrets=Vous avez développé vos nouvelles tourelles, elles sont certes un peu moroses, sans couleur, mais au moins elles font le boulot !
+text_turrets_bob=Vous avez développé vos nouvelles tourelles, et celles-ci brillent dans (presque) toutes les couleurs de l'arc-en-ciel. La jaune fait les dégâts habituels, les versions supérieures (MK2-5) les augmentent de 25% chacune, ainsi que la portée par 2. Les améliorations MK4 et 5 peuvent aussi recevoir un stock de munitions supplémentaires.
+heading_ammo=Munitions
+text_ammo=Les tourelles peuvent accueillir tout type de missiles. Pour éviter qu'elles ne se détruisent elles-mêmes, elles ne pourront pas tirer sur les ennemis qui lui sont trop proches. (Dans un rayon de 15 autour d'elles.) Une attention particulière est requise pour l'utilisation de bombes atomiques, elles sont assez dévastatrices pour détruire vos défenses par la même occasion...

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.

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"

prototypes/technology.lua

@@ -15,7 +15,7 @@ rocket_tech = {
 	prerequisites =
 	{
 		"rocketry",
-		"turrets",
+		"gun-turret",
 		"steel-processing",
 	},
 	unit =