From 2606c264b9aacdc25512886c998f87e804de9ad0 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 27 Mar 2018 15:08:31 +0200 Subject: [PATCH] Update doc modpack (1.2.2) --- mods/HELP/doc/doc/API.md | 4 ++-- mods/HELP/doc/doc/README.md | 6 ++--- mods/HELP/doc/doc/init.lua | 2 +- mods/HELP/doc/doc_identifier/README.md | 2 +- mods/HELP/doc/doc_identifier/init.lua | 22 +++++++++--------- mods/HELP/doc/doc_identifier/locale/de.txt | 2 +- .../doc/doc_identifier/locale/template.txt | 2 +- .../textures/doc_identifier_identifier.png | Bin 284 -> 429 bytes .../doc_identifier_identifier_liquid.png | Bin 287 -> 414 bytes mods/HELP/doc/doc_items/API.md | 4 ++-- mods/HELP/doc/doc_items/README.md | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/mods/HELP/doc/doc/API.md b/mods/HELP/doc/doc/API.md index 3c20a12b8..784a66685 100644 --- a/mods/HELP/doc/doc/API.md +++ b/mods/HELP/doc/doc/API.md @@ -41,7 +41,7 @@ this mod is capable of and how these use cases could be implemented. ### Simple use case: Minetest basics Let's say you want to write in free form short help texts about the basic -concepts of Minetest or your subgame. First you could define a category +concepts of Minetest or your game. First you could define a category called “Basics”, the data for each of its entry is just a free form text. The template function simply creates a formspec where this free form text is displayed. @@ -233,7 +233,7 @@ The help starts with this default order: This function can be called at any time, but it recommended to only call this function once for the entire server session and to only call it -from subgame mods, to avoid contradictions. If this function is called a +from game mods, to avoid contradictions. If this function is called a second time by any mod, a warning is written into the log. #### Parameters diff --git a/mods/HELP/doc/doc/README.md b/mods/HELP/doc/doc/README.md index 5731495ce..f95b5f89a 100644 --- a/mods/HELP/doc/doc/README.md +++ b/mods/HELP/doc/doc/README.md @@ -4,7 +4,7 @@ can access help pages about various things and the modder can add those pages. The mod itself does not provide any help texts, just the framework. It is the heart of the Help modpack, on which the other Help mods depend. -Current version: 1.1.0 +Current version: 1.1.1 ## For players ### Accessing the help @@ -37,9 +37,9 @@ stored in the world directory in the file `doc.mt`. You can safely reset the viewed/revealed state of all players by deleting this file. Players then need to start over revealing all entries. -## For modders and subgame authors +## For modders and game authors This mod helps you in creating extensive and flexible help entries for your -mods or subgame. You can write about basically anything in the presentation +mods or game. You can write about basically anything in the presentation you prefer. To get started, read `API.md` in the directory of this mod. diff --git a/mods/HELP/doc/doc/init.lua b/mods/HELP/doc/doc/init.lua index b8f82703c..7f4705ef5 100644 --- a/mods/HELP/doc/doc/init.lua +++ b/mods/HELP/doc/doc/init.lua @@ -689,7 +689,7 @@ do doc.data.players[name] = {} doc.data.players[name].stored_data = players_stored_data end - minetest.debug("[doc] doc.mt successfully read.") + minetest.log("action", "[doc] doc.mt successfully read.") end end end diff --git a/mods/HELP/doc/doc_identifier/README.md b/mods/HELP/doc/doc_identifier/README.md index 7620be7c5..7afe3b90c 100644 --- a/mods/HELP/doc/doc_identifier/README.md +++ b/mods/HELP/doc/doc_identifier/README.md @@ -1,5 +1,5 @@ # Lookup Tool [`doc_identifier`] -Version: 1.2.1 +Version: 1.2.2 ## Description The lookup tool is an useful little helper which can be used to quickly learn diff --git a/mods/HELP/doc/doc_identifier/init.lua b/mods/HELP/doc/doc_identifier/init.lua index b9675349e..8ba005f3c 100644 --- a/mods/HELP/doc/doc_identifier/init.lua +++ b/mods/HELP/doc/doc_identifier/init.lua @@ -36,7 +36,7 @@ doc_identifier.identify = function(itemstack, user, pointed_thing) mod = string.sub(param,1,colon-1) end end - message = S("Error: This node, item or object is undefined. This is always an error.\nThis can happen for the following reasons:\n• The mod which is required for it is not enabled\n• The author of the subgame or a mod has made a mistake") + message = S("Error: This node, item or object is undefined. This is always an error.\nThis can happen for the following reasons:\n• The mod which is required for it is not enabled\n• The author of the game or a mod has made a mistake") message = message .. "\n\n" if mod ~= nil then @@ -152,7 +152,7 @@ function doc_identifier.liquid_mode(itemstack, user, pointed_thing) -- Use pointed node's on_rightclick function first, if present if pointed_thing.type == "node" then local node = minetest.get_node(pointed_thing.under) - if user and not user:get_player_control().sneak then + if user and not user:get_player_control().sneak then if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack end @@ -190,19 +190,19 @@ minetest.register_tool("doc_identifier:identifier_liquid", { on_secondary_use = doc_identifier.solid_mode, }) --- TODO: These crafting recipes are temporary. Add a different way to obtain the lookup tool +--- TODO: These crafting recipes are temporary. Add a different way to obtain the lookup tool +minetest.register_craft({ + output = "doc_identifier:identifier_solid", + recipe = { {"group:stick", "group:stick" }, + {"", "group:stick"}, + {"group:stick", ""} } +}) + if minetest.get_modpath("mcl_core") ~= nil then - minetest.register_craft({ - output = "doc_identifier:identifier_solid", - recipe = { {"mcl_core:stick", "mcl_core:stick" }, - {"", "mcl_core:stick"}, - {"mcl_core:stick", ""} } - }) - minetest.register_craft({ output = "doc_identifier:identifier_solid", recipe = { { "mcl_core:glass" }, - { "mcl_core:stick" } } + { "group:stick" } } }) end diff --git a/mods/HELP/doc/doc_identifier/locale/de.txt b/mods/HELP/doc/doc_identifier/locale/de.txt index 54688cc20..418bd83b9 100644 --- a/mods/HELP/doc/doc_identifier/locale/de.txt +++ b/mods/HELP/doc/doc_identifier/locale/de.txt @@ -1,4 +1,4 @@ -Error: This node, item or object is undefined. This is always an error.\nThis can happen for the following reasons:\n• The mod which is required for it is not enabled\n• The author of the subgame or a mod has made a mistake = Fehler: Dieser Node, Gegenstand oder dieses Objekt ist nicht definiert.\nDas ist immer ein Fehler.\nDies kann aus folgenden Gründen passieren:\n• Die Mod, die dafür benötigt wird, ist nicht aktiv\n• Der Subgame-Autor oder ein Mod-Autor machte einen Fehler +Error: This node, item or object is undefined. This is always an error.\nThis can happen for the following reasons:\n• The mod which is required for it is not enabled\n• The author of the game or a mod has made a mistake = Fehler: Dieser Node, Gegenstand oder dieses Objekt ist nicht definiert.\nDas ist immer ein Fehler.\nDies kann aus folgenden Gründen passieren:\n• Die Mod, die dafür benötigt wird, ist nicht aktiv\n• Der Spiel-Autor oder ein Mod-Autor machte einen Fehler It appears to originate from the mod “%s”, which is enabled. = Es scheint von der Mod »%s« zu stammen. Sie ist aktiv. It appears to originate from the mod “%s”, which is not enabled! = Es scheint von der Mod »%s« zu stammen. Sie ist nicht aktiv! Its identifier is “%s”. = Der Identifkator ist »%s«. diff --git a/mods/HELP/doc/doc_identifier/locale/template.txt b/mods/HELP/doc/doc_identifier/locale/template.txt index e1dafd34b..b57c67f5d 100644 --- a/mods/HELP/doc/doc_identifier/locale/template.txt +++ b/mods/HELP/doc/doc_identifier/locale/template.txt @@ -1,4 +1,4 @@ -Error: This node, item or object is undefined. This is always an error.\\nThis can happen for the following reasons:\\n• The mod which is required for it is not enabled\\n• The author of the subgame or a mod has made a mistake = +Error: This node, item or object is undefined. This is always an error.\\nThis can happen for the following reasons:\\n• The mod which is required for it is not enabled\\n• The author of the game or a mod has made a mistake = It appears to originate from the mod “%s”, which is enabled. = It appears to originate from the mod “%s”, which is not enabled! = Its identifier is “%s”. = diff --git a/mods/HELP/doc/doc_identifier/textures/doc_identifier_identifier.png b/mods/HELP/doc/doc_identifier/textures/doc_identifier_identifier.png index 5e70ec84812c701894f90e674fd7fc24c912a6bd..00b3147a0befecc4dc438364a0b78bb743495fa2 100644 GIT binary patch delta 414 zcmV;P0b%}}0<8m(8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000SaNLh0L01m_e01m_f zl`9S#00007bV*G`2jB<<5EKO`VC^0N000bWR9JLFZ*6U5ZgcZto4yZyrd_1R_rt54tg-*D#9{{uxe{}mXm*0K&|8i~X z|CzU+|3?o*tkF0*j`_b?_Av%?b8|*?4d~H`0j9F;Rla;2w?o0dsXol{8h8H0R0K&L~9@ga0761SM07*qo IM6N<$f?sLFCjbBd delta 268 zcmV+n0rUQ?1Dpbo8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30002dNklW4v6m87T-t=Axd@6`G-eJYR{C{Z@l*!sE2^+*zFhAXO~ryzHdOh6~PHFHBD^YPCV@jTfGzAG!7GAbQ z&-{G8Jba%A{#uHgVSBSA0fcB`6>V~6tcB@ugY|^usvh7@3z66fk(w{a&mOH4d^7#b zeRhbMbOl}Ukj?l>ZUumX{79m8N^nuN>6`#IF4%KRT-TtlUxWZ?O$)N@r(9SsucOOw2r4_*Q?rJ(xk|*NGm(pJ$#VX tq&QoZrK1V?t4)jZHCZ|wm;5`u19iS~k;Sb(w*UYD00>D%PDHLkV1mp;s^tIx delta 271 zcmV+q0r38w1D^tr8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30002gNklk4g#JAy101Dq2+hq#n=3pdHXp&Pfw0xUcK}cL=Obv zQ$01F`Rks<$8$`Gim7P{EMNB|Kb~zwlD%PDHLkV1kmCd~^T+ diff --git a/mods/HELP/doc/doc_items/API.md b/mods/HELP/doc/doc_items/API.md index a683771c7..26cb11861 100644 --- a/mods/HELP/doc/doc_items/API.md +++ b/mods/HELP/doc/doc_items/API.md @@ -179,7 +179,7 @@ explicitly). ### Hand and air The mod adds some default help texts for the hand and the air which are -written in a way that they probably are true for most subgames out of the +written in a way that they probably are true for most games out of the box, but especially the hand help text is kept intentionally vague. If you want to change these help texts or the entry names or other attributes, just add `_doc_items_*` fields to the item definition, either @@ -271,7 +271,7 @@ entry then. #### Background Normally, the core factoids are written in a very general-purpose style, so this function might -not be needed at all. But it might be useful for subgames and mods which radically break with +not be needed at all. But it might be useful for games and mods which radically break with some of the underlying core assumptions in Minetest. For example, if your mod completely changes the digging system, the help texts provided by `doc_items` are probably incorrect, so you can disable `node_mining` and register a custom factoid as a replacement. diff --git a/mods/HELP/doc/doc_items/README.md b/mods/HELP/doc/doc_items/README.md index c163fea87..c3e6f67c7 100644 --- a/mods/HELP/doc/doc_items/README.md +++ b/mods/HELP/doc/doc_items/README.md @@ -1,4 +1,4 @@ -# Item Help [`doc_items`] (Version 1.1.1) +# Item Help [`doc_items`] (Version 1.1.2) ## Description Automatically generated help texts of blocks, tools, weapons, crafting items and other items.