Skip to content
Snippets Groups Projects
Commit 3186b719 authored by DarkGod's avatar DarkGod
Browse files

scaling again

parent 3d9e0973
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
game/modules/tome/data/talents/corruptions/vile-life.lua
+ 6
− 5
View file @ 3186b719
......@@ -162,8 +162,8 @@ newTalent{
requires_target = true,
range = 1,
target = function(self, t) return {type="hit", range=self:getTalentRange(t), talent=t} end,
getNb = function(self, t) return math.floor(self:combatTalentScale(t, 2, 9)) end,
getDam = function(self, t) return 4 end,
getNb = function(self, t) return math.floor(self:combatTalentScale(t, 2, 4, "log")) end,
getDam = function(self, t) return self:combatTalentLimit(t, 2, 10, 5) end, --Limit < 10% life/effect
action = function(self, t)
local tg = self:getTalentTarget(t)
local x, y = self:getTarget(tg)
......@@ -194,7 +194,7 @@ newTalent{
self:removeEffect(eff_id)
local dead, val = self:takeHit(dam, self, {source_talent=t})
target:heal(val, self)
game.logPlayer(self, "#CRIMSON#%s transfers an effect (%s) to %s!", self.name:capitalize(), e.desc, target.name)
game:delayedLogMessage(self, target, "vile_transplant"..e.desc, ("#CRIMSON##Source# transfers an effect (%s) to #Target#!"):format(e.desc))
end
nb = nb - 1
end
......@@ -205,8 +205,9 @@ newTalent{
return true
end,
info = function(self, t)
return ([[You touch a nearby creature to transfer up to %d physical or magical detrimental effects currently affecting you.
The transfer takes %d%% of your remaining life and heals the target for the same value.]]):
return ([[You transfer up to %d physical or magical detrimental effects currently affecting you to a nearby creature by touching it.
The transfer takes %0.1f%% of your remaining life for each effect transferred and heals the target for the same amount.
The chance to transfer each effect increases with your Spellpower.]]):
format(t.getNb(self, t), t.getDam(self, t))
end,
}
game/modules/tome/data/talents/cunning/called-shots.lua
+ 28
− 24
View file @ 3186b719
......@@ -30,12 +30,11 @@ local sniper_bonuses = function(self, calc_all)
local level = self:getTalentLevel(t)
if level > 0 or calc_all then
bonuses.crit_chance = math.min(25, self:combatTalentScale(t, 1, 10))
bonuses.crit_power = math.min(.5, self:combatTalentScale(t, 0.1, 0.2))
bonuses.crit_chance = self:combatTalentScale(t, 3, 10)
bonuses.crit_power = self:combatTalentScale(t, 0.1, 0.2, 0.75)
end
if level >= 5 or calc_all then
local resists_pen = math.min(30, self:combatStatScale("cun", 1, 20))
bonuses.resists_pen = {[DamageType.PHYSICAL] = resists_pen}
bonuses.resists_pen = {[DamageType.PHYSICAL] = self:combatStatLimit("cun", 100, 15, 50)} -- Limit < 100%
end
return bonuses
end
......@@ -92,13 +91,13 @@ newTalent {
range = archery_range,
on_pre_use = function(self, t, silent) return sling_equipped(self, silent) end,
pin_duration = function(self, t)
return math.floor(1 + self:getTalentLevel(t) * 0.2)
return math.floor(self:combatTalentScale(t, 1, 2))
end,
slow_duration = function(self, t)
return math.floor(3 + self:getTalentLevel(t) / 3)
return math.floor(self:combatTalentScale(t, 3, 4.7))
end,
slow_power = function(self, t)
return math.min(0.6, 0.1 + self:getCun(0.5, true) + self:combatTalentScale(t, 0, 0.5))
return self:combatLimit(self:getCun()*.5 + self:getTalentLevel(t)*10, 0.6, 0.2, 15, 0.5, 100) --Limit < 60%, 20% at TL 1 for 10 Cun, 50% at TL5, Cun 100
end,
archery_onreach = pen_on,
archery_onmiss = pen_off,
......@@ -117,8 +116,9 @@ newTalent {
end,
action = fire_shot,
info = function(self, t)
return ([[Nail your opponent in the knee for %d%% weapon damage, knocking them down (%d turn pin) and slowing their movement by %d%% for %d turns afterwards.
This shot will pass through enemies to reach its target.]])
return ([[Strike your opponent in the knee (or other critical point in an ambulatory appendage) for %d%% weapon damage, knocking them down (%d turn pin) and slowing their movement by %d%% for %d turns afterwards.
This shot will bypass other enemies between you and your target.
The slow effect becomes more powerful with your Cunning.]])
:format(t.damage_multiplier(self, t) * 100,
t.pin_duration(self, t),
t.slow_power(self, t) * 100,
......@@ -144,8 +144,8 @@ newTalent {
requires_target = true,
range = archery_range,
on_pre_use = function(self, t, silent) return sling_equipped(self, silent) end,
getDistanceBonus = function(self, t)
return 0.3
getDistanceBonus = function(self, t, range)
return self:combatScale(range, -.5, 1, 2.5, 10, 0.25) --Slow scaling to allow for greater range variability
end,
getDamage = function(self, t)
return 1
......@@ -168,14 +168,13 @@ newTalent {
-- THIS IS WHY I HATE YOUR CODE STRUCTURE GRAYSWANDIR
local bonuses = sniper_bonuses(self)
local dist = core.fov.distance(self.x, self.y, targets[1].x, targets[1].y)
local damage = t.damage_multiplier(self, t) + ( t.getDistanceBonus(self, t) * dist )
local damage, distbonus = t.damage_multiplier(self, t), t.getDistanceBonus(self, t, dist)
local target = game.level.map(targets[1].x, targets[1].y, engine.Map.ACTOR)
if not target then return end
game.logSeen(self, "#DARK_ORCHID#%s snipes %s for %d%% weapon damage (+%d%% range bonus)!#LAST#", self.name:capitalize(), target.name:capitalize(), damage*100, t.getDistanceBonus(self, t) * dist * 100 )
local params = {mult = damage}
game:delayedLogMessage(self, target, "kill_shot", "#DARK_ORCHID##Source# snipes #Target# (%+d%%%%%%%% weapon bonus for range)!#LAST#", distbonus*100)
local params = {mult = damage + distbonus}
if bonuses.crit_chance then params.crit_chance = bonuses.crit_chance end
if bonuses.crit_power then params.crit_power = bonuses.crit_power end
if bonuses.resists_pen then params.resists_pen = bonuses.resists_pen end
......@@ -184,11 +183,14 @@ newTalent {
return true
end,
info = function(self, t)
return ([[Snipe a target at long range dealing %d%% damage increased by %d%% for each tile between you and the target.
This shot will pass through enemies to reach its target.]])
:format(t.damage_multiplier(self, t) * 100, t.getDistanceBonus(self, t)*100
)
end,
local range = self:getTalentRange(t)
return ([[Employ a specialized sniping shot at a target.
This shot is focused on precision at long range and deals base %d%% ranged damage with a bonus that increases with distance.
The ranged bonus is %d%% (penalty) at point blank range, while at your maximum range of %d it is %d%%.
This shot will bypass other enemies between you and your target.]])
:format(t.damage_multiplier(self, t) * 100, t.getDistanceBonus(self, t, 1)*100, range, t.getDistanceBonus(self, t, range)*100)
end,
}
newTalent {
......@@ -220,8 +222,10 @@ newTalent {
archery_target_parameters = {limit_shots = 1, multishots = 3},
action = fire_shot,
info = function(self, t)
return ([[Apply directly to the forehead! Shoot 3 quick sling bullets for %d%% damage in succession into your opponent’s brow. Each bullet will try to stun or increase the target's stun duration by 1.
This shot will pass through enemies to reach its target.]])
return ([[Fire three shots in quick succession at a vulnerable point on the target (usually the head).
Each shot deals %d%% Ranged damage and will try to stun or increase the target's stun duration by 1.
These shots will bypass other enemies between you and your target.
The chance to stun increases with your Accuracy.]])
:format(t.damage_multiplier(self, t) * 100)
end,
}
......@@ -236,7 +240,7 @@ newTalent {
mode = "passive",
info = function(self, t)
local bonuses = sniper_bonuses(self, true)
return ([[Your mastery of called shots is unparalleled. Gain %d%% bonus critical chance and %d%% critical damage on your Called Shots. At rank 3 lowers the cooldowns of your Called Shots by 2 each. At rank 5 gain %d%% physical resist piercing with all Called Shot attacks.]])
return ([[Your mastery of called shots is unparalleled. and you gain %d%% bonus critical chance and %d%% critical damage with your Called Shots Talents. At rank 3 the cooldowns of all of your Called Shots Talents are reduced by 2 each. At rank 5 you gain %d%% Physical resistance penetration with all Called Shot attacks.]])
:format(bonuses.crit_chance,
bonuses.crit_power * 100,
bonuses.resists_pen[DamageType.PHYSICAL])
......
game/modules/tome/data/talents/misc/objects.lua
+ 2
− 2
View file @ 3186b719
......@@ -153,13 +153,13 @@ newTalent{
end,
info = function(self, t)
local xs = ""
for w, nb in pairs(self.wards) do
for w, nb in pairs(self.wards or {}) do
if nb > 0 then
xs = xs .. (xs ~= "" and ", " or "") .. engine.DamageType.dam_def[w].name:capitalize() .. "(" .. tostring(nb) .. ")"
end
end
return ([[Bring a damage-type-specific ward into being. The ward will fully negate as many attacks of its element as it has charges.
You can activate the following wards: %s]]):format(xs)
You can activate the following wards: %s]]):format(#xs>0 and xs or "None")
end,
}
......
game/modules/tome/data/talents/techniques/bow.lua
+ 1
− 1
View file @ 3186b719
......@@ -26,7 +26,7 @@ newTalent{
getDamage = function(self, t) return self:getTalentLevel(t) * 10 end,
getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 5) / 2 end,
ammo_mastery_reload = function(self, t)
return math.floor(self:getTalentLevel(t) / 2)
return math.floor(self:combatTalentScale(t, 0, 2.7, "log"))
end,
passives = function(self, t, p)
self:talentTemporaryValue(p, 'ammo_mastery_reload', t.ammo_mastery_reload(self, t))
......
game/modules/tome/data/talents/techniques/skirmisher-slings.lua
+ 4
− 4
View file @ 3186b719
......@@ -35,7 +35,7 @@ newTalent {
getDamage = function(self, t) return self:getTalentLevel(t) * 10 end,
getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 5) / 2 end,
ammo_mastery_reload = function(self, t)
return math.floor(self:getTalentLevel(t) / 2)
return math.floor(self:combatTalentScale(t, 0, 2.7, "log"))
end,
passives = function(self, t, p)
self:talentTemporaryValue(p, 'ammo_mastery_reload', t.ammo_mastery_reload(self, t))
......@@ -127,7 +127,7 @@ newTalent {
end,
-- Maximum number of shots fired.
limit_shots = function(self, t)
return math.floor(6 + self:getTalentLevel(t))
return math.floor(self:combatTalentScale(t, 6, 11, "log"))
end,
action = function(self, t)
-- Get list of possible targets, possibly doubled.
......@@ -173,7 +173,7 @@ newTalent {
return fired
end,
info = function(self, t)
return ([[Take aim and unload %d shots for %d%% weapon damage each against random enemies inside a cone. Each enemy can only be hit once, or twice starting with the third talent point. Using Swift Shot lowers the cooldown by 1.]])
return ([[Take aim and unload up to %d shots for %d%% weapon damage each against random enemies inside a cone. Each enemy can only be hit once (twice for talent level 3 and higher). Using Swift Shot lowers the cooldown by 1.]])
:format(t.limit_shots(self, t),
t.damage_multiplier(self, t) * 100)
end,
......@@ -206,7 +206,7 @@ newTalent {
activate = function(self, t) return {} end,
deactivate = function(self, t, p) return true end,
info = function(self, t)
return ([[Your basic Shot talent now fires %d sling bullets for %d%% weapon damage while this is activated, at a cost of %d Stamina per attack.]])
return ([[While activated, your basic Shot talent now fires %d sling bullets, each dealing %d%% Ranged damage, at a cost of %d Stamina per attack.]])
:format(t.bullet_count(self, t), t.damage_multiplier(self, t) * 100, t.shot_stamina(self, t))
end,
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment