diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index af4cb52f74b81636b7bc02f3538fd83ca43c6d72..ba05f1c43b9d4de397eba1eb50c940bec8a829ab 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -601,8 +601,6 @@ function _M:changeLevel(lev, zone, params)
-- Finish stuff registered for the previous level
self:onTickEndExecute()
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-
if self.zone and self.level then self.party:leftLevel() end
if self.player:isTalentActive(self.player.T_JUMPGATE) then
@@ -613,7 +611,6 @@ function _M:changeLevel(lev, zone, params)
self.player:forceUseTalent(self.player.T_JUMPGATE_TWO, {ignore_energy=true})
end
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- clear chrono worlds and their various effects
if self._chronoworlds then self._chronoworlds = nil end
@@ -625,7 +622,6 @@ function _M:changeLevel(lev, zone, params)
local recreate_nothing = false
local popup = nil
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- We only switch temporarily, keep the old one around
if params.temporary_zone_shift then
self:leaveLevel(self.level, lev, old_lev)
@@ -704,17 +700,14 @@ function _M:changeLevel(lev, zone, params)
end
end
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Post process walls
self.nicer_tiles:postProcessLevelTiles(self.level)
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Post process if needed once the nicer tiles are done
if self.level.data and self.level.data.post_nicer_tiles then self.level.data.post_nicer_tiles(self.level) end
-- Check if we need to switch the current guardian
self.state:zoneCheckBackupGuardian()
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Check if we must do some special things on load of this level
self.on_level_load_fcts = self.on_level_load_fcts or {}
@@ -723,7 +716,6 @@ function _M:changeLevel(lev, zone, params)
fct.fct(self.zone, self.level, fct.data)
end
self.on_level_load_fcts[self.zone.short_name.."-"..self.level.level] = nil
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Decay level ?
if self.level.last_turn and self.level.data.decay and self.level.last_turn + self.level.data.decay[1] * 10 < self.turn then
@@ -745,7 +737,6 @@ function _M:changeLevel(lev, zone, params)
end
end
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Move back to old wilderness position
if self.zone.wilderness then
self.player:move(self.player.wild_x, self.player.wild_y, true)
@@ -786,7 +777,6 @@ function _M:changeLevel(lev, zone, params)
local x, y = util.findFreeGrid(self.player.x, self.player.y, 20, true, {[Map.ACTOR]=true})
if x then act:move(x, y, true) end
end end
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Re add entities
self.level:addEntity(self.player)
@@ -800,7 +790,6 @@ function _M:changeLevel(lev, zone, params)
end
self.to_re_add_actors = nil
end
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
if self.zone.on_enter then
self.zone.on_enter(lev, old_lev, zone)
@@ -809,7 +798,6 @@ function _M:changeLevel(lev, zone, params)
self.player:onEnterLevel(self.zone, self.level)
self.player:resetMoveAnim()
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
local musics = {}
local keep_musics = false
if self.level.data.ambient_music then
@@ -823,12 +811,10 @@ function _M:changeLevel(lev, zone, params)
end
end
if not keep_musics then self:playAndStopMusic(unpack(musics)) end
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Update the minimap
self:setupMiniMap()
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Tell the map to use path strings to speed up path calculations
for uid, e in pairs(self.level.entities) do
if e.getPathString then
@@ -836,7 +822,6 @@ function _M:changeLevel(lev, zone, params)
end
end
self.zone_name_s = nil
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Special stuff
for uid, act in pairs(self.level.entities) do
@@ -845,7 +830,6 @@ function _M:changeLevel(lev, zone, params)
else act:removeEffect(act.EFF_ZERO_GRAVITY, nil, true) end
end
end
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Level feeling
local feeling
@@ -863,24 +847,20 @@ function _M:changeLevel(lev, zone, params)
end
end
if feeling then self.log("#TEAL#%s", feeling) end
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Autosave
-- if config.settings.tome.autosave and not config.settings.cheat and ((left_zone and left_zone.short_name ~= "wilderness") or self.zone.save_per_level) and (left_zone and left_zone.short_name ~= self.zone.short_name) then self:saveGame() end
self.player:onEnterLevelEnd(self.zone, self.level)
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Day/Night cycle
if self.level.data.day_night then self.state:dayNightCycle() end
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
if not recreate_nothing then
self.level.map:redisplay()
self.level.map:reopen()
if force_recreate then self.level.map:recreate() end
end
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
-- Anti stairscum
if self.level.last_turn and self.level.last_turn < self.turn then
@@ -902,12 +882,10 @@ function _M:changeLevel(lev, zone, params)
end
end
end
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
if popup then popup:done() end
self:dieClonesDie()
- print("=====TIMING", st - core.game.getTime()) sti = sti + 1
end
function _M:dieClonesDie()
diff --git a/game/modules/tome/data/general/npcs/horror.lua b/game/modules/tome/data/general/npcs/horror.lua
index ea8b0fbd21b896fe18e359c407e3d6ae0424f5a4..e4b3a1bffdc30dae260f1bfe00df0c74f1892b30 100644
--- a/game/modules/tome/data/general/npcs/horror.lua
+++ b/game/modules/tome/data/general/npcs/horror.lua
@@ -505,6 +505,7 @@ newEntity{ base = "BASE_NPC_HORROR",
newEntity{ base = "BASE_NPC_HORROR",
name = "blade horror", color=colors.GREY, define_as="BLADEHORROR",
desc = "Blades whirl in the air around this thin, floating figure. The air around it swirls with force, threatening to tear apart anything that approches, if the blades don't do it first.",
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/horror_eldritch_blade_horror.png", display_h=2, display_y=-1}}},
level_range = {15, nil}, exp_worth = 1,
rarity = 2,
rank = 2,
@@ -517,15 +518,15 @@ newEntity{ base = "BASE_NPC_HORROR",
life_rating = 12,
life_regen = 0.25,
combat_armor = 12, combat_def = 24,
-
+
ai = "tactical", ai_state = { ai_move="move_dmap", talent_in=2, ally_compassion=0 },
-
+
on_melee_hit = {[DamageType.PHYSICALBLEED]=resolvers.mbonus(14, 2)},
combat = { dam=resolvers.levelup(resolvers.rngavg(16,22), 1, 1.5), atk=resolvers.levelup(18, 1, 1), apr=4, dammod={wil=0.25, cun=0.1}, damtype=engine.DamageType.PHYSICALBLEED, },
combat_physspeed = 4, --Crazy fast attack rate
-
+
resists = {[DamageType.PHYSICAL] = 10, [DamageType.MIND] = 40, [DamageType.ARCANE] = -20},
-
+
resolvers.talents{
[Talents.T_KNIFE_STORM]={base=3, every=6, max=7},
[Talents.T_BIND]={base=1, every=8, max=4},
@@ -552,7 +553,7 @@ newEntity{ base = "BASE_NPC_HORROR",
life_rating = 20,
life_regen = 3,
combat_armor = 15, combat_def = 24,
-
+
on_move = function(self)
local DamageType = require "engine.DamageType"
local duration = 10
@@ -572,17 +573,17 @@ newEntity{ base = "BASE_NPC_HORROR",
false
)
end,
-
+
on_melee_hit = {[DamageType.SLIME]=resolvers.mbonus(16, 2), [DamageType.ACID]=resolvers.mbonus(14, 2)},
- combat = {
- dam=resolvers.levelup(resolvers.rngavg(40,50), 1, 0.9),
- atk=resolvers.rngavg(25,50), apr=25,
- dammod={wil=1.1}, physcrit = 10,
+ combat = {
+ dam=resolvers.levelup(resolvers.rngavg(40,50), 1, 0.9),
+ atk=resolvers.rngavg(25,50), apr=25,
+ dammod={wil=1.1}, physcrit = 10,
damtype=engine.DamageType.SLIME,
},
-
+
ai = "tactical", ai_state = { ai_move="move_dmap", talent_in=1, ally_compassion=0 },
-
+
resists = {all=15, [DamageType.PHYSICAL] = -10, [DamageType.NATURE] = 100, [DamageType.ARCANE] = 40, [DamageType.BLIGHT] = 24},
resolvers.talents{
@@ -599,6 +600,7 @@ newEntity{ base = "BASE_NPC_HORROR",
subtype = "eldritch",
name = "umbral horror", color=colors.BLACK,
desc = "A dark shifting shape stalks through the shadows, blending in seemlessly.",
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/horror_eldritch_umbral_horror.png", display_h=2, display_y=-1}}},
level_range = {16, nil}, exp_worth = 1,
rarity = 8,
rank = 3,
@@ -610,17 +612,17 @@ newEntity{ base = "BASE_NPC_HORROR",
life_regen = 0.25,
hate_regen=4,
combat_armor = 0, combat_def = 24,
-
- combat = {
- dam=resolvers.levelup(resolvers.rngavg(36,45), 1, 1.2),
- atk=resolvers.rngavg(25,35), apr=20,
- dammod={wil=0.8}, physcrit = 12,
+
+ combat = {
+ dam=resolvers.levelup(resolvers.rngavg(36,45), 1, 1.2),
+ atk=resolvers.rngavg(25,35), apr=20,
+ dammod={wil=0.8}, physcrit = 12,
damtype=engine.DamageType.DARKNESS,
},
combat_physspeed = 2,
-
+
ai = "tactical", ai_state = { ai_move="move_dmap", talent_in=1, ally_compassion=0 },
-
+
resists = {[DamageType.PHYSICAL] = -10, [DamageType.DARKNESS] = 100, [DamageType.LIGHT] = -60},
resolvers.talents{
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_blade_horror.png b/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_blade_horror.png
new file mode 100644
index 0000000000000000000000000000000000000000..b13f296932bdc822ac834e871cb8bd4091d7e412
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_blade_horror.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_oozing_horror.png b/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_oozing_horror.png
new file mode 100644
index 0000000000000000000000000000000000000000..982ec2d09f8a2e3cd6d5b3f92160e585666fe6fc
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_oozing_horror.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_umbral_horror.png b/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_umbral_horror.png
new file mode 100644
index 0000000000000000000000000000000000000000..bccf3343369e990b5e2cf026c2cbe370f7005676
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_umbral_horror.png differ