Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

Corrige l'affige des awards d'un joueur donné.
Empêche le retour de l'inventaire sfinv quand on active ou desactive
les awards d'un joueur.

README.md

@@ -37,11 +37,10 @@ awards.register_award("mymod:award", {
 
 The above trigger type is an example of a counted_key trigger:
 rather than a single counter there's a counter per key - in this
-case the key is the value of the `node` field.
-
-If you leave out the key in a `counted_key` trigger, then the total will be used
-instead. For example, here is an award which unlocks after you've placed 10
-nodes of any type:
+case the key is the value of the `node` field. If you leave out
+the key in a `counted_key` trigger, then the total will be used
+instead. For example, here is an award which unlocks after you've
+placed 10 nodes of any type:
 
 ```lua
 awards.register_award("mymod:award", {
@@ -126,10 +125,6 @@ awards.register_trigger("foo", {
 	type             = "custom",
 	progress         = "@1/@2 foos",
 	auto_description = { "Do a foo", "Foo @1 times" },
-
-	on_register = function(self, award)
-		print(award.name .. " was registered with foo trigger type")
-	end,
 })
 
 minetest.register_on_foo(function()
@@ -173,9 +168,7 @@ end
 
 # API
 
-## Awards
-
-* `awards.register_award(name, def)`, the def table has the following fields:
+* awards.register_award(name, def), the def table has the following fields:
 	* `title` - title of the award (defaults to name)
 	* `description` - longer description of the award, displayed in Awards tab
 	* `difficulty` - see [Award Difficulty](#award-difficulty).
@@ -189,48 +182,23 @@ end
 	* `background` - the background image, use default otherwise.
 	* `trigger` - trigger definition, see [Builtin Trigger Types](#builtin-trigger-types).
 	* `on_unlock(name, def)` - callback on unlock.
-* `awards.registered_awards` - table of award name to definition.
-* `awards.register_on_unlock(func(name, def))`
-	* `name` is the player name
-	* `def` is the award def.
-	* return true to cancel HUD
-* `awards.unlock(player_name, award_name)`
-	* gives an award to a player
-* `awards.get_award_states(player_name)`
-	* Returns list of tables, sorted by `score`, each having the fields:
-
-		```lua
-		{
-			name     = "mymod:awardname",
-			def      = {}, -- Award definition
-			unlocked = true, -- Whether award has been unlocked
-			started  = true, -- Whether any progress has been made
-			score    = 0, -- Score used in sorting
-
-			-- Either a table or nil
-			-- Will be nil if progress is indeterminable or
-			-- if the award is unlocked
-			progress = {
-				current = 5,
-				target  = 10,
-				label   = "label", -- Label to show over progress bar
-			}
-		}
-		```
-
-## Triggers
-
-* `awards.register_trigger(name, def)`, the def table has the following fields:
-	* `type` - see trigger type types in [Trigger Types](#trigger-types).
+* awards.register_trigger(name, def), the def table has the following fields:
+	* `type` - see [Trigger Types](#trigger-types).
 	* `progress` - used to format progress, defaults to "%1/%2".
 	* `auto_description` - a table of two elements. Each element is a format string. Element 1 is singular, element 2 is plural. Used for the award description (not title) if none is given.
-	* `on_register(self, award_def)` - called when an award registers with this type.
+	* `on_register(award_def)` - called when an award registers with this type.
 	* "counted_key" only:
 		* `auto_description_total` - Used if the trigger is for the total.
 		* `get_key(self, def)` - get key for particular award, return nil for a total.
 		* `key_is_item` - true if the key is an item name. On notify(),
 			any watched groups will also be notified as `group:groupname` keys.
-* `awards.registered_triggers` - table of trigger name to definition.
+* awards.register_on_unlock(func(name, def))
+	* name is the player name
+	* def is the award def.
+	* return true to cancel HUD
+* awards.unlock(name, award)
+	* gives an award to a player
+	* name is the player name
 
 ## Builtin Trigger Types
 

init.lua

@@ -3,9 +3,7 @@
 -- The global award namespace
 awards = {
 	show_mode = "hud",
-	registered_awards = {},
 	registered_triggers = {},
-	on_unlock = {},
 }
 
 -- Internationalization support.

src/api_awards.lua

@@ -127,6 +127,9 @@ function awards.unlock(name, award)
 		end
 	else
 		local player = minetest.get_player_by_name(name)
+		if not (player and player.is_player and player:is_player()) then
+			return
+		end
 		local one = player:hud_add({
 			hud_elem_type = "image",
 			name = "award_bg",
@@ -182,71 +185,3 @@ function awards.unlock(name, award)
 		end)
 	end
 end
-
-function awards.get_award_states(name)
-	local hash_is_unlocked = {}
-	local retval = {}
-
-	-- Add all unlocked awards
-	local data = awards.player(name)
-	if data and data.unlocked then
-		for awardname, _ in pairs(data.unlocked) do
-			local def = awards.registered_awards[awardname]
-			if def then
-				hash_is_unlocked[awardname] = true
-				local score = -100000
-
-				local difficulty = def.difficulty or 1
-				if def.trigger and def.trigger.target then
-					difficulty = difficulty * def.trigger.target
-				end
-				score = score + difficulty
-
-				retval[#retval + 1] = {
-					name     = awardname,
-					def      = def,
-					unlocked = true,
-					started  = true,
-					score    = score,
-					progress = nil,
-				}
-			end
-		end
-	end
-
-	-- Add all locked awards
-	for _, def in pairs(awards.registered_awards) do
-		if not hash_is_unlocked[def.name] and def:can_unlock(data) then
-			local progress = def.get_progress and def:get_progress(data)
-			local started = false
-			local score = def.difficulty or 1
-			if def.secret then
-				score = 1000000
-			elseif def.trigger and def.trigger.target and progress then
-				local perc = progress.current / progress.target
-				score = score * (1 - perc) * def.trigger.target
-				if perc < 0.001 then
-					score = score + 100
-				else
-					started = true
-				end
-			else
-				score = 100
-			end
-
-			retval[#retval + 1] = {
-				name     = def.name,
-				def      = def,
-				unlocked = false,
-				started  = started,
-				score    = score,
-				progress = progress,
-			}
-		end
-	end
-
-	table.sort(retval, function(a, b)
-		return a.score < b.score
-	end)
-	return retval
-end

src/api_triggers.lua

@@ -2,7 +2,9 @@
 
 local S, NS = awards.gettext, awards.ngettext
 
+awards.registered_awards = {}
 awards.on = {}
+awards.on_unlock = {}
 
 local default_def = {}
 
@@ -41,12 +43,11 @@ function awards.register_trigger(tname, tdef)
 			}
 			tdef.register(tmp)
 
-			function def.get_progress(_, data)
-				local current = math.min(data[tname] or 0, tmp.target)
+			function def.getProgress(_, data)
+				local done = math.min(data[tname] or 0, tmp.target)
 				return {
-					current = current,
-					target = tmp.target,
-					label = S(tdef.progress, current, tmp.target),
+					perc = done / tmp.target,
+					label = S(tdef.progress, done, tmp.target),
 				}
 			end
 
@@ -101,7 +102,7 @@ function awards.register_trigger(tname, tdef)
 			end
 
 			-- Called to get progress values and labels
-			function def.get_progress(_, data)
+			function def.getProgress(_, data)
 				data[tname] = data[tname] or {}
 
 				local done
@@ -113,8 +114,7 @@ function awards.register_trigger(tname, tdef)
 				done = math.min(done, tmp.target)
 
 				return {
-					current = done,
-					target = tmp.target,
+					perc = done / tmp.target,
 					label = S(tdef.progress, done, tmp.target),
 				}
 			end

src/awards.lua

@@ -1090,7 +1090,7 @@ if minetest.get_modpath("mesecons") then
 		difficulty = 0.2,
 		trigger = {
 			type = "place",
-			node = "mesecons:wire_00000000_off",
+			node = "pipeworks:tube_1",
 			target = 500,
 		}
 	})
@@ -1099,7 +1099,7 @@ end
 if minetest.get_modpath("basic_materials") then
 	awards.register_award("awards_oil", {
 		title = S("Oil Typhoon"),
-		description = S("Craft 500 times oil extract."),
+		description = S("Craft 100 times flint and steel."),
 
 		trigger = {
 			type = "craft",

src/chat_commands.lua

@@ -2,28 +2,39 @@
 
 local S = awards.gettext
 
+minetest.register_privilege("awards_admin", { description = "Can manage awards of given player" })
+
 minetest.register_chatcommand("awards", {
-	params = S("[c|clear|disable|enable]"),
-	description = S("Show, clear, disable or enable your awards"),
+	params = "[c|clear|disable|enable] [player_name]",
+	description = "Show, clear, disable or enable player's awards",
 	func = function(name, param)
-		if param == "clear" then
-			awards.clear_player(name)
-			minetest.chat_send_player(name,
-			S("All your awards and statistics have been cleared. You can now start again."))
-		elseif param == "disable" then
-			awards.disable(name)
-			minetest.chat_send_player(name, S("You have disabled awards."))
-		elseif param == "enable" then
-			awards.enable(name)
-			minetest.chat_send_player(name, S("You have enabled awards."))
-		elseif param == "c" then
-			awards.show_to(name, name, nil, true)
-		else
+		if not minetest.check_player_privs(name, { awards_admin = true }) then
+			return false, "You need awards_admin privilege!"
+		end
+		local action, playern = param:split(" ")[1], param:split(" ")[2] or name
+		if action == "clear" then
+			awards.clear_player(playern)
+			minetest.chat_send_player(playern,
+				S("All your awards and statistics have been cleared. You can now start again."))
+			minetest.chat_send_player(name, "All awards and statistics of "..playern.." have been cleared.")
+		elseif action == "disable" then
+			awards.disable(playern)
+			minetest.chat_send_player(playern, "Your awards are disabled.")
+			minetest.chat_send_player(name, "You have disabled awards of "..playern..".")
+		elseif action == "enable" then
+			awards.enable(playern)
+			minetest.chat_send_player(playern, "Your awards are enabled.")
+			minetest.chat_send_player(name, "You have enabled awards of "..playern..".")
+		elseif action == "c" then
+			awards.show_to(playern, name, nil, true)
+		elseif not action then
 			awards.show_to(name, name, nil, false)
+		else
+			awards.show_to(action, name, nil, true)
 		end
 
-		if (param == "disable" or param == "enable") and minetest.global_exists("sfinv") then
-			local player = minetest.get_player_by_name(name)
+		if (action == "disable" or action == "enable") and minetest.global_exists("sfinv") and not minetest.get_modpath("unified_inventory") then
+			local player = minetest.get_player_by_name(playern)
 			if player then
 				sfinv.set_player_inventory_formspec(player)
 			end

src/gui.lua

@@ -2,9 +2,73 @@
 
 local S = awards.gettext
 
+local function order_awards(name)
+	local hash_is_unlocked = {}
+	local retval = {}
+
+	local data = awards.player(name)
+	if data and data.unlocked then
+		for awardname, _ in pairs(data.unlocked) do
+			local def = awards.registered_awards[awardname]
+			if def then
+				hash_is_unlocked[awardname] = true
+				local score = -100000
+
+				local difficulty = def.difficulty or 1
+				if def.trigger and def.trigger.target then
+					difficulty = difficulty * def.trigger.target
+				end
+				score = score + difficulty
+
+				retval[#retval + 1] = {
+					name     = awardname,
+					def      = def,
+					unlocked = true,
+					started  = true,
+					score    = score,
+				}
+			end
+		end
+	end
+
+	for _, def in pairs(awards.registered_awards) do
+		if not hash_is_unlocked[def.name] and def:can_unlock(data) then
+			local started = false
+			local score = def.difficulty or 1
+			if def.secret then
+				score = 1000000
+			elseif def.trigger and def.trigger.target and def.getProgress then
+				local progress = def:getProgress(data).perc
+				score = score * (1 - progress) * def.trigger.target
+				if progress < 0.001 then
+					score = score + 100
+				else
+					started = true
+				end
+			else
+				score = 100
+			end
+
+			retval[#retval + 1] = {
+				name     = def.name,
+				def      = def,
+				unlocked = false,
+				started  = started,
+				score    = score,
+			}
+		end
+	end
+
+	table.sort(retval, function(a, b)
+		return a.score < b.score
+	end)
+	return retval
+end
+
 function awards.get_formspec(name, to, sid)
 	local formspec = ""
-	local awards_list = awards.get_award_states(name)
+	local awards_list = order_awards(name)
+	local data  = awards.player(name)
 
 	if #awards_list == 0 then
 		formspec = formspec .. "label[3.9,1.5;"..minetest.formspec_escape(S("Error: No achivements available.")).."]"
@@ -42,11 +106,15 @@ function awards.get_formspec(name, to, sid)
 		if sdef and sdef.icon then
 			formspec = formspec .. "image[0.45,0;3.5,3.5;" .. sdef.icon .. "]"  -- adjusted values from 0.6,0;3,3
 		end
-
-		if sitem.progress then
-			local barwidth = 3.95
-			local perc = sitem.progress.current / sitem.progress.target
-			local label = sitem.progress.label
+		local barwidth = 3.95
+		local perc = nil
+		local label = nil
+		if sdef.getProgress and data then
+			local res = sdef:getProgress(data)
+			perc = res.perc
+			label = res.label
+		end
+		if perc then
 			if perc > 1 then
 				perc = 1
 			end
@@ -56,7 +124,6 @@ function awards.get_formspec(name, to, sid)
 				formspec = formspec .. "label[1.6,8.15;" .. minetest.formspec_escape(label) .. "]"
 			end
 		end
-
 		if sdef and sdef.description then
 			formspec = formspec .. "box[-0.05,3.75;3.9,4.2;#000]"
 			formspec = formspec	.. "textarea[0.25,3.75;3.9,4.2;;" ..
@@ -101,13 +168,13 @@ function awards.show_to(name, to, sid, text)
 	if name == "" or name == nil then
 		name = to
 	end
-	local data = awards.player(to)
+	local data = awards.player(name)
 	if name == to and data.disabled then
 		minetest.chat_send_player(name, S("You've disabled awards. Type /awards enable to reenable."))
 		return
 	end
 	if text then
-		local awards_list = awards.get_award_states(name)
+		local awards_list = order_awards(name)
 		if #awards_list == 0 then
 			minetest.chat_send_player(to, S("Error: No award available."))
 			return

src/triggers.lua

@@ -113,15 +113,15 @@ awards.register_trigger("craft", {
 	end,
 	key_is_item = true,
 })
-minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
-	if not player_ok(player) or itemstack:is_empty() then
-		return
-	end
-
-	local itemname = itemstack:get_name()
-	itemname = minetest.registered_aliases[itemname] or itemname
-	awards.notify_craft(player, itemname, itemstack:get_count())
-end)
+--minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
+--	if not player_ok(player) or itemstack:is_empty() then
+--		return
+--	end
+--
+--	local itemname = itemstack:get_name()
+--	itemname = minetest.registered_aliases[itemname] or itemname
+--	awards.notify_craft(player, itemname, itemstack:get_count())
+--end)
 
 
 awards.register_trigger("eat", {