Wuzzy/Repixture
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Armor fixes and cleanup

Browse Source
This commit is contained in:
Wuzzy 2019-10-24 16:48:51 +02:00
parent 14a431c40c
commit cabbc3979a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mods/armor/init.lua
View File

@ -41,6 +41,11 @@ form_armor = form_armor .. default.ui.get_itemslot_bg(2.25, 0.75, 1, 3)
default.ui.register_page("armor:armor", form_armor) default.ui.register_page("armor:armor", form_armor)
function armor.get_formspec(name)
local form = default.ui.get_page("armor:armor")
return form
end
function armor.is_armor(itemname) function armor.is_armor(itemname)
local item = minetest.registered_items[itemname] local item = minetest.registered_items[itemname]
@ -279,10 +284,7 @@ end)
-- Move armor items to correct slot -- Move armor items to correct slot
minetest.register_on_player_inventory_action(function(player, action, inventory, inventory_info) minetest.register_on_player_inventory_action(function(player, action, inventory, inventory_info)
if inventory_info.to_list ~= "armor" then if action == "move" and inventory_info.to_list == "armor" then
return
end
if action == "move" then
local stack = inventory:get_stack(inventory_info.to_list, inventory_info.to_index) local stack = inventory:get_stack(inventory_info.to_list, inventory_info.to_index)
local name = stack:get_name() local name = stack:get_name()
local slot = minetest.get_item_group(name, "armor_slot") local slot = minetest.get_item_group(name, "armor_slot")
@ -298,7 +300,11 @@ minetest.register_on_player_inventory_action(function(player, action, inventory,
inventory:set_stack("armor", slot, stack) inventory:set_stack("armor", slot, stack)
end end
end end
if action == "move" and inventory_info.to_list == "armor" or inventory_info.from_list == "armor" then
armor.update(player) armor.update(player)
elseif action == "put" or action == "take" and inventory_info.listname == "armor" then
armor.update(player)
end
end) end)
-- Achievements -- Achievements

2
mods/default/formspec.lua
View File

@ -350,7 +350,7 @@ function default.ui.receive_fields(player, form_name, fields)
form = crafting.get_formspec(name) form = crafting.get_formspec(name)
elseif minetest.get_modpath("armor") ~= nil and fields.tab_armor then elseif minetest.get_modpath("armor") ~= nil and fields.tab_armor then
formname = "armor:armor" formname = "armor:armor"
form = default.ui.get_page("armor:armor") form = armor.get_formspec(name)
elseif minetest.get_modpath("achievements") ~= nil and fields.tab_achievements then elseif minetest.get_modpath("achievements") ~= nil and fields.tab_achievements then
formname = "achievements:achievements" formname = "achievements:achievements"
form = achievements.get_formspec(name) form = achievements.get_formspec(name)