Skip to content
Snippets Groups Projects
Commit d7cdd2c6 authored by DarkGod's avatar DarkGod
Browse files

plop

parent daccc078
No related branches found
No related tags found
No related merge requests found
game/modules/tome/data/gfx/shockbolt/portrait/allied-kingdoms.png

21 KiB

game/modules/tome/data/gfx/shockbolt/portrait/angolwen.png

16.1 KiB

game/modules/tome/data/gfx/shockbolt/portrait/iron-throne.png

20.1 KiB

game/modules/tome/data/gfx/shockbolt/portrait/point-zero.png

29.6 KiB

game/modules/tome/data/gfx/shockbolt/portrait/shalore.png

21.6 KiB

game/modules/tome/data/gfx/shockbolt/portrait/thalore.png

22 KiB

game/modules/tome/data/gfx/shockbolt/portrait/the-way.png

18.8 KiB

game/modules/tome/data/gfx/shockbolt/portrait/zigur.png

15.5 KiB

......@@ -60,11 +60,11 @@ function _M:makeUI()
if h + frameh < back.h then h = back.h - frameh end
-- Ensure if it's too big but too small to not have the down deco, to increase it a it
if h + frameh > back.h then
if h + frameh < back.h + 16 then h = back.h - frameh + 16 game.log("==adjusting to %d", 16)
elseif h + frameh < back.h + 32 then h = back.h - frameh + 32 game.log("==adjusting to %d", 32)
elseif h + frameh < back.h + 48 then h = back.h - frameh + 48 game.log("==adjusting to %d", 48)
elseif h + frameh < back.h + 64 then h = back.h - frameh + 64 game.log("==adjusting to %d", 64)
elseif h + frameh < back.h + 80 then h = back.h - frameh + 80 game.log("==adjusting to %d", 80)
if h + frameh < back.h + 16 then h = back.h - frameh + 16
elseif h + frameh < back.h + 32 then h = back.h - frameh + 32
elseif h + frameh < back.h + 48 then h = back.h - frameh + 48
elseif h + frameh < back.h + 64 then h = back.h - frameh + 64
elseif h + frameh < back.h + 80 then h = back.h - frameh + 80
end
end
......@@ -148,6 +148,8 @@ function _M:getActorPortrait(actor)
return Entity.new{name=actor.name, image=actor.image:gsub("^object/artifact/", "portrait/")}
elseif actor.image:find("^talents/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^talents/", "portrait/")) then
return Entity.new{name=actor.name, image=actor.image:gsub("^talents/", "portrait/")}
elseif actor.image:find("^faction/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^faction/", "portrait/")) then
return Entity.new{name=actor.name, image=actor.image:gsub("^faction/", "portrait/")}
end
-- Last resort, use it as it is
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment