From 07997a54f4c082b6c2499f904825fb51394c9bf5 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Wed, 4 Apr 2018 21:11:40 +0100
Subject: [PATCH] Readd awards

---
 api.lua    |  4 ++--
 awards.lua |  6 +++---
 init.lua   | 13 +------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/api.lua b/api.lua
index a4c7a3e..d85ef6c 100644
--- a/api.lua
+++ b/api.lua
@@ -162,7 +162,7 @@ function awards.register_trigger(tname, tdef)
 			end
 
 			function def.getDefaultDescription(_)
-				local n = self.trigger.target
+				local n = def.trigger.target
 				return NS(tdef.auto_description[1], tdef.auto_description[2], n, n)
 			end
 
@@ -216,7 +216,7 @@ function awards.register_trigger(tname, tdef)
 			end
 
 			function def.getDefaultDescription(_)
-				local n = self.trigger.target
+				local n = def.trigger.target
 				if tmp.key then
 					local nname = tmp.key
 					return NS(tdef.auto_description[1],
diff --git a/awards.lua b/awards.lua
index 9ea27b3..4716198 100644
--- a/awards.lua
+++ b/awards.lua
@@ -214,9 +214,9 @@ if minetest.get_modpath("default") then
 		icon = "default_lava.png",
 	})
 	awards.register_on_dig(function(player,data)
-		local pos = player:getpos()
-		if pos and (minetest.find_node_near(pos, 1, "default:lava_source") ~= nil or
-		minetest.find_node_near(pos, 1, "default:lava_flowing") ~= nil) then
+		local pos = player:get_pos()
+		if pos and (minetest.find_node_near(pos, 1, "default:lava_source") or
+				minetest.find_node_near(pos, 1, "default:lava_flowing")) then
 			return "award_lavaminer"
 		end
 		return nil
diff --git a/init.lua b/init.lua
index 7ee2409..fed7ceb 100644
--- a/init.lua
+++ b/init.lua
@@ -28,7 +28,7 @@ dofile(minetest.get_modpath("awards").."/api.lua")
 dofile(minetest.get_modpath("awards").."/chat_commands.lua")
 dofile(minetest.get_modpath("awards").."/gui.lua")
 dofile(minetest.get_modpath("awards").."/triggers.lua")
--- dofile(minetest.get_modpath("awards").."/awards.lua")
+dofile(minetest.get_modpath("awards").."/awards.lua")
 
 -- Backwards compatibility
 awards.give_achievement = awards.unlock
@@ -41,14 +41,3 @@ awards.register_onChat  = awards.register_on_chat
 awards.register_onJoin  = awards.register_on_join
 awards.register_onCraft = awards.register_on_craft
 awards.def              = awards.registered_awards
-
-awards.register_achievement("award_saint_maclou",{
-	title = "Saint-Maclou",
-	description = "Place 20 coal checkers.",
-	icon = "awards_novicebuilder.png",
-	trigger = {
-		type = "dig",
-		node = "default:stone",
-		target = 3,
-	},
-})