Added wiki integration

Also moved graphics to be used by both info integrations

README.md

@@ -9,9 +9,10 @@ This mod should just work, but I specifically added compatibility for the follow
 
 + [Bob's Metals, Chemicals and Intermediates](https://mods.factorio.com/mod/bobplates) - more turrets (MK2-MK5)
 + [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
 
 ### 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.
 
-### Credits
+### 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).

changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+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,4 @@
 --control.lua
 
-require("integrations.informatron.control")
+require("integrations.info.informatron.control")
+require("integrations.info.wiki.control")

data.lua

@@ -14,4 +14,5 @@ data:extend({
 
 -- integrations
 require("integrations.bobplates.data")
-require("integrations.informatron.data")
+require("integrations.info.informatron.data")
+require("integrations.info.wiki.data")

info.json

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

integrations/info/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("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

integrations/info/wiki/control.lua

@@ -0,0 +1,17 @@
+require("integrations.info.wiki.wiki")
+
+if script.active_mods["wiki"] then
+  local initialize_wiki
+  if script.active_mods["bobplates"] 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(function() initialize_wiki() end)
+  script.on_load(function() initialize_wiki() end) 
+end

integrations/info/wiki/data.lua

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

integrations/info/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__/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"} },
+    }
+  }
+}

locale/en/locale.cfg

@@ -30,4 +30,4 @@ 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.