From 72cc346c35d3610c2367d7dbb02e130ac8a96411 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Wed, 4 Apr 2018 17:43:44 +0100 Subject: [PATCH] Rename awards.def to awards.registered_awards --- api.lua | 8 ++++---- chat_commands.lua | 2 +- gui.lua | 10 +++++----- init.lua | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/api.lua b/api.lua index fd4b2dc..73182db 100644 --- a/api.lua +++ b/api.lua @@ -16,7 +16,7 @@ local S, NS = awards.gettext, awards.ngettext -awards.def = {} +awards.registered_awards = {} awards.on = {} awards.on_unlock = {} @@ -205,9 +205,9 @@ function awards.register_achievement(name, def) end -- Add Award - awards.def[name] = def + awards.registered_awards[name] = def - local tdef = awards.def[name] + local tdef = awards.registered_awards[name] if def.description == nil and tdef.getDefaultDescription then def.description = tdef:getDefaultDescription() end @@ -241,7 +241,7 @@ end function awards.unlock(name, award) -- Access Player Data local data = awards.player(name) - local awdef = awards.def[award] + local awdef = awards.registered_awards[award] assert(awdef, "Unable to unlock an award which doesn't exist!") if data.disabled or diff --git a/chat_commands.lua b/chat_commands.lua index 3f4ed68..c85d1ed 100644 --- a/chat_commands.lua +++ b/chat_commands.lua @@ -42,7 +42,7 @@ minetest.register_chatcommand("awd", { params = S(""), description = S("Show details of an achievement"), func = function(name, param) - local def = awards.def[param] + local def = awards.registered_awards[param] if def then minetest.chat_send_player(name, string.format(S("%s: %s"), def.title, def.description)) else diff --git a/gui.lua b/gui.lua index b6f1084..6b873eb 100644 --- a/gui.lua +++ b/gui.lua @@ -6,13 +6,13 @@ local function order_awards(name) local player = awards.player(name) if player and player.unlocked then for _,got in pairs(player.unlocked) do - if awards.def[got] then + if awards.registered_awards[got] then done[got] = true table.insert(retval,{name=got,got=true}) end end end - for _,def in pairs(awards.def) do + for _,def in pairs(awards.registered_awards) do if not done[def.name] then table.insert(retval,{name=def.name,got=false}) end @@ -34,7 +34,7 @@ function awards.get_formspec(name, to, sid) -- Sidebar if sid then local item = listofawards[sid+0] - local def = awards.def[item.name] + local def = awards.registered_awards[item.name] if def and def.secret and not item.got then formspec = formspec .. "label[1,2.75;"..minetest.formspec_escape(S("(Secret Award)")).."]".. @@ -87,7 +87,7 @@ function awards.get_formspec(name, to, sid) formspec = formspec .. "textlist[4.75,0;6,5;awards;" local first = true for _,award in pairs(listofawards) do - local def = awards.def[award.name] + local def = awards.registered_awards[award.name] if def then if not first then formspec = formspec .. "," @@ -134,7 +134,7 @@ function awards.show_to(name, to, sid, text) minetest.chat_send_player(to, string.format(S("%s’s awards:"), name)) for _, str in pairs(data.unlocked) do - local def = awards.def[str] + local def = awards.registered_awards[str] if def then if def.title then if def.description then diff --git a/init.lua b/init.lua index 03e2682..114790a 100644 --- a/init.lua +++ b/init.lua @@ -40,6 +40,7 @@ awards.register_onDeath = awards.register_on_death 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",