From c6666417ae48fc8f3b6cc9198b7c37ab849a0d15 Mon Sep 17 00:00:00 2001
From: Shibari <ShibariTOME@Gmail.com>
Date: Sun, 2 Jul 2017 01:24:27 -0400
Subject: [PATCH] Standardize and add more information to some of the
inscription short infos
Number changes
Redesign Biting Gale and Acid Wave some
Finalize Mirror Image code
Redesign Primal Infusion
Lower NPC max attack rune count to 1
Move Shatter Afflictions and Wild to utility instead of protect
Update AI tactical tables for inscriptions
---
.../tome/data/general/objects/scrolls.lua | 58 +++---
.../data/general/objects/world-artifacts.lua | 21 +--
.../tome/data/talents/misc/inscriptions.lua | 173 +++++++-----------
.../tome/data/timed_effects/physical.lua | 13 +-
game/modules/tome/resolvers.lua | 2 +-
5 files changed, 113 insertions(+), 154 deletions(-)
diff --git a/game/modules/tome/data/general/objects/scrolls.lua b/game/modules/tome/data/general/objects/scrolls.lua
index b5757dfca8..aebc4c483f 100644
--- a/game/modules/tome/data/general/objects/scrolls.lua
+++ b/game/modules/tome/data/general/objects/scrolls.lua
@@ -138,9 +138,9 @@ newEntity{ base = "BASE_INFUSION",
inscription_kind = "heal",
inscription_data = {
- cooldown = resolvers.rngrange(7, 13),
- heal = resolvers.mbonus_level(80, 20, function(e, v) return v * 0.06 end),
- use_stat_mod = 2.4,
+ cooldown = resolvers.rngrange(9, 13),
+ heal = resolvers.mbonus_level(80, 40, function(e, v) return v * 0.06 end),
+ use_stat_mod = 2,
},
inscription_talent = "INFUSION:_HEALING",
}
@@ -167,7 +167,7 @@ newEntity{ base = "BASE_INFUSION",
rarity = 15,
cost = 20,
chance = resolvers.mbonus_level(80, -20), -- No chance of 2 cleanses until higher ilvl to discourage rerolling the earliest shops
- inscription_kind = "protect",
+ inscription_kind = "utility",
inscription_data = resolvers.generic(function(e)
local what = {}
local effects = {physical=true, mental=true, magical=true}
@@ -179,10 +179,10 @@ newEntity{ base = "BASE_INFUSION",
what[eff2] = true
end
return {
- cooldown = rng.range(12, 17),
- dur = rng.mbonus(4, resolvers.current_level, resolvers.mbonus_max_level) + 4,
- power = rng.mbonus(20, resolvers.current_level, resolvers.mbonus_max_level) + 10,
- use_stat_mod = 0.1,
+ cooldown = rng.range(12, 16),
+ dur = rng.range(2, 4),
+ power = resolvers.mbonus_level(10, 15), -- Low variance because duration and chance for second debuff type is enough randomness
+ use_stat_mod = 0.2, -- +20% resist all at 100 stat
what=what,
}
end),
@@ -197,7 +197,7 @@ newEntity{ base = "BASE_INFUSION",
inscription_kind = "movement",
inscription_data = {
- cooldown = resolvers.rngrange(13, 20),
+ cooldown = resolvers.rngrange(13, 20), -- High variance because this is the only really important stat
speed = resolvers.mbonus_level(500, 300, function(e, v) return v * 0.001 end),
use_stat_mod = 3,
},
@@ -226,12 +226,12 @@ newEntity{ base = "BASE_INFUSION",
newEntity{ base = "BASE_RUNE",
name = "teleportation rune",
level_range = {1, 50},
- rarity = 35, -- Very rare because item quality has little impact on this
+ rarity = 50, -- Very rare because item quality has little impact on this
cost = 10,
inscription_kind = "teleport",
inscription_data = {
- cooldown = resolvers.rngrange(14, 19),
+ cooldown = resolvers.rngrange(10, 20), -- High variance because this is the only really important stat
range = resolvers.mbonus_level(100, 20, function(e, v) return v * 0.03 end),
use_stat_mod = 1,
},
@@ -254,26 +254,22 @@ newEntity{ base = "BASE_RUNE",
inscription_talent = "RUNE:_SHIELDING",
}
--- Very strong debuff, very low damage and scaling
--- This is mostly aimed at classes that want a decent way to land their stuns more reliably
newEntity{ base = "BASE_RUNE",
name = "biting gale rune",
- level_range = {10, 50},
+ level_range = {20, 50},
rarity = 20,
cost = 20,
inscription_kind = "attack",
inscription_data = {
- cooldown = resolvers.rngrange(15, 22),
- power = resolvers.mbonus_level(100, 30, function(e, v) return v * 0.1 end),
- apply = resolvers.mbonus_level(5, 20, function(e, v) return v * 0.1 end),
- radius = 6,
- use_stat_mod = 1.2,
+ cooldown = resolvers.rngrange(15, 19),
+ power = resolvers.mbonus_level(200, 30, function(e, v) return v * 0.1 end),
+ dur = 5,
+ use_stat_mod = 2.2,
},
inscription_talent = "RUNE:_BITING_GALE",
}
--- Weaker debuff, medium damage and scaling
newEntity{ base = "BASE_RUNE",
name = "acid wave rune",
level_range = {20, 50},
@@ -282,11 +278,9 @@ newEntity{ base = "BASE_RUNE",
inscription_kind = "attack",
inscription_data = {
- cooldown = resolvers.rngrange(15, 25),
- radius = 6,
- power = resolvers.mbonus_level(250, 40, function(e, v) return v * 0.1 end),
- apply = resolvers.mbonus_level(5, 20, function(e, v) return v * 0.1 end),
- use_stat_mod = 1.2,
+ cooldown = resolvers.rngrange(15, 19),
+ power = resolvers.mbonus_level(200, 30, function(e, v) return v * 0.1 end),
+ use_stat_mod = 2.2,
dur = 5,
},
inscription_talent = "RUNE:_ACID_WAVE",
@@ -295,7 +289,7 @@ newEntity{ base = "BASE_RUNE",
newEntity{ base = "BASE_RUNE",
name = "manasurge rune",
level_range = {1, 50},
- rarity = 25,
+ rarity = 50, -- Very rare because only a limited number of classes have any use for this
cost = 10,
inscription_kind = "utility",
@@ -326,7 +320,7 @@ newEntity{ base = "BASE_RUNE",
newEntity{ base = "BASE_RUNE",
name = "stormshield rune",
- level_range = {20, 50},
+ level_range = {30, 50},
rarity = 25,
cost = 20,
inscription_kind = "protect",
@@ -345,10 +339,10 @@ newEntity{ base = "BASE_RUNE",
level_range = {1, 50},
rarity = 15,
cost = 10,
- inscription_kind = "protect",
+ inscription_kind = "utility",
inscription_data = {
- cooldown = resolvers.rngrange(14, 19),
- shield = resolvers.mbonus_level(100, 50, function(e, v) return v * 0.06 end),
+ cooldown = resolvers.rngrange(16, 20),
+ shield = resolvers.mbonus_level(100, 20, function(e, v) return v * 0.06 end),
use_stat_mod = 1 -- 1x, applied up to 3 times
},
inscription_talent = "RUNE:_SHATTER_AFFLICTIONS",
@@ -362,8 +356,8 @@ newEntity{ base = "BASE_RUNE",
inscription_kind = "protect",
inscription_data = {
cooldown = resolvers.rngrange(16, 22),
- dur = resolvers.mbonus_level(5, 3),
- power = resolvers.mbonus_level(8, 7, function(e, v) return v * 1 end),
+ dur = 5,
+ power = resolvers.mbonus_level(20, 7, function(e, v) return v * 1 end),
resist = resolvers.mbonus_level(30, 10),
move = resolvers.mbonus_level(20, 10),
reduction = 0.5,
diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua
index ae5b1b5df3..77a8de045a 100644
--- a/game/modules/tome/data/general/objects/world-artifacts.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts.lua
@@ -65,30 +65,26 @@ newEntity{ base = "BASE_GEM",
},
}
--- Low base values because you can stack affinity and resist
--- The 3rd type is pretty meaningless balance-wise. Magic debuffs hardly matter. The real advantage is the affinity.
newEntity{ base = "BASE_INFUSION",
name = "Primal Infusion", unique=true, image = "object/artifact/primal_infusion.png",
desc = [[This wild infusion has evolved.]],
unided_name = "pulsing infusion",
- level_range = {15, 40},
+ level_range = {15, 50},
rarity = 300,
- cost = 300,
- material_level = 3,
+ cost = 500,
inscription_kind = "protect",
inscription_data = {
cooldown = 18,
- dur = 6,
+ dur = 5,
+ reduce = 1,
power = 10,
- use_stat_mod = 0.1,
- use_stat = "con",
- what = {physical=true, mental=true, magical=true},
+ use_stat_mod = 0.02, -- +2 duration reduction and +20% affinity at 100 stat
+ use_stat = "wil",
},
inscription_talent = "INFUSION:_PRIMAL",
}
--- Unique but generated randomly without any link to tier/level
newEntity{ base = "BASE_RUNE",
name = "Prismatic Rune", unique=true, define_as="RUNE_PRISMATIC",
level_range = {5, 50},
@@ -102,7 +98,7 @@ newEntity{ base = "BASE_RUNE",
num_types = resolvers.rngrange(3, 5),
wards = {},
resolvers.genericlast(function(e)
- e.inscription_data.wards["PHYSICAL"] = resolvers.rngrange(3, 5) -- guarantee physical wards
+ e.inscription_data.wards["PHYSICAL"] = resolvers.rngrange(2, 4) -- guarantee physical wards
for _ = 1,e.inscription_data.num_types do
local pick = rng.tableRemove(e.types)
e.inscription_data.wards[pick] = resolvers.rngrange(3, 5)
@@ -112,7 +108,6 @@ newEntity{ base = "BASE_RUNE",
inscription_talent = "RUNE:_PRISMATIC",
}
--- Unique but generated randomly without any link to tier/level
newEntity{ base = "BASE_RUNE",
name = "Mirror Image Rune", unique=true, define_as="RUNE_MIRROR_IMAGE",
level_range = {5, 50},
@@ -120,7 +115,7 @@ newEntity{ base = "BASE_RUNE",
cost = 500,
inscription_kind = "protect",
inscription_data = {
- cooldown = 18,
+ cooldown = 24,
dur = 6,
inheritance = 1,
},
diff --git a/game/modules/tome/data/talents/misc/inscriptions.lua b/game/modules/tome/data/talents/misc/inscriptions.lua
index 611fc44469..bdde843ad5 100644
--- a/game/modules/tome/data/talents/misc/inscriptions.lua
+++ b/game/modules/tome/data/talents/misc/inscriptions.lua
@@ -126,7 +126,7 @@ newInscription{
end,
short_info = function(self, t)
local data = self:getInscriptionData(t.short_name)
- return ([[heal %d]]):format(data.heal + data.inc_stat)
+ return ([[heal %d; %d cd]]):format(data.heal + data.inc_stat, data.cooldown)
end,
}
@@ -166,57 +166,34 @@ newInscription{
local what = table.concatNice(table.keys(data.what), ", ", " and ")
return ([[Activate the infusion to cure yourself of one random %s effect and reduce all damage taken by %d%% for %d turns.
-
Also removes cross-tier effects of the affected types for free.]]):format(what, data.power+data.inc_stat, data.dur)
end,
short_info = function(self, t)
local data = self:getInscriptionData(t.short_name)
local what = table.concat(table.keys(data.what), ", ")
- return ([[resist %d%%; cure %s]]):format(data.power + data.inc_stat, what)
+ return ([[resist %d%%; cure %s; dur %d]]):format(data.power + data.inc_stat, what, data.dur)
end,
}
--- fixedart wild variant
--- Needs update with 1.6
newInscription{
name = "Infusion: Primal", image = "talents/infusion__wild.png",
type = {"inscriptions/infusions", 1},
points = 1,
no_energy = true,
- tactical = {
- DEFEND = 2,
- CURE = function(self, t, target)
- local data = self:getInscriptionData(t.short_name)
- return #self:effectsFilter({types=data.what, status="detrimental"})
- end
- },
+ tactical = {DEFEND = 2, CURE = 2},
action = function(self, t)
local data = self:getInscriptionData(t.short_name)
-
- local target = self
- local effs = {}
- local force = {}
- local removed = 0
-
- removed = target:removeEffectsFilter({types=data.what, subtype={["cross tier"] = true}, status="detrimental"})
- removed = removed + target:removeEffectsFilter({types=data.what, status="detrimental"}, 1)
- if removed > 0 then
- game.logSeen(self, "%s is cured!", self.name:capitalize())
- end
- self:setEffect(self.EFF_PRIMAL_ATTUNEMENT, data.dur, {power=data.power + data.inc_stat})
+ self:setEffect(self.EFF_PRIMAL_ATTUNEMENT, data.dur, {power=data.power + data.inc_stat*10, reduce=data.reduce + data.inc_stat})
return true
end,
info = function(self, t)
local data = self:getInscriptionData(t.short_name)
- local what = table.concatNice(table.keys(data.what), ", ", " or ")
-
- return ([[Activate the infusion to cure yourself of one random %s effect and increase affinity for all damage by %d%% (scales with Constitution) for %d turns.
-Also removes cross-tier effects of the affected types for free.]]):format(what, data.power+data.inc_stat, data.dur)
+ return ([[Activate the infusion to heal for %d%% of all damage taken (calculated before resistances) and reduce the duration of a random debuff by %d each turn for %d turns.]]):
+ format(data.power+data.inc_stat*10, data.reduce + data.inc_stat, data.dur)
end,
short_info = function(self, t)
local data = self:getInscriptionData(t.short_name)
- local what = table.concat(table.keys(data.what), ", ")
- return ([[affinity %d%%; cure %s]]):format(data.power + data.inc_stat, what)
+ return ([[affinity %d%%; reduction %d]]):format(data.power + data.inc_stat*10, data.reduce + data.inc_stat)
end,
}
@@ -225,7 +202,7 @@ newInscription{
type = {"inscriptions/infusions", 1},
points = 1,
no_energy = true,
- tactical = { DEFEND = 1, ESCAPE = 1, CLOSEIN = 1 },
+ tactical = { ESCAPE = 1, CLOSEIN = 1 },
on_pre_use = function(self, t) return not self:attr("never_move") end,
action = function(self, t)
local data = self:getInscriptionData(t.short_name)
@@ -250,7 +227,7 @@ newInscription{
type = {"inscriptions/infusions", 1},
points = 1,
no_energy = true,
- tactical = { BUFF = 1, DEFEND = 1 },
+ tactical = { DEFEND = 1 },
action = function(self, t)
local data = self:getInscriptionData(t.short_name)
self:setEffect(self.EFF_HEROISM, data.dur, {die_at=data.die_at + data.inc_stat * 30})
@@ -264,7 +241,7 @@ newInscription{
end,
short_info = function(self, t)
local data = self:getInscriptionData(t.short_name)
- return ([[%d turns, die at -%d]]):format(data.dur, data.die_at + data.inc_stat * 30)
+ return ([[%d turns; die at -%d; %d cd]]):format(data.dur, data.die_at + data.inc_stat * 30, data.cooldown)
end,
}
@@ -317,7 +294,6 @@ local function attack_rune(self, btid)
end
end
--- Activate a second time to return?
newInscription{
name = "Rune: Teleportation",
type = {"inscriptions/runes", 1},
@@ -364,7 +340,7 @@ newInscription{
end,
short_info = function(self, t)
local data = self:getInscriptionData(t.short_name)
- return ([[absorb %d for %d turns]]):format(data.power + data.inc_stat, data.dur)
+ return ([[absorb %d; %d turns; %d cd]]):format(data.power + data.inc_stat, data.dur, data.cooldown)
end,
}
@@ -396,7 +372,7 @@ newInscription{
local data = self:getInscriptionData(t.short_name)
local power = 100+5*self:getMag()
if data.power and data.inc_stat then power = data.power + data.inc_stat end
- return ([[absorb and reflect %d for %d turns]]):format(power, data.dur or 5)
+ return ([[absorb and reflect %d; %d turns]]):format(power, data.dur or 5)
end,
}
@@ -407,18 +383,10 @@ newInscription{
is_attack_rune = true,
no_energy = true,
is_spell = true,
- tactical = { ATTACK = { COLD = 1 }, DISABLE = { stun = 1 }, CURE = function(self, t, target)
- local nb = 0
- local data = self:getInscriptionData(t.short_name)
- for eff_id, p in pairs(self.tmp) do
- local e = self.tempeffect_def[eff_id]
- if e.type == "mental" and e.status == "detrimental" then nb = nb + 1 end
- end
- return nb
- end },
+ tactical = { ATTACK = { COLD = 1 }, DISABLE = { stun = 1 } },
requires_target = true,
- range = 0,
radius = 6,
+ range = 0,
target = function(self, t)
return {type="cone", cone_angle=25, radius = self:getTalentRadius(t), range=self:getTalentRange(t), talent=t, display={particle="bolt_ice", trail="icetrail"}}
end,
@@ -428,38 +396,31 @@ newInscription{
local x, y = self:getTarget(tg)
if not x or not y then return nil end
- local damage = data.power + data.inc_stat -- Cut by ~2/3rds or so
- local apply = self:rescaleCombatStats((data.apply + data.inc_stat))
-
- -- local apply = data.apply + data.inc_stat -- Same calculation as Sun Infusion, goes above what PCs can get on power stats pretty easily
+ local damage = data.power + data.inc_stat
self:project(tg, x, y, function(tx, ty)
local target = game.level.map(tx, ty, Map.ACTOR)
if not target or target == self then return end
- -- Minor damage, apply stun resist reduction, freeze
DamageType:get(DamageType.COLD).projector(self, tx, ty, DamageType.COLD, damage)
- target:setEffect(target.EFF_WET, 5, {apply_power=data.inc_stat})
+ target:setEffect(target.EFF_WET, 5, {})
if target:canBe("stun") then
- target:setEffect(target.EFF_FROZEN, 2, {hp=damage*1.5, apply_power=apply})
+ target:setEffect(target.EFF_FROZEN, data.dur, {hp=damage*2})
end
end, data.power + data.inc_stat, {type="freeze"})
- self:removeEffectsFilter({status="detrimental", type="mental", ignore_crosstier=true}, 1)
game:playSoundNear(self, "talents/ice")
attack_rune(self, t.id)
return true
end,
info = function(self, t)
local data = self:getInscriptionData(t.short_name)
- local apply = self:rescaleCombatStats((data.apply + data.inc_stat))
return ([[Activate the rune to direct a cone of chilling stormwind doing %0.2f cold damage.
- The storm will soak enemies hit reducing their resistance to stuns by 50%% then attempt to freeze them for 3 turns (with power %d vs. physical save).
- The deep cold also crystalizes your mind, removing one random detrimental mental effect from you.]]):
- format(damDesc(self, DamageType.COLD, data.power + data.inc_stat), apply)
+ The storm will soak enemies hit reducing their resistance to stuns by 50%% then attempt to freeze them for %d.
+ These effects can be resisted but not saved against.]]):
+ format(damDesc(self, DamageType.COLD, data.power + data.inc_stat), data.dur)
end,
short_info = function(self, t)
local data = self:getInscriptionData(t.short_name)
- local apply = self:rescaleCombatStats((data.apply + data.inc_stat))
- return ([[%d cold damage; freeze 3 turns with power %d]]):format(damDesc(self, DamageType.COLD, data.power + data.inc_stat), apply)
+ return ([[%d damage; %d turns]]):format(damDesc(self, DamageType.COLD, data.power + data.inc_stat), data.dur)
end,
}
@@ -472,25 +433,14 @@ newInscription{
is_spell = true,
tactical = {
ATTACKAREA = { ACID = 1 },
- CURE = function(self, t, target)
- local nb = 0
- local data = self:getInscriptionData(t.short_name)
- for eff_id, p in pairs(self.tmp) do
- local e = self.tempeffect_def[eff_id]
- if e.type == "magical" and e.status == "detrimental" then nb = nb + 1 end
- end
- return nb
- end
+ DISABLE = { disarm = 1 }
},
requires_target = true,
direct_hit = true,
+ radius = 6,
range = 0,
- radius = function(self, t)
- local data = self:getInscriptionData(t.short_name)
- return data.radius
- end,
target = function(self, t)
- return {type="cone", radius=self:getTalentRadius(t), range = 0, selffire=false, cone_angle=5, talent=t}
+ return {type="cone", radius=self:getTalentRadius(t), range=self:getTalentRange(t), selffire=false, cone_angle=25, talent=t}
end,
action = function(self, t)
local data = self:getInscriptionData(t.short_name)
@@ -498,19 +448,14 @@ newInscription{
local x, y = self:getTarget(tg)
if not x or not y then return nil end
- local apply = self:rescaleCombatStats((data.apply + data.inc_stat))
-
- self:removeEffectsFilter({status="detrimental", type="magical", ignore_crosstier=true}, 1)
self:project(tg, x, y, function(tx, ty)
local target = game.level.map(tx, ty, Map.ACTOR)
if not target or target == self then return end
if target:canBe("disarm") then
- target:setEffect(target.EFF_DISARMED, data.dur, {apply_power=apply})
+ target:setEffect(target.EFF_DISARMED, data.dur, {})
end
-
DamageType:get(DamageType.ACID).projector(self, tx, ty, DamageType.ACID, data.power + data.inc_stat)
-
end)
game.level.map:particleEmitter(self.x, self.y, tg.radius, "breath_acid", {radius=tg.radius, tx=x-self.x, ty=y-self.y})
@@ -520,18 +465,15 @@ newInscription{
end,
info = function(self, t)
local data = self:getInscriptionData(t.short_name)
- local pow = data.apply + data.inc_stat
- local apply = self:rescaleCombatStats((data.apply + data.inc_stat))
- return ([[Activate the rune to unleash a wave of acid in a cone of radius %d, doing %0.2f acid damage. The corrosive acid will also disarm enemies struck for %d turns (with power %d vs. physical save).
- The surge of natural acids will remove one detrimental magical effect from you.]]):
- format(self:getTalentRadius(t), damDesc(self, DamageType.ACID, data.power + data.inc_stat), data.dur or 3, apply)
+ return ([[Activate the rune to unleash a cone dealing %0.2f acid damage.
+ The corrosive acid will also disarm enemies struck for %d turns.
+ This effect can be resisted but not saved against.]]):
+ format(damDesc(self, DamageType.ACID, data.power + data.inc_stat), data.dur or 3)
end,
short_info = function(self, t)
local data = self:getInscriptionData(t.short_name)
local pow = data.power
- local apply = self:rescaleCombatStats((data.apply + data.inc_stat))
-
- return ([[%d acid damage; disarm %d turns with power %d]]):format(damDesc(self, DamageType.ACID, data.power + data.inc_stat), data.dur or 3, apply)
+ return ([[%d damage; %d turns]]):format(damDesc(self, DamageType.ACID, data.power + data.inc_stat), data.dur or 3)
end,
}
@@ -684,11 +626,17 @@ newInscription{
points = 1,
is_spell = true,
is_teleport = true,
- tactical = { CLOSEIN = 2 },
+ tactical = { ESCAPE = 1, CLOSEIN = 1 },
+ range = function(self, t)
+ local data = self:getInscriptionData(t.short_name)
+ return data.range + data.inc_stat
+ end,
+ target = function(self, t) return {type="hit", nolock=true, pass_terrain=false, nowarning=true, range=t.range(self, t),
+ grid_params = {want_range = (not self.ai_target.actor or self.ai_state.tactic == "escape") and 6 or 1 } } end,
getDur = function(self, t) return 3 end,
action = function(self, t)
local data = self:getInscriptionData(t.short_name)
- local tg = {type="beam", nolock=true, pass_terrain=false, nowarning=true, range=data.range + data.inc_stat, radius=1, requires_knowledge=false}
+ local tg = self:getTalentTarget(t)
local x, y = self:getTarget(tg)
if not x then return end
if not self:hasLOS(x, y) then return end
@@ -728,7 +676,7 @@ newInscription{
points = 1,
is_spell = true,
no_energy = true,
- --tactical = { DEFEND = 3, ESCAPE = 2 },
+ tactical = { ESCAPE = 1 },
getDur = function(self, t) return 5 end,
getResistance = function(self, t)
local data = self:getInscriptionData(t.short_name)
@@ -758,7 +706,7 @@ newInscription{
format(t.getDur(self, t),t.getReduction(self, t) * 100, t.getResistance(self, t), t.getMove(self, t), t.getPower(self, t))
end,
short_info = function(self, t)
- return ([[power %d, resist %d%%, move %d%%, %d turns]]):format(t.getPower(self, t), t.getResistance(self, t), t.getMove(self, t), t.getDur(self, t))
+ return ([[power %d; resist %d%%; move %d%%; %d turns]]):format(t.getPower(self, t), t.getResistance(self, t), t.getMove(self, t), t.getDur(self, t))
end,
}
@@ -770,7 +718,8 @@ newInscription{
type = {"inscriptions/runes", 1},
points = 1,
is_spell = true,
- tactical = { DEFEND = 3 },
+ no_energy = true,
+ tactical = { DEFEND = 1 },
getDur = function(self, t)
local data = self:getInscriptionData(t.short_name)
return data.dur
@@ -795,7 +744,7 @@ newInscription{
:format(t.getDur(self, t), t.getThreshold(self, t), t.getBlocks(self, t) )
end,
short_info = function(self, t)
- return ([[threshold %d, blocks %d, %d turns]]):format(t.getThreshold(self, t), t.getBlocks(self, t), t.getDur(self, t) )
+ return ([[threshold %d; blocks %d; %d turns]]):format(t.getThreshold(self, t), t.getBlocks(self, t), t.getDur(self, t) )
end,
}
@@ -829,7 +778,7 @@ newInscription{
short_info = function(self, t)
local data = self:getInscriptionData(t.short_name)
local str = table.concat(table.keys(data.wards), ", ")
- return ([[%d turns, %s]]):format(t.getDur(self, t), str:lower() )
+ return ([[%d turns; %s]]):format(t.getDur(self, t), str:lower() )
end,
}
@@ -840,7 +789,7 @@ newInscription{
image = "talents/phase_shift.png", -- re-used icon
points = 1,
is_spell = true,
- --tactical = { DEFEND = 3, ESCAPE = 2 },
+ no_npc_use, -- You can't taunt players
getDur = function(self, t)
local data = self:getInscriptionData(t.short_name)
return data.dur
@@ -879,9 +828,12 @@ newInscription{
local image = NPC.new{
name = "Mirror Image",
type = "image", subtype = "image",
+ ai = "summoned", ai_real = nil, ai_state = { talent_in=1, }, ai_target = {actor=nil},
desc = "A blurred image.",
image = caster.image,
- add_mos = caster.add_mos, -- this is horribly wrong isn't it?
+ add_mos = caster.add_mos, -- this is horribly wrong isn't it? seems to work though
+ shader = "shadow_simulacrum", shader_args = { color = {0.0, 0.4, 0.8}, base = 0.6, time_factor = 1500 },
+ exp_worth=0,
max_life = caster.max_life,
life = caster.max_life, -- We don't want to make this only useful before you take damage
combat_armor_hardiness = caster:combatArmorHardiness(),
@@ -893,17 +845,18 @@ newInscription{
life_rating = 0,
cant_be_moved = 1,
never_move = 1,
+ never_anger = true,
resolvers.talents{
[Talents.T_TAUNT]=1, -- Add the talent so the player can see it even though we cast it manually
},
- on_act = function(self) -- avoid any interaction with .. uh, anything, for now
- self:forceUseTalent(self.T_TAUNT, {ignore_cd=true, ignore_energy=true})
+ on_act = function(self) -- avoid any interaction with .. uh, anything
+ self:forceUseTalent(self.T_TAUNT, {ignore_cd=true, no_talent_fail = true})
end,
faction = caster.faction,
- summoner = caster, summoner_gain_exp=true,
+ summoner = caster,
summon_time=t.getDur(self, t),
no_breath = 1,
- remove_from_party_on_death = true
+ remove_from_party_on_death = true,
}
image:resolve()
@@ -912,8 +865,11 @@ newInscription{
control=false,
type="summon",
title="Summon",
- orders = {target=true, leash=true, anchor=true, talents=true},
+ temporary_level = true,
+ orders = {},
})
+
+ image:forceUseTalent(image.T_TAUNT, {})
end
end
end
@@ -938,7 +894,14 @@ newInscription{
image = "talents/warp_mine_away.png", -- re-used icon
type = {"inscriptions/runes", 1},
points = 1,
- tactical = { },
+ tactical = { CURE = function(self, t, target)
+ local types = 0
+ types = types + #self:effectsFilter({status="detrimental", type="physical"}, 1)
+ types = types + #self:effectsFilter({status="detrimental", type="magical"}, 1)
+ types = types + #self:effectsFilter({status="detrimental", type="mental"}, 1)
+ return types
+ end
+ },
is_spell = true,
no_energy = true,
getShield = function(self, t)
@@ -964,7 +927,7 @@ newInscription{
end,
short_info = function(self, t)
local data = self:getInscriptionData(t.short_name)
- return ([[cooldown %d, shield %d ]]):format(data.cooldown, data.shield + data.inc_stat)
+ return ([[cooldown %d; absorb %d ]]):format(data.cooldown, data.shield + data.inc_stat)
end,
}
@@ -974,7 +937,7 @@ newInscription{
type = {"inscriptions/runes", 1},
points = 1,
is_spell = true,
- tactical = {},
+ no_npc_use = true, -- Quest reward
range = 10,
direct_hit = true,
action = function(self, t)
diff --git a/game/modules/tome/data/timed_effects/physical.lua b/game/modules/tome/data/timed_effects/physical.lua
index 91f0879def..9090b5ee00 100644
--- a/game/modules/tome/data/timed_effects/physical.lua
+++ b/game/modules/tome/data/timed_effects/physical.lua
@@ -854,15 +854,14 @@ newEffect{
end,
}
--- artifact wild infusion
newEffect{
name = "PRIMAL_ATTUNEMENT", image = "talents/infusion__wild.png",
desc = "Primal Attunement",
- long_desc = function(self, eff) return ("The target is attuned to the wild, increasing all damage affinity by %d%%."):format(eff.power) end,
+ long_desc = function(self, eff) return ("The target is attuned to the wild, increasing all damage affinity by %d%% and reducing a random debuff duration by %d%%."):format(eff.power, eff.reduce) end,
type = "physical",
subtype = { nature=true },
status = "beneficial",
- parameters = { power=20 },
+ parameters = { power=20, reduce = 3 },
on_gain = function(self, err) return "#Target# attunes to the wild.", "+Primal" end,
on_lose = function(self, err) return "#Target# is no longer one with nature.", "-Primal" end,
activate = function(self, eff)
@@ -871,6 +870,14 @@ newEffect{
deactivate = function(self, eff)
self:removeTemporaryValue("damage_affinity", eff.pid)
end,
+ on_timeout = function(self, eff)
+ local effs = self:effectsFilter({status = "detrimental", ignore_crosstier = true}, 1)
+ local eff2 = self:hasEffect(effs[1])
+ if eff2 then
+ eff2.dur = eff2.dur - eff.reduce
+ if eff2.dur <= 0 then self:removeEffect(eff2) end
+ end
+ end,
}
newEffect{
diff --git a/game/modules/tome/resolvers.lua b/game/modules/tome/resolvers.lua
index c528c21e18..72eb40ab2f 100644
--- a/game/modules/tome/resolvers.lua
+++ b/game/modules/tome/resolvers.lua
@@ -837,7 +837,7 @@ end
local inscriptions_max = {
heal = 1,
protect = 1,
- attack = 4,
+ attack = 1, -- Reduce instant cast NPC bursts
movement = 1,
utility = 6,
teleport = 0, -- Annoying
--
GitLab