From 8f4dcf4491aa851189a10a3263a4933008914ab1 Mon Sep 17 00:00:00 2001 From: Wyrrrd Date: Sun, 29 Mar 2020 14:46:31 +0200 Subject: [PATCH] Added wiki integration Also moved graphics to be used by both info integrations --- README.md | 1 + changelog.txt | 5 ++ control.lua | 3 +- data.lua | 3 +- info.json | 5 +- .../{informatron => info}/graphics/ammo.png | Bin .../{informatron => info}/graphics/cover.png | Bin .../graphics/cover_bob.png | Bin .../graphics/turrets.png | Bin .../graphics/turrets_bob.png | Bin .../{ => info}/informatron/control.lua | 0 integrations/{ => info}/informatron/data.lua | 10 ++-- .../{ => info}/informatron/sample.png | Bin integrations/info/wiki/control.lua | 17 +++++++ integrations/info/wiki/data.lua | 9 ++++ integrations/info/wiki/wiki.lua | 43 ++++++++++++++++++ 16 files changed, 87 insertions(+), 9 deletions(-) rename integrations/{informatron => info}/graphics/ammo.png (100%) rename integrations/{informatron => info}/graphics/cover.png (100%) rename integrations/{informatron => info}/graphics/cover_bob.png (100%) rename integrations/{informatron => info}/graphics/turrets.png (100%) rename integrations/{informatron => info}/graphics/turrets_bob.png (100%) rename integrations/{ => info}/informatron/control.lua (100%) rename integrations/{ => info}/informatron/data.lua (52%) rename integrations/{ => info}/informatron/sample.png (100%) create mode 100644 integrations/info/wiki/control.lua create mode 100644 integrations/info/wiki/data.lua create mode 100644 integrations/info/wiki/wiki.lua diff --git a/README.md b/README.md index f425838..ea25982 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ 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. diff --git a/changelog.txt b/changelog.txt index c8392c6..b51f1a6 100644 --- a/changelog.txt +++ b/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: diff --git a/control.lua b/control.lua index c27fa25..493c1de 100644 --- a/control.lua +++ b/control.lua @@ -1,3 +1,4 @@ --control.lua -require("integrations.informatron.control") \ No newline at end of file +require("integrations.info.informatron.control") +require("integrations.info.wiki.control") \ No newline at end of file diff --git a/data.lua b/data.lua index 4f4f037..480233e 100644 --- a/data.lua +++ b/data.lua @@ -14,4 +14,5 @@ data:extend({ -- integrations require("integrations.bobplates.data") -require("integrations.informatron.data") \ No newline at end of file +require("integrations.info.informatron.data") +require("integrations.info.wiki.data") \ No newline at end of file diff --git a/info.json b/info.json index 719d5f8..0af1477 100644 --- a/info.json +++ b/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" } \ No newline at end of file diff --git a/integrations/informatron/graphics/ammo.png b/integrations/info/graphics/ammo.png similarity index 100% rename from integrations/informatron/graphics/ammo.png rename to integrations/info/graphics/ammo.png diff --git a/integrations/informatron/graphics/cover.png b/integrations/info/graphics/cover.png similarity index 100% rename from integrations/informatron/graphics/cover.png rename to integrations/info/graphics/cover.png diff --git a/integrations/informatron/graphics/cover_bob.png b/integrations/info/graphics/cover_bob.png similarity index 100% rename from integrations/informatron/graphics/cover_bob.png rename to integrations/info/graphics/cover_bob.png diff --git a/integrations/informatron/graphics/turrets.png b/integrations/info/graphics/turrets.png similarity index 100% rename from integrations/informatron/graphics/turrets.png rename to integrations/info/graphics/turrets.png diff --git a/integrations/informatron/graphics/turrets_bob.png b/integrations/info/graphics/turrets_bob.png similarity index 100% rename from integrations/informatron/graphics/turrets_bob.png rename to integrations/info/graphics/turrets_bob.png diff --git a/integrations/informatron/control.lua b/integrations/info/informatron/control.lua similarity index 100% rename from integrations/informatron/control.lua rename to integrations/info/informatron/control.lua diff --git a/integrations/informatron/data.lua b/integrations/info/informatron/data.lua similarity index 52% rename from integrations/informatron/data.lua rename to integrations/info/informatron/data.lua index ff00991..040357a 100644 --- a/integrations/informatron/data.lua +++ b/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 \ No newline at end of file diff --git a/integrations/informatron/sample.png b/integrations/info/informatron/sample.png similarity index 100% rename from integrations/informatron/sample.png rename to integrations/info/informatron/sample.png diff --git a/integrations/info/wiki/control.lua b/integrations/info/wiki/control.lua new file mode 100644 index 0000000..87a1e56 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/integrations/info/wiki/data.lua b/integrations/info/wiki/data.lua new file mode 100644 index 0000000..8e4bc22 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/integrations/info/wiki/wiki.lua b/integrations/info/wiki/wiki.lua new file mode 100644 index 0000000..2cdabcf --- /dev/null +++ b/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"} }, + } + } +} \ No newline at end of file