Release 2.3.0

Fixes #21

api.lua

@@ -220,9 +220,16 @@ function awards.unlock(name, award)
 	-- Get Notification Settings
 	local title = awdef.title or award
 	local desc = awdef.description or ""
-	local background = awdef.background or "bg_default.png"
-	local icon = awdef.icon or "unknown.png"
-	local custom_announce = awdef.custom_announce or S("Achievement Unlocked:")
+	local background = awdef.background or "awards_bg_default.png"
+	local icon = awdef.icon or "awards_unknown.png"
+	local custom_announce = awdef.custom_announce
+	if not custom_announce then
+		if awdef.secret then
+			custom_announce = S("Secret Achievement Unlocked:")
+		else
+			custom_announce = S("Achievement Unlocked:")
+		end
+	end
 
 	-- Do Notification
 	if awards.show_mode == "formspec" then
@@ -233,8 +240,14 @@ function awards.unlock(name, award)
 				"label[1.1,1;"..title.."]"..
 				"label[0.3,0.1;"..custom_announce.."]")
 	elseif awards.show_mode == "chat" then
+		local chat_announce
+		if awdef.secret == true then
+			chat_announce = S("Secret Achievement Unlocked: %s")
+		else
+			chat_announce = S("Achievement Unlocked: %s")
+		end
 		-- use the chat console to send it
-		minetest.chat_send_player(name, S("Achievement Unlocked:")..title)
+		minetest.chat_send_player(name, string.format(chat_announce, title))
 		if desc~="" then
 			minetest.chat_send_player(name, desc)
 		end
@@ -249,12 +262,18 @@ function awards.unlock(name, award)
 			offset = {x = 0, y = 138},
 			alignment = {x = 0, y = -1}
 		})
+		local hud_announce
+		if awdef.secret == true then
+			hud_announce = S("Secret Achievement Unlocked!")
+		else
+			hud_announce = S("Achievement Unlocked!")
+		end
 		local two = player:hud_add({
 			hud_elem_type = "text",
 			name = "award_au",
 			number = 0xFFFFFF,
 			scale = {x = 100, y = 20},
-			text = "Achievement Unlocked!",
+			text = hud_announce,
 			position = {x = 0.5, y = 0},
 			offset = {x = 0, y = 40},
 			alignment = {x = 0, y = -1}
@@ -299,7 +318,7 @@ awards.give_achievement = awards.unlock
 })]]--
 
 function awards.getFormspec(name, to, sid)
-	local formspec = "size[11,5]"
+	local formspec = ""
 	local listofawards = awards._order_awards(name)
 	local playerdata = awards.players[name]
 
@@ -308,10 +327,10 @@ function awards.getFormspec(name, to, sid)
 		local item = listofawards[sid+0]
 		local def = awards.def[item.name]
 		if def and def.secret and not item.got then
-			formspec = formspec .. "label[1,2.75;Secret Award]"..
-								"image[1,0;3,3;unknown.png]"
+			formspec = formspec .. "label[1,2.75;(Secret Award)]"..
+								"image[1,0;3,3;awards_unknown.png]"
 			if def and def.description then
-				formspec = formspec	.. "label[0,3.25;Unlock this award to find out what it is]"
+				formspec = formspec	.. "label[0,3.25;Unlock this award to find out what it is.]"
 			end
 		else
 			local title = item.name
@@ -335,8 +354,11 @@ function awards.getFormspec(name, to, sid)
 				label = res.label
 			end
 			if perc then
-				formspec = formspec .. "background[0,4.80;" .. barwidth ..",0.25;awards_progress_gray.png]"
-				formspec = formspec .. "background[0,4.80;" .. (barwidth * perc) ..",0.25;awards_progress_green.png]"
+				if perc > 1 then
+					perc = 1
+				end
+				formspec = formspec .. "background[0,4.80;" .. barwidth ..",0.25;awards_progress_gray.png;false]"
+				formspec = formspec .. "background[0,4.80;" .. (barwidth * perc) ..",0.25;awards_progress_green.png;false]"
 				if label then
 					formspec = formspec .. "label[1.75,4.63;" .. label .. "]"
 				end
@@ -359,7 +381,7 @@ function awards.getFormspec(name, to, sid)
 			first = false
 
 			if def.secret and not award.got then
-				formspec = formspec .. "#ACACACSecret Award"
+				formspec = formspec .. "#707070(Secret Award)"
 			else
 				local title = award.name
 				if def and def.title then
@@ -411,7 +433,8 @@ function awards.show_to(name, to, sid, text)
 			sid = 1
 		end
 		-- Show formspec to user
-		minetest.show_formspec(to,"awards:awards", awards.getFormspec(name, to, sid))
+		minetest.show_formspec(to,"awards:awards",
+			"size[11,5]" .. awards.getFormspec(name, to, sid))
 	end
 end
 awards.showto = awards.show_to

depends.txt

@@ -1 +1,3 @@
 intllib?
+sfinv?
+unified_inventory?

init.lua

@@ -25,6 +25,8 @@ end
 
 dofile(minetest.get_modpath("awards").."/api.lua")
 dofile(minetest.get_modpath("awards").."/chat_commands.lua")
+dofile(minetest.get_modpath("awards").."/sfinv.lua")
+dofile(minetest.get_modpath("awards").."/unified_inventory.lua")
 dofile(minetest.get_modpath("awards").."/triggers.lua")
 awards.set_intllib(S)
 
@@ -32,7 +34,7 @@ awards.set_intllib(S)
 awards.register_achievement("award_lightitup",{
 	title = S("Light It Up"),
 	description = S("Place 100 torches."),
-	icon = "novicebuilder.png",
+	icon = "awards_novicebuilder.png",
 	trigger = {
 		type = "place",
 		node = "default:torch",
@@ -44,7 +46,7 @@ awards.register_achievement("award_lightitup",{
 awards.register_achievement("award_well_lit",{
 	title = S("Well Lit"),
 	description = S("Place 1,000 torches."),
-	icon = "novicebuilder.png",
+	icon = "awards_novicebuilder.png",
 	trigger = {
 		type = "place",
 		node = "default:torch",
@@ -58,7 +60,7 @@ if minetest.get_modpath("moreblocks") then
 	awards.register_achievement("award_saint_maclou",{
 		title = S("Saint-Maclou"),
 		description = S("Place 20 coal checkers."),
-		icon = "novicebuilder.png",
+		icon = "awards_novicebuilder.png",
 		trigger = {
 			type = "place",
 			node = "moreblocks:coal_checker",
@@ -70,7 +72,7 @@ if minetest.get_modpath("moreblocks") then
 	awards.register_achievement("award_castorama",{
 		title = S("Castorama"),
 		description = S("Place 20 iron checkers."),
-		icon = "novicebuilder.png",
+		icon = "awards_novicebuilder.png",
 		trigger = {
 			type = "place",
 			node = "moreblocks:iron_checker",
@@ -82,7 +84,7 @@ if minetest.get_modpath("moreblocks") then
 	awards.register_achievement("award_sam_the_trapper",{
 		title = S("Sam the Trapper"),
 		description = S("Place 2 trap stones."),
-		icon = "novicebuilder.png",
+		icon = "awards_novicebuilder.png",
 		trigger = {
 			type = "place",
 			node = "moreblocks:trap_stone",
@@ -91,12 +93,68 @@ if minetest.get_modpath("moreblocks") then
 	})
 end
 
+
+awards.register_achievement("awards_stonebrick", {
+	title = S("Home Improvement"),
+	description = S("Craft 200 stone bricks."),
+	icon = "default_stone_brick.png",
+	trigger = {
+		type = "craft",
+		item = "default:stonebrick",
+		target = 200
+	}
+})
+
+awards.register_achievement("awards_desert_stonebrick", {
+	title = S("Desert Dweller"),
+	description = S("Craft 400 desert stone bricks."),
+	icon = "default_desert_stone_brick.png",
+	trigger = {
+		type = "craft",
+		item = "default:desert_stonebrick",
+		target = 400
+	}
+})
+
+awards.register_achievement("awards_desertstonebrick", {
+	title = S("Pharaoh"),
+	description = S("Craft 100 sandstone bricks."),
+	icon = "default_sandstone_brick.png",
+	trigger = {
+		type = "craft",
+		item = "default:sandstonebrick",
+		target = 100
+	}
+})
+
+awards.register_achievement("awards_bookshelf", {
+	title = S("Little Library"),
+	description = S("Craft 7 bookshelves."),
+	icon = "default_bookshelf.png",
+	trigger = {
+		type = "craft",
+		item = "default:bookshelf",
+		target = 7
+	}
+})
+
+awards.register_achievement("awards_obsidian", {
+	title = S("Lava and Water"),
+	description = S("Mine your first obsidian."),
+	icon = "default_obsidian.png",
+	trigger = {
+		type = "dig",
+		node = "default:obsidian",
+		target = 1
+	}
+})
+
 -- Obsessed with Obsidian
 awards.register_achievement("award_obsessed_with_obsidian",{
 	title = S("Obsessed with Obsidian"),
 	description = S("Mine 50 obsidian."),
-	icon = "miniminer.png",
-	background = "bg_mining.png",
+	icon = "awards_miniminer.png",
+	background = "awards_bg_mining.png",
 	trigger = {
 		type = "dig",
 		node = "default:obsidian",
@@ -108,7 +166,7 @@ awards.register_achievement("award_obsessed_with_obsidian",{
 awards.register_achievement("award_on_the_way", {
 	title = S("On The Way"),
 	description = S("Place 100 rails."),
-	icon = "novicebuilder.png",
+	icon = "awards_novicebuilder.png",
 	trigger = {
 		type = "place",
 		node = "default:rail",
@@ -191,9 +249,9 @@ awards.register_achievement("award_jungleman", {
 -- Found some Mese!
 awards.register_achievement("award_mesefind", {
 	title = S("First Mese Find"),
-	description = S("Find some Mese."),
-	icon = "default_mese_block.png",
-	background = "bg_mining.png",
+	description = S("Mine your first mese ore."),
+	icon = "default_stone.png^default_mineral_mese.png",
+	background = "awards_bg_mining.png",
 	trigger = {
 		type = "dig",
 		node = "default:stone_with_mese",
@@ -201,12 +259,28 @@ awards.register_achievement("award_mesefind", {
 	}
 })
 
+-- Mese Block
+awards.register_achievement("award_meseblock", {
+	secret = true,
+	title = S("Mese Mastery"),
+	description = S("Mine a mese block."),
+	icon = "default_mese_block.png",
+	background = "bg_mining.png",
+	trigger = {
+		type = "dig",
+		node = "default:mese",
+		target = 1
+	}
+})
+
+
+
 -- You're a copper
 awards.register_achievement("award_youre_a_copper", {
 	title = S("You're a copper"),
 	description = S("Dig 1,000 copper ores."),
-	icon = "miniminer.png",
-	background = "bg_mining.png",
+	icon = "awards_miniminer.png",
+	background = "awards_bg_mining.png",
 	trigger = {
 		type = "dig",
 		node = "default:stone_with_copper",
@@ -216,8 +290,9 @@ awards.register_achievement("award_youre_a_copper", {
 
 -- Found a Nyan cat!
 awards.register_achievement("award_nyanfind", {
-	title = S("OMG, Nyan Cat!"),
-	description = S("Find a nyan cat."),
+	secret = true,
+	title = S("A Cat in a Pop-Tart?!"),
+	description = S("Mine a nyan cat."),
 	icon = "nyancat_front.png",
 	trigger = {
 		type = "dig",
@@ -230,8 +305,8 @@ awards.register_achievement("award_nyanfind", {
 awards.register_achievement("award_mine2", {
 	title = S("Mini Miner"),
 	description = S("Dig 100 stone blocks."),
-	icon = "miniminer.png",
-	background = "bg_mining.png",
+	icon = "awards_miniminer.png",
+	background = "awards_bg_mining.png",
 	trigger = {
 		type = "dig",
 		node = "default:stone",
@@ -242,9 +317,9 @@ awards.register_achievement("award_mine2", {
 -- Hardened Miner
 awards.register_achievement("award_mine3", {
 	title = S("Hardened Miner"),
-	description = S("Dig 1,000 stone blocks"),
-	icon = "miniminer.png",
-	background = "bg_mining.png",
+	description = S("Dig 1,000 stone blocks."),
+	icon = "awards_miniminer.png",
+	background = "awards_bg_mining.png",
 	trigger = {
 		type = "dig",
 		node = "default:stone",
@@ -256,8 +331,8 @@ awards.register_achievement("award_mine3", {
 awards.register_achievement("award_mine4", {
 	title = S("Master Miner"),
 	description = S("Dig 10,000 stone blocks."),
-	icon = "miniminer.png",
-	background = "bg_mining.png",
+	icon = "awards_miniminer.png",
+	background = "awards_bg_mining.png",
 	trigger = {
 		type = "dig",
 		node = "default:stone",
@@ -269,7 +344,8 @@ awards.register_achievement("award_mine4", {
 awards.register_achievement("award_marchand_de_sable", {
 	title = S("Marchand De Sable"),
 	description = S("Dig 1,000 sand."),
-	background = "bg_mining.png",
+	icon = "default_sand.png",
+	background = "awards_bg_mining.png",
 	trigger = {
 		type = "dig",
 		node = "default:sand",
@@ -279,7 +355,8 @@ awards.register_achievement("award_marchand_de_sable", {
 
 awards.register_achievement("awards_crafter_of_sticks", {
 	title = S("Crafter of Sticks"),
-	description = S("Create 100 Sticks"),
+	description = S("Craft 100 sticks."),
+	icon = "default_stick.png",
 	trigger = {
 		type = "craft",
 		item = "default:stick",
@@ -287,124 +364,145 @@ awards.register_achievement("awards_crafter_of_sticks", {
 	}
 })
 
--- Join
-awards.register_achievement("award_join2", {
-	title = S("Frequent Visitor"),
-	description = S("Connect to the server 50 times."),
+awards.register_achievement("awards_junglegrass", {
+	title = S("Jungle Discoverer"),
+	description = S("Mine your first jungle grass."),
+	icon = "default_junglegrass.png",
 	trigger = {
-		type = "join",
-		target = 50
-	},
-	secret = true
-})
-
--- Dying Spree
-awards.register_achievement("award_dying_spree", {
-	title = S("Dying Spree"),
-	description = S("Die 5 times."),
-	trigger = {
-		type = "death",
-		target = 5
+		type = "dig",
+		node = "default:junglegrass",
+		target = 1
 	}
 })
 
--- Bot-like
-awards.register_achievement("award_bot_like", {
-	title = S("Bot-like"),
-	description = S("Die 10 times."),
+awards.register_achievement("awards_grass", {
+	title = S("Grasslands Discoverer"),
+	description = S("Mine some grass."),
+	icon = "default_grass_3.png",
 	trigger = {
-		type = "death",
-		target = 10
+		type = "dig",
+		node = "default:grass_1",
+		target = 1
 	}
 })
 
--- You Suck!
-awards.register_achievement("award_you_suck", {
-	title = S("You Suck!"),
-	description = S("Die 100 times."),
+awards.register_achievement("awards_dry_grass", {
+	title = S("Savannah Discoverer"),
+	description = S("Mine some dry grass."),
+	icon = "default_dry_grass_3.png",
 	trigger = {
-		type = "death",
-		target = 100
-	},
-	secret = true
+		type = "dig",
+		node = "default:dry_grass_3",
+		target = 1
+	}
 })
 
--- Burned to death
-awards.register_achievement("award_burn", {
-	title = S("You're a witch!"),
-	description = S("Burn to death in a fire.")
+awards.register_achievement("awards_cactus", {
+	title = S("Desert Discoverer"),
+	description = S("Mine your first cactus."),
+	icon = "default_cactus_side.png",
+	trigger = {
+		type = "dig",
+		node = "default:cactus",
+		target = 1
+	}
 })
-awards.register_onDeath(function(player,data)
-	local pos = player:getpos()
-	if pos and minetest.find_node_near(pos, 2, "fire:basic_flame") ~= nil then
-		return "award_burn"
-	end
-	return nil
-end)
 
--- Died in flowing lava
-awards.register_achievement("award_in_the_flow", {
-	title = S("In the Flow"),
-	description = S("Die in flowing lava.")
+awards.register_achievement("awards_dry_shrub", {
+	title = S("Far Lands"),
+	description = S("Mine your first dry shrub."),
+	icon = "default_dry_shrub.png",
+	trigger = {
+		type = "dig",
+		node = "default:dry_shrub",
+		target = 1
+	}
 })
-awards.register_onDeath(function(player,data)
-	local pos = player:getpos()
-	if pos and minetest.find_node_near(pos, 2, "default:lava_flowing") ~= nil then
-		return "award_in_the_flow"
-	end
-	return nil
-end)
 
--- Die near diamond ore
-awards.register_achievement("award_this_is_sad", {
-	title = S("This is Sad"),
-	description = S("Die near diamond ore.")
+awards.register_achievement("awards_farmer", {
+	title = S("Farmer"),
+	description = S("Dig a fully grown wheat plant."),
+	icon = "farming_wheat_8.png",
+	trigger = {
+		type = "dig",
+		node = "farming:wheat_8",
+		target = 1
+	}
 })
-awards.register_on_death(function(player,data)
-	local pos = player:getpos()
-	if pos and minetest.find_node_near(pos, 5, "default:stone_with_diamond") ~= nil then
-		return "award_this_is_sad"
-	end
-	return nil
-end)
 
--- Die near diamond ore
-awards.register_achievement("award_the_stack", {
-	title = S("The Stack"),
-	description = S("Die near bones.")
+awards.register_achievement("awards_ice", {
+	title = S("Glacier Discoverer"),
+	description = S("Mine your first ice."),
+	icon = "default_ice.png",
+	trigger = {
+		type = "dig",
+		node = "default:ice",
+		target = 1
+	}
 })
-awards.register_on_death(function(player,data)
-	local pos = player:getpos()
-	if pos and minetest.find_node_near(pos, 5, "bones:bones") ~= nil then
-		return "award_the_stack"
-	end
-	return nil
-end)
 
--- Die near diamond ore
-awards.register_achievement("award_deep_down", {
-	title = S("Deep Down"),
-	description = S("Die below -10000"),
-	secret = true
+awards.register_achievement("awards_gold_ore", {
+	title = S("First Gold Find"),
+	description = S("Mine your first gold ore."),
+	icon = "default_stone.png^default_mineral_gold.png",
+	trigger = {
+		type = "dig",
+		node = "default:stone_with_gold",
+		target = 1
+	}
 })
-awards.register_on_death(function(player,data)
-	local pos = player:getpos()
-	if pos and pos.y < -10000 then
-		return "award_deep_down"
-	end
-	return nil
-end)
 
--- Die near diamond ore
-awards.register_achievement("award_no_screen", {
-	title = S("In space, no one can hear you scream"),
-	description = S("Die above 10000"),
-	secret = true
+awards.register_achievement("awards_gold_rush", {
+	title = S("Gold Rush"),
+	description = S("Mine 45 gold ores."),
+	icon = "default_stone.png^default_mineral_gold.png",
+	trigger = {
+		type = "dig",
+		node = "default:stone_with_gold",
+		target = 45
+	}
+})
+
+awards.register_achievement("awards_diamond_ore", {
+	title = S("Wow, I am Diamonds!"),
+	description = S("Mine your first diamond ore."),
+	icon = "default_stone.png^default_mineral_diamond.png",
+	trigger = {
+		type = "dig",
+		node = "default:stone_with_diamond",
+		target = 1
+	}
+})
+
+awards.register_achievement("awards_diamond_rush", {
+	title = S("Girl's Best Friend"),
+	description = S("Mine 18 diamond ores."),
+	icon = "default_stone.png^default_mineral_diamond.png",
+	trigger = {
+		type = "dig",
+		node = "default:stone_with_diamond",
+		target = 18
+	}
+})
+
+awards.register_achievement("awards_diamondblock", {
+	title = S("Hardest Block on Earth"),
+	description = S("Craft a diamond block."),
+	icon = "default_diamond_block.png",
+	trigger = {
+		type = "craft",
+		item = "default:diamondblock",
+		target = 1
+	}
+})
+
+awards.register_achievement("awards_mossycobble", {
+	title = S("In the Dungeon"),
+	description = S("Mine a mossy cobblestone."),
+	icon = "default_mossycobble.png",
+	trigger = {
+		type = "dig",
+		node = "default:mossycobble",
+		target = 1
+	}
 })
-awards.register_on_death(function(player,data)
-	local pos = player:getpos()
-	if pos and pos.y > 10000 then
-		return "award_no_screen"
-	end
-	return nil
-end)

locale/template.txt

@@ -1,4 +1,9 @@
 Achievement Unlocked: =
+Secret Achievement Unlocked: =
+Achievement Unlocked: %s =
+Secret Achievement Unlocked: %s =
+Achievement Unlocked! =
+Secret Achievement Unlocked! =
 Light It Up =
 Place 100 torches. =
 Light ALL The Things! =
@@ -59,3 +64,4 @@ Deep Down =
 Die below -10000 =
 In space, no one can hear you scream =
 Die above 10000 =
+Awards =

mod.conf

@@ -4,4 +4,4 @@ author = rubenwardy
 description = Adds achievements to Minetest, and an API to register new ones.
 license = LGPL 2.1 or later
 forum = https://forum.minetest.net/viewtopic.php?t=4870
-version = 2.2.0
+version = 2.3.0

sfinv.lua

@@ -0,0 +1,23 @@
+if minetest.get_modpath("sfinv") then
+	sfinv.register_page("awards:awards", {
+		title = "Awards",
+		on_enter = function(self, player, context)
+			context.awards_idx = 1
+		end,
+		get = function(self, player, context)
+			local name = player:get_player_name()
+			return sfinv.make_formspec(player, context,
+				awards.getFormspec(name, name, context.awards_idx or 1),
+				false, "size[11,5]")
+		end,
+		on_player_receive_fields = function(self, player, context, fields)
+			if fields.awards then
+				local event = minetest.explode_textlist_event(fields.awards)
+				if event.type == "CHG" then
+					context.awards_idx = event.index
+					sfinv.set(player, context)
+				end
+			end
+		end
+	})
+end

unified_inventory.lua

@@ -0,0 +1,19 @@
+if minetest.get_modpath("unified_inventory") ~= nil then
+	local S
+	if (intllib) then
+		dofile(minetest.get_modpath("intllib").."/intllib.lua")
+		S = intllib.Getter(minetest.get_current_modname())
+	else
+		S = function ( s ) return s end
+	end
+
+	unified_inventory.register_button("awards", {
+		type = "image",
+		image = "awards_ui_icon.png",
+		tooltip = S("Awards"),
+		action = function(player)
+			local name = player:get_player_name()
+			awards.show_to(name, name, nil, false)
+		end,
+	})
+end