diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index abb9501e78c313bf0c5acbdd151460dc675401e6..d03f4acd3086bcdf0f1651d9c37b2d290c41993d 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -823,6 +823,8 @@ function _M:incMoney(v)
world:gainAchievement("TREASURE_HUNTER", self)
world:gainAchievement("TREASURE_HOARDER", self)
world:gainAchievement("DRAGON_GREED", self)
+ if v >= 0 then game:playSound("actions/coins")
+ else game:playSound("actions/coins_less") end
end
end
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 71be2483f6b14c6742cc160852b1684b317118e8..529071255eafa218728dd141fd580f5a22a07311 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -1012,6 +1012,7 @@ function _M:on_pickup_object(o)
if self:attr("auto_id") and o:getPowerRank() <= self.auto_id then
o:identify(true)
end
+ if o.pickup_sound then game:playSound(o.pickup_sound) end
end
--- Tell us when we are targeted
diff --git a/game/modules/tome/data/general/npcs/lich.lua b/game/modules/tome/data/general/npcs/lich.lua
index e29453d38932195d71242258e258522d15aca64a..68a9ffe221ec07f1ae634dd77f3d468749c90c4e 100644
--- a/game/modules/tome/data/general/npcs/lich.lua
+++ b/game/modules/tome/data/general/npcs/lich.lua
@@ -103,6 +103,7 @@ newEntity{ base = "BASE_NPC_LICH",
newEntity{ base = "BASE_NPC_LICH",
name = "ancient lich", color=colors.DARK_RED,
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_lich_ancient_lich.png", display_h=2, display_y=-1}}},
desc=[[An elder being from a now-forgotten age, filled and fueled by its hate and rage toward all things living, it seeks to deprive all others of a prize it cannot have... life.]],
level_range = {40, nil}, exp_worth = 1,
rarity = 25,
@@ -136,6 +137,7 @@ newEntity{ base = "BASE_NPC_LICH",
newEntity{ base = "BASE_NPC_LICH",
name = "archlich", color=colors.SLATE,
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_lich_archlich.png", display_h=2, display_y=-1}}},
desc=[[Blacker than the deepest night, this cold cruel form of darkness approaches. Long ago it laid aside its mortality, but it has not forgotten its power; rather, its malice and hate have bent this undead entity on the destruction of all things living.]],
level_range = {45, nil}, exp_worth = 1,
rarity = 30,
diff --git a/game/modules/tome/data/general/npcs/vampire.lua b/game/modules/tome/data/general/npcs/vampire.lua
index f7ff1385312224013e7bdc7d42bc6f430a8c07b9..1add4ef128c5b6d09870a760017da6d0ad811ab9 100644
--- a/game/modules/tome/data/general/npcs/vampire.lua
+++ b/game/modules/tome/data/general/npcs/vampire.lua
@@ -90,6 +90,7 @@ newEntity{ base = "BASE_NPC_VAMPIRE",
newEntity{ base = "BASE_NPC_VAMPIRE",
name = "master vampire", color=colors.GREEN, image = "npc/master_vampire.png",
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/master_vampire.png", display_h=2, display_y=-1}}},
desc=[[It is a humanoid form dressed in robes. Power emanates from its chilling frame.]],
level_range = {23, nil}, exp_worth = 1,
rarity = 1,
diff --git a/game/modules/tome/data/general/npcs/wight.lua b/game/modules/tome/data/general/npcs/wight.lua
index 9618325343d05d8955c7312bec81b0a07c74685e..844c610d948dc2be78195a172866c1e9303f1ce7 100644
--- a/game/modules/tome/data/general/npcs/wight.lua
+++ b/game/modules/tome/data/general/npcs/wight.lua
@@ -94,6 +94,7 @@ newEntity{ base = "BASE_NPC_WIGHT",
newEntity{ base = "BASE_NPC_WIGHT",
name = "barrow wight", color=colors.LIGHT_RED, image="npc/barrow_wight.png",
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/barrow_wight.png", display_h=2, display_y=-1}}},
desc=[[It is a ghostly nightmare of an entity.]],
level_range = {25, nil}, exp_worth = 1,
rarity = 2,
@@ -107,6 +108,7 @@ newEntity{ base = "BASE_NPC_WIGHT",
newEntity{ base = "BASE_NPC_WIGHT",
name = "emperor wight", color=colors.RED, image="npc/emperor_wight.png",
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/emperor_wight.png", display_h=2, display_y=-1}}},
desc=[[Your life force is torn from your body as this powerful unearthly being approaches.]],
level_range = {30, nil}, exp_worth = 1,
rarity = 5,
diff --git a/game/modules/tome/data/general/objects/gem.lua b/game/modules/tome/data/general/objects/gem.lua
index 56c73db0a79cfd1863b0b67292189c58cf549b01..ce699d0f8ed4b580fbfbc279bfd0d91665a63377 100644
--- a/game/modules/tome/data/general/objects/gem.lua
+++ b/game/modules/tome/data/general/objects/gem.lua
@@ -26,7 +26,7 @@ newEntity{
encumber = 0,
identified = true,
stacking = true,
- auto_pickup = true,
+ auto_pickup = true, pickup_sound = "actions/gem",
desc = [[Gems can be sold for money or used in arcane rituals.]],
}
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/barrow_wight.png b/game/modules/tome/data/gfx/shockbolt/npc/barrow_wight.png
index ff0d6cebc954d13b6a07bb2fc20ed20aea9724ce..48bf798c0465f8383d8ee0b1564bfc1242344a07 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/barrow_wight.png and b/game/modules/tome/data/gfx/shockbolt/npc/barrow_wight.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/canine_ww.png b/game/modules/tome/data/gfx/shockbolt/npc/canine_ww.png
index c91ccc8f27fc73d73eee580dd1126b298cfd891a..ab68ab8890154b1f0c13c5cb2727f8633d524072 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/canine_ww.png and b/game/modules/tome/data/gfx/shockbolt/npc/canine_ww.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/dragon_cold_cold_drake_hatchling.png b/game/modules/tome/data/gfx/shockbolt/npc/dragon_cold_cold_drake_hatchling.png
index 38246c2393dd85d48c012c25bbbd0397cb350560..81bd030bde0b3dd8e856067257b7e4d8d99bc7b1 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/dragon_cold_cold_drake_hatchling.png and b/game/modules/tome/data/gfx/shockbolt/npc/dragon_cold_cold_drake_hatchling.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/dragon_multihued_multi_hued_drake_hatchling.png b/game/modules/tome/data/gfx/shockbolt/npc/dragon_multihued_multi_hued_drake_hatchling.png
index 54a507ce0f2ae96dbbe811826d33966a767088db..fc254b5ae7fff65fafe522fddb7b7bbbb0aa6692 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/dragon_multihued_multi_hued_drake_hatchling.png and b/game/modules/tome/data/gfx/shockbolt/npc/dragon_multihued_multi_hued_drake_hatchling.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/dragon_storm_storm_drake_hatchling.png b/game/modules/tome/data/gfx/shockbolt/npc/dragon_storm_storm_drake_hatchling.png
index dd59ca9be4775db2ec6b5f5aa983272166e9a5a7..38246c2393dd85d48c012c25bbbd0397cb350560 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/dragon_storm_storm_drake_hatchling.png and b/game/modules/tome/data/gfx/shockbolt/npc/dragon_storm_storm_drake_hatchling.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/emperor_wight.png b/game/modules/tome/data/gfx/shockbolt/npc/emperor_wight.png
index e7fd6493a1791b82cf5a63e742d7f82c8c33bf3b..5194a6472c529bad86de0eddf0f3e82a3ee8c54e 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/emperor_wight.png and b/game/modules/tome/data/gfx/shockbolt/npc/emperor_wight.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/forest_wight.png b/game/modules/tome/data/gfx/shockbolt/npc/forest_wight.png
index 9640c2d52a9a241c402d04d5004ed6a23b286676..a3398d61caaf22be5dfb92139942d99fdb438c33 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/forest_wight.png and b/game/modules/tome/data/gfx/shockbolt/npc/forest_wight.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/grave_wight.png b/game/modules/tome/data/gfx/shockbolt/npc/grave_wight.png
index a381c52e0a200f8068081ce0b62d499ae35e6a10..fc583a1726590111b54d3a48974a5827ce0f41bf 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/grave_wight.png and b/game/modules/tome/data/gfx/shockbolt/npc/grave_wight.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_eldritch_eye.png b/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_eldritch_eye.png
index 000974edaa8e52361e680ae2e3e9b236554d130e..e16d4117fa966edd11e54eacf11a4c328bd68580 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_eldritch_eye.png and b/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_eldritch_eye.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/master_vampire.png b/game/modules/tome/data/gfx/shockbolt/npc/master_vampire.png
index 9c2f6bfd7dd6b32956bc12b1d7a4beafb3d52b9d..9b6248d1497fbae2e5a1be687a83906471ff90ca 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/master_vampire.png and b/game/modules/tome/data/gfx/shockbolt/npc/master_vampire.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/undead_lich_ancient_lich.png b/game/modules/tome/data/gfx/shockbolt/npc/undead_lich_ancient_lich.png
index 7b61d16223dd07fc4140a1b5edb209fbdc758784..c3973b2d0b8a9061b7bf85dddaf8bdf2a41491f2 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/undead_lich_ancient_lich.png and b/game/modules/tome/data/gfx/shockbolt/npc/undead_lich_ancient_lich.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/undead_lich_archlich.png b/game/modules/tome/data/gfx/shockbolt/npc/undead_lich_archlich.png
index 55aca79695cd9ca36383db84882e93796709b0de..8f0908cc9c044be99efeb4dd11693873220bb008 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/undead_lich_archlich.png and b/game/modules/tome/data/gfx/shockbolt/npc/undead_lich_archlich.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/vampire.png b/game/modules/tome/data/gfx/shockbolt/npc/vampire.png
index cb2361434392ead8049a1864069943009c7070af..255df6c1b8f76c1cf0e20a8c3f4db53d579811ce 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/vampire.png and b/game/modules/tome/data/gfx/shockbolt/npc/vampire.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/sanguine_shield.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/sanguine_shield.png
index 0724714732de50423c9b73af70b9f1dcbbc51fda..f7071ad76ed57128a333897d3d145ad7c122ee45 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/object/artifact/sanguine_shield.png and b/game/modules/tome/data/gfx/shockbolt/object/artifact/sanguine_shield.png differ
diff --git a/game/modules/tome/data/sound/actions/arrow.lua b/game/modules/tome/data/sound/actions/arrow.lua
deleted file mode 100644
index 50875a65e6603ec960c83f73e916684bd1b0e018..0000000000000000000000000000000000000000
--- a/game/modules/tome/data/sound/actions/arrow.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-return {
- file = "actions/arrow.ogg",
- volume = 30,
-}
diff --git a/game/modules/tome/data/sound/actions/arrow.ogg b/game/modules/tome/data/sound/actions/arrow.ogg
index 8f329c2a180dd136c38c9d1620f421bf298f7af5..073e83816bdc7201c989154add620ff4ad8a042f 100644
Binary files a/game/modules/tome/data/sound/actions/arrow.ogg and b/game/modules/tome/data/sound/actions/arrow.ogg differ
diff --git a/game/modules/tome/data/sound/actions/coins.lua b/game/modules/tome/data/sound/actions/coins.lua
new file mode 100644
index 0000000000000000000000000000000000000000..9bddb3c71015b8a609e9dc81bc552cb5210290d3
--- /dev/null
+++ b/game/modules/tome/data/sound/actions/coins.lua
@@ -0,0 +1,4 @@
+return {
+ file = "actions/coins.ogg",
+ volume = 50,
+}
diff --git a/game/modules/tome/data/sound/actions/coins.ogg b/game/modules/tome/data/sound/actions/coins.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..d45cf7aac9028d8263898dda9425f901412ea36d
Binary files /dev/null and b/game/modules/tome/data/sound/actions/coins.ogg differ
diff --git a/game/modules/tome/data/sound/actions/coins_less.ogg b/game/modules/tome/data/sound/actions/coins_less.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..e22707fc15305c8fbbd877f597ae51777a082a97
Binary files /dev/null and b/game/modules/tome/data/sound/actions/coins_less.ogg differ
diff --git a/game/modules/tome/data/sound/actions/gem.ogg b/game/modules/tome/data/sound/actions/gem.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..e1c5b69088dcc0540b1a4e4b3e3241b9c9bd628c
Binary files /dev/null and b/game/modules/tome/data/sound/actions/gem.ogg differ
diff --git a/game/modules/tome/data/sound/talents/arcane.lua b/game/modules/tome/data/sound/talents/arcane.lua
deleted file mode 100644
index 47cf9ffaa92423b27955b80f54cc4297d357a5e3..0000000000000000000000000000000000000000
--- a/game/modules/tome/data/sound/talents/arcane.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-return {
- file = "talents/arcane.ogg",
- volume = 50,
-}
diff --git a/game/modules/tome/data/sound/talents/arcane.ogg b/game/modules/tome/data/sound/talents/arcane.ogg
index bbf40410756deb0459d54589892396c0c6f2d6d0..ee70612f78bdb24368a07af441226f77ef68402a 100644
Binary files a/game/modules/tome/data/sound/talents/arcane.ogg and b/game/modules/tome/data/sound/talents/arcane.ogg differ
diff --git a/game/modules/tome/data/sound/talents/devouringflame.ogg b/game/modules/tome/data/sound/talents/devouringflame.ogg
index ebe098d66ffc112cc9e8af84a8aa70ed65e2d8c7..4b1ed2086dd1e5b17fb6f74b80b335bfb8731444 100644
Binary files a/game/modules/tome/data/sound/talents/devouringflame.ogg and b/game/modules/tome/data/sound/talents/devouringflame.ogg differ
diff --git a/game/modules/tome/data/sound/talents/fire.lua b/game/modules/tome/data/sound/talents/fire.lua
deleted file mode 100644
index 9552124dbf1b3f05bacfb5fb46d1bf42ad6e7a31..0000000000000000000000000000000000000000
--- a/game/modules/tome/data/sound/talents/fire.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-return {
- file = "talents/fire.ogg",
- volume = 50,
-}
diff --git a/game/modules/tome/data/sound/talents/fire.ogg b/game/modules/tome/data/sound/talents/fire.ogg
index 321703361287e25ed06e763dad38b44ec66cc000..5e12689631daaa9eb13ce7a2b5da675e31be60a4 100644
Binary files a/game/modules/tome/data/sound/talents/fire.ogg and b/game/modules/tome/data/sound/talents/fire.ogg differ
diff --git a/game/modules/tome/data/sound/talents/teleport.ogg b/game/modules/tome/data/sound/talents/teleport.ogg
index 39fecd315f3207b4931d9d88cd52933366307bb2..cdba45443e00140695a109322a9ff40142b61e02 100644
Binary files a/game/modules/tome/data/sound/talents/teleport.ogg and b/game/modules/tome/data/sound/talents/teleport.ogg differ
diff --git a/game/modules/tome/data/talents/spells/fire.lua b/game/modules/tome/data/talents/spells/fire.lua
index 67b3b11a4eba4d383f7fce621875e48575def680..b04f135c4d6f030d7c7a8d2b2e515b0f100f6e49 100644
--- a/game/modules/tome/data/talents/spells/fire.lua
+++ b/game/modules/tome/data/talents/spells/fire.lua
@@ -205,7 +205,7 @@ newTalent{
nil, self:spellFriendlyFire()
)
- game:playSoundNear(self, "talents/fire")
+ game:playSoundNear(self, "talents/devouringflame")
return true
end,
info = function(self, t)
diff --git a/game/modules/tome/data/timed_effects/mental.lua b/game/modules/tome/data/timed_effects/mental.lua
index 1c61b56f0f47367118af7fecf74c20050858cdc6..62ed703687f8391224a89b7591c853577e0b06b5 100644
--- a/game/modules/tome/data/timed_effects/mental.lua
+++ b/game/modules/tome/data/timed_effects/mental.lua
@@ -126,6 +126,7 @@ newEffect{
self.move_others = true
self.summoner = eff.src
self.summoner_gain_exp = true
+ if self.dead then return end
game.party:addMember(self, {
control="full",
type="thrall",