From ef19940edc20791d2342b7b68b7bb098a0abc2db Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Wed, 4 Apr 2018 17:01:55 +0100
Subject: Add trigger definitions rather than register function

---
 api_helpers.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'api_helpers.lua')

diff --git a/api_helpers.lua b/api_helpers.lua
index cd499ab..88aebd4 100644
--- a/api_helpers.lua
+++ b/api_helpers.lua
@@ -34,6 +34,7 @@ function awards.assertPlayer(playern)
 end
 
 function awards.player(name)
+	awards.assertPlayer(name)
 	return awards.players[name]
 end
 
-- 
cgit v1.2.3


From eeee4a8398a487c0d2f51b14c36ddb7b0cbbe4ac Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Wed, 4 Apr 2018 17:23:46 +0100
Subject: Clean up player data validation

---
 api_helpers.lua | 42 +++++++-----------------------------------
 1 file changed, 7 insertions(+), 35 deletions(-)

(limited to 'api_helpers.lua')

diff --git a/api_helpers.lua b/api_helpers.lua
index 88aebd4..6e4c514 100644
--- a/api_helpers.lua
+++ b/api_helpers.lua
@@ -1,40 +1,12 @@
-function awards.tbv(tb,value,default)
-	if not default then
-		default = {}
-	end
-	if not tb or type(tb) ~= "table" then
-		if not value then
-			value = "[NULL]"
-		end
-		minetest.log("error", "awards.tbv - table "..dump(value).." is null, or not a table! Dump: "..dump(tb))
-		return
-	end
-	if not value then
-		error("[ERROR] awards.tbv was not used correctly!\n"..
-			"Value: '"..dump(value).."'\n"..
-			"Dump:"..dump(tb))
-		return
-	end
-	if not tb[value] then
-		tb[value] = default
-	end
-end
-
-function awards.assertPlayer(playern)
-	awards.tbv(awards.players, playern)
-	awards.tbv(awards.players[playern], "name", playern)
-	awards.tbv(awards.players[playern], "unlocked")
-	awards.tbv(awards.players[playern], "place")
-	awards.tbv(awards.players[playern], "count")
-	awards.tbv(awards.players[playern], "craft")
-	awards.tbv(awards.players[playern], "eat")
-	awards.tbv(awards.players[playern], "deaths", 0)
-	awards.tbv(awards.players[playern], "joins", 0)
-	awards.tbv(awards.players[playern], "chats", 0)
+function awards.player(name)
+	local data = awards.players[name] or {}
+	awards.players[name] = data
+	data.name = data.name or name
+	data.unlocked = data.unlocked or {}
+	return data
 end
 
-function awards.player(name)
-	awards.assertPlayer(name)
+function awards.player_or_nil(name)
 	return awards.players[name]
 end
 
-- 
cgit v1.2.3


From 5de9dcb7976f1c581601ab876d6bf3087991c4f6 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Wed, 4 Apr 2018 17:42:12 +0100
Subject: Move api_helpers.lua in api.lua

---
 api_helpers.lua | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 api_helpers.lua

(limited to 'api_helpers.lua')

diff --git a/api_helpers.lua b/api_helpers.lua
deleted file mode 100644
index 6e4c514..0000000
--- a/api_helpers.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-function awards.player(name)
-	local data = awards.players[name] or {}
-	awards.players[name] = data
-	data.name = data.name or name
-	data.unlocked = data.unlocked or {}
-	return data
-end
-
-function awards.player_or_nil(name)
-	return awards.players[name]
-end
-
-function awards._order_awards(name)
-	local done = {}
-	local retval = {}
-	local player = awards.player(name)
-	if player and player.unlocked then
-		for _,got in pairs(player.unlocked) do
-			if awards.def[got] then
-				done[got] = true
-				table.insert(retval,{name=got,got=true})
-			end
-		end
-	end
-	for _,def in pairs(awards.def) do
-		if not done[def.name] then
-			table.insert(retval,{name=def.name,got=false})
-		end
-	end
-	return retval
-end
-- 
cgit v1.2.3