Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
yutio888
Tales of MajEyal
Commits
9987d39f
Commit
9987d39f
authored
13 years ago
by
dg
Browse files
Options
Downloads
Patches
Plain Diff
fix
git-svn-id:
http://svn.net-core.org/repos/t-engine4@4314
51575b47-30f0-44d4-a5cc-537603b46e54
parent
c95c85ed
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/modules/tome/data/talents/psionic/other.lua
+1
-1
1 addition, 1 deletion
game/modules/tome/data/talents/psionic/other.lua
game/modules/tome/data/talents/psionic/psi-archery.lua
+3
-3
3 additions, 3 deletions
game/modules/tome/data/talents/psionic/psi-archery.lua
with
4 additions
and
4 deletions
game/modules/tome/data/talents/psionic/other.lua
+
1
−
1
View file @
9987d39f
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/data/talents/psionic/psi-archery.lua
+
3
−
3
View file @
9987d39f
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment