From ea7c8f20dcaf1fafd0e024cfb14ad0ea5611acad Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Sat, 5 Sep 2015 21:31:35 +0200 Subject: [PATCH] Force placement of shields after everything else in preview - Solves #266 --- mods/3d_armor/3d_armor/armor.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mods/3d_armor/3d_armor/armor.lua b/mods/3d_armor/3d_armor/armor.lua index b2440463..0ddb18c2 100755 --- a/mods/3d_armor/3d_armor/armor.lua +++ b/mods/3d_armor/3d_armor/armor.lua @@ -178,7 +178,7 @@ armor.set_player_armor = function(self, player) local textures = {} local physics_o = {speed=1,gravity=1,jump=1} local material = {type=nil, count=1} - local preview = armor:get_preview(name) or "character_preview.png" + local preview = "" for _,v in ipairs(self.elements) do elements[v] = false end @@ -193,7 +193,11 @@ armor.set_player_armor = function(self, player) if level then local texture = item:gsub("%:", "_") table.insert(textures, texture..".png") - preview = preview.."^"..texture.."_preview.png" + if stack:get_name():find("shield") then -- //MFF(Mg|09/05/15) + preview = preview.."^"..texture.."_preview.png" + else + preview = texture .. "_preview.png^" .. preview + end armor_level = armor_level + level state = state + stack:get_wear() items = items + 1 @@ -221,6 +225,7 @@ armor.set_player_armor = function(self, player) end end end + preview = (armor:get_preview(name) or "character_preview.png") .. "^" .. preview -- //MFF(Mg|09/05/15) if minetest.get_modpath("shields") then armor_level = armor_level * 0.9 end