diff --git a/game/engines/default/engine/Map.lua b/game/engines/default/engine/Map.lua
index ab42541bbd7e2aa948d1035b727d6f37c4df3225..2296c844e2e976818cfb2eaf5519d16641779c70 100644
--- a/game/engines/default/engine/Map.lua
+++ b/game/engines/default/engine/Map.lua
@@ -736,7 +736,7 @@ end
--- Checks the given coords to see if they are in bound
function _M:isBound(x, y)
- if x < 0 or x >= self.w or y < 0 or y >= self.h then return false end
+ if x and y and x < 0 or x >= self.w or y < 0 or y >= self.h then return false end
return true
end
diff --git a/game/engines/default/engine/interface/ActorAI.lua b/game/engines/default/engine/interface/ActorAI.lua
index 480957ea6c6ce96476fc71f0b164995ae094e794..a88c6f74fe36861b70edb9b409a0452007fb47dd 100644
--- a/game/engines/default/engine/interface/ActorAI.lua
+++ b/game/engines/default/engine/interface/ActorAI.lua
@@ -132,7 +132,7 @@ function _M:doAI()
end
function _M:runAI(ai)
- if not ai then return end
+ if not ai or not self.x then return end
return _M.ai_def[ai](self)
end
diff --git a/game/modules/tome/ai/target.lua b/game/modules/tome/ai/target.lua
index 3a60564b781e89f242b9b4089028965333b6ef11..cb99870021867cab9b4e24b5ee1caa5d3f3a6509 100644
--- a/game/modules/tome/ai/target.lua
+++ b/game/modules/tome/ai/target.lua
@@ -21,6 +21,7 @@
-- this requires the ActorFOV interface, or an interface that provides self.fov.actors*
-- This is ToME specific, overriding the engine default target_simple to account for lite, infravision, ...
newAI("target_simple", function(self)
+ if not self.x then return end
if self.ai_target.actor and not self.ai_target.actor.dead and game.level:hasEntity(self.ai_target.actor) and rng.percent(90) and not self.ai_target.actor:attr("invulnerable") then return true end
-- Find closer enemy and target it
@@ -33,7 +34,7 @@ newAI("target_simple", function(self)
act = self.fov.actors_dist[i]
-- print("AI looking for target", self.uid, self.name, "::", act.uid, act.name, self.fov.actors[act].sqdist)
-- find the closest enemy
- if act and self:reactionToward(act) < 0 and not act.dead and
+ if act and self:reactionToward(act) < 0 and not act.dead and act.x and game.level.map:isBound(act.x, act.y) and
(
-- If it has lite we can always see it
((act.lite or 0) > 0)
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_dwarf_dwarven_paddlestriker.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_dwarf_dwarven_paddlestriker.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eb89db605da97bed6005bde90c22eed17d1f6be
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_dwarf_dwarven_paddlestriker.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_greatmother.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_greatmother.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce6b9583e0bc726358d3ac9e085470fa0ca9496b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_greatmother.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/spiderkin_spider_ungole.png b/game/modules/tome/data/gfx/shockbolt/npc/spiderkin_spider_ungole.png
new file mode 100644
index 0000000000000000000000000000000000000000..10f2a2edefcfb6949bbc3c489911c321c334040d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/spiderkin_spider_ungole.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_ancient_elven_mummy.png b/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_ancient_elven_mummy.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4f80c1a8cb4251158d005203b7805696dc3d399
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_ancient_elven_mummy.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_animated_mummy_wrappings.png b/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_animated_mummy_wrappings.png
new file mode 100644
index 0000000000000000000000000000000000000000..9eaac1bbb08b0b6e0f92d29daa8be1fd004792d3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_animated_mummy_wrappings.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_greater_mummy_lord.png b/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_greater_mummy_lord.png
new file mode 100644
index 0000000000000000000000000000000000000000..42a18ce5f78e5889205e85f6bb7b6c530143081d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_greater_mummy_lord.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_rotting_mummy.png b/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_rotting_mummy.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa3d7e445b8d079b245494b4d35bb304bb270138
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/undead_mummy_rotting_mummy.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/undead_rodent_skeletal_rat.png b/game/modules/tome/data/gfx/shockbolt/npc/undead_rodent_skeletal_rat.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8dc4320c0a5a70e7baa4f7cbfdc4b98a8c48bb7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/undead_rodent_skeletal_rat.png differ
diff --git a/game/modules/tome/data/zones/ardhungol/npcs.lua b/game/modules/tome/data/zones/ardhungol/npcs.lua
index 4009f658add29484286a00dfffc174da525c1bcf..1aae9de8a60ee1374471ff9455d770feefd09fa7 100644
--- a/game/modules/tome/data/zones/ardhungol/npcs.lua
+++ b/game/modules/tome/data/zones/ardhungol/npcs.lua
@@ -26,6 +26,7 @@ local Talents = require("engine.interface.ActorTalents")
newEntity{ define_as = "UNGOLE", base = "BASE_NPC_SPIDER",
allow_infinite_dungeon = true,
name = "Ungolë", color=colors.VIOLET, unique = true,
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/spiderkin_spider_ungole.png", display_h=2, display_y=-1}}},
desc = [[A huge spider, shrouded in darkness, with red glowing eyes darting at you. She looks hungry.]],
level_range = {30, nil}, exp_worth = 2,
max_life = 450, life_rating = 15, fixed_rating = true,
diff --git a/game/modules/tome/data/zones/arena/npcs.lua b/game/modules/tome/data/zones/arena/npcs.lua
index 2fa54fbd2375c64e505da5ea7fc482a0c82b2f31..74b57f978750e98ba8d03c5143a4ad10f1f620f4 100644
--- a/game/modules/tome/data/zones/arena/npcs.lua
+++ b/game/modules/tome/data/zones/arena/npcs.lua
@@ -60,6 +60,7 @@ newEntity{ define_as = "BASE_NPC_ARENA1",
newEntity{ name = "skeletal rat",
base = "BASE_NPC_RODENT",
define_as = "SKELERAT",
+ type = "undead",
desc = [[The diminutive skeleton of a giant rat, charged with evil energies. Nobody understands the usefulness of undead rodents until several of them come after you]],
color = colors.GOLD,
level_range = {3, 4},
diff --git a/game/modules/tome/data/zones/orc-breeding-pit/npcs.lua b/game/modules/tome/data/zones/orc-breeding-pit/npcs.lua
index 3509e5e7492bad114d7c8d5841ea97e4ba97559c..6ea74ba8489d49ae0478b2d381cec182d77e71a2 100644
--- a/game/modules/tome/data/zones/orc-breeding-pit/npcs.lua
+++ b/game/modules/tome/data/zones/orc-breeding-pit/npcs.lua
@@ -99,6 +99,7 @@ newEntity{ base = "BASE_NPC_ORC",
newEntity{ base="BASE_NPC_ORC", define_as = "GREATMOTHER",
name = "Orc Greatmother", color=colors.VIOLET, unique = true,
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/humanoid_orc_orc_greatmother.png", display_h=2, display_y=-1}}},
desc = [[Here stands a tremendous form almost the size of a dragon. Bloated skin rises in thick folds, seeping viscous slime from its wide pores. Hundreds of hanging teats feed a small army of squabbling, fighting young orcs - only the toughest of them are able to gain the precious nutrients to grow stronger, the weaker ones left to wither on the mouldy floor. Dozens of gaping vulvae squelch and pulsate, pushing out new young with alarming rapidity. At the top of this towering hulk is a shrivelled head coated in long tangled hair. Dazed eyes peer out with a mixture of sadness and pain, but as they fix on you they turn to anger, the creature's face contorted with the fierce desire to protect its young.]],
level_range = {40, nil}, exp_worth = 1,
rank = 5,