Merge branch 'master' of yunohost.local:mtcontrib/minetest_mana into nalc-1.2-dev

API.md

@@ -1,5 +1,5 @@
-API documentation for Mana 1.2.0
+API documentation for Mana mod
-================================
+==============================
 
 ## Introduction
 The API of the Mana mod allows you to set and receive

README.md

@@ -1,6 +1,6 @@
 # Mana [mana]
 
-* Version: 1.2.0
+* Version: 1.3.1
 * Note: This mod uses semantic versioning, as defined by version 2.0.0 of the SemVer standard. See: <http://semver.org/>
 
 ## Description
@@ -14,7 +14,7 @@ Each player will have an additional attribute: Mana. To be precise:
 
 By default, each player spawns with 0/200 mana, and regenerates 1 mana per fifth of a second. All
 these values can be configured with the server settings (`minetest.conf`) and it is highly advised to do
-so if you plan to integrate this mod into a subgame.
+so if you plan to integrate this mod into a game.
 
 The mana regeneration rate (the “mana tick”) is a global setting and is *not* configured on a
 per-player basis.
@@ -26,7 +26,6 @@ way. You should install other mods which use the Mana mod as a dependency.
 The API documentation is in the file `API.md`.
 
 If the mod “HUD bars” [`hudbars`] is installed, a blue bar will be added to the HUD showing the player's mana reserves.
-It currently only works with version 0.3.0 of this mod.
 
 Otherwise, the mana is just shown as text.
 
@@ -44,5 +43,5 @@ License information
 ===================
 * `textures/mana_icon.png`: [CC BY 3.0](https://creativecommons.org/licenses/by/3.0/) by [Buch](http://opengameart.org/users/Buch).
 * `textures/mana_bgicon.png`: CC BY 3.0, originally by Buch, modified by Wuzzy.
-* `textures/mana_bar.png`: [WTFPL](http://www.wtfpl.net/txt/copying/) by Wuzzy.
+* `textures/mana_bar.png`: [MIT License](https://opensource.org/licenses/MIT) by Wuzzy.
-* Everything else: WTFPL.
+* Everything else: MIT License.

depends.txt

@@ -1,2 +0,0 @@
-hudbars?
-intllib?

description.txt

@@ -1 +0,0 @@
-Adds a mana attribute to players, can be used as energy source for magical items, etc.

init.lua

@@ -2,19 +2,14 @@
 Mana
 This mod adds mana to players, a special attribute
 
-License: WTFPL
+License: MIT License
 ]]
 
 --[===[
 	Initialization
 ]===]
 
-local S
+local S = minetest.get_translator("mana")
-if (minetest.get_modpath("intllib")) then
-	S = intllib.Getter()
-else
-	S = function(s,a,...)a={a,...}return s:gsub("@(%d+)",function(n)return a[tonumber(n)]end)end
-end
 
 mana = {}
 mana.playerlist = {}
@@ -25,17 +20,17 @@ mana.settings.default_regen = 1
 mana.settings.regen_timer = 0.2
 
 do
-	local default_max = tonumber(minetest.setting_get("mana_default_max"))
+	local default_max = tonumber(minetest.settings:get("mana_default_max"))
 	if default_max ~= nil then
 		mana.settings.default_max = default_max
 	end
 
-	local default_regen = tonumber(minetest.setting_get("mana_default_regen"))
+	local default_regen = tonumber(minetest.settings:get("mana_default_regen"))
 	if default_regen ~= nil then
 		mana.settings.default_regen = default_regen
 	end
 
-	local regen_timer = tonumber(minetest.setting_get("mana_regen_timer"))
+	local regen_timer = tonumber(minetest.settings:get("mana_regen_timer"))
 	if regen_timer ~= nil then
 		mana.settings.regen_timer = regen_timer
 	end
@@ -276,7 +271,7 @@ end)
 ]===]
 
 if minetest.get_modpath("hudbars") ~= nil then
-	hb.register_hudbar("mana", 0xFFFFFF, S("Mana"), { bar = "mana_bar.png", icon = "mana_icon.png", bgicon = "mana_bgicon.png" }, 0, mana.settings.default_max, false)
+	hb.register_hudbar("mana", 0xFFFFFF, S("Mana"), { bar = "mana_bar_purple.png", icon = "mana_icon_purple.png", bgicon = "mana_icon_bg_empty.png" }, 0, mana.settings.default_max, false)
 
 	function mana.hud_update(playername)
 		local player = minetest.get_player_by_name(playername)
@@ -326,3 +321,5 @@ end
 mana.round = function(x)
 	return math.ceil(math.floor(x+0.5))
 end
+
+minetest.log("action", "[mana] loaded.")

locale/de.txt

@@ -1,2 +0,0 @@
-Mana = Mana
-Mana: @1/@2 = Mana: @1/@2

locale/mana.de.tr

@@ -0,0 +1,3 @@
+# textdomain:mana
+Mana=Mana
+Mana: @1/@2=Mana: @1/@2

locale/template.txt

@@ -1,2 +1,3 @@
+# textdomain:mana
 Mana=
 Mana: @1/@2=

mod.conf

@@ -0,0 +1,3 @@
+name = mana
+description = Adds a mana attribute to players, can be used as energy source for magical items, etc.
+optional_depends = hudbars