Fix bugs when player has achieved removed award

This commit is contained in:
rubenwardy 2014-09-26 19:52:10 +01:00
parent b75f2cbaea
commit fc950bb620
1 changed files with 30 additions and 23 deletions

53
api.lua
View File

@ -347,8 +347,10 @@ function awards._order_awards(name)
local player = awards.player(name) local player = awards.player(name)
if player and player.unlocked then if player and player.unlocked then
for _,got in pairs(player.unlocked) do for _,got in pairs(player.unlocked) do
done[got] = true if awards.def[got] then
table.insert(retval,{name=got,got=true}) done[got] = true
table.insert(retval,{name=got,got=true})
end
end end
end end
for _,def in pairs(awards.def) do for _,def in pairs(awards.def) do
@ -372,14 +374,16 @@ function awards.showto(name, to, sid, text)
for _, str in pairs(awards.players[name].unlocked) do for _, str in pairs(awards.players[name].unlocked) do
local def = awards.def[str] local def = awards.def[str]
if def and def.title then if def then
if def.description then if def.title then
minetest.chat_send_player(to, def.title..": "..def.description) if def.description then
minetest.chat_send_player(to, def.title..": "..def.description)
else
minetest.chat_send_player(to, def.title)
end
else else
minetest.chat_send_player(to, def.title) minetest.chat_send_player(to, str)
end end
else
minetest.chat_send_player(to, str)
end end
end end
else else
@ -408,6 +412,7 @@ function awards.showto(name, to, sid, text)
if item.got then if item.got then
status = " (got)" status = " (got)"
end end
local icon = ""
if def and def.icon then if def and def.icon then
icon = def.icon icon = def.icon
end end
@ -423,23 +428,25 @@ function awards.showto(name, to, sid, text)
formspec = formspec .. "textlist[4.75,0;6,5;awards;" formspec = formspec .. "textlist[4.75,0;6,5;awards;"
local first = true local first = true
for _,award in pairs(listofawards) do for _,award in pairs(listofawards) do
if not first then
formspec = formspec .. ","
end
first = false
local def = awards.def[award.name] local def = awards.def[award.name]
if def then
if def and def.secret and not award.got then if not first then
formspec = formspec .. "#ACACACSecret Award" formspec = formspec .. ","
else end
local title = award.name first = false
if def and def.title then
title = def.title if def.secret and not award.got then
end formspec = formspec .. "#ACACACSecret Award"
if award.got then
formspec = formspec .. minetest.formspec_escape(title)
else else
formspec = formspec .. "#ACACAC".. minetest.formspec_escape(title) local title = award.name
if def and def.title then
title = def.title
end
if award.got then
formspec = formspec .. minetest.formspec_escape(title)
else
formspec = formspec .. "#ACACAC".. minetest.formspec_escape(title)
end
end end
end end
end end