diff --git a/game/engines/default/data/gfx/background/cards/aeryn.png b/game/engines/default/data/gfx/background/cards/aeryn.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae7743985946c9158a78ccaab8b2dd6dba6b4c40
Binary files /dev/null and b/game/engines/default/data/gfx/background/cards/aeryn.png differ
diff --git a/game/engines/default/data/gfx/background/cards/derth.png b/game/engines/default/data/gfx/background/cards/derth.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5fd672b48820421ae4ef46d59857af559889d0a
Binary files /dev/null and b/game/engines/default/data/gfx/background/cards/derth.png differ
diff --git a/game/engines/default/data/gfx/background/cards/fortress.png b/game/engines/default/data/gfx/background/cards/fortress.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b9450445e884b4180e29f85e39036f54074ad77
Binary files /dev/null and b/game/engines/default/data/gfx/background/cards/fortress.png differ
diff --git a/game/engines/default/data/gfx/background/cards/garkul.png b/game/engines/default/data/gfx/background/cards/garkul.png
new file mode 100644
index 0000000000000000000000000000000000000000..95cc18e9622c5dbd7826fa9fca2dc6273be9d0cb
Binary files /dev/null and b/game/engines/default/data/gfx/background/cards/garkul.png differ
diff --git a/game/engines/default/data/gfx/background/cards/linaniil.png b/game/engines/default/data/gfx/background/cards/linaniil.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcc1c799a79e1febca908ef515e4d84927542876
Binary files /dev/null and b/game/engines/default/data/gfx/background/cards/linaniil.png differ
diff --git a/game/engines/default/data/gfx/background/cards/master.png b/game/engines/default/data/gfx/background/cards/master.png
new file mode 100644
index 0000000000000000000000000000000000000000..de09533439eb2a13425c6fd6fbfd908e6b1584d6
Binary files /dev/null and b/game/engines/default/data/gfx/background/cards/master.png differ
diff --git a/game/engines/default/data/gfx/background/cards/myssil.png b/game/engines/default/data/gfx/background/cards/myssil.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ea10f26365a5e1b5e3227bf0006808acc5e3534
Binary files /dev/null and b/game/engines/default/data/gfx/background/cards/myssil.png differ
diff --git a/game/engines/default/data/gfx/background/cards/urkis.png b/game/engines/default/data/gfx/background/cards/urkis.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdd5ca507ab2634362e5011bad248dae7d5fa6c4
Binary files /dev/null and b/game/engines/default/data/gfx/background/cards/urkis.png differ
diff --git a/game/engines/default/engine/LogDisplay.lua b/game/engines/default/engine/LogDisplay.lua
index f62c90b774e2de11b36646424470bb417279da24..1df23598f8a5fc54bcb2eb2ba30e4fd713dc4f47 100644
--- a/game/engines/default/engine/LogDisplay.lua
+++ b/game/engines/default/engine/LogDisplay.lua
@@ -183,7 +183,7 @@ function _M:mouseEvent(button, x, y, xrel, yrel, bx, by, event)
for di = 1, #citem.item._dduids do sub_es[#sub_es+1] = citem.item._dduids[di].e end
if citem.url and button == "left" and event == "button" then
- util.browserOpenUrl(citem.url)
+ util.browserOpenUrl(citem.url, {is_external=true})
else
self.on_mouse(citem, sub_es, button, event, x, y, xrel, yrel, bx, by)
end
diff --git a/game/engines/default/engine/Module.lua b/game/engines/default/engine/Module.lua
index 2ef9cd2b43c4de67ac2d0853d2785c630e020d34..32774ca9f0933f9ebad6c7e035eef4afeed95184 100644
--- a/game/engines/default/engine/Module.lua
+++ b/game/engines/default/engine/Module.lua
@@ -346,8 +346,11 @@ function _M:listBackgrounds(mod)
end
-- Add the default one
- local backname = util.getval(mod.background_name) or "tome"
- defs[#defs+1] = {name="/data/gfx/background/"..backname..".png", logo="/data/gfx/background/"..backname.."-logo.png", chance=100}
+ -- local backname = util.getval(mod.background_name) or "tome"
+ -- defs[#defs+1] = {name="/data/gfx/background/"..backname..".png", logo="/data/gfx/background/"..backname.."-logo.png", chance=100}
+ for i, backname in ipairs(mod.background_name) do
+ defs[#defs+1] = {name="/data/gfx/background/"..backname..".png", logo="/data/gfx/background/"..backname.."-logo.png", chance=100}
+ end
-- Look for more
parse("/addons/")
@@ -366,6 +369,8 @@ function _M:listBackgrounds(mod)
if def.logo then logo = {(core.display.loadImage(def.logo) or core.display.loadImage("/data/gfx/background/tome-logo.png")):glTexture()} end
if def.umount then def.umount() end
+ if mod.keep_background_texture then mod.keep_background_texture = bkgs end
+
return bkgs, logo
end
diff --git a/game/engines/default/engine/UserChat.lua b/game/engines/default/engine/UserChat.lua
index 77b1007fc14b1895c968cb86cb933cfa01d5eee1..fe6c2684111be6696b465445c065aa731f60d6b6 100644
--- a/game/engines/default/engine/UserChat.lua
+++ b/game/engines/default/engine/UserChat.lua
@@ -648,7 +648,7 @@ function _M:mouseEvent(button, x, y, xrel, yrel, bx, by, event)
end
if citem and citem.url and button == "left" and event == "button" then
- util.browserOpenUrl(citem.url)
+ util.browserOpenUrl(citem.url, {is_external=true})
else
self.on_mouse(citem and citem.login and self.channels[self.cur_channel] and self.channels[self.cur_channel].users and self.channels[self.cur_channel].users[citem.login], citem and citem.login and citem, button, event, x, y, xrel, yrel, bx, by)
end
diff --git a/game/engines/default/engine/dialogs/UserInfo.lua b/game/engines/default/engine/dialogs/UserInfo.lua
index 685d753bd3c667241c1be0b3509cc96eae53bf45..a8dd4b1208b4cb4e255107fd9c265b4215e05284 100644
--- a/game/engines/default/engine/dialogs/UserInfo.lua
+++ b/game/engines/default/engine/dialogs/UserInfo.lua
@@ -40,8 +40,8 @@ function _M:init(data)
str:add({"color","ANTIQUE_WHITE"}, "Validation: ", {"color", "LAST"}, data.current_char.valid and "Game has been validated by the server" or "Game is not validated by the server", true)
self.c_desc = Textzone.new{width=400, height=1, auto_height=true, text=str}
- local b_profile = require("engine.ui.Button").new{text="Go to online profile", fct=function() util.browserOpenUrl(data.profile) end}
- local b_char = require("engine.ui.Button").new{text="Go to online charsheet", fct=function() util.browserOpenUrl(data.char_link) end}
+ local b_profile = require("engine.ui.Button").new{text="Go to online profile", fct=function() util.browserOpenUrl(data.profile, {is_external=true}) end}
+ local b_char = require("engine.ui.Button").new{text="Go to online charsheet", fct=function() util.browserOpenUrl(data.char_link, {is_external=true}) end}
local ui = {
{left=0, top=0, ui=self.c_desc},
diff --git a/game/engines/default/engine/ui/Slider.lua b/game/engines/default/engine/ui/Slider.lua
index 15244e8ec4aed5ef64e695d1d6c1df1ef251b191..fe674d53ad3fc5a0c3870603e04c8f62dda01b79 100644
--- a/game/engines/default/engine/ui/Slider.lua
+++ b/game/engines/default/engine/ui/Slider.lua
@@ -48,9 +48,9 @@ function _M:display(x, y)
self.middle.t:toScreenFull(x, y + self.top.h, self.middle.w, self.h - self.top.h - self.bottom.h, self.middle.tw, self.middle.th)
self.pos = util.minBound(self.pos, 0, self.max)
if self.inverse then
- y = y + self.h - (self.pos / self.max) * (self.h - self.bottom.h - self.top.h - self.sel.h * 0.5) + self.sel.h * 0.5
+ y = y + self.h - (self.pos / self.max) * (self.h - self.bottom.h - self.top.h - self.sel.h) - self.bottom.h - self.sel.h
else
- y = y + (self.pos / self.max) * (self.h - self.bottom.h - self.top.h - self.sel.h * 0.5) + self.sel.h * 0.5
+ y = y + (self.pos / self.max) * (self.h - self.bottom.h - self.top.h - self.sel.h) + self.top.h
end
self.sel.t:toScreenFull(x - (self.sel.w - self.top.w) * 0.5, y, self.sel.w, self.sel.h, self.sel.tw, self.sel.th)
end
diff --git a/game/engines/default/engine/utils.lua b/game/engines/default/engine/utils.lua
index 65220178f3d5b02279fa7aeecc50a721dc2da9b9..8ce2dddd6dfcdebe34e64d93ed1bdf3802902b2a 100644
--- a/game/engines/default/engine/utils.lua
+++ b/game/engines/default/engine/utils.lua
@@ -718,7 +718,8 @@ function string.removeUIDCodes(str)
end
function string.splitLine(str, max_width, font)
- local space_w = font:size(" ")
+ local fontoldsize = font.simplesize or font.size
+ local space_w = fontoldsize(font, " ")
local lines = {}
local cur_line, cur_size = "", 0
local v
@@ -726,7 +727,7 @@ function string.splitLine(str, max_width, font)
for i = 1, #ls do
local v = ls[i]
local shortv = v:lpegSub("#" * (Puid + Pcolorcodefull + Pcolorname + Pfontstyle + Pextra) * "#", "")
- local w, h = font:size(shortv)
+ local w, h = fontoldsize(font, shortv)
if cur_size + space_w + w < max_width then
cur_line = cur_line..(cur_size==0 and "" or " ")..v
@@ -824,146 +825,18 @@ function __get_uid_entity(uid)
end
local tmps = core.display.newSurface(1, 1)
-getmetatable(tmps).__index.drawColorString = function(s, font, str, x, y, r, g, b, alpha_from_texture, limit_w)
- local list = str:split("#" * (Puid + Pcolorcodefull + Pcolorname + Pfontstyle + Pextra) * "#", true)
- r = r or 255
- g = g or 255
- b = b or 255
- limit_w = limit_w or 99999999
- local oldr, oldg, oldb = r, g, b
- local max_h = 0
- local sw = 0
- local bx, by = x, y
- for i, v in ipairs(list) do
- local nr, ng, nb = lpeg.match("#" * lpeg.C(Pcolorcode) * lpeg.C(Pcolorcode) * lpeg.C(Pcolorcode) * "#", v)
- local col = lpeg.match("#" * lpeg.C(Pcolorname) * "#", v)
- local uid, mo = lpeg.match("#" * Puid_cap * "#", v)
- local fontstyle = lpeg.match("#" * Pfontstyle_cap * "#", v)
- local extra = lpeg.match("#" * lpeg.C(Pextra) * "#", v)
- if nr and ng and nb then
- oldr, oldg, oldb = r, g, b
- r, g, b = nr:parseHex(), ng:parseHex(), nb:parseHex()
- elseif col then
- if col == "LAST" then
- r, g, b = oldr, oldg, oldb
- else
- oldr, oldg, oldb = r, g, b
- r, g, b = colors[col].r, colors[col].g, colors[col].b
- end
- elseif uid and mo and game.level then
- uid = tonumber(uid)
- mo = tonumber(mo)
- local e = __uids[uid]
- if e then
- local surf = e:getEntityFinalSurface(game.level.map.tiles, font:lineSkip(), font:lineSkip())
- if surf then
- local w, h = surf:getSize()
- if sw + w > limit_w then break end
- s:merge(surf, x, y)
- if h > max_h then max_h = h end
- x = x + (w or 0)
- sw = sw + (w or 0)
- end
- end
- elseif fontstyle then
- font:setStyle(fontstyle)
- elseif extra then
- --
- else
- local w, h = font:size(v)
- local stop = false
- while sw + w > limit_w do
- v = v:sub(1, #v - 1)
- if #v == 0 then break end
- w, h = font:size(v)
- stop = true
- end
- if h > max_h then max_h = h end
- s:drawStringBlended(font, v, x, y, r, g, b, alpha_from_texture)
- x = x + w
- sw = sw + w
- if stop then break end
- end
- end
- return r, g, b, sw, max_h, bx, by
-end
-
-getmetatable(tmps).__index.drawColorStringCentered = function(s, font, str, dx, dy, dw, dh, r, g, b, alpha_from_texture, limit_w)
- local w, h = font:size(str)
- local x, y = dx + (dw - w) / 2, dy + (dh - h) / 2
- s:drawColorString(font, str, x, y, r, g, b, alpha_from_texture, limit_w)
-end
-
-
getmetatable(tmps).__index.drawColorStringBlended = function(s, font, str, x, y, r, g, b, alpha_from_texture, limit_w)
- local list = str:split("#" * (Puid + Pcolorcodefull + Pcolorname + Pfontstyle + Pextra) * "#", true)
- r = r or 255
- g = g or 255
- b = b or 255
- limit_w = limit_w or 99999999
- local oldr, oldg, oldb = r, g, b
- local max_h = 0
- local sw = 0
- local bx, by = x, y
- for i, v in ipairs(list) do
- local nr, ng, nb = lpeg.match("#" * lpeg.C(Pcolorcode) * lpeg.C(Pcolorcode) * lpeg.C(Pcolorcode) * "#", v)
- local col = lpeg.match("#" * lpeg.C(Pcolorname) * "#", v)
- local uid, mo = lpeg.match("#" * Puid_cap * "#", v)
- local fontstyle = lpeg.match("#" * Pfontstyle_cap * "#", v)
- local extra = lpeg.match("#" * lpeg.C(Pextra) * "#", v)
- if nr and ng and nb then
- oldr, oldg, oldb = r, g, b
- r, g, b = nr:parseHex(), ng:parseHex(), nb:parseHex()
- elseif col then
- if col == "LAST" then
- r, g, b = oldr, oldg, oldb
- else
- oldr, oldg, oldb = r, g, b
- r, g, b = colors[col].r, colors[col].g, colors[col].b
- end
- elseif uid and mo and game.level then
- uid = tonumber(uid)
- mo = tonumber(mo)
- local e = __uids[uid]
- if e then
- local surf = e:getEntityFinalSurface(game.level.map.tiles, font:lineSkip(), font:lineSkip())
- if surf then
- local w, h = surf:getSize()
- if sw + (w or 0) > limit_w then break end
- s:merge(surf, x, y)
- if h > max_h then max_h = h end
- x = x + (w or 0)
- sw = sw + (w or 0)
- end
- end
- elseif fontstyle then
- font:setStyle(fontstyle)
- elseif extra then
- --
- else
- local w, h = font:size(v)
- local stop = false
- while sw + w > limit_w do
- v = v:sub(1, #v - 1)
- if #v == 0 then break end
- w, h = font:size(v)
- stop = true
- end
- if h > max_h then max_h = h end
- s:drawStringBlended(font, v, x, y, r, g, b, alpha_from_texture)
- x = x + w
- sw = sw + w
- if stop then break end
- end
- end
- return r, g, b, sw, max_h, bx, by
+ local tstr = str:toTString()
+ return tstr:drawOnSurface(s, limit_w or 99999999, 1, font, x, y, r, g, b, not alpha_from_texture)
end
+getmetatable(tmps).__index.drawColorString = getmetatable(tmps).__index.drawColorStringBlended
getmetatable(tmps).__index.drawColorStringBlendedCentered = function(s, font, str, dx, dy, dw, dh, r, g, b, alpha_from_texture, limit_w)
local w, h = font:size(str)
local x, y = dx + (dw - w) / 2, dy + (dh - h) / 2
s:drawColorStringBlended(font, str, x, y, r, g, b, alpha_from_texture, limit_w)
end
+getmetatable(tmps).__index.drawColorStringCentered = getmetatable(tmps).__index.drawColorStringBlendedCentered
local font_cache = {}
local oldNewFont = core.display.newFont
@@ -987,53 +860,44 @@ local tmps = core.display.newFont("/data/font/Vera.ttf", 12)
local word_size_cache = {}
local fontoldsize = getmetatable(tmps).__index.size
getmetatable(tmps).__index.simplesize = fontoldsize
+local fontcachewordsize = function(font, fstyle, v)
+ if not word_size_cache[font][fstyle][v] then
+ word_size_cache[font][fstyle][v] = {fontoldsize(font, v)}
+ end
+ return unpack(word_size_cache[font][fstyle][v])
+end
getmetatable(tmps).__index.size = function(font, str)
- local list = str:split("#" * (Puid + Pcolorcodefull + Pcolorname + Pfontstyle + Pextra) * "#", true)
+ local tstr = str:toTString()
local mw, mh = 0, 0
local fstyle = font:getStyle()
word_size_cache[font] = word_size_cache[font] or {}
word_size_cache[font][fstyle] = word_size_cache[font][fstyle] or {}
local v
- for i = 1, #list do
- v = list[i]
- local nr, ng, nb = lpeg.match("#" * lpeg.C(Pcolorcode) * lpeg.C(Pcolorcode) * lpeg.C(Pcolorcode) * "#", v)
- local col = lpeg.match("#" * lpeg.C(Pcolorname) * "#", v)
- local uid, mo = lpeg.match("#" * Puid_cap * "#", v)
- local fontstyle = lpeg.match("#" * Pfontstyle_cap * "#", v)
- local extra = lpeg.match("#" * lpeg.C(Pextra) * "#", v)
- if nr and ng and nb then
- -- Ignore
- elseif col then
- -- Ignore
- elseif uid and mo and game.level then
- uid = tonumber(uid)
- mo = tonumber(mo)
- local e = __uids[uid]
- if e then
- local surf = e:getEntityFinalSurface(game.level.map.tiles, font:lineSkip(), font:lineSkip())
- if surf then
- local w, h = surf:getSize()
- mw = mw + w
- if h > mh then mh = h end
+ for i = 1, #tstr do
+ v = tstr[i]
+ if type(v) == "table" then
+ if v[1] == "font" then
+ local fontstyle = v[2]
+ font:setStyle(fontstyle)
+ fstyle = fontstyle
+ word_size_cache[font][fstyle] = word_size_cache[font][fstyle] or {}
+ elseif v[1] == "uid" then
+ local uid = v[2]
+ local e = __uids[uid]
+ if e then
+ local surf = e:getEntityFinalSurface(game.level.map.tiles, font:lineSkip(), font:lineSkip())
+ if surf then
+ local w, h = surf:getSize()
+ mw = mw + w
+ if h > mh then mh = h end
+ end
end
- end
- elseif fontstyle then
- font:setStyle(fontstyle)
- fstyle = fontstyle
- word_size_cache[font][fstyle] = word_size_cache[font][fstyle] or {}
- elseif extra then
- --
- else
- local w, h
- if word_size_cache[font][fstyle][v] then
- w, h = word_size_cache[font][fstyle][v][1], word_size_cache[font][fstyle][v][2]
- else
- w, h = fontoldsize(font, v)
- word_size_cache[font][fstyle][v] = {w, h}
- end
+ end -- ignore colors and all that
+ elseif type(v) == "string" then
+ local w, h = fontcachewordsize(font, fstyle, v)
if h > mh then mh = h end
mw = mw + w
- end
+ end -- ignore the rest
end
return mw, mh
end
@@ -1099,6 +963,10 @@ function tstring:merge(v)
return self
end
+function tstring:clone()
+ return tstring(table.clone(self))
+end
+
function tstring:countLines()
local nb = 1
local v
@@ -1114,10 +982,10 @@ function tstring:maxWidth(font)
local old_style = font:getStyle()
local line_max = 0
local v
- local w, h = font:size("")
+ local w, h = fontoldsize(font, "")
for i = 1, #self do
v = self[i]
- if type(v) == "string" then line_max = line_max + font:size(v) + 1
+ if type(v) == "string" then line_max = line_max + fontoldsize(font, v) + 1
elseif type(v) == "table" then if v[1] == "uid" then line_max = line_max + h -- UID surface is same as font size
elseif v[1] == "font" and v[2] == "bold" then font:setStyle("bold")
elseif v[1] == "font" and v[2] == "normal" then font:setStyle("normal") end
@@ -1136,8 +1004,13 @@ function tstring.from(str)
end
end
+tstring.__tstr_cache = {}
+local tstring_cache = tstring.__tstr_cache
+setmetatable(tstring_cache, {__mode="v"})
+
--- Parse a string and return a tstring
function string.toTString(str)
+ if tstring_cache[str] then return tstring_cache[str]:clone() end
local tstr = tstring{}
local list = str:split(("#" * (Puid + Pcolorcodefull + Pcolorname + Pfontstyle + Pextra) * "#") + lpeg.P"\n", true)
for i = 1, #list do
@@ -1152,7 +1025,7 @@ function string.toTString(str)
elseif col then
tstr:add({"color", col})
elseif uid and mo then
- tstr:add({"uid", tonumber(uid)})
+ tstr:add({"uid", tonumber(uid), tonumber(mo)})
elseif fontstyle then
tstr:add({"font", fontstyle})
elseif extra then
@@ -1163,7 +1036,8 @@ function string.toTString(str)
tstr:add(v)
end
end
- return tstr
+ tstring_cache[str] = tstr
+ return tstr:clone()
end
function string:toString() return self end
@@ -1192,8 +1066,8 @@ function tstring:toTString() return self end
--- Tablestrings can not be formated, this just returns self
function tstring:format() return self end
-function tstring:splitLines(max_width, font)
- local space_w = font:size(" ")
+function tstring:splitLines(max_width, font, max_lines)
+ local fstyle = font:getStyle()
local ret = tstring{}
local cur_size = 0
local max_w = 0
@@ -1209,21 +1083,30 @@ function tstring:splitLines(max_width, font)
ret[#ret+1] = true
max_w = math.max(max_w, cur_size)
cur_size = 0
+ if max_lines then
+ max_lines = max_lines - 1
+ if max_lines <= 0 then break end
+ end
else
- local w, h = fontoldsize(font, vv)
+ local w, h = fontcachewordsize(font, fstyle, vv)
if cur_size + w < max_width then
cur_size = cur_size + w
ret[#ret+1] = vv
else
ret[#ret+1] = true
- ret[#ret+1] = vv
max_w = math.max(max_w, cur_size)
+ if max_lines then
+ max_lines = max_lines - 1
+ if max_lines <= 0 then break end
+ end
+ ret[#ret+1] = vv
cur_size = w
end
end
end
elseif tv == "table" and v[1] == "font" then
font:setStyle(v[2])
+ fstyle = v[2]
ret[#ret+1] = v
elseif tv == "table" and v[1] == "extra" then
ret[#ret+1] = v
@@ -1340,6 +1223,7 @@ function tstring:makeLineTextures(max_width, font, no_split, r, g, b)
r, g, b = v[2], v[3], v[4]
elseif v[1] == "font" then
font:setStyle(v[2])
+ fstyle = v[2]
elseif v[1] == "extra" then
--
elseif v[1] == "uid" then
@@ -1365,14 +1249,18 @@ function tstring:makeLineTextures(max_width, font, no_split, r, g, b)
end
function tstring:drawOnSurface(s, max_width, max_lines, font, x, y, r, g, b, no_alpha, on_word)
- local list = self:splitLines(max_width, font)
+ local list = self:splitLines(max_width, font, max_lines)
max_lines = util.bound(max_lines or #list, 1, #list)
local fh = font:lineSkip()
+ local fstyle = font:getStyle()
local w, h = 0, 0
r, g, b = r or 255, g or 255, b or 255
local oldr, oldg, oldb = r, g, b
local v, tv
local on_word_w, on_word_h
+ local last_line_h = 0
+ local max_w = 0
+ local lines_drawn = 0
for i = 1, #list do
v = list[i]
tv = type(v)
@@ -1381,12 +1269,17 @@ function tstring:drawOnSurface(s, max_width, max_lines, font, x, y, r, g, b, no_
if on_word_w and on_word_h then
w, h = on_word_w, on_word_h
else
+ local dw, dh = fontcachewordsize(font, fstyle, v)
+ last_line_h = math.max(last_line_h, dh)
s:drawStringBlended(font, v, x + w, y + h, r, g, b, not no_alpha)
w = w + fontoldsize(font, v)
end
elseif tv == "boolean" then
+ max_w = math.max(max_w, w)
w = 0
h = h + fh
+ last_line_h = 0
+ lines_drawn = lines_drawn + 1
max_lines = max_lines - 1
if max_lines <= 0 then break end
else
@@ -1415,6 +1308,7 @@ function tstring:drawOnSurface(s, max_width, max_lines, font, x, y, r, g, b, no_
end
end
end
+ return r, g, b, math.max(max_w, w), fh * lines_drawn + last_line_h, x, y
end
function tstring:diffWith(str2, on_diff)
@@ -2345,9 +2239,13 @@ end
function util.browserOpenUrl(url, forbid_methods)
forbid_methods = forbid_methods or {}
+ if forbid_methods.is_external and config.settings.open_links_external then
+ forbid_methods.webview = true
+ forbid_methods.steam = true
+ end
+
if core.webview and not forbid_methods.webview then local d = require("engine.ui.Dialog"):webPopup(url) if d then return "webview", d end end
if core.steam and not forbid_methods.steam and core.steam.openOverlayUrl(url) then return "steam", true end
-
if forbid_methods.native then return false end
local tries = {
diff --git a/game/engines/default/modules/boot/class/Game.lua b/game/engines/default/modules/boot/class/Game.lua
index 8aa304353e2fe90f793d4331a3949bee1e917e9f..708a18ff72981c631410a96b5654f45f386c4aad 100644
--- a/game/engines/default/modules/boot/class/Game.lua
+++ b/game/engines/default/modules/boot/class/Game.lua
@@ -56,16 +56,19 @@ function _M:init()
engine.GameEnergyBased.init(self, engine.KeyBind.new(), 100, 100)
self.profile_font = FontPackage:get("default")
- local background_name
- if not config.settings.censor_boot then background_name = {"tome","tome2","tome3"}
- else background_name = {"tome3"}
- end
+ self.background = self.__mod_info.keep_background_texture
- local value = {name=background_name}
- local hd = {"Boot:loadBackground", value=value}
- if self:triggerHook(hd) then background_name = hd.value.name end
+ if type(self.background) ~= "userdata" then
+ local background_name
+ if not config.settings.censor_boot then background_name = {"tome","tome2","tome3"}
+ else background_name = {"tome3"}
+ end
+ local value = {name=background_name}
+ local hd = {"Boot:loadBackground", value=value}
+ if self:triggerHook(hd) then background_name = hd.value.name end
+ self.background = core.display.loadImage("/data/gfx/background/"..util.getval(background_name)..".png")
+ end
- self.background = core.display.loadImage("/data/gfx/background/"..util.getval(background_name)..".png")
if self.background then
self.background_w, self.background_h = self.background:getSize()
self.background, self.background_tw, self.background_th = self.background:glTexture()
@@ -174,7 +177,7 @@ Now go and have some fun!]]
if self.s_log then
local w, h = self.s_log:getSize()
self.mouse:registerZone(self.w - w, self.h - h, w, h, function(button)
- if button == "left" then util.browserOpenUrl(self.logged_url) end
+ if button == "left" then util.browserOpenUrl(self.logged_url, {is_external=true}) end
end, {button=true})
end
@@ -412,7 +415,7 @@ function _M:updateNews()
if self.news.link then
self.mouse:registerZone(5, self.tooltip.h - 30, self.tooltip.w, 30, function(button)
- if button == "left" then util.browserOpenUrl(self.news.link) end
+ if button == "left" then util.browserOpenUrl(self.news.link, {is_external=true}) end
end, {button=true})
end
end
diff --git a/game/engines/default/modules/boot/dialogs/MainMenu.lua b/game/engines/default/modules/boot/dialogs/MainMenu.lua
index 1f0aacb5db5a9acd2a477b497d39e78a215a9e94..35d5f1335846e63344b566588c7484cb6f92e03b 100644
--- a/game/engines/default/modules/boot/dialogs/MainMenu.lua
+++ b/game/engines/default/modules/boot/dialogs/MainMenu.lua
@@ -84,9 +84,9 @@ function _M:init()
self.c_list = List.new{width=self.iw, nb_items=#self.list, list=self.list, fct=function(item) end, font={FontPackage:getFont("default")}}
- self.c_facebook = ButtonImage.new{no_decoration=true, alpha_unfocus=0.5, file="facebook.png", fct=function() util.browserOpenUrl("https://www.facebook.com/tales.of.maj.eyal") end}
- self.c_twitter = ButtonImage.new{no_decoration=true, alpha_unfocus=0.5, file="twitter.png", fct=function() util.browserOpenUrl("https://twitter.com/darkgodone") end}
- self.c_forums = ButtonImage.new{no_decoration=true, alpha_unfocus=0.5, file="forums.png", fct=function() util.browserOpenUrl("http://forums.te4.org/") end}
+ self.c_facebook = ButtonImage.new{no_decoration=true, alpha_unfocus=0.5, file="facebook.png", fct=function() util.browserOpenUrl("https://www.facebook.com/tales.of.maj.eyal", {is_external=true}) end}
+ self.c_twitter = ButtonImage.new{no_decoration=true, alpha_unfocus=0.5, file="twitter.png", fct=function() util.browserOpenUrl("https://twitter.com/darkgodone", {is_external=true}) end}
+ self.c_forums = ButtonImage.new{no_decoration=true, alpha_unfocus=0.5, file="forums.png", fct=function() util.browserOpenUrl("http://forums.te4.org/", {is_external=true}) end}
self.base_uis = {
{left=0, top=0, ui=self.c_list},
@@ -101,7 +101,7 @@ function _M:init()
if game.__mod_info.publisher_logo then
local c_pub = ButtonImage.new{no_decoration=true, alpha_unfocus=1, file="background/"..game.__mod_info.publisher_logo..".png", fct=function()
- if game.__mod_info.publisher_url then util.browserOpenUrl(game.__mod_info.publisher_url) end
+ if game.__mod_info.publisher_url then util.browserOpenUrl(game.__mod_info.publisher_url, {is_external=true}) end
end}
if game.w - 450 - 250 - c_pub.w - 20 > 0 then
table.insert(self.base_uis, 1, {right=0, top=0, absolute=true, ui=c_pub})
@@ -171,7 +171,7 @@ end
function _M:uiStats(uis)
self.logged_url = "http://te4.org/users/"..profile.auth.page
local str1 = Textzone.new{auto_width=true, auto_height=true, text="#GOLD#Online Profile#WHITE#"}
- local str2 = Textzone.new{auto_width=true, auto_height=true, text="#LIGHT_BLUE##{underline}#"..self.logged_url.."#LAST##{normal}#", fct=function() util.browserOpenUrl(self.logged_url) end}
+ local str2 = Textzone.new{auto_width=true, auto_height=true, text="#LIGHT_BLUE##{underline}#"..self.logged_url.."#LAST##{normal}#", fct=function() util.browserOpenUrl(self.logged_url, {is_external=true}) end}
local logoff = Textzone.new{text="#LIGHT_BLUE##{underline}#Logout", auto_height=true, width=50, fct=function() self:logout() end}
diff --git a/game/engines/default/modules/boot/init.lua b/game/engines/default/modules/boot/init.lua
index 42b4292116fa278c0e12a8663f9dcbcf51cbd21a..b426bc005496908ebc870789627b86e1f6bef47c 100644
--- a/game/engines/default/modules/boot/init.lua
+++ b/game/engines/default/modules/boot/init.lua
@@ -36,6 +36,15 @@ allow_userchat = {"mainmenu"} -- We can talk to the online community but not joi
if not config.settings.censor_boot then background_name = {"tome","tome2","tome3"}
else background_name = {"tome3"}
end
+if config.settings.unlock_background_linaniil then background_name[#background_name+1] = "cards/linaniil" end
+if config.settings.unlock_background_master then background_name[#background_name+1] = "cards/master" end
+if config.settings.unlock_background_garkul then background_name[#background_name+1] = "cards/garkul" end
+if config.settings.unlock_background_aeryn then background_name[#background_name+1] = "cards/aeryn" end
+if config.settings.unlock_background_myssil then background_name[#background_name+1] = "cards/myssil" end
+if config.settings.unlock_background_derth then background_name[#background_name+1] = "cards/derth" end
+if config.settings.unlock_background_fortress then background_name[#background_name+1] = "cards/fortress" end
+if config.settings.unlock_background_urkis then background_name[#background_name+1] = "cards/urkis" end
+keep_background_texture = true
font_package_id = function() config.settings.tome = config.settings.tome or {} if not config.settings.tome.fonts then config.settings.tome.fonts = {type="fantasy", size="normal"} end return config.settings.tome.fonts.type end
font_package_size = function() config.settings.tome = config.settings.tome or {} if not config.settings.tome.fonts then config.settings.tome.fonts = {type="fantasy", size="normal"} end return config.settings.tome.fonts.size end
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index b62f6ce2ba9defa53632105b20802ac24a093c35..eb0bb6164c3a6921151c85b52f1f3553fba9ac3f 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -2351,6 +2351,18 @@ function _M:setAllowedBuild(what, notify)
return true
end
+function _M:unlockBackground(kind, name)
+ if not config.settings['unlock_background_'..kind] then
+ game.log("#ANTIQUE_WHITE#Splash screen unlocked: #GOLD#"..name)
+ end
+ config.settings['unlock_background_'..kind] = true
+ local save = {}
+ for k, v in pairs(config.settings) do if k:find("^unlock_background_") then
+ save[#save+1] = k.."=true"
+ end end
+ game:saveSettings("unlock_background", table.concat(save, "\n"))
+end
+
function _M:playSoundNear(who, name)
if who and (not who.attr or not who:attr("_forbid_sounds")) and self.level and self.level.map.seens(who.x, who.y) then
local pos = {x=0,y=0,z=0}
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 4c3c417ddc7580e200f1c1c0f1366ae8cb19a8fe..1fa21d4fb835ee67a0b91b483b85a8a0a1940f04 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -825,7 +825,7 @@ local function spotHostiles(self, actors_only)
local tx, ty
-- Bresenham is too so check if we're anywhere near the mathematical line of flight
- if proj.project then
+ if type(proj.project) == "table" then
tx, ty = proj.project.def.x, proj.project.def.y
elseif proj.homing then
tx, ty = proj.homing.target.x, proj.homing.target.y
diff --git a/game/modules/tome/data/achievements/lore.lua b/game/modules/tome/data/achievements/lore.lua
index 3a4e4c0c7df5ad065041924dda23e9304d511ff1..d722c90e3938bcd89f8ef8db7bc1e405cfbfad12 100644
--- a/game/modules/tome/data/achievements/lore.lua
+++ b/game/modules/tome/data/achievements/lore.lua
@@ -47,7 +47,10 @@ newAchievement{
if not game.party:knownLore("garkul-history-4") then return false end
if not game.party:knownLore("garkul-history-5") then return false end
return true
- end
+ end,
+ on_gain = function()
+ game:unlockBackground("garkul", "Garkul")
+ end,
}
newAchievement{
diff --git a/game/modules/tome/data/chats/angolwen-leader.lua b/game/modules/tome/data/chats/angolwen-leader.lua
index 0782d32d309c59c9ecb56985dcb064b4ee7e4f40..53812da5b59b539843ad1610d3ba98a23395b92b 100644
--- a/game/modules/tome/data/chats/angolwen-leader.lua
+++ b/game/modules/tome/data/chats/angolwen-leader.lua
@@ -35,14 +35,21 @@ Cleansing the skies will take much time. In the meanwhile, if thou art willing,
I will not lie to thee: we can send thee thence, but this could be a death trap, and we have no means for thou to depart his lair, as he lives atop a tall peak in the Daikara mountains.]],
answers = {
{"I need to prepare myself. I will be back soon.", action=function(npc, player) player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED, "tempest-located") end},
- {"I am ready. Send me. I will not let the good people of Derth down.", action=function(npc, player) player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED, "tempest-located") player:hasQuest("lightning-overload"):teleport_urkis() end},
+ {"I am ready. Send me. I will not let the good people of Derth down.", action=function(npc, player)
+ player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED, "tempest-located")
+ player:hasQuest("lightning-overload"):teleport_urkis()
+ game:unlockBackground("linaniil", "Archmage Linaniil")
+ end},
}
}
newChat{ id="teleport-urkis",
text = [[Good luck to thee. Thou hast the blessings of Angolwen.]],
answers = {
- {"Thank you.", action=function(npc, player) player:hasQuest("lightning-overload"):teleport_urkis() end},
+ {"Thank you.", action=function(npc, player)
+ player:hasQuest("lightning-overload"):teleport_urkis()
+ game:unlockBackground("linaniil", "Archmage Linaniil")
+ end},
}
}
diff --git a/game/modules/tome/data/chats/gates-of-morning-main.lua b/game/modules/tome/data/chats/gates-of-morning-main.lua
index 0d5c269898c66c0a86d9a360434ec60bca167b80..785b3718608ce8e6ffe2456ddaaa59a4b34256d0 100644
--- a/game/modules/tome/data/chats/gates-of-morning-main.lua
+++ b/game/modules/tome/data/chats/gates-of-morning-main.lua
@@ -133,7 +133,10 @@ newChat{ id="charred-scar-success",
text = [[Sorcerers? I have never heard of them. There were rumours about a new master of the Pride, but it seems they have two.
Thank you for everything. You must continue your hunt now that you know what to look for.]],
answers = {
- {"I will avenge your men.", action=function(npc, player) player:setQuestStatus("charred-scar", engine.Quest.DONE) end}
+ {"I will avenge your men.", action=function(npc, player)
+ player:setQuestStatus("charred-scar", engine.Quest.DONE)
+ game:unlockBackground("aeryn", "High Sun Paladin Aeryn")
+ end}
},
}
diff --git a/game/modules/tome/data/chats/myssil.lua b/game/modules/tome/data/chats/myssil.lua
index 8463e1d1f6418384791d57c5532691e61017fe8c..adc82bdcfbb5e0ec6483e4946f5ba8dda04b6b3b 100644
--- a/game/modules/tome/data/chats/myssil.lua
+++ b/game/modules/tome/data/chats/myssil.lua
@@ -49,6 +49,7 @@ Erase him.]],
answers = {
{"You can count on me, Protector.", action=function(npc, player)
player:hasQuest("lightning-overload"):create_entrance()
+ game:unlockBackground("myssil", "Protector Myssil")
end},
}
}
diff --git a/game/modules/tome/data/gfx/shockbolt/facings.lua b/game/modules/tome/data/gfx/shockbolt/facings.lua
index 985a905ed759098dd90ba92a0d406d7fbad02092..fdbf197aaecb85cac80406de2c1cea8445a2bc25 100644
--- a/game/modules/tome/data/gfx/shockbolt/facings.lua
+++ b/game/modules/tome/data/gfx/shockbolt/facings.lua
@@ -7,7 +7,7 @@ tiles["npc/horror_eldritch_headless_horror.png"] = { flipx=false }
tiles["player/ghoul_female.png"] = { flipx=false }
tiles["npc/immovable_crystal_golden_crystal.png"] = { flipx=false }
dolls.race_ghoul = dolls.race_ghoul or {}
-dolls.race_ghoul.all = { flipx=false }
+dolls.race_ghoul.all = { flipx=true }
tiles["npc/elemental_fire_ultimate_faeros.png"] = { flipx=false }
tiles["npc/humanoid_human_human_citizen.png"] = { flipx=true }
tiles["npc/humanoid_yeek_yeek_psionic.png"] = { flipx=false }
@@ -30,7 +30,7 @@ tiles["npc/vermin_rodent_giant_grey_mouse.png"] = { flipx=false }
tiles["npc/humanoid_human_harno__herald_of_last_hope.png"] = { flipx=false }
tiles["npc/humanoid_human_slave_combatant.png"] = { flipx=false }
tiles["npc/hummerhorn.png"] = { flipx=false }
-tiles["npc/horror_eldritch_worm_that_walks.png"] = { flipx=false }
+tiles["npc/horror_eldritch_weirdling_beast.png"] = { flipx=false }
tiles["npc/iceblock.png"] = { flipx=false }
tiles["npc/canine_warg.png"] = { flipx=false }
tiles["npc/undead_mummy_ancient_elven_mummy.png"] = { flipx=false }
@@ -38,12 +38,12 @@ tiles["npc/horror_eldritch_dream_seed.png"] = { flipx=false }
tiles["npc/humanoid_human_townsfolk_farmer_maggot01_64.png"] = { flipx=false }
tiles["npc/dragon_storm_storm_drake.png"] = { flipx=false }
tiles["npc/horror_eldritch_grgglck.png"] = { flipx=false }
-tiles["npc/firebrick-snake.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_assassin.png"] = { flipx=false }
+tiles["npc/humanoid_shalore_elven_elite_warrior.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_summoner.png"] = { flipx=false }
dolls.race_halfling = dolls.race_halfling or {}
dolls.race_halfling.female = { flipx=false }
tiles["npc/humanoid_human_shady_cornac_man.png"] = { flipx=false }
-tiles["npc/crystal_darkred.png"] = { flipx=false }
+tiles["player/higher_male.png"] = { flipx=false }
tiles["npc/vampire_lord.png"] = { flipx=true }
tiles["npc/vermin_oozes_gelatinous_cube.png"] = { flipx=false }
tiles["npc/elemental_xorn_harkor_zun.png"] = { flipx=false }
@@ -56,10 +56,10 @@ tiles["npc/horror_aquatic_swarm_hive.png"] = { flipx=false }
tiles["npc/humanoid_halfling_halfling_gardener.png"] = { flipx=false }
tiles["npc/humanoid_human_cutpurse.png"] = { flipx=false }
tiles["npc/elemental_fire_faeros.png"] = { flipx=false }
-tiles["npc/skeleton_warrior.png"] = { flipx=false }
+tiles["npc/ice_ant.png"] = { flipx=false }
tiles["npc/vermin_oozes_crimson_ooze.png"] = { flipx=false }
tiles["npc/humanoid_orc_orc_grand_master_assassin.png"] = { flipx=false }
-tiles["npc/humanoid_naga_naga_tidecaller.png"] = { flipx=false }
+tiles["npc/humanoid_naga_naga_tidewarden.png"] = { flipx=true }
tiles["npc/naga_myrmidon_no_armor.png"] = { flipx=false }
tiles["npc/jelly-yellow.png"] = { flipx=false }
tiles["npc/blue_ant.png"] = { flipx=false }
@@ -67,7 +67,7 @@ tiles["npc/undead_ghost_glacial_legion.png"] = { flipx=false }
tiles["npc/humanoid_human_fallen_sun_paladin_aeryn.png"] = { flipx=false }
tiles["npc/undead_giant_eternal_bone_giant.png"] = { flipx=false }
tiles["npc/aquatic_demon_walrog.png"] = { flipx=false }
-tiles["npc/humanoid_orc_krogar.png"] = { flipx=false }
+tiles["npc/elemental_air_greater_gwelgoroth.png"] = { flipx=false }
tiles["npc/humanoid_human_multihued_wyrmic.png"] = { flipx=false }
tiles["npc/horror_eldritch_ak_gishil.png"] = { flipx=false }
tiles["npc/undead_lich_ancient_lich.png"] = { flipx=false }
@@ -78,7 +78,7 @@ tiles["npc/insect_ritch_ritch_hive_mother2.png"] = { flipx=true }
tiles["npc/humanoid_shalore_archmage_tarelion.png"] = { flipx=false }
tiles["npc/humanoid_yeek_yeek_wayist.png"] = { flipx=false }
tiles["npc/carpenter_ant.png"] = { flipx=false }
-tiles["npc/humanoid_yaech_blood_master.png"] = { flipx=true }
+tiles["npc/humanoid_human_last_hope_guard.png"] = { flipx=false }
tiles["npc/undead_vampire_arch_zephyr.png"] = { flipx=true }
tiles["npc/vermin_rodent_giant_brown_rat.png"] = { flipx=false }
tiles["npc/elemental_void_manaworm.png"] = { flipx=false }
@@ -86,14 +86,14 @@ tiles["npc/humanoid_human_apprentice_mage.png"] = { flipx=false }
tiles["npc/canine_rungof.png"] = { flipx=false }
tiles["npc/immovable_plants_giant_venus_flytrap.png"] = { flipx=false }
tiles["npc/construct_golem_golem.png"] = { flipx=false }
-tiles["npc/naga_myrmidon.png"] = { flipx=false }
+tiles["player/ghoul_male.png"] = { flipx=false }
tiles["npc/vermin_rodent_giant_rabbit.png"] = { flipx=false }
-tiles["npc/animal_canine_the_withering_thing.png"] = { flipx=true }
+tiles["player/higher_female.png"] = { flipx=false }
tiles["npc/undead_rodent_ghoulish_rat.png"] = { flipx=false }
tiles["npc/horror_corrupted_dremling.png"] = { flipx=false }
-tiles["npc/humanoid_human_bandit.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_master_wyrmic.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_orb_spinner.png"] = { flipx=true }
+tiles["npc/humanoid_human_reaver.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_elite_fighter.png"] = { flipx=true }
+tiles["npc/spiderkin_spider_fate_weaver.png"] = { flipx=true }
tiles["npc/dreadmaster.png"] = { flipx=false }
tiles["npc/black_ant.png"] = { flipx=true }
tiles["npc/hornet_swarm.png"] = { flipx=false }
@@ -103,17 +103,17 @@ tiles["npc/jelly-darkgrey.png"] = { flipx=false }
tiles["npc/humanoid_human_ziguranth_wyrmic.png"] = { flipx=false }
tiles["npc/seed_of_dreams.png"] = { flipx=false }
tiles["npc/elemental_temporal_greater_teluvorta.png"] = { flipx=false }
-tiles["npc/horror_eldritch_blade_horror.png"] = { flipx=false }
-tiles["npc/horror_corrupted_the_mouth.png"] = { flipx=false }
+tiles["npc/horror_eldritch_eldritch_eye.png"] = { flipx=false }
+tiles["npc/horror_corrupted_brecklorn.png"] = { flipx=true }
tiles["npc/red_ant.png"] = { flipx=true }
tiles["npc/dread.png"] = { flipx=false }
tiles["player/ascii_player_exotic_01.png"] = { flipx=true }
tiles["npc/humanoid_yaech_murgol__the_yaech_lord.png"] = { flipx=false }
tiles["npc/dragon_water_ukllmswwik_the_wise.png"] = { flipx=false }
tiles["npc/giant_troll_mountain_troll_thunderer.png"] = { flipx=false }
-tiles["npc/canine_gw.png"] = { flipx=false }
+tiles["npc/canine_dw.png"] = { flipx=true }
tiles["npc/humanoid_halfling_master_slinger.png"] = { flipx=false }
-tiles["npc/shadow-caster.png"] = { flipx=false }
+tiles["npc/humanoid_orc_brotoq_the_reaver.png"] = { flipx=false }
tiles["npc/banshee.png"] = { flipx=false }
tiles["npc/giant_minotaur_minotaur.png"] = { flipx=false }
dolls.race_halfling = dolls.race_halfling or {}
@@ -125,13 +125,13 @@ tiles["npc/acid_ant.png"] = { flipx=false }
tiles["npc/humanoid_shalore_elven_corruptor.png"] = { flipx=false }
tiles["npc/white_rat_01_64.png"] = { flipx=false }
tiles["npc/dragon_fire_fire_drake_hatchling.png"] = { flipx=false }
-tiles["npc/humanoid_human_fryjia_loren.png"] = { flipx=false }
+tiles["npc/snaproot_pimp.png"] = { flipx=false }
tiles["player/runic_golem_female.png"] = { flipx=true }
-tiles["npc/troll_s_03.png"] = { flipx=false }
+tiles["npc/troll_s_02.png"] = { flipx=false }
tiles["npc/dragon_cold_cold_drake_hatchling.png"] = { flipx=false }
tiles["npc/animal_feline_tiger.png"] = { flipx=false }
tiles["npc/vermin_sandworm_sandworm_queen.png"] = { flipx=false }
-tiles["npc/giant_minotaur_minotaur_of_the_labyrinth.png"] = { flipx=false }
+tiles["npc/undead_giant_heavy_bone_giant.png"] = { flipx=false }
tiles["npc/undead_horror_bone_horror.png"] = { flipx=false }
tiles["npc/naga_psyren_2.png"] = { flipx=false }
tiles["player/shalore_female.png"] = { flipx=false }
@@ -141,17 +141,17 @@ tiles["npc/jelly-white.png"] = { flipx=false }
tiles["npc/vermin_worms_carrion_worm_mass.png"] = { flipx=false }
tiles["npc/birds_eagle01.png"] = { flipx=true }
tiles["npc/humanoid_yaech_yaech_mindslayer.png"] = { flipx=false }
-tiles["npc/humanoid_elf_fillarel_aldaren.png"] = { flipx=false }
+tiles["npc/vermin_oozes_brittle_clear_ooze.png"] = { flipx=false }
tiles["npc/horror_eldritch_radiant_horror.png"] = { flipx=false }
tiles["npc/giant_ice_snow_giant_thunderer2.png"] = { flipx=false }
tiles["npc/animal_feline_panther.png"] = { flipx=false }
tiles["npc/horror_aquatic_swarming_horror.png"] = { flipx=false }
tiles["npc/elemental_losgoroth_space_disturbance.png"] = { flipx=false }
tiles["npc/patrol_orc_pride_orcs_patrol.png"] = { flipx=false }
-tiles["npc/humanoid_human_great_gladiator.png"] = { flipx=true }
+tiles["npc/undead_horror_necrotic_abomination.png"] = { flipx=false }
tiles["npc/patrol_sunwall_anorithil_patrol.png"] = { flipx=true }
-tiles["npc/demon_major_thaurhereg.png"] = { flipx=false }
-tiles["npc/jelly-red.png"] = { flipx=false }
+tiles["player/ascii_player_dorfhelmet_01_64.png"] = { flipx=true }
+tiles["npc/vermin_oozes_morphic_ooze.png"] = { flipx=false }
tiles["npc/vermin_oozes_black_ooze.png"] = { flipx=false }
tiles["npc/animal_bird_phoenix.png"] = { flipx=true }
tiles["npc/humanoid_shalore_rhaloren_inquisitor.png"] = { flipx=false }
@@ -166,7 +166,7 @@ tiles["npc/vermin_sandworm_sandworm.png"] = { flipx=false }
tiles["npc/elemental_air_gwelgoroth.png"] = { flipx=true }
tiles["npc/master_vampire.png"] = { flipx=false }
tiles["npc/naga_tide_huntress_2.png"] = { flipx=false }
-tiles["npc/spellblaze_simulacrum.png"] = { flipx=false }
+tiles["npc/humanoid_human_townsfolk_pitiful_looking_beggar01_64.png"] = { flipx=false }
tiles["npc/humanoid_shalore_elven_mage.png"] = { flipx=false }
tiles["npc/vermin_worms_green_worm_mass.png"] = { flipx=false }
tiles["npc/spiderkin_spider_nimisil.png"] = { flipx=false }
@@ -188,12 +188,12 @@ tiles["npc/humanoid_orc_grushnak__battlemaster_of_the_pride.png"] = { flipx=true
tiles["npc/humanoid_human_ben_cruthdar__the_cursed.png"] = { flipx=false }
tiles["npc/jelly-green.png"] = { flipx=false }
tiles["npc/humanoid_orc_orc_corruptor.png"] = { flipx=false }
-tiles["npc/shadow-stalker.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_orb_weaver.png"] = { flipx=false }
+tiles["npc/humanoid_yaech_yaech_psion.png"] = { flipx=true }
+tiles["npc/spiderkin_spider_gaeramarth.png"] = { flipx=false }
tiles["npc/dragon_multihued_greater_multi_hued_wyrm.png"] = { flipx=false }
tiles["npc/horror_aquatic_abyssal_horror.png"] = { flipx=false }
tiles["npc/umber-snake.png"] = { flipx=false }
-tiles["player/ascii_player_mario_01_64.png"] = { flipx=true }
+tiles["player/ascii_player_red_hood_01.png"] = { flipx=true }
tiles["npc/dread_02_64.png"] = { flipx=false }
tiles["npc/humanoid_human_high_gladiator.png"] = { flipx=false }
tiles["npc/master_skeleton_archer.png"] = { flipx=true }
@@ -217,7 +217,7 @@ tiles["npc/construct_golem_alchemist_golem.png"] = { flipx=false }
tiles["npc/demon_major_kryl_feijan.png"] = { flipx=false }
tiles["npc/demon_major_general_of_urh_rok.png"] = { flipx=false }
tiles["npc/horror_temporal_cronolith_twin.png"] = { flipx=false }
-tiles["npc/grizzly_bear.png"] = { flipx=false }
+tiles["npc/spiderkin_spider_chitinous_spider.png"] = { flipx=false }
dolls.race_human = dolls.race_human or {}
dolls.race_human.male = { flipx=false }
tiles["npc/elemental_xorn_xaren.png"] = { flipx=false }
@@ -229,10 +229,10 @@ tiles["npc/dragon_venom_venom_wyrm.png"] = { flipx=false }
tiles["npc/immovable_molds_skeletal_mold.png"] = { flipx=false }
dolls.race_elf = dolls.race_elf or {}
dolls.race_elf.male = { flipx=false }
-tiles["npc/humanoid_human_cryomancer.png"] = { flipx=false }
+tiles["npc/humanoid_human_lumberjack.png"] = { flipx=false }
tiles["npc/barrow_wight.png"] = { flipx=false }
dolls.race_skeleton = dolls.race_skeleton or {}
-dolls.race_skeleton.all = { flipx=false }
+dolls.race_skeleton.all = { flipx=true }
tiles["npc/undead_ghost_kor_s_fury.png"] = { flipx=false }
tiles["npc/elemental_void_losgoroth_corrupted.png"] = { flipx=false }
tiles["npc/birds_eagle_shadow_01.png"] = { flipx=true }
@@ -241,13 +241,13 @@ tiles["npc/humanoid_human_master_alchemist.png"] = { flipx=false }
tiles["npc/dragon_venom_venom_drake.png"] = { flipx=false }
tiles["npc/humanoid_human_riala_shalarak.png"] = { flipx=true }
tiles["npc/humanoid_yaech_slaver.png"] = { flipx=false }
-tiles["npc/humanoid_human_human_sun_paladin.png"] = { flipx=false }
-tiles["npc/humanoid_elenulach_thief.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_mage_hunter.png"] = { flipx=false }
+tiles["player/halfling_female.png"] = { flipx=false }
tiles["npc/horror_temporal_dredge_captain.png"] = { flipx=false }
tiles["npc/immovable_jelly_malevolent_dimensional_jelly.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_blood_mage.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_cryomancer.png"] = { flipx=false }
tiles["npc/humanoid_human_aluin_the_fallen.png"] = { flipx=false }
-tiles["npc/horror_corrupted_horner_horror.png"] = { flipx=false }
+tiles["npc/horror_corrupted_slimy_crawler.png"] = { flipx=false }
tiles["npc/humanoid_orc_orc_fighter.png"] = { flipx=true }
tiles["npc/humanoid_human_linaniil_supreme_archmage.png"] = { flipx=false }
tiles["npc/naga_tide_huntress.png"] = { flipx=false }
@@ -255,382 +255,382 @@ tiles["npc/dream_seed.png"] = { flipx=false }
tiles["npc/humanoid_elf_star_crusader.png"] = { flipx=false }
tiles["npc/shadow-claw.png"] = { flipx=true }
tiles["npc/vermin_oozes_bloated_ooze.png"] = { flipx=false }
-tiles["npc/elemental_temporal_epoch.png"] = { flipx=false }
+tiles["npc/horror_eldritch_grgglck_s_tentacle.png"] = { flipx=false }
tiles["npc/humanoid_orc_fiery_orc_wyrmic.png"] = { flipx=false }
tiles["npc/humanoid_orc_orc_child.png"] = { flipx=false }
tiles["npc/vermin_oozes_poison_ooze.png"] = { flipx=false }
-tiles["npc/humanoid_dwarf_dwarven_guard.png"] = { flipx=false }
+tiles["npc/golem.png"] = { flipx=false }
tiles["npc/undead_mummy_greater_mummy_lord.png"] = { flipx=false }
+tiles["npc/white-snake.png"] = { flipx=false }
tiles["npc/crystal_black.png"] = { flipx=false }
-tiles["npc/golem.png"] = { flipx=false }
-tiles["npc/horror_eldritch_oozing_horror.png"] = { flipx=false }
-tiles["npc/undead_ghost_aletta_soultorn.png"] = { flipx=false }
-tiles["player/thalore_male.png"] = { flipx=false }
+dolls.race_orc = dolls.race_orc or {}
+dolls.race_orc.all = { flipx=false }
+dolls.race_human = dolls.race_human or {}
+dolls.race_human.female = { flipx=false }
+tiles["npc/polar_bear.png"] = { flipx=true }
+dolls.race_dwarf = dolls.race_dwarf or {}
+dolls.race_dwarf.female = { flipx=false }
tiles["npc/humanoid_orc_rak_shor_cultist.png"] = { flipx=false }
-tiles["npc/humanoid_halfling_halfling_citizen.png"] = { flipx=false }
-tiles["npc/humanoid_human_melnela.png"] = { flipx=false }
-tiles["player/thalore_female.png"] = { flipx=false }
-tiles["npc/dragon_temporal_rantha_the_abomination.png"] = { flipx=false }
-tiles["player/skeleton_female.png"] = { flipx=true }
+tiles["npc/humanoid_halfling_halfling_slinger.png"] = { flipx=true }
+tiles["npc/humanoid_human_slinger.png"] = { flipx=true }
+dolls.race_yeek = dolls.race_yeek or {}
+dolls.race_yeek.all = { flipx=false }
+tiles["npc/spiderkin_spider_faerlhing.png"] = { flipx=true }
+tiles["npc/humanoid_human_gladiator.png"] = { flipx=false }
tiles["npc/woman_redhair_naked.png"] = { flipx=true }
-tiles["player/shalore_male.png"] = { flipx=false }
-tiles["player/runic_golem_male.png"] = { flipx=true }
-tiles["player/higher_male.png"] = { flipx=false }
-tiles["player/higher_female.png"] = { flipx=false }
-tiles["player/halfling_female.png"] = { flipx=false }
+tiles["npc/humanoid_human_subject_z.png"] = { flipx=false }
+tiles["npc/giant_troll_patchwork_troll.png"] = { flipx=false }
+tiles["npc/dragon_multihued_multi_hued_drake.png"] = { flipx=false }
+tiles["player/ascii_player_shopper_01.png"] = { flipx=false }
+tiles["npc/troll_m.png"] = { flipx=false }
tiles["npc/insect_ritch_ritch_hunter.png"] = { flipx=false }
-tiles["player/ghoul_male.png"] = { flipx=false }
-tiles["player/dwarf_male.png"] = { flipx=false }
-tiles["player/dwarf_female.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_cryomancer.png"] = { flipx=false }
+tiles["npc/humanoid_human_the_possessed.png"] = { flipx=false }
+tiles["npc/humanoid_elenulach_thief.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_blood_mage.png"] = { flipx=false }
+tiles["npc/spiderkin_spider_ungole.png"] = { flipx=false }
tiles["npc/construct_golem_drolem.png"] = { flipx=false }
-tiles["player/cornac_female_redhair.png"] = { flipx=false }
-tiles["npc/demon_major_champion_of_urh_rok.png"] = { flipx=false }
+tiles["npc/horror_corrupted_horner_horror.png"] = { flipx=false }
+tiles["npc/darkgrey-snake.png"] = { flipx=false }
tiles["npc/undead_skeleton_skeleton_mage.png"] = { flipx=false }
tiles["npc/undead_horror_animated_blood.png"] = { flipx=false }
tiles["npc/humanoid_human_townsfolk_singing_happy_drunk01_64.png"] = { flipx=true }
-tiles["player/ascii_player_shopper_01.png"] = { flipx=false }
-tiles["player/ascii_player_red_hood_01.png"] = { flipx=true }
-tiles["player/ascii_player_pink_amazone_01.png"] = { flipx=true }
-tiles["npc/humanoid_yeek_yeek_commoner_07.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_chitinous_spider.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_mage_hunter.png"] = { flipx=false }
-tiles["npc/immovable_plants_treant.png"] = { flipx=false }
-tiles["player/ascii_player_dorfhelmet_01_64.png"] = { flipx=true }
-tiles["npc/insect_ritch_ritch_flamespitter.png"] = { flipx=true }
-tiles["npc/troll_s_02.png"] = { flipx=false }
-tiles["npc/yellow-green-snake.png"] = { flipx=false }
-tiles["npc/vermin_rodent_giant_crystal_rat.png"] = { flipx=false }
-tiles["npc/white-snake.png"] = { flipx=false }
+tiles["npc/elemental_temporal_teluvorta.png"] = { flipx=true }
+tiles["npc/insect_ritch_ritch_larva.png"] = { flipx=false }
+tiles["npc/humanoid_human_derth_guard.png"] = { flipx=false }
+tiles["npc/humanoid_human_shadowblade.png"] = { flipx=false }
+tiles["npc/humanoid_human_ice_wyrmic.png"] = { flipx=true }
tiles["npc/humanoid_orc_ukruk_the_fierce.png"] = { flipx=false }
-tiles["npc/vermin_worms_white_worm_mass.png"] = { flipx=false }
-tiles["npc/humanoid_yeek_yeek_commoner_01.png"] = { flipx=false }
-tiles["npc/horror_corrupted_slimy_crawler.png"] = { flipx=false }
-tiles["npc/vermin_sandworm_huge_sandworm_burrower.png"] = { flipx=true }
+tiles["npc/immovable_plants_treant.png"] = { flipx=false }
+tiles["npc/skeleton_warrior.png"] = { flipx=false }
+tiles["npc/humanoid_human_townsfolk_battlescarred_veteran01_64.png"] = { flipx=false }
+tiles["npc/demon_major_champion_of_urh_rok.png"] = { flipx=false }
+tiles["npc/humanoid_human_melnela.png"] = { flipx=false }
+tiles["npc/undead_skull_flying_skull.png"] = { flipx=false }
+tiles["npc/vampire.png"] = { flipx=false }
+tiles["npc/naga_myrmidon_2.png"] = { flipx=false }
+tiles["npc/humanoid_human_geomancer.png"] = { flipx=true }
+tiles["npc/humanoid_human_tempest.png"] = { flipx=true }
+tiles["npc/elemental_fire_fyrk__faeros_high_guard.png"] = { flipx=false }
+tiles["npc/firebrick-snake.png"] = { flipx=false }
tiles["npc/elemental_fire_greater_faeros.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_baby.png"] = { flipx=false }
-tiles["npc/vermin_sandworm_gigantic_corrosive_tunneler.png"] = { flipx=false }
+tiles["npc/humanoid_human_assassin.png"] = { flipx=false }
+tiles["npc/giant_ice_snow_giant_thunderer.png"] = { flipx=false }
tiles["npc/vermin_rodent_giant_white_rat.png"] = { flipx=false }
-tiles["npc/vermin_rodent_giant_white_mouse.png"] = { flipx=false }
-tiles["npc/humanoid_elf_limmir_the_jeweler.png"] = { flipx=true }
+tiles["npc/humanoid_yeek_yeek_commoner_08.png"] = { flipx=false }
+tiles["npc/undead_lich_lich.png"] = { flipx=false }
tiles["npc/white_ant.png"] = { flipx=false }
tiles["npc/dragon_wild_spire_dragon.png"] = { flipx=false }
tiles["npc/humanoid_orc_orc_high_cryomancer.png"] = { flipx=false }
-tiles["npc/vermin_rodent_giant_brown_mouse.png"] = { flipx=false }
-tiles["npc/vermin_rodent_cute_little_bunny.png"] = { flipx=false }
-tiles["npc/vermin_oozes_yellow_ooze.png"] = { flipx=false }
+tiles["npc/horror_temporal_temporal_stalker.png"] = { flipx=false }
+tiles["npc/humanoid_yeek_yeek_commoner_07.png"] = { flipx=false }
+tiles["npc/vermin_rodent_giant_white_mouse.png"] = { flipx=false }
tiles["npc/lesser_vampire.png"] = { flipx=false }
-tiles["npc/vermin_oozes_white_ooze.png"] = { flipx=false }
+tiles["npc/horror_corrupted_grannor_vin.png"] = { flipx=false }
tiles["npc/immovable_molds_grey_mold.png"] = { flipx=false }
-tiles["npc/vermin_oozes_slimy_ooze.png"] = { flipx=false }
+tiles["npc/humanoid_human_martyr.png"] = { flipx=false }
tiles["npc/demon_minor_wretchling.png"] = { flipx=false }
-tiles["npc/vermin_oozes_morphic_ooze.png"] = { flipx=false }
+tiles["npc/humanoid_halfling_sm_halfling.png"] = { flipx=false }
tiles["npc/giant_treant_wrathroot.png"] = { flipx=false }
-tiles["npc/vermin_oozes_green_ooze.png"] = { flipx=false }
+tiles["npc/summoner_turtle.png"] = { flipx=false }
tiles["npc/giant_ice_snow_giant_boulder_thrower.png"] = { flipx=false }
-tiles["npc/vermin_oozes_brittle_clear_ooze.png"] = { flipx=false }
-tiles["npc/crystal_npc.png"] = { flipx=false }
+tiles["npc/spiderkin_spider_orb_spinner.png"] = { flipx=true }
+tiles["npc/humanoid_yeek_yeek_commoner_05.png"] = { flipx=false }
tiles["npc/crystal_violet.png"] = { flipx=false }
-tiles["npc/vampire_lord_02.png"] = { flipx=true }
+tiles["npc/demon_major_dolleg.png"] = { flipx=false }
tiles["npc/skeleton_archer.png"] = { flipx=false }
-tiles["npc/vampire.png"] = { flipx=false }
-tiles["npc/unknown_unknown_the_eidolon.png"] = { flipx=false }
-tiles["npc/undead_wight_void_spectre.png"] = { flipx=false }
+tiles["npc/vampire_lord_02.png"] = { flipx=true }
+tiles["npc/humanoid_human_rogue.png"] = { flipx=false }
+tiles["npc/humanoid_yeek_yeek_commoner_02.png"] = { flipx=false }
tiles["npc/humanoid_halfling_agrimley_the_hermit.png"] = { flipx=false }
-tiles["npc/undead_skull_flying_skull.png"] = { flipx=false }
-tiles["npc/undead_skeleton_the_shade.png"] = { flipx=false }
-tiles["npc/undead_skeleton_filio_flightfond.png"] = { flipx=false }
-tiles["npc/horror_temporal_void_horror.png"] = { flipx=false }
+tiles["npc/aquatic_critter_ink_squid.png"] = { flipx=false }
+tiles["npc/humanoid_human_pyromancer.png"] = { flipx=false }
+tiles["npc/spiderkin_spider_fate_spinner.png"] = { flipx=true }
+tiles["npc/humanoid_orc_orc_baby.png"] = { flipx=false }
tiles["player/skeleton_male.png"] = { flipx=true }
-tiles["npc/summoner_golem.png"] = { flipx=false }
-tiles["npc/undead_rodent_spectral_rat.png"] = { flipx=false }
-tiles["npc/aquatic_critter_ancient_dragon_turtle.png"] = { flipx=false }
-tiles["npc/undead_rodent_gigantic_bone_rat.png"] = { flipx=false }
+tiles["npc/humanoid_naga_slasul.png"] = { flipx=true }
+tiles["npc/naga_myrmidon.png"] = { flipx=false }
+tiles["npc/humanoid_human_bandit.png"] = { flipx=false }
+tiles["npc/humanoid_human_thief.png"] = { flipx=false }
tiles["npc/humanoid_dwarf_dwarven_paddlestriker.png"] = { flipx=false }
-tiles["npc/undead_mummy_rotting_mummy.png"] = { flipx=false }
-tiles["npc/elemental_ice_ultimate_shivgoroth.png"] = { flipx=false }
-tiles["npc/undead_lich_lich.png"] = { flipx=false }
-dolls.race_orc = dolls.race_orc or {}
-dolls.race_orc.all = { flipx=false }
-tiles["npc/undead_lich_archlich.png"] = { flipx=false }
+tiles["npc/horror_aquatic_boiling_horror.png"] = { flipx=false }
+tiles["npc/undead_giant_bone_giant.png"] = { flipx=true }
+tiles["npc/horror_eldritch_blade_horror.png"] = { flipx=false }
+tiles["npc/horror_temporal_void_horror.png"] = { flipx=false }
+tiles["npc/patrol_allied_kingdoms_allied_kingdoms_halfling_patrol.png"] = { flipx=false }
tiles["npc/undead_giant_half_finished_bone_giant.png"] = { flipx=true }
tiles["npc/horror_eldritch_luminous_horror.png"] = { flipx=false }
-tiles["npc/undead_horror_sanguine_horror.png"] = { flipx=false }
-tiles["npc/humanoid_human_pyromancer.png"] = { flipx=false }
-tiles["npc/undead_horror_necrotic_abomination.png"] = { flipx=false }
+tiles["npc/humanoid_shalore_elven_tempest.png"] = { flipx=false }
+tiles["npc/vermin_sandworm_gigantic_corrosive_tunneler.png"] = { flipx=false }
+tiles["player/skeleton_female.png"] = { flipx=true }
tiles["npc/elemental_ice_greater_shivgoroth.png"] = { flipx=false }
tiles["npc/elemental_temporal_ultimate_teluvorta.png"] = { flipx=false }
tiles["npc/humanoid_human_valfred_loren.png"] = { flipx=true }
-tiles["npc/humanoid_human_rej_arkatis.png"] = { flipx=false }
-tiles["npc/undead_giant_heavy_sentinel.png"] = { flipx=false }
-tiles["npc/undead_giant_heavy_bone_giant.png"] = { flipx=false }
+tiles["npc/humanoid_player_default.png"] = { flipx=false }
+tiles["npc/horror_eldritch_bloated_horror.png"] = { flipx=false }
+tiles["npc/humanoid_elf_limmir_the_jeweler.png"] = { flipx=true }
tiles["npc/dragon_venom_venom_drake_hatchling.png"] = { flipx=false }
tiles["npc/sage_kitty.png"] = { flipx=false }
-tiles["npc/undead_giant_bone_giant.png"] = { flipx=true }
+tiles["npc/humanoid_orc_orc_warrior.png"] = { flipx=false }
tiles["npc/humanoid_orc_orc_grand_summoner.png"] = { flipx=true }
tiles["npc/naga_psyren.png"] = { flipx=false }
-tiles["npc/humanoid_thalore_thalore_wilder.png"] = { flipx=false }
+tiles["npc/humanoid_thalore_thalore_hunter.png"] = { flipx=false }
tiles["npc/humanoid_shalore_shalore_rune_master.png"] = { flipx=false }
-tiles["npc/undead_ghoul_rotting_titan.png"] = { flipx=false }
-tiles["npc/undead_ghoul_ghoulking.png"] = { flipx=false }
-tiles["npc/horror_eldritch_umbral_horror.png"] = { flipx=false }
+tiles["npc/undead_skeleton_the_shade.png"] = { flipx=false }
+tiles["npc/humanoid_human_fryjia_loren.png"] = { flipx=false }
+tiles["npc/horror_eldritch_oozing_horror.png"] = { flipx=false }
+tiles["npc/spiderkin_spider_giant_spider.png"] = { flipx=false }
+tiles["npc/demon_major_lithfengel.png"] = { flipx=false }
+tiles["player/runic_golem_male.png"] = { flipx=true }
+tiles["player/dwarf_female.png"] = { flipx=false }
tiles["npc/spiderkin_spider_weaver_young.png"] = { flipx=false }
-tiles["npc/undead_ghoul_ghoul.png"] = { flipx=false }
-tiles["npc/lightning_ant.png"] = { flipx=false }
-tiles["npc/undead_ghoul_ghast.png"] = { flipx=false }
-tiles["npc/canine_dw.png"] = { flipx=true }
-tiles["npc/humanoid_halfling_halfling_slinger.png"] = { flipx=true }
-tiles["npc/undead_ghost_the_shade_of_telos.png"] = { flipx=false }
+tiles["player/shalore_male.png"] = { flipx=false }
+tiles["npc/spiderkin_spider_losselhing.png"] = { flipx=true }
tiles["npc/spiderkin_spider_ungolmor.png"] = { flipx=false }
-tiles["npc/humanoid_halfling_sm_halfling.png"] = { flipx=false }
+tiles["npc/humanoid_halfling_derth_guard.png"] = { flipx=true }
tiles["npc/horror_aquatic_entrenched_horror.png"] = { flipx=false }
-tiles["npc/immovable_plants_poison_ivy.png"] = { flipx=false }
-tiles["npc/humanoid_human_assassin.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_necromancer.png"] = { flipx=true }
+tiles["npc/humanoid_orc_orc_high_pyromancer.png"] = { flipx=true }
tiles["npc/humanoid_human_argoniel.png"] = { flipx=false }
tiles["npc/humanoid_human_sun_paladin_guren.png"] = { flipx=true }
-tiles["npc/atamathon.png"] = { flipx=false }
-tiles["npc/humanoid_halfling_halfling_guard.png"] = { flipx=false }
+tiles["npc/humanoid_shalore_elven_guard.png"] = { flipx=false }
+tiles["npc/humanoid_human_necromancer.png"] = { flipx=true }
tiles["npc/brown_ant.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_gaeramarth.png"] = { flipx=false }
+tiles["npc/giant_minotaur_minotaur_of_the_labyrinth.png"] = { flipx=false }
tiles["npc/humanoid_human_enthralled_slave.png"] = { flipx=false }
-tiles["npc/troll_c.png"] = { flipx=false }
+tiles["npc/armored_skeleton_warrior2.png"] = { flipx=true }
tiles["npc/vermin_rodent_giant_grey_rat.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_weaver_matriarch.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_ninurlhing.png"] = { flipx=false }
-tiles["npc/elemental_void_losgoroth.png"] = { flipx=false }
-tiles["npc/humanoid_elf_elven_sun_mage.png"] = { flipx=false }
+tiles["npc/aquatic_critter_electric_eel.png"] = { flipx=false }
+tiles["npc/humanoid_human_human_farmer.png"] = { flipx=true }
+tiles["player/thalore_female.png"] = { flipx=false }
+tiles["npc/drake_multi_ureslak.png"] = { flipx=false }
tiles["npc/forest_wight.png"] = { flipx=false }
-tiles["npc/giant_troll_shax_the_slimy.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_losselhing.png"] = { flipx=true }
-tiles["npc/spiderkin_spider_giant_spider.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_fate_weaver.png"] = { flipx=true }
+tiles["npc/undead_horror_sanguine_horror.png"] = { flipx=false }
+tiles["npc/humanoid_orc_krogar.png"] = { flipx=false }
+tiles["npc/humanoid_human_spectator03.png"] = { flipx=false }
+tiles["npc/humanoid_human_hexer.png"] = { flipx=false }
tiles["player/ascii_player_gentleman_01_64.png"] = { flipx=true }
tiles["npc/elemental_xorn_xorn.png"] = { flipx=false }
-tiles["npc/patrol_allied_kingdoms_allied_kingdoms_halfling_patrol.png"] = { flipx=false }
-tiles["npc/horror_eldritch_weirdling_beast.png"] = { flipx=false }
+tiles["npc/brown_bear.png"] = { flipx=false }
+tiles["npc/horror_eldritch_umbral_horror.png"] = { flipx=false }
tiles["npc/undead_ghost_will_o__the_wisp.png"] = { flipx=false }
-tiles["npc/horror_eldritch_grgglck_s_tentacle.png"] = { flipx=false }
-tiles["npc/horror_eldritch_eldritch_eye.png"] = { flipx=false }
+tiles["npc/aquatic_critter_giant_eel.png"] = { flipx=false }
+tiles["npc/crystal_red.png"] = { flipx=false }
tiles["npc/humanoid_orc_vor__grand_geomancer_of_the_pride.png"] = { flipx=false }
tiles["npc/humanoid_shalore_mean_looking_elven_guard.png"] = { flipx=false }
-tiles["npc/naga_myrmidon_2.png"] = { flipx=false }
-tiles["npc/horror_eldritch_bloated_horror.png"] = { flipx=false }
+tiles["npc/undead_ghoul_ghoulking.png"] = { flipx=false }
+tiles["npc/humanoid_elf_elven_sun_mage.png"] = { flipx=false }
tiles["npc/giant_troll_forest_troll_hedge_wizard.png"] = { flipx=false }
-tiles["npc/darkgrey-snake.png"] = { flipx=false }
-tiles["npc/vermin_sandworm_sandworm_burrower.png"] = { flipx=false }
+tiles["npc/humanoid_yaech_blood_master.png"] = { flipx=true }
+tiles["player/ascii_player_pink_amazone_01.png"] = { flipx=true }
tiles["npc/cave_bear.png"] = { flipx=false }
-tiles["npc/horror_corrupted_grannor_vor.png"] = { flipx=false }
+tiles["npc/arcane_eye.png"] = { flipx=false }
tiles["npc/dragon_sand_sand_drake.png"] = { flipx=false }
tiles["npc/humanoid_human_high_sun_paladin_rodmour.png"] = { flipx=false }
-tiles["npc/giant_ice_snow_giant_thunderer.png"] = { flipx=false }
+tiles["npc/vermin_rodent_cute_little_bunny.png"] = { flipx=false }
tiles["npc/troll_mt.png"] = { flipx=false }
tiles["player/ascii_player_bunny_01.png"] = { flipx=true }
tiles["npc/undead_lich_blood_lich.png"] = { flipx=false }
tiles["npc/canine_fox.png"] = { flipx=false }
tiles["npc/humanoid_human_assassin_lord.png"] = { flipx=false }
-tiles["npc/humanoid_human_last_hope_guard.png"] = { flipx=false }
-tiles["npc/horror_corrupted_brecklorn.png"] = { flipx=true }
+tiles["npc/humanoid_thalore_mindworm.png"] = { flipx=true }
+tiles["npc/humanoid_female_sluttymaid.png"] = { flipx=false }
tiles["npc/horror_temporal_temporal_defiler.png"] = { flipx=false }
tiles["player/ascii_player_helmet_02_64.png"] = { flipx=true }
-tiles["npc/horror_aquatic_boiling_horror.png"] = { flipx=false }
-tiles["npc/humanoid_orc_massok_the_dragonslayer.png"] = { flipx=false }
+tiles["npc/humanoid_dwarf_norgan.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_soldier.png"] = { flipx=false }
tiles["npc/horror_corrupted_the_abomination.png"] = { flipx=false }
-tiles["npc/hostile_humanoid_adventurers_party.png"] = { flipx=false }
-tiles["npc/giant_troll_patchwork_troll.png"] = { flipx=false }
-tiles["npc/humanoid_human_celia.png"] = { flipx=false }
-tiles["npc/humanoid_yaech_yaech_psion.png"] = { flipx=true }
+tiles["npc/atamathon.png"] = { flipx=false }
+tiles["npc/vermin_oozes_slimy_ooze.png"] = { flipx=false }
tiles["npc/giant_minotaur_maulotaur.png"] = { flipx=false }
+tiles["npc/vermin_oozes_white_ooze.png"] = { flipx=false }
+tiles["npc/undead_skeleton_filio_flightfond.png"] = { flipx=false }
tiles["npc/humanoid_halfling_protector_myssil.png"] = { flipx=false }
tiles["npc/stone_shader.png"] = { flipx=false }
-tiles["npc/dragon_storm_storm_wyrm.png"] = { flipx=false }
-tiles["npc/elemental_ice_shivgoroth.png"] = { flipx=false }
-tiles["npc/canine_ww.png"] = { flipx=false }
+tiles["npc/humanoid_naga_lady_zoisla_the_tidebringer.png"] = { flipx=false }
+tiles["npc/undead_lich_archlich.png"] = { flipx=false }
+tiles["npc/undead_ghost_the_shade_of_telos.png"] = { flipx=false }
tiles["npc/horror_eldritch_devourer.png"] = { flipx=false }
-tiles["npc/immovable_molds_brown_mold.png"] = { flipx=false }
+tiles["npc/vermin_rodent_giant_brown_mouse.png"] = { flipx=false }
tiles["npc/aquatic_critter_dragon_turtle.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_spitting_spider.png"] = { flipx=false }
+tiles["npc/humanoid_shalore_grand_corruptor.png"] = { flipx=true }
tiles["npc/humanoid_shalore_elven_blood_mage.png"] = { flipx=false }
-tiles["npc/humanoid_thalore_thalore_hunter.png"] = { flipx=false }
-tiles["npc/humanoid_thalore_mindworm.png"] = { flipx=true }
+tiles["npc/humanoid_human_great_gladiator.png"] = { flipx=true }
+tiles["npc/insect_ritch_ritch_flamespitter.png"] = { flipx=true }
tiles["npc/insect_ant_queen_ant.png"] = { flipx=false }
-tiles["npc/elemental_xorn_umber_hulk.png"] = { flipx=false }
+tiles["npc/animal_canine_the_withering_thing.png"] = { flipx=true }
tiles["npc/immovable_plants_rimebark.png"] = { flipx=false }
tiles["npc/demon_major_corrupted_daelach.png"] = { flipx=false }
tiles["npc/humanoid_male_sluttymaid.png"] = { flipx=false }
-dolls.race_dwarf = dolls.race_dwarf or {}
-dolls.race_dwarf.female = { flipx=false }
-tiles["npc/humanoid_orc_warmaster_gnarg.png"] = { flipx=false }
-tiles["npc/humanoid_shalore_elven_guard.png"] = { flipx=false }
+tiles["npc/undead_wight_void_spectre.png"] = { flipx=false }
+tiles["npc/yellow-green-snake.png"] = { flipx=false }
+tiles["npc/jelly-red.png"] = { flipx=false }
tiles["npc/undead_ghoul_borfast_the_broken.png"] = { flipx=false }
tiles["player/yeek_male.png"] = { flipx=false }
-tiles["npc/humanoid_orc_young_orc.png"] = { flipx=false }
+tiles["npc/undead_mummy_rotting_mummy.png"] = { flipx=false }
tiles["npc/undead_mummy_animated_mummy_wrappings.png"] = { flipx=false }
-tiles["npc/dragon_fire_varsha_the_writhing.png"] = { flipx=false }
-tiles["npc/horror_corrupted_grannor_vin.png"] = { flipx=false }
+tiles["npc/humanoid_human_townsfolk_blubbering_idiot01_64.png"] = { flipx=false }
+tiles["npc/troll_s.png"] = { flipx=false }
tiles["npc/undead_ghost_ruin_banshee.png"] = { flipx=false }
-tiles["npc/canine_w.png"] = { flipx=false }
-tiles["npc/demon_major_dolleg.png"] = { flipx=false }
-tiles["npc/horror_temporal_dredgling.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_mother.png"] = { flipx=false }
-tiles["npc/demon_major_lithfengel.png"] = { flipx=false }
-tiles["npc/horror_temporal_temporal_stalker.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_elite_fighter.png"] = { flipx=true }
+tiles["npc/undead_ghoul_ghast.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_assassin.png"] = { flipx=false }
+tiles["npc/humanoid_yaech_yaech_diver.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_berserker.png"] = { flipx=false }
+tiles["npc/crystal_darkred.png"] = { flipx=false }
+tiles["npc/horror_corrupted_drem_master.png"] = { flipx=true }
+tiles["npc/vermin_rodent_giant_crystal_rat.png"] = { flipx=false }
tiles["npc/green_ant.png"] = { flipx=false }
-tiles["npc/humanoid_dwarf_norgan.png"] = { flipx=false }
+tiles["npc/immovable_plants_poison_ivy.png"] = { flipx=false }
tiles["npc/crystal_blue.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_archer.png"] = { flipx=true }
+tiles["npc/undead_rodent_spectral_rat.png"] = { flipx=false }
tiles["npc/grave_wight.png"] = { flipx=false }
-tiles["npc/horror_sher_tul_caldizar.png"] = { flipx=false }
-tiles["npc/drake_multi_ureslak.png"] = { flipx=false }
-tiles["npc/salmon-snake.png"] = { flipx=false }
-tiles["npc/horror_corrupted_drem_master.png"] = { flipx=true }
-tiles["npc/humanoid_halfling_derth_guard.png"] = { flipx=true }
-tiles["npc/humanoid_human_arcane_blade.png"] = { flipx=true }
+tiles["npc/summoner_hydra.png"] = { flipx=false }
+tiles["player/ascii_player_mario_01_64.png"] = { flipx=true }
+tiles["npc/humanoid_yeek_yeek_commoner_06.png"] = { flipx=false }
+tiles["npc/spiderkin_spider_ninurlhing.png"] = { flipx=false }
+tiles["npc/unknown_unknown_the_eidolon.png"] = { flipx=false }
+tiles["npc/aquatic_critter_ancient_dragon_turtle.png"] = { flipx=false }
tiles["npc/construct_golem_broken_golem.png"] = { flipx=false }
tiles["npc/undead_rodent_rat_lich.png"] = { flipx=false }
-tiles["npc/animal_canine_lone_wolf.png"] = { flipx=false }
-tiles["npc/humanoid_human_blood_mage.png"] = { flipx=false }
-tiles["npc/arcane_eye.png"] = { flipx=false }
+tiles["npc/horror_sher_tul_caldizar.png"] = { flipx=false }
+tiles["npc/undead_giant_heavy_sentinel.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_greatmother.png"] = { flipx=true }
tiles["npc/humanoid_human_lost_merchant.png"] = { flipx=true }
tiles["npc/humanoid_elf_elven_archer.png"] = { flipx=false }
-tiles["npc/humanoid_human_trickster.png"] = { flipx=false }
-tiles["npc/humanoid_human_derth_guard.png"] = { flipx=false }
-tiles["npc/humanoid_human_bandit_lord.png"] = { flipx=false }
-tiles["npc/humanoid_human_fire_wyrmic.png"] = { flipx=false }
-tiles["npc/humanoid_human_townsfolk_mangy_looking_leper01_64.png"] = { flipx=false }
-dolls.race_human = dolls.race_human or {}
-dolls.race_human.female = { flipx=false }
-tiles["npc/humanoid_human_townsfolk_blubbering_idiot01_64.png"] = { flipx=false }
-tiles["npc/humanoid_human_townsfolk_battlescarred_veteran01_64.png"] = { flipx=false }
-tiles["npc/humanoid_naga_lady_zoisla_the_tidebringer.png"] = { flipx=false }
-tiles["npc/humanoid_human_thief.png"] = { flipx=false }
-tiles["npc/humanoid_human_the_possessed.png"] = { flipx=false }
-tiles["npc/humanoid_human_tannen.png"] = { flipx=true }
-tiles["npc/humanoid_human_spectator03.png"] = { flipx=false }
-tiles["npc/humanoid_human_hexer.png"] = { flipx=false }
+tiles["npc/dragon_storm_storm_wyrm.png"] = { flipx=false }
+tiles["npc/immovable_molds_brown_mold.png"] = { flipx=false }
+tiles["npc/humanoid_human_rej_arkatis.png"] = { flipx=false }
+tiles["npc/grizzly_bear.png"] = { flipx=false }
+tiles["npc/humanoid_human_human_sun_paladin.png"] = { flipx=false }
+tiles["npc/horror_eldritch_worm_that_walks.png"] = { flipx=false }
+tiles["npc/humanoid_human_cryomancer.png"] = { flipx=false }
+tiles["npc/humanoid_orc_warmaster_gnarg.png"] = { flipx=false }
+tiles["npc/vermin_oozes_yellow_ooze.png"] = { flipx=false }
+tiles["npc/dragon_temporal_rantha_the_abomination.png"] = { flipx=false }
+tiles["npc/elemental_xorn_umber_hulk.png"] = { flipx=false }
tiles["npc/humanoid_human_high_slinger.png"] = { flipx=true }
-tiles["npc/humanoid_human_high_sun_paladin_aeryn.png"] = { flipx=false }
tiles["npc/humanoid_human_sand_wyrmic.png"] = { flipx=true }
-tiles["npc/elemental_temporal_teluvorta.png"] = { flipx=true }
+tiles["npc/humanoid_human_townsfolk_squinteyed_rogue01_64.png"] = { flipx=false }
+tiles["npc/elemental_temporal_epoch.png"] = { flipx=false }
+tiles["npc/horror_temporal_dredgling.png"] = { flipx=false }
+tiles["npc/spiderkin_spider_weaver_queen.png"] = { flipx=true }
+tiles["npc/humanoid_yeek_yeek_commoner_04.png"] = { flipx=false }
tiles["npc/elder_vampire.png"] = { flipx=false }
-tiles["npc/humanoid_human_human_farmer.png"] = { flipx=true }
-tiles["npc/aquatic_critter_ink_squid.png"] = { flipx=false }
-tiles["npc/horror_aquatic_ravenous_horror.png"] = { flipx=false }
-tiles["npc/humanoid_human_human_guard.png"] = { flipx=true }
+tiles["npc/undead_ghost_aletta_soultorn.png"] = { flipx=false }
+tiles["npc/spiderkin_spider_orb_weaver.png"] = { flipx=false }
+tiles["npc/humanoid_human_spectator.png"] = { flipx=true }
+tiles["npc/humanoid_human_spectator02.png"] = { flipx=false }
tiles["npc/naga_psyren2.png"] = { flipx=false }
tiles["npc/skeleton_mage.png"] = { flipx=false }
-tiles["npc/humanoid_human_townsfolk_squinteyed_rogue01_64.png"] = { flipx=false }
-tiles["npc/humanoid_human_ice_wyrmic.png"] = { flipx=true }
-tiles["npc/humanoid_human_lumberjack.png"] = { flipx=false }
-tiles["npc/humanoid_human_martyr.png"] = { flipx=false }
-tiles["npc/elemental_air_greater_gwelgoroth.png"] = { flipx=false }
-tiles["npc/crystal_red.png"] = { flipx=false }
+tiles["npc/crystal_npc.png"] = { flipx=false }
+tiles["npc/salmon-snake.png"] = { flipx=false }
+tiles["npc/undead_ghoul_ghoul.png"] = { flipx=false }
+tiles["npc/elemental_ice_ultimate_shivgoroth.png"] = { flipx=false }
+tiles["npc/troll_f.png"] = { flipx=false }
+tiles["npc/vermin_sandworm_huge_sandworm_burrower.png"] = { flipx=true }
tiles["npc/giant_troll_corrupted_oozemancer.png"] = { flipx=false }
tiles["npc/animal_feline_sabertooth_tiger.png"] = { flipx=false }
-tiles["npc/humanoid_human_necromancer.png"] = { flipx=false }
+tiles["npc/humanoid_human_storm_wyrmic.png"] = { flipx=false }
tiles["npc/undead_horror_necrotic_mass.png"] = { flipx=false }
-tiles["npc/humanoid_human_reaver.png"] = { flipx=false }
+tiles["npc/animal_canine_lone_wolf.png"] = { flipx=false }
tiles["npc/undead_giant_runed_bone_giant.png"] = { flipx=true }
-tiles["npc/humanoid_human_rogue.png"] = { flipx=false }
+tiles["npc/undead_rodent_gigantic_bone_rat.png"] = { flipx=false }
tiles["npc/aquatic_demon_water_imp.png"] = { flipx=false }
-tiles["npc/humanoid_human_shadowblade.png"] = { flipx=false }
-tiles["npc/humanoid_human_spectator.png"] = { flipx=true }
-tiles["npc/humanoid_human_spectator02.png"] = { flipx=false }
+tiles["npc/vermin_worms_white_worm_mass.png"] = { flipx=false }
+tiles["npc/vermin_sandworm_sandworm_burrower.png"] = { flipx=false }
+tiles["npc/vermin_oozes_green_ooze.png"] = { flipx=false }
tiles["npc/horror_eldritch_nightmare_horror.png"] = { flipx=false }
-tiles["npc/humanoid_human_storm_wyrmic.png"] = { flipx=false }
+tiles["npc/demon_major_thaurhereg.png"] = { flipx=false }
tiles["npc/horror_temporal_dredge.png"] = { flipx=false }
-tiles["npc/humanoid_human_tempest.png"] = { flipx=true }
-dolls.race_yeek = dolls.race_yeek or {}
-dolls.race_yeek.all = { flipx=false }
+tiles["player/thalore_male.png"] = { flipx=false }
tiles["npc/construct_golem_athamathon_the_giant_golem.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_faerlhing.png"] = { flipx=true }
+tiles["player/cornac_female_redhair.png"] = { flipx=false }
tiles["npc/insect_ritch_ritch_hive_mother.png"] = { flipx=true }
tiles["npc/humanoid_yeek_yeek_mindslayer.png"] = { flipx=false }
tiles["npc/dragon_wild_blinkwyrm.png"] = { flipx=false }
tiles["npc/humanoid_orc_gorbat__supreme_wyrmic_of_the_pride.png"] = { flipx=false }
tiles["npc/troll_c_02.png"] = { flipx=false }
tiles["npc/humanoid_human_townsfolk_meanlooking_mercenary01_64.png"] = { flipx=false }
-tiles["npc/humanoid_human_townsfolk_pitiful_looking_beggar01_64.png"] = { flipx=false }
+tiles["npc/humanoid_elf_fillarel_aldaren.png"] = { flipx=false }
tiles["npc/vermin_sandworm_sandworm_destroyer.png"] = { flipx=false }
-tiles["npc/humanoid_human_townsfolk_village_idiot01_64.png"] = { flipx=true }
+tiles["npc/humanoid_orc_orc_archer.png"] = { flipx=true }
tiles["npc/R2D2_01.png"] = { flipx=false }
tiles["npc/troll_bill.png"] = { flipx=false }
tiles["npc/animal_bear_norgos_the_frozen.png"] = { flipx=false }
-tiles["npc/humanoid_human_gladiator.png"] = { flipx=false }
+tiles["npc/horror_aquatic_ravenous_horror.png"] = { flipx=false }
tiles["npc/yellow_ant.png"] = { flipx=false }
-tiles["npc/humanoid_naga_naga_tidewarden.png"] = { flipx=true }
-tiles["npc/humanoid_naga_slasul.png"] = { flipx=true }
+tiles["npc/undead_ghoul_rotting_titan.png"] = { flipx=false }
+tiles["npc/shadow-caster.png"] = { flipx=false }
tiles["npc/humanoid_human_meranas__herald_of_angolwen.png"] = { flipx=false }
-tiles["npc/humanoid_orc_brotoq_the_reaver.png"] = { flipx=false }
+tiles["npc/humanoid_halfling_halfling_guard.png"] = { flipx=false }
tiles["npc/elemental_temporal_ultimate_telugoroth.png"] = { flipx=false }
tiles["npc/vermin_oozes_blue_ooze.png"] = { flipx=false }
tiles["npc/naga_psyren2_2.png"] = { flipx=false }
tiles["npc/army_ant.png"] = { flipx=false }
tiles["npc/humanoid_orc_icy_orc_wyrmic.png"] = { flipx=false }
tiles["npc/humanoid_human_urkis__the_high_tempest.png"] = { flipx=false }
-tiles["npc/armored_skeleton_warrior2.png"] = { flipx=true }
+tiles["npc/troll_s_03.png"] = { flipx=false }
tiles["npc/vermin_sandworm_gigantic_sandworm_tunneler.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_berserker.png"] = { flipx=false }
-tiles["npc/aquatic_critter_electric_eel.png"] = { flipx=false }
+tiles["npc/humanoid_human_townsfolk_mangy_looking_leper01_64.png"] = { flipx=false }
+tiles["npc/spiderkin_spider_weaver_matriarch.png"] = { flipx=false }
tiles["player/cornac_male.png"] = { flipx=false }
tiles["npc/humanoid_human_townsfolk_boilcovered_wretch01_64.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_high_pyromancer.png"] = { flipx=true }
+tiles["player/dwarf_male.png"] = { flipx=false }
tiles["player/ascii_player_fedora_feather_04_64.png"] = { flipx=true }
tiles["npc/giant_troll_half_dead_forest_troll.png"] = { flipx=false }
tiles["npc/humanoid_orc_orc_elite_berserker.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_necromancer.png"] = { flipx=true }
-tiles["npc/humanoid_orc_orc_pyromancer.png"] = { flipx=true }
-tiles["npc/humanoid_orc_orc_soldier.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_summoner.png"] = { flipx=false }
+tiles["npc/dragon_storm_storm_drake_hatchling.png"] = { flipx=false }
tiles["npc/elemental_temporal_greater_telugoroth.png"] = { flipx=false }
-tiles["npc/humanoid_orc_orc_warrior.png"] = { flipx=false }
+tiles["npc/humanoid_human_arcane_blade.png"] = { flipx=true }
+tiles["npc/canine_w.png"] = { flipx=false }
+tiles["npc/horror_corrupted_grannor_vor.png"] = { flipx=false }
+tiles["npc/horror_corrupted_the_mouth.png"] = { flipx=false }
tiles["player/tutorial_human_female.png"] = { flipx=false }
-tiles["npc/demon_major_uruivellas.png"] = { flipx=false }
+tiles["npc/humanoid_orc_massok_the_dragonslayer.png"] = { flipx=false }
tiles["npc/war_bear.png"] = { flipx=false }
tiles["npc/black_bear.png"] = { flipx=false }
-tiles["npc/brown_bear.png"] = { flipx=false }
-tiles["npc/humanoid_player_default.png"] = { flipx=false }
-tiles["npc/humanoid_shalore_elven_elite_warrior.png"] = { flipx=false }
+tiles["npc/canine_gw.png"] = { flipx=false }
+tiles["npc/humanoid_human_townsfolk_village_idiot01_64.png"] = { flipx=true }
+tiles["npc/elemental_ice_shivgoroth.png"] = { flipx=false }
tiles["npc/demon_minor_fire_imp.png"] = { flipx=false }
-tiles["npc/humanoid_shalore_elven_tempest.png"] = { flipx=false }
-tiles["npc/humanoid_shalore_elven_warrior.png"] = { flipx=false }
-tiles["npc/humanoid_shalore_grand_corruptor.png"] = { flipx=true }
-tiles["npc/humanoid_female_sluttymaid.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_master_wyrmic.png"] = { flipx=false }
+tiles["npc/demon_major_uruivellas.png"] = { flipx=false }
+tiles["npc/humanoid_human_celia.png"] = { flipx=false }
+tiles["npc/humanoid_yaech_yaech_hunter.png"] = { flipx=true }
tiles["npc/atamathon_broken.png"] = { flipx=false }
tiles["npc/giant_treant_snaproot.png"] = { flipx=false }
-tiles["npc/master_skeleton_warrior.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_fate_spinner.png"] = { flipx=true }
-tiles["npc/humanoid_orc_orc_greatmother.png"] = { flipx=true }
-tiles["npc/dragon_storm_storm_drake_hatchling.png"] = { flipx=false }
-tiles["npc/elemental_fire_fyrk__faeros_high_guard.png"] = { flipx=false }
-tiles["npc/humanoid_yaech_yaech_hunter.png"] = { flipx=true }
-tiles["npc/elemental_light_wisp.png"] = { flipx=false }
-tiles["npc/humanoid_yeek_yeek_commoner_02.png"] = { flipx=false }
tiles["npc/humanoid_yeek_yeek_commoner_03.png"] = { flipx=false }
+tiles["npc/canine_ww.png"] = { flipx=false }
+tiles["npc/master_skeleton_warrior.png"] = { flipx=false }
tiles["npc/summoner_wardog.png"] = { flipx=false }
-tiles["npc/humanoid_yeek_yeek_commoner_04.png"] = { flipx=false }
-tiles["npc/humanoid_yeek_yeek_commoner_05.png"] = { flipx=false }
-tiles["npc/humanoid_yeek_yeek_commoner_06.png"] = { flipx=false }
+tiles["npc/humanoid_orc_young_orc.png"] = { flipx=false }
+tiles["npc/dragon_fire_varsha_the_writhing.png"] = { flipx=false }
+tiles["npc/elemental_light_wisp.png"] = { flipx=false }
+tiles["npc/humanoid_orc_orc_mother.png"] = { flipx=false }
+tiles["npc/humanoid_thalore_thalore_wilder.png"] = { flipx=false }
+tiles["npc/hostile_humanoid_adventurers_party.png"] = { flipx=false }
+tiles["npc/humanoid_human_tannen.png"] = { flipx=true }
+tiles["npc/lightning_ant.png"] = { flipx=false }
+tiles["npc/humanoid_human_high_sun_paladin_aeryn.png"] = { flipx=false }
tiles["npc/giant_ice_snow_giant.png"] = { flipx=false }
-tiles["npc/humanoid_yeek_yeek_commoner_08.png"] = { flipx=false }
-tiles["npc/humanoid_human_geomancer.png"] = { flipx=true }
+tiles["npc/summoner_golem.png"] = { flipx=false }
+tiles["npc/spiderkin_spider_spitting_spider.png"] = { flipx=false }
tiles["npc/dragon_multihued_multi_hued_drake_hatchling.png"] = { flipx=false }
-tiles["npc/aquatic_critter_giant_eel.png"] = { flipx=false }
+tiles["npc/giant_troll_shax_the_slimy.png"] = { flipx=false }
tiles["npc/demon_major_daelach.png"] = { flipx=false }
tiles["npc/giant_ice_snow_giant_chieftain.png"] = { flipx=false }
-tiles["npc/insect_ritch_ritch_larva.png"] = { flipx=false }
-tiles["npc/humanoid_human_slinger.png"] = { flipx=true }
+tiles["npc/humanoid_orc_orc_pyromancer.png"] = { flipx=true }
+tiles["npc/humanoid_human_blood_mage.png"] = { flipx=false }
tiles["npc/humanoid_thalore_ziguranth_summoner.png"] = { flipx=false }
tiles["npc/humanoid_orc_golbug_the_destroyer.png"] = { flipx=true }
tiles["npc/undead_giant_ryal.png"] = { flipx=false }
tiles["npc/patrol_allied_kingdoms_allied_kingdoms_human_patrol.png"] = { flipx=false }
-tiles["npc/humanoid_human_subject_z.png"] = { flipx=false }
-tiles["npc/polar_bear.png"] = { flipx=true }
-tiles["npc/humanoid_yaech_yaech_diver.png"] = { flipx=false }
+tiles["npc/shadow-stalker.png"] = { flipx=false }
+tiles["npc/humanoid_shalore_elven_warrior.png"] = { flipx=false }
+tiles["npc/humanoid_yeek_yeek_commoner_01.png"] = { flipx=false }
tiles["npc/humanoid_orc_rak_shor__grand_necromancer_of_the_pride.png"] = { flipx=true }
-tiles["npc/dragon_multihued_multi_hued_drake.png"] = { flipx=false }
-tiles["npc/ice_ant.png"] = { flipx=false }
-tiles["npc/snaproot_pimp.png"] = { flipx=false }
+tiles["npc/humanoid_naga_naga_tidecaller.png"] = { flipx=false }
+tiles["npc/humanoid_dwarf_dwarven_guard.png"] = { flipx=false }
+tiles["npc/humanoid_halfling_halfling_citizen.png"] = { flipx=false }
tiles["npc/undead_shadow_shadow.png"] = { flipx=false }
dolls.race_elf = dolls.race_elf or {}
dolls.race_elf.female = { flipx=false }
@@ -638,13 +638,13 @@ tiles["npc/humanoid_naga_naga_nereid.png"] = { flipx=false }
tiles["npc/fire_ant.png"] = { flipx=false }
tiles["npc/humanoid_human_homeless_fighter.png"] = { flipx=false }
tiles["npc/giant_troll_prox_the_mighty.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_ungole.png"] = { flipx=false }
+tiles["npc/elemental_void_losgoroth.png"] = { flipx=false }
tiles["npc/dragon_fire_fire_drake.png"] = { flipx=false }
tiles["npc/dragon_cold_ice_wyrm.png"] = { flipx=false }
-tiles["npc/spiderkin_spider_weaver_queen.png"] = { flipx=true }
-tiles["npc/troll_s.png"] = { flipx=false }
+tiles["npc/spellblaze_simulacrum.png"] = { flipx=false }
+tiles["npc/troll_c.png"] = { flipx=false }
tiles["npc/undead_rodent_vampire_rat.png"] = { flipx=false }
-tiles["npc/summoner_hydra.png"] = { flipx=false }
-tiles["npc/summoner_turtle.png"] = { flipx=false }
-tiles["npc/troll_f.png"] = { flipx=false }
-tiles["npc/troll_m.png"] = { flipx=false }
+tiles["npc/humanoid_human_fire_wyrmic.png"] = { flipx=false }
+tiles["npc/humanoid_human_bandit_lord.png"] = { flipx=false }
+tiles["npc/humanoid_human_human_guard.png"] = { flipx=true }
+tiles["npc/humanoid_human_trickster.png"] = { flipx=false }
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_degenerated_ogric_mass.png b/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_degenerated_ogric_mass.png
new file mode 100644
index 0000000000000000000000000000000000000000..e51c7b19db0f38c6445d146efeae55cafb390c85
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_degenerated_ogric_mass.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_pounder.png b/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_pounder.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ecf870d916cb91f07fa688aee5a9f61015fdf79
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_pounder.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_rune_spinner.png b/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_rune_spinner.png
new file mode 100644
index 0000000000000000000000000000000000000000..84d6c86cff7cea8b103eb97ef365f908679f1a64
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_rune_spinner.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_sentry.png b/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_sentry.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf7114871146b3f03986713ee7530f7fcee1f589
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_sentry.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogric_abomination.png b/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogric_abomination.png
new file mode 100644
index 0000000000000000000000000000000000000000..28e4e4c98b37fc653b5accd8b5958d1e7d8f02be
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogric_abomination.png differ
diff --git a/game/modules/tome/data/quests/lightning-overload.lua b/game/modules/tome/data/quests/lightning-overload.lua
index 761bbf793d54db066aa9abeca7bc2961b01ebf5c..611af73075e3f7bbafa7a30ecc66ac499b5053d8 100644
--- a/game/modules/tome/data/quests/lightning-overload.lua
+++ b/game/modules/tome/data/quests/lightning-overload.lua
@@ -59,6 +59,7 @@ on_status_change = function(self, who, status, sub)
who:setQuestStatus(self.id, engine.Quest.DONE)
game:setAllowedBuild("mage_tempest", true)
world:gainAchievement("EYE_OF_THE_STORM", game.player:resolveSource())
+ game:unlockBackground("derth", "Derth")
local p = game.party:findMember{main=true}
if p.descriptor.subclass == "Archmage" then
if p:knowTalentType("spell/storm") == nil then
diff --git a/game/modules/tome/data/quests/shertul-fortress.lua b/game/modules/tome/data/quests/shertul-fortress.lua
index d1cff2a386a6a0939d078708bc6e29655951fc48..2d179f67fe86247c14df7bc81f90ea33291f30bf 100644
--- a/game/modules/tome/data/quests/shertul-fortress.lua
+++ b/game/modules/tome/data/quests/shertul-fortress.lua
@@ -89,6 +89,7 @@ spawn_butler = function(self)
game.player:setQuestStatus(self.id, self.COMPLETED, "butler")
world:gainAchievement("SHERTUL_FORTRESS", game.player)
+ game:unlockBackground("fortress", "Yiilkgur, the Sher'Tul Fortress")
end
spawn_transmo_chest = function(self, energy)
diff --git a/game/modules/tome/data/timed_effects/other.lua b/game/modules/tome/data/timed_effects/other.lua
index 1ab2911f975075ebd3439564c1b232a856ec15cf..32956d9f3a0e307b740f49d794c6ccf3571e64b3 100644
--- a/game/modules/tome/data/timed_effects/other.lua
+++ b/game/modules/tome/data/timed_effects/other.lua
@@ -2701,6 +2701,7 @@ newEffect{
type = "other", decrease = 0, no_remove = true,
subtype = { combat=true, penalty=true },
status = "detrimental",
+ no_stop_enter_worlmap = true, no_stop_resting = true,
parameters = {},
activate = function(self, eff)
self:effectTemporaryValue(eff, "hit_penalty_2h", 1)
@@ -2770,4 +2771,4 @@ newEffect{
self:removeParticles(eff.particle1)
self:removeParticles(eff.particle2)
end,
-}
\ No newline at end of file
+}
diff --git a/game/modules/tome/data/zones/conclave-vault/npcs.lua b/game/modules/tome/data/zones/conclave-vault/npcs.lua
index c71179bcbded5e7acf2ed8fea91bd0b327d8a980..12ecd631d13bf15d35ea67da7477e2b07d9a2468 100644
--- a/game/modules/tome/data/zones/conclave-vault/npcs.lua
+++ b/game/modules/tome/data/zones/conclave-vault/npcs.lua
@@ -112,6 +112,7 @@ newEntity{ base = "BASE_NPC_OGRE",
newEntity{ base = "BASE_NPC_OGRE",
name = "ogre pounder", color=colors.DARK_UMBER,
desc = [[This ogre closes in fast on you, arms open for the hug of death.]],
+ resolvers.nice_tile{tall=1},
level_range = {20, nil}, exp_worth = 1,
special_rarity = 3,
rank = 3,
@@ -132,6 +133,7 @@ newEntity{ base = "BASE_NPC_OGRE",
newEntity{ base = "BASE_NPC_OGRE",
name = "degenerated ogric mass", color=colors.BLUE,
desc = [[This huge mass of deformed flesh was probably once an ogre, but something had gone wrong.]],
+ resolvers.nice_tile{tall=1},
level_range = {20, nil}, exp_worth = 1,
special_rarity = 2,
rank = 2,
@@ -149,6 +151,7 @@ newEntity{ base = "BASE_NPC_OGRE",
newEntity{ base = "BASE_NPC_OGRE",
name = "ogric abomination", color=colors.LIGHT_GREY,
desc = [[This ogre seems to have tried to graft golem parts on its own body. To various interresting results.]],
+ resolvers.nice_tile{tall=1},
level_range = {22, nil}, exp_worth = 1,
special_rarity = 4,
rank = 3,
@@ -168,6 +171,8 @@ newEntity{ base = "BASE_NPC_OGRE",
newEntity{ base = "BASE_NPC_OGRE",
name = "ogre rune-spinner", color=colors.LIGHT_RED,
desc = [[A towering ogre guard, his skin covered in runes and arcane designs.]],
+ female = 1,
+ resolvers.nice_tile{tall=1},
level_range = {23, nil}, exp_worth = 1,
special_rarity = 2,
rank = 3,
@@ -187,6 +192,7 @@ newEntity{ base = "BASE_NPC_OGRE",
newEntity{ base = "BASE_NPC_OGRE", define_as = "OGRE_SENTRY",
name = "ogre sentry", color=colors.GREY,
+ resolvers.nice_tile{tall=1},
desc = [[This greatsword-wielding ogre looks at you with contempt and hatred.]],
level_range = {21, nil}, exp_worth = 1,
rank = 3,
diff --git a/game/modules/tome/data/zones/dreadfell/npcs.lua b/game/modules/tome/data/zones/dreadfell/npcs.lua
index 5056908b7db3d9793b1f10f89b45d4d947da6c8a..bf09053f5f0ad5df3e41afc76482e70016a8500c 100644
--- a/game/modules/tome/data/zones/dreadfell/npcs.lua
+++ b/game/modules/tome/data/zones/dreadfell/npcs.lua
@@ -112,6 +112,8 @@ newEntity{ define_as = "THE_MASTER",
game.player:resolveSource():grantQuest("dreadfell")
game.player:resolveSource():setQuestStatus("dreadfell", engine.Quest.COMPLETED)
+ game:unlockBackground("master", "The Master")
+
local ud = {}
if not profile.mod.allow_build.undead_skeleton then ud[#ud+1] = "undead_skeleton" end
if not profile.mod.allow_build.undead_ghoul then ud[#ud+1] = "undead_ghoul" end
diff --git a/game/modules/tome/data/zones/tempest-peak/npcs.lua b/game/modules/tome/data/zones/tempest-peak/npcs.lua
index c4ceb34ccdae6b4e8c2a0fd0479317b71da9aa12..44e5d7bb62a4e7c0f6d66022bc17370b3763dd5e 100644
--- a/game/modules/tome/data/zones/tempest-peak/npcs.lua
+++ b/game/modules/tome/data/zones/tempest-peak/npcs.lua
@@ -74,5 +74,6 @@ newEntity{ define_as = "URKIS",
on_die = function(self, who)
game.player:resolveSource():setQuestStatus("lightning-overload", engine.Quest.COMPLETED)
+ game:unlockBackground("urkis", "Urkis, the High Tempest")
end,
}
diff --git a/game/modules/tome/data/zones/town-elvala/npcs.lua b/game/modules/tome/data/zones/town-elvala/npcs.lua
index 5f197c19d39b3c3eb11d430fdb5a7c59f3485a98..e0b75500318ab3215395a03191ca4f6b24edb509 100644
--- a/game/modules/tome/data/zones/town-elvala/npcs.lua
+++ b/game/modules/tome/data/zones/town-elvala/npcs.lua
@@ -106,6 +106,8 @@ newEntity{
newEntity{ base = "BASE_NPC_ELVALA_OGRE_TOWN",
name = "ogre rune-spinner", color=colors.LIGHT_UMBER,
desc = [[A towering ogre guard, his skin covered in runes.]],
+ female = 1,
+ resolvers.nice_tile{tall=1},
level_range = {1, nil}, exp_worth = 1,
rarity = 3,
diff --git a/game/modules/tome/dialogs/CharacterSheet.lua b/game/modules/tome/dialogs/CharacterSheet.lua
index a6d45e4fc3064663c6ff62d7753735f7461786a3..406008267f824afd40208e2cb5d4af679e405f75 100644
--- a/game/modules/tome/dialogs/CharacterSheet.lua
+++ b/game/modules/tome/dialogs/CharacterSheet.lua
@@ -191,7 +191,7 @@ function _M:mouseLink(link, text, _, _, _, w, h, x, y)
{ x=x, y=y, w=w, h=h, fct=function(button)
game.tooltip_x, game.tooltip_y = 1, 1; game:tooltipDisplayAtMap(game.w, game.h, text)
if button == "left" then
- util.browserOpenUrl(link)
+ util.browserOpenUrl(link, {is_external=true})
end
end},
}, true)
diff --git a/game/modules/tome/dialogs/Donation.lua b/game/modules/tome/dialogs/Donation.lua
index ab94f496c85784ac9914ee5414e6998d9b41db74..7c6f7bbd92dbf93fea1dceb61122a7540596f5f6 100644
--- a/game/modules/tome/dialogs/Donation.lua
+++ b/game/modules/tome/dialogs/Donation.lua
@@ -90,6 +90,6 @@ function _M:ok()
local url = ("http://te4.org/ingame-donate/%s/%s/%s/EUR/%s"):format(self.c_donate.number, self.c_recur.checked and "monthly" or "onetime", (profile.auth and profile.auth.drupid) and profile.auth.drupid or "0", self.donation_source)
- if inside then util.browserOpenUrl(url)
- else util.browserOpenUrl(url, {webview=true}) end
+ if inside then util.browserOpenUrl(url, {is_external=true})
+ else util.browserOpenUrl(url, {webview=true, is_external=true}) end
end
diff --git a/game/modules/tome/dialogs/GameOptions.lua b/game/modules/tome/dialogs/GameOptions.lua
index 6f61a6cfd3b99124afc332c856f34c3c73b97eab..61c0013752b691281846f5bf94f9ebc57b4247eb 100644
--- a/game/modules/tome/dialogs/GameOptions.lua
+++ b/game/modules/tome/dialogs/GameOptions.lua
@@ -507,6 +507,15 @@ function _M:generateListOnline()
self.c_list:drawItem(item)
end,}
+ local zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text=string.toTString"Open links in external browser instead of the embedded one.\nThis does not affect addons browse and installation which always stays ingame."}
+ list[#list+1] = { zone=zone, name=string.toTString"#GOLD##{bold}#Open links in external browser#WHITE##{normal}#", status=function(item)
+ return tostring(config.settings.open_links_external and "enabled" or "disabled")
+ end, fct=function(item)
+ config.settings.open_links_external = not config.settings.open_links_external
+ game:saveSettings("open_links_external", ("open_links_external = %s\n"):format(tostring(config.settings.open_links_external)))
+ self.c_list:drawItem(item)
+ end,}
+
self.list = list
end
diff --git a/game/modules/tome/dialogs/ShowChatLog.lua b/game/modules/tome/dialogs/ShowChatLog.lua
index 0d8b4a8dc28437ad4493f2090bdada154c9f7f8f..e94cbb7b24b69fd9d090042bcd76bfad5520ce00 100644
--- a/game/modules/tome/dialogs/ShowChatLog.lua
+++ b/game/modules/tome/dialogs/ShowChatLog.lua
@@ -150,7 +150,7 @@ function _M:mouseEvent(button, x, y, xrel, yrel, bx, by, event)
end
elseif event == "button" then
if citem and citem.url and button == "left" then
- util.browserOpenUrl(citem.url)
+ util.browserOpenUrl(citem.url, {is_external=true})
end
if gitem and button == "right" then
@@ -183,9 +183,9 @@ function _M:mouseEvent(button, x, y, xrel, yrel, bx, by, event)
local UserInfo = require "engine.dialogs.UserInfo"
game:registerDialog(UserInfo.new(data))
elseif sel.ui == "profile" then
- util.browserOpenUrl(data.profile)
+ util.browserOpenUrl(data.profile, {is_external=true})
elseif sel.ui == "charsheet" then
- util.browserOpenUrl(data.char_link)
+ util.browserOpenUrl(data.char_link, {is_external=true})
elseif sel.ui == "whisper" then
profile.chat:setCurrentTarget(false, citem.login)
profile.chat:talkBox()
diff --git a/game/modules/tome/init.lua b/game/modules/tome/init.lua
index fd5a1bd08671069a2d6b8568de95da1f957a9dfd..955d479355d8ae38ef7689670f3952e7c3a975ab 100644
--- a/game/modules/tome/init.lua
+++ b/game/modules/tome/init.lua
@@ -65,6 +65,14 @@ publisher_logo = "netcore-logo"
if not config.settings.censor_boot then background_name = {"tome","tome2","tome3"}
else background_name = {"tome3"}
end
+if config.settings.unlock_background_linaniil then background_name[#background_name+1] = "cards/linaniil" end
+if config.settings.unlock_background_master then background_name[#background_name+1] = "cards/master" end
+if config.settings.unlock_background_garkul then background_name[#background_name+1] = "cards/garkul" end
+if config.settings.unlock_background_aeryn then background_name[#background_name+1] = "cards/aeryn" end
+if config.settings.unlock_background_myssil then background_name[#background_name+1] = "cards/myssil" end
+if config.settings.unlock_background_derth then background_name[#background_name+1] = "cards/derth" end
+if config.settings.unlock_background_fortress then background_name[#background_name+1] = "cards/fortress" end
+if config.settings.unlock_background_urkis then background_name[#background_name+1] = "cards/urkis" end
font_package_id = function() config.settings.tome = config.settings.tome or {} if not config.settings.tome.fonts then config.settings.tome.fonts = {type="fantasy", size="normal"} end return config.settings.tome.fonts.type end
font_package_size = function() config.settings.tome = config.settings.tome or {} if not config.settings.tome.fonts then config.settings.tome.fonts = {type="fantasy", size="normal"} end return config.settings.tome.fonts.size end