Version 1.2.0

API.md

@@ -1,4 +1,4 @@
-API documentation for Mana 1.1.0
+API documentation for Mana 1.2.0
 ================================
 
 ## Introduction

README.md

@@ -1,18 +1,16 @@
-Mana mod [mana]
+# Mana [mana]
-===============
-Version: 1.1.0
-Note: This mod uses semantic versioning, as defined by version 2.0.0 of the SemVer standard.
-See: <http://semver.org/>
 
-Description
+* Version: 1.2.0
-===========
+* Note: This mod uses semantic versioning, as defined by version 2.0.0 of the SemVer standard. See: <http://semver.org/>
+
+## Description
 This mod adds basic support for mana to Minetest.
 
 Each player will have an additional attribute: Mana. To be precise:
 
-- Current mana reserves: How much mana the player currently has
+* Current mana reserves: How much mana the player currently has
-- Maximum possible mana: How much mana the player can have at maximum
+* Maximum possible mana: How much mana the player can have at maximum
-- Mana regeneration amont: How much mana will be generated each “mana tick” (default 0.2 seconds)
+* Mana regeneration amont: How much mana will be generated each “mana tick” (default 0.2 seconds)
 
 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
@@ -25,15 +23,14 @@ The mod provides a simple API to set, get, add and subtract the mana (and maximu
 for setting the regeneration amount. Note that this mod itself does *not* change the gameplay in a meaningful
 way. You should install other mods which use the Mana mod as a dependency.
 
-The API documentation is in the file API.md.
+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.
+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.
 
-Configuration
+## Configuration
-=============
 
 This mod can be configured with minetest.conf! The following settings are accepted:
 
@@ -43,10 +40,9 @@ This mod can be configured with minetest.conf! The following settings are accept
   regen value per mana tick. Default: `0.2`. This value must be positive, also try to avoid very small values
   as those could probably stress your machine a lot.
 
-
 License information
 ===================
-* textures/mana_icon.png: CC-BY by Buch <http://opengameart.org/users/Buch>.
+* `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, originally by Buch <http://opengameart.org/users/Buch>, modified by Wuzzy.
+* `textures/mana_bgicon.png`: CC BY 3.0, originally by Buch, modified by Wuzzy.
-* textures/mana_bar.png: WTFPL by Wuzzy.
+* `textures/mana_bar.png`: [WTFPL](http://www.wtfpl.net/txt/copying/) by Wuzzy.
 * Everything else: WTFPL.

depends.txt

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

init.lua

@@ -1,5 +1,5 @@
 --[[
-Mana 1.0.2
+Mana
 This mod adds mana to players, a special attribute
 
 License: WTFPL
@@ -9,13 +9,20 @@ License: WTFPL
 	Initialization
 ]===]
 
+local S
+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 = {}
 
 mana.settings = {}
 mana.settings.default_max = 200
-mana.settings.default_regen = 10
+mana.settings.default_regen = 1
-mana.settings.regen_timer = 10
+mana.settings.regen_timer = 0.2
 
 do
 	local default_max = tonumber(minetest.setting_get("mana_default_max"))
@@ -35,8 +42,6 @@ do
 end
 
 
-minetest.mkdir(minetest.get_worldpath() .. "/mana/")
-
 --[===[
 	API functions
 ]===]
@@ -159,39 +164,35 @@ end
 
 
 -- Load the playerlist from a previous session, if available.
-function mana.load_file(playername)
+do
-	local filepath = minetest.get_worldpath().."/mana/" .. playername
+	local filepath = minetest.get_worldpath().."/mana.mt"
 	local file = io.open(filepath, "r")
 	if file then
-		minetest.log("action", "[mana] File opened for player " .. playername .. ".")
+		minetest.log("action", "[mana] mana.mt opened.")
 		local string = file:read()
 		io.close(file)
 		if(string ~= nil) then
 			local savetable = minetest.deserialize(string)
-			if savetable and type(savetable) == "table" then
+			mana.playerlist = savetable.playerlist
-				minetest.log("action", "[mana] Data successfully read.")
+			minetest.debug("[mana] mana.mt successfully read.")
-				return savetable
-			end
 		end
 	end
-	return {}
 end
 
-mana.playerlist = {}
+function mana.save_to_file()
-
+	local savetable = {}
-function mana.save_to_file(playername)
+	savetable.playerlist = mana.playerlist
-	local savetable = mana.playerlist[playername]
 
 	local savestring = minetest.serialize(savetable)
 
-	local filepath = minetest.get_worldpath().."/mana/" .. playername
+	local filepath = minetest.get_worldpath().."/mana.mt"
 	local file = io.open(filepath, "w")
 	if file then
 		file:write(savestring)
 		io.close(file)
-		minetest.log("action", "[mana] Wrote mana data for "..playername..".")
+		minetest.log("action", "[mana] Wrote mana data into "..filepath..".")
 	else
-		minetest.log("error", "[mana] Failed to write mana data for "..playername..".")
+		minetest.log("error", "[mana] Failed to write mana data into "..filepath..".")
 	end
 end
 
@@ -208,21 +209,19 @@ minetest.register_on_leaveplayer(function(player)
 	if not minetest.get_modpath("hudbars") ~= nil then
 		mana.hud_remove(playername)
 	end
-	mana.save_to_file(playername)
+	mana.save_to_file()
 end)
 
 minetest.register_on_shutdown(function()
-      minetest.log("action", "[mana] Server shuts down. Rescuing data into mana.mt")
+	minetest.log("action", "[mana] Server shuts down. Rescuing data into mana.mt")
-      for _, pref in pairs(minetest.get_connected_players()) do
+	mana.save_to_file()
-	 mana.save_to_file(pref:get_player_name())
-      end
 end)
 
 minetest.register_on_joinplayer(function(player)
 	local playername = player:get_player_name()
 	
-	mana.playerlist[playername] = mana.load_file(playername)
+	if mana.playerlist[playername] == nil then
-	if not mana.playerlist[playername].mana then
+		mana.playerlist[playername] = {}
 		mana.playerlist[playername].mana = 0
 		mana.playerlist[playername].maxmana = mana.settings.default_max
 		mana.playerlist[playername].regen = mana.settings.default_regen
@@ -243,38 +242,41 @@ end)
 
 mana.regen_timer = 0
 
-function mana_regen_step()
+minetest.register_globalstep(function(dtime)
-	local players = minetest.get_connected_players()
+	mana.regen_timer = mana.regen_timer + dtime
-	for i=1, #players do
+	if mana.regen_timer >= mana.settings.regen_timer then
-		local name = players[i]:get_player_name()
+		local factor = math.floor(mana.regen_timer / mana.settings.regen_timer)
-		if mana.playerlist[name] ~= nil then
+		local players = minetest.get_connected_players()
-			if players[i]:get_hp() > 0 then
+		for i=1, #players do
-				local plus = mana.playerlist[name].regen
+			local name = players[i]:get_player_name()
-				-- Compability check for version <= 1.0.2 which did not have the remainder field
+			if mana.playerlist[name] ~= nil then
-				if mana.playerlist[name].remainder ~= nil then
+				if players[i]:get_hp() > 0 then
-					plus = plus + mana.playerlist[name].remainder
+					local plus = mana.playerlist[name].regen * factor
+					-- Compability check for version <= 1.0.2 which did not have the remainder field
+					if mana.playerlist[name].remainder ~= nil then
+						plus = plus + mana.playerlist[name].remainder
+					end
+					local plus_now = math.floor(plus)
+					local floor = plus - plus_now
+					if plus_now > 0 then
+						mana.add_up_to(name, plus_now)
+					else
+						mana.subtract_up_to(name, math.abs(plus_now))
+					end
+					mana.playerlist[name].remainder = floor
 				end
-				local plus_now = math.floor(plus)
-				local floor = plus - plus_now
-				if plus_now > 0 then
-					mana.add_up_to(name, plus_now)
-				else
-					mana.subtract_up_to(name, math.abs(plus_now))
-				end
-				mana.playerlist[name].remainder = floor
 			end
 		end
+		mana.regen_timer = mana.regen_timer % mana.settings.regen_timer
 	end
-	minetest.after(mana.settings.regen_timer, mana_regen_step)
+end)
-end
-minetest.after(0, mana_regen_step)
 
 --[===[
 	HUD functions
 ]===]
 
 if minetest.get_modpath("hudbars") ~= nil then
-	hb.register_hudbar("mana", 0xFFFFFF, "Mana", { bar = "mana_bar_purple.png", icon = "mana_icon_purple.png", bgicon = "mana_bgicon.png" }, 0, mana.settings.default_max, false)
+	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)
 
 	function mana.hud_update(playername)
 		local player = minetest.get_player_by_name(playername)
@@ -288,39 +290,28 @@ if minetest.get_modpath("hudbars") ~= nil then
 
 else
 	function mana.manastring(playername)
-		return string.format("Mana: %d/%d", mana.get(playername), mana.getmax(playername))
+		return S("Mana: @1/@2", mana.get(playername), mana.getmax(playername))
 	end
 	
 	function mana.hud_add(playername)
 		local player = minetest.get_player_by_name(playername)
-		player:hud_add({
-			hud_elem_type = "statbar",
-			position = {x=0.5,y=1},
-			size = {x=24, y=24},
-			text = "mana_icon_bg_empty.png",
-			number = 20,
-			alignment = {x=-1,y=-1},
-			offset = {x=80, y=-186},
-			}
-		)
 		local id = player:hud_add({
-			hud_elem_type = "statbar",
+			hud_elem_type = "text",
-			position = {x=0.5,y=1},
+			position = { x = 0.5, y=1 },
-			size = {x=24, y=24},
+			text = mana.manastring(playername),
-			text = "mana_icon_purple.png",
+			scale = { x = 0, y = 0 },
-			number = mana.get(playername)/10,
+			alignment = { x = 1, y = 0},
-			alignment = {x=-1,y=-1},
+			direction = 1,
-			offset = {x=80, y=-186},
+			number = 0xFFFFFF,
-			}
+			offset = { x = -262, y = -103}
-		)
+		})
-
 		mana.playerlist[playername].hudid = id
 		return id
 	end
 	
 	function mana.hud_update(playername)
 		local player = minetest.get_player_by_name(playername)
-		player:hud_change(mana.playerlist[playername].hudid, "number", mana.get(playername)/100)
+		player:hud_change(mana.playerlist[playername].hudid, "text", mana.manastring(playername))
 	end
 	
 	function mana.hud_remove(playername)

locale/de.txt

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

locale/template.txt

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