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
Otowa Kotori
Tales of MajEyal
Commits
0c8106d1
Commit
0c8106d1
authored
13 years ago
by
dg
Browse files
Options
Downloads
Patches
Plain Diff
typo
git-svn-id:
http://svn.net-core.org/repos/t-engine4@3177
51575b47-30f0-44d4-a5cc-537603b46e54
parent
267c343a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
game/modules/tome/class/interface/Combat.lua
+3
-3
3 additions, 3 deletions
game/modules/tome/class/interface/Combat.lua
with
3 additions
and
3 deletions
game/modules/tome/class/interface/Combat.lua
+
3
−
3
View file @
0c8106d1
...
...
@@ -583,13 +583,13 @@ end
function
_M
:
combatDamage
(
weapon
)
weapon
=
weapon
or
self
.
combat
or
{}
local
sub_c
o
n_to_str
=
false
if
weapon
.
talented
and
weapon
.
talented
==
"knife"
and
self
:
knowTalent
(
Talents
.
T_LETHALITY
)
then
sub_c
o
n_to_str
=
true
end
local
sub_c
u
n_to_str
=
false
if
weapon
.
talented
and
weapon
.
talented
==
"knife"
and
self
:
knowTalent
(
Talents
.
T_LETHALITY
)
then
sub_c
u
n_to_str
=
true
end
local
totstat
=
0
local
dammod
=
weapon
.
dammod
or
{
str
=
0
.
6
}
for
stat
,
mod
in
pairs
(
dammod
)
do
if
sub_c
o
n_to_str
and
stat
==
"str"
then
stat
=
"cun"
end
if
sub_c
u
n_to_str
and
stat
==
"str"
then
stat
=
"cun"
end
if
self
.
use_psi_combat
and
stat
==
"str"
then
stat
=
"wil"
end
if
self
.
use_psi_combat
and
stat
==
"dex"
then
stat
=
"cun"
end
totstat
=
totstat
+
self
:
getStat
(
stat
)
*
mod
...
...
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