nalc/minetest-3d_armor
1
0
Fork 0
forked from mtcontrib/3d_armor
Code Issues Pull Requests Releases Wiki Activity

Log warning if initialization fails and validate armor.def for UI

Browse Source
This commit is contained in:
stujones11 2017-04-11 20:42:58 +01:00
parent 9ffcc19fd7
commit b45fbd0f2a
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3d_armor/init.lua
View File

@ -239,9 +239,13 @@ minetest.register_globalstep(function(dtime)
timer = timer + dtime timer = timer + dtime
if timer > armor.config.init_delay then if timer > armor.config.init_delay then
for i, con in pairs(pending_players) do for i, con in pairs(pending_players) do
local remove = armor:init_player_armor(con[1]) == true
con[2] = con[2] + 1 con[2] = con[2] + 1
if con[2] > armor.config.init_times or if con[2] > armor.config.init_times then
armor:init_player_armor(con[1]) == true then minetest.log("warning", "3d_armor: Failed to initialize player")
remove = true
end
if remove == true then
table.remove(pending_players, i) table.remove(pending_players, i)
end end
end end

19
3d_armor_ui/init.lua
View File

@ -29,19 +29,22 @@ unified_inventory.register_page("armor", {
local name = player:get_player_name() local name = player:get_player_name()
local formspec = "background[0.06,"..fy..";7.92,7.52;3d_armor_ui_form.png]".. local formspec = "background[0.06,"..fy..";7.92,7.52;3d_armor_ui_form.png]"..
"label[0,0;Armor]".. "label[0,0;Armor]"..
"list[detached:"..name.."_armor;armor;0,"..fy..";2,3;]".. "list[detached:"..name.."_armor;armor;0,"..fy..";2,3;]"
if armor.def[name] then
formspec = formspec ..
"image[2.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]".. "image[2.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]"..
"label[5.0,"..(fy + 0.0)..";"..S("Level")..": "..armor.def[name].level.."]".. "label[5.0,"..(fy + 0.0)..";"..S("Level")..": "..armor.def[name].level.."]"..
"label[5.0,"..(fy + 0.5)..";"..S("Heal")..": "..armor.def[name].heal.."]".. "label[5.0,"..(fy + 0.5)..";"..S("Heal")..": "..armor.def[name].heal.."]"..
"listring[current_player;main]".. "listring[current_player;main]"..
"listring[detached:"..name.."_armor;armor]" "listring[detached:"..name.."_armor;armor]"
if armor.config.fire_protect then if armor.config.fire_protect then
formspec = formspec.."label[5.0,"..(fy + 1.0)..";".. formspec = formspec.."label[5.0,"..(fy + 1.0)..";"..
S("Fire")..": "..armor.def[name].fire.."]" S("Fire")..": "..armor.def[name].fire.."]"
end end
if minetest.global_exists("technic") then if minetest.global_exists("technic") then
formspec = formspec.."label[5.0,"..(fy + 1.5)..";".. formspec = formspec.."label[5.0,"..(fy + 1.5)..";"..
S("Radiation")..": "..armor.def[name].groups["radiation"].."]" S("Radiation")..": "..armor.def[name].groups["radiation"].."]"
end
end end
return {formspec=formspec} return {formspec=formspec}
end, end,