Version 1.3.1

API.md

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

README.md

@@ -1,22 +1,20 @@
-Mana mod [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/>
+# Mana [mana]
 
-Description
-===========
+* 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
 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
-- 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)
+* Current mana reserves: How much mana the player currently has
+* 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)
 
 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.
@@ -25,15 +23,13 @@ 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.
-It currently only works with version 0.3.0 of this mod.
+If the mod “HUD bars” [`hudbars`] is installed, a blue bar will be added to the HUD showing the player's mana reserves.
 
 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 +39,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_bgicon.png: CC-BY, originally by Buch <http://opengameart.org/users/Buch>, modified by Wuzzy.
-* textures/mana_bar.png: WTFPL by Wuzzy.
-* Everything else: WTFPL.
+* `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`: [MIT License](https://opensource.org/licenses/MIT) by Wuzzy.
+* Everything else: MIT License.

depends.txt

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

description.txt

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

init.lua

@@ -1,47 +1,47 @@
 --[[
-Mana 1.0.2
+Mana
 This mod adds mana to players, a special attribute
 
-License: WTFPL
+License: MIT License
 ]]
 
 --[===[
 	Initialization
 ]===]
 
+local S = minetest.get_translator("mana")
+
 mana = {}
 mana.playerlist = {}
 
 mana.settings = {}
 mana.settings.default_max = 200
-mana.settings.default_regen = 10
-mana.settings.regen_timer = 10
+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
 end
 
 
-minetest.mkdir(minetest.get_worldpath() .. "/mana/")
-
 --[===[
 	API functions
 ]===]
 
-function mana.set(playername, value)
+function mana.set(playername, value) 
 	if value < 0 then
 		minetest.log("info", "[mana] Warning: mana.set was called with negative value!")
 		value = 0
@@ -110,7 +110,7 @@ function mana.add(playername, value)
 	local t = mana.playerlist[playername]
 	value = mana.round(value)
 	if(t ~= nil and ((t.mana + value) <= t.maxmana) and value >= 0) then
-		t.mana = t.mana + value
+		t.mana = t.mana + value 
 		mana.hud_update(playername)
 		return true
 	else
@@ -122,7 +122,7 @@ function mana.subtract(playername, value)
 	local t = mana.playerlist[playername]
 	value = mana.round(value)
 	if(t ~= nil and t.mana >= value and value >= 0) then
-		t.mana = t.mana -value
+		t.mana = t.mana -value 
 		mana.hud_update(playername)
 		return true
 	else
@@ -159,39 +159,35 @@ end
 
 
 -- Load the playerlist from a previous session, if available.
-function mana.load_file(playername)
-	local filepath = minetest.get_worldpath().."/mana/" .. playername
+do
+	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
-				minetest.log("action", "[mana] Data successfully read.")
-				return savetable
-			end
+			mana.playerlist = savetable.playerlist
+			minetest.debug("[mana] mana.mt successfully read.")
 		end
 	end
-	return {}
 end
 
-mana.playerlist = {}
-
-function mana.save_to_file(playername)
-	local savetable = mana.playerlist[playername]
+function mana.save_to_file()
+	local savetable = {}
+	savetable.playerlist = mana.playerlist
 
 	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 +204,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")
-      for _, pref in pairs(minetest.get_connected_players()) do
-	 mana.save_to_file(pref:get_player_name())
-      end
+	minetest.log("action", "[mana] Server shuts down. Rescuing data into mana.mt")
+	mana.save_to_file()
 end)
 
 minetest.register_on_joinplayer(function(player)
 	local playername = player:get_player_name()
-
-	mana.playerlist[playername] = mana.load_file(playername)
-	if not mana.playerlist[playername].mana then
+	
+	if mana.playerlist[playername] == nil 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 +237,41 @@ end)
 
 mana.regen_timer = 0
 
-function mana_regen_step()
-	local players = minetest.get_connected_players()
-	for i=1, #players do
-		local name = players[i]:get_player_name()
-		if mana.playerlist[name] ~= nil then
-			if players[i]:get_hp() > 0 then
-				local plus = mana.playerlist[name].regen
-				-- 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
+minetest.register_globalstep(function(dtime)
+	mana.regen_timer = mana.regen_timer + dtime
+	if mana.regen_timer >= mana.settings.regen_timer then
+		local factor = math.floor(mana.regen_timer / mana.settings.regen_timer)
+		local players = minetest.get_connected_players()
+		for i=1, #players do
+			local name = players[i]:get_player_name()
+			if mana.playerlist[name] ~= nil then
+				if players[i]:get_hp() > 0 then
+					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
-minetest.after(0, mana_regen_step)
+end)
 
 --[===[
 	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,41 +285,30 @@ 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",
-			position = {x=0.5,y=1},
-			size = {x=24, y=24},
-			text = "mana_icon_purple.png",
-			number = mana.get(playername)/10,
-			alignment = {x=-1,y=-1},
-			offset = {x=80, y=-186},
-			}
-		)
-
+			hud_elem_type = "text",
+			position = { x = 0.5, y=1 },
+			text = mana.manastring(playername),
+			scale = { x = 0, y = 0 },
+			alignment = { x = 1, y = 0},
+			direction = 1,
+			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)
 		local player = minetest.get_player_by_name(playername)
 		player:hud_remove(mana.playerlist[playername].hudid)

locale/mana.de.tr

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

locale/template.txt

@@ -0,0 +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