Authored by DarkGod
1 parent daccc078

### plop

21 KB

16.1 KB

20.1 KB

29.6 KB

21.6 KB

22 KB

18.8 KB

15.5 KB

 @@ -60,11 +60,11 @@ function _M:makeUI() @@ -60,11 +60,11 @@ function _M:makeUI() 60 if h + frameh < back.h then h = back.h - frameh end 60 if h + frameh < back.h then h = back.h - frameh end 61 -- Ensure if it's too big but too small to not have the down deco, to increase it a it 61 -- Ensure if it's too big but too small to not have the down deco, to increase it a it 62 if h + frameh > back.h then 62 if h + frameh > back.h then 63 - if h + frameh < back.h + 16 then h = back.h - frameh + 16 game.log("==adjusting to %d", 16) 64 - elseif h + frameh < back.h + 32 then h = back.h - frameh + 32 game.log("==adjusting to %d", 32) 65 - elseif h + frameh < back.h + 48 then h = back.h - frameh + 48 game.log("==adjusting to %d", 48) 66 - elseif h + frameh < back.h + 64 then h = back.h - frameh + 64 game.log("==adjusting to %d", 64) 67 - elseif h + frameh < back.h + 80 then h = back.h - frameh + 80 game.log("==adjusting to %d", 80) 63 + if h + frameh < back.h + 16 then h = back.h - frameh + 16 64 + elseif h + frameh < back.h + 32 then h = back.h - frameh + 32 65 + elseif h + frameh < back.h + 48 then h = back.h - frameh + 48 66 + elseif h + frameh < back.h + 64 then h = back.h - frameh + 64 67 + elseif h + frameh < back.h + 80 then h = back.h - frameh + 80 68 end 68 end 69 end 69 end 70 70 @@ -148,6 +148,8 @@ function _M:getActorPortrait(actor) @@ -148,6 +148,8 @@ function _M:getActorPortrait(actor) 148 return Entity.new{name=actor.name, image=actor.image:gsub("^object/artifact/", "portrait/")} 148 return Entity.new{name=actor.name, image=actor.image:gsub("^object/artifact/", "portrait/")} 149 elseif actor.image:find("^talents/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^talents/", "portrait/")) then 149 elseif actor.image:find("^talents/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^talents/", "portrait/")) then 150 return Entity.new{name=actor.name, image=actor.image:gsub("^talents/", "portrait/")} 150 return Entity.new{name=actor.name, image=actor.image:gsub("^talents/", "portrait/")} 151 + elseif actor.image:find("^faction/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^faction/", "portrait/")) then 152 + return Entity.new{name=actor.name, image=actor.image:gsub("^faction/", "portrait/")} 151 end 153 end 152 154 153 -- Last resort, use it as it is 155 -- Last resort, use it as it is