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

fixes

parent 1262ce4d
No related branches found
No related tags found
No related merge requests found
......@@ -23,10 +23,19 @@ newTalent{
type = {"psionic/finer-energy-manipulations", 1},
require = psi_cun_req1,
points = 5,
psi = 30,
cooldown = 20,
tactical = { HEAL = 2 },
getHeal = function(self, t) return 40 + self:combatTalentMindDamage(t, 20, 450) end,
psi = 15,
cooldown = 15,
tactical = { HEAL = 2, CURE = function(self, t, target)
local nb = 0
for eff_id, p in pairs(self.tmp) do
local e = self.tempeffect_def[eff_id]
if e.status == "detrimental" and e.type == "physical" then
nb = nb + 1
end
end
return nb
end },
getHeal = function(self, t) return 40 + self:combatTalentMindDamage(t, 20, 290) end,
is_heal = true,
numCure = function(self, t) return math.floor(self:combatTalentScale(t, 1, 3, "log"))
end,
......
......@@ -60,11 +60,11 @@ newTalent{
points = 5,
random_ego = "attack",
cooldown = 15,
psi = 40,
psi = 20,
tactical = { ATTACK = { PHYSICAL = 2 } },
range = function(self, t) return math.floor(self:combatStatScale("str", 1, 5) + self:combatMindpower()/20) end,
getDamage = function (self, t)
return math.floor(self:combatTalentMindDamage(t, 10, 300))
return math.floor(self:combatTalentMindDamage(t, 10, 170))
end,
getKBResistPen = function(self, t) return self:combatTalentLimit(t, 100, 25, 45) end,
requires_target = true,
......@@ -92,7 +92,6 @@ newTalent{
target:setMoveAnim(ox, oy, 8, 5)
end
end
--Note this can hit the original target in the AOE
self:project(tg, target.x, target.y, DamageType.SPELLKNOCKBACK, dam/2) --AOE damage
if target:canBe("stun") then
target:setEffect(target.EFF_STUNNED, 4, {apply_power=self:combatMindpower()})
......
......@@ -41,7 +41,7 @@ newTalent{
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
self:attr("use_psi_combat", 1)
local hit = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.9, 1.5))
local hit = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.9, 1.5), true)
if self:getInven(self.INVEN_PSIONIC_FOCUS) then
for i, o in ipairs(self:getInven(self.INVEN_PSIONIC_FOCUS)) do
if o.combat and not o.archery then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment