From 13800606275efcbb564465d13aa9921434d6f596 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 3 Oct 2011 15:39:42 +0000
Subject: [PATCH] Big saves overhaul: <li>Display change: Combat
stats(Accuracy, Spellpower, Mindpower, Physical power) and Saves (Defense,
Spell save, Mental save, Physical save) are now computed on a O to 100 scale,
split in 5 tiers. In each tier it takes more points to upgrade. So if you
have 22 spellpower and wear a new item granting +2 spellpower you only get up
to 23 spellpower. *This does NOT change the damage you are doing since a
similar scale was applied to damage done in previous betas*</li> <li>Saves
now reduce the duration of timed effects</li> <li>When a creature is hit by a
special effect from a creature whose combat stat is in a tier over the
target's save tier it triggers a "cross tier effect"</li> <li>Cross tier
effects are dependant on the nature of the effet. A powerful knockback will
set a target offbalance, a terrible mind attack will brainlock the target, a
overpowering spell will spellshock the target</li> <li>Tooltips show both
combat stats & saves for all creature</li>
git-svn-id: http://svn.net-core.org/repos/t-engine4@4498 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Actor.lua | 62 ++++--
game/modules/tome/class/Object.lua | 3 +
game/modules/tome/class/PlayerDisplay.lua | 17 +-
game/modules/tome/class/interface/Archery.lua | 2 +-
game/modules/tome/class/interface/Combat.lua | 192 +++++++++++++---
.../tome/class/interface/TooltipsData.lua | 37 ++--
.../tome/data/birth/races/tutorial.lua | 6 +-
game/modules/tome/data/damage_types.lua | 70 +++---
.../data/general/objects/boss-artifacts.lua | 2 +-
.../tome/data/general/objects/egos/weapon.lua | 4 +-
.../data/general/objects/quest-artifacts.lua | 2 +-
.../data/general/objects/world-artifacts.lua | 14 +-
.../tome/data/maps/vaults/trickvault.lua | 8 +
.../tome/data/talents/chronomancy/energy.lua | 2 +-
.../talents/chronomancy/spacetime-folding.lua | 1 +
.../tome/data/talents/corruptions/blight.lua | 1 +
.../tome/data/talents/corruptions/scourge.lua | 4 +-
.../tome/data/talents/cunning/ambush.lua | 4 +-
.../tome/data/talents/cunning/dirty.lua | 4 +-
.../tome/data/talents/cunning/traps.lua | 10 +-
.../tome/data/talents/cursed/slaughter.lua | 3 +-
.../tome/data/talents/gifts/fire-drake.lua | 2 +-
.../tome/data/talents/gifts/sand-drake.lua | 2 +-
.../tome/data/talents/gifts/storm-drake.lua | 1 +
.../data/talents/gifts/summon-utility.lua | 2 +-
.../tome/data/talents/misc/horrors.lua | 5 +-
game/modules/tome/data/talents/misc/misc.lua | 1 +
game/modules/tome/data/talents/misc/npcs.lua | 20 +-
.../tome/data/talents/misc/tutorial.lua | 207 ++++++++++++++++++
.../tome/data/talents/psionic/absorption.lua | 2 +-
.../talents/psionic/augmented-mobility.lua | 7 +-
.../psionic/finer-energy-manipulations.lua | 25 +--
.../tome/data/talents/psionic/focus.lua | 9 +-
.../tome/data/talents/psionic/grip.lua | 8 +-
.../tome/data/talents/psionic/projection.lua | 6 +-
.../tome/data/talents/psionic/voracity.lua | 53 +++--
.../data/talents/spells/arcane-shield.lua | 4 +-
.../tome/data/talents/spells/golem.lua | 7 +-
.../tome/data/talents/spells/staff-combat.lua | 10 +-
.../tome/data/talents/techniques/2hweapon.lua | 12 +-
.../tome/data/talents/techniques/archery.lua | 6 +-
.../talents/techniques/battle-tactics.lua | 2 +-
.../data/talents/techniques/bloodthirst.lua | 2 +-
.../tome/data/talents/techniques/bow.lua | 7 +-
.../talents/techniques/combat-training.lua | 26 ++-
.../data/talents/techniques/dualweapon.lua | 2 +-
.../data/talents/techniques/field-control.lua | 7 +-
.../talents/techniques/finishing-moves.lua | 6 +-
.../data/talents/techniques/grappling.lua | 12 +-
.../tome/data/talents/techniques/sling.lua | 12 +-
.../tome/data/talents/techniques/thuggery.lua | 2 +-
.../talents/techniques/unarmed-discipline.lua | 2 +-
.../talents/techniques/unarmed-training.lua | 10 +-
.../tome/data/talents/techniques/warcries.lua | 2 +-
.../tome/data/talents/undeads/ghoul.lua | 2 +-
.../texts/tutorial/combat-stats-intro.lua | 23 ++
.../tome/data/timed_effects/magical.lua | 21 ++
.../tome/data/timed_effects/mental.lua | 48 +++-
.../tome/data/timed_effects/physical.lua | 18 +-
59 files changed, 782 insertions(+), 259 deletions(-)
create mode 100644 game/modules/tome/data/talents/misc/tutorial.lua
create mode 100644 game/modules/tome/data/texts/tutorial/combat-stats-intro.lua
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 2218c8de7c..afb140a958 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -285,7 +285,7 @@ function _M:actBase()
end
-- Cooldown talents
- if not self:attr("stunned") then self:cooldownTalents() end
+ if not self:attr("no_talents_cooldown") then self:cooldownTalents() end
-- Regen resources
self:regenLife()
if self:knowTalent(self.T_UNNATURAL_BODY) then
@@ -650,7 +650,7 @@ function _M:move(x, y, force)
if self:attr("lightning_speed") or self:attr("step_up") or self:attr("wild_speed") then blur = 3 end
self:setMoveAnim(ox, oy, config.settings.tome.smooth_move, blur)
end
-
+
if moved and not force and self:knowTalent(self.T_HASTE) and self:hasEffect(self.EFF_HASTE) then
local t = self:getTalentFromId(self.T_HASTE)
t.do_haste_double(self, t, ox, oy)
@@ -871,6 +871,13 @@ function _M:getRankLifeAdjust(value)
end
end
+
+
+
+
+
+
+
function _M:getRankResistAdjust()
if self.rank == 1 then return 0.4, 0.9
elseif self.rank == 2 then return 0.5, 1.5
@@ -906,6 +913,26 @@ function _M:TextSizeCategory()
return sizecat
end
+function _M:colorStats(stat)
+ local score = math.floor(self[stat](self, fake))
+
+ if score <= 9 then
+ return "#B4B4B4# "..score
+ elseif score <= 20 then
+ return "#B4B4B4#"..score
+ elseif score <= 40 then
+ return "#FFFFFF#"..score
+ elseif score <= 60 then
+ return "#00FF80#"..score
+ elseif score <= 80 then
+ return "#0080FF#"..score
+ elseif score <= 99 then
+ return "#8d55ff#"..score
+ elseif score == 100 then
+ return "#8d55ff#**"
+ end
+end
+
function _M:tooltip(x, y, seen_by)
if seen_by and not seen_by:canSee(self) then return end
local factcolor, factstate, factlevel = "#ANTIQUE_WHITE#", "neutral", Faction:factionReaction(self.faction, game.player.faction)
@@ -944,26 +971,31 @@ function _M:tooltip(x, y, seen_by)
ts:add(self.type:capitalize(), " / ", self.subtype:capitalize(), true)
ts:add("Rank: ") ts:merge(rank_color:toTString()) ts:add(rank, {"color", "WHITE"}, true)
ts:add({"color", 0, 255, 255}, ("Level: %d"):format(self.level), {"color", "WHITE"}, true)
- ts:add(("Exp: %d/%d"):format(self.exp, self:getExpChart(self.level+1) or "---"), true)
- if self.life >= 0 then
- ts:add({"color", 255, 0, 0}, ("HP: %d (%d%%)"):format(self.life, self.life * 100 / self.max_life), {"color", "WHITE"}, true)
- else
- ts:add({"color", 255, 0, 0}, "HP: ???", {"color", "WHITE"}, true)
- end
+ ts:add({"color", 255, 0, 0}, ("HP: %d (%d%%)"):format(self.life, self.life * 100 / self.max_life), {"color", "WHITE"}, true)
+
if self:attr("encased_in_ice") then
local eff = self:hasEffect(self.EFF_FROZEN)
ts:add({"color", 0, 255, 128}, ("Iceblock: %d"):format(eff.hp), {"color", "WHITE"}, true)
end
- ts:add(("Stats: %d / %d / %d / %d / %d / %d"):format(self:getStr(), self:getDex(), self:getCon(), self:getMag(), self:getWil(), self:getCun()), true)
- ts:add("Resists: ", table.concat(resists, ','), true)
- ts:add("Armour/Defense: ", tostring(math.floor(self:combatArmor())), ' / ', tostring(math.floor(self:combatDefense(true))), true)
+ --ts:add(("Stats: %d / %d / %d / %d / %d / %d"):format(self:getStr(), self:getDex(), self:getCon(), self:getMag(), self:getWil(), self:getCun()), true)
+ if #resists > 0 then ts:add("Resists: ", table.concat(resists, ','), true) end
+ ts:add("Hardiness/Armour: ", tostring(math.floor(self:combatArmorHardiness())), '% / ', tostring(math.floor(self:combatArmor())), true)
ts:add("Size: ", {"color", "ANTIQUE_WHITE"}, self:TextSizeCategory(), {"color", "WHITE"}, true)
+
+ ts:add("#FFD700#Accuracy#FFFFFF#: ", self:colorStats("combatAttack"), " ")
+ ts:add("#0080FF#Defense#FFFFFF#: ", self:colorStats("combatDefense"), true)
+ ts:add("#FFD700#P. power#FFFFFF#: ", self:colorStats("combatPhysicalpower"), " ")
+ ts:add("#0080FF#P. save#FFFFFF#: ", self:colorStats("combatPhysicalResist"), true)
+ ts:add("#FFD700#S. power#FFFFFF#: ", self:colorStats("combatSpellpower"), " ")
+ ts:add("#0080FF#S. save#FFFFFF#: ", self:colorStats("combatSpellResist"), true)
+ ts:add("#FFD700#M. power#FFFFFF#: ", self:colorStats("combatMindpower"), " ")
+ ts:add("#0080FF#M. save#FFFFFF#: ", self:colorStats("combatMentalResist"), true)
if self.summon_time then
ts:add("Time left: ", {"color", "ANTIQUE_WHITE"}, ("%d"):format(self.summon_time), {"color", "WHITE"}, true)
end
- ts:add(self.desc, true)
+ if self.desc then ts:add(self.desc, true) end
if self.faction and Faction.factions[self.faction] then ts:add("Faction: ") ts:merge(factcolor:toTString()) ts:add(("%s (%s, %d)"):format(Faction.factions[self.faction].name, factstate, factlevel), {"color", "WHITE"}, true) end
- ts:add("Personal reaction: ") ts:merge(pfactcolor:toTString()) ts:add(("%s, %d"):format(pfactstate, pfactlevel), {"color", "WHITE"}, true)
+ if game.player ~= self then ts:add("Personal reaction: ") ts:merge(pfactcolor:toTString()) ts:add(("%s, %d"):format(pfactstate, pfactlevel), {"color", "WHITE"}, true) end
for tid, act in pairs(self.sustain_talents) do
if act then ts:add("- ", {"color", "LIGHT_GREEN"}, self:getTalentFromId(tid).name, {"color", "WHITE"}, true) end
@@ -2939,7 +2971,8 @@ function _M:on_set_temporary_effect(eff_id, e, p)
p.maximum = p.dur
p.minimum = p.min_dur or 0 --Default minimum duration is 0. Can specify something else by putting min_dur=foo in p when calling setEffect()
save = self[p.apply_save or save_for_effects[e.type]](self)
- local duration = p.maximum - math.max(0, math.floor((save - p.apply_power) / 10))
+ --local duration = p.maximum - math.max(0, math.floor((save - p.apply_power) / 5))
+ local duration = p.maximum - math.max(0, (math.floor(save/5) - math.floor(p.apply_power/5)))
p.dur = util.bound(duration, p.minimum or 0, p.maximum)
p.amount_decreased = p.maximum - p.dur
local save_type = nil
@@ -2951,6 +2984,7 @@ function _M:on_set_temporary_effect(eff_id, e, p)
elseif save_type == "combatSpellResist"
then p.save_string = "Spell save"
end
+ if not p.no_ct_effect and e.status == "detrimental" then self:crossTierEffect(eff_id, p.apply_power, p.apply_save or save_for_effects[e.type]) end
p.total_dur = p.dur
p.apply_power = nil
end
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index d15e12389c..4206e7763c 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -728,6 +728,9 @@ function _M:getTextualDesc(compare_with)
compare_fields(w, compare_with, field, "combat_spellpower", "%+d", "Spellpower: ")
compare_fields(w, compare_with, field, "combat_spellcrit", "%+d%%", "Spell crit. chance: ")
+
+ compare_fields(w, compare_with, field, "combat_mindpower", "%+d", "Mindpower: ")
+ compare_fields(w, compare_with, field, "combat_mindcrit", "%+d%%", "Mental crit. chance: ")
compare_fields(w, compare_with, field, "lite", "%+d", "Light radius: ")
compare_fields(w, compare_with, field, "infravision", "%+d", "Infravision radius: ")
diff --git a/game/modules/tome/class/PlayerDisplay.lua b/game/modules/tome/class/PlayerDisplay.lua
index 04555214ee..0f76a3215f 100644
--- a/game/modules/tome/class/PlayerDisplay.lua
+++ b/game/modules/tome/class/PlayerDisplay.lua
@@ -195,7 +195,7 @@ function _M:display()
self:mouseTooltip(("#GOLD##{bold}#%s\n#WHITE##{normal}#Unused stats: %d\nUnused class talents: %d\nUnused generic talents: %d\nUnused categories: %d"):format(player.name, player.unused_stats, player.unused_talents, player.unused_generics, player.unused_talents_types), self.w, self.font_h, 0, h, function()
player:playerLevelup()
end)
--- h = h + self.font_h
+ h = h + self.font_h
end
self.font:setStyle("bold")
@@ -205,6 +205,21 @@ function _M:display()
self:mouseTooltip(self.TOOLTIP_LEVEL, self:makeTexture(("Level / Exp: #00ff00#%s / %2d%%"):format(player.level, 100 * cur_exp / max_exp), x, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_GOLD, self:makeTexture(("Gold: #00ff00#%0.2f"):format(player.money or 0), x, h, 255, 255, 255)) h = h + self.font_h
+ --Display attack, defense, spellpower, mindpower, and saves.
+ local attack_stats = {{"combatAttack", "TOOLTIP_COMBAT_ATTACK", "Accuracy:"}, {"combatPhysicalpower", "TOOLTIP_COMBAT_PHYSICAL_POWER", "P. power:"}, {"combatSpellpower", "TOOLTIP_SPELL_POWER", "S. power:"}, {"combatMindpower", "TOOLTIP_MINDPOWER", "M. power:"}, {"combatDefense", "TOOLTIP_DEFENSE", "Defense:"}, {"combatPhysicalResist", "TOOLTIP_PHYS_SAVE", "P. save:"}, {"combatSpellResist", "TOOLTIP_SPELL_SAVE", "S. save:"}, {"combatMentalResist", "TOOLTIP_MENTAL_SAVE", "M. save:"}}
+
+ local attack_stat_color = "#FFD700#"
+ local defense_stat_color = "#0080FF#"
+ for i = 1, 4 do
+ text = ("%s"):format(player:colorStats(attack_stats[i][1]))
+ self:mouseTooltip(self[attack_stats[i][2]], self:makeTexture((attack_stat_color.."%s"):format(attack_stats[i][3]), x, h, 255, 255, 255))
+ self:mouseTooltip(self[attack_stats[i][2]], self:makeTexture(("%s"):format(text), x+75, h, 255, 255, 255))
+ text = ("%s"):format(player:colorStats(attack_stats[i+4][1]))
+ self:mouseTooltip(self[attack_stats[i+4][2]], self:makeTexture((defense_stat_color.."%s"):format(attack_stats[i+4][3]), x+110, h, 255, 255, 255))
+ self:mouseTooltip(self[attack_stats[i+4][2]], self:makeTexture(("%s"):format(text), x+180, h, 255, 255, 255)) h = h + self.font_h
+ end
+ h = h + self.font_h
+
if game.level and game.level.turn_counter then
self:makeTexture(("Turns remaining: %d"):format(game.level.turn_counter / 10), x, h, 255, 0, 0) h = h + self.font_h
h = h + self.font_h
diff --git a/game/modules/tome/class/interface/Archery.lua b/game/modules/tome/class/interface/Archery.lua
index f638762896..a6fe06a62f 100644
--- a/game/modules/tome/class/interface/Archery.lua
+++ b/game/modules/tome/class/interface/Archery.lua
@@ -147,7 +147,7 @@ local function archery_projectile(tx, ty, tg, self)
local crit
if tg.archery.crit_chance then self.combat_physcrit = self.combat_physcrit + tg.archery.crit_chance end
- dam, crit = self:physicalCrit(dam, ammo, target)
+ dam, crit = self:physicalCrit(dam, ammo, target, atk, def)
if tg.archery.crit_chance then self.combat_physcrit = self.combat_physcrit - tg.archery.crit_chance end
print("[ATTACK ARCHERY] after crit", dam)
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index c7a70aeb29..44625c5a41 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -174,7 +174,8 @@ end
--- Computes a logarithmic chance to hit, opposing chance to hit to chance to miss
-- This will be used for melee attacks, physical and spell resistance
-function _M:checkHit(atk, def, min, max, factor)
+
+function _M:checkHitOld(atk, def, min, max, factor)
print("checkHit", atk, def)
if atk == 0 then atk = 1 end
local hit = nil
@@ -190,6 +191,57 @@ function _M:checkHit(atk, def, min, max, factor)
return rng.percent(hit), hit
end
+--Tells the tier difference between two values
+function _M:crossTierEffect(eff_id, apply_power, apply_save, use_given_e)
+ local q = game.player:hasQuest("tutorial-combat-stats")
+ if q and not q:isCompleted("final-lesson")then
+ return
+ end
+ local ct_effect
+ local save_for_effects = {
+ physical = "combatPhysicalResist",
+ magical = "combatSpellResist",
+ mental = "combatMentalResist",
+ }
+ local cross_tier_effects = {
+ combatPhysicalResist = self.EFF_OFFBALANCE,
+ combatSpellResist = self.EFF_SPELLSHOCKED,
+ combatMentalResist = self.EFF_BRAINLOCKED,
+ }
+ local e = self.tempeffect_def[eff_id]
+ if not apply_power or not save_for_effects[e.type] then return end
+ local save = self[apply_save or save_for_effects[e.type]](self)
+
+ if use_given_e then
+ ct_effect = self["EFF_"..e.name]
+ else
+ ct_effect = cross_tier_effects[save_for_effects[e.type]]
+ end
+ local dur = self:getTierDiff(apply_power, save)
+ self:setEffect(ct_effect, dur, {})
+end
+
+function _M:getTierDiff(atk, def)
+ atk = math.floor(atk)
+ def = math.floor(def)
+ return math.max(0, math.max(math.ceil(atk/20), 1) - math.max(math.ceil(def/20), 1))
+end
+
+--New, simpler checkHit that relies on rescaleCombatStats() being used elsewhere
+function _M:checkHit(atk, def, min, max, factor, p)
+ local min = min or 0
+ local max = max or 100
+ if game.player:hasQuest("tutorial-combat-stats") then
+ min = 0
+ max = 100
+ end --ensures predictable combat for the tutorial
+ print("checkHit", atk, def)
+ local hit = 50 + 5 * (atk - def)
+ hit = util.bound(hit, min, max)
+ print("=> chance to hit", hit)
+ return rng.percent(hit), hit
+end
+
--- Try to totally evade an attack
function _M:checkEvasion(target)
if not target:attr("evasion") then return end
@@ -251,7 +303,7 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
local damrange = self:combatDamageRange(weapon)
dam = rng.range(dam, dam * damrange)
print("[ATTACK] after range", dam)
- dam, crit = self:physicalCrit(dam, weapon, target)
+ dam, crit = self:physicalCrit(dam, weapon, target, atk, def)
print("[ATTACK] after crit", dam)
dam = dam * mult
print("[ATTACK] after mult", dam)
@@ -375,12 +427,15 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
if target:checkHit(self:combatAttack(weapon), target:combatPhysicalResist(), 0, 95, 10) and target:canBe("knockback") then
target:knockback(self.x, self.y, self:attr("onslaught"))
+ target:crossTierEffect(target.EFF_OFFBALANCE, src:combatAttack())
end
if lt and lt:checkHit(self:combatAttack(weapon), lt:combatPhysicalResist(), 0, 95, 10) and lt:canBe("knockback") then
lt:knockback(self.x, self.y, self:attr("onslaught"))
+ target:crossTierEffect(target.EFF_OFFBALANCE, src:combatAttack())
end
if rt and rt:checkHit(self:combatAttack(weapon), rt:combatPhysicalResist(), 0, 95, 10) and rt:canBe("knockback") then
rt:knockback(self.x, self.y, self:attr("onslaught"))
+ target:crossTierEffect(target.EFF_OFFBALANCE, src:combatAttack())
end
end
@@ -530,12 +585,12 @@ end
--- Gets the defense
--- Fake denotes a check not actually being made, used by character sheets etc.
-function _M:combatDefense(fake)
+function _M:combatDefenseBase(fake)
local add = 0
if self:hasDualWeapon() and self:knowTalent(self.T_DUAL_WEAPON_DEFENSE) then
add = add + 4 + (self:getTalentLevel(self.T_DUAL_WEAPON_DEFENSE) * self:getDex()) / 12
end
- if not fake then
+ if not fake then
add = add + (self:checkOnDefenseCall("defense") or 0)
end
if self:knowTalent(self.T_TACTICAL_EXPERT) then
@@ -560,11 +615,15 @@ function _M:combatDefense(fake)
end
--- Gets the defense ranged
---- Fake denotes a check not actually being made, used by character sheets etc.
-function _M:combatDefenseRanged(fake)
- local base_defense = self:combatDefense(true)
- if not fake then base_defense = self:combatDefense() end
- return math.max(0, base_defense + (self.combat_def_ranged or 0))
+function _M:combatDefense()
+ local d = self:combatDefenseBase()
+ return self:rescaleCombatStats(d)
+end
+
+--- Gets the defense ranged
+function _M:combatDefenseRanged()
+ local d = math.max(0, self:combatDefenseBase() + (self.combat_def_ranged or 0))
+ return self:rescaleCombatStats(d)
end
--- Gets the armor
@@ -603,10 +662,10 @@ function _M:combatAttackBase(weapon, ammo)
end
function _M:combatAttack(weapon, ammo)
local stats
- if self.use_psi_combat then stats = (self:getWil(50, true) - 5) + (self:getCun(50, true) - 5)
- else stats = (self:getStr(50, true) - 5) + (self:getDex(50, true) - 5)
+ if self.use_psi_combat then stats = self:getCun(100, true) - 10
+ else stats = self:getDex(100, true) - 10
end
- return self:combatAttackBase(weapon, ammo) + stats
+ return self:rescaleCombatStats(self:combatAttackBase(weapon, ammo) + stats)
end
--- Gets the attack using only strength
@@ -659,10 +718,23 @@ end
--- Scale damage values
--- This makes low damage values equal to what they should be and puts disminishing returns to super high values
+-- This currently beefs up high-end damage values to make up for the combat stat rescale nerf.
function _M:rescaleDamage(dam)
if dam <= 0 then return dam end
- return dam * (1 - math.log10(dam * 2) / 7)
+-- return dam * (1 - math.log10(dam * 2) / 7) --this is the old version, pre-combat-stat-rescale
+ return dam ^ 1.04
+end
+--Diminishing-returns method of scaling combat stats, observing this rule: the first twenty ranks cost 1 point each, the second twenty cost two each, and so on. This is much, much better for players than some logarithmic mess, since they always know exactly what's going on, and there are nice breakpoints to strive for.
+function _M:rescaleCombatStats(raw_combat_stat_value)
+ local x = raw_combat_stat_value
+ local tiers = 5 -- Just increase this if you want to add high-level content that allows for combat stat scores over 100.
+ --return math.floor(math.min(x, 20) + math.min(math.max((x-20), 0)/2, 20) + math.min(math.max((x-60), 0)/3, 20) + math.min(math.max((x-120), 0)/4, 20) + math.min(math.max((x-200), 0)/5, 20)) --Five terms of the summation below.
+ local total = 0
+ for i = 1, tiers do
+ local sub = 20*(i*(i-1)/2)
+ total = total + math.min(math.max(x-sub, 0)/i, 20)
+ end
+ return total
end
--- Gets the damage
@@ -689,6 +761,16 @@ function _M:combatDamage(weapon)
end
end
+ local talented_mod = math.sqrt(self:combatCheckTraining(weapon) / 10) / 2 + 1
+
+ local power = math.max((weapon.dam or 1), 1)
+ power = (math.sqrt(power / 10) - 1) * 0.5 + 1
+ --print(("[COMBAT DAMAGE] power(%f) totstat(%f) talent_mod(%f)"):format(power, totstat, talented_mod))
+ return self:rescaleDamage(0.3*(self:combatPhysicalpower() + totstat) * power * talented_mod)
+end
+
+function _M:combatPhysicalpower(mod)
+ mod = mod or 1
local add = 0
if self:knowTalent(Talents.T_ARCANE_DESTRUCTION) then
add = add + self:combatSpellpower() * self:getTalentLevel(Talents.T_ARCANE_DESTRUCTION) / 9
@@ -696,17 +778,33 @@ function _M:combatDamage(weapon)
if self:isTalentActive(Talents.T_BLOOD_FRENZY) then
add = add + self.blood_frenzy
end
- if self:knowTalent(self.T_EMPTY_HAND) and weapon == self.combat then
+ if self:knowTalent(self.T_EMPTY_HAND) and self:isUnarmed() then
local t = self:getTalentFromId(self.T_EMPTY_HAND)
add = add + t.getDamage(self, t)
end
+ if self:knowTalent(Talents.T_WEAPONS_MASTERY) then
+ add = add + 5 * self:getTalentLevel(Talents.T_WEAPONS_MASTERY)
+ end
+ if self:knowTalent(Talents.T_KNIFE_MASTERY) then
+ add = add + 5 * self:getTalentLevel(Talents.T_WEAPONS_MASTERY)
+ end
+ if self:knowTalent(Talents.T_EXOTIC_WEAPONS_MASTERY) then
+ add = add + 5 * self:getTalentLevel(Talents.T_WEAPONS_MASTERY)
+ end
+ if self:knowTalent(Talents.T_UNARMED_MASTERY) then
+ add = add + 5 * self:getTalentLevel(Talents.T_UNARMED_MASTERY)
+ end
+ if self:knowTalent(Talents.T_STAFF_MASTERY) then
+ add = add + 5 * self:getTalentLevel(Talents.T_STAFF_MASTERY)
+ end
+ if self:knowTalent(Talents.T_BOW_MASTERY) then
+ add = add + 5 * self:getTalentLevel(Talents.T_BOW_MASTERY)
+ end
+ if self:knowTalent(Talents.T_SLING_MASTERY) then
+ add = add + 5 * self:getTalentLevel(Talents.T_SLING_MASTERY)
+ end
- local talented_mod = math.sqrt(self:combatCheckTraining(weapon) / 10) + 1
-
- local power = math.max(self.combat_dam + (weapon.dam or 1) + add, 1)
- power = (math.sqrt(power / 10) - 1) * 0.8 + 1
- print(("[COMBAT DAMAGE] power(%f) totstat(%f) talent_mod(%f)"):format(power, totstat, talented_mod))
- return self:rescaleDamage(totstat / 1.5 * power * talented_mod)
+ return self:rescaleCombatStats((self.combat_dam > 0 and self.combat_dam or 0) + add + self:getStr()) * mod
end
--- Gets spellpower
@@ -723,7 +821,7 @@ function _M:combatSpellpower(mod)
add = add + self:hasEffect(self.EFF_BLOODLUST).dur
end
- return ((self.combat_spellpower > 0 and self.combat_spellpower or 0) + add + self:getMag()) * mod
+ return self:rescaleCombatStats((self.combat_spellpower > 0 and self.combat_spellpower or 0) + add + self:getMag()) * mod
end
--- Gets damage based on talent
@@ -777,12 +875,14 @@ function _M:combatSummonSpeed()
end
--- Computes physical crit for a damage
-function _M:physicalCrit(dam, weapon, target)
+function _M:physicalCrit(dam, weapon, target, atk, def)
+ local tier_diff = self:getTierDiff(atk, def)
if self:isTalentActive(self.T_STEALTH) and self:knowTalent(self.T_SHADOWSTRIKE) then
return dam * (1.5 + self:getTalentLevel(self.T_SHADOWSTRIKE) / 7), true
end
local chance = self:combatCrit(weapon)
+ local crit_power_add = 0
local crit = false
if self:knowTalent(self.T_BACKSTAB) and target:attr("stunned") then chance = chance + self:getTalentLevel(self.T_BACKSTAB) * 10 end
@@ -796,6 +896,7 @@ function _M:physicalCrit(dam, weapon, target)
end
end
+
if target:hasHeavyArmor() and target:knowTalent(target.T_ARMOUR_TRAINING) then
chance = chance - target:getTalentLevel(target.T_ARMOUR_TRAINING) * 1.9
end
@@ -804,7 +905,13 @@ function _M:physicalCrit(dam, weapon, target)
print("[PHYS CRIT %]", chance)
if rng.percent(chance) then
- dam = dam * (1.5 + (self.combat_critical_power or 0) / 100)
+ if tier_diff > 0 then
+ target:crossTierEffect(target.EFF_OFFBALANCE, atk, "combatDefense")
+ end
+ if target:hasEffect(target.EFF_OFFBALANCE) then
+ crit_power_add = 0.25
+ end
+ dam = dam * (1.5 + crit_power_add + (self.combat_critical_power or 0) / 100)
crit = true
end
@@ -854,7 +961,7 @@ end
function _M:combatMindpower(mod)
mod = mod or 1
local add = 0
- return ((self.combat_mindpower > 0 and self.combat_mindpower or 0) + add + self:getWil() * 0.7 + self:getCun() * 0.4) * mod
+ return self:rescaleCombatStats((self.combat_mindpower > 0 and self.combat_mindpower or 0) + add + self:getWil() * 0.7 + self:getCun() * 0.4) * mod
end
--- Gets damage based on talent
@@ -870,47 +977,59 @@ function _M:combatTalentStatDamage(t, stat, base, max)
-- Compute at "max"
local mod = max / ((base + 100) * ((math.sqrt(5) - 1) * 0.8 + 1))
-- Compute real
- return self:rescaleDamage((base + (self:getStat(stat))) * ((math.sqrt(self:getTalentLevel(t)) - 1) * 0.8 + 1) * mod)
+ local dam = (base + (self:getStat(stat))) * ((math.sqrt(self:getTalentLevel(t)) - 1) * 0.8 + 1) * mod
+ dam = dam * (1 - math.log10(dam * 2) / 7)
+ dam = dam ^ (1 / 1.04)
+ return self:rescaleDamage(dam)
end
---- Gets damage based on talent, stat, and interval
+--- Gets damage based on talent, basic stat, and interval
function _M:combatTalentIntervalDamage(t, stat, min, max, stat_weight)
local stat_weight = stat_weight or 0.5
- --return self:rescaleDamage(min + (1 + (self:getStat(stat) / 100) * (max / 6.5 - 1)) * self:getTalentLevel(t))
- return self:rescaleDamage(min + (max - min)*((stat_weight * self:getStat(stat)/100) + (1 - stat_weight) * self:getTalentLevel(t)/6.5))
+ local dam = min + (max - min)*((stat_weight * self:getStat(stat)/100) + (1 - stat_weight) * self:getTalentLevel(t)/6.5)
+ dam = dam * (1 - math.log10(dam * 2) / 7)
+ dam = dam ^ (1 / 1.04)
+ return self:rescaleDamage(dam)
+end
+
+--- Gets damage based on talent, stat, and interval
+function _M:combatStatTalentIntervalDamage(t, stat, min, max, stat_weight)
+ local stat_weight = stat_weight or 0.5
+ scaled_stat = self[stat](self)
+ return self:rescaleDamage(min + (max - min)*((stat_weight * self[stat](self)/100) + (1 - stat_weight) * self:getTalentLevel(t)/6.5))
end
--- Computes physical resistance
--- Fake denotes a check not actually being made, used by character sheets etc.
function _M:combatPhysicalResist(fake)
local add = 0
- if not fake then
+ if not fake then
add = add + (self:checkOnDefenseCall("physical") or 0)
end
if self:knowTalent(self.T_POWER_IS_MONEY) then
add = add + util.bound(self.money / (80 - self:getTalentLevelRaw(self.T_POWER_IS_MONEY) * 5), 0, self:getTalentLevelRaw(self.T_POWER_IS_MONEY) * 10)
end
- return self.combat_physresist + (self:getCon() + self:getStr() + (self:getLck() - 50) * 0.5) * 0.35 + add
+ return self:rescaleCombatStats(self.combat_physresist + (self:getCon() + self:getStr() + (self:getLck() - 50) * 0.5) * 0.35 + add)
end
--- Computes spell resistance
--- Fake denotes a check not actually being made, used by character sheets etc.
function _M:combatSpellResist(fake)
local add = 0
- if not fake then
+ if not fake then
add = add + (self:checkOnDefenseCall("spell") or 0)
end
if self:knowTalent(self.T_POWER_IS_MONEY) then
add = add + util.bound(self.money / (80 - self:getTalentLevelRaw(self.T_POWER_IS_MONEY) * 5), 0, self:getTalentLevelRaw(self.T_POWER_IS_MONEY) * 10)
end
- return self.combat_spellresist + (self:getMag() + self:getWil() + (self:getLck() - 50) * 0.5) * 0.35 + add
+ return self:rescaleCombatStats(self.combat_spellresist + (self:getMag() + self:getWil() + (self:getLck() - 50) * 0.5) * 0.35 + add)
end
--- Computes mental resistance
--- Fake denotes a check not actually being made, used by character sheets etc.
function _M:combatMentalResist(fake)
local add = 0
- if not fake then
+ if not fake then
add = add + (self:checkOnDefenseCall("mental") or 0)
end
if self:knowTalent(self.T_STEADY_MIND) then
@@ -920,7 +1039,7 @@ function _M:combatMentalResist(fake)
if self:knowTalent(self.T_POWER_IS_MONEY) then
add = add + util.bound(self.money / (80 - self:getTalentLevelRaw(self.T_POWER_IS_MONEY) * 5), 0, self:getTalentLevelRaw(self.T_POWER_IS_MONEY) * 10)
end
- return self.combat_mentalresist + (self:getCun() + self:getWil() + (self:getLck() - 50) * 0.5) * 0.35 + add
+ return self:rescaleCombatStats(self.combat_mentalresist + (self:getCun() + self:getWil() + (self:getLck() - 50) * 0.5) * 0.35 + add)
end
-- Called when a Save or Defense is checked
@@ -1191,7 +1310,8 @@ function _M:startGrapple(target)
self:setEffect(self.EFF_GRAPPLING, duration, {trgt=target}, true)
return true
elseif target:canBe("pin") then
- target:setEffect(target.EFF_GRAPPLED, duration, {src=self, power=power, apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_GRAPPLED, duration, {src=self, power=power, apply_power=self:combatPhysicalpower()})
+ target:crossTierEffect(target.EFF_GRAPPLED, self:combatPhysicalpower())
self:setEffect(self.EFF_GRAPPLING, duration, {trgt=target})
return true
else
diff --git a/game/modules/tome/class/interface/TooltipsData.lua b/game/modules/tome/class/interface/TooltipsData.lua
index a510c278fe..657b5f1adf 100644
--- a/game/modules/tome/class/interface/TooltipsData.lua
+++ b/game/modules/tome/class/interface/TooltipsData.lua
@@ -164,22 +164,22 @@ I.E: at 100% you will be able to do 100% more attacks (aka twice as many) in the
-- Stats
-------------------------------------------------------------
TOOLTIP_STR = [[#GOLD#Strength#LAST#
-Strength defines your character's ability to apply physical force. It increases your melee damage, damage done with heavy weapons, your chance to hit, your chance to save against physical effects, and carrying capacity.
+Strength defines your character's ability to apply physical force. It increases Physical Power, damage done with heavy weapons, Physical Save, and carrying capacity.
]]
TOOLTIP_DEX = [[#GOLD#Dexterity#LAST#
-Dexterity defines your character's ability to be agile and alert. It increases your chance to hit, your ability to avoid attacks, and your damage with light weapons.
+Dexterity defines your character's ability to be agile and alert. It increases Accuracy, Defense, and your damage with light weapons.
]]
TOOLTIP_CON = [[#GOLD#Constitution#LAST#
-Constitution defines your character's ability to withstand and resist damage. It increases your maximum life and your chance to save against physical effects.
+Constitution defines your character's ability to withstand and resist damage. It increases your maximum life and Physical Save.
]]
TOOLTIP_MAG = [[#GOLD#Magic#LAST#
-Magic defines your character's ability to manipulate the magical energy of the world. It increases your spell power, your chance to save against magical effects, and the effect of spells and other magic items.
+Magic defines your character's ability to manipulate the magical energy of the world. It increases your Spellpower, Spell Save, and the effect of spells and other magic items.
]]
TOOLTIP_WIL = [[#GOLD#Willpower#LAST#
-Willpower defines your character's ability to concentrate. It increases your mana, stamina, psi capacity, and your chance to save against magical and mental effects.
+Willpower defines your character's ability to concentrate. It increases your mana, stamina, psi capacity, Mindpower, Spell Save, and Mental Save.
]]
TOOLTIP_CUN = [[#GOLD#Cunning#LAST#
-Cunning defines your character's ability to learn, think, and react. It allows you to learn many worldly abilities, and increases your chance to save against mental effects and critical chance.
+Cunning defines your character's ability to learn, think, and react. It allows you to learn many worldly abilities, and increases your Mindpower, Mental Save, and critical chance.
]]
TOOLTIP_STRDEXCON = "#AQUAMARINE#Physical stats#LAST#\n---\n"..TOOLTIP_STR.."\n---\n"..TOOLTIP_DEX.."\n---\n"..TOOLTIP_CON
TOOLTIP_MAGWILCUN = "#AQUAMARINE#Mental stats#LAST#\n---\n"..TOOLTIP_MAG.."\n---\n"..TOOLTIP_WIL.."\n---\n"..TOOLTIP_CUN
@@ -188,9 +188,12 @@ TOOLTIP_MAGWILCUN = "#AQUAMARINE#Mental stats#LAST#\n---\n"..TOOLTIP_MAG.."\n---
-- Melee
-------------------------------------------------------------
TOOLTIP_COMBAT_ATTACK = [[#GOLD#Accuracy#LAST#
-Your accuracy value represents your chance to hit your opponents, it is measured directly against the target's defense rating.
-When you inflict temporary physical effects on an enemy, every ten points of accuracy counteracts a single turn of duration reduction granted by the enemy's saving throws.
-It is improved by both Strength and Dexterity.
+Determines your chance to hit your target when measured against the target's Defense.
+When you use Accuracy to inflict temporary physical effects on an enemy, every five points of Accuracy counteracts a single turn of duration reduction granted by the enemy's saving throws.
+]]
+TOOLTIP_COMBAT_PHYSICAL_POWER = [[#GOLD#Physical Power#LAST#
+Measures your ability to deal physical damage in combat.
+When you use Physical Power to inflict temporary physical effects on an enemy, every five points of Physical Power counteracts a single turn of duration reduction granted by the enemy's saving throws.
]]
TOOLTIP_COMBAT_DAMAGE = [[#GOLD#Damage#LAST#
This is the damage you inflict on your foes when you hit them.
@@ -237,19 +240,19 @@ Armour hardiness value represents how much of every incoming blows the armour wi
Absorbs (hardiness)% of incoming physical damage, up to a maximum of (armour) damage absorbed.
]]
TOOLTIP_DEFENSE = [[#GOLD#Defense#LAST#
-Defense represents your chance to avoid being hit at all by a melee attack, it is measured against the attacker's accuracy chance.
+Defense represents your chance to avoid physical melee attacks. It is measured against the attacker's Accuracy.
]]
TOOLTIP_RDEFENSE = [[#GOLD#Ranged Defense#LAST#
-Ranged defense represents your chance to avoid being hit at all by a ranged attack, it is measured against the attacker's accuracy chance.
+Defense represents your chance to avoid physical ranged attacks. It is measured against the attacker's Accuracy.
]]
TOOLTIP_PHYS_SAVE = [[#GOLD#Physical saving throw#LAST#
-Increases chance to shrug off physically-induced effects. Also reduces duration of detrimental physical effects by up to one turn for every ten points, depending on the opponent.
+Increases chance to shrug off physically-induced effects. Also reduces duration of detrimental physical effects by up to one turn for every five points, depending on the opponent.
]]
TOOLTIP_SPELL_SAVE = [[#GOLD#Spell saving throw#LAST#
-Increases chance to shrug off magically-induced effects. Also reduces duration of detrimental magical effects by up to one turn for every ten points, depending on the opponent.
+Increases chance to shrug off magically-induced effects. Also reduces duration of detrimental magical effects by up to one turn for every five points, depending on the opponent.
]]
TOOLTIP_MENTAL_SAVE = [[#GOLD#Mental saving throw#LAST#
-Increases chance to shrug off mentally-induced effects. Also reduces duration of detrimental mental effects by up to one turn for every ten points, depending on the opponent.
+Increases chance to shrug off mentally-induced effects. Also reduces duration of detrimental mental effects by up to one turn for every five points, depending on the opponent.
]]
-------------------------------------------------------------
@@ -257,8 +260,7 @@ Increases chance to shrug off mentally-induced effects. Also reduces duration of
-------------------------------------------------------------
TOOLTIP_SPELL_POWER = [[#GOLD#Spellpower#LAST#
Your spellpower value represents how powerful your spells are.
-In addition, when your spells inflict temporary detrimental effects, every ten points of spellpower counteracts a single turn of duration reduction granted by the enemy's saving throws.
-It is improved by Magic, equipment, and certain talents.
+In addition, when your spells inflict temporary detrimental effects, every five points of spellpower counteracts a single turn of duration reduction granted by the enemy's saving throws.
]]
TOOLTIP_SPELL_CRIT = [[#GOLD#Spell critical chance#LAST#
Each time you deal damage with a spell you have a chance to make a critical hit that deals 150% of the normal damage.
@@ -271,8 +273,7 @@ The lower it is the faster it is.
]]
TOOLTIP_MINDPOWER = [[#GOLD#Mindpower#LAST#
Your mindpower value represents how powerful your mental abilities are.
-In addition, when you use mental abilities inflict temporary detrimental effects, every ten points of mindpower counteracts a single turn of duration reduction granted by the enemy's saving throws.
-It is improved by both Willpower and Cunning, equipment, and certain talents.
+In addition, when you use mental abilities inflict temporary detrimental effects, every five points of mindpower counteracts a single turn of duration reduction granted by the enemy's saving throws.
]]
-------------------------------------------------------------
diff --git a/game/modules/tome/data/birth/races/tutorial.lua b/game/modules/tome/data/birth/races/tutorial.lua
index ca5cd3f32f..7b26b53faf 100644
--- a/game/modules/tome/data/birth/races/tutorial.lua
+++ b/game/modules/tome/data/birth/races/tutorial.lua
@@ -51,9 +51,9 @@ newBirthDescriptor
},
copy = {
default_wilderness = {1, 1, "wilderness"},
- starting_zone = "tutorial",
- starting_quest = "tutorial",
- starting_intro = "tutorial",
+ starting_zone = "tutorial-combat-stats",
+ starting_quest = "tutorial-combat-stats",
+ starting_intro = "tutorial-combat-stats",
moddable_tile = "human_#sex#",
moddable_tile_base = "base_cornac_01.png",
},
diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua
index 695aa94d92..686c4027d5 100644
--- a/game/modules/tome/data/damage_types.lua
+++ b/game/modules/tome/data/damage_types.lua
@@ -119,7 +119,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
-- Damage Smearing
if type ~= DamageType.TEMPORAL and target:hasEffect(target.EFF_DAMAGE_SMEARING) then
local smear = dam
- target:setEffect(target.EFF_SMEARED, 6, {src=src, power=smear/6})
+ target:setEffect(target.EFF_SMEARED, 6, {src=src, power=smear/6, no_ct_effect=true})
dam = 0
end
@@ -196,7 +196,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
if not target.dead and dam > 0 and target:attr("elemental_harmony") and not target:hasEffect(target.EFF_ELEMENTAL_HARMONY) then
if type == DamageType.FIRE or type == DamageType.COLD or type == DamageType.LIGHTNING or type == DamageType.ACID or type == DamageType.NATURE then
- target:setEffect(target.EFF_ELEMENTAL_HARMONY, 5 + math.ceil(target:attr("elemental_harmony")), {power=target:attr("elemental_harmony"), type=type})
+ target:setEffect(target.EFF_ELEMENTAL_HARMONY, 5 + math.ceil(target:attr("elemental_harmony")), {power=target:attr("elemental_harmony"), type=type, no_ct_effect=true})
end
end
@@ -435,7 +435,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target and rng.percent(dam) then
if target:canBe("silence") then
- target:setEffect(target.EFF_SILENCED, 4, {apply_power=src:combatAttackDex()*0.7})
+ target:setEffect(target.EFF_SILENCED, 4, {apply_power=src:combatAttack()*0.7, no_ct_effect=true})
else
game.logSeen(target, "%s resists!", target.name:capitalize())
end
@@ -476,7 +476,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target then
if target:canBe("blind") then
- target:setEffect(target.EFF_BLINDED, math.ceil(dam), {apply_power=src:combatAttackStr(), apply_save="combatPhysicalResist"})
+ target:setEffect(target.EFF_BLINDED, math.ceil(dam), {apply_power=src:combatPhysicalpower(), apply_save="combatPhysicalResist"})
else
game.logSeen(target, "%s avoids the blinding ink!", target.name:capitalize())
end
@@ -489,7 +489,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target then
if target:canBe("blind") then
- target:setEffect(target.EFF_BLINDED, math.ceil(dam.turns), {apply_power=dam.power, apply_save="combatMentalResist"})
+ target:setEffect(target.EFF_BLINDED, math.ceil(dam.turns), {apply_power=dam.power, apply_save="combatMentalResist", no_ct_effect=true})
else
game.logSeen(target, "%s resists the blinding light!", target.name:capitalize())
end
@@ -510,7 +510,7 @@ newDamageType{
if target then
-- Set on fire!
dam = dam - init_dam
- target:setEffect(target.EFF_BURNING, dur, {src=src, power=dam / dur})
+ target:setEffect(target.EFF_BURNING, dur, {src=src, power=dam / dur, no_ct_effect=true})
end
return init_dam
end,
@@ -643,7 +643,6 @@ newDamageType{
local sx, sy = game.level.map:getTileToScreen(x, y)
if target:canBe("stun") then
target:setEffect(target.EFF_FROZEN, dam.dur, {hp=dam.hp * 1.5, apply_power=src:combatSpellpower(), min_dur=1})
-
game.flyers:add(sx, sy, 30, (rng.range(0,2)-1) * 0.5, -3, "Frozen!", {0,255,155})
else
game.flyers:add(sx, sy, 30, (rng.range(0,2)-1) * 0.5, -3, "Resist!", {0,255,155})
@@ -660,7 +659,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target then
if target:canBe("blind") then
- target:setEffect(target.EFF_DIM_VISION, 7, {sight=dam, apply_power=src:combatAttackDex()})
+ target:setEffect(target.EFF_DIM_VISION, 7, {sight=dam, apply_power=src:combatAttack()})
else
game.logSeen(target, "%s resists!", target.name:capitalize())
end
@@ -734,6 +733,7 @@ newDamageType{
if target then
if target:checkHit(src:combatSpellpower(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
target:knockback(src.x, src.y, 1)
+ target:crossTierEffect(target.EFF_OFFBALANCE, src:combatSpellpower())
game.logSeen(target, "%s is knocked back!", target.name:capitalize())
else
game.logSeen(target, "%s resists the wave!", target.name:capitalize())
@@ -754,6 +754,7 @@ newDamageType{
DamageType:get(DamageType.FIREBURN).projector(src, x, y, DamageType.FIREBURN, dam.dam)
if target:checkHit(src:combatSpellpower(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
target:knockback(src.x, src.y, dam.dist)
+ target:crossTierEffect(target.EFF_OFFBALANCE, src:combatSpellpower())
game.logSeen(target, "%s is knocked back!", target.name:capitalize())
else
game.logSeen(target, "%s resists the punch!", target.name:capitalize())
@@ -774,6 +775,7 @@ newDamageType{
DamageType:get(DamageType.DARKNESS).projector(src, x, y, DamageType.DARKNESS, dam.dam)
if target:checkHit(src:combatSpellpower(), target:combatMentalResist(), 0, 95, 15) and target:canBe("knockback") then
target:knockback(src.x, src.y, dam.dist)
+ target:crossTierEffect(target.EFF_BRAINLOCKED, src:combatSpellpower())
game.logSeen(target, "%s is knocked back!", target.name:capitalize())
else
game.logSeen(target, "%s resists the darkness!", target.name:capitalize())
@@ -794,6 +796,7 @@ newDamageType{
realdam = DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam)
if target:checkHit(src:combatSpellpower(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
target:knockback(src.x, src.y, 3)
+ target:crossTierEffect(target.EFF_OFFBALANCE, src:combatSpellpower())
game.logSeen(target, "%s is knocked back!", target.name:capitalize())
else
game.logSeen(target, "%s resists the punch!", target.name:capitalize())
@@ -814,6 +817,7 @@ newDamageType{
DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam)
if target:checkHit(src:combatMindpower() * 0.8, target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
target:knockback(src.x, src.y, 3)
+ target:crossTierEffect(target.EFF_OFFBALANCE, src:combatMindpower())
game.logSeen(target, "%s is knocked back!", target.name:capitalize())
else
game.logSeen(target, "%s resists the punch!", target.name:capitalize())
@@ -831,8 +835,9 @@ newDamageType{
if target and not tmp[target] then
tmp[target] = true
DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam.dam)
- if target:checkHit(src:combatAttackStr(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
+ if target:checkHit(src:combatPhysicalpower(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
target:knockback(src.x, src.y, dam.dist)
+ target:crossTierEffect(target.EFF_OFFBALANCE, src:combatPhysicalpower())
game.logSeen(target, "%s is knocked back!", target.name:capitalize())
else
game.logSeen(target, "%s resists the knockback!", target.name:capitalize())
@@ -885,7 +890,7 @@ newDamageType{
DamageType:get(DamageType.NATURE).projector(src, x, y, DamageType.NATURE, dam.dam / dam.dur)
local target = game.level.map(x, y, Map.ACTOR)
if target and target:canBe("poison") then
- target:setEffect(target.EFF_SPYDRIC_POISON, dam.dur, {src=src, power=dam.dam / dam.dur})
+ target:setEffect(target.EFF_SPYDRIC_POISON, dam.dur, {src=src, power=dam.dam / dam.dur, no_ct_effect=true})
end
end,
}
@@ -897,7 +902,7 @@ newDamageType{
DamageType:get(DamageType.NATURE).projector(src, x, y, DamageType.NATURE, dam.dam / dam.dur)
local target = game.level.map(x, y, Map.ACTOR)
if target and target:canBe("poison") then
- target:setEffect(target.EFF_INSIDIOUS_POISON, dam.dur, {src=src, power=dam.dam / dam.dur, heal_factor=dam.heal_factor})
+ target:setEffect(target.EFF_INSIDIOUS_POISON, dam.dur, {src=src, power=dam.dam / dam.dur, heal_factor=dam.heal_factor, no_ct_effect=true})
end
end,
}
@@ -911,7 +916,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target and target:canBe("cut") then
-- Set on fire!
- target:setEffect(target.EFF_CUT, 5, {src=src, power=dam / 5})
+ target:setEffect(target.EFF_CUT, 5, {src=src, power=dam / 5, no_ct_effect=true})
end
end,
}
@@ -923,7 +928,7 @@ newDamageType{
local realdam = DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam)
local target = game.level.map(x, y, Map.ACTOR)
if realdam > 0 and target and target:canBe("cut") then
- target:setEffect(target.EFF_CUT, 5, {src=src, power=dam * 0.1})
+ target:setEffect(target.EFF_CUT, 5, {src=src, power=dam * 0.1, no_ct_effect=true})
end
end,
}
@@ -935,7 +940,7 @@ newDamageType{
DamageType:get(DamageType.NATURE).projector(src, x, y, DamageType.NATURE, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target then
- target:setEffect(target.EFF_SLOW, 3, {power=0.3})
+ target:setEffect(target.EFF_SLOW, 3, {power=0.3, no_ct_effect=true})
end
end,
}
@@ -981,11 +986,11 @@ newDamageType{
-- Freeze it, if we pass the test
local sx, sy = game.level.map:getTileToScreen(x, y)
if src == target then
- target:setEffect(target.EFF_TIME_PRISON, dam, {})
- target:setEffect(target.EFF_CONTINUUM_DESTABILIZATION, 100, {power=src:combatSpellpower(0.3)})
+ target:setEffect(target.EFF_TIME_PRISON, dam, {no_ct_effect=true})
+ target:setEffect(target.EFF_CONTINUUM_DESTABILIZATION, 100, {power=src:combatSpellpower(0.3), no_ct_effect=true})
elseif target:checkHit(src:combatSpellpower() - (target:attr("continuum_destabilization") or 0), target:combatSpellResist(), 0, 95, 15) then
- target:setEffect(target.EFF_TIME_PRISON, dam, {apply_power=src:combatSpellpower() - (target:attr("continuum_destabilization") or 0), apply_save="combatSpellResist"})
- target:setEffect(target.EFF_CONTINUUM_DESTABILIZATION, 100, {power=src:combatSpellpower(0.3)})
+ target:setEffect(target.EFF_TIME_PRISON, dam, {apply_power=src:combatSpellpower() - (target:attr("continuum_destabilization") or 0), apply_save="combatSpellResist", no_ct_effect=true})
+ target:setEffect(target.EFF_CONTINUUM_DESTABILIZATION, 100, {power=src:combatSpellpower(0.3), no_ct_effect=true})
else
game.logSeen(target, "%s resists the time prison.", target.name:capitalize())
end
@@ -1016,7 +1021,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target and rng.percent(dam.dam) then
if target:canBe("confusion") then
- target:setEffect(target.EFF_CONFUSED, dam.dam, {power=75, apply_power=(dam.power_check or src.combatSpellpower)(src)})
+ target:setEffect(target.EFF_CONFUSED, dam.dam, {power=75, apply_power=(dam.power_check or src.combatSpellpower)(src), no_ct_effect=true})
else
game.logSeen(target, "%s resists!", target.name:capitalize())
end
@@ -1032,7 +1037,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target and rng.percent(dam.dam) then
if target:canBe("blind") then
- target:setEffect(target.EFF_BLINDED, dam.dam, {apply_power=(dam.power_check or src.combatSpellpower)(src)})
+ target:setEffect(target.EFF_BLINDED, dam.dam, {apply_power=(dam.power_check or src.combatSpellpower)(src), no_ct_effect=true})
else
game.logSeen(target, "%s resists!", target.name:capitalize())
end
@@ -1048,7 +1053,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target then
if target:canBe("blind") then
- target:setEffect(target.EFF_BLINDED, dam.dur, {apply_power=src:combatAttackStr(), apply_save="combatPhysicalResist"})
+ target:setEffect(target.EFF_BLINDED, dam.dur, {apply_power=src:combatPhysicalpower(), apply_save="combatPhysicalResist"})
else
game.logSeen(target, "%s resists the sandstorm!", target.name:capitalize())
end
@@ -1064,7 +1069,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target then
if target:canBe("pin") then
- target:setEffect(target.EFF_PINNED, dam.dur, {apply_power=src:combatAttackStr()})
+ target:setEffect(target.EFF_PINNED, dam.dur, {apply_power=src:combatPhysicalpower()})
else
game.logSeen(target, "%s resists!", target.name:capitalize())
end
@@ -1203,7 +1208,7 @@ newDamageType{
DamageType:get(DamageType.BLIGHT).projector(src, x, y, DamageType.BLIGHT, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and not target.undead and not target.construct then
- target:setEffect(target.EFF_SLOW, 4, {power=0.2})
+ target:setEffect(target.EFF_SLOW, 4, {power=0.2, no_ct_effect=true})
end
end,
}
@@ -1243,7 +1248,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target and target:canBe("cut") then
-- Set on fire!
- target:setEffect(target.EFF_CUT, 5, {src=src, power=dam / 11})
+ target:setEffect(target.EFF_CUT, 5, {src=src, power=dam / 11, no_ct_effect=true})
end
end,
}
@@ -1308,6 +1313,7 @@ newDamageType{
tmp[target] = true
if target:checkHit(src:combatSpellpower(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
target:knockback(src.x, src.y, 2)
+ target:crossTierEffect(target.EFF_OFFBALANCE, src:combatSpellpower())
game.logSeen(target, "%s is knocked back!", target.name:capitalize())
else
game.logSeen(target, "%s resists the knockback!", target.name:capitalize())
@@ -1340,7 +1346,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target then
if target == src then
- target:setEffect(target.EFF_SANCTITY, 1, {power=dam})
+ target:setEffect(target.EFF_SANCTITY, 1, {power=dam, no_ct_effect=true})
elseif target:canBe("silence") then
target:setEffect(target.EFF_SILENCED, 2, {apply_power=src:combatSpellpower(), min_dur=1}, true)
else
@@ -1356,7 +1362,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target then
if target == src then
- target:setEffect(target.EFF_SHIFTING_SHADOWS, 1, {power= dam})
+ target:setEffect(target.EFF_SHIFTING_SHADOWS, 1, {power= dam, no_ct_effect=true})
else
DamageType:get(DamageType.DARKNESS).projector(src, x, y, DamageType.DARKNESS, dam)
end
@@ -1370,7 +1376,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target then
if target == src then
- target:setEffect(target.EFF_BLAZING_LIGHT, 1, {power= 1 + (dam / 4)})
+ target:setEffect(target.EFF_BLAZING_LIGHT, 1, {power= 1 + (dam / 4), no_ct_effect=true})
else
DamageType:get(DamageType.FIRE).projector(src, x, y, DamageType.FIRE, dam)
DamageType:get(DamageType.LIGHT).projector(src, x, y, DamageType.LIGHT, dam)
@@ -1385,12 +1391,13 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target then
if target == src then
- target:setEffect(target.EFF_WARDING, 1, {power=dam})
+ target:setEffect(target.EFF_WARDING, 1, {power=dam, no_ct_effect=true})
elseif target ~= src then
DamageType:get(DamageType.LIGHT).projector(src, x, y, DamageType.LIGHT, dam )
DamageType:get(DamageType.DARKNESS).projector(src, x, y, DamageType.DARKNESS, dam)
if target:checkHit(src:combatSpellpower(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
target:knockback(src.x, src.y, 1)
+ target:crossTierEffect(target.EFF_OFFBALANCE, src:combatSpellpower())
game.logSeen(target, "%s is knocked back!", target.name:capitalize())
else
game.logSeen(target, "%s resists the knockback!", target.name:capitalize())
@@ -1408,6 +1415,7 @@ newDamageType{
if target then
if target:canBe("knockback") then
target:knockback(src.x, src.y, 3)
+ target:crossTierEffect(target.EFF_OFFBALANCE, src:combatMindpower())
game.logSeen(target, "%s is knocked back!", target.name:capitalize())
else
game.logSeen(target, "%s resists the knockback!", target.name:capitalize())
@@ -1486,7 +1494,7 @@ newDamageType{
if target then
-- Set on fire!
dam = dam - init_dam
- target:setEffect(target.EFF_WASTING, dur, {src=src, power=dam / dur})
+ target:setEffect(target.EFF_WASTING, dur, {src=src, power=dam / dur, no_ct_effect=true})
end
return init_dam
end,
@@ -1610,7 +1618,7 @@ newDamageType{
local target = game.level.map(x, y, Map.ACTOR)
if target then
if target:canBe("pin") then
- target:setEffect(target.EFF_PINNED, 5, {})
+ target:setEffect(target.EFF_PINNED, 5, {no_ct_effect=true})
else
game.logSeen(target, "%s resists!", target.name:capitalize())
end
@@ -1627,7 +1635,7 @@ newDamageType{
if game.zone.void_blast_hits and game.party:hasMember(target) then game.zone.void_blast_hits = game.zone.void_blast_hits + 1 end
if target:knowTalent(target.T_MANA_POOL) then
- target:setEffect(target.EFF_MANAWORM, 5, {power=dam * 5, src=src})
+ target:setEffect(target.EFF_MANAWORM, 5, {power=dam * 5, src=src, no_ct_effect=true})
src:disappear(src)
else
game.logSeen(target, "%s is unaffected.", target.name:capitalize())
diff --git a/game/modules/tome/data/general/objects/boss-artifacts.lua b/game/modules/tome/data/general/objects/boss-artifacts.lua
index bb5171bba5..f834824773 100644
--- a/game/modules/tome/data/general/objects/boss-artifacts.lua
+++ b/game/modules/tome/data/general/objects/boss-artifacts.lua
@@ -201,7 +201,6 @@ Tridents require the exotic weapons mastery talent to use correctly.]],
material_level = 4,
combat = {
dam = 60,
- atk = 10,
apr = 4,
physcrit = 15,
dammod = {str=1.3},
@@ -213,6 +212,7 @@ Tridents require the exotic weapons mastery talent to use correctly.]],
},
wielder = {
+ combat_atk = 10,
combat_spellresist = 18,
see_invisible = 2,
resists={[DamageType.COLD] = 25},
diff --git a/game/modules/tome/data/general/objects/egos/weapon.lua b/game/modules/tome/data/general/objects/egos/weapon.lua
index 4e18aba67f..e75ad8e24d 100644
--- a/game/modules/tome/data/general/objects/egos/weapon.lua
+++ b/game/modules/tome/data/general/objects/egos/weapon.lua
@@ -85,7 +85,7 @@ newEntity{
level_range = {1, 50},
rarity = 3,
cost = 4,
- combat={atk = resolvers.mbonus_material(20, 5)},
+ wielder={combat_atk = resolvers.mbonus_material(20, 5)},
}
newEntity{
@@ -157,6 +157,7 @@ newEntity{
rarity = 25,
cost = 35,
wielder = {
+ combat_atk = resolvers.mbonus_material(10, 2),
inc_damage = {
[DamageType.PHYSICAL] = resolvers.mbonus_material(15, 4),
},
@@ -168,7 +169,6 @@ newEntity{
},
combat = {
apr = resolvers.mbonus_material(8, 1),
- atk = resolvers.mbonus_material(10, 2),
},
}
diff --git a/game/modules/tome/data/general/objects/quest-artifacts.lua b/game/modules/tome/data/general/objects/quest-artifacts.lua
index 2b41b0ebb6..fe8e8808ad 100644
--- a/game/modules/tome/data/general/objects/quest-artifacts.lua
+++ b/game/modules/tome/data/general/objects/quest-artifacts.lua
@@ -38,12 +38,12 @@ Light around it seems to dim and you can feel its tremendous power simply by tou
combat = {
dam = 30,
apr = 4,
- atk = 20,
dammod = {mag=1},
damtype = DamageType.ARCANE,
talented = "staff",
},
wielder = {
+ combat_atk = 20,
combat_spellpower = 20,
combat_spellcrit = 10,
},
diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua
index 6a54374117..6ca1028cd8 100644
--- a/game/modules/tome/data/general/objects/world-artifacts.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts.lua
@@ -163,11 +163,11 @@ newEntity{ base = "BASE_STAFF",
combat = {
dam = 64,
apr = 10,
- atk = 7,
dammod = {mag=1.4},
damtype = DamageType.PHYSICAL,
},
wielder = {
+ combat_atk = 7,
combat_spellpower = 12,
combat_spellcrit = 18,
inc_damage={
@@ -651,10 +651,10 @@ newEntity{ base = "BASE_KNIFE",
combat = {
dam = 15,
apr = 10,
- atk = 40,
physcrit = 0,
dammod = {dex=0.55, str=0.45},
},
+ wielder = {combat_atk=20},
}
newEntity{ base = "BASE_LEATHER_BOOT",
@@ -886,12 +886,12 @@ newEntity{ base = "BASE_KNIFE",
combat = {
dam = 25,
apr = 10,
- atk = 15,
physcrit = 8,
dammod = {dex=0.55,str=0.35},
no_stealth_break = true,
melee_project={[DamageType.RANDOM_SILENCE] = 10},
},
+ wielder = {combat_atk = 10},
}
newEntity{ base = "BASE_KNIFE", define_as = "ART_PAIR_MOON",
@@ -1037,12 +1037,12 @@ newEntity{ base = "BASE_GREATMAUL",
combat = {
dam = 48,
apr = 15,
- atk = 20,
physcrit = 3,
dammod = {str=1.2},
talent_on_hit = { [Talents.T_SUNDER_ARMOUR] = {level=3, chance=15} },
},
wielder = {
+ combat_atk = 20,
pin_immune = 1,
knockback_immune = 1,
},
@@ -1062,11 +1062,11 @@ newEntity{ base = "BASE_MACE",
combat = {
dam = 25,
apr = 4,
- atk = 12,
physcrit = 10,
dammod = {str=1},
melee_project={[DamageType.RANDOM_CONFUSION] = 14},
},
+ wielder = {combat_atk=12,},
}
newEntity{ base = "BASE_MACE",
@@ -1083,11 +1083,11 @@ newEntity{ base = "BASE_MACE",
combat = {
dam = 40,
apr = 4,
- atk = 6,
physcrit = 9,
dammod = {str=1},
melee_project={[DamageType.RANDOM_SILENCE] = 10, [DamageType.NATURE] = 18},
},
+ wielder = {combat_atk=6},
max_power = 25, power_regen = 1,
use_talent = { id = Talents.T_RUSH, level = 3, power = 15 },
@@ -1618,12 +1618,12 @@ newEntity{ base = "BASE_WHIP",
combat = {
dam = 28,
apr = 8,
- atk = 10,
physcrit = 5,
dammod = {dex=1},
melee_project={[DamageType.POISON] = 22},
},
wielder = {
+ combat_atk = 10,
see_invisible = 9,
},
}
diff --git a/game/modules/tome/data/maps/vaults/trickvault.lua b/game/modules/tome/data/maps/vaults/trickvault.lua
index 2d4d08d698..3f73ad40cf 100644
--- a/game/modules/tome/data/maps/vaults/trickvault.lua
+++ b/game/modules/tome/data/maps/vaults/trickvault.lua
@@ -20,6 +20,14 @@
startx = 7
starty = 12
+setStatusAll{no_teleport=true}
+
+specialList("terrain", {
+ "/data/general/grids/basic.lua",
+ "/data/general/grids/lava.lua",
+ "/data/general/grids/.lua",
+})
+
defineTile('#', "HARDWALL")
defineTile('O', "GLASSWALL")
defineTile('!', "DOOR_VAULT", nil, nil, nil, {block = true})
diff --git a/game/modules/tome/data/talents/chronomancy/energy.lua b/game/modules/tome/data/talents/chronomancy/energy.lua
index dde3068f03..42920c25a5 100644
--- a/game/modules/tome/data/talents/chronomancy/energy.lua
+++ b/game/modules/tome/data/talents/chronomancy/energy.lua
@@ -141,7 +141,7 @@ newTalent{
self.talents_cd[tid] = self.talents_cd[tid] - cdr
end
end
-
+ target:crossTierEffect(target.EFF_SPELLSHOCKED, self:combatSpellpower())
game.level.map:particleEmitter(tx, ty, 1, "charge_matter")
game.level.map:particleEmitter(self.x, self.y, 1, "charge")
game:playSoundNear(self, "talents/spell_generic")
diff --git a/game/modules/tome/data/talents/chronomancy/spacetime-folding.lua b/game/modules/tome/data/talents/chronomancy/spacetime-folding.lua
index 560ab943ed..fd21e2a644 100644
--- a/game/modules/tome/data/talents/chronomancy/spacetime-folding.lua
+++ b/game/modules/tome/data/talents/chronomancy/spacetime-folding.lua
@@ -77,6 +77,7 @@ newTalent{
end
if target:canBe("teleport") and self:checkHit(power, target:combatSpellResist() + (target:attr("continuum_destabilization") or 0)) then
+ target:crossTierEffect(target.EFF_SPELLSHOCKED, self:combatSpellpower())
-- first remove the target so the destination tile is empty
game.level.map:remove(target.x, target.y, Map.ACTOR)
local px, py
diff --git a/game/modules/tome/data/talents/corruptions/blight.lua b/game/modules/tome/data/talents/corruptions/blight.lua
index d2eefbe025..601585457b 100644
--- a/game/modules/tome/data/talents/corruptions/blight.lua
+++ b/game/modules/tome/data/talents/corruptions/blight.lua
@@ -92,6 +92,7 @@ newTalent{
local eff = rng.tableRemove(effs)
if self:checkHit(self:combatSpellpower(), target:combatSpellResist(), 0, 95, 5) then
+ target:crossTierEffect(target.EFF_SPELLSHOCKED, self:combatSpellpower())
if eff[1] == "effect" then
target:removeEffect(eff[2])
else
diff --git a/game/modules/tome/data/talents/corruptions/scourge.lua b/game/modules/tome/data/talents/corruptions/scourge.lua
index 71470033b7..0d7ec63be5 100644
--- a/game/modules/tome/data/talents/corruptions/scourge.lua
+++ b/game/modules/tome/data/talents/corruptions/scourge.lua
@@ -45,14 +45,14 @@ newTalent{
-- Try to bleed !
if hit1 then
if target:canBe("cut") then
- target:setEffect(target.EFF_CUT, 5, {power=self:combatTalentSpellDamage(t, 5, 40), src=self, apply_power=self:combatAttackStr(weapon.combat)})
+ target:setEffect(target.EFF_CUT, 5, {power=self:combatTalentSpellDamage(t, 5, 40), src=self, apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the cut!", target.name:capitalize())
end
end
if hit2 then
if target:canBe("cut") then
- target:setEffect(target.EFF_CUT, 5, {power=self:combatTalentSpellDamage(t, 5, 40), src=self, apply_power=self:combatAttackStr(offweapon.combat)})
+ target:setEffect(target.EFF_CUT, 5, {power=self:combatTalentSpellDamage(t, 5, 40), src=self, apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the cut!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/cunning/ambush.lua b/game/modules/tome/data/talents/cunning/ambush.lua
index 359151e3ce..76070cfe92 100644
--- a/game/modules/tome/data/talents/cunning/ambush.lua
+++ b/game/modules/tome/data/talents/cunning/ambush.lua
@@ -38,7 +38,7 @@ newTalent{
if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
if target:canBe("disarm") then
- target:setEffect(target.EFF_DISARMED, t.getDuration(self, t), {apply_power=self:combatAttackDex()})
+ target:setEffect(target.EFF_DISARMED, t.getDuration(self, t), {apply_power=self:combatAttack()})
else
game.logSeen(target, "%s resists the shadow!", target.name:capitalize())
end
@@ -80,7 +80,7 @@ newTalent{
if core.fov.distance(self.x, self.y, sx, sy) <= 1 then
if target:canBe("silence") then
- target:setEffect(target.EFF_SILENCED, t.getDuration(self, t), {apply_power=self:combatAttackDex()})
+ target:setEffect(target.EFF_SILENCED, t.getDuration(self, t), {apply_power=self:combatAttack()})
else
game.logSeen(target, "%s resists the shadow!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/cunning/dirty.lua b/game/modules/tome/data/talents/cunning/dirty.lua
index b92d5f5829..b4618c636a 100644
--- a/game/modules/tome/data/talents/cunning/dirty.lua
+++ b/game/modules/tome/data/talents/cunning/dirty.lua
@@ -40,7 +40,7 @@ newTalent{
if hitted then
if target:canBe("stun") then
- target:setEffect(target.EFF_STUNNED, t.getDuration(self, t), {apply_power=self:combatAttackDex()})
+ target:setEffect(target.EFF_STUNNED, t.getDuration(self, t), {apply_power=self:combatAttack()})
else
game.logSeen(target, "%s resists the stun!", target.name:capitalize())
end
@@ -140,7 +140,7 @@ newTalent{
tw = tw or target.combat
local atk = target:combatAttack(tw) * (t.getAttackPenalty(self, t)) / 100
local dam = target:combatDamage(tw) * (t.getDamagePenalty(self, t)) / 100
- target:setEffect(target.EFF_CRIPPLE, t.getDuration(self, t), {atk=atk, dam=dam, apply_power=self:combatAttackDex()})
+ target:setEffect(target.EFF_CRIPPLE, t.getDuration(self, t), {atk=atk, dam=dam, apply_power=self:combatAttack()})
end
return true
diff --git a/game/modules/tome/data/talents/cunning/traps.lua b/game/modules/tome/data/talents/cunning/traps.lua
index b2b3a8c7a3..94fdca2662 100644
--- a/game/modules/tome/data/talents/cunning/traps.lua
+++ b/game/modules/tome/data/talents/cunning/traps.lua
@@ -281,7 +281,7 @@ newTalent{
local t = basetrap(self, t, x, y, 8 + self:getTalentLevel(self.T_TRAP_MASTERY), {
type = "physical", name = "bear trap", color=colors.UMBER, image = "trap/beartrap01.png",
dam = dam,
- check_hit = self:combatAttackDex(),
+ check_hit = self:combatAttack(),
triggered = function(self, x, y, who)
if who and who:canBe("cut") then who:setEffect(who.EFF_CUT, 5, {src=self.summoner, power=self.dam}) end
if who:canBe("pin") then
@@ -329,7 +329,7 @@ newTalent{
local t = basetrap(self, t, x, y, 8 + self:getTalentLevel(self.T_TRAP_MASTERY), {
type = "physical", name = "catapult trap", color=colors.LIGHT_UMBER, image = "trap/trap_catapult_01_64.png",
dist = 2 + math.ceil(self:getTalentLevel(self.T_TRAP_MASTERY)),
- check_hit = self:combatAttackDex(),
+ check_hit = self:combatAttack(),
triggered = function(self, x, y, who)
-- Try to knockback !
local can = function(target)
@@ -383,7 +383,7 @@ newTalent{
local t = basetrap(self, t, x, y, 8 + self:getTalentLevel(self.T_TRAP_MASTERY), {
type = "physical", name = "disarming trap", color=colors.DARK_GREY, image = "trap/trap_magical_disarm_01_64.png",
dur = 2 + math.ceil(self:getTalentLevel(self.T_TRAP_MASTERY) / 2),
- check_hit = self:combatAttackDex(),
+ check_hit = self:combatAttack(),
triggered = function(self, x, y, who)
if who:canBe("disarm") then
who:setEffect(who.EFF_DISARMED, self.dur, {apply_power=self.check_hit})
@@ -431,7 +431,7 @@ newTalent{
local t = basetrap(self, t, x, y, 5 + self:getTalentLevel(self.T_TRAP_MASTERY), {
type = "nature", name = "nightshade trap", color=colors.LIGHT_BLUE, image = "trap/poison_vines01.png",
dam = dam,
- check_hit = self:combatAttackDex(),
+ check_hit = self:combatAttack(),
triggered = function(self, x, y, who)
self:project({type="hit", x=x,y=y}, x, y, engine.DamageType.NATURE, self.dam, {type="slime"})
if who:canBe("stun") then
@@ -476,7 +476,7 @@ newTalent{
local t = basetrap(self, t, x, y, 5 + self:getTalentLevel(self.T_TRAP_MASTERY), {
type = "elemental", name = "flash bang trap", color=colors.YELLOW, image = "trap/blast_acid01.png",
dur = math.floor(self:getTalentLevel(self.T_TRAP_MASTERY) + 4),
- check_hit = self:combatAttackDex(),
+ check_hit = self:combatAttack(),
lure_trigger = true,
triggered = function(self, x, y, who)
self:project({type="ball", x=x,y=y, radius=2}, x, y, function(px, py)
diff --git a/game/modules/tome/data/talents/cursed/slaughter.lua b/game/modules/tome/data/talents/cursed/slaughter.lua
index a4405f893d..8678b3dfca 100644
--- a/game/modules/tome/data/talents/cursed/slaughter.lua
+++ b/game/modules/tome/data/talents/cursed/slaughter.lua
@@ -199,7 +199,8 @@ newTalent{
local blocked = true
if blockingTarget.size_category <= maxSize then
- if blockingTarget:checkHit(self:combatAttackStr(), blockingTarget:combatPhysicalResist(), 0, 95, 15) and blockingTarget:canBe("knockback") then
+ if blockingTarget:checkHit(self:combatPhysicalpower(), blockingTarget:combatPhysicalResist(), 0, 95, 15) and blockingTarget:canBe("knockback") then
+ blockingTarget:crossTierEffect(blockingTarget.EFF_OFFBALANCE, self:combatPhysicalpower())
-- determine where to move the target (any adjacent square that isn't next to the attacker)
local start = rng.range(0, 8)
for i = start, start + 8 do
diff --git a/game/modules/tome/data/talents/gifts/fire-drake.lua b/game/modules/tome/data/talents/gifts/fire-drake.lua
index 5123e775fb..0add2d8a97 100644
--- a/game/modules/tome/data/talents/gifts/fire-drake.lua
+++ b/game/modules/tome/data/talents/gifts/fire-drake.lua
@@ -39,7 +39,7 @@ newTalent{
self:project(tg, self.x, self.y, DamageType.CONFUSION, {
dur=3,
dam=40 + 6 * self:getTalentLevel(t),
- power_check=function() return self:combatAttackStr() end,
+ power_check=function() return self:combatPhysicalpower() end,
resist_check=self.combatPhysicalResist,
}, {type="flame"})
return true
diff --git a/game/modules/tome/data/talents/gifts/sand-drake.lua b/game/modules/tome/data/talents/gifts/sand-drake.lua
index d45db8bf6b..7e4cd350a9 100644
--- a/game/modules/tome/data/talents/gifts/sand-drake.lua
+++ b/game/modules/tome/data/talents/gifts/sand-drake.lua
@@ -42,7 +42,7 @@ newTalent{
return true
end
- if (target:checkHit(self:combatAttackStr(), target:combatPhysicalResist(), 0, 95, 15) or target.dead) and (target:canBe("instakill") or target.life * 100 / target.max_life <= 5) then
+ if (target:checkHit(self:combatPhysicalpower(), target:combatPhysicalResist(), 0, 95, 15) or target.dead) and (target:canBe("instakill") or target.life * 100 / target.max_life <= 5) then
if not target.dead then target:die(self) end
world:gainAchievement("EAT_BOSSES", self, target)
self:incEquilibrium(-target.level - 5)
diff --git a/game/modules/tome/data/talents/gifts/storm-drake.lua b/game/modules/tome/data/talents/gifts/storm-drake.lua
index 2e10d76bff..20b5b6fe8e 100644
--- a/game/modules/tome/data/talents/gifts/storm-drake.lua
+++ b/game/modules/tome/data/talents/gifts/storm-drake.lua
@@ -67,6 +67,7 @@ newTalent{
game.logSeen(target, "%s resists the static field!", target.name:capitalize())
return
end
+ target:crossTierEffect(target.EFF_OFFBALANCE, self:combatMindpower())
game.logSeen(target, "%s is caught in the static field!", target.name:capitalize())
local dam = target.life * t.getPercent(self, t) / 100
if target.life - dam < 0 then dam = target.life end
diff --git a/game/modules/tome/data/talents/gifts/summon-utility.lua b/game/modules/tome/data/talents/gifts/summon-utility.lua
index 8e2240a9c2..8d29a638e3 100644
--- a/game/modules/tome/data/talents/gifts/summon-utility.lua
+++ b/game/modules/tome/data/talents/gifts/summon-utility.lua
@@ -75,7 +75,7 @@ newTalent{ short_name="SPIDER_WEB",
self:project(tg, x, y, function(tx, ty)
local target = game.level.map(tx, ty, Map.ACTOR)
if target and target:canBe("pin") then
- target:setEffect(target.EFF_PINNED, 3 + self:getTalentLevel(t), {apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_PINNED, 3 + self:getTalentLevel(t), {apply_power=self:combatPhysicalpower()})
end
end)
return true
diff --git a/game/modules/tome/data/talents/misc/horrors.lua b/game/modules/tome/data/talents/misc/horrors.lua
index 04c5d77c48..1c609aa059 100644
--- a/game/modules/tome/data/talents/misc/horrors.lua
+++ b/game/modules/tome/data/talents/misc/horrors.lua
@@ -49,7 +49,7 @@ newTalent{
local hit = self:attackTarget(target, nil, t.getDamage(self, t), true)
if hit then
if target:canBe("cut") then
- target:setEffect(target.EFF_DEEP_WOUND, 5, {src=self, heal_factor=t.getHealingPenalty(self, t), power=t.getBleedDamage(self, t)/5, apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_DEEP_WOUND, 5, {src=self, heal_factor=t.getHealingPenalty(self, t), power=t.getBleedDamage(self, t)/5, apply_power=self:combatPhysicalpower()})
end
end
return true
@@ -151,7 +151,7 @@ newTalent{
local hit = self:attackTarget(target, nil, t.getDamage(self, t), true)
if target:canBe("cut") then
- target:setEffect(target.EFF_CUT, 5, {power=t.getBleedDamage(self, t), src=self, apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_CUT, 5, {power=t.getBleedDamage(self, t), src=self, apply_power=self:combatPhysicalpower()})
t.do_devourer_frenzy(self, target, t)
else
game.logSeen(target, "%s resists the cut!", target.name:capitalize())
@@ -392,6 +392,7 @@ newTalent{
if target:canBe("fear") then
target:setEffect(target.EFF_VOID_ECHOES, 6, {src=self, power=t.getDamage(self, t), apply_power=self:combatMindpower()})
+ target:crossTierEffect(target.EFF_VOID_ECHOES, self:combatMindpower())
else
game.logSeen(target, "%s resists the void!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/misc/misc.lua b/game/modules/tome/data/talents/misc/misc.lua
index f751948f18..aa02567bd1 100644
--- a/game/modules/tome/data/talents/misc/misc.lua
+++ b/game/modules/tome/data/talents/misc/misc.lua
@@ -29,6 +29,7 @@ load("/data/talents/misc/inscriptions.lua")
load("/data/talents/misc/npcs.lua")
load("/data/talents/misc/horrors.lua")
load("/data/talents/misc/races.lua")
+load("/data/talents/misc/tutorial.lua")
-- Default melee attack
newTalent{
diff --git a/game/modules/tome/data/talents/misc/npcs.lua b/game/modules/tome/data/talents/misc/npcs.lua
index 22812349de..c4202a8e11 100644
--- a/game/modules/tome/data/talents/misc/npcs.lua
+++ b/game/modules/tome/data/talents/misc/npcs.lua
@@ -187,7 +187,7 @@ newTalent{
-- Try to stun !
if hit then
if target:canBe("stun") then
- target:setEffect(target.EFF_STUNNED, 2 + self:getTalentLevel(t), {apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_STUNNED, 2 + self:getTalentLevel(t), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the stunning blow!", target.name:capitalize())
end
@@ -217,7 +217,8 @@ newTalent{
local hit = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.5, 1), true)
if hit and target:canBe("disarm") then
- target:setEffect(target.EFF_DISARMED, 2 + self:getTalentLevel(t), {apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_DISARMED, 2 + self:getTalentLevel(t), {apply_power=self:combatPhysicalpower()})
+ target:crossTierEffect(target.EFF_DISARMED, self:combatPhysicalpower())
else
game.logSeen(target, "%s resists the blow!", target.name:capitalize())
end
@@ -248,7 +249,7 @@ newTalent{
-- Try to stun !
if hit then
if target:canBe("stun") then
- target:setEffect(target.EFF_CONSTRICTED, (2 + self:getTalentLevel(t)) * 10, {src=self, power=1.5 * self:getTalentLevel(t), apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_CONSTRICTED, (2 + self:getTalentLevel(t)) * 10, {src=self, power=1.5 * self:getTalentLevel(t), apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the constriction!", target.name:capitalize())
end
@@ -279,8 +280,9 @@ newTalent{
-- Try to knockback !
if hit then
- if target:checkHit(self:combatAttackStr(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("knockback") then
+ if target:checkHit(self:combatPhysicalpower(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("knockback") then
target:knockback(self.x, self.y, 4)
+ target:crossTierEffect(target.EFF_OFFBALANCE, self:combatPhysicalpower())
else
game.logSeen(target, "%s resists the knockback!", target.name:capitalize())
end
@@ -395,7 +397,7 @@ newTalent{
-- Try to rot !
if hit then
if target:canBe("disease") then
- target:setEffect(target.EFF_ROTTING_DISEASE, 10 + self:getTalentLevel(t) * 3, {src=self, dam=self:getStr() / 3 + self:getTalentLevel(t) * 2, con=math.floor(4 + target:getCon() * 0.1), apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_ROTTING_DISEASE, 10 + self:getTalentLevel(t) * 3, {src=self, dam=self:getStr() / 3 + self:getTalentLevel(t) * 2, con=math.floor(4 + target:getCon() * 0.1), apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the disease!", target.name:capitalize())
end
@@ -426,7 +428,7 @@ newTalent{
-- Try to rot !
if hit then
if target:canBe("disease") then
- target:setEffect(target.EFF_DECREPITUDE_DISEASE, 10 + self:getTalentLevel(t) * 3, {src=self, dam=self:getStr() / 3 + self:getTalentLevel(t) * 2, dex=math.floor(4 + target:getDex() * 0.1), apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_DECREPITUDE_DISEASE, 10 + self:getTalentLevel(t) * 3, {src=self, dam=self:getStr() / 3 + self:getTalentLevel(t) * 2, dex=math.floor(4 + target:getDex() * 0.1), apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the disease!", target.name:capitalize())
end
@@ -457,7 +459,7 @@ newTalent{
-- Try to rot !
if hit then
if target:canBe("disease") then
- target:setEffect(target.EFF_WEAKNESS_DISEASE, 10 + self:getTalentLevel(t) * 3, {src=self, dam=self:getStr() / 3 + self:getTalentLevel(t) * 2, str=math.floor(4 + target:getStr() * 0.1), apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_WEAKNESS_DISEASE, 10 + self:getTalentLevel(t) * 3, {src=self, dam=self:getStr() / 3 + self:getTalentLevel(t) * 2, str=math.floor(4 + target:getStr() * 0.1), apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the disease!", target.name:capitalize())
end
@@ -653,7 +655,7 @@ newTalent{
-- Try to stun !
if hit then
if target:canBe("stun") then
- target:setEffect(target.EFF_PINNED, 1 + self:getTalentLevel(t), {apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_PINNED, 1 + self:getTalentLevel(t), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the grab!", target.name:capitalize())
end
@@ -1044,7 +1046,7 @@ newTalent{
-- Try to stun !
if hit then
if target:canBe("stun") then
- target:setEffect(target.EFF_PINNED, 2 + self:getTalentLevel(t), {apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_PINNED, 2 + self:getTalentLevel(t), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the crushing!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/misc/tutorial.lua b/game/modules/tome/data/talents/misc/tutorial.lua
new file mode 100644
index 0000000000..1377e2ed03
--- /dev/null
+++ b/game/modules/tome/data/talents/misc/tutorial.lua
@@ -0,0 +1,207 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011 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
+
+-- race & classes
+newTalentType{ type="tutorial", name = "tutorial", hide = true, description = "Tutorial-specific talents." }
+
+newTalent{
+ name = "Shove", short_name = "TUTORIAL_PHYS_KB",
+ type = {"tutorial", 1},
+ points = 5,
+ random_ego = "attack",
+ cooldown = 0,
+ requires_target = true,
+ tactical = { ATTACK = 2},
+ action = function(self, t)
+ local tg = {type="hit", range=self:getTalentRange(t)}
+ local x, y, target = self:getTarget(tg)
+ if not x or not y or not target then return nil end
+ if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+ if self:checkHit(self:combatPhysicalpower(), target:combatPhysicalResist()) then
+ target:knockback(self.x, self.y, 1)
+ else
+ game.logSeen(target, "%s resists the shove!", target.name:capitalize())
+ end
+ return true
+ end,
+ info = function(self, t)
+ return ([[Give the target a good old-fashioned shove, knocking it back a square.]])
+ end,
+}
+
+newTalent{
+ name = "Mana Gale", short_name = "TUTORIAL_SPELL_KB",
+ type = {"tutorial", 1},
+ points = 5,
+ range = 3,
+ random_ego = "attack",
+ cooldown = 0,
+ requires_target = true,
+ tactical = { ATTACK = 2},
+ action = function(self, t)
+ local tg = {type="hit", range=self:getTalentRange(t)}
+ local x, y, target = self:getTarget(tg)
+ if not x or not y or not target then return nil end
+ if core.fov.distance(self.x, self.y, x, y) > self:getTalentRange(t) then return nil end
+ if self:checkHit(self:combatSpellpower(), target:combatPhysicalResist()) then
+ target:knockback(self.x, self.y, self:getTalentLevel(t))
+ game.logSeen(target, "%s is knocked back by the gale!", target.name:capitalize())
+ target:crossTierEffect(target.EFF_OFFBALANCE, self:combatSpellpower())
+ else
+ game.logSeen(target, "%s remains firmly planted in the face of the gale!", target.name:capitalize())
+ end
+ return true
+ end,
+ info = function(self, t)
+ local dist = self:getTalentLevel(t)
+ return ([[Conjure up a powerful magical wind, pushing the target back a distance of %d.]]):format(dist)
+ end,
+}
+
+newTalent{
+ name = "Telekinetic Punt", short_name = "TUTORIAL_MIND_KB",
+ type = {"tutorial", 1},
+ points = 5,
+ range = 3,
+ random_ego = "attack",
+ cooldown = 0,
+ requires_target = true,
+ tactical = { ATTACK = 2},
+ action = function(self, t)
+ local tg = {type="hit", range=self:getTalentRange(t)}
+ local x, y, target = self:getTarget(tg)
+ if not x or not y or not target then return nil end
+ if core.fov.distance(self.x, self.y, x, y) > self:getTalentRange(t) then return nil end
+ if self:checkHit(self:combatMindpower(), target:combatPhysicalResist()) then
+ target:knockback(self.x, self.y, 1)
+ game.logSeen(target, "%s is knocked back by the telekinetic blow!", target.name:capitalize())
+ target:crossTierEffect(target.EFF_OFFBALANCE, self:combatMindpower())
+ else
+ game.logSeen(target, "%s holds its ground!", target.name:capitalize())
+ end
+ return true
+ end,
+ info = function(self, t)
+ return ([[Knock the target backwards with a powerful telekinetic blow.]])
+ end,
+}
+
+newTalent{
+ name = "Blink", short_name = "TUTORIAL_SPELL_BLINK",
+ type = {"tutorial", 1},
+ points = 5,
+ range = 3,
+ random_ego = "attack",
+ cooldown = 0,
+ requires_target = true,
+ tactical = { ATTACK = 2},
+ action = function(self, t)
+ local tg = {type="hit", range=self:getTalentRange(t)}
+ local x, y, target = self:getTarget(tg)
+ if not x or not y or not target then return nil end
+ if core.fov.distance(self.x, self.y, x, y) > self:getTalentRange(t) then return nil end
+ if self:checkHit(self:combatSpellpower(), target:combatSpellResist()) then
+ target:knockback(self.x, self.y, 1)
+ game.logSeen(target, "%s is teleported a short distance!", target.name:capitalize())
+ target:crossTierEffect(target.EFF_SPELLSHOCKED, self:combatSpellpower())
+ else
+ game.logSeen(target, "%s resists the teleportation!", target.name:capitalize())
+ end
+ return true
+ end,
+ info = function(self, t)
+ return ([[Attempts to magically teleport a target slightly farther from you.]])
+ end,
+}
+
+newTalent{
+ name = "Fear", short_name = "TUTORIAL_MIND_FEAR",
+ type = {"tutorial", 1},
+ points = 5,
+ range = 3,
+ random_ego = "attack",
+ cooldown = 0,
+ requires_target = true,
+ tactical = { ATTACK = 2},
+ action = function(self, t)
+ local tg = {type="hit", range=self:getTalentRange(t)}
+ local x, y, target = self:getTarget(tg)
+ if not x or not y or not target then return nil end
+ if core.fov.distance(self.x, self.y, x, y) > self:getTalentRange(t) then return nil end
+ if self:checkHit(self:combatMindpower(), target:combatMentalResist()) then
+ target:knockback(self.x, self.y, 1)
+ game.logSeen(target, "%s retreats in terror!", target.name:capitalize())
+ target:crossTierEffect(target.EFF_BRAINLOCKED, self:combatMindpower())
+ else
+ game.logSeen(target, "%s shakes off the fear!", target.name:capitalize())
+ end
+ return true
+ end,
+ info = function(self, t)
+ return ([[Attempts to briefly terrify a target into retreating.]])
+ end,
+}
+
+newTalent{
+ name = "Bleed", short_name = "TUTORIAL_SPELL_BLEED",
+ type = {"tutorial", 1},
+ points = 5,
+ range = 5,
+ random_ego = "attack",
+ cooldown = 0,
+ requires_target = true,
+ tactical = { ATTACK = 2},
+ action = function(self, t)
+ local tg = {type="hit", range=self:getTalentRange(t)}
+ local x, y, target = self:getTarget(tg)
+ if not x or not y or not target then return nil end
+ if core.fov.distance(self.x, self.y, x, y) > self:getTalentRange(t) then return nil end
+ if target then
+ target:setEffect(self.EFF_CUT, 10, {power=1, apply_power=self:combatSpellpower()})
+ end
+ return true
+ end,
+ info = function(self, t)
+ return ([[Inflicts a 10-turn bleed effect.]])
+ end,
+}
+
+newTalent{
+ name = "Confusion", short_name = "TUTORIAL_MIND_CONFUSION",
+ type = {"tutorial", 1},
+ points = 5,
+ range = 3,
+ random_ego = "attack",
+ cooldown = 6,
+ requires_target = true,
+ tactical = { ATTACK = 2},
+ action = function(self, t)
+ local tg = {type="hit", range=self:getTalentRange(t)}
+ local x, y, target = self:getTarget(tg)
+ if not x or not y or not target then return nil end
+ if core.fov.distance(self.x, self.y, x, y) > self:getTalentRange(t) then return nil end
+ if target then
+ target:setEffect(self.EFF_CONFUSED, 5, {power=100, apply_power=self:combatMindpower()})
+ end
+ return true
+ end,
+ info = function(self, t)
+ return ([[Use your mental powers to confuse the target for five turns.]])
+ end,
+}
diff --git a/game/modules/tome/data/talents/psionic/absorption.lua b/game/modules/tome/data/talents/psionic/absorption.lua
index 8875028e53..30ad5080f0 100644
--- a/game/modules/tome/data/talents/psionic/absorption.lua
+++ b/game/modules/tome/data/talents/psionic/absorption.lua
@@ -23,7 +23,7 @@ local function getShieldStrength(self, t)
add = getGemLevel(self)*(1 + 0.1*(self:getTalentLevel(self.T_FOCUSED_CHANNELING) or 0))
end
--return 2 + (1+ self:getWil(8))*self:getTalentLevel(t) + add
- return self:combatTalentIntervalDamage(t, "wil", 3, 50) + add
+ return self:combatStatTalentIntervalDamage(t, "combatMindpower", 3, 40) + add
end
local function getSpikeStrength(self, t)
diff --git a/game/modules/tome/data/talents/psionic/augmented-mobility.lua b/game/modules/tome/data/talents/psionic/augmented-mobility.lua
index 2f3f5cf758..8e1f5b54e7 100644
--- a/game/modules/tome/data/talents/psionic/augmented-mobility.lua
+++ b/game/modules/tome/data/talents/psionic/augmented-mobility.lua
@@ -69,8 +69,11 @@ newTalent{
psi = 30,
no_energy = true,
require = psi_wil_20_2,
+ getDuration = function(self, t)
+ return 10 + self:combatMindpower(0.1)
+ end,
action = function(self, t)
- self:setEffect(self.EFF_QUICKNESS, 10+self:getWil(10), {power=self:getTalentLevel(t) * 0.2})
+ self:setEffect(self.EFF_QUICKNESS, t.getDuration(self, t), {power=self:getTalentLevel(t) * 0.2})
return true
end,
info = function(self, t)
@@ -78,7 +81,7 @@ newTalent{
local percentinc = 100 * inc
--local percentinc = ((1/(1-inc))-1)*100
return ([[You encase your legs in precise sheathes of force, increasing your movement speed by %d%% for %d turns.]]):
- format(percentinc, 10+self:getWil(10))
+ format(percentinc, t.getDuration(self, t))
end,
}
diff --git a/game/modules/tome/data/talents/psionic/finer-energy-manipulations.lua b/game/modules/tome/data/talents/psionic/finer-energy-manipulations.lua
index 24cd16f7a1..fa0c0b08be 100644
--- a/game/modules/tome/data/talents/psionic/finer-energy-manipulations.lua
+++ b/game/modules/tome/data/talents/psionic/finer-energy-manipulations.lua
@@ -21,19 +21,22 @@ newTalent{
name = "Perfect Control",
type = {"psionic/finer-energy-manipulations", 1},
require = psi_cun_high1,
- cooldown = 100,
+ cooldown = 50,
psi = 15,
points = 5,
tactical = { BUFF = 2 },
+ getBoost = function(self, t)
+ return 15 + math.ceil(self:getTalentLevel(t)*self:combatStatTalentIntervalDamage(t, "combatMindpower", 1, 9))
+ end,
action = function(self, t)
- self:setEffect(self.EFF_CONTROL, 5 + self:getTalentLevelRaw(t), {power=15 + math.ceil(self:getTalentLevel(t)*(1 + self:getCun(8, true)))})
+ self:setEffect(self.EFF_CONTROL, 5 + self:getTalentLevelRaw(t), {power= t.getBoost(self, t)})
return true
end,
info = function(self, t)
- local boost = 15 + math.ceil(self:getTalentLevel(t)*(1 + self:getCun(8, true)))
+ local boost = t.getBoost(self, t)
local dur = 5 + self:getTalentLevelRaw(t)
return ([[Encase your body in a sheath of thought-quick forces, allowing you to control your body's movements directly without the inefficiency of dealing with crude mechanisms like nerves and muscles.
- Increases attack by %d and critical strike chance by %0.2f%% for %d turns. The effect scales with Cunning.]]):
+ Increases attack by %d and critical strike chance by %0.2f%% for %d turns.]]):
format(boost, 0.5*boost, dur)
end,
}
@@ -48,7 +51,7 @@ newTalent{
no_npc_use = true,
no_unlearn_last = true,
boost = function(self, t)
- return math.floor(self:combatTalentIntervalDamage(t, "wil", 3, 20))
+ return math.floor(self:combatStatTalentIntervalDamage(t, "combatMindpower", 3, 20))
end,
action = function(self, t)
local d d = self:showInventory("Reshape which weapon?", self:getInven("INVEN"), function(o) return not o.quest and o.type == "weapon" and not o.fully_reshaped end, function(o, item)
@@ -77,8 +80,7 @@ newTalent{
end,
info = function(self, t)
local weapon_boost = t.boost(self, t)
- return ([[Manipulate forces on the molecular level to realign, rebalance, and hone your weapon. Permanently increases the accuracy and damage of any weapon by %d.
- This value scales with Willpower.]]):
+ return ([[Manipulate forces on the molecular level to realign, rebalance, and hone your weapon. Permanently increases the accuracy and damage of any weapon by %d.]]):
format(weapon_boost)
end,
}
@@ -93,8 +95,6 @@ newTalent{
no_npc_use = true,
no_unlearn_last = true,
arm_boost = function(self, t)
- --return math.floor(0.1*self:combatTalentIntervalDamage(t, "wil", 10, 30))
- --return math.floor(0.25*t.fat_red(self, t))
local arm_values = {
0 + self:getWil(2),
1 + self:getWil(2),
@@ -106,7 +106,6 @@ newTalent{
return arm_values[index] * (self:getTalentLevel(t) / self:getTalentLevelRaw(t))
end,
fat_red = function(self, t)
- --return math.floor(0.1*self:combatTalentIntervalDamage(t, "wil", 50, 100))
local fat_values = {
1 + self:getWil(3),
1 + self:getWil(3),
@@ -168,13 +167,11 @@ newTalent{
points = 5,
no_npc_use = true,
energy_per_turn = function(self, t)
- --return 5 + 2 * math.ceil(self:getTalentLevel(t)) + self:getCun(5)
- return self:combatTalentIntervalDamage(t, "cun", 10, 40, 0.25)
+ return self:combatStatTalentIntervalDamage(t, "combatMindpower", 10, 40, 0.25)
end,
action = function(self, t)
local d d = self:showInventory("Use which gem?", self:getInven("INVEN"), function(gem) return gem.type == "gem" and gem.material_level and not gem.unique end, function(gem, gem_item)
self:removeObject(self:getInven("INVEN"), gem_item)
- --local amt = 0.1*self:combatTalentIntervalDamage(t, "cun", 100, 400)
local amt = t.energy_per_turn(self, t)
local dur = 3 + 2*(gem.material_level or 0)
self:setEffect(self.EFF_PSI_REGEN, dur, {power=amt})
@@ -189,7 +186,7 @@ newTalent{
info = function(self, t)
local amt = t.energy_per_turn(self, t)
return ([[Matter is energy, as any good Mindslayer knows. Unfortunately, the various bonds and particles involved are just too numerous and complex to make the conversion feasible in most cases. Fortunately, the organized, crystalline structure of gems makes it possible to transform a small percentage of its matter into usable energy.
- Grants %d energy per turn for between five and thirteen turns, depending on the quality of the gem used. The amount of energy granted per turn scales with Cunning.]]):
+ Grants %d energy per turn for between five and thirteen turns, depending on the quality of the gem used.]]):
format(amt)
end,
}
diff --git a/game/modules/tome/data/talents/psionic/focus.lua b/game/modules/tome/data/talents/psionic/focus.lua
index b7aca2203c..5e84fd9b8c 100644
--- a/game/modules/tome/data/talents/psionic/focus.lua
+++ b/game/modules/tome/data/talents/psionic/focus.lua
@@ -44,13 +44,12 @@ newTalent{
end,
getDamage = function (self, t)
local gem_level = getGemLevel(self)
- return self:combatTalentIntervalDamage(t, "wil", 6, 265)*(1 + 0.3*gem_level)
+ return self:combatStatTalentIntervalDamage(t, "combatMindpower", 6, 170)*(1 + 0.3*gem_level)
end,
requires_target = true,
target = function(self, t) return {type="ball", range=self:getTalentRange(t), radius=0, selffire=false, talent=t} end,
action = function(self, t)
local gem_level = getGemLevel(self)
- --local dam = (5 + self:getTalentLevel(t) * self:getWil(40))*(1 + 0.3*gem_level)
local dam = t.getDamage(self, t)
local tg = self:getTalentTarget(t)
local x, y = self:getTarget(tg)
@@ -81,8 +80,6 @@ newTalent{
return true
end,
info = function(self, t)
- --local gem_level = getGemLevel(self)
- --local dam = (5 + self:getTalentLevel(t) * self:getWil(40))*(1 + 0.3*gem_level)
local dam = t.getDamage(self, t)
return ([[Focus energies on a distant target to lash it with physical force, doing %d damage.
Mindslayers do not do this sort of ranged attack naturally. The use of a telekinetically-wielded gem as a focus will improve the effects considerably.]]):
@@ -113,7 +110,7 @@ newTalent{
end,
getDamage = function (self, t)
local gem_level = getGemLevel(self)
- return self:combatTalentIntervalDamage(t, "wil", 21, 281)*(1 + 0.3*gem_level)
+ return self:combatStatTalentIntervalDamage(t, "combatMindpower", 21, 200)*(1 + 0.3*gem_level)
end,
target = function(self, t)
return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), friendlyfire=false}
@@ -126,8 +123,6 @@ newTalent{
end,
info = function(self, t)
local radius = self:getTalentRadius(t)
- --local gem_level = getGemLevel(self)
- --local dam = (20 + self:getTalentLevel(t) * self:getWil(40))*(1 + 0.3*gem_level)
local dam = t.getDamage(self, t)
return ([[Focus energies on all foes within %d squares, setting them ablaze. Does %d damage over ten turns.
Mindslayers do not do this sort of ranged attack naturally. The use of a telekinetically-wielded gem as a focus will improve the effects considerably.]]):
diff --git a/game/modules/tome/data/talents/psionic/grip.lua b/game/modules/tome/data/talents/psionic/grip.lua
index b2764f5696..f0f2dd7f29 100644
--- a/game/modules/tome/data/talents/psionic/grip.lua
+++ b/game/modules/tome/data/talents/psionic/grip.lua
@@ -70,8 +70,7 @@ newTalent{
end,
getDuration = function (self, t)
local gem_level = getGemLevel(self)
- --return 5 + self:getWil(5) + self:getTalentLevel(t) + gem_level
- return self:combatTalentIntervalDamage(t, "wil", 3, 12, 0.2) + gem_level
+ return self:combatStatTalentIntervalDamage(t, "combatMindpower", 3, 10, 0.2) + gem_level
end,
requires_target = true,
target = function(self, t) return {type="ball", range=self:getTalentRange(t), radius=0, selffire=false, talent=t} end,
@@ -121,11 +120,11 @@ newTalent{
end,
getDuration = function (self, t)
local gem_level = getGemLevel(self)
- return self:combatTalentIntervalDamage(t, "wil", 2, 6, 0.2)
+ return self:combatStatTalentIntervalDamage(t, "combatMindpower", 2, 6, 0.2)
end,
getDamage = function (self, t)
local gem_level = getGemLevel(self)
- return self:combatTalentIntervalDamage(t, "wil", 100, 200, 0.25)*(1 + 0.1*gem_level)
+ return self:combatStatTalentIntervalDamage(t, "combatMindpower", 100, 150, 0.25)*(1 + 0.1*gem_level)
end,
requires_target = true,
target = function(self, t) return {type="ball", range=self:getTalentRange(t), radius=0, selffire=false, talent=t} end,
@@ -136,6 +135,7 @@ newTalent{
local x, y = self:getTarget(tg)
if not x or not y then return nil end
self:project(tg, x, y, DamageType.IMPLOSION, {dur=dur, dam=dam})
+ target:crossTierEffect(target.EFF_OFFBALANCE, self:combatMindpower())
return true
end,
diff --git a/game/modules/tome/data/talents/psionic/projection.lua b/game/modules/tome/data/talents/psionic/projection.lua
index 3fbc875ad8..d5d460acab 100644
--- a/game/modules/tome/data/talents/psionic/projection.lua
+++ b/game/modules/tome/data/talents/psionic/projection.lua
@@ -21,8 +21,7 @@ local function aura_strength(self, t)
if self:knowTalent(self.T_FOCUSED_CHANNELING) then
add = getGemLevel(self)*(1 + 0.1*(self:getTalentLevel(self.T_FOCUSED_CHANNELING) or 0))
end
- --return 5 + (1+ self:getWil(5))*self:getTalentLevel(t) + add
- return self:combatTalentIntervalDamage(t, "wil", 10, 50) + add
+ return self:combatStatTalentIntervalDamage(t, "combatMindpower", 10, 40) + add
end
local function aura_spike_strength(self, t)
@@ -183,7 +182,6 @@ newTalent{
local spikecost = t.getSpikeCost(self, t)
return ([[Fills the air around you with reactive currents of force that do %d physical damage to all who approach. All damage done by the aura will drain one point of energy per %0.2f points of damage dealt.
When deactivated, if you have at least %d energy, a massive spike of kinetic energy is released as a beam, smashing targets for %d physical damage and sending them flying. Telekinetically wielding a gem instead of a weapon will result in improved spike efficiency.
- The damage will increase with the Willpower stat.
To turn off an aura without spiking it, deactivate it and target yourself.]]):format(dam, mast, spikecost, spikedam)
end,
}
@@ -300,7 +298,6 @@ newTalent{
local spikecost = t.getSpikeCost(self, t)
return ([[Fills the air around you with reactive currents of furnace-like heat that do %d fire damage to all who approach. All damage done by the aura will drain one point of energy per %0.2f points of damage dealt.
When deactivated, if you have at least %d energy, a massive spike of thermal energy is released as a conical blast (radius %d) of superheated air. Anybody caught in it will suffer %d fire damage over several turns. Telekinetically wielding a gem instead of a weapon will result in improved spike efficiency.
- The damage will increase with the Willpower stat.
To turn off an aura without spiking it, deactivate it and target yourself.]]):format(dam, mast, spikecost, rad, spikedam)
end,
}
@@ -462,7 +459,6 @@ newTalent{
local nb = t.getNumSpikeTargets(self, t)
return ([[Fills the air around you with crackling energy, doing %d lightning damage to all who stand nearby. All damage done by the aura will drain one point of energy per %0.2f points of damage dealt.
When deactivated, if you have at least %d energy, a massive spike of electrical energy jumps between up to %d nearby targets, doing %d lightning damage to each. Telekinetically wielding a gem instead of a weapon will result in improved spike efficiency.
- The damage will increase with the Willpower stat.
To turn off an aura without spiking it, deactivate it and target yourself.]]):format(dam, mast, spikecost, nb, spikedam)
end,
}
diff --git a/game/modules/tome/data/talents/psionic/voracity.lua b/game/modules/tome/data/talents/psionic/voracity.lua
index 7fbe499001..e0a721d7ce 100644
--- a/game/modules/tome/data/talents/psionic/voracity.lua
+++ b/game/modules/tome/data/talents/psionic/voracity.lua
@@ -38,9 +38,15 @@ newTalent{
target = function(self, t)
return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=false, talent=t}
end,
+ getLeech = function(self, t)
+ return self:combatStatTalentIntervalDamage(t, "combatMindpower", 4, 20)
+ end,
+ getSlow = function(self, t)
+ return math.min(5 * self:getTalentLevel(t) + 15, 50)
+ end,
action = function(self, t)
- local en = ( 3 + self:getTalentLevel(t)) * (100 + self:getWil())/100
- local dam = math.min(0.1 + 0.03*self:getTalentLevel(t), 0.4)
+ local en = t.getLeech(self, t)
+ local dam = t.getSlow(self, t)/100
local tg = self:getTalentTarget(t)
self:project(tg, self.x, self.y, function(tx, ty)
local act = game.level.map(tx, ty, engine.Map.ACTOR)
@@ -53,11 +59,10 @@ newTalent{
end,
info = function(self, t)
local range = self:getTalentRadius(t)
- local slow = 3 * self:getTalentLevel(t) + 10
- local en = ( 3 + self:getTalentLevel(t)) * (100 + self:getWil())/100
+ local slow = t.getSlow(self, t)
+ local en = t.getLeech(self, t)
return ([[You suck the kinetic energy out of your surroundings, slowing all targets in a radius of %d by %d%% for four turns.
- For each target drained, you gain %d energy.
- The energy gained scales with Willpower.]]):format(range, slow, en)
+ For each target drained, you gain %d energy.]]):format(range, slow, en)
end,
}
@@ -81,9 +86,15 @@ newTalent{
target = function(self, t)
return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=false, talent=t}
end,
+ getLeech = function(self, t)
+ return self:combatStatTalentIntervalDamage(t, "combatMindpower", 5, 25)
+ end,
+ getDam = function(self, t)
+ return math.ceil(1 + 0.5*self:getTalentLevel(t))
+ end,
action = function(self, t)
- local en = ( 4 + self:getTalentLevel(t)) * (100 + self:getWil())/85
- local dam = math.ceil(1 + 0.5*self:getTalentLevel(t))
+ local en = t.getLeech(self, t)
+ local dam = t.getDam(self, t)
local tg = self:getTalentTarget(t)
self:project(tg, self.x, self.y, function(tx, ty)
local act = game.level.map(tx, ty, engine.Map.ACTOR)
@@ -96,11 +107,10 @@ newTalent{
end,
info = function(self, t)
local range = self:getTalentRadius(t)
- local dam = math.ceil(1 + 0.5*self:getTalentLevel(t))
- local en = ( 4 + self:getTalentLevel(t)) * (100 + self:getWil())/85
+ local dam = t.getDam(self, t)
+ local en = t.getLeech(self, t)
--local duration = self:getTalentLevel(t) + 2
- return ([[You leech the heat out of all targets in a radius of %d, freezing them for up to %d turns and gaining %d energy for each target frozen.
- The energy gained scales with Willpower.]]):
+ return ([[You leech the heat out of all targets in a radius of %d, freezing them for up to %d turns and gaining %d energy for each target frozen.]]):
format(range, dam, en)
end,
}
@@ -126,16 +136,22 @@ newTalent{
target = function(self, t)
return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=false, talent=t}
end,
+ getLeech = function(self, t)
+ return self:combatStatTalentIntervalDamage(t, "combatMindpower", 6, 30)
+ end,
+ getDam = function(self, t)
+ return self:spellCrit(self:combatTalentMindDamage(t, 28, 270))
+ end,
action = function(self, t)
- local en = ( 5 + self:getTalentLevel(t)) * (100 + self:getWil())/75
- local dam = self:spellCrit(self:combatTalentMindDamage(t, 28, 270))
+ local en = t.getLeech(self, t)
+ local dam = t.getDam(self, t)
local tg = self:getTalentTarget(t)
self:project(tg, self.x, self.y, function(tx, ty)
local act = game.level.map(tx, ty, engine.Map.ACTOR)
if act then
self:incPsi(en)
end
- DamageType:get(DamageType.LIGHTNING_DAZE).projector(self, tx, ty, DamageType.LIGHTNING_DAZE, dam)
+ DamageType:get(DamageType.LIGHTNING_DAZE).projector(self, tx, ty, DamageType.LIGHTNING_DAZE, rng.avg(dam/3, dam, 3))
end)
-- Lightning ball gets a special treatment to make it look neat
local sradius = (tg.radius + 0.5) * (engine.Map.tile_w + engine.Map.tile_h) / 2
@@ -153,10 +169,9 @@ newTalent{
end,
info = function(self, t)
local range = self:getTalentRadius(t)
- local en = ( 5 + self:getTalentLevel(t)) * (100 + self:getWil())/75
- local dam = damDesc(self, DamageType.LIGHTNING, self:combatTalentMindDamage(t, 28, 270))
- return ([[You pull electric potential from all targets around you in a radius of %d, gaining %d energy for each one affected and giving them a nasty shock in the process. Deals between %d and %d damage.
- The energy gained scales with Willpower.]]):format(range, en, dam / 3, dam)
+ local en = t.getLeech(self, t)
+ local dam = damDesc(self, DamageType.LIGHTNING, t.getDam(self, t))
+ return ([[You pull electric potential from all targets around you in a radius of %d, gaining %d energy for each one affected and giving them a nasty shock in the process. Deals between %d and %d damage.]]):format(range, en, dam / 3, dam)
end,
}
newTalent{
diff --git a/game/modules/tome/data/talents/spells/arcane-shield.lua b/game/modules/tome/data/talents/spells/arcane-shield.lua
index 2f04669913..1ffa1feeec 100644
--- a/game/modules/tome/data/talents/spells/arcane-shield.lua
+++ b/game/modules/tome/data/talents/spells/arcane-shield.lua
@@ -43,7 +43,7 @@ newTalent{
-- Try to stun !
if hit then
if target:canBe("stun") then
- target:setEffect(target.EFF_STUNNED, 2 + math.floor(self:getTalentLevel(t) / 2), {apply_power=self:combatAttackStr(shield.special_combat)})
+ target:setEffect(target.EFF_STUNNED, 2 + math.floor(self:getTalentLevel(t) / 2), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the stun!", target.name:capitalize())
end
@@ -113,7 +113,7 @@ newTalent{
-- Try to stun !
if hit1 or hit2 or hit3 then
if target:canBe("stun") then
- target:setEffect(target.EFF_DAZED, 3 + math.floor(self:getTalentLevel(t)), {apply_power=self:combatAttackStr(shield.special_combat), apply_save="combatSpellResist"})
+ target:setEffect(target.EFF_DAZED, 3 + math.floor(self:getTalentLevel(t)), {apply_power=self:combatPhysicalpower(), apply_save="combatSpellResist"})
else
game.logSeen(target, "%s resists the dazing blows!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/spells/golem.lua b/game/modules/tome/data/talents/spells/golem.lua
index 9036fcc199..86e41a9d2a 100644
--- a/game/modules/tome/data/talents/spells/golem.lua
+++ b/game/modules/tome/data/talents/spells/golem.lua
@@ -73,8 +73,9 @@ newTalent{
-- Try to knockback !
if hit then
- if target:checkHit(self:combatAttackStr(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("knockback") then
+ if target:checkHit(self:combatPhysicalpower(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("knockback") then
target:knockback(self.x, self.y, 3)
+ target:crossTierEffect(target.EFF_OFFBALANCE, self:combatPhysicalpower())
else
game.logSeen(target, "%s resists the knockback!", target.name:capitalize())
end
@@ -183,7 +184,7 @@ newTalent{
-- Try to pin
if hit then
if target:canBe("pin") then
- target:setEffect(target.EFF_PINNED, t.getPinDuration(self, t), {apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_PINNED, t.getPinDuration(self, t), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the crushing!", target.name:capitalize())
end
@@ -257,7 +258,7 @@ newTalent{
local target = game.level.map(xx, yy, Map.ACTOR)
if target and self:attackTarget(target, nil, t.getGolemDamage(self, t), true) then
if target:canBe("stun") then
- target:setEffect(target.EFF_DAZED, t.getDazeDuration(self, t), {apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_DAZED, t.getDazeDuration(self, t), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the dazing blow!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/spells/staff-combat.lua b/game/modules/tome/data/talents/spells/staff-combat.lua
index bfbe467ad4..29e0b42e6d 100644
--- a/game/modules/tome/data/talents/spells/staff-combat.lua
+++ b/game/modules/tome/data/talents/spells/staff-combat.lua
@@ -106,11 +106,13 @@ newTalent{
mode = "passive",
require = spells_req2,
points = 5,
- getDamage = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) end,
+ getDamage = function(self, t) return self:getTalentLevel(t) * 5 end,
+ getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) / 2 end,
info = function(self, t)
local damage = t.getDamage(self, t)
- return ([[Increases damage done with staves by %d%%.]]):
- format(100 * damage)
+ local inc = t.getPercentInc(self, t)
+ return ([[Increases Physical Power by %d. Also increases damage done with staves by %d%%.]]):
+ format(damage, 100 * inc)
end,
}
@@ -181,7 +183,7 @@ newTalent{
-- Try to stun !
if hit then
if target:canBe("stun") then
- target:setEffect(target.EFF_DAZED, t.getDazeDuration(self, t), {apply_power=self:combatAttackStr(weapon.combat)})
+ target:setEffect(target.EFF_DAZED, t.getDazeDuration(self, t), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the dazing blow!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/techniques/2hweapon.lua b/game/modules/tome/data/talents/techniques/2hweapon.lua
index 464d821fe3..df9ab66541 100644
--- a/game/modules/tome/data/talents/techniques/2hweapon.lua
+++ b/game/modules/tome/data/talents/techniques/2hweapon.lua
@@ -135,7 +135,7 @@ newTalent{
self:project(tg, x, y, DamageType.CONFUSION, {
dur=3+self:getTalentLevelRaw(t),
dam=50+self:getTalentLevelRaw(t)*10,
- power_check=function() return self:combatAttackStr(weapon) end,
+ power_check=function() return self:combatPhysicalpower() end,
resist_check=self.combatPhysicalResist,
}, {type="flame"})
return true
@@ -185,7 +185,7 @@ newTalent{
-- Try to insta-kill
if hit then
- if target:checkHit(self:combatAttackStr(weapon.combat), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("instakill") and target.life > 0 and target.life < target.max_life * 0.2 then
+ if target:checkHit(self:combatPhysicalpower(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("instakill") and target.life > 0 and target.life < target.max_life * 0.2 then
-- KILL IT !
game.logSeen(target, "%s feels the pain of the death blow!", target.name:capitalize())
target:die(self)
@@ -232,7 +232,7 @@ newTalent{
-- Try to stun !
if hit then
if target:canBe("stun") then
- target:setEffect(target.EFF_STUNNED, 2 + self:getTalentLevel(t), {apply_power=self:combatAttackStr(weapon.combat)})
+ target:setEffect(target.EFF_STUNNED, 2 + self:getTalentLevel(t), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the stunning blow!", target.name:capitalize())
end
@@ -244,7 +244,7 @@ newTalent{
return ([[Hits the target with your weapon doing %d%% damage. If the attack hits, the target is stunned for %d turns.
Stun chance increase with your Strength stat.]])
:format(100 * self:combatTalentWeaponDamage(t, 1, 1.5),
- 2 + self:getTalentLevel(t))
+ 2 + math.floor(self:getTalentLevel(t)))
end,
}
@@ -275,7 +275,7 @@ newTalent{
-- Try to stun !
if hit then
if target:canBe("stun") then
- target:setEffect(target.EFF_SUNDER_ARMOUR, 4 + self:getTalentLevel(t), {power=5*self:getTalentLevel(t), apply_power=self:combatAttackStr(weapon.combat)})
+ target:setEffect(target.EFF_SUNDER_ARMOUR, 4 + self:getTalentLevel(t), {power=5*self:getTalentLevel(t), apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the sundering!", target.name:capitalize())
end
@@ -321,7 +321,7 @@ newTalent{
-- Try to stun !
if hit then
if target:canBe("stun") then
- target:setEffect(target.EFF_SUNDER_ARMS, 4 + self:getTalentLevel(t), {power=3*self:getTalentLevel(t), apply_power=self:combatAttackStr(weapon.combat)})
+ target:setEffect(target.EFF_SUNDER_ARMS, 4 + self:getTalentLevel(t), {power=3*self:getTalentLevel(t), apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the sundering!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/techniques/archery.lua b/game/modules/tome/data/talents/techniques/archery.lua
index e4730d1366..7a62e69482 100644
--- a/game/modules/tome/data/talents/techniques/archery.lua
+++ b/game/modules/tome/data/talents/techniques/archery.lua
@@ -250,7 +250,7 @@ newTalent{
requires_target = true,
on_pre_use = function(self, t, silent) if not self:hasArcheryWeapon() then if not silent then game.logPlayer(self, "You require a bow or sling for this talent.") end return false end return true end,
archery_onhit = function(self, t, target, x, y)
- target:setEffect(target.EFF_SLOW, 7, {power=util.bound((self:combatAttack() * 0.15 * self:getTalentLevel(t)) / 100, 0.1, 0.4), apply_power=self:combatAttackDex()})
+ target:setEffect(target.EFF_SLOW, 7, {power=util.bound((self:combatAttack() * 0.15 * self:getTalentLevel(t)) / 100, 0.1, 0.4), apply_power=self:combatAttack()})
end,
action = function(self, t)
local targets = self:archeryAcquireTargets(nil, {one_shot=true})
@@ -278,7 +278,7 @@ newTalent{
on_pre_use = function(self, t, silent) if not self:hasArcheryWeapon() then if not silent then game.logPlayer(self, "You require a bow or sling for this talent.") end return false end return true end,
archery_onhit = function(self, t, target, x, y)
if target:canBe("pin") then
- target:setEffect(target.EFF_PINNED, 2 + self:getTalentLevelRaw(t), {apply_power=self:combatAttackDex()})
+ target:setEffect(target.EFF_PINNED, 2 + self:getTalentLevelRaw(t), {apply_power=self:combatAttack()})
else
game.logSeen(target, "%s resists!", target.name:capitalize())
end
@@ -318,7 +318,7 @@ newTalent{
on_pre_use = function(self, t, silent) if not self:hasArcheryWeapon() then if not silent then game.logPlayer(self, "You require a bow or sling for this talent.") end return false end return true end,
archery_onhit = function(self, t, target, x, y)
if target:canBe("stun") then
- target:setEffect(target.EFF_STUNNED, 2 + self:getTalentLevelRaw(t), {apply_power=self:combatAttackDex()})
+ target:setEffect(target.EFF_STUNNED, 2 + self:getTalentLevelRaw(t), {apply_power=self:combatAttack()})
else
game.logSeen(target, "%s resists!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/techniques/battle-tactics.lua b/game/modules/tome/data/talents/techniques/battle-tactics.lua
index c772756348..abb242821f 100644
--- a/game/modules/tome/data/talents/techniques/battle-tactics.lua
+++ b/game/modules/tome/data/talents/techniques/battle-tactics.lua
@@ -79,7 +79,7 @@ newTalent{
dam = rng.range(dam, dam * damrange)
dam = dam * self:combatTalentWeaponDamage(t, 2, 3.2)
- target:setEffect(target.EFF_DEEP_WOUND, 7, {src=self, heal_factor=self:getTalentLevel(t) * 10, power=dam / 7, apply_power=self:combatAttackDex()})
+ target:setEffect(target.EFF_DEEP_WOUND, 7, {src=self, heal_factor=self:getTalentLevel(t) * 10, power=dam / 7, apply_power=self:combatAttack()})
end
end
return true
diff --git a/game/modules/tome/data/talents/techniques/bloodthirst.lua b/game/modules/tome/data/talents/techniques/bloodthirst.lua
index 35771e493a..e5e3668a1b 100644
--- a/game/modules/tome/data/talents/techniques/bloodthirst.lua
+++ b/game/modules/tome/data/talents/techniques/bloodthirst.lua
@@ -49,7 +49,7 @@ newTalent{
weapon = weapon or target.combat
if target:canBe("stun") then
- target:setEffect(target.EFF_DAZED, 5, {apply_power=self:combatAttackStr(weapon.combat)})
+ target:setEffect(target.EFF_DAZED, 5, {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the terror!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/techniques/bow.lua b/game/modules/tome/data/talents/techniques/bow.lua
index 79d773d37c..8a64949202 100644
--- a/game/modules/tome/data/talents/techniques/bow.lua
+++ b/game/modules/tome/data/talents/techniques/bow.lua
@@ -23,8 +23,13 @@ newTalent{
points = 10,
require = { stat = { dex=function(level) return 12 + level * 3 end }, },
mode = "passive",
+ getDamage = function(self, t) return self:getTalentLevel(t) * 5 end,
+ getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) / 2 end,
info = function(self, t)
- return ([[Increases damage done with bows by %d%%.]]):format(100 * (math.sqrt(self:getTalentLevel(t) / 10)))
+ local damage = t.getDamage(self, t)
+ local inc = t.getPercentInc(self, t)
+ return ([[Increases Physical Power by %d. Also increases damage done with bows by %d%%.]]):
+ format(damage, inc * 100)
end,
}
diff --git a/game/modules/tome/data/talents/techniques/combat-training.lua b/game/modules/tome/data/talents/techniques/combat-training.lua
index fa741a62e3..60ad2e8771 100644
--- a/game/modules/tome/data/talents/techniques/combat-training.lua
+++ b/game/modules/tome/data/talents/techniques/combat-training.lua
@@ -102,11 +102,13 @@ newTalent{
points = 10,
require = { stat = { str=function(level) return 12 + level * 3 end }, },
mode = "passive",
- getDamage = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) end,
+ getDamage = function(self, t) return self:getTalentLevel(t) * 5 end,
+ getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) / 2 end,
info = function(self, t)
local damage = t.getDamage(self, t)
- return ([[Increases damage done with swords, maces and axes by %d%%.]]):
- format(100 * damage)
+ local inc = t.getPercentInc(self, t)
+ return ([[Increases Physical Power by %d. Also increases damage done with swords, axes, maces, knives, and exotic weapons by %d%%]]):
+ format(damage, 100*inc)
end,
}
@@ -117,11 +119,13 @@ newTalent{
points = 10,
require = { stat = { dex=function(level) return 10 + level * 3 end }, },
mode = "passive",
- getDamage = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) end,
+ getDamage = function(self, t) return self:getTalentLevel(t) * 5 end,
+ getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) / 2 end,
info = function(self, t)
local damage = t.getDamage(self, t)
- return ([[Increases damage done with knives by %d%%.]]):
- format(100 * damage)
+ local inc = t.getPercentInc(self, t)
+ return ([[Increases Physical Power by %d. Also increases damage done with knives by %d%%]]):
+ format(damage, 100*inc)
end,
}
@@ -132,10 +136,12 @@ newTalent{
points = 10,
require = { stat = { str=function(level) return 10 + level * 3 end, dex=function(level) return 10 + level * 3 end }, },
mode = "passive",
- getDamage = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) end,
+ getDamage = function(self, t) return self:getTalentLevel(t) * 5 end,
+ getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) / 2 end,
info = function(self, t)
local damage = t.getDamage(self, t)
- return ([[Increases damage done with exotic weapons (whips, tridents, ...) by %d%%.]]):
- format(100 * damage)
+ local inc = t.getPercentInc(self, t)
+ return ([[Increases Physical Power by %d. Also increases damage done with exotic weapons by %d%%]]):
+ format(damage, 100*inc)
end,
-}
+}
\ No newline at end of file
diff --git a/game/modules/tome/data/talents/techniques/dualweapon.lua b/game/modules/tome/data/talents/techniques/dualweapon.lua
index 415e97b296..c54ab12380 100644
--- a/game/modules/tome/data/talents/techniques/dualweapon.lua
+++ b/game/modules/tome/data/talents/techniques/dualweapon.lua
@@ -136,7 +136,7 @@ newTalent{
-- Second attack with mainhand
if hit then
if target:canBe("stun") then
- target:setEffect(target.EFF_STUNNED, 2 + self:getTalentLevel(t), {apply_power=self:combatAttackDex(weapon.combat)})
+ target:setEffect(target.EFF_STUNNED, 2 + self:getTalentLevel(t), {apply_power=self:combatAttack()})
else
game.logSeen(target, "%s resists the stunning strike!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/techniques/field-control.lua b/game/modules/tome/data/talents/techniques/field-control.lua
index 171b1550f7..0f4e47c7b1 100644
--- a/game/modules/tome/data/talents/techniques/field-control.lua
+++ b/game/modules/tome/data/talents/techniques/field-control.lua
@@ -85,14 +85,17 @@ newTalent{
-- Try to knockback !
local can = function(target)
- if target:checkHit(self:combatAttackDex(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("knockback") then
+ if target:checkHit(self:combatPhysicalpower(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("knockback") then
return true
else
game.logSeen(target, "%s resists the knockback!", target.name:capitalize())
end
end
- if can(target) then target:knockback(self.x, self.y, math.floor(2 + self:getTalentLevel(t)), can) end
+ if can(target) then
+ target:knockback(self.x, self.y, math.floor(2 + self:getTalentLevel(t)), can)
+ target:crossTierEffect(target.EFF_OFFBALANCE, self:combatPhysicalpower())
+ end
return true
end,
diff --git a/game/modules/tome/data/talents/techniques/finishing-moves.lua b/game/modules/tome/data/talents/techniques/finishing-moves.lua
index 2577ad106f..2a68e66425 100644
--- a/game/modules/tome/data/talents/techniques/finishing-moves.lua
+++ b/game/modules/tome/data/talents/techniques/finishing-moves.lua
@@ -48,7 +48,7 @@ newTalent{
if hit then
if target:canBe("stun") then
- target:setEffect(target.EFF_STUNNED, t.getDuration(self, t), {apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_STUNNED, t.getDuration(self, t), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the stun!", target.name:capitalize())
end
@@ -159,7 +159,7 @@ newTalent{
if hit then
-- try to daze
if target:canBe("stun") then
- target:setEffect(target.EFF_DAZED, t.getDuration(self, t), {apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_DAZED, t.getDuration(self, t), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the body shot!", target.name:capitalize())
end
@@ -218,7 +218,7 @@ newTalent{
-- Try to insta-kill
if hit then
- if target:checkHit(self:combatAttackStr(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("instakill") and target.life > 0 and target.life < target.max_life * 0.2 then
+ if target:checkHit(self:combatPhysicalpower(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("instakill") and target.life > 0 and target.life < target.max_life * 0.2 then
-- KILL IT !
game.logSeen(target, "%s feels the pain of the death blow!", target.name:capitalize())
target:die(self)
diff --git a/game/modules/tome/data/talents/techniques/grappling.lua b/game/modules/tome/data/talents/techniques/grappling.lua
index e7676b91ed..382313a1d0 100644
--- a/game/modules/tome/data/talents/techniques/grappling.lua
+++ b/game/modules/tome/data/talents/techniques/grappling.lua
@@ -168,10 +168,10 @@ newTalent{
-- deal damage and maim if appropriate
if hit then
if grappled then
- self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getDamage(self, t), nil, target))
+ self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getDamage(self, t), nil, target, self:combatAttack(), target:combatDefense()))
target:setEffect(target.EFF_MAIMED, t.getDuration(self, t), {power=t.getMaim(self, t)})
else
- self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getDamage(self, t), nil, target))
+ self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getDamage(self, t), nil, target, self:combatAttack(), target:combatDefense()))
end
end
@@ -264,16 +264,16 @@ newTalent{
-- takedown or slam as appropriate
if hit then
if grappled then
- self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getSlam(self, t), nil, target))
+ self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getSlam(self, t), nil, target, self:combatAttack(), target:combatDefense()))
if target:canBe("stun") then
- target:setEffect(target.EFF_STUNNED, t.getDuration(self, t), {apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_STUNNED, t.getDuration(self, t), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the stun!", target.name:capitalize())
end
else
- self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getTakeDown(self, t), nil, target))
+ self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getTakeDown(self, t), nil, target, self:combatAttack(), target:combatDefense()))
if target:canBe("stun") then
- target:setEffect(target.EFF_DAZED, t.getDuration(self, t), {apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_DAZED, t.getDuration(self, t), {apply_power=self:combatPhysicalpower()})
else
game.logSeen(target, "%s resists the daze!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/techniques/sling.lua b/game/modules/tome/data/talents/techniques/sling.lua
index b43770857e..77f0ee9261 100644
--- a/game/modules/tome/data/talents/techniques/sling.lua
+++ b/game/modules/tome/data/talents/techniques/sling.lua
@@ -23,8 +23,13 @@ newTalent{
points = 10,
require = { stat = { dex=function(level) return 12 + level * 3 end }, },
mode = "passive",
+ getDamage = function(self, t) return self:getTalentLevel(t) * 5 end,
+ getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) / 2 end,
info = function(self, t)
- return ([[Increases damage done with slings by %d%%.]]):format(100 * (math.sqrt(self:getTalentLevel(t) / 10)))
+ local damage = t.getDamage(self, t)
+ local inc = t.getPercentInc(self, t)
+ return ([[Increases Physical Power by %d. Also increases damage done with slings by %d%%.]]):
+ format(damage, inc * 100)
end,
}
@@ -42,7 +47,7 @@ newTalent{
on_pre_use = function(self, t, silent) if not self:hasArcheryWeapon("sling") then if not silent then game.logPlayer(self, "You require a sling for this talent.") end return false end return true end,
archery_onhit = function(self, t, target, x, y)
if target:canBe("blind") then
- target:setEffect(target.EFF_BLINDED, 2 + self:getTalentLevelRaw(t), {apply_power=self:combatAttackDex()})
+ target:setEffect(target.EFF_BLINDED, 2 + self:getTalentLevelRaw(t), {apply_power=self:combatAttack()})
else
game.logSeen(target, "%s resists!", target.name:capitalize())
end
@@ -76,8 +81,9 @@ newTalent{
tactical = { ATTACK = 2, DISABLE = 2, ESCAPE = 1 },
on_pre_use = function(self, t, silent) if not self:hasArcheryWeapon("sling") then if not silent then game.logPlayer(self, "You require a sling for this talent.") end return false end return true end,
archery_onhit = function(self, t, target, x, y)
- if target:checkHit(self:combatAttackDex(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
+ if target:checkHit(self:combatAttack(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
target:knockback(self.x, self.y, 4)
+ target:crossTierEffect(target.EFF_OFFBALANCE, self:combatAttack())
game.logSeen(target, "%s is knocked back!", target.name:capitalize())
else
game.logSeen(target, "%s stands firm!", target.name:capitalize())
diff --git a/game/modules/tome/data/talents/techniques/thuggery.lua b/game/modules/tome/data/talents/techniques/thuggery.lua
index d380e0cfe1..f68c6afad1 100644
--- a/game/modules/tome/data/talents/techniques/thuggery.lua
+++ b/game/modules/tome/data/talents/techniques/thuggery.lua
@@ -56,7 +56,7 @@ newTalent{
if hitted then
if target:canBe("confusion") then
- target:setEffect(target.EFF_CONFUSED, t.getDuration(self, t), {power=30 + self:getDex(70), apply_power=self:combatAttackDex()})
+ target:setEffect(target.EFF_CONFUSED, t.getDuration(self, t), {power=30 + self:getDex(70), apply_power=self:combatAttack()})
else
game.logSeen(target, "%s resists the headblow!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/talents/techniques/unarmed-discipline.lua b/game/modules/tome/data/talents/techniques/unarmed-discipline.lua
index 01c0216750..616e1bda1e 100644
--- a/game/modules/tome/data/talents/techniques/unarmed-discipline.lua
+++ b/game/modules/tome/data/talents/techniques/unarmed-discipline.lua
@@ -91,7 +91,7 @@ newTalent{
do_throw = function(self, target, t)
local hit = self:checkHit(self:combatAttack(), target:combatDefense(), 0, 95, 5 - self:getTalentLevel(t) / 2)
if hit then
- self:project(target, target.x, target.y, DamageType.PHYSICAL, self:physicalCrit(t.getDamageTwo(self, t), nil, target))
+ self:project(target, target.x, target.y, DamageType.PHYSICAL, self:physicalCrit(t.getDamageTwo(self, t), nil, target, self:combatAttack(), target:combatDefense()))
-- if grappled stun
if target:isGrappled(self) and target:canBe("stun") then
target:setEffect(target.EFF_STUNNED, 2, {apply_power=self:combatAttack(), min_dur=1})
diff --git a/game/modules/tome/data/talents/techniques/unarmed-training.lua b/game/modules/tome/data/talents/techniques/unarmed-training.lua
index e75dc040f9..ac37f2ff70 100644
--- a/game/modules/tome/data/talents/techniques/unarmed-training.lua
+++ b/game/modules/tome/data/talents/techniques/unarmed-training.lua
@@ -49,12 +49,14 @@ newTalent{
points = 10,
require = { stat = { cun=function(level) return 12 + level * 3 end }, },
mode = "passive",
- getDamage = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) end,
+ getDamage = function(self, t) return self:getTalentLevel(t) * 5 end,
+ getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 10) / 2 end,
info = function(self, t)
local damage = t.getDamage(self, t)
- return ([[Increases damage done with unarmed attacks by %d%%
- Note this only applies to your base unarmed damage and things that work off of it (pugilism and finishing moves for instance) and will not increase grappling or kick damage.]]):
- format(100 * damage)
+ local inc = t.getPercentInc(self, t)
+ return ([[Increases Physical Power by %d.
+ Also increases damage done with unarmed attacks by %d%%. Note this only applies to your base unarmed damage and things that work off of it (pugilism and finishing moves for instance) and will not increase grappling or kick damage.]]):
+ format(damage, 100*inc)
end,
}
diff --git a/game/modules/tome/data/talents/techniques/warcries.lua b/game/modules/tome/data/talents/techniques/warcries.lua
index 8f68003ae6..1f767e769c 100644
--- a/game/modules/tome/data/talents/techniques/warcries.lua
+++ b/game/modules/tome/data/talents/techniques/warcries.lua
@@ -108,7 +108,7 @@ newTalent{
self:project(tg, x, y, function(px, py)
local target = game.level.map(px, py, Map.ACTOR)
if not target then return end
- target:setEffect(target.EFF_BATTLE_CRY, 7, {power=7 * self:getTalentLevel(t), apply_power=self:combatAttackStr()})
+ target:setEffect(target.EFF_BATTLE_CRY, 7, {power=7 * self:getTalentLevel(t), apply_power=self:combatPhysicalpower()})
end, {type="flame"})
return true
end,
diff --git a/game/modules/tome/data/talents/undeads/ghoul.lua b/game/modules/tome/data/talents/undeads/ghoul.lua
index 0d8ab7e5b5..2f0196a596 100644
--- a/game/modules/tome/data/talents/undeads/ghoul.lua
+++ b/game/modules/tome/data/talents/undeads/ghoul.lua
@@ -132,7 +132,7 @@ newTalent{
if hitted then
if target:canBe("stun") then
- target:setEffect(target.EFF_STUNNED, 3 + math.ceil(self:getTalentLevel(t)), {apply_power=self:combatAttackDex()})
+ target:setEffect(target.EFF_STUNNED, 3 + math.ceil(self:getTalentLevel(t)), {apply_power=self:combatAttack()})
else
game.logSeen(target, "%s resists the stun!", target.name:capitalize())
end
diff --git a/game/modules/tome/data/texts/tutorial/combat-stats-intro.lua b/game/modules/tome/data/texts/tutorial/combat-stats-intro.lua
new file mode 100644
index 0000000000..1061d3e727
--- /dev/null
+++ b/game/modules/tome/data/texts/tutorial/combat-stats-intro.lua
@@ -0,0 +1,23 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011 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 [[
+Onward! The #GOLD#Dungeon of Adventurer Enlightenment#WHITE# awaits you!
+]]
+
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index d12119288c..c4923aecac 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -1406,3 +1406,24 @@ newEffect{
self:removeParticles(eff.particle)
end,
}
+
+
+newEffect{
+ name = "SPELLSHOCKED",
+ desc = "Spellshocked",
+ long_desc = function(self, eff) return ("Overwhelming magic has temporarily interfered with all damage resistances, lowering them by 25%.") end,
+ type = "magical",
+ subtype = { cross_tier=true },
+ status = "detrimental",
+ parameters = { power=10 },
+ on_gain = function(self, err) return nil, "+Spellshocked" end,
+ on_lose = function(self, err) return nil, "-Spellshocked" end,
+ activate = function(self, eff)
+ eff.tmpid = self:addTemporaryValue("resists", {
+ all = -25,
+ })
+ end,
+ deactivate = function(self, eff)
+ self:removeTemporaryValue("resists", eff.tmpid)
+ end,
+}
\ No newline at end of file
diff --git a/game/modules/tome/data/timed_effects/mental.lua b/game/modules/tome/data/timed_effects/mental.lua
index bcbe57d428..5edf2dfb43 100644
--- a/game/modules/tome/data/timed_effects/mental.lua
+++ b/game/modules/tome/data/timed_effects/mental.lua
@@ -382,27 +382,27 @@ newEffect{
on_lose = function(self, err) return "#Target# is no longer beckoned.", "-Beckoned" end,
activate = function(self, eff)
eff.particle = self:addParticles(Particles.new("beckoned", 1))
-
+
eff.spellpowerChangeId = self:addTemporaryValue("combat_spellpower", eff.spellpowerChange)
eff.mindpowerChangeId = self:addTemporaryValue("combat_mindpower", eff.mindpowerChange)
end,
deactivate = function(self, eff)
if eff.particle then self:removeParticles(eff.particle) end
-
+
if eff.spellpowerChangeId then self:removeTemporaryValue("combat_spellpower", eff.spellpowerChangeId) end
if eff.mindpowerChangeId then self:removeTemporaryValue("combat_mindpower", eff.spellpowerChangeId) end
end,
on_timeout = function(self, eff)
if eff.source.dead then return nil end
-
+
local distance = core.fov.distance(self.x, self.y, eff.source.x, eff.source.y)
if math.floor(distance) > 1 and distance <= eff.range then
-- in range but not adjacent
-
+
-- add debuffs
if not eff.spellpowerChangeId then eff.spellpowerChangeId = self:addTemporaryValue("combat_spellpower", eff.spellpowerChange) end
if not eff.mindpowerChangeId then eff.mindpowerChangeId = self:addTemporaryValue("combat_mindpower", eff.mindpowerChange) end
-
+
-- custom pull logic (adapted from move_dmap; forces movement, pushes others aside, custom particles)
if not self:attr("never_move") and rng.percent(eff.chance) then
local source = eff.source
@@ -421,7 +421,7 @@ newEffect{
-- moveX, moveY = util.coordAddDir(self.x, self.y, dir)
-- end
--end
-
+
-- move a-star (far more useful than dmap)
local a = Astar.new(game.level.map, self)
local path = a:calc(self.x, self.y, source.x, source.y)
@@ -429,7 +429,7 @@ newEffect{
moveX, moveY = path[1].x, path[1].y
end
end
-
+
if moveX and moveY then
local old_move_others, old_x, old_y = self.move_others, self.x, self.y
self.move_others = true
@@ -505,14 +505,14 @@ newEffect{
eff.neverMoveId = self:addTemporaryValue("never_move", 1)
eff.armorId = self:addTemporaryValue("combat_armor", eff.armorChange)
eff.defenseId = self:addTemporaryValue("combat_def", eff.armorChange)
-
+
eff.particle = self:addParticles(Particles.new("dominated", 1))
end,
deactivate = function(self, eff)
self:removeTemporaryValue("never_move", eff.neverMoveId)
self:removeTemporaryValue("combat_armor", eff.armorId)
self:removeTemporaryValue("combat_def", eff.defenseId)
-
+
self:removeParticles(eff.particle)
end,
}
@@ -1461,4 +1461,32 @@ newEffect{
self:removeTemporaryValue("combat_spellpower", eff.spellid)
self:removeTemporaryValue("combat_mindpower", eff.mindid)
end,
-}
\ No newline at end of file
+}
+
+newEffect{
+ name = "BRAINLOCKED",
+ desc = "Brainlocked",
+ long_desc = function(self, eff) return ("Renders a random talent unavailable. No talents will cool down until the effect has worn off."):format() end,
+ type = "mental",
+ subtype = { cross_tier=true },
+ status = "detrimental",
+ parameters = {},
+ on_gain = function(self, err) return nil, "+Brainlocked" end,
+ on_lose = function(self, err) return nil, "-Brainlocked" end,
+ activate = function(self, eff)
+ eff.tcdid = self:addTemporaryValue("no_talents_cooldown", 1)
+ local tids = {}
+ for tid, lev in pairs(self.talents) do
+ local t = self:getTalentFromId(tid)
+ if t and not self.talents_cd[tid] and t.mode == "activated" and not t.innate then tids[#tids+1] = t end
+ end
+ for i = 1, 1 do
+ local t = rng.tableRemove(tids)
+ if not t then break end
+ self.talents_cd[t.id] = 1
+ end
+ end,
+ deactivate = function(self, eff)
+ self:removeTemporaryValue("no_talents_cooldown", eff.tmpid)
+ end,
+}
diff --git a/game/modules/tome/data/timed_effects/physical.lua b/game/modules/tome/data/timed_effects/physical.lua
index e8872a04fc..330f939c49 100644
--- a/game/modules/tome/data/timed_effects/physical.lua
+++ b/game/modules/tome/data/timed_effects/physical.lua
@@ -267,6 +267,7 @@ newEffect{
on_lose = function(self, err) return "#Target# is not stunned anymore.", "-Burning Shock" end,
activate = function(self, eff)
eff.tmpid = self:addTemporaryValue("stunned", 1)
+ eff.tcdid = self:addTemporaryValue("no_talents_cooldown", 1)
eff.speedid = self:addTemporaryValue("movement_speed", -0.5)
local tids = {}
@@ -285,6 +286,7 @@ newEffect{
end,
deactivate = function(self, eff)
self:removeTemporaryValue("stunned", eff.tmpid)
+ self:removeTemporaryValue("no_talents_cooldown", eff.tcdid)
self:removeTemporaryValue("movement_speed", eff.speedid)
end,
}
@@ -301,6 +303,7 @@ newEffect{
on_lose = function(self, err) return "#Target# is not stunned anymore.", "-Stunned" end,
activate = function(self, eff)
eff.tmpid = self:addTemporaryValue("stunned", 1)
+ eff.tcdid = self:addTemporaryValue("no_talents_cooldown", 1)
eff.speedid = self:addTemporaryValue("movement_speed", -0.5)
local tids = {}
@@ -316,6 +319,7 @@ newEffect{
end,
deactivate = function(self, eff)
self:removeTemporaryValue("stunned", eff.tmpid)
+ self:removeTemporaryValue("no_talents_cooldown", eff.tcdid)
self:removeTemporaryValue("movement_speed", eff.speedid)
end,
}
@@ -1642,4 +1646,16 @@ newEffect{
deactivate = function(self, eff)
self:removeTemporaryValue("combat_def", eff.defenseChangeId)
end,
-}
\ No newline at end of file
+}
+
+newEffect{
+ name = "OFFBALANCE",
+ desc = "Off-balance",
+ long_desc = function(self, eff) return ("Badly off balance. Attackers gain a 25% bonus to critical strike power.") end,
+ type = "physical",
+ subtype = { cross_tier=true },
+ status = "detrimental",
+ parameters = {power = 1},
+ on_gain = function(self, err) return nil, "+Off-balance" end,
+ on_lose = function(self, err) return nil, "-Off-balance" end,
+}
--
GitLab