From 022f179b5c0c6dba8d793b292983ee43f251f852 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 3 Aug 2012 20:03:20 +0000
Subject: [PATCH] New psionic class Solipsist - Create and destroy with your
thoughts, manipulate and enter the dreams of others, overcome the world with
the power of your mind
git-svn-id: http://svn.net-core.org/repos/t-engine4@5411 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/ai/tactical.lua | 5 +-
game/modules/tome/ai/target.lua | 1 +
game/modules/tome/class/Actor.lua | 40 ++--
.../tome/data/birth/classes/psionic.lua | 10 +-
.../modules/tome/data/general/npcs/horror.lua | 175 +++++++++++++++++-
.../npc/horror_eldritch_dream_seed.png | Bin 0 -> 4726 bytes
.../npc/horror_eldritch_dreaming_horror.png | Bin 0 -> 9482 bytes
.../talents/chronomancy/age-manipulation.lua | 11 +-
.../tome/data/talents/psionic/distortion.lua | 10 +-
.../tome/data/talents/psionic/dreaming.lua | 9 +-
.../tome/data/talents/psionic/mentalism.lua | 16 +-
.../tome/data/talents/psionic/nightmare.lua | 4 +-
.../data/talents/psionic/psychic-assault.lua | 115 ++++++------
.../tome/data/talents/psionic/slumber.lua | 8 +-
.../tome/data/talents/psionic/solipsism.lua | 37 +++-
.../data/talents/psionic/thought-forms.lua | 29 ++-
.../data/texts/unlock-psionic_solipsist.lua | 36 ++++
.../tome/data/timed_effects/mental.lua | 40 +++-
.../modules/tome/data/timed_effects/other.lua | 36 +++-
.../data/zones/dreamscape-talent/zone.lua | 2 +-
20 files changed, 450 insertions(+), 134 deletions(-)
create mode 100644 game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_dream_seed.png
create mode 100644 game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_dreaming_horror.png
create mode 100644 game/modules/tome/data/texts/unlock-psionic_solipsist.lua
diff --git a/game/modules/tome/ai/tactical.lua b/game/modules/tome/ai/tactical.lua
index 6c7244b8c8..ef3dd160de 100644
--- a/game/modules/tome/ai/tactical.lua
+++ b/game/modules/tome/ai/tactical.lua
@@ -19,7 +19,7 @@
local DamageType = require "engine.DamageType"
-local print = function() end
+--local print = function() end
-- Internal functions
local checkLOS = function(sx, sy, tx, ty)
@@ -185,13 +185,14 @@ newAI("use_tactical", function(self)
local need_heal = 0
local life = 100 * self.life / self.max_life
+ -- Subtract solipsism straight from the life value to give us higher than normal weights; helps keep clarity up and avoid solipsism
+ if self:knowTalent(self.T_SOLIPSISM) then life = life - (100 * self:getPsi() / self:getMaxPsi()) end
if life < 20 then need_heal = need_heal + 10 * self_compassion / 5
elseif life < 30 then need_heal = need_heal + 8 * self_compassion / 5
elseif life < 40 then need_heal = need_heal + 5 * self_compassion / 5
elseif life < 60 then need_heal = need_heal + 4 * self_compassion / 5
elseif life < 80 then need_heal = need_heal + 3 * self_compassion / 5
end
-
-- Need healing
if avail.heal then
want.heal = need_heal
diff --git a/game/modules/tome/ai/target.lua b/game/modules/tome/ai/target.lua
index 8734caedc1..3efd1ec364 100644
--- a/game/modules/tome/ai/target.lua
+++ b/game/modules/tome/ai/target.lua
@@ -59,6 +59,7 @@ newAI("target_player_radius", function(self)
if core.fov.distance(self.x, self.y, game.player.x, game.player.y) < self.ai_state.sense_radius then
self.ai_target.actor = game.player
+ self:check("on_acquire_target", game.player)
return true
end
end)
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 9d362167fe..48642f4d3e 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -1513,11 +1513,6 @@ function _M:onTakeHit(value, src)
return 0
end
- if self.knowTalent and self:knowTalent(self.T_DISMISSAL) then
- local t = self:getTalentFromId(self.T_DISMISSAL)
- value = t.doDismissalOnHit(self, value, src, t)
- end
-
if self:attr("retribution") then
-- Absorb damage into the retribution
if value / 2 <= self.retribution_absorb then
@@ -1696,6 +1691,12 @@ function _M:onTakeHit(value, src)
eff.begone = game.turn
end
end
+
+ -- Mind save to reduce damage to zero
+ if self:knowTalent(self.T_DISMISSAL) and value > 0 then
+ local t = self:getTalentFromId(self.T_DISMISSAL)
+ value = t.doDismissalOnHit(self, value, src, t)
+ end
-- Feedback pool: Stores damage as energy to use later
if self:getMaxFeedback() > 0 and src ~= self and src ~= self.summoner then
@@ -1757,20 +1758,11 @@ function _M:onTakeHit(value, src)
end
end
- -- Solipsism
- if self:knowTalent(self.T_SOLIPSISM) then
+ -- Solipsism damage; set it up here but apply it after on_take_hit
+ local damage_to_psi = 0
+ if self:knowTalent(self.T_SOLIPSISM) and value > 0 then
local t = self:getTalentFromId(self.T_SOLIPSISM)
- local damage_to_psi = value * t.getConversionRatio(self, t)
- if self:getPsi() > damage_to_psi then
- self:incPsi(-damage_to_psi)
- else
- damage_to_psi = self:getPsi()
- self:incPsi(-damage_to_psi)
- end
- if damage_to_psi > 0 then
- game.logSeen(self, "%s's mind suffers #YELLOW#%d psi#LAST# damage from the attack.", self.name:capitalize(), damage_to_psi)
- end
- value = value - damage_to_psi
+ damage_to_psi = value * t.getConversionRatio(self, t)
end
-- Stoned ? SHATTER !
@@ -1858,6 +1850,18 @@ function _M:onTakeHit(value, src)
end
if self.on_takehit then value = self:check("on_takehit", value, src) end
+
+ -- Apply Solipsism hit
+ if damage_to_psi > 0 then
+ if self:getPsi() > damage_to_psi then
+ self:incPsi(-damage_to_psi)
+ else
+ damage_to_psi = self:getPsi()
+ self:incPsi(-damage_to_psi)
+ end
+ game.logSeen(self, "%s's mind suffers #YELLOW#%d psi#LAST# damage from the attack.", self.name:capitalize(), damage_to_psi)
+ value = value - damage_to_psi
+ end
-- VITALITY?
if self:knowTalent(self.T_VITALITY) and self.life > self.max_life /2 and self.life - value <= self.max_life/2 then
diff --git a/game/modules/tome/data/birth/classes/psionic.lua b/game/modules/tome/data/birth/classes/psionic.lua
index 64dad34645..0212f663ec 100644
--- a/game/modules/tome/data/birth/classes/psionic.lua
+++ b/game/modules/tome/data/birth/classes/psionic.lua
@@ -152,11 +152,11 @@ newBirthDescriptor{
newBirthDescriptor{
type = "subclass",
name = "Solipsist",
- locked = function() return profile.mod.allow_build.psionic_solipsist and true or "hide" end,
- locked_desc = "The world as we know it is the collective dream of those that live in it. Find and wake the sleeper and you'll unlock the potential of your dreams.",
+ locked = function() return profile.mod.allow_build.psionic_solipsist end,
+ locked_desc = "Some believe that the world is the collective dream of those that live in it. Find and wake the sleeper and you'll unlock the potential of your dreams.",
desc = {
- "The Solipsist has awakened to the truth of reality, that it's malleable, nothing more than the collective vision of those that experience it.",
- "They wield this knowledge to both create and destory, to invade the minds of others, and to manipulate the dreams of the unenlightened.",
+ "The Solipsist believes that reality is malleable and nothing more than the collective vision of those that experience it.",
+ "They wield this knowledge to both create and destory, to invade the minds of others, and to manipulate the dreams of those around them.",
"This knowledge comes with a heavy price and the Solipsist must guard his thoughts, lest he come to believe that the world exists only within his own mind.",
"Their most important stats are: Willpower and Cunning",
"#GOLD#Stat modifiers:",
@@ -187,7 +187,7 @@ newBirthDescriptor{
talents = {
[ActorTalents.T_SLEEP] = 1,
- [ActorTalents.T_SUNDER_MIND] = 1,
+ [ActorTalents.T_MIND_SEAR] = 1,
[ActorTalents.T_SOLIPSISM] = 1,
[ActorTalents.T_THOUGHT_FORMS] = 1,
},
diff --git a/game/modules/tome/data/general/npcs/horror.lua b/game/modules/tome/data/general/npcs/horror.lua
index 940879cd25..761af21563 100644
--- a/game/modules/tome/data/general/npcs/horror.lua
+++ b/game/modules/tome/data/general/npcs/horror.lua
@@ -30,7 +30,7 @@ newEntity{
autolevel = "warrior",
ai = "dumb_talented_simple", ai_state = { ai_move="move_dmap", talent_in=3, },
- stats = { str=02, dex=20, wil=20, mag=20, con=20, cun=20 },
+ stats = { str=20, dex=20, wil=20, mag=20, con=20, cun=20 },
combat_armor = 5, combat_def = 10,
combat = { dam=5, atk=10, apr=5, dammod={str=0.6} },
infravision = 10,
@@ -148,6 +148,7 @@ newEntity{ base = "BASE_NPC_HORROR",
mana_regen = 10,
negative_regen = 10,
hate_regen = 10,
+ psi_regen = 10,
rarity = 8,
rank = 3,
max_life = resolvers.rngavg(150,170),
@@ -175,6 +176,7 @@ newEntity{ base = "BASE_NPC_HORROR",
[Talents.T_DISMAY]={base=3, every=12, max=8},
[Talents.T_DOMINATE]={base=3, every=12, max=8},
[Talents.T_INVOKE_DARKNESS]={base=5, every=8, max=10},
+ [Talents.T_NIGHTMARE]={base=5, every=8, max=10},
[Talents.T_WAKING_NIGHTMARE]={base=3, every=8, max=10},
[Talents.T_ABYSSAL_SHROUD]={base=3, every=8, max=8},
[Talents.T_INNER_DEMONS]={base=3, every=8, max=10},
@@ -520,7 +522,7 @@ newEntity{ base = "BASE_NPC_HORROR",
life_regen = 0.25,
combat_armor = 12, combat_def = 24,
- ai = "tactical", ai_state = { ai_move="move_dmap", talent_in=2, ally_compassion=0 },
+ 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, },
@@ -583,7 +585,7 @@ newEntity{ base = "BASE_NPC_HORROR",
damtype=engine.DamageType.SLIME,
},
- ai = "tactical", ai_state = { ai_move="move_dmap", talent_in=1, ally_compassion=0 },
+ 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},
@@ -622,7 +624,7 @@ newEntity{ base = "BASE_NPC_HORROR",
},
combat_physspeed = 2,
- ai = "tactical", ai_state = { ai_move="move_dmap", talent_in=1, ally_compassion=0 },
+ ai = "tactical", ai_state = { ai_move="move_dmap", talent_in=1, ally_compassion=0 },
resists = {[DamageType.PHYSICAL] = -10, [DamageType.DARKNESS] = 100, [DamageType.LIGHT] = -60},
@@ -639,6 +641,164 @@ newEntity{ base = "BASE_NPC_HORROR",
},
resolvers.sustains_at_birth(),
}
+
+-- Dream Horror
+newEntity{ base = "BASE_NPC_HORROR",
+ name = "dreaming horror", color=colors.ORCHID,
+ desc =[[A vaguely tentacled yet constantly changing form rests here apparently oblivious to your existence.
+With each slow breath it takes reality distorts around it. Blue twirls into red, green twists into yellow, and the air sings softly before bursting into a myriad of pastel shapes and colors.]],
+ shader = "shadow_simulacrum",
+ shader_args = { color = {0.5, 0.5, 1.0}, base = 0.8, time_factor= 2000 },
+ level_range = {20, nil}, exp_worth = 1,
+ rarity = 30, -- Very rare; should feel almost like uniques though they aren't
+ rank = 3,
+ max_life = 100, -- Solipsism will take care of hit points
+ life_rating = 4,
+ psi_rating = 6,
+ autolevel = "wildcaster",
+ combat_armor = 1, combat_def = 15,
+ combat = { dam=resolvers.levelup(20, 1, 1.1), atk=20, apr=20, dammod={wil=1}, damtype=DamageType.MIND},
+
+ ai = "tactical", ai_tactic = resolvers.tactic"ranged",
+ ai_state = { ai_target="target_player_radius", sense_radius=20, talent_in=1 }, -- Huge radius for projections to target
+ dont_pass_target = true,
+
+ resists = { all = 35 },
+ inc_damage = { all = -50}, -- Set base damage low, in the dreamscape it will be much higher
+
+ combat_mindpower = resolvers.levelup(30, 1, 2),
+
+ body = { INVEN = 10 },
+ resolvers.drops{chance=100, nb=5, {ego_chance=100} }, -- Gives good loot to encourage the player to wake it up
+
+ resolvers.talents{
+ [Talents.T_DISTORTION_BOLT]={base=2, every=6, max=8},
+ [Talents.T_DISTORTION_WAVE]={base=2, every=6, max=8},
+ [Talents.T_MAELSTROM]={base=2, every=6, max=8},
+ [Talents.T_RAVAGE]={base=2, every=6, max=8},
+
+ [Talents.T_BIOFEEDBACK]={base=2, every=6, max=8},
+ [Talents.T_RESONANCE_FIELD]={base=2, every=6, max=8},
+ [Talents.T_BACKLASH]={base=2, every=6, max=8},
+
+ [Talents.T_MENTAL_SHIELDING]={base=2, every=6, max=8},
+
+ [Talents.T_SOLIPSISM]=7, -- Seven gives some damage to health though it's very small
+ [Talents.T_BALANCE]={base=2, every=6, max=8},
+ [Talents.T_CLARITY]={base=2, every=6, max=8},
+ [Talents.T_DISMISSAL]={base=2, every=6, max=8},
+
+ [Talents.T_LUCID_DREAMER]={base=4, every=12, max=8},
+ [Talents.T_DREAM_WALK]={base=4, every=12, max=8},
+ [Talents.T_SLUMBER]={base=2, every=6, max=8},
+ [Talents.T_RESTLESS_NIGHT]={base=2, every=6, max=8},
+ [Talents.T_DREAMSCAPE]=10,
+ },
+
+ resolvers.inscriptions(1, {"regeneration infusion"}),
+
+ resolvers.sustains_at_birth(),
+
+ -- Used to track if he's awake or spawning projections
+ dreamer_sleep_state = 1,
+ -- And some particles to show that we're asleep
+ resolvers.genericlast(function(e)
+ if core.shader.active() then
+ e.sleep_particle = e:addParticles(engine.Particles.new("shader_shield", 1, {img="shield2", size_factor=1}, {type="shield", time_factor=6000, aadjust=2, color={0.6, 1, 0.6}}))
+ else
+ e.sleep_particle = e:addParticles(engine.Particles.new("ultrashield", 1, {rm=0, rM=0, gm=180, gM=255, bm=180, bM=255, am=70, aM=180, radius=0.4, density=60, life=14, instop=1, static=100}))
+ end
+ end),
+
+ -- Spawn Dream Seeds
+ on_act = function(self)
+ if self.dreamer_sleep_state and self.ai_target.actor then
+ self.dreamer_sleep_state = math.min(self.dreamer_sleep_state + 1, 51) -- Caps at 51 so a new one doesn't spawn as soon as an old one dies
+ self:useEnergy() -- Always use energy when in the sleep state
+
+ if self.dreamer_sleep_state%10 == 0 and self.dreamer_sleep_state <= 50 then
+ -- Find Space
+ local x, y = util.findFreeGrid(self.x, self.y, 5, true, {[engine.Map.ACTOR]=true})
+ if not x then
+ return
+ end
+
+ local seed = {type="horror", subtype="eldrtich", name="dream seed"}
+ local list = mod.class.NPC:loadList("/data/general/npcs/horror.lua")
+ local m = list.DREAM_SEED:clone()
+ if not m then return nil end
+
+ m.exp_worth = 0
+ m.summoner = self
+ m:resolve() m:resolve(nil, true)
+ m:forceLevelup(self.level)
+ game.zone:addEntity(game.level, m, "actor", x, y)
+
+ game.level.map:particleEmitter(x, y, 1, "generic_teleport", {rm=225, rM=255, gm=225, gM=255, bm=225, bM=255, am=35, aM=90})
+ game.logSeen(self, "%s spawns a dream seed!", self.name:capitalize())
+ end
+ -- Script the AI to encourage opening with dream scape
+ elseif self.ai_target.actor and not game.zone.is_dream_scape then
+ if not self:isTalentCoolingDown(self.T_SLUMBER) then
+ self:forceUseTalent(self.T_SLUMBER, {})
+ elseif not self:isTalentCoolingDown(self.T_DREAMSCAPE) and self.ai_target.actor:attr("sleep") then
+ self:forceUseTalent(self.T_DREAMSCAPE, {})
+ end
+ end
+ end,
+ on_acquire_target = function(self, who)
+ self:useEnergy() -- Use energy as soon as we find a target so we don't move
+ end,
+ on_takehit = function(self, value, src)
+ if value > 0 and self.dreamer_sleep_state then
+ self.dreamer_sleep_state = nil
+ self.desc = [[A vaguely tentacled yet rapidly changing shape floats here. With each breath you can feel reality twist, shatter, and break.
+Blue burns into red, green bursts into yellow, and the air crackles and hisses before exploding into a thousand fragments of sharp shapes and colors.]]
+ self:removeParticles(self.sleep_particle)
+ game.logSeen(self, "#LIGHT_BLUE#The sleeper stirs...")
+ end
+ return value
+ end,
+}
+
+newEntity{ base = "BASE_NPC_HORROR", define_as = "DREAM_SEED",
+ name = "dream seed", color=colors.PINK,
+ desc ="A pinkish bubble floats here, reflecting the world not as it is, but as it would be in that surreal place that exists only in our dreams.",
+ level_range = {20, nil}, exp_worth = 1,
+ rarity = 30, -- Very rare; but they do spawn on their own to keep the players on thier toes
+ rank = 2,
+ max_life = 1, life_rating = 4, -- Solipsism will take care of hit points
+ autolevel = "wildcaster",
+
+ ai = "tactical",
+ ai_state = { ai_target="target_player_radius", sense_radius=20, talent_in=3, },
+ dont_pass_target = true,
+ can_pass = {pass_wall=20},
+ levitation = 1,
+
+ combat_armor = 1, combat_def = 5,
+ combat = { dam=resolvers.levelup(20, 1, 1.1), atk=10, apr=10, dammod={wil=1}, damtype=engine.DamageType.MIND},
+
+ resolvers.talents{
+ [Talents.T_BACKLASH]={base=2, every=6, max=8},
+ [Talents.T_DISTORTION_BOLT]={base=2, every=6, max=8},
+
+ [Talents.T_SOLIPSISM]=8,
+
+ [Talents.T_SLEEP]={base=2, every=6, max=8},
+ [Talents.T_LUCID_DREAMER]={base=2, every=6, max=8},
+ [Talents.T_DREAM_WALK]=5,
+ },
+
+ resolvers.sustains_at_birth(),
+
+ -- Remove ourselves from the dream seed limit
+ on_die = function(self)
+ if self.summoner and self.summoner.dreamer_sleep_state then
+ self.summoner.dreamer_sleep_state = self.summoner.dreamer_sleep_state - 10
+ end
+ end,
+}
------------------------------------------------------------------------
-- Uniques
------------------------------------------------------------------------
@@ -666,7 +826,7 @@ You can discern a huge round mouth covered in razor-sharp teeth.]],
combat = { dam=resolvers.levelup(resolvers.mbonus(100, 15), 1, 1), atk=500, apr=0, dammod={str=1.2} },
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
- resolvers.drops{chance=100, nb=1, {unique=true} },
+ resolvers.drops{chance=100, nb=1, {unique=true} },
resolvers.drops{chance=100, nb=5, {ego_chance=100} },
resists = { all=500 },
@@ -757,7 +917,7 @@ newEntity{ base = "BASE_NPC_HORROR",
resolvers.drops{chance=100, nb=1, {defined="BLADE_RIFT"} },
- ai = "tactical", ai_state = { ai_move="move_dmap", talent_in=2, ally_compassion=0 },
+ ai = "tactical", ai_state = { ai_move="move_dmap", talent_in=2, ally_compassion=0 },
on_melee_hit = {[DamageType.PHYSICALBLEED]=resolvers.mbonus(30, 4)},
combat = { dam=resolvers.levelup(resolvers.rngavg(20,28), 1, 1.5), physspeed = 0.25,atk=resolvers.levelup(24, 1.2, 1.2), apr=4, dammod={wil=0.3, cun=0.15}, damtype=engine.DamageType.PHYSICALBLEED, },
@@ -908,5 +1068,4 @@ newEntity{ base="BASE_NPC_HORROR", define_as = "DISTORTED_BLADE",
game.logSeen(self, "#AQUAMARINE#With the horror's death the chaotic blade clatters to the ground!")
end
end,
-}
-
+}
\ No newline at end of file
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_dream_seed.png b/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_dream_seed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b32c83d97aadb6bd783e97afba34df480ef03cc9
GIT binary patch
literal 4726
zcmV-+5{d1JP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01Y|-01Y|;10o)U00007bV*G`2iyn(
z4m&Yaqc^qy01@^{L_t(|+T~lxjwH!(ea~Xc%-VW}n$Zw51S#?+LO0$8=wJ8^`W9h+
zK|i3Apqr#4MUa9ZisTRymnM6uB{O4jdpfvBl&4o@b@$AX1vnzADwnYB*)wx<O2VJ>
zPyN0xeEH=Yrdy^p-&^*#D!ZTmXX&+8ypP$(E3Nt7v-^<!&9m2f@%ks0{N%?k-f3OF
zj|U{-xgvmNf>~04Wy&c3W-FhgLIJtJAya~9Ybu2IGs=9Y65gqRmtVfILg-TXDqH36
z<==9T$UUI6Y*<;I{ckFiqciKBN?27u=I$sSm}i8nvumCG-mWOZ&V+zx0!`U<EPl^d
zuAI^v{C&dVISeS3kXwCC&^le4bbpz>ugP9(g(s=7ZYk&pU`W?7`@LFGMD9_RE8*pr
zZ@8v}_fbF@<FnvRT5VcgS}lN`UGVSJ>ld2vM*!PQ0W(m72Ff2@pN1em5xh^r&Z|$W
zSy2pEl)yX`)|7A(0tM2S=w4;k?lJ{*0CwrR1+bxE3&ZDd9Ju8VHQ-MOdJ98We74dx
zTHi6sF(yUK0v?jkhfE2_;yPrZG8LGiGDGA_SQJpieYIlwT;LYKCR-Qjx=rf>Ktscp
z4ZkhN1Sx=Qmd}(}#Qy{Utk@~&6@0P!QH}$EeG+)S@6+{AC}BK<535S3SKOW}fLCY2
zcS+b?ChTRpUeIs>OUfWSIVu`<s969aA5+$ZAV;t*Ke8=<5Z?H|3VJh#0h7>j?32(P
zfcqj7@fi%uIm1&7DDwQ8@Uz9cOz<s$>m>X&4VN%n0@#4u(vnxy=t#D(1v_#=6s=DL
zNCA%8d;I}5uHdX7jR1}?8~|(?zk4soT>-*#Xbu2g6{M;pS<ixCncwTe?RUx2J2w0g
zTl|%J{pX1nkQZ!mL2?U22a6y{G74X#VZ{rLx`!i3au@=g(Pbx$0It}g!^BZB6poM{
zU^pg4G;*|T_&rF!(S-j?R-VIS$U>{i?pZ3KUU7db@_Lt9epbK>8eV9?Er1sQu9M(b
zN$?#ETaq1Wv@|pTDv%X`iZxn*2EYl%+%LHX41z|26M#w3z$na412+KnkUAJ@8d^vb
z9NY8^cL^glS==+>gRQZ|Tmfq#P!}m~o2-08!;MD$9>6sWAA!7KiyKzl!LTE_Ws41f
z7GwiMV;w8l602f|CPimLYYIC|8Z~NEuVKjoJsbmC#pjvW$<aWn0lbytB1?aPH9iOM
zpb0-uf3Keji4z6n46i9re|GU}03QK(0mBV|n<V@d$x9e6*>J~-8vw0!+_2+zaXkkm
z5xyFi4#3$ku;C6H4BqRgUPqZGI(q;ehz?Stfi-}dwJJ>u=@~(O7t#^He-|XnGdY*y
zY0U#>3}`a&+hx|jhT$5(3y?3^;))e-Y|D>9w(+5`Wy7|*wq5gCy$iP<ray%N2BSsv
zr=5hJ6dy4pk1#<8+p<N+jrTfgR0~Hds3q8-Rihzh6xI+NK@Qib{{rw9zzu-gEFI>|
zkmo$WGDK~%+`dcJzk=Z^#r#bY{?c~#dGqb+`|7n1w|-|E+rZGsQE8MU(Y6Z*z!INU
z<Sa)mhv0DZ*eJ+gXl%<)HF}LYVq&A9nqb8a)CeggAO$A*!U;m=#U&pI=M*rbepST%
z6@W{|G<U^{H>jiVi0QA<gi#Y{JG)3;U^LkDIs{fEJ3g{M14)*78wvtrsF-S)_oy{$
zf@89cwW`#3uLg!jqavQv5l9s@!Y~pTQs(HBAxmP!b0C-(I<p6CGvvR7;Tq&MYFy63
zTgOW{<hTBo9XG6_0@={mkT8%<6qXeq-On;tbVxx+;XybE1I=KnSZP!Z$HazaK;=D*
z25N}!78KwdQtbCM91>~jiy|s#x1m%(Re<13e71?*T>`kw0B^^J7a(`6v1P}OH5!l=
zTNo==YzQ`q0idkU%7U9E5hn~_g-SK3QPcpiqZt720k)EQ1Ug5w>NW5H(*ZFv%+&dq
z<QXy}d+7ny3i)Xl42Z1mk`*sVUchj{hL^0kVU3O*J2q@#s92+7Lnh&4wy)B4{-(n1
z=i*gkEKFFDv$qHWLCR6V;=kE(%OGf?v%w_Sh=3yvdpWOQ+7q~!FGX8jG-T`?5h~eV
ztn7dt$SrDIz_4Q#Q(Z#)&br9+lkk=aPd0qE@FoaBBp`OtV>Alh$LvTFG9{#^QtZn%
z*7?yL;D{=Es-TULUw9A7^*Up)Ic*+srrTph<rfK1ENnK6%q|k0HkG{<TQ+P!RxlW=
zQ_JVVlU!Y>6E;+&?ab`jPB4QF<Fz7K!&t{><d!=&j25oZrBZvVQAf7u?1DdHjmtv#
zvbTvmI!g?wnS=+qLyb!qx|n>}S;r2Br~rUW>SM*_J{SJf@iGsX2-S+@7l6iO`J_A=
zsF0hA21pt;r?Q5IMzP-L1epei?GpQIZMkr+-<NlMW*XeE#YeWY@58WRjTVL$hK3Dm
z)~H}G7?`Xi7?fi8#L8r{X!Fzq*btJSgBGGh!(;Y%j9$V(IK*b5*EPu+h6Xh@0Hj{O
zgTt~Au$9K_*$~M4d>w#Equ!EiK(-bEuVKeJ*@Uc~=Ji>Xv!Ew9F#j*Pc=kFiPiFC+
za|k6c<zosZ?IeBY^nH^7V11@%@PrDZ==3&AF)`tYEp7nRFjTBqrFe|OCsoP;0z`!q
zD`!05X%?s>7^be?jQmg{#c(LIzET)O1vI3l$e+&iE~{s{(I-(^7DSJLF`-Ef4P%Wu
zfuE&xWpmCx`PBLyE!RiPI5Eczc&GucVMdi~9tl(Qme|)jw_m}P9w*ln@H8ZBwT*4;
z*s@+SdP>fT^%)5AiH|LUmSAWro?$5*A}xj-Ow>gR(#bt$6+Ekib30Q{Jm9o4^mMJ4
zl9dTyhSbhx_5hC`WSRS)^SAf=iQhL$3X6+FK|!MyelJgjjz9S}7Hv3|T_G#>=*pIn
zr%vu>uB7B}1;sXIw8C6%mk)riz4Pqxy^7YKKU+yi=Odw=QcJ~)E|3+wPUSx2s!i<4
zCZmCnMoj1v5KeGRaJVJ}jZ)U!&{EfbsIVbD)0C7pH_3ybaar#7KFQ(jcbcyGwB98z
z4M_z`D)BQ<;qL-LJZT$6&BooD*uadvx}Z@(vBrJ`q?5|7wEp5L?-G8BWJp0sy#XnH
zvunTvK&S!RM)v8wf}|J<lIJ^3OK6<R<!fnBMbjXZ`)-m(ItK-f0LNH_pv_sIBp?8E
z#&^!UclAn#9?uA$!fCcXV%WK)pnHwOFGp8oj$>Zu$DX9_6qc}1(GGjEKTsFj)A{yu
zxmiiu^5Z0KuTd?6TGXuO`W+5|(1O~tfJ#LT^v<|XntX(jXnkdo?$ay31u$C2DeWf&
z7+ULi8G>FSoNSMUV)OKDTilB`J?^zh11mFB{1$><DX0h7X~4t=bs{bnA6>u*#fAj|
zQ>3}I!0C|`%_9y=%%`|l5Ll6@0Q8!>#z+=6L6(#q6cm=Qm~iit{-gnighip~26?fb
zctGy{0l+B7Ktm5;Qm;FQ{}jNM6)#XBwy!5PtP^8M<V2&~0b`R9BxU=zcKWTe`!5*6
z$2#C-zy_!wfQAtUQ&Pelq8hM=GyoWBn3598Aq$+t0AE_m`Em>}400UN>y8agrk28>
z0L_I^7S~E&<q9Gz(g4DvH$3sXDZ>O$N(_>ZsZAEG?r_9%2aHs?qBMH+P{)Mnr0+NH
zD2?yhEv^gn&qH9|nT=i`^#CVH11I((cFkwib@N%h3HR>4cVuKlatQ&3CN+FIKmkO>
z$I`d7N5TvxFib!gQ%baE1wgDgDQNUw1AuAHPRaUxwzE7GQzlOas_G*Cr@{l`zP#fA
z!%>bSfmTujC2kOFc-Iu;eqn19oHbmd3<h|g%4H}5g+JZNRScgcJ!(wpZ-Of*=zs@}
z8d$N{s6J)=n40}$n&emvSB#l_s~%7eCym80!XfR;Z8dPi79%D+jK2@R4!8a>0JAN3
z3TQya_LT%p6l*vpm^^)_kp$@dBh<6v!YH$=Yl?WHQ2~z0dmUM0@?OJ<^`rYo!5w=!
zj>S|-p4rZNK#l=Jrpdh=2LgwAn;JkZsrJ3U_9F({*fjvL;SMg-2rP{ffU)0CDa36t
z<#^$k)1z|2l&l_UH!%6A5w;koW5YoQ-7Q`_gWr~afnKjPEyEMDJYJ06odv<En8!H)
zcv$8Fq!!?&x~YCZLmTe>cN+EJfH-Pm!ww-9v#g4lz$tpaf_&-vJ~BkjVUS`!3hx*-
zYNTOeMfYA6q(P&O3HgV7l!gue7C^5_|B(zhJU1;;GC^kiEf0ac9CwUO(i#(9SjUfG
zsBw?4((a7_HnwA(z;IMALq}t3Z_o5v4%eWB>Wk0|e@?_Fz%iwmpA<Cs(Fc&V_j;vK
z_Zl!na85V{yw#|G*MQ$<1}rndSp}#dL30Sqy}?$FmOv}$<@7TA3k;XZMO#+fwco2h
zt8c1i_|16l2OVgndevz7m?~3jBYOTU@cdx&>!euF1U8&Bs`p-p2z)w5BDNUm0LQ~T
zLZb)$Gk`y2*3Usu?*c)l54Ow$4*7O@QbO%}{|yXRAg=%fv={)yp8i31e$d|HcJ~%i
zgOIG95FL)7@ud7F3>Cqc>c~mZ(GPl1uR+oX$5BB?Oz7n&uK$o`hVB6DX=oM8w8Mvl
zfL79BU-k!S=(yz%6jAsdl7WN|{<8nY_)}Kg`q3XqHV(iX4)7vQg+#z*MG8_Xvpsc~
z8^oR68ji`2zSpP+?{!RnpA^)yVuK3Q-fsciA<hfk$?-OAhu@;&4{7Q&;g^~9ePyor
z2@xv2U>1Hqx0&Q<(d&QU=+c}(1xXs{Veqd2bk=dJS{sCv|AVU3=cjF1)t}Zo-}^MZ
z48PZ?BLYmLVl6R6!mOa9MjhsdR?q>!U|W6%0DX^N!Er0cEr8c)Cg2vp9zp+B%m%Cq
zUwQztlF_mlEB6dc69Rx2w&fQjKlP*kFJeu;17m-m6N8qFN5~ZzcY80?3x3cTZv8IB
z^J8Bz0>H$IO-!qpxZ!oU3qMn@hXDUs%J;96)!(G`Hif{w9QVm+YZO?|4N8`y?&WOY
zMVb}30&v9|-v#+Gf~GV$agmhJ($KMC9G0rMMU9RXTkCl3qmCMNuTc+=MegJ9f~3HP
z7i@T;gMJHx`9Xh#w1?wC5%eB1!Dl7hCM-B)9AGR+(8-|W+Ni7*+vQC$C^gRu?O5Xr
zkbkLB2O4hDF7giK6<d6a2>~^lG&vRrFANnXjH!#`3Gk|n(J9f|kfz6ST6;j;_dkvK
zxb8CHk3|Yxyr7&FuFtf@^6tqT4lG7oCQbM)O?v<vIh?Ty>#f7iHuibA^`E1cL>$<r
zJ-V<|flO^HrEK^Zr?I#hPttLux3l%{GHc(Z^^gfa6oRh`zj|Jv@Pcy7Jl}TOEH0mo
z(E!-6#tV?2BzjsW&xu(iPLNR{&3Bxh5>duOMgXJj?E4COql12uxqiOxGM7KD%nPr&
z{<GuqpZxemNGC<C<j$EF<kWe}h|^`9*wX8yoDFRuQ#E(|YXGjjewUTEmvW2<y3Oj5
zIrUuucrC{tvq{kV?0#{18vaI(Ujz7crq~ZVFp<4bMJqWJe8JB!#|efi)#Q5sTlwQb
z3g7!rQYP6iy?Vy}gB-83&+7s7deB#yg=eAn8A)4;H#vTl!0_Zy)pJK?-gRoMJji4#
zP1Gl+J2c@oxqW_!q5)8A!mBLH%rgOhC_2$&QO*tpxaGi@H$1+2ZZP_T4^0(k2)J_i
zX&$Nj77bSkncGb0eC5Y%Y-Kmf-$M!KIz3a-)YZEz|8<Vdp*S0u@5|2uE1Ss3&kxP_
z`D}l6=D^gN5^`b3Vn3i{dhad#2OXR&%4S=6@S)fW848Qf_vKjb8m>$$n={ihN9p{z
zLlNKD1I~nlo$mCXjG&x5FKC7JxiZDQc1|#?0I#1rCilM9{~!gdC;?{%52`{~t{l6w
zGhmxraVh|~baOBF`aVSPucd%zaG`W-tPNJ2nMvTvVTL@kROED(b^X^7{2MFaOjzUt
z2<2hvwJQo7SWCZHDcJ=8pZ?Q7NdNfv_$EL6b3Z=+|JkSVj0zEfhX4Qo07*qoM6N<$
Ef?-g-MgRZ+
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_dreaming_horror.png b/game/modules/tome/data/gfx/shockbolt/npc/horror_eldritch_dreaming_horror.png
new file mode 100644
index 0000000000000000000000000000000000000000..be39923cad14ba4edf2b2ab93fe6dc2bc19c88b8
GIT binary patch
literal 9482
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
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/talents/chronomancy/age-manipulation.lua b/game/modules/tome/data/talents/chronomancy/age-manipulation.lua
index 20ac8ff034..f38fc65041 100644
--- a/game/modules/tome/data/talents/chronomancy/age-manipulation.lua
+++ b/game/modules/tome/data/talents/chronomancy/age-manipulation.lua
@@ -157,7 +157,16 @@ newTalent{
points = 5,
paradox = 10,
cooldown = 10,
- tactical = { HEAL = 2, CURE = 2 },
+ tactical = { HEAL = 2, CURE = function(self, t, target)
+ local nb = 0
+ for eff_id, p in pairs(self.tmp) do
+ local e = self.tempeffect_def[eff_id]
+ if e.status == "detrimental" and e.type == "physical" then
+ nb = nb + 1
+ end
+ end
+ return nb
+ end },
is_heal = true,
getHeal = function(self, t) return self:combatTalentSpellDamage(t, 40, 440)*getParadoxModifier(self, pm) end,
getRemoveCount = function(self, t) return math.floor(self:getTalentLevel(t)) end,
diff --git a/game/modules/tome/data/talents/psionic/distortion.lua b/game/modules/tome/data/talents/psionic/distortion.lua
index 8f342f4218..2483c75c7a 100644
--- a/game/modules/tome/data/talents/psionic/distortion.lua
+++ b/game/modules/tome/data/talents/psionic/distortion.lua
@@ -31,7 +31,7 @@ newTalent{
radius = function(self, t) return 1 + math.floor(self:getTalentLevel(t)/3) end,
requires_target = true,
getDamage = function(self, t) return self:combatTalentMindDamage(t, 10, 150) end,
- getDetonateDamage = function(self, t) return self:combatTalentMindDamage(t, 20, 200) end,
+ getDetonateDamage = function(self, t) return self:combatTalentMindDamage(t, 20, 300) end,
target = function(self, t)
return {type="bolt", range=self:getTalentRange(t), talent=t, display={trail="distortion_trail"}}
end,
@@ -60,7 +60,9 @@ newTalent{
require = psi_wil_req2,
cooldown = 6,
psi = 10,
- tactical = { ATTACK = { PHYSICAL = 2}, DISABLE = 2},
+ tactical = { ATTACK = { PHYSICAL = 2},
+ DISABLE = function(self, t, target) if target:hasEffect(target.EFF_DISTORION) then return 4 else return 2 end end,
+ },
range = 0,
radius = function(self, t) return 3 + math.ceil(self:getTalentLevel(t)/2) end,
requires_target = true,
@@ -97,7 +99,9 @@ newTalent{
require = psi_wil_req3,
cooldown = 12,
psi = 20,
- tactical = { ATTACK = { PHYSICAL = 2}, DISABLE = 2},
+ tactical = { ATTACK = { PHYSICAL = 2},
+ DISABLE = function(self, t, target) if target:hasEffect(target.EFF_DISTORION) then return 4 else return 0 end end,
+ },
range = 10,
requires_target = true,
direct_hit = true,
diff --git a/game/modules/tome/data/talents/psionic/dreaming.lua b/game/modules/tome/data/talents/psionic/dreaming.lua
index f72626a2e5..31e72dfca9 100644
--- a/game/modules/tome/data/talents/psionic/dreaming.lua
+++ b/game/modules/tome/data/talents/psionic/dreaming.lua
@@ -142,7 +142,10 @@ newTalent{
require = psi_wil_req3,
psi= 10,
cooldown = 10,
- tactical = { CLOSEIN = 2, ESCAPE = 2 },
+ tactical = {
+ CLOSEIN = function(self, t, target) if target:attr("sleep") or (self:getTalentLevel(t) >= 5 and self:attr("lucid_dreamer")) then return 2 else return 0 end end,
+ ESCAPE = function(self, t, target) if target:attr("sleep") or (self:getTalentLevel(t) >= 5 and self:attr("lucid_dreamer")) then return 2 else return 0 end end,
+ },
range = function(self, t) return 5 + math.min(5, self:getTalentLevelRaw(t)) end,
requires_target = true,
target = function(self, t)
@@ -196,7 +199,7 @@ newTalent{
mode = "sustained",
sustain_psi = 40,
cooldown = 50,
- tactical = { DISABLE=2 },
+ tactical = { DISABLE = function(self, t, target) if target:attr("sleep") then return 4 else return 0 end end},
range = function(self, t) return 5 + math.min(5, self:getTalentLevelRaw(t)) end,
requires_target = true,
target = function(self, t)
@@ -209,13 +212,11 @@ newTalent{
game:playSoundNear(self, "talents/spell_generic")
local ret = {
drain = self:addTemporaryValue("psi_regen", -t.getDrain(self, t)),
- particles = self:addParticles(engine.Particles.new("ultrashield", 1, {rm=0, rM=0, gm=180, gM=255, bm=180, bM=255, am=70, aM=180, radius=0.8, density=60, life=14, instop=20, static=80}))
}
return ret
end,
deactivate = function(self, t, p)
self:removeTemporaryValue("psi_regen", p.drain)
- self:removeParticles(p.particles)
return true
end,
info = function(self, t)
diff --git a/game/modules/tome/data/talents/psionic/mentalism.lua b/game/modules/tome/data/talents/psionic/mentalism.lua
index 0013ba7a31..b3239d44c2 100644
--- a/game/modules/tome/data/talents/psionic/mentalism.lua
+++ b/game/modules/tome/data/talents/psionic/mentalism.lua
@@ -64,7 +64,16 @@ newTalent{
require = psi_wil_req2,
psi = 15,
cooldown = 24,
- tactical = { CURE=2},
+ tactical = { BUFF = 1, CURE = function(self, t, target)
+ local nb = 0
+ for eff_id, p in pairs(self.tmp) do
+ local e = self.tempeffect_def[eff_id]
+ if e.status == "detrimental" and e.type == "mental" then
+ nb = nb + 1
+ end
+ end
+ return nb
+ end,},
no_energy = true,
getRemoveCount = function(self, t) return math.ceil(self:getTalentLevel(t)) end,
action = function(self, t)
@@ -252,6 +261,11 @@ newTalent{
esp = self:addTemporaryValue("esp", {[target.type] = 1}),
}
+ -- Update for ESP
+ game:onTickEnd(function()
+ self:resetCanSeeCache()
+ end)
+
return ret
end,
deactivate = function(self, t, p)
diff --git a/game/modules/tome/data/talents/psionic/nightmare.lua b/game/modules/tome/data/talents/psionic/nightmare.lua
index 986e04de99..b1ef267bed 100644
--- a/game/modules/tome/data/talents/psionic/nightmare.lua
+++ b/game/modules/tome/data/talents/psionic/nightmare.lua
@@ -95,7 +95,7 @@ newTalent{
range = 10,
direct_hit = true,
requires_target = true,
- tactical = { ATTACK = 3 },
+ tactical = { ATTACK = function(self, t, target) if target:attr("sleep") then return 4 else return 2 end end },
getChance = function(self, t) return self:combatTalentMindDamage(t, 15, 50) end,
getDuration = function(self, t) return 2 + math.ceil(self:getTalentLevel(t) * 2) end,
summon_inner_demons = function(self, target, t)
@@ -220,7 +220,7 @@ newTalent{
range = 10,
direct_hit = true,
requires_target = true,
- tactical = { ATTACK = { DARKNESS = 2 }, DISABLE = { confusion = 1, stun = 1, blind = 1 } },
+ tactical = { ATTACK = { DARKNESS = 2 }, DISABLE = function(self, t, target) if target:attr("sleep") then return 4 else return 2 end end },
getChance = function(self, t) return self:combatTalentMindDamage(t, 15, 50) end,
getDamage = function(self, t) return self:combatTalentMindDamage(t, 5, 50) end,
getDuration = function(self, t) return 4 + math.ceil(self:getTalentLevel(t)) end,
diff --git a/game/modules/tome/data/talents/psionic/psychic-assault.lua b/game/modules/tome/data/talents/psionic/psychic-assault.lua
index 5f73e9a4da..43efd7a9fa 100644
--- a/game/modules/tome/data/talents/psionic/psychic-assault.lua
+++ b/game/modules/tome/data/talents/psionic/psychic-assault.lua
@@ -18,77 +18,40 @@
-- darkgod@te4.org
newTalent{
- name = "Sunder Mind",
+ name = "Mind Sear",
type = {"psionic/psychic-assault", 1},
require = psi_wil_req1,
points = 5,
cooldown = 2,
psi = 5,
- tactical = { ATTACK = { MIND = 2}, DISABLE = 1},
range = 7,
+ direct_hit = true,
requires_target = true,
- getDamage = function(self, t) return self:combatTalentMindDamage(t, 10, 150) end,
target = function(self, t)
- return {type="hit", range=self:getTalentRange(t), talent=t}
+ return {type="beam", range=self:getTalentRange(t), talent=t}
end,
+ tactical = { ATTACKAREA = { MIND = 3 } },
+ getDamage = function(self, t) return self:combatTalentMindDamage(t, 10, 300) end,
action = function(self, t)
local tg = self:getTalentTarget(t)
local x, y = self:getTarget(tg)
if not x or not y then return nil end
- local _ _, x, y = self:canProject(tg, x, y)
- local target = game.level.map(x, y, Map.ACTOR)
- if not target then return end
-
- local dam =self:mindCrit(t.getDamage(self, t))
- self:project(tg, x, y, DamageType.MIND, {dam=dam, alwaysHit=true}, {type="mind"})
- target:setEffect(target.EFF_SUNDER_MIND, 2, {power=dam/10})
-
- game:playSoundNear(self, "talents/warp")
+ self:project(tg, x, y, DamageType.MIND, self:mindCrit(t.getDamage(self, t)), {type="mind"})
+ game:playSoundNear(self, "talents/spell_generic")
return true
end,
info = function(self, t)
local damage = t.getDamage(self, t)
- local power = t.getDamage(self, t) / 10
- return ([[Cripples the target's mind, inflicting %0.2f mind damage and reducing it's mental save by %d. This attack always hits and the mental save reduction stacks.
- The damage and save reduction will scale with your mindpower.]]):
- format(damDesc(self, DamageType.MIND, (damage)), power)
+ return ([[Sends a telepathic attack, trying to destroy the brains of any target in the beam, doing %0.2f mind damage.
+ The damage will increase with your mindpower.]]):format(damDesc(self, DamageType.MIND, damage))
end,
}
newTalent{
- name = "Synaptic Static",
+ name = "Psychic Lobotomy",
type = {"psionic/psychic-assault", 2},
require = psi_wil_req2,
points = 5,
- cooldown = 10,
- psi = 10,
- range = 0,
- direct_hit = true,
- requires_target = true,
- radius = function(self, t) return math.min(10, 3 + math.ceil(self:getTalentLevel(t)/2)) end,
- target = function(self, t) return {type="ball", radius=self:getTalentRadius(t), range=self:getTalentRange(t), talent=t, selffire=false} end,
- tactical = { ATTACKAREA = { MIND = 3 }, DISABLE=1 },
- getDamage = function(self, t) return self:combatTalentMindDamage(t, 20, 200) end,
- action = function(self, t)
- local tg = self:getTalentTarget(t)
- self:project(tg, self.x, self.y, DamageType.MIND, {dam=self:mindCrit(self:combatTalentMindDamage(t, 20, 200)), crossTierChance=100} )
- game.level.map:particleEmitter(self.x, self.y, self:getTalentRadius(t), "generic_ball", {radius=self:getTalentRadius(t), rm=100, rM=125, gm=100, gM=125, bm=100, bM=125, am=200, aM=255})
- game:playSoundNear(self, "talents/echo")
- return true
- end,
- info = function(self, t)
- local damage = t.getDamage(self, t)
- local radius = self:getTalentRadius(t)
- return ([[Sends out a blast of telepathic static in a %d radius, inflicting %0.2f mind damage. This attack can brain-lock affected targets.
- The damage will increase with your mindpower.]]):format(radius, damDesc(self, DamageType.MIND, damage))
- end,
-}
-
-newTalent{
- name = "Psychic Lobotomy",
- type = {"psionic/psychic-assault", 3},
- require = psi_wil_req3,
- points = 5,
cooldown = 8,
range = 7,
psi = 10,
@@ -109,8 +72,9 @@ newTalent{
if not target then return nil end
local ai = target.ai or nil
+ local dam = self:mindCrit(t.getDamage(self, t))
if target:canBe("confused") then
- target:setEffect(target.EFF_LOBOTOMIZED, t.getDuration(self, t), {src=self, dam=t.getDamage(self, t), power=t.getPower(self, t), apply_power=self:combatMindpower()})
+ target:setEffect(target.EFF_LOBOTOMIZED, t.getDuration(self, t), {src=self, dam=dam, power=t.getPower(self, t), apply_power=self:combatMindpower()})
else
game.logSeen(target, "%s resists the lobotomy!", target.name:capitalize())
end
@@ -130,31 +94,68 @@ newTalent{
}
newTalent{
- name = "Mind Sear",
+ name = "Synaptic Static",
+ type = {"psionic/psychic-assault", 3},
+ require = psi_wil_req3,
+ points = 5,
+ cooldown = 10,
+ psi = 10,
+ range = 0,
+ direct_hit = true,
+ requires_target = true,
+ radius = function(self, t) return math.min(10, 3 + math.ceil(self:getTalentLevel(t)/2)) end,
+ target = function(self, t) return {type="ball", radius=self:getTalentRadius(t), range=self:getTalentRange(t), talent=t, selffire=false} end,
+ tactical = { ATTACKAREA = { MIND = 3 }, DISABLE=1 },
+ getDamage = function(self, t) return self:combatTalentMindDamage(t, 20, 200) end,
+ action = function(self, t)
+ local tg = self:getTalentTarget(t)
+ self:project(tg, self.x, self.y, DamageType.MIND, {dam=self:mindCrit(self:combatTalentMindDamage(t, 20, 200)), crossTierChance=100} )
+ game.level.map:particleEmitter(self.x, self.y, self:getTalentRadius(t), "generic_ball", {radius=self:getTalentRadius(t), rm=100, rM=125, gm=100, gM=125, bm=100, bM=125, am=200, aM=255})
+ game:playSoundNear(self, "talents/echo")
+ return true
+ end,
+ info = function(self, t)
+ local damage = t.getDamage(self, t)
+ local radius = self:getTalentRadius(t)
+ return ([[Sends out a blast of telepathic static in a %d radius, inflicting %0.2f mind damage. This attack can brain-lock affected targets.
+ The damage will increase with your mindpower.]]):format(radius, damDesc(self, DamageType.MIND, damage))
+ end,
+}
+
+newTalent{
+ name = "Sunder Mind",
type = {"psionic/psychic-assault", 4},
require = psi_wil_req4,
points = 5,
cooldown = 2,
psi = 5,
+ tactical = { ATTACK = { MIND = 2}, DISABLE = 1},
range = 7,
- direct_hit = true,
requires_target = true,
+ getDamage = function(self, t) return self:combatTalentMindDamage(t, 10, 300) end,
target = function(self, t)
- return {type="beam", range=self:getTalentRange(t), talent=t}
+ return {type="hit", range=self:getTalentRange(t), talent=t}
end,
- tactical = { ATTACKAREA = { MIND = 3 } },
- getDamage = function(self, t) return self:combatTalentMindDamage(t, 10, 300) end,
action = function(self, t)
local tg = self:getTalentTarget(t)
local x, y = self:getTarget(tg)
if not x or not y then return nil end
- self:project(tg, x, y, DamageType.MIND, self:mindCrit(t.getDamage(self, t)), {type="mind"})
- game:playSoundNear(self, "talents/spell_generic")
+ local _ _, x, y = self:canProject(tg, x, y)
+ local target = game.level.map(x, y, Map.ACTOR)
+ if not target then return end
+
+ local dam =self:mindCrit(t.getDamage(self, t))
+ self:project(tg, x, y, DamageType.MIND, {dam=dam, alwaysHit=true}, {type="mind"})
+ target:setEffect(target.EFF_SUNDER_MIND, 2, {power=dam/10})
+
+ game:playSoundNear(self, "talents/warp")
return true
end,
info = function(self, t)
local damage = t.getDamage(self, t)
- return ([[Sends a telepathic attack, trying to destroy the brains of any target in the beam, doing %0.2f mind damage.
- The damage will increase with your mindpower.]]):format(damDesc(self, DamageType.MIND, damage))
+ local power = t.getDamage(self, t) / 10
+ return ([[Cripples the target's mind, inflicting %0.2f mind damage and reducing it's mental save by %d for 2 turns. This attack always hits and the mental save reduction stacks.
+ The damage and save reduction will scale with your mindpower.]]):
+ format(damDesc(self, DamageType.MIND, (damage)), power)
end,
}
\ No newline at end of file
diff --git a/game/modules/tome/data/talents/psionic/slumber.lua b/game/modules/tome/data/talents/psionic/slumber.lua
index 3b320948d4..5dc7a56fdb 100644
--- a/game/modules/tome/data/talents/psionic/slumber.lua
+++ b/game/modules/tome/data/talents/psionic/slumber.lua
@@ -116,7 +116,7 @@ newTalent{
require = psi_wil_req4,
cooldown = 24,
psi = 40,
- tactical = { DISABLE = {sleep = 2} },
+ tactical = { DISABLE = function(self, t, target) if target:attr("sleep") then return 4 else return 0 end end},
direct_hit = true,
requires_target = true,
range = function(self, t) return 5 + math.min(5, self:getTalentLevelRaw(t)) end,
@@ -212,6 +212,12 @@ newTalent{
end
game.logPlayer(game.player, "#LIGHT_BLUE#You are taken to the Dreamscape!")
+
+ -- Learn about solipsists
+ if target == game.player then
+ game:setAllowedBuild("psionic_solipsist", true)
+ end
+
end)
local power = self:mindCrit(t.getPower(self, t))
diff --git a/game/modules/tome/data/talents/psionic/solipsism.lua b/game/modules/tome/data/talents/psionic/solipsism.lua
index b8b808de5d..3965eceff2 100644
--- a/game/modules/tome/data/talents/psionic/solipsism.lua
+++ b/game/modules/tome/data/talents/psionic/solipsism.lua
@@ -27,13 +27,19 @@ newTalent{
getConversionRatio = function(self, t) return math.min(0.25 + self:getTalentLevel(t) * 0.1, 1) end,
on_learn = function(self, t)
if self:getTalentLevelRaw(t) == 1 then
- self:incMaxPsi((self:getWil()-10) * 1)
- self.max_life = self.max_life - (self:getCon()-10) * 0.5
self.inc_resource_multi.psi = (self.inc_resource_multi.psi or 0) + 1
self.inc_resource_multi.life = (self.inc_resource_multi.life or 0) - 0.5
self.life_rating = math.ceil(self.life_rating/2)
self.psi_rating = self.psi_rating + 10
self.solipsism_threshold = (self.solipsism_threshold or 0) + 0.2
+
+ -- Adjust the values onTickEnd for NPCs to make sure these table values are resolved
+ -- If we're not the player, we resetToFull to ensure correct values
+ game:onTickEnd(function()
+ self:incMaxPsi((self:getWil()-10) * 1)
+ self.max_life = self.max_life - (self:getCon()-10) * 0.5
+ if self ~= game.player then self:resetToFull() end
+ end)
end
end,
on_unlearn = function(self, t)
@@ -63,11 +69,16 @@ newTalent{
getBalanceRatio = function(self, t) return math.min(0.25 + self:getTalentLevel(t) * 0.1, 1) end,
on_learn = function(self, t)
if self:getTalentLevelRaw(t) == 1 then
- self:incMaxPsi((self:getWil()-10) * 1)
- self.max_life = self.max_life - (self:getCon()-10) * 0.5
self.inc_resource_multi.psi = (self.inc_resource_multi.psi or 0) + 1
self.inc_resource_multi.life = (self.inc_resource_multi.life or 0) - 0.5
self.solipsism_threshold = (self.solipsism_threshold or 0) + 0.1
+ -- Adjust the values onTickEnd for NPCs to make sure these table values are filled out
+ -- If we're not the player, we resetToFull to ensure correct values
+ game:onTickEnd(function()
+ self:incMaxPsi((self:getWil()-10) * 1)
+ self.max_life = self.max_life - (self:getCon()-10) * 0.5
+ if self ~= game.player then self:resetToFull() end
+ end)
end
end,
on_unlearn = function(self, t)
@@ -97,11 +108,16 @@ newTalent{
on_learn = function(self, t)
self.clarity_threshold = t.getClarityThreshold(self, t)
if self:getTalentLevelRaw(t) == 1 then
- self:incMaxPsi((self:getWil()-10) * 1)
- self.max_life = self.max_life - (self:getCon()-10) * 0.5
self.inc_resource_multi.psi = (self.inc_resource_multi.psi or 0) + 1
self.inc_resource_multi.life = (self.inc_resource_multi.life or 0) - 0.5
self.solipsism_threshold = (self.solipsism_threshold or 0) + 0.1
+ -- Adjust the values onTickEnd for NPCs to make sure these table values are resolved
+ -- If we're not the player, we resetToFull to ensure correct values
+ game:onTickEnd(function()
+ self:incMaxPsi((self:getWil()-10) * 1)
+ self.max_life = self.max_life - (self:getCon()-10) * 0.5
+ if self ~= game.player then self:resetToFull() end
+ end)
end
end,
on_unlearn = function(self, t)
@@ -133,11 +149,16 @@ newTalent{
getSavePercentage = function(self, t) return math.min(0.4 + self:getTalentLevel(t) * 0.16, 1.5) end,
on_learn = function(self, t)
if self:getTalentLevelRaw(t) == 1 then
- self:incMaxPsi((self:getWil()-10) * 1)
- self.max_life = self.max_life - (self:getCon()-10) * 0.5
self.inc_resource_multi.psi = (self.inc_resource_multi.psi or 0) + 1
self.inc_resource_multi.life = (self.inc_resource_multi.life or 0) - 0.5
self.solipsism_threshold = (self.solipsism_threshold or 0) + 0.1
+ -- Adjust the values onTickEnd for NPCs to make sure these table values are resolved
+ -- If we're not the player, we resetToFull to ensure correct values
+ game:onTickEnd(function()
+ self:incMaxPsi((self:getWil()-10) * 1)
+ self.max_life = self.max_life - (self:getCon()-10) * 0.5
+ if self ~= game.player then self:resetToFull() end
+ end)
end
end,
on_unlearn = function(self, t)
diff --git a/game/modules/tome/data/talents/psionic/thought-forms.lua b/game/modules/tome/data/talents/psionic/thought-forms.lua
index 5af9d16220..28cd2e8544 100644
--- a/game/modules/tome/data/talents/psionic/thought-forms.lua
+++ b/game/modules/tome/data/talents/psionic/thought-forms.lua
@@ -80,7 +80,10 @@ newTalent{
-- Keep them on a leash
on_act = function(self)
local t = self.summoner:getTalentFromId(self.summoner.T_TF_BOWMAN)
- if not game.level:hasEntity(self.summoner) or core.fov.distance(self.x, self.y, self.summoner.x, self.summoner.y) > self.summoner:getTalentRange(t) then
+ if not game.level:hasEntity(self.summoner) or self.summoner.dead or not self.summoner:isTalentActive(self.summoner.T_TF_BOWMAN) then
+ self:die(self)
+ end
+ if game.level:hasEntity(self.summoner) and core.fov.distance(self.x, self.y, self.summoner.x, self.summoner.y) > self.summoner:getTalentRange(t) then
local Map = require "engine.Map"
local x, y = util.findFreeGrid(self.summoner.x, self.summoner.y, 5, true, {[Map.ACTOR]=true})
if not x then
@@ -143,7 +146,9 @@ newTalent{
return ret
end,
deactivate = function(self, t, p)
- p.summon:die(p.summon)
+ if p.summon and p.summon.summoner == self then
+ p.summon:die(p.summon)
+ end
if p.speed then self:removeTemporaryValue("combat_mindspeed", p.speed) end
return true
end,
@@ -216,7 +221,10 @@ newTalent{
-- Keep them on a leash
on_act = function(self)
local t = self.summoner:getTalentFromId(self.summoner.T_TF_WARRIOR)
- if not game.level:hasEntity(self.summoner) or core.fov.distance(self.x, self.y, self.summoner.x, self.summoner.y) > self.summoner:getTalentRange(t) then
+ if not game.level:hasEntity(self.summoner) or self.summoner.dead or not self.summoner:isTalentActive(self.summoner.T_TF_WARRIOR) then
+ self:die(self)
+ end
+ if game.level:hasEntity(self.summoner) and core.fov.distance(self.x, self.y, self.summoner.x, self.summoner.y) > self.summoner:getTalentRange(t) then
local Map = require "engine.Map"
local x, y = util.findFreeGrid(self.summoner.x, self.summoner.y, 5, true, {[Map.ACTOR]=true})
if not x then
@@ -278,7 +286,9 @@ newTalent{
return ret
end,
deactivate = function(self, t, p)
- p.summon:die(p.summon)
+ if p.summon and p.summon.summoner == self then
+ p.summon:die(p.summon)
+ end
if p.power then self:removeTemporaryValue("combat_mindpower", p.power) end
return true
end,
@@ -351,7 +361,10 @@ newTalent{
-- Keep them on a leash
on_act = function(self)
local t = self.summoner:getTalentFromId(self.summoner.T_TF_DEFENDER)
- if not game.level:hasEntity(self.summoner) or core.fov.distance(self.x, self.y, self.summoner.x, self.summoner.y) > self.summoner:getTalentRange(t) then
+ if not game.level:hasEntity(self.summoner) or self.summoner.dead or not self.summoner:isTalentActive(self.summoner.T_TF_DEFENDER) then
+ self:die(self)
+ end
+ if game.level:hasEntity(self.summoner) and core.fov.distance(self.x, self.y, self.summoner.x, self.summoner.y) > self.summoner:getTalentRange(t) then
local Map = require "engine.Map"
local x, y = util.findFreeGrid(self.summoner.x, self.summoner.y, 5, true, {[Map.ACTOR]=true})
if not x then
@@ -415,7 +428,9 @@ newTalent{
return ret
end,
deactivate = function(self, t, p)
- p.summon:die(p.summon)
+ if p.summon and p.summon.summoner == self then
+ p.summon:die(p.summon)
+ end
if p.resist then self:removeTemporaryValue("resists", p.resist) end
return true
end,
@@ -464,7 +479,7 @@ newTalent{
local bonus = t.getStatBonus(self, t)
local range = self:getTalentRange(t)
return([[Forge a guardian from your thoughts alone. Your guardian's primary stat will be improved by %d and it's two secondary stats by %d.
- At talent level one you may forge a mighty bowman clad in leather armor, at level three a powerful warrior wielding a two-handed weapon, and at level five a strong defender using a sword and shield, and at talent level 5
+ At talent level one you may forge a mighty bowman clad in leather armor, at level three a powerful warrior wielding a two-handed weapon, and at level five a strong defender using a sword and shield.
Thought forms can only be maintained up to a range of %d and will rematerialize next to you if this range is exceeded.
Only one thought-form may be active at a time and the stat bonuses will improve with your mindpower.]]):format(bonus, bonus/2, range)
end,
diff --git a/game/modules/tome/data/texts/unlock-psionic_solipsist.lua b/game/modules/tome/data/texts/unlock-psionic_solipsist.lua
new file mode 100644
index 0000000000..900bda75b9
--- /dev/null
+++ b/game/modules/tome/data/texts/unlock-psionic_solipsist.lua
@@ -0,0 +1,36 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+return "New Class: #LIGHT_GREEN#Solipsist (Psionic)",
+[[Solipsists are powerful psionicists that believe that the world is made up of nothing more than the thoughts and dreams of those that live in it.
+This power does not come without a price however, and the Solipsist must constantly fight with their own ego in order to keep a clear view of reality, lest they fall into a state of solipsism, the belief that the world and those that live in it is nothing more than a figment of thier mind.
+
+You've experienced the power of dreams first hand and may now create characters with the #LIGHT_GREEN#Solipsist class#WHITE#.
+
+Solipsists use the power of thought and dreams to manipulate the world around them.
+Class features:#YELLOW#
+- Distort the fabric of reality
+- Store and discharge psionic feedback
+- Summon powerful warriors birthed from your own consciousness
+- Convert damage you take into Psi damage and keep yourself alive with your mental reserves
+- Put your foes to sleep, enter their dreams, and become their worst nightmare#WHITE#
+
+Solipsists use their mind to manipulate the world around them.
+They require energy to do so, which they recover naturally over time and through methods others use to heal the body.
+]]
diff --git a/game/modules/tome/data/timed_effects/mental.lua b/game/modules/tome/data/timed_effects/mental.lua
index e7edf0c872..1f5f7d9c15 100644
--- a/game/modules/tome/data/timed_effects/mental.lua
+++ b/game/modules/tome/data/timed_effects/mental.lua
@@ -2273,7 +2273,7 @@ newEffect{
on_lose = function(self, err) return "#Target#'s regains it's senses.", "-Lobotomized" end,
parameters = { power=1, dam=1 },
activate = function(self, eff)
- DamageType:get(DamageType.MIND).projector(eff.src or self, self.x, self.y, DamageType.MIND, eff.src:mindCrit(eff.dam))
+ DamageType:get(DamageType.MIND).projector(eff.src or self, self.x, self.y, DamageType.MIND, {dam=eff.dam, alwaysHit=true})
eff.power = math.max(eff.power - (self:attr("confusion_immune") or 0) * 100, 10)
eff.tmpid = self:addTemporaryValue("confused", eff.power)
eff.cid = self:addTemporaryValue("inc_stats", {[Stats.STAT_CUN]=-eff.power/2})
@@ -2345,10 +2345,22 @@ newEffect{
parameters = { power=100 },
on_gain = function(self, err) return "A psychic field forms around #target#.", "+Resonance Shield" end,
on_lose = function(self, err) return "The psychic field around #target# crumbles.", "-Resonance Shield" end,
+ damage_feedback = function(self, eff, src, value)
+ if eff.particle and eff.particle._shader and eff.particle._shader.shad and src and src.x and src.y then
+ local r = -rng.float(0.2, 0.4)
+ local a = math.atan2(src.y - self.y, src.x - self.x)
+ eff.particle._shader:setUniform("impact", {math.cos(a) * r, math.sin(a) * r})
+ eff.particle._shader:setUniform("impact_tick", core.game.getTime())
+ end
+ end,
activate = function(self, eff)
self.resonance_field_absorb = eff.power
- eff.particle = self:addParticles(engine.Particles.new("ultrashield", 1, {rm=255, rM=255, gm=180, gM=255, bm=0, bM=0, am=70, aM=180, radius=0.4, density=60, life=14, instop=1, static=100}))
eff.sid = self:addTemporaryValue("resonance_field", eff.power)
+ if core.shader.active() then
+ eff.particle = self:addParticles(Particles.new("shader_shield", 1, {img="shield2", size_factor=1.25}, {type="shield", time_factor=6000, color={1, 1, 0}}))
+ else
+ eff.particle = self:addParticles(Particles.new("time_shield_bubble", 1))
+ end
end,
deactivate = function(self, eff)
self.resonance_field_absorb = nil
@@ -2433,7 +2445,11 @@ newEffect{
if dream_prison then
eff.dur = eff.dur + 1
if not eff.particle then
- eff.particle = self:addParticles(engine.Particles.new("ultrashield", 1, {rm=0, rM=0, gm=180, gM=255, bm=180, bM=255, am=70, aM=180, radius=0.4, density=60, life=14, instop=1, static=100}))
+ if core.shader.active() then
+ eff.particle = self:addParticles(Particles.new("shader_shield", 1, {img="shield2", size_factor=1.25}, {type="shield", time_factor=6000, aadjust=5, color={0, 1, 1}}))
+ else
+ eff.particle = self:addParticles(engine.Particles.new("ultrashield", 1, {rm=0, rM=0, gm=180, gM=255, bm=180, bM=255, am=70, aM=180, radius=0.4, density=60, life=14, instop=1, static=100}))
+ end
end
elseif eff.contagious > 0 and eff.dur > 1 then
local t = eff.src:getTalentFromId(eff.src.T_SLEEP)
@@ -2443,7 +2459,7 @@ newEffect{
self:removeParticles(eff.particle)
end
-- Incriment Insomnia Duration
- eff.insomnia_duration = eff.insomnia_duration + 1
+ eff.insomnia_duration = math.min(eff.insomnia_duration + 1, 10)
end,
activate = function(self, eff)
eff.insomnia_duration = 0
@@ -2485,13 +2501,17 @@ newEffect{
if dream_prison then
eff.dur = eff.dur + 1
if not eff.particle then
- eff.particle = self:addParticles(engine.Particles.new("ultrashield", 1, {rm=0, rM=0, gm=180, gM=255, bm=180, bM=255, am=70, aM=180, radius=0.4, density=60, life=14, instop=1, static=100}))
+ if core.shader.active() then
+ eff.particle = self:addParticles(Particles.new("shader_shield", 1, {img="shield2", size_factor=1.25}, {type="shield", time_factor=6000, aadjust=5, color={0, 1, 1}}))
+ else
+ eff.particle = self:addParticles(engine.Particles.new("ultrashield", 1, {rm=0, rM=0, gm=180, gM=255, bm=180, bM=255, am=70, aM=180, radius=0.4, density=60, life=14, instop=1, static=100}))
+ end
end
elseif eff.particle and not dream_prison then
self:removeParticles(eff.particle)
end
-- Incriment Insomnia Duration
- eff.insomnia_duration = eff.insomnia_duration + 1
+ eff.insomnia_duration = math.min(eff.insomnia_duration + 1, 10)
end,
activate = function(self, eff)
eff.insomnia_duration = 0
@@ -2533,7 +2553,11 @@ newEffect{
if dream_prison then
eff.dur = eff.dur + 1
if not eff.particle then
- eff.particle = self:addParticles(engine.Particles.new("ultrashield", 1, {rm=0, rM=0, gm=180, gM=255, bm=180, bM=255, am=70, aM=180, radius=0.4, density=60, life=14, instop=1, static=100}))
+ if core.shader.active() then
+ eff.particle = self:addParticles(Particles.new("shader_shield", 1, {img="shield2", size_factor=1.25}, {type="shield", aadjust=5, color={0, 1, 1}}))
+ else
+ eff.particle = self:addParticles(engine.Particles.new("ultrashield", 1, {rm=0, rM=0, gm=180, gM=255, bm=180, bM=255, am=70, aM=180, radius=0.4, density=60, life=14, instop=1, static=100}))
+ end
end
else
-- Store the power for later
@@ -2548,7 +2572,7 @@ newEffect{
self:removeParticles(eff.particle)
end
-- Incriment Insomnia Duration
- eff.insomnia_duration = eff.insomnia_duration + 1
+ eff.insomnia_duration = math.min(eff.insomnia_duration + 1, 10)
end,
activate = function(self, eff)
eff.insomnia_duration = 0
diff --git a/game/modules/tome/data/timed_effects/other.lua b/game/modules/tome/data/timed_effects/other.lua
index 6bf3208081..8364315403 100644
--- a/game/modules/tome/data/timed_effects/other.lua
+++ b/game/modules/tome/data/timed_effects/other.lua
@@ -1557,7 +1557,7 @@ newEffect{
newEffect{
name = "SOLIPSISM", image = "talents/solipsism.png",
desc = "Solipsism",
- long_desc = function(self, eff) return ("This creature has fallen into a solipsistic state and is caught up in its own thoughts (-%d%% global speed)."):format(eff.power * 100) end,
+ long_desc = function(self, eff) return ("This creature has fallen into a solipsistic state and is caught up in its own egoic thoughts (-%d%% global speed)."):format(eff.power * 100) end,
type = "other",
subtype = { psionic=true },
status = "detrimental",
@@ -1575,7 +1575,7 @@ newEffect{
newEffect{
name = "CLARITY", image = "talents/clarity.png",
desc = "Clarity",
- long_desc = function(self, eff) return ("The creature has found a state of clarity (+%d%% global speed)."):format(eff.power * 100) end,
+ long_desc = function(self, eff) return ("The creature has found a state of clarity and sees the world for what it is (+%d%% global speed)."):format(eff.power * 100) end,
type = "other",
subtype = { psionic=true },
status = "beneficial",
@@ -1616,14 +1616,16 @@ newEffect{
-- Create a clone for later spawning
local m = require("mod.class.NPC").new(eff.target:clone{
shader = "shadow_simulacrum",
- shader_args = { color = {0.0, 0.4, 0.8}, base = 0.6 },
+ shader_args = { color = {0.0, 1, 1}, base = 0.6 },
no_drops = true,
faction = eff.target.faction,
summoner = eff.target, summoner_gain_exp=true,
ai_target = {actor=nil},
ai = "summoned", ai_real = "tactical",
+ ai_state = eff.target.ai_state or { ai_move="move_dmap", talent_in=1 },
name = eff.target.name.."'s dream projection",
})
+ m.ai_state.ally_compassion = 10
m:removeAllMOs()
m.make_escort = nil
m.on_added_to_level = nil
@@ -1659,8 +1661,11 @@ newEffect{
-- track number killed
m.on_die = function(self, who)
if who then
- local p = who:hasEffect(who.EFF_DREAMSCAPE) or who.summoner:hasEffect(who.summoner.EFF_DREAMSCAPE)
- p.projections_killed = p.projections_killed + 1
+ local p = who:hasEffect(who.EFF_DREAMSCAPE)
+ if p then -- For the rare instance we die after the effect ends but before the dreamscape instance closes
+ p.projections_killed = p.projections_killed + 1
+ game.logSeen(p.target, "#LIGHT_RED#%s writhes in agony as a fragment of it's mind is destroyed!", p.target.name:capitalize())
+ end
end
end
@@ -1679,6 +1684,11 @@ newEffect{
m:resetCanSeeCache()
end
end
+
+ -- Try to insure the AI isn't attacking the invulnerable actor
+ if self.ai_target and self.ai_target.actor and self.ai_target.actor:attr("invulnerable") then
+ self.ai_target.actor = nil
+ end
end
end,
activate = function(self, eff)
@@ -1687,8 +1697,13 @@ newEffect{
eff.sid = eff.target:addTemporaryValue("time_prison", 1)
eff.tid = eff.target:addTemporaryValue("no_timeflow", 1)
eff.imid = eff.target:addTemporaryValue("status_effect_immune", 1)
- eff.particle = eff.target:addParticles(engine.Particles.new("ultrashield", 1, {rm=0, rM=0, gm=180, gM=255, bm=180, bM=255, am=70, aM=180, radius=0.4, density=60, life=14, instop=1, static=100}))
eff.target.energy.value = 0
+ if core.shader.active() then
+ eff.particle = eff.target:addParticles(Particles.new("shader_shield", 1, {img="shield2", size_factor=1.25}, {type="shield", time_factor=6000, aadjust=5, color={0, 1, 1}}))
+ else
+ eff.particle = eff.target:addParticles(Particles.new("damage_shield", 1))
+ end
+
-- Make the invader deadly
eff.pid = self:addTemporaryValue("inc_damage", {all=eff.power})
eff.did = self:addTemporaryValue("lucid_dreamer", 1)
@@ -1772,8 +1787,13 @@ newEffect{
-- Apply Dreamscape hit
if eff.projections_killed > 0 then
- eff.target:takeHit(eff.target.max_life/10 * eff.projections_killed, self)
- eff.target:setEffect(eff.target.EFF_BRAINLOCKED, eff.projections_killed, {})
+ local kills = eff.projections_killed
+ eff.target:takeHit(eff.target.max_life/10 * kills, self)
+ eff.target:setEffect(eff.target.EFF_BRAINLOCKED, kills, {})
+
+ local loss = "loss"
+ if kills >= 10 then loss = "potentially fatal loss" elseif kills >=8 then loss = "devastating loss" elseif kills >=6 then loss = "tremendous loss" elseif kills >=4 then loss = "terrible loss" end
+ game.logSeen(eff.target, "#LIGHT_RED#%s suffered a %s of self in the Dreamscape!", eff.target.name:capitalize(), loss)
end
end)
end,
diff --git a/game/modules/tome/data/zones/dreamscape-talent/zone.lua b/game/modules/tome/data/zones/dreamscape-talent/zone.lua
index 77d915b063..d9596b8510 100644
--- a/game/modules/tome/data/zones/dreamscape-talent/zone.lua
+++ b/game/modules/tome/data/zones/dreamscape-talent/zone.lua
@@ -46,7 +46,7 @@ return {
},
},
post_process = function(level)
- game.state:makeWeather(level, 6, {max_nb=2, chance=1, dir=120, speed={0.1, 0.9}, alpha={0.2, 0.4}, particle_name="weather/grey_cloud_%02d"})
+ game.state:makeWeather(level, 6, {max_nb=2, chance=1, dir=120, r=0.8, g=0.4, b=0.8, speed={0.1, 0.9}, alpha={0.2, 0.4}, particle_name="weather/grey_cloud_%02d"})
end,
foreground = function(level, dx, dx, nb_keyframes)
local tick = core.game.getTime()
--
GitLab