diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 534bba01e01eb036759d79ea6b975caf1f814673..9ac4d00f4dfc77a2b0e0341678be9d76b9050e74 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -157,7 +157,7 @@ function _M:init(t, no_default)
t.positive_regen = t.positive_regen or -0.2 -- Positive energy slowly decays
t.negative_regen = t.negative_regen or -0.2 -- Positive energy slowly decays
t.paradox_regen = t.paradox_regen or 0 -- Paradox does not regen
- t.psi_regen = t.psi_regen or 0 -- Energy does not regen
+ t.psi_regen = t.psi_regen or 0.2 -- Energy regens slowly
t.max_positive = t.max_positive or 50
t.max_negative = t.max_negative or 50
@@ -230,7 +230,10 @@ function _M:useEnergy(val)
local t = self:getTalentFromId(self.T_BEYOND_THE_FLESH)
t.do_tkautoattack(self, t)
end
-
+ if self:hasEffect(self.EFF_MASTERFUL_TELEKINETIC_ARCHERY) then
+ local t = self:getTalentFromId(self.T_MASTERFUL_TELEKINETIC_ARCHERY)
+ t.do_tkautoshoot(self, t)
+ end
end
function _M:actBase()
diff --git a/game/modules/tome/class/NPC.lua b/game/modules/tome/class/NPC.lua
index fc29dc3f0a3a7b9e9d1610a9de8e880506ae34bf..ea27ce4e93d657b9c399c3bb077238c7fbfaf57a 100644
--- a/game/modules/tome/class/NPC.lua
+++ b/game/modules/tome/class/NPC.lua
@@ -78,7 +78,7 @@ function _M:seen_by(who)
if not who:canSee(who.ai_target.actor) then return end
if not who.x or not self:hasLOS(who.x, who.y) then return end
self:setTarget(who.ai_target.actor)
- print("=========++PASSING TARGET", self.name, "from", who.name, "to", who.ai_target.actor.name)
+ print("[TARGET] Passing target", self.name, "from", who.name, "to", who.ai_target.actor.name)
end
--- Check if we are angered
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 023dd2e7011df540c0cf8d1fbe755b31df6d67ea..8b5e52bda1b02dab05249f8508061e17e58c47cc 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -481,7 +481,7 @@ local function spotHostiles(self)
end
--- Can we continue resting ?
--- We can rest if no hostiles are in sight, and if we need life/mana/stamina (and their regen rates allows them to fully regen)
+-- We can rest if no hostiles are in sight, and if we need life/mana/stamina/psi (and their regen rates allows them to fully regen)
function _M:restCheck()
local spotted = spotHostiles(self)
if spotted then return false, ("hostile spotted (%s%s)"):format(spotted.actor.name, game.level.map:isOnScreen(spotted.x, spotted.y) and "" or " - offscreen") end
@@ -495,6 +495,7 @@ function _M:restCheck()
act.arcane_shield = old_shield
act:incStamina(act.stamina_regen * perc)
act:incMana(act.mana_regen * perc)
+ act:incPsi(act.psi_regen * perc)
end end
-- Check resources, make sure they CAN go up, otherwise we will never stop
@@ -503,6 +504,7 @@ function _M:restCheck()
if self.life_regen <= 0 then return false, "loosing health!" end
if self:getMana() < self:getMaxMana() and self.mana_regen > 0 then return true end
if self:getStamina() < self:getMaxStamina() and self.stamina_regen > 0 then return true end
+ if self:getPsi() < self:getMaxPsi() and self.psi_regen > 0 then return true end
if self.life < self.max_life and self.life_regen> 0 then return true end
for act, def in pairs(game.party.members) do if game.level:hasEntity(act) and not act.dead then
if act.life < act.max_life and act.life_regen> 0 then return true end
diff --git a/game/modules/tome/class/interface/Archery.lua b/game/modules/tome/class/interface/Archery.lua
index 334dc6217b04156ba8f8b4dc21db13a80ef804ab..d5b72c06990627ac493771b031d895a8b31de623 100644
--- a/game/modules/tome/class/interface/Archery.lua
+++ b/game/modules/tome/class/interface/Archery.lua
@@ -122,8 +122,11 @@ local function archery_projectile(tx, ty, tg, self)
local mult = tg.archery.mult or 1
-- Does the blow connect? yes .. complex :/
+ if tg.archery.use_psi_archery then self.use_psi_combat = true end
local atk, def = self:combatAttack(weapon, ammo), target:combatDefenseRanged()
local dam, apr, armor = self:combatDamage(ammo), self:combatAPR(ammo), target:combatArmor()
+ atk = atk + (tg.archery.atk or 0)
+ dam = dam + (tg.archery.dam or 0)
print("[ATTACK ARCHERY] to ", target.name, " :: ", dam, apr, armor, "::", mult)
if not self:canSee(target) then atk = atk / 3 end
@@ -175,6 +178,29 @@ local function archery_projectile(tx, ty, tg, self)
local dam = t.getDamage(self, t)
DamageType:get(DamageType.TEMPORAL).projector(self, target.x, target.y, DamageType.TEMPORAL, dam)
end
+
+ -- Conduit (Psi)
+ if hitted and not target.dead and self:knowTalent(self.T_CONDUIT) and self:isTalentActive(self.T_CONDUIT) and self.use_psi_combat then
+ local t = self:getTalentFromId(self.T_CONDUIT)
+ --t.do_combat(self, t, target)
+ local mult = 1 + 0.2*(self:getTalentLevel(t))
+ local auras = self:isTalentActive(t.id)
+ if auras.k_aura_on then
+ local k_aura = self:getTalentFromId(self.T_KINETIC_AURA)
+ local k_dam = mult * k_aura.getAuraStrength(self, k_aura)
+ DamageType:get(DamageType.PHYSICAL).projector(self, target.x, target.y, DamageType.PHYSICAL, k_dam)
+ end
+ if auras.t_aura_on then
+ local t_aura = self:getTalentFromId(self.T_THERMAL_AURA)
+ local t_dam = mult * t_aura.getAuraStrength(self, t_aura)
+ DamageType:get(DamageType.FIRE).projector(self, target.x, target.y, DamageType.FIRE, t_dam)
+ end
+ if auras.c_aura_on then
+ local c_aura = self:getTalentFromId(self.T_CHARGED_AURA)
+ local c_dam = mult * c_aura.getAuraStrength(self, c_aura)
+ DamageType:get(DamageType.LIGHTNING).projector(self, target.x, target.y, DamageType.LIGHTNING, c_dam)
+ end
+ end
-- Regen on being hit
@@ -191,7 +217,7 @@ local function archery_projectile(tx, ty, tg, self)
target:forceUseTalent(target.T_CARBON_SPIKES, {ignore_energy=true})
end
end
-
+ self.use_psi_combat = false
end
--- Shoot at one target
@@ -205,11 +231,10 @@ function _M:archeryShoot(targets, talent, tg, params)
game.logPlayer(self, "You are disarmed!")
return nil
end
-
print("[SHOOT WITH]", weapon.name, ammo.name)
local realweapon = weapon
weapon = weapon.combat
-
+
local tg = tg or {type="bolt"}
tg.talent = tg.talent or talent
@@ -235,6 +260,12 @@ function _M:hasArcheryWeapon(type)
if not self:getInven("QUIVER") then return nil, "no ammo" end
local weapon = self:getInven("MAINHAND")[1]
local ammo = self:getInven("QUIVER")[1]
+ if self.inven[self.INVEN_PSIONIC_FOCUS] then
+ local pf_weapon = self:getInven("PSIONIC_FOCUS")[1]
+ if pf_weapon and pf_weapon.archery then
+ weapon = pf_weapon
+ end
+ end
if not weapon or not weapon.archery then
return nil, "no shooter"
end
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index 6a693166d25de30f67fb3abf2a434ea03826486a..e6a8a84bbdfb7a966a419b2c44aa0c1d156d9f92 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -621,7 +621,14 @@ function _M:combatDamage(weapon)
if self.use_psi_combat and stat == "dex" then stat = "cun" end
totstat = totstat + self:getStat(stat) * mod
end
- if self.use_psi_combat then totstat = totstat * 0.6 end
+ if self.use_psi_combat then
+ if self:knowTalent(self.T_GREATER_TELEKINETIC_GRASP) then
+ local g = self:getTalentFromId(self.T_GREATER_TELEKINETIC_GRASP)
+ totstat = totstat * g.stat_sub(self, g)
+ else
+ totstat = totstat * 0.6
+ end
+ end
local add = 0
if self:knowTalent(Talents.T_ARCANE_DESTRUCTION) then
@@ -814,8 +821,10 @@ function _M:combatTalentStatDamage(t, stat, base, max)
end
--- Gets damage based on talent, stat, and interval
-function _M:combatTalentIntervalDamage(t, stat, min, max)
- return self:rescaleDamage(min + (1 + (self:getStat(stat) / 100) * (max / 6.5 - 1)) * self:getTalentLevel(t))
+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))
end
--- Computes physical resistance
diff --git a/game/modules/tome/data/birth/classes/psionic.lua b/game/modules/tome/data/birth/classes/psionic.lua
index 0b8b4e8c0e9725d5e78d02523db74fa9445bd420..0f326989ebd688c1b533061b3dc0fadf895cb33b 100644
--- a/game/modules/tome/data/birth/classes/psionic.lua
+++ b/game/modules/tome/data/birth/classes/psionic.lua
@@ -34,7 +34,7 @@ newBirthDescriptor{
},
},
copy = {
-
+ psi_regen = 0.2,
},
body = { PSIONIC_FOCUS = 1, QS_PSIONIC_FOCUS = 1,},
}
@@ -54,16 +54,23 @@ newBirthDescriptor{
},
stats = { str=1, wil=4, cun=3, },
talents_types = {
+ --Level 0 trees:
["psionic/absorption"]={true, 0.3},
["psionic/projection"]={true, 0.3},
["psionic/psi-fighting"]={true, 0.3},
- ["psionic/focus"]={false, 0.3},
- ["psionic/augmented-mobility"]={false, 0},
+ ["psionic/focus"]={true, 0.3},
+ ["psionic/mental-discipline"]={true, 0.3},
["psionic/voracity"]={true, 0.3},
+ --Level 10 trees:
["psionic/finer-energy-manipulations"]={false, 0},
- ["psionic/mental-discipline"]={true, 0.3},
+ ["psionic/psi-archery"]={false, 0.3},
+ --Level 20 trees:
+ ["psionic/grip"]={false, 0},
+ ["psionic/augmented-mobility"]={false, 0},
+ --Miscellaneous trees:
["cunning/survival"]={true, 0},
["technique/combat-training"]={true, 0},
+
},
talents = {
[ActorTalents.T_KINETIC_SHIELD] = 1,
@@ -73,6 +80,7 @@ newBirthDescriptor{
[ActorTalents.T_TRAP_DETECTION] = 1,
[ActorTalents.T_TELEKINETIC_GRASP] = 1,
[ActorTalents.T_TELEKINETIC_SMASH] = 1,
+ [ActorTalents.T_SHOOT] = 1,
},
copy = {
max_life = 110,
@@ -80,6 +88,10 @@ newBirthDescriptor{
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="greatsword", name="iron greatsword", autoreq=true, ego_chance=-1000},
},
+ resolvers.inventory{ id=true,
+ {type="gem",},
+ {type="weapon", subtype="longbow", name="elm longbow", ego_chance=-1000},
+ },
resolvers.generic(function(self)
-- Make and wield some alchemist gems
local gs = game.zone:makeEntity(game.level, "object", {type="weapon", subtype="greatsword", name="iron greatsword", ego_chance=-1000}, nil, true)
diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua
index 1b0f59ae39863f66b5b4ac2cc6270c0908042e30..5e2af38e3f3617a6fedb89a1e458cafd87443a0b 100644
--- a/game/modules/tome/data/damage_types.lua
+++ b/game/modules/tome/data/damage_types.lua
@@ -1408,6 +1408,21 @@ newDamageType{
end,
}
+newDamageType{
+ name = "implosion", type = "IMPLOSION",
+ projector = function(src, x, y, type, dam)
+ local dur = 3
+ local perc = 50
+ if _G.type(dam) == "table" then dam, dur, perc = dam.dam, dam.dur, (dam.initial or perc) end
+ local init_dam = dam
+ if init_dam > 0 then DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, init_dam) end
+ local target = game.level.map(x, y, Map.ACTOR)
+ if target then
+ target:setEffect(target.EFF_IMPLODING, dur, {src=src, power=dam})
+ end
+ end,
+}
+
-- Temporal + Stat damage
newDamageType{
name = "clock", type = "CLOCK",
diff --git a/game/modules/tome/data/gfx/talents/augmented_shot.png b/game/modules/tome/data/gfx/talents/augmented_shot.png
new file mode 100644
index 0000000000000000000000000000000000000000..316d9c80f99a641eae8965c4cb358ac7f411a6f1
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/augmented_shot.png differ
diff --git a/game/modules/tome/data/gfx/talents/bind.png b/game/modules/tome/data/gfx/talents/bind.png
new file mode 100644
index 0000000000000000000000000000000000000000..829b5a0d22bc27228f83ca0929b2f43cf0441c10
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/bind.png differ
diff --git a/game/modules/tome/data/gfx/talents/deflect_projectiles.png b/game/modules/tome/data/gfx/talents/deflect_projectiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..40a061c013a1ee484f3cb1a776a73e19cf52c27e
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/deflect_projectiles.png differ
diff --git a/game/modules/tome/data/gfx/talents/greater_telekinetic_grasp.png b/game/modules/tome/data/gfx/talents/greater_telekinetic_grasp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d590558071cb9dcfd3ceae7a73b199ff7db3c0f9
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/greater_telekinetic_grasp.png differ
diff --git a/game/modules/tome/data/gfx/talents/guided_shot.png b/game/modules/tome/data/gfx/talents/guided_shot.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8eaf5f3745d91ffb0193e7c52c48152468e2bae
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/guided_shot.png differ
diff --git a/game/modules/tome/data/gfx/talents/implode.png b/game/modules/tome/data/gfx/talents/implode.png
new file mode 100644
index 0000000000000000000000000000000000000000..a42feb9714974ce6e64e166d4be6fff99e1901ee
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/implode.png differ
diff --git a/game/modules/tome/data/gfx/talents/masterful_telekinetic_archery.png b/game/modules/tome/data/gfx/talents/masterful_telekinetic_archery.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0ce023576c46d93bf52f9d24194e65e71a8e794
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/masterful_telekinetic_archery.png differ
diff --git a/game/modules/tome/data/gfx/talents/thought-quick_shot.png b/game/modules/tome/data/gfx/talents/thought-quick_shot.png
new file mode 100644
index 0000000000000000000000000000000000000000..779fcfb84225162ab5868b37e1e699a6bac56528
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/thought-quick_shot.png differ
diff --git a/game/modules/tome/data/gfx/talents/thought_quick_shot.png b/game/modules/tome/data/gfx/talents/thought_quick_shot.png
new file mode 100644
index 0000000000000000000000000000000000000000..4991b37643c5fefccab891a1d59ed3bbde38bacc
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/thought_quick_shot.png differ
diff --git a/game/modules/tome/data/talents/psionic/augmented-mobility.lua b/game/modules/tome/data/talents/psionic/augmented-mobility.lua
index 3ca7c62f5281c988bde24d8a4158f0f014bdb719..34fb70d9c74d7b826d89738b601881c82f9c9386 100644
--- a/game/modules/tome/data/talents/psionic/augmented-mobility.lua
+++ b/game/modules/tome/data/talents/psionic/augmented-mobility.lua
@@ -20,7 +20,7 @@
newTalent{
name = "Mindhook",
type = {"psionic/augmented-mobility", 1},
- require = psi_wil_high1,
+ require = psi_wil_20_1,
cooldown = function(self, t)
return math.ceil(20 - self:getTalentLevel(t)*2)
end,
@@ -66,7 +66,7 @@ newTalent{
random_ego = "utility",
cooldown = 80,
psi = 30,
- require = psi_wil_high2,
+ require = psi_wil_20_2,
action = function(self, t)
self:setEffect(self.EFF_QUICKNESS, 10+self:getWil(10), {power=self:getTalentLevel(t) * 0.1})
return true
@@ -84,7 +84,7 @@ newTalent{
--name = "Super"..self.race.." Leap",
name = "Telekinetic Leap",
type = {"psionic/augmented-mobility", 3},
- require = psi_wil_high3,
+ require = psi_wil_20_3,
cooldown = 15,
psi = 10,
points = 5,
@@ -121,7 +121,7 @@ newTalent{
newTalent{
name = "Shattering Charge",
type = {"psionic/augmented-mobility", 4},
- require = psi_wil_high4,
+ require = psi_wil_20_4,
points = 5,
random_ego = "attack",
psi = 60,
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 f1083c2eb28f617029702d8593594fd29a2b41c1..65405adc83796477ba246ba8e549c99bfe2977aa 100644
--- a/game/modules/tome/data/talents/psionic/finer-energy-manipulations.lua
+++ b/game/modules/tome/data/talents/psionic/finer-energy-manipulations.lua
@@ -20,7 +20,7 @@
newTalent{
name = "Perfect Control",
type = {"psionic/finer-energy-manipulations", 1},
- require = psi_cun_req1,
+ require = psi_cun_high1,
cooldown = 100,
psi = 15,
points = 5,
@@ -41,7 +41,7 @@ newTalent{
newTalent{
name = "Reshape Weapon",
type = {"psionic/finer-energy-manipulations", 2},
- require = psi_cun_req2,
+ require = psi_cun_high2,
cooldown = 1,
psi = 0,
points = 5,
@@ -86,7 +86,7 @@ newTalent{
newTalent{
name = "Reshape Armor",
type = {"psionic/finer-energy-manipulations", 3},
- require = psi_cun_req3,
+ require = psi_cun_high3,
cooldown = 1,
psi = 0,
points = 5,
@@ -143,15 +143,20 @@ newTalent{
newTalent{
name = "Matter is Energy",
type = {"psionic/finer-energy-manipulations", 4},
- require = psi_cun_req4,
+ require = psi_cun_high4,
cooldown = 50,
psi = 0,
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)
+ 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 = 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})
self.changed = true
@@ -163,7 +168,7 @@ newTalent{
return true
end,
info = function(self, t)
- local amt = 0.1*self:combatTalentIntervalDamage(t, "cun", 100, 400)
+ 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.]]):
format(amt)
diff --git a/game/modules/tome/data/talents/psionic/focus.lua b/game/modules/tome/data/talents/psionic/focus.lua
index 698bfdbfc66eeccbc3442d0e57a9768f1c3af434..b7aca2203c40d86512e0ea9f90d9be01da626369 100644
--- a/game/modules/tome/data/talents/psionic/focus.lua
+++ b/game/modules/tome/data/talents/psionic/focus.lua
@@ -25,7 +25,7 @@
newTalent{
name = "Mindlash",
type = {"psionic/focus", 1},
- require = psi_wil_high1,
+ require = psi_wil_req1,
points = 5,
random_ego = "attack",
cooldown = function(self, t)
@@ -49,13 +49,35 @@ newTalent{
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 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)
if not x or not y then return nil end
self:project(tg, x, y, DamageType.PHYSICAL, self:spellCrit(rng.avg(0.8*dam, dam)), {type="flame"})
+ if gem_level > 0 and not tg.dead and self:knowTalent(self.T_CONDUIT) and self:isTalentActive(self.T_CONDUIT) then
+ local c = self:getTalentFromId(self.T_CONDUIT)
+ --c.do_combat(self, c, tg)
+ local mult = 1 + 0.2*(self:getTalentLevel(c))
+ local auras = self:isTalentActive(c.id)
+ if auras.k_aura_on then
+ local k_aura = self:getTalentFromId(self.T_KINETIC_AURA)
+ local k_dam = mult * k_aura.getAuraStrength(self, k_aura)
+ DamageType:get(DamageType.PHYSICAL).projector(self, x, y, DamageType.PHYSICAL, k_dam)
+ end
+ if auras.t_aura_on then
+ local t_aura = self:getTalentFromId(self.T_THERMAL_AURA)
+ local t_dam = mult * t_aura.getAuraStrength(self, t_aura)
+ DamageType:get(DamageType.FIRE).projector(self, x, y, DamageType.FIRE, t_dam)
+ end
+ if auras.c_aura_on then
+ local c_aura = self:getTalentFromId(self.T_CHARGED_AURA)
+ local c_dam = mult * c_aura.getAuraStrength(self, c_aura)
+ DamageType:get(DamageType.LIGHTNING).projector(self, x, y, DamageType.LIGHTNING, c_dam)
+ end
+
+ end
return true
end,
info = function(self, t)
@@ -71,7 +93,7 @@ newTalent{
newTalent{
name = "Pyrokinesis",
type = {"psionic/focus", 2},
- require = psi_wil_high2,
+ require = psi_wil_req2,
points = 5,
random_ego = "attack",
cooldown = function(self, t)
@@ -116,7 +138,7 @@ newTalent{
newTalent{
name = "Reach",
type = {"psionic/focus", 3},
- require = psi_wil_high3,
+ require = psi_wil_req3,
mode = "passive",
points = 5,
info = function(self, t)
@@ -129,11 +151,11 @@ newTalent{
newTalent{
name = "Focused Channeling",
type = {"psionic/focus", 4},
- require = psi_wil_high4,
+ require = psi_wil_req4,
mode = "passive",
points = 5,
info = function(self, t)
- local inc = 1 + 0.1*self:getTalentLevel(t)
+ local inc = 1 + 0.15*self:getTalentLevel(t)
return ([[You can channel more energy with your auras and shields using a telekinetically-wielded gemstone as a focus. Increases the base strength of all auras and shields by %0.2f to %0.2f, depending on the quality of the gem used as a focus.]]):
format(inc, 5*inc)
end,
diff --git a/game/modules/tome/data/talents/psionic/grip.lua b/game/modules/tome/data/talents/psionic/grip.lua
new file mode 100644
index 0000000000000000000000000000000000000000..4402f027743f8d4ba5cc18d4034b49c99c4bacec
--- /dev/null
+++ b/game/modules/tome/data/talents/psionic/grip.lua
@@ -0,0 +1,188 @@
+-- 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
+
+--[=[
+1) Bind: 20 psi, (6, modified by reach) range, (15 - gem level) cooldown. (0, 0, 1, 1, 2) radius
+Paralyses enemies for (3-9[capped], based on normal scaling) turns. Checks your willpower against their physical saves, then against their mental saves for resistance. (only one required to hit, 80% max chance of success on each).
+Envelop your target in bonds of force and compulsion, paralyzing it for XXX turns. At talent level 3, it will affect an area. Chance to paralyze will improve with the Willpower stat.
+
+2) Swat Projectiles
+
+3) Greater Telekinetic Grasp: disarm immunity, % increase to TK weapon damage, gem level
+
+4) Implosion: Fuck dudes up. DOT.
+]=]
+
+newTalent{
+ name = "Deflect Projectiles",
+ type = {"psionic/grip", 1},
+ require = psi_wil_20_1,
+ points = 5,
+ mode = "passive",
+ on_learn = function(self, t)
+ self.combat_def_ranged = (self.combat_def_ranged or 0) + 8
+ end,
+
+ on_unlearn = function(self, t)
+ self.combat_def_ranged = self.combat_def_ranged - 8
+ end,
+ info = function(self, t)
+ local boost = self:getTalentLevelRaw(t) * 8
+ return ([[You learn to devote a portion of your attention to mentally swatting, grabbing, or otherwise deflecting incoming projectiles. Increases ranged defense by %d.]]):
+ format(boost)
+ end,
+
+}
+
+newTalent{
+ name = "Bind",
+ type = {"psionic/grip", 2},
+ require = psi_wil_20_2,
+ points = 5,
+ random_ego = "attack",
+ cooldown = function(self, t)
+ local c = 15
+ local gem_level = getGemLevel(self)
+ return math.max(c - gem_level, 0)
+ end,
+ psi = 10,
+ tactical = { ATTACK = 2 },
+ range = function(self, t)
+ local r = 5
+ local gem_level = getGemLevel(self)
+ local mult = (1 + 0.02*gem_level*(self:getTalentLevel(self.T_REACH)))
+ r = math.floor(r*mult)
+ return math.min(r, 10)
+ 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, 15, 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,
+ action = function(self, t)
+ local gem_level = getGemLevel(self)
+ local dur = t.getDuration(self, t)
+ local tg = self:getTalentTarget(t)
+ local x, y = self:getTarget(tg)
+ if not x or not y then return nil end
+ local _ _, x, y = self:canProject(tg, x, y)
+ game:playSoundNear(self, "talents/spell_generic")
+ local target = game.level.map(x, y, Map.ACTOR)
+ if target and target:checkHit(self:combatMindpower(), target:combatMentalResist(), 0, 95, 15)then
+ target:setEffect(self.EFF_PSIONIC_BIND, dur, {power=1})
+ else
+ return
+ end
+ return true
+ end,
+ info = function(self, t)
+ local dur = t.getDuration(self, t)
+ return ([[Bind the target in crushing bands of telekinetic force, immobilizing it for %d turns.
+ The use of a telekinetically-wielded gem as a focus will improve the effects of this talent considerably.]]):
+ format(dur)
+ end,
+}
+
+newTalent{
+ name = "Implode",
+ type = {"psionic/grip", 3},
+ require = psi_wil_20_3,
+ points = 5,
+ random_ego = "attack",
+ cooldown = function(self, t)
+ local c = 45
+ local gem_level = getGemLevel(self)
+ return math.max(c - 2 * gem_level, 0)
+ end,
+ psi = 40,
+ tactical = { ATTACK = 2 },
+ range = function(self, t)
+ local r = 3
+ local gem_level = getGemLevel(self)
+ local mult = (1 + 0.02*gem_level*(self:getTalentLevel(self.T_REACH)))
+ r = math.floor(r*mult)
+ return math.min(r, 10)
+ 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", 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)
+ 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 dur = t.getDuration(self, t)
+ local dam = t.getDamage(self, t)
+ local tg = self:getTalentTarget(t)
+ local x, y = self:getTarget(tg)
+ if not x or not y then return nil end
+ --local _ _, x, y = self:canProject(tg, x, y)
+ --game:playSoundNear(self, "talents/spell_generic")
+ --local target = game.level.map(x, y, Map.ACTOR)
+ --if target and target:checkHit(self:combatMindpower(), target:combatPhysicalResist(), 0, 95, 15)then
+ -- target:setEffect(self.EFF_IMPLODING, dur, {power=dam, src=self})
+ --else
+ -- return
+ --end
+ self:project(tg, x, y, DamageType.IMPLOSION, {dur=dur, dam=dam})
+
+ return true
+ end,
+ info = function(self, t)
+ local dur = t.getDuration(self, t)
+ local dam = t.getDamage(self, t)
+ return ([[Crush the target mercilessly with constant, bone-shattering pressure, slowing it by 50%% for %d turns and dealing %d damage each turn.
+ The use of a telekinetically-wielded gem as a focus will improve the effects of this talent considerably.]]):
+ format(dur, dam)
+ end,
+}
+
+
+newTalent{
+ name = "Greater Telekinetic Grasp",
+ type = {"psionic/grip", 4},
+ require = psi_wil_20_4,
+ points = 5,
+ mode = "passive",
+ stat_sub = function(self, t)
+ return .6 + .04 * self:getTalentLevel(t)
+ end,
+ on_learn = function(self, t)
+ self.disarm_immune = (self.disarm_immune or 0) + .2
+ end,
+
+ on_unlearn = function(self, t)
+ self.disarm_immune = (self.disarm_immune or 0) - .2
+ end,
+ info = function(self, t)
+ local boost = 100 * t.stat_sub(self, t)
+ return ([[Use finely controlled forces to augment both your flesh-and-blood grip and your telekinetic grip. This does the following:
+ Increases disarm immunity by %d%%.
+ Allows %d%% of willpower and cunning (instead of the usual 60%%) to be substituted for strength and dexterity for the purposes of determining damage done by telekinetically-wielded weapons.
+ At talent level 5, telekinetically wielded gems will be treated as one material level higher than they actually are.
+ ]]):
+ format(self:getTalentLevelRaw(t)*20, boost)
+ end,
+}
diff --git a/game/modules/tome/data/talents/psionic/other.lua b/game/modules/tome/data/talents/psionic/other.lua
index 690742d7014cff487412b7478f170b081f4f94f6..170ca278f03f38f90c7d0c22a9e0c7960e6cf047 100644
--- a/game/modules/tome/data/talents/psionic/other.lua
+++ b/game/modules/tome/data/talents/psionic/other.lua
@@ -28,7 +28,7 @@ newTalent{
action = function(self, t)
local inven = self:getInven("INVEN")
local d d = self:showInventory("Telekinetically grasp which item?", inven, function(o)
- return (o.type == "weapon" or o.type == "gem") and o.subtype ~= "longbow" and o.subtype ~= "sling"
+ return (o.type == "weapon" or o.type == "gem") and o.subtype ~= "sling"
end, function(o, item)
local pf = self:getInven("PSIONIC_FOCUS")
if not pf then return end
@@ -142,8 +142,8 @@ newTalent{
if not self:getInven("PSIONIC_FOCUS") then return end
local tkweapon = self:getInven("PSIONIC_FOCUS")[1]
if type(tkweapon) == "boolean" then tkweapon = nil end
- if not tkweapon or tkweapon.type == "gem" then
- game.logPlayer(self, "You cannot do that without a telekinetically-wielded weapon.")
+ if not tkweapon or tkweapon.type == "gem" or tkweapon.archery then
+ game.logPlayer(self, "You cannot do that without a telekinetically-wielded melee weapon.")
return nil
end
return true
diff --git a/game/modules/tome/data/talents/psionic/psi-archery.lua b/game/modules/tome/data/talents/psionic/psi-archery.lua
new file mode 100644
index 0000000000000000000000000000000000000000..7638a87f155714ac8c6f279b5e4262cfc9bbbfbf
--- /dev/null
+++ b/game/modules/tome/data/talents/psionic/psi-archery.lua
@@ -0,0 +1,254 @@
+-- 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
+
+
+newTalent{
+ name = "Guided Shot",
+ type = {"psionic/psi-archery", 1},
+ require = psi_cun_high1,
+ no_energy = "fake",
+ points = 5,
+ random_ego = "attack",
+ cooldown = 10,
+ psi = 10,
+ tactical = { ATTACK = 2 },
+ range = archery_range,
+ 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 for this talent.") end return false end return true end,
+ shot_boost = function(self, t)
+ return 30 + 10*self:getTalentLevel(t)
+ end,
+ use_psi_archery = function(self, t)
+ local pf_weapon = self:getInven("PSIONIC_FOCUS")[1]
+ if pf_weapon and pf_weapon.archery then
+ return true
+ else
+ return false
+ end
+ end,
+ action = function(self, t)
+ local inc = t.shot_boost(self, t)
+ local targets = self:archeryAcquireTargets(nil, {one_shot=true})
+ if not targets then return end
+ self:archeryShoot(targets, t, nil, {atk = inc, crit_chance = inc, use_psi_archery = t.use_psi_archery(self,t)})
+ return true
+ end,
+ info = function(self, t)
+ return ([[Fire and guide an arrow to its target with precise telekinetic nudges. Does normal damage, but accuracy and crit chance are increased by %d.]]):format(t.shot_boost(self, t))
+ end,
+}
+
+newTalent{
+ name = "Augmented Shot",
+ type = {"psionic/psi-archery", 2},
+ no_energy = "fake",
+ points = 5,
+ random_ego = "attack",
+ cooldown = 15,
+ psi = 15,
+ require = psi_cun_high2,
+ range = archery_range,
+ requires_target = true,
+ tactical = { ATTACK = 2 },
+ on_pre_use = function(self, t, silent) if not self:hasArcheryWeapon() then if not silent then game.logPlayer(self, "You require a bow for this talent.") end return false end return true end,
+ apr_boost = function(self, t)
+ return 10 + 10*self:getTalentLevel(t)
+ end,
+ dam_mult = function(self, t)
+ return self:combatTalentWeaponDamage(t, 1.5, 2.5)
+ end,
+ use_psi_archery = function(self, t)
+ local pf_weapon = self:getInven("PSIONIC_FOCUS")[1]
+ if pf_weapon and pf_weapon.archery then
+ return true
+ else
+ return false
+ end
+ end,
+ action = function(self, t)
+ local targets = self:archeryAcquireTargets(nil, {one_shot=true})
+ if not targets then return end
+ self:archeryShoot(targets, t, nil, {mult=t.dam_mult(self, t), apr = t.apr_boost(self, t), use_psi_archery = t.use_psi_archery(self,t)})
+ return true
+ end,
+ info = function(self, t)
+ return ([[Use telekinetic forces to greatly augment the durability and tension of your bow in order to fire an arrow with velocity unmatched by even the mightiest mundane archers. Increases armor penetration by %d, and deals %d%% damage.]]):format(t.apr_boost(self, t), t.dam_mult(self, t) * 100)
+ end,
+}
+
+newTalent{
+ name = "Thought-quick Shot",
+ type = {"psionic/psi-archery", 3},
+ require = psi_cun_high3,
+ no_energy = true,
+ points = 5,
+ random_ego = "attack",
+ cooldown = function(self, t)
+ return math.ceil(math.max(18 - 2 * self:getTalentLevel(t), 5))
+ end,
+ psi = 20,
+ tactical = { ATTACK = 2 },
+ range = archery_range,
+ 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 for this talent.") end return false end return true end,
+ use_psi_archery = function(self, t)
+ local pf_weapon = self:getInven("PSIONIC_FOCUS")[1]
+ if pf_weapon and pf_weapon.archery then
+ return true
+ else
+ return false
+ end
+ end,
+ action = function(self, t)
+ local old = self.energy.value
+ local targets = self:archeryAcquireTargets(nil, {one_shot=true})
+ if not targets then return end
+ self:archeryShoot(targets, t, nil, {use_psi_archery = t.use_psi_archery(self,t)})
+ self.energy.value = old
+ return true
+ end,
+ info = function(self, t)
+ return ([[Ready and release an arrow with a flitting thought. This attack does not use a turn, and increases in talent level reduce its cooldown.]])
+ end,
+}
+
+newTalent{
+ name = "Masterful Telekinetic Archery",
+ type = {"psionic/psi-archery", 4},
+ require = psi_cun_high4,
+ points = 5,
+ psi = 30,
+ cooldown = 50,
+ range = archery_range,
+ direct_hit = true,
+ tactical = { BUFF = 3 },
+ duration = function(self, t)
+ return math.ceil(3 + self:getTalentLevel(t))
+ end,
+ do_tkautoshoot = function(self, t)
+ if game.zone.wilderness then return end
+
+ local targnum = 1
+ if self:hasEffect(self.EFF_PSIFRENZY) then targnum = 1 + math.ceil(0.2*self:getTalentLevel(self.T_FRENZIED_PSIFIGHTING)) end
+ local speed, hit = nil, false
+ local sound, sound_miss = nil, nil
+ --dam = self:getTalentLevel(t)
+ local target
+ local minDistance = 9999
+ local tgts = {}
+ local grids = core.fov.circle_grids(self.x, self.y, 10, true)
+ for x, yy in pairs(grids) do for y, _ in pairs(grids[x]) do
+ local a = game.level.map(x, y, Map.ACTOR)
+ if a and self:reactionToward(a) < 0 and self:hasLOS(a.x, a.y) then
+ tgts[#tgts+1] = a
+ local distance = core.fov.distance(self.x, self.y, a.x, a.y)
+ if (not target or distance < minDistance) and self:hasLOS(a.x, a.y) then
+ target = a
+ minDistance = distance
+ end
+ end
+ end end
+
+
+ --local tg = {type="hit", range=10, talent=t}
+ for i = 1, targnum do
+ if #tgts <= 0 then break end
+
+ local a, id = rng.table(tgts)
+ --local a, id = tgts[i]
+ --local targets = self:archeryAcquireTargets(target)
+ table.remove(tgts, id)
+ local weapon, ammo = self:hasArcheryWeapon()
+ local targets = {}
+ local am
+ if not ammo.infinite then
+ am = self:removeObject(self:getInven("QUIVER"), 1)
+ else
+ am = ammo
+ end
+ if am then
+ targets = {{x=a.x, y=a.y, ammo=am.combat}}
+ end
+
+ if self:getInven(self.INVEN_PSIONIC_FOCUS) then
+ for i, o in ipairs(self:getInven(self.INVEN_PSIONIC_FOCUS)) do
+ if o.combat and o.archery then
+ print("[PSI ATTACK] attacking with", o.name)
+ self:archeryShoot(targets, t, nil, {use_psi_archery = true})
+ --local s, h = self:attackTargetWith(a, o.combat, nil, 1, self)
+ --speed = math.max(speed or 0, s)
+ --hit = hit or h
+ --if hit and not sound then sound = o.combat.sound
+ --elseif not hit and not sound_miss then sound_miss = o.combat.sound_miss end
+ if not o.combat.no_stealth_break then break_stealth = true end
+ self:breakStepUp()
+ end
+ end
+ else
+ return nil
+ end
+
+ end
+ --return hit
+ end,
+ action = function (self, t)
+ if not self:getInven("PSIONIC_FOCUS") then return end
+ local tkweapon = self:getInven("PSIONIC_FOCUS")[1]
+ if type(tkweapon) == "boolean" then tkweapon = nil end
+ if not tkweapon or not tkweapon.archery then
+ game.logPlayer(self, "You cannot do that without a telekinetically-wielded bow.")
+ return nil
+ end
+ self:setEffect(self.EFF_MASTERFUL_TELEKINETIC_ARCHERY, t.duration(self, t), {power=1})
+ return true
+ end,
+ info = function(self, t)
+ local duration = t.duration(self, t)
+ local atk = 0
+ local dam = 0
+ local apr = 0
+ local crit = 0
+ local speed = 1
+ local o = self:getInven("PSIONIC_FOCUS")[1]
+ if type(o) == "boolean" then o = nil end
+ if not o then
+ return ([[You temporarily set aside a part of you mind to direct your telekinetically-wielded bow. It will automatically attack the nearest target each turn for %d turns.
+ The telekinetically-wielded bow uses Willpower in place of Strength and Cunning in place of Dexterity to determine attack and damage.
+ You are not telekinetically wielding anything right now.]]):format(duration)
+ end
+ if o.type == "weapon" then
+ self.use_psi_combat = true
+ atk = self:combatAttack(o.combat)
+ dam = self:combatDamage(o.combat)
+ apr = self:combatAPR(o.combat)
+ crit = self:combatCrit(o.combat)
+ speed = self:combatSpeed(o.combat)
+ self.use_psi_combat = false
+ end
+ return ([[You temporarily set aside a part of you mind to direct your telekinetically-wielded bow. It will automatically attack a target each turn for %d turns.
+ The telekinetically-wielded bow uses Willpower in place of Strength and Cunning in place of Dexterity to determine attack and damage.
+ Combat stats:
+ Accuracy: %d
+ Damage: %d
+ APR: %d
+ Crit: %0.2f
+ Speed: %0.2f]]):
+ format(duration, atk, dam, apr, crit, speed)
+ end,
+}
diff --git a/game/modules/tome/data/talents/psionic/psi-fighting.lua b/game/modules/tome/data/talents/psionic/psi-fighting.lua
index 07145e4c87f931f5d4cd08abf28ed10dacfba38d..3ae2272d9625b25f56a8fa201f11ee3370c9745f 100644
--- a/game/modules/tome/data/talents/psionic/psi-fighting.lua
+++ b/game/modules/tome/data/talents/psionic/psi-fighting.lua
@@ -38,9 +38,9 @@ newTalent{
requires_target = true,
tactical = { ATTACK = 2 },
action = function(self, t)
- local tkweapon = self:getInven("MAINHAND") and self:getInven("MAINHAND")[1]
- if type(tkweapon) == "boolean" then tkweapon = nil end
- if not tkweapon then
+ local weapon = self:getInven("MAINHAND") and self:getInven("MAINHAND")[1]
+ if type(weapon) == "boolean" then weapon = nil end
+ if not weapon or self:attr("disarmed")then
game.logPlayer(self, "You cannot do that without a weapon in your hands.")
return nil
end
@@ -49,7 +49,7 @@ newTalent{
if not x or not y or not target then return nil end
if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
self.use_psi_combat = true
- self:attackTargetWith(target, tkweapon.combat, nil, self:combatTalentWeaponDamage(t, 1.8, 3))
+ self:attackTargetWith(target, weapon.combat, nil, self:combatTalentWeaponDamage(t, 1.8, 3))
self.use_psi_combat = false
return true
end,
diff --git a/game/modules/tome/data/talents/psionic/psionic.lua b/game/modules/tome/data/talents/psionic/psionic.lua
index f1509f7b2c4d3fce9499fa0081930213d944f977..1fb975341ce105e388e066cb9750bb109be98dc4 100644
--- a/game/modules/tome/data/talents/psionic/psionic.lua
+++ b/game/modules/tome/data/talents/psionic/psionic.lua
@@ -28,7 +28,11 @@ newTalentType{ allow_random=true, type="psionic/finer-energy-manipulations", gen
newTalentType{ allow_random=true, type="psionic/mental-discipline", generic = true, name = "mental discipline", description = "Increase mental capacity, endurance, and flexibility." }
newTalentType{ no_silence=true, type="psionic/other", name = "other", description = "Various psionic talents." }
--- Generic requires for psionic talents based on talent level
+newTalentType{ allow_random=true, type="psionic/grip", name = "grip", description = "Augment your telekinetic grip." }
+newTalentType{ allow_random=true, type="psionic/psi-archery", name = "psi-archery", description = "Use your telekinetic powers to wield bows with deadly effectiveness." }
+newTalentType{ allow_random=true, type="psionic/greater-psi-fighting", name = "greater psi-fighting", description = "Elevate psi-fighting prowess to epic levels." }
+newTalentType{ allow_random=true, type="psionic/brainstorm", name = "brainstorm", description = "Focus your telekinetic powers in ways undreamed of by most mindslayers." }
+-- Level 0 wil tree requirements:
psi_absorb = {
stat = { wil=function(level) return 12 + (level-1) * 8 end },
level = function(level) return 0 + 5*(level-1) end,
@@ -49,10 +53,8 @@ psi_wil_req4 = {
stat = { wil=function(level) return 36 + (level-1) * 2 end },
level = function(level) return 12 + (level-1) end,
}
-psi_wil_req5 = {
- stat = { wil=function(level) return 44 + (level-1) * 2 end },
- level = function(level) return 16 + (level-1) end,
-}
+
+--Level 10 wil tree requirements:
psi_wil_high1 = {
stat = { wil=function(level) return 22 + (level-1) * 2 end },
level = function(level) return 10 + (level-1) end,
@@ -69,11 +71,26 @@ psi_wil_high4 = {
stat = { wil=function(level) return 46 + (level-1) * 2 end },
level = function(level) return 22 + (level-1) end,
}
-psi_wil_high5 = {
- stat = { wil=function(level) return 54 + (level-1) * 2 end },
- level = function(level) return 26 + (level-1) end,
+
+--Level 20 wil tree requirements:
+psi_wil_20_1 = {
+ stat = { wil=function(level) return 32 + (level-1) * 2 end },
+ level = function(level) return 20 + (level-1) end,
+}
+psi_wil_20_2 = {
+ stat = { wil=function(level) return 36 + (level-1) * 2 end },
+ level = function(level) return 24 + (level-1) end,
+}
+psi_wil_20_3 = {
+ stat = { wil=function(level) return 42 + (level-1) * 2 end },
+ level = function(level) return 28 + (level-1) end,
}
--- For cunning trees
+psi_wil_20_4 = {
+ stat = { wil=function(level) return 48 + (level-1) * 2 end },
+ level = function(level) return 32 + (level-1) end,
+}
+
+-- Level 0 cun tree requirements:
psi_cun_req1 = {
stat = { cun=function(level) return 12 + (level-1) * 2 end },
level = function(level) return 0 + (level-1) end,
@@ -90,10 +107,9 @@ psi_cun_req4 = {
stat = { cun=function(level) return 36 + (level-1) * 2 end },
level = function(level) return 12 + (level-1) end,
}
-psi_cun_req5 = {
- stat = { cun=function(level) return 44 + (level-1) * 2 end },
- level = function(level) return 16 + (level-1) end,
-}
+
+
+-- Level 10 cun tree requirements:
psi_cun_high1 = {
stat = { cun=function(level) return 22 + (level-1) * 2 end },
level = function(level) return 10 + (level-1) end,
@@ -110,10 +126,7 @@ psi_cun_high4 = {
stat = { cun=function(level) return 46 + (level-1) * 2 end },
level = function(level) return 22 + (level-1) end,
}
-psi_cun_high5 = {
- stat = { cun=function(level) return 54 + (level-1) * 2 end },
- level = function(level) return 26 + (level-1) end,
-}
+
-- Useful definitions for psionic talents
function getGemLevel(self)
@@ -124,6 +137,11 @@ function getGemLevel(self)
gem_level = tk_item.material_level or 5
end
end
+ if self:knowTalent(self.T_GREATER_TELEKINETIC_GRASP) and gem_level > 0 then
+ if self:getTalentLevelRaw(self.T_GREATER_TELEKINETIC_GRASP) == 5 then
+ gem_level = gem_level + 1
+ end
+ end
return gem_level
end
@@ -136,3 +154,6 @@ load("/data/talents/psionic/voracity.lua")
load("/data/talents/psionic/augmented-mobility.lua")
load("/data/talents/psionic/focus.lua")
load("/data/talents/psionic/other.lua")
+
+load("/data/talents/psionic/psi-archery.lua")
+load("/data/talents/psionic/grip.lua")
diff --git a/game/modules/tome/data/talents/techniques/archery.lua b/game/modules/tome/data/talents/techniques/archery.lua
index 91f0cd9e3e633d81536cfa631290ff67531c0f2d..6004d7195dab9534a2cfd318f2d6bb8b797cb0cb 100644
--- a/game/modules/tome/data/talents/techniques/archery.lua
+++ b/game/modules/tome/data/talents/techniques/archery.lua
@@ -30,10 +30,18 @@ newTalent{
requires_target = true,
tactical = { ATTACK = 1 },
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,
+ use_psi_archery = function(self, t)
+ local pf_weapon = self:getInven("PSIONIC_FOCUS")[1]
+ if pf_weapon and pf_weapon.archery then
+ return true
+ else
+ return false
+ end
+ end,
action = function(self, t)
local targets = self:archeryAcquireTargets(nil, {one_shot=true})
if not targets then return end
- self:archeryShoot(targets, t)
+ self:archeryShoot(targets, t, nil, {use_psi_archery = t.use_psi_archery(self, t)})
return true
end,
info = function(self, t)
diff --git a/game/modules/tome/data/timed_effects.lua b/game/modules/tome/data/timed_effects.lua
index 9f49157d80c6fd68de4fd13989e9b4cc06558896..f6417eb199f276b8bfd11b070bc40169fced9b3d 100644
--- a/game/modules/tome/data/timed_effects.lua
+++ b/game/modules/tome/data/timed_effects.lua
@@ -3252,6 +3252,60 @@ newEffect{
end,
}
+newEffect{
+ name = "MASTERFUL_TELEKINETIC_ARCHERY",
+ desc = "Telekinetic Archery",
+ long_desc = function(self, eff) return ("Your telekinetically-wielded bow automatically attacks the nearest target each turn.") end,
+ type = "mental",
+ status = "beneficial",
+ parameters = {dam=10},
+ on_gain = function(self, err) return "#Target# enters a telekinetic archer's trance!", "+Telekinetic archery" end,
+ on_lose = function(self, err) return "#Target# is no longer in a telekinetic archer's trance.", "-Telekinetic archery" end,
+}
+
+newEffect{
+ name = "PSIONIC_BIND",
+ desc = "Immobilized",
+ long_desc = function(self, eff) return "Immobilized by telekinetic forces." end,
+ type = "mental",
+ status = "detrimental",
+ parameters = {},
+ on_gain = function(self, err) return "#F53CBE##Target# is bound by telekinetic forces!", "+Paralyzed" end,
+ on_lose = function(self, err) return "#Target# shakes free of the telekinetic binding", "-Paralyzed" end,
+ activate = function(self, eff)
+ --eff.particle = self:addParticles(Particles.new("gloom_stunned", 1))
+ eff.tmpid = self:addTemporaryValue("paralyzed", 1)
+ -- Start the stun counter only if this is the first stun
+ if self.paralyzed == 1 then self.paralyzed_counter = (self:attr("stun_immune") or 0) * 100 end
+ eff.dur = self:updateEffectDuration(eff.dur, "stun")
+ end,
+ deactivate = function(self, eff)
+ --self:removeParticles(eff.particle)
+ self:removeTemporaryValue("paralyzed", eff.tmpid)
+ if not self:attr("paralyzed") then self.paralyzed_counter = nil end
+ end,
+}
+
+newEffect{
+ name = "IMPLODING",
+ desc = "Slow",
+ long_desc = function(self, eff) return ("Slowed by 50%% and taking %d crushing damage per turn."):format( eff.power) end,
+ type = "mental",
+ status = "detrimental",
+ parameters = {},
+ on_gain = function(self, err) return "#Target# is being crushed.", "+Imploding" end,
+ on_lose = function(self, err) return "#Target# shakes off the crushing forces.", "-Imploding" end,
+ activate = function(self, eff)
+ eff.tmpid = self:addTemporaryValue("global_speed", -0.5)
+ eff.dur = self:updateEffectDuration(eff.dur, "slow")
+ end,
+ deactivate = function(self, eff)
+ self:removeTemporaryValue("global_speed", eff.tmpid)
+ end,
+ on_timeout = function(self, eff)
+ DamageType:get(DamageType.PHYSICAL).projector(eff.src, self.x, self.y, DamageType.PHYSICAL, eff.power)
+ end,
+}
newEffect{
name = "TURN_BACK_THE_CLOCK",