Merge remote-tracking branch 'upstream/master'

Torch name change if placed on wall/ceiling and break torch awards

src/api_awards.lua

@@ -116,17 +116,20 @@ function awards.unlock(name, award)
 	if awards.show_mode == "chat" then
 		local chat_announce
 		if awdef.secret then
-			chat_announce = S("Secret Award Unlocked: %s")
+			chat_announce = S("Secret Award Unlocked: @1", title)
 		else
-			chat_announce = S("Award Unlocked: %s")
+			chat_announce = S("Award Unlocked: @1", title)
 		end
 		-- use the chat console to send it
-		minetest.chat_send_player(name, string.format(chat_announce, title))
+		minetest.chat_send_player(name, chat_announce)
 		if desc~="" then
 			minetest.chat_send_player(name, desc)
 		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",

src/awards.lua

@@ -455,7 +455,7 @@ if minetest.get_modpath("default") then
 
 	-- Marchand de sable
 	awards.register_award("award_marchand_de_sable", {
-		title = S("Marchand De Sable"),
+		title = S("SandMan"),
 		description = S("Dig 1,000 sand."),
 		icon = "awards_marchand_de_sable.png",
 		hud_background = "awards_bg_mining.png",

src/chat_commands.lua

@@ -2,28 +2,39 @@
 
 local S = awards.translator
 
+minetest.register_privilege("awards_admin", { description = S("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 = S("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, S("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, S("All awards and statistics of @1 have been cleared.", playern))
+		elseif action == "disable" then
+			awards.disable(playern)
+			minetest.chat_send_player(playern, S("Your awards are disabled."))
+			minetest.chat_send_player(name, S("You have disabled awards of @1.", playern))
+		elseif action == "enable" then
+			awards.enable(playern)
+			minetest.chat_send_player(playern, S("Your awards are enabled."))
+			minetest.chat_send_player(name, S("You have enabled awards of @1.", 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

@@ -106,7 +106,7 @@ 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
@@ -120,7 +120,7 @@ function awards.show_to(name, to, sid, text)
 			minetest.chat_send_player(to, S("You have not unlocked any awards."))
 			return
 		end
-		minetest.chat_send_player(to, string.format(S("%s’s awards:"), name))
+		minetest.chat_send_player(to, S("@1’s awards:", name))
 
 		for str, _ in pairs(data.unlocked) do
 			local def = awards.registered_awards[str]

src/triggers.lua

@@ -105,6 +105,10 @@ minetest.register_on_placenode(function(pos, node, player)
 
 	local node_name = node.name
 	node_name = minetest.registered_aliases[node_name] or node_name
+	
+	if string.match(node_name, "default:torch_") then -- NALC: fix torch name change on wall place
+		node_name = "default:torch"
+	end
 	awards.notify_place(player, node_name)
 end)
 
@@ -119,15 +123,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", {