From 9987d39f77ad152ece980b1b88b101da720209c0 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sat, 3 Sep 2011 10:38:35 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@4314 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/talents/psionic/other.lua | 2 +-
game/modules/tome/data/talents/psionic/psi-archery.lua | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/game/modules/tome/data/talents/psionic/other.lua b/game/modules/tome/data/talents/psionic/other.lua
index fbe33f1c03..3698f5f1e1 100644
--- a/game/modules/tome/data/talents/psionic/other.lua
+++ b/game/modules/tome/data/talents/psionic/other.lua
@@ -121,7 +121,7 @@ newTalent{
if o.combat and not o.archery then
print("[PSI ATTACK] attacking with", o.name)
self.use_psi_combat = true
- local s, h = self:attackTargetWith(a, o.combat, nil, 1, self)
+ local s, h = self:attackTargetWith(a, o.combat, nil, 1)
self.use_psi_combat = false
speed = math.max(speed or 0, s)
hit = hit or h
diff --git a/game/modules/tome/data/talents/psionic/psi-archery.lua b/game/modules/tome/data/talents/psionic/psi-archery.lua
index 7638a87f15..918bca9bd1 100644
--- a/game/modules/tome/data/talents/psionic/psi-archery.lua
+++ b/game/modules/tome/data/talents/psionic/psi-archery.lua
@@ -169,7 +169,7 @@ newTalent{
--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)
@@ -185,13 +185,13 @@ newTalent{
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)
+ --local s, h = self:attackTargetWith(a, o.combat, nil, 1)
--speed = math.max(speed or 0, s)
--hit = hit or h
--if hit and not sound then sound = o.combat.sound
--
GitLab