Commit 81dd39c071f5713ae46fbae55e2af78f26061605
1 parent
1a8d9aaf
Some UI updates
Tentative fix for yeti's in EoR havingfur stick outside of pants
Showing
33 changed files
with
5 additions
and
3 deletions
... | ... | @@ -4367,7 +4367,7 @@ function _M:updateModdableTile() |
4367 | 4367 | |
4368 | 4368 | i = self:getObjectModdableTile(self.INVEN_FEET); if i and i.moddable_tile then add[#add+1] = {image = base..(i.moddable_tile)..".png", bodyplace="feet", auto_tall=1} end |
4369 | 4369 | i = self:getObjectModdableTile(self.INVEN_BODY); if i and i.moddable_tile2 then add[#add+1] = {image = base..(i.moddable_tile2)..".png", bodyplace="body", auto_tall=1} |
4370 | - elseif not self:attr("moddable_tile_nude") then add[#add+1] = {image = base..(self:attr("moddable_tile_lower_underwear") or "lower_body_01.png"), bodyplace="body", auto_tall=1} end | |
4370 | + elseif not self:attr("moddable_tile_nude") and (not i or i.moddable_tile2 ~= false) then add[#add+1] = {image = base..(self:attr("moddable_tile_lower_underwear") or "lower_body_01.png"), bodyplace="body", auto_tall=1} end | |
4371 | 4371 | i = self:getObjectModdableTile(self.INVEN_BODY); if i and i.moddable_tile then add[#add+1] = {image = base..(i.moddable_tile)..".png", bodyplace="body", auto_tall=1} |
4372 | 4372 | elseif not self:attr("moddable_tile_nude") then add[#add+1] = {image = base..(self:attr("moddable_tile_higher_underwear") or "upper_body_01.png"), bodyplace="body", auto_tall=1} end |
4373 | 4373 | i = self:getObjectModdableTile(self.INVEN_CLOAK); if i and i.moddable_tile then add[#add+1] = {image = base..(i.moddable_tile):format("shoulder")..".png", bodyplace="body", auto_tall=1} end | ... | ... |
... | ... | @@ -98,7 +98,8 @@ function _M:init(t, no_default) |
98 | 98 | end |
99 | 99 | if file and fs.exists("/data/gfx/shockbolt/player/human_female/"..filecheck..".png") then |
100 | 100 | self.moddable_tile = file |
101 | - -- print("[UNIQUE MODDABLE] auto moddable set for ", self.name, file) | |
101 | + self.moddable_tile2 = false | |
102 | + -- print("[UNIQUE MODDABLE] auto moddable set (case 1) for ", self.name, file) | |
102 | 103 | else |
103 | 104 | -- Try using the artifact image name |
104 | 105 | if type(self.image) == "string" and self.image:find("^object/artifact/") then |
... | ... | @@ -115,7 +116,8 @@ function _M:init(t, no_default) |
115 | 116 | end |
116 | 117 | if file and fs.exists("/data/gfx/shockbolt/player/human_female/"..filecheck..".png") then |
117 | 118 | self.moddable_tile = file |
118 | - -- print("[UNIQUE MODDABLE] auto moddable set for ", self.name, file) | |
119 | + self.moddable_tile2 = false | |
120 | + -- print("[UNIQUE MODDABLE] auto moddable set (case 2) for ", self.name, file) | |
119 | 121 | else |
120 | 122 | print("[UNIQUE MODDABLE] auto moddable failed for ", self.name) |
121 | 123 | end | ... | ... |

18 KB

20.6 KB

25.9 KB
-
Please register or login to post a comment