diff --git a/game/modules/tome/data/general/objects/2htridents.lua b/game/modules/tome/data/general/objects/2htridents.lua
index 912d9122a460638f31f1bc14931efd7bf3869e0f..74cf7f91d73aa88bea9e40e21f314c555b6b1a17 100644
--- a/game/modules/tome/data/general/objects/2htridents.lua
+++ b/game/modules/tome/data/general/objects/2htridents.lua
@@ -21,7 +21,7 @@ newEntity{
define_as = "BASE_TRIDENT",
slot = "MAINHAND",
slot_forbid = "OFFHAND",
- type = "weapon", subtype="trident", image = resolvers.image_material("2htrident", "sea-metal"),
+ type = "weapon", subtype="trident", image = resolvers.image_material("trident", "sea-metal"),
add_name = " (#COMBAT#)",
display = "|", color=colors.AQUAMARINE,
encumber = 3,
diff --git a/game/modules/tome/data/general/objects/gem.lua b/game/modules/tome/data/general/objects/gem.lua
index 984b5b6283c45909ece544c9d0abb955c98bbfc8..c97ae572493566dcfdd97d558eb272afdec74d19 100644
--- a/game/modules/tome/data/general/objects/gem.lua
+++ b/game/modules/tome/data/general/objects/gem.lua
@@ -75,35 +75,35 @@ newGem("Ruby", "object/ruby.png", 4, 16, "red", 30, 40, 4, 65,
{ inc_stats = { [Stats.STAT_STR] = 4, [Stats.STAT_DEX] = 4, [Stats.STAT_MAG] = 4, [Stats.STAT_WIL] = 4, [Stats.STAT_CUN] = 4, [Stats.STAT_CUN] = 4, } },
{ power=20 }
)
-newGem("Amber", "object/.png", 4, 16, "yellow", 30, 40, 4, 65,
+newGem("Amber", "object/amber.png", 4, 16, "yellow", 30, 40, 4, 65,
{ inc_damage = {all=8} },
{ stun={chance=10, dur=2} }
)
-newGem("Turquoise", "object/.png",4, 16, "green", 30, 40, 4, 65,
+newGem("Turquoise", "object/turquoise.png",4, 16, "green", 30, 40, 4, 65,
{ see_invisible=10 },
{ splash={type="ACID", dam=30} }
)
-newGem("Jade", "object/.png", 4, 16, "green", 30, 40, 4, 65,
+newGem("Jade", "object/jade.png", 4, 16, "green", 30, 40, 4, 65,
{ resists = {all=8} },
{ splash={type="SLOW", dam=-1 + 1 / (1 + 0.20)} }
)
-newGem("Sapphire", "object/.png",4, 16, "blue", 30, 40, 4, 65,
+newGem("Sapphire", "object/garnet.png",4, 16, "blue", 30, 40, 4, 65,
{ combat_def=8 },
{ splash={type="ICE", dam=30} }
)
-newGem("Quartz", "object/.png",3, 12, "white", 20, 30, 3, 50,
+newGem("Quartz", "object/quartz.png",3, 12, "white", 20, 30, 3, 50,
{ stun_immune=0.3 },
{ splash={type="SPELLKNOCKBACK", dam=10} }
)
-newGem("Emerald", "object/.png",3, 12, "green", 20, 30, 3, 50,
+newGem("Emerald", "object/emerald.png",3, 12, "green", 20, 30, 3, 50,
{ resists = {all=6} },
{ splash={type="POISON", dam=50} }
)
-newGem("Lapis Lazuli", "object/.png",3, 12, "blue", 20, 30, 3, 50,
+newGem("Lapis Lazuli", "object/lapis_lazuli.png",3, 12, "blue", 20, 30, 3, 50,
{ combat_def=6 },
{ mana=30 }
)
-newGem("Garnets", "object/.png",3, 12, "red", 20, 30, 3, 50,
+newGem("Garnets", "object/garnet.png",3, 12, "red", 20, 30, 3, 50,
{ inc_damage = {all=6} },
{ leech=5 }
)
diff --git a/game/modules/tome/data/general/objects/money.lua b/game/modules/tome/data/general/objects/money.lua
index 9cf87aa5fe195409995eb0dfbb8a8d539e2ad0c4..c742152a381c2ccb314c9983233d43bac8397d34 100644
--- a/game/modules/tome/data/general/objects/money.lua
+++ b/game/modules/tome/data/general/objects/money.lua
@@ -41,14 +41,14 @@ newEntity{
}
newEntity{ base = "BASE_MONEY", define_as = "MONEY_SMALL",
- name = "gold pieces",
+ name = "gold pieces", image = "object/money_small.png",
add_name = " (#MONEY#)",
level_range = {1, 50},
money_value = resolvers.rngavg(1, 5),
}
newEntity{ base = "BASE_MONEY", define_as = "MONEY_BIG",
- name = "huge pile of gold pieces",
+ name = "huge pile of gold pieces", image = "object/money_large.png",
add_name = " (#MONEY#)",
level_range = {30, 50},
color=colors.GOLD,
diff --git a/game/modules/tome/data/general/objects/wizard-hat.lua b/game/modules/tome/data/general/objects/wizard-hat.lua
index e4f8484ba2f211f9d413d7f1302f2705ebadff15..2a0919af1bb5cc209d2972a5eba7517826f7b263 100644
--- a/game/modules/tome/data/general/objects/wizard-hat.lua
+++ b/game/modules/tome/data/general/objects/wizard-hat.lua
@@ -22,7 +22,7 @@ newEntity{
slot = "HEAD",
type = "armor", subtype="head",
add_name = " (#ARMOR#)",
- display = "]", color=colors.BLUE,
+ display = "]", color=colors.BLUE, image = resolvers.image_material("wizardhat", "cloth"),
encumber = 2,
rarity = 6,
desc = [[A pointy cloth hat, very wizardly...]],
diff --git a/game/modules/tome/data/gfx/object/2hsword_mithril.png b/game/modules/tome/data/gfx/object/2hsword_mithril.png
index 8f57a228cd597c4ccbe683d3757b2996ca118528..05d7d5f366df554e8ddd2e083fbedba5a90b774d 100644
Binary files a/game/modules/tome/data/gfx/object/2hsword_mithril.png and b/game/modules/tome/data/gfx/object/2hsword_mithril.png differ
diff --git a/game/modules/tome/data/gfx/object/amber.png b/game/modules/tome/data/gfx/object/amber.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccc03aa6e90f4573312aea53d82b9003dcfa7963
Binary files /dev/null and b/game/modules/tome/data/gfx/object/amber.png differ
diff --git a/game/modules/tome/data/gfx/object/bloodstone.png b/game/modules/tome/data/gfx/object/bloodstone.png
index dfc356562a163fc824c5101084d84681022d3b6d..4a58e823b527f9ac49be4d58dbc370117d6120f3 100644
Binary files a/game/modules/tome/data/gfx/object/bloodstone.png and b/game/modules/tome/data/gfx/object/bloodstone.png differ
diff --git a/game/modules/tome/data/gfx/object/boots_drakeskin.png b/game/modules/tome/data/gfx/object/boots_drakeskin.png
index 20a649460b2a97d9a38f34d6c868f8d99dba22bb..fa3553d56179e505da23fd79e8113edfbee29420 100644
Binary files a/game/modules/tome/data/gfx/object/boots_drakeskin.png and b/game/modules/tome/data/gfx/object/boots_drakeskin.png differ
diff --git a/game/modules/tome/data/gfx/object/cap_drakeskin.png b/game/modules/tome/data/gfx/object/cap_drakeskin.png
index 4806117871816262d24ca971176890a98eab8ae0..1adfe296575279974d25cd906a369072047c2bae 100644
Binary files a/game/modules/tome/data/gfx/object/cap_drakeskin.png and b/game/modules/tome/data/gfx/object/cap_drakeskin.png differ
diff --git a/game/modules/tome/data/gfx/object/emerald.png b/game/modules/tome/data/gfx/object/emerald.png
new file mode 100644
index 0000000000000000000000000000000000000000..11b9d3cee0112714592409c4cc49dfc336d4bb8d
Binary files /dev/null and b/game/modules/tome/data/gfx/object/emerald.png differ
diff --git a/game/modules/tome/data/gfx/object/garnet.png b/game/modules/tome/data/gfx/object/garnet.png
new file mode 100644
index 0000000000000000000000000000000000000000..986060717050c9ce477ea7427dae6f104222b3c2
Binary files /dev/null and b/game/modules/tome/data/gfx/object/garnet.png differ
diff --git a/game/modules/tome/data/gfx/object/jade.png b/game/modules/tome/data/gfx/object/jade.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c0a1ebd20aaa14f3df34c6734242c640b794775
Binary files /dev/null and b/game/modules/tome/data/gfx/object/jade.png differ
diff --git a/game/modules/tome/data/gfx/object/lapis_lazuli.png b/game/modules/tome/data/gfx/object/lapis_lazuli.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec277eba3c03160a1ca78019115ec4a528fe1cdf
Binary files /dev/null and b/game/modules/tome/data/gfx/object/lapis_lazuli.png differ
diff --git a/game/modules/tome/data/gfx/object/money_large.png b/game/modules/tome/data/gfx/object/money_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f85bd9a7f7a4264745eb7eb07c0c53a1700f428
Binary files /dev/null and b/game/modules/tome/data/gfx/object/money_large.png differ
diff --git a/game/modules/tome/data/gfx/object/money_small.png b/game/modules/tome/data/gfx/object/money_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b1a379595d3581db27e99a8cbb9e898887e9a13
Binary files /dev/null and b/game/modules/tome/data/gfx/object/money_small.png differ
diff --git a/game/modules/tome/data/gfx/object/quartz.png b/game/modules/tome/data/gfx/object/quartz.png
new file mode 100644
index 0000000000000000000000000000000000000000..4891547300763c76e0ee56ad0aa0ac0e291d737e
Binary files /dev/null and b/game/modules/tome/data/gfx/object/quartz.png differ
diff --git a/game/modules/tome/data/gfx/object/sapphire.png b/game/modules/tome/data/gfx/object/sapphire.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bb494b08048ec89bf18af27d761b1b6a61b4697
Binary files /dev/null and b/game/modules/tome/data/gfx/object/sapphire.png differ
diff --git a/game/modules/tome/data/gfx/object/trident_bluesteel.png b/game/modules/tome/data/gfx/object/trident_bluesteel.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7a3eadb437ca942b1d3cdbc06175b2f8c1764e7
Binary files /dev/null and b/game/modules/tome/data/gfx/object/trident_bluesteel.png differ
diff --git a/game/modules/tome/data/gfx/object/trident_coral.png b/game/modules/tome/data/gfx/object/trident_coral.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d6984a82b2c9399770e610b91bd0991cf2989d1
Binary files /dev/null and b/game/modules/tome/data/gfx/object/trident_coral.png differ
diff --git a/game/modules/tome/data/gfx/object/trident_deepsteel.png b/game/modules/tome/data/gfx/object/trident_deepsteel.png
new file mode 100644
index 0000000000000000000000000000000000000000..a773094bf1b7db9533833b6a643135cbb610ee66
Binary files /dev/null and b/game/modules/tome/data/gfx/object/trident_deepsteel.png differ
diff --git a/game/modules/tome/data/gfx/object/trident_orihalcum.png b/game/modules/tome/data/gfx/object/trident_orihalcum.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a424cf17bc669029050235b4051616d81ea9761
Binary files /dev/null and b/game/modules/tome/data/gfx/object/trident_orihalcum.png differ
diff --git a/game/modules/tome/data/gfx/object/trident_orite.png b/game/modules/tome/data/gfx/object/trident_orite.png
new file mode 100644
index 0000000000000000000000000000000000000000..07944959150e821b67cef5b5d11a93534d51b0bf
Binary files /dev/null and b/game/modules/tome/data/gfx/object/trident_orite.png differ
diff --git a/game/modules/tome/data/gfx/object/turquoise.png b/game/modules/tome/data/gfx/object/turquoise.png
new file mode 100644
index 0000000000000000000000000000000000000000..64f2b5706738c24cbc92d1ec36c718f8e4626a5a
Binary files /dev/null and b/game/modules/tome/data/gfx/object/turquoise.png differ
diff --git a/game/modules/tome/data/gfx/object/wizardhat_cashmere.png b/game/modules/tome/data/gfx/object/wizardhat_cashmere.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebbb23c6f936fa37b07be84ead5c7d2a6168179e
Binary files /dev/null and b/game/modules/tome/data/gfx/object/wizardhat_cashmere.png differ
diff --git a/game/modules/tome/data/gfx/object/wizardhat_elvensilk.png b/game/modules/tome/data/gfx/object/wizardhat_elvensilk.png
new file mode 100644
index 0000000000000000000000000000000000000000..7219184eb7b68ab7ccb8096e0da804867c0b0dd8
Binary files /dev/null and b/game/modules/tome/data/gfx/object/wizardhat_elvensilk.png differ
diff --git a/game/modules/tome/data/gfx/object/wizardhat_linen.png b/game/modules/tome/data/gfx/object/wizardhat_linen.png
new file mode 100644
index 0000000000000000000000000000000000000000..55f2bf31b26553f91813bf531256062f734041a1
Binary files /dev/null and b/game/modules/tome/data/gfx/object/wizardhat_linen.png differ
diff --git a/game/modules/tome/resolvers.lua b/game/modules/tome/resolvers.lua
index 2ab3aaa7d04e4fce19931e6553be84e7c5a8d7b3..819439a73d90566538212178077159a278edd25f 100644
--- a/game/modules/tome/resolvers.lua
+++ b/game/modules/tome/resolvers.lua
@@ -213,7 +213,7 @@ function resolvers.image_material(image, values)
end
function resolvers.calc.image_material(t, e)
if not t[2] or (type(t[2]) == "string" and t[2] == "metal") then t[2] = {"iron", "steel", "dsteel", "galvorn", "mithril"} end
- if type(t[2]) == "string" and t[2] == "sea-metal" then t[2] = {"coral", "blue-steel", "deep-steel", "orite", "orichalcum"} end
+ if type(t[2]) == "string" and t[2] == "sea-metal" then t[2] = {"coral", "bluesteel", "deepsteel", "orite", "orichalcum"} end
if type(t[2]) == "string" and t[2] == "leather" then t[2] = {"rough", "cured", "hardened", "reinforced", "drakeskin"} end
if type(t[2]) == "string" and t[2] == "wood" then t[2] = {"elm","ash","yew","elvenwood","dragonbone"} end
if type(t[2]) == "string" and t[2] == "cloth" then t[2] = {"linen","woolen","cashmere","silk","elvensilk"} end