more images

git-svn-id: http://svn.net-core.org/repos/t-engine4@935 51575b47-30f0-44d4-a5cc-537603b46e54

game/engine/Entity.lua

@@ -218,6 +218,14 @@ function _M:getMapObjects(tiles, mos, z)
 	until not mo
 end
 
+function _M:getDisplayString(mo)
+	if core.display.FBOActive() then
+		return "#UID:"..self.uid..":"..(mo or 0).."#"
+	else
+		return ""
+	end
+end
+
 --- Resolves an entity
 -- This is called when generatingthe final clones of an entity for use in a level.<br/>
 -- This can be used to make random enchants on objects, random properties on actors, ...<br/>

game/engine/Map.lua

@@ -165,6 +165,7 @@ end
 function _M:resetTiles()
 	Entity:invalidateAllMO()
 	self.tiles = Tiles.new(self.tile_w, self.tile_h, self.fontname, self.fontsize, true, self.allow_backcolor)
+	self.tilesSDL = Tiles.new(self.tile_w, self.tile_h, self.fontname, self.fontsize, false, self.allow_backcolor)
 	self.tilesTactic = Tiles.new(self.tile_w, self.tile_h, self.fontname, self.fontsize, true, false)
 	self.tilesSurface = Tiles.new(self.tile_w, self.tile_h, self.fontname, self.fontsize, true, true)
 end

game/engine/Tooltip.lua

@@ -83,13 +83,17 @@ function _M:display()
 	end
 
 	local i = 1
+	local y = 0
+	local r, g, b, max_h = self.color[1], self.color[2], self.color[3], nil
 	for ii, l in ipairs(self.text) do
 		if self.text[i] == "---" then
-			self:drawWBorder(self.surface, 4, 4 + (i-1 + 0.5) * self.font_h, self.w - 8)
+			self:drawWBorder(self.surface, 4, 4 + y + 0.5 * self.font_h, self.w - 8)
 			i = i + 1
+			y = y + self.font_h
 		else
-			self.surface:drawColorString(self.font, self.text[i], 4, 4 + (i-1) * self.font_h, self.color[1], self.color[2], self.color[3])
+			r, g, b, max_h = self.surface:drawColorStringBlended(self.font, self.text[i], 4, 4 + y, r, g, b)
 			i = i + 1
+			y = y + max_h
 		end
 	end
 	self.texture = self.surface:glTexture()

game/engine/utils.lua

@@ -160,12 +160,16 @@ function string.splitLine(str, max_width, font)
 		-- Ignore the size of color markers
 		local _, _, color1 = v:find("(#%x%x%x%x%x%x#)")
 		local _, _, color2 = v:find("(#[A-Z_]+#)")
+		local _, _, uid = v:find("(#UID:[0-9]+:[0-9]#)")
 		if color1 then
 			local color_w = font:size(color1)
 			w = w - color_w
 		elseif color2 then
 			local color_w = font:size(color2)
 			w = w - color_w
+		elseif uid then
+			local color_w = font:size(uid)
+			w = w - color_w
 		end
 
 		if cur_size + space_w + w < max_width then
@@ -277,18 +281,22 @@ getmetatable(tmps).__index.drawColorStringCentered = function(s, font, str, dx,
 end
 
 getmetatable(tmps).__index.drawColorStringBlended = function(s, font, str, x, y, r, g, b)
+	local Puid = "UID:" * lpeg.R"09"^1 * ":" * lpeg.R"09"
+	local Puid_cap = "UID:" * lpeg.C(lpeg.R"09"^1) * ":" * lpeg.C(lpeg.R"09")
 	local Pcolorname = (lpeg.R"AZ" + "_")^3
 	local Pcode = (lpeg.R"af" + lpeg.R"09" + lpeg.R"AF")
 	local Pcolorcode = Pcode * Pcode
 
-	local list = str:split("#" * ((Pcolorcode * Pcolorcode * Pcolorcode) + Pcolorname) * "#", true)
+	local list = str:split("#" * (Puid + (Pcolorcode * Pcolorcode * Pcolorcode) + Pcolorname) * "#", true)
 	r = r or 255
 	g = g or 255
 	b = b or 255
 	local oldr, oldg, oldb = r, g, b
+	local max_h = 0
 	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)
 		if nr and ng and nb then
 			oldr, oldg, oldb = r, g, b
 			r, g, b = nr:parseHex(), ng:parseHex(), nb:parseHex()
@@ -299,13 +307,29 @@ getmetatable(tmps).__index.drawColorStringBlended = function(s, font, str, x, y,
 				oldr, oldg, oldb = r, g, b
 				r, g, b = colors[col].r, colors[col].g, colors[col].b
 			end
+		elseif uid and mo then
+			os.exit("FINISH UID DISPLAY IN STRING")
+			uid = tonumber(uid)
+			mo = tonumber(mo)
+			local e = __uids[uid]
+			if e then
+				local surfs = e:getEntitySurfaces(game.level.map.tilesSDL)
+				local w, h = nil, nil
+				for i = 1, #surfs do
+					if not w then w, h = surfs[i]:getSize() end
+					s:merge(surfs[i], x, y)
+				end
+				if h > max_h then max_h = h end
+				x = x + (w or 0)
+			end
 		else
 			local w, h = font:size(v)
+			if h > max_h then max_h = h end
 			s:drawStringBlended(font, v, x, y, r, g, b)
 			x = x + w
 		end
 	end
-	return r, g, b
+	return r, g, b, max_h
 end
 
 getmetatable(tmps).__index.drawColorStringBlendedCentered = function(s, font, str, dx, dy, dw, dh, r, g, b)

game/modules/tome/class/Object.lua

@@ -151,8 +151,9 @@ function _M:getName(t)
 		end
 	else
 		local _, c = self:getDisplayColor()
+		local ds = self:getDisplayString()
 		if qty == 1 or t.no_count then return c..name.."#LAST#"
-		else return c..qty.." "..name.."#LAST#"
+		else return c..qty.." "..ds..name.."#LAST#"
 		end
 	end
 end
@@ -340,7 +341,7 @@ function _M:getDesc()
 	end
 
 	if self.encumber then
-		desc[#desc+1] = ("#67AD00#%0.2f Encumbrance."):format(self.encumber)
+		desc[#desc+1] = ("#67AD00#%0.2f Encumbrance.#LAST#"):format(self.encumber)
 	end
 
 	local textdesc = table.concat(self:getTextualDesc(), "\n")

game/modules/tome/data/general/objects/2haxes.lua

@@ -21,7 +21,7 @@ newEntity{
 	define_as = "BASE_BATTLEAXE",
 	slot = "MAINHAND",
 	slot_forbid = "OFFHAND",
-	type = "weapon", subtype="battleaxe",
+	type = "weapon", subtype="battleaxe", image = resolvers.image_material("2haxe", "metal"),
 	add_name = " (#COMBAT#)",
 	display = "/", color=colors.SLATE,
 	encumber = 3,
@@ -34,7 +34,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_BATTLEAXE",
-	name = "iron battleaxe", image = "object/2haxe_iron.png",
+	name = "iron battleaxe",
 	level_range = {1, 10},
 	require = { stat = { str=11 }, },
 	cost = 5,
@@ -48,7 +48,7 @@ newEntity{ base = "BASE_BATTLEAXE",
 }
 
 newEntity{ base = "BASE_BATTLEAXE",
-	name = "steel battleaxe", image = "object/2haxe_steel.png",
+	name = "steel battleaxe",
 	level_range = {10, 20},
 	require = { stat = { str=16 }, },
 	cost = 10,
@@ -62,7 +62,7 @@ newEntity{ base = "BASE_BATTLEAXE",
 }
 
 newEntity{ base = "BASE_BATTLEAXE",
-	name = "dwarven-steel battleaxe", image = "object/2haxe_dsteel.png",
+	name = "dwarven-steel battleaxe",
 	level_range = {20, 30},
 	require = { stat = { str=24 }, },
 	cost = 15,
@@ -76,7 +76,7 @@ newEntity{ base = "BASE_BATTLEAXE",
 }
 
 newEntity{ base = "BASE_BATTLEAXE",
-	name = "galvorn battleaxe", image = "object/2haxe_galvorn.png",
+	name = "galvorn battleaxe",
 	level_range = {30, 40},
 	require = { stat = { str=35 }, },
 	cost = 25,
@@ -90,7 +90,7 @@ newEntity{ base = "BASE_BATTLEAXE",
 }
 
 newEntity{ base = "BASE_BATTLEAXE",
-	name = "mithril battleaxe", image = "object/2haxe_mithril.png",
+	name = "mithril battleaxe",
 	level_range = {40, 50},
 	require = { stat = { str=48 }, },
 	cost = 35,

game/modules/tome/data/general/objects/2hmaces.lua

@@ -23,7 +23,7 @@ newEntity{
 	slot_forbid = "OFFHAND",
 	type = "weapon", subtype="greatmaul",
 	add_name = " (#COMBAT#)",
-	display = "\\", color=colors.SLATE,
+	display = "\\", color=colors.SLATE, image = resolvers.image_material("2hmace", "metal"),
 	encumber = 5,
 	rarity = 5,
 	metallic = true,
@@ -34,7 +34,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_GREATMAUL",
-	name = "iron greatmaul", image = "object/2hmace_iron.png",
+	name = "iron greatmaul",
 	level_range = {1, 10},
 	require = { stat = { str=11 }, },
 	cost = 5,
@@ -48,7 +48,7 @@ newEntity{ base = "BASE_GREATMAUL",
 }
 
 newEntity{ base = "BASE_GREATMAUL",
-	name = "steel greatmaul", image = "object/2hmace_steel.png",
+	name = "steel greatmaul",
 	level_range = {10, 20},
 	require = { stat = { str=16 }, },
 	cost = 10,
@@ -62,7 +62,7 @@ newEntity{ base = "BASE_GREATMAUL",
 }
 
 newEntity{ base = "BASE_GREATMAUL",
-	name = "dwarven-steel greatmaul", image = "object/2hmace_dsteel.png",
+	name = "dwarven-steel greatmaul",
 	level_range = {20, 30},
 	require = { stat = { str=24 }, },
 	cost = 15,
@@ -76,7 +76,7 @@ newEntity{ base = "BASE_GREATMAUL",
 }
 
 newEntity{ base = "BASE_GREATMAUL",
-	name = "galvorn greatmaul", image = "object/2hmace_galvorn.png",
+	name = "galvorn greatmaul",
 	level_range = {30, 40},
 	require = { stat = { str=35 }, },
 	cost = 25,
@@ -90,7 +90,7 @@ newEntity{ base = "BASE_GREATMAUL",
 }
 
 newEntity{ base = "BASE_GREATMAUL",
-	name = "mithril greatmaul", image = "object/2hmace_mithril.png",
+	name = "mithril greatmaul",
 	level_range = {40, 50},
 	require = { stat = { str=48 }, },
 	cost = 35,

game/modules/tome/data/general/objects/2hswords.lua

@@ -23,7 +23,7 @@ newEntity{
 	slot_forbid = "OFFHAND",
 	type = "weapon", subtype="greatsword",
 	add_name = " (#COMBAT#)",
-	display = "/", color=colors.SLATE,
+	display = "/", color=colors.SLATE, image = resolvers.image_material("2hsword", "metal"),
 	encumber = 3,
 	rarity = 5,
 	combat = { talented = "sword", damrange = 1.6, sound = "actions/melee", sound_miss = "actions/melee_miss", },
@@ -34,7 +34,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_GREATSWORD",
-	name = "iron greatsword", image = "object/2hsword_iron.png",
+	name = "iron greatsword",
 	level_range = {1, 10},
 	require = { stat = { str=11 }, },
 	cost = 5,
@@ -47,7 +47,7 @@ newEntity{ base = "BASE_GREATSWORD",
 	},
 }
 
-newEntity{ base = "BASE_GREATSWORD", image = "object/2hsword_dsteel.png",
+newEntity{ base = "BASE_GREATSWORD",
 	name = "steel greatsword",
 	level_range = {10, 20},
 	require = { stat = { str=16 }, },
@@ -62,7 +62,7 @@ newEntity{ base = "BASE_GREATSWORD", image = "object/2hsword_dsteel.png",
 }
 
 newEntity{ base = "BASE_GREATSWORD",
-	name = "dwarven-steel greatsword", image = "object/2hsword_dsteel.png",
+	name = "dwarven-steel greatsword",
 	level_range = {20, 30},
 	require = { stat = { str=24 }, },
 	cost = 15,
@@ -76,7 +76,7 @@ newEntity{ base = "BASE_GREATSWORD",
 }
 
 newEntity{ base = "BASE_GREATSWORD",
-	name = "galvorn greatsword", image = "object/2hsword_galvorn.png",
+	name = "galvorn greatsword",
 	level_range = {30, 40},
 	require = { stat = { str=35 }, },
 	cost = 25,
@@ -90,7 +90,7 @@ newEntity{ base = "BASE_GREATSWORD",
 }
 
 newEntity{ base = "BASE_GREATSWORD",
-	name = "mithril greatsword", image = "object/2hsword_mithril.png",
+	name = "mithril greatsword",
 	level_range = {40, 50},
 	require = { stat = { str=48 }, },
 	cost = 35,

game/modules/tome/data/general/objects/axes.lua

@@ -22,7 +22,7 @@ newEntity{
 	slot = "MAINHAND",
 	type = "weapon", subtype="waraxe",
 	add_name = " (#COMBAT#)",
-	display = "/", color=colors.SLATE,
+	display = "/", color=colors.SLATE, image = resolvers.image_material("axe", "metal"),
 	encumber = 3,
 	rarity = 3,
 	metallic = true,
@@ -32,7 +32,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_WARAXE",
-	name = "iron waraxe", image = "object/axe_iron.png",
+	name = "iron waraxe",
 	level_range = {1, 10},
 	require = { stat = { str=11 }, },
 	cost = 5,
@@ -46,7 +46,7 @@ newEntity{ base = "BASE_WARAXE",
 }
 
 newEntity{ base = "BASE_WARAXE",
-	name = "steel waraxe", image = "object/axe_steel.png",
+	name = "steel waraxe",
 	level_range = {10, 20},
 	require = { stat = { str=16 }, },
 	cost = 10,
@@ -60,7 +60,7 @@ newEntity{ base = "BASE_WARAXE",
 }
 
 newEntity{ base = "BASE_WARAXE",
-	name = "dwarven-steel waraxe", image = "object/axe_dsteel.png",
+	name = "dwarven-steel waraxe",
 	level_range = {20, 30},
 	require = { stat = { str=24 }, },
 	cost = 15,
@@ -74,7 +74,7 @@ newEntity{ base = "BASE_WARAXE",
 }
 
 newEntity{ base = "BASE_WARAXE",
-	name = "galvorn waraxe", image = "object/axe_galvorn.png",
+	name = "galvorn waraxe",
 	level_range = {30, 40},
 	require = { stat = { str=35 }, },
 	cost = 25,
@@ -88,7 +88,7 @@ newEntity{ base = "BASE_WARAXE",
 }
 
 newEntity{ base = "BASE_WARAXE",
-	name = "mithril waraxe", image = "object/axe_mithril.png",
+	name = "mithril waraxe",
 	level_range = {40, 50},
 	require = { stat = { str=48 }, },
 	cost = 35,

game/modules/tome/data/general/objects/bows.lua

@@ -22,7 +22,7 @@ newEntity{
 	slot = "MAINHAND",
 	slot_forbid = "OFFHAND",
 	type = "weapon", subtype="longbow",
-	display = "}", color=colors.UMBER,
+	display = "}", color=colors.UMBER, image = resolvers.image_material("longbow", "wood"),
 	encumber = 4,
 	rarity = 5,
 	combat = { talented = "bow", damrange = 1.4, sound = "actions/arrow", sound_miss = "actions/arrow",},
@@ -32,7 +32,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_LONGBOW",
-	name = "elm longbow", image = "object/longbow_elm.png",
+	name = "elm longbow",
 	level_range = {1, 10},
 	require = { stat = { dex=11 }, },
 	cost = 5,
@@ -44,7 +44,7 @@ newEntity{ base = "BASE_LONGBOW",
 }
 
 newEntity{ base = "BASE_LONGBOW",
-	name = "ash longbow", image = "object/longbow_ash.png",
+	name = "ash longbow",
 	level_range = {10, 20},
 	require = { stat = { dex=16 }, },
 	cost = 10,
@@ -56,7 +56,7 @@ newEntity{ base = "BASE_LONGBOW",
 }
 
 newEntity{ base = "BASE_LONGBOW",
-	name = "yew longbow", image = "object/longbow_yew.png",
+	name = "yew longbow",
 	level_range = {20, 30},
 	require = { stat = { dex=24 }, },
 	cost = 15,
@@ -68,7 +68,7 @@ newEntity{ base = "BASE_LONGBOW",
 }
 
 newEntity{ base = "BASE_LONGBOW",
-	name = "elven-wood longbow", image = "object/longbow_elvenyew.png",
+	name = "elven-wood longbow",
 	level_range = {30, 40},
 	require = { stat = { dex=35 }, },
 	cost = 25,
@@ -80,7 +80,7 @@ newEntity{ base = "BASE_LONGBOW",
 }
 
 newEntity{ base = "BASE_LONGBOW",
-	name = "dragonbone longbow", image = "object/longbow_dragonbone.png",
+	name = "dragonbone longbow",
 	level_range = {40, 50},
 	require = { stat = { dex=48 }, },
 	cost = 35,
@@ -98,7 +98,7 @@ newEntity{
 	slot = "QUIVER",
 	type = "ammo", subtype="arrow",
 	add_name = " (#COMBAT#)",
-	display = "{", color=colors.UMBER,
+	display = "{", color=colors.UMBER, image = resolvers.image_material("arrow", "wood"),
 	encumber = 0.03,
 	rarity = 5,
 	combat = { talented = "bow", damrange = 1.4},
@@ -110,7 +110,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_ARROW",
-	name = "elm arrow", image = "object/arrow_elm.png",
+	name = "elm arrow",
 	level_range = {1, 10},
 	require = { stat = { dex=11 }, },
 	cost = 0.05,
@@ -124,7 +124,7 @@ newEntity{ base = "BASE_ARROW",
 }
 
 newEntity{ base = "BASE_ARROW",
-	name = "ash arrow", image = "object/arrow_ash.png",
+	name = "ash arrow",
 	level_range = {10, 20},
 	require = { stat = { dex=16 }, },
 	cost = 0.1,
@@ -138,7 +138,7 @@ newEntity{ base = "BASE_ARROW",
 }
 
 newEntity{ base = "BASE_ARROW",
-	name = "yew arrow", image = "object/arrow_yew.png",
+	name = "yew arrow",
 	level_range = {20, 30},
 	require = { stat = { dex=24 }, },
 	cost = 0.15,
@@ -152,7 +152,7 @@ newEntity{ base = "BASE_ARROW",
 }
 
 newEntity{ base = "BASE_ARROW",
-	name = "elven-wood arrow", image = "object/arrow_elvenyew.png",
+	name = "elven-wood arrow",
 	level_range = {30, 40},
 	require = { stat = { dex=35 }, },
 	cost = 0.25,
@@ -166,7 +166,7 @@ newEntity{ base = "BASE_ARROW",
 }
 
 newEntity{ base = "BASE_ARROW",
-	name = "dragonbone arrow", image = "object/arrow_dragonbone.png",
+	name = "dragonbone arrow",
 	level_range = {40, 50},
 	require = { stat = { dex=48 }, },
 	cost = 0.35,

game/modules/tome/data/general/objects/cloth-armors.lua

@@ -22,7 +22,7 @@ newEntity{
 	slot = "BODY",
 	type = "armor", subtype="cloth",
 	add_name = " (#ARMOR#)",
-	display = "[", color=colors.SLATE,
+	display = "[", color=colors.SLATE, image = resolvers.image_material("robe", "cloth"),
 	encumber = 2,
 	rarity = 5,
 	desc = [[A cloth vestment. It offers no intrinsic protection but can be enchanted.]],
@@ -30,21 +30,21 @@ newEntity{
 }
 
 newEntity{ base = "BASE_CLOTH_ARMOR",
-	name = "linen robe", image = "object/robe_linen.png",
+	name = "linen robe",
 	level_range = {1, 10},
 	cost = 0.5,
 	material_level = 1,
 }
 
 newEntity{ base = "BASE_CLOTH_ARMOR",
-	name = "woollen robe", image = "object/robe_woolen.png",
+	name = "woollen robe",
 	level_range = {10, 20},
 	cost = 1.5,
 	material_level = 2,
 }
 
 newEntity{ base = "BASE_CLOTH_ARMOR",
-	name = "cashmere robe", image = "object/robe_cashmere.png",
+	name = "cashmere robe",
 	level_range = {20, 30},
 	cost = 2.5,
 	material_level = 3,
@@ -52,7 +52,7 @@ newEntity{ base = "BASE_CLOTH_ARMOR",
 }
 
 newEntity{ base = "BASE_CLOTH_ARMOR",
-	name = "silk robe", image = "object/robe_silk.png",
+	name = "silk robe",
 	level_range = {30, 40},
 	cost = 3.5,
 	material_level = 4,
@@ -60,7 +60,7 @@ newEntity{ base = "BASE_CLOTH_ARMOR",
 }
 
 newEntity{ base = "BASE_CLOTH_ARMOR",
-	name = "elven-silk robe", image = "object/robe_elvensilk.png",
+	name = "elven-silk robe",
 	level_range = {40, 50},
 	cost = 5.5,
 	material_level = 5,

game/modules/tome/data/general/objects/heavy-armors.lua

@@ -22,7 +22,7 @@ local Talents = require "engine.interface.ActorTalents"
 newEntity{
 	define_as = "BASE_HEAVY_ARMOR",
 	slot = "BODY",
-	type = "armor", subtype="heavy",
+	type = "armor", subtype="heavy", image = resolvers.image_material("mail", "metal"),
 	add_name = " (#ARMOR#)",
 	display = "[", color=colors.SLATE,
 	require = { talent = { Talents.T_HEAVY_ARMOUR_TRAINING }, },
@@ -34,7 +34,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_HEAVY_ARMOR",
-	name = "iron mail armour", image = "object/mail_iron.png",
+	name = "iron mail armour",
 	level_range = {1, 10},
 	require = { stat = { str=14 }, },
 	cost = 20,
@@ -47,7 +47,7 @@ newEntity{ base = "BASE_HEAVY_ARMOR",
 }
 
 newEntity{ base = "BASE_HEAVY_ARMOR",
-	name = "steel mail armour", image = "object/mail_steel.png",
+	name = "steel mail armour",
 	level_range = {10, 20},
 	require = { stat = { str=20 }, },
 	cost = 25,
@@ -60,7 +60,7 @@ newEntity{ base = "BASE_HEAVY_ARMOR",
 }
 
 newEntity{ base = "BASE_HEAVY_ARMOR",
-	name = "dwarven-steel mail armour", image = "object/mail_dsteel.png",
+	name = "dwarven-steel mail armour",
 	level_range = {20, 30},
 	require = { stat = { str=28 }, },
 	cost = 30,
@@ -73,7 +73,7 @@ newEntity{ base = "BASE_HEAVY_ARMOR",
 }
 
 newEntity{ base = "BASE_HEAVY_ARMOR",
-	name = "galvorn mail armour", image = "object/mail_galvorn.png",
+	name = "galvorn mail armour",
 	level_range = {30, 40},
 	cost = 40,
 	material_level = 4,
@@ -86,7 +86,7 @@ newEntity{ base = "BASE_HEAVY_ARMOR",
 }
 
 newEntity{ base = "BASE_HEAVY_ARMOR",
-	name = "mithril mail armour", image = "object/mail_mithril.png",
+	name = "mithril mail armour",
 	level_range = {40, 50},
 	require = { stat = { str=48 }, },
 	cost = 50,

game/modules/tome/data/general/objects/heavy-boots.lua

@@ -22,7 +22,7 @@ local Talents = require "engine.interface.ActorTalents"
 newEntity{
 	define_as = "BASE_HEAVY_BOOTS",
 	slot = "FEET",
-	type = "armor", subtype="feet",
+	type = "armor", subtype="feet", image = resolvers.image_material("hboots", "metal"),
 	add_name = " (#ARMOR#)",
 	display = "]", color=colors.SLATE,
 	require = { talent = { Talents.T_HEAVY_ARMOUR_TRAINING }, },

game/modules/tome/data/general/objects/helms.lua

@@ -24,7 +24,7 @@ newEntity{
 	slot = "HEAD",
 	type = "armor", subtype="head",
 	add_name = " (#ARMOR#)",
-	display = "]", color=colors.SLATE,
+	display = "]", color=colors.SLATE, image = resolvers.image_material("helm", "metal"),
 	require = { talent = { Talents.T_HEAVY_ARMOUR_TRAINING }, },
 	encumber = 3,
 	rarity = 7,

game/modules/tome/data/general/objects/jewelry.lua

@@ -20,7 +20,7 @@
 newEntity{
 	define_as = "BASE_RING",
 	slot = "FINGER",
-	type = "jewelry", subtype="ring",
+	type = "jewelry", subtype="ring", image = resolvers.image_material("ring", {"copper", "steel", "gold", "galvorn", "mithril"}),
 	display = "=",
 	encumber = 0.1,
 	rarity = 6,
@@ -31,7 +31,7 @@ newEntity{
 newEntity{
 	define_as = "BASE_AMULET",
 	slot = "NECK",
-	type = "jewelry", subtype="amulet",
+	type = "jewelry", subtype="amulet", image = resolvers.image_material("amulet", {"copper", "steel", "gold", "galvorn", "mithril"}),
 	display = '"',
 	encumber = 0.1,
 	rarity = 8,

game/modules/tome/data/general/objects/knifes.lua

@@ -22,7 +22,7 @@ newEntity{
 	slot = "MAINHAND", offslot = "OFFHAND",
 	type = "weapon", subtype="dagger",
 	add_name = " (#COMBAT#)",
-	display = "/", color=colors.WHITE,
+	display = "/", color=colors.WHITE, image = resolvers.image_material("knife", "metal"),
 	encumber = 1,
 	rarity = 5,
 	metallic = true,

game/modules/tome/data/general/objects/leather-boots.lua

@@ -22,7 +22,7 @@ newEntity{
 	slot = "FEET",
 	type = "armor", subtype="feet",
 	add_name = " (#ARMOR#)",
-	display = "]", color=colors.UMBER,
+	display = "]", color=colors.UMBER, image = resolvers.image_material("boots", "leather"),
 	encumber = 2,
 	rarity = 6,
 	desc = [[A pair of boots made of leather.]],

game/modules/tome/data/general/objects/leather-caps.lua

@@ -22,7 +22,7 @@ newEntity{
 	slot = "HEAD",
 	type = "armor", subtype="head",
 	add_name = " (#ARMOR#)",
-	display = "]", color=colors.UMBER,
+	display = "]", color=colors.UMBER, image = resolvers.image_material("cap", "leather"),
 	encumber = 2,
 	rarity = 6,
 	desc = [[A cap made of leather.]],

game/modules/tome/data/general/objects/light-armors.lua

@@ -22,7 +22,7 @@ newEntity{
 	slot = "BODY",
 	type = "armor", subtype="light",
 	add_name = " (#ARMOR#)",
-	display = "[", color=colors.SLATE,
+	display = "[", color=colors.SLATE, image = resolvers.image_material("leather", "leather"),
 	encumber = 17,
 	rarity = 5,
 	desc = [[A suit of armour made of leather.]],

game/modules/tome/data/general/objects/lites.lua

@@ -20,7 +20,7 @@
 newEntity{
 	define_as = "BASE_LITE",
 	slot = "LITE",
-	type = "lite", subtype="lite",
+	type = "lite", subtype="lite", image = resolvers.image_material("lite", {"brass","","dwarven","","faenorian"}),
 	display = "~",
 	desc = [[Lite up the dark places of the world!]],
 	egos = "/data/general/objects/egos/lite.lua", egos_chance = { prefix=resolvers.mbonus(15, 3), suffix=resolvers.mbonus(15, 3) },