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
K'van
Tales of MajEyal
Commits
e32005b7
Commit
e32005b7
authored
9 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
stuff
parent
40399e81
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
game/modules/tome/class/Object.lua
+3
-3
3 additions, 3 deletions
game/modules/tome/class/Object.lua
game/modules/tome/class/interface/Archery.lua
+14
-2
14 additions, 2 deletions
game/modules/tome/class/interface/Archery.lua
ideas/irdc2015-t-engine.odp
+0
-0
0 additions, 0 deletions
ideas/irdc2015-t-engine.odp
with
17 additions
and
5 deletions
game/modules/tome/class/Object.lua
+
3
−
3
View file @
e32005b7
...
...
@@ -1108,7 +1108,7 @@ function _M:getTextualDesc(compare_with, use_actor)
nil
,
true
)
self
:
triggerHook
{
"Object:descCombat"
,
compare_with
=
compare_with
,
compare_fields
=
compare_fields
,
compare_table_fields
=
compare_table_fields
,
desc
=
desc
,
combat
=
combat
}
self
:
triggerHook
{
"Object:descCombat"
,
compare_with
=
compare_with
,
compare_fields
=
compare_fields
,
compare_scaled
=
compare_scaled
,
compare_scaled
=
compare_scaled
,
compare_table_fields
=
compare_table_fields
,
desc
=
desc
,
combat
=
combat
}
end
local
desc_wielder
=
function
(
w
,
compare_with
,
field
)
...
...
@@ -1620,7 +1620,7 @@ function _M:getTextualDesc(compare_with, use_actor)
desc
:
add
(
"Allows you to speak and read the old Sher'Tul language."
,
true
)
end
self
:
triggerHook
{
"Object:descWielder"
,
compare_with
=
compare_with
,
compare_fields
=
compare_fields
,
compare_table_fields
=
compare_table_fields
,
desc
=
desc
,
w
=
w
,
field
=
field
}
self
:
triggerHook
{
"Object:descWielder"
,
compare_with
=
compare_with
,
compare_fields
=
compare_fields
,
compare_scaled
=
compare_scaled
,
compare_table_fields
=
compare_table_fields
,
desc
=
desc
,
w
=
w
,
field
=
field
}
-- Do not show "general effect" if nothing to show
-- if desc[#desc-2] == "General effects: " then table.remove(desc) table.remove(desc) table.remove(desc) table.remove(desc) end
...
...
@@ -1858,7 +1858,7 @@ function _M:getTextualDesc(compare_with, use_actor)
end
end
self
:
triggerHook
{
"Object:descMisc"
,
compare_with
=
compare_with
,
compare_fields
=
compare_fields
,
compare_table_fields
=
compare_table_fields
,
desc
=
desc
,
object
=
self
}
self
:
triggerHook
{
"Object:descMisc"
,
compare_with
=
compare_with
,
compare_fields
=
compare_fields
,
compare_scaled
=
compare_scaled
,
compare_table_fields
=
compare_table_fields
,
desc
=
desc
,
object
=
self
}
local
use_desc
=
self
:
getUseDesc
(
use_actor
)
if
use_desc
then
desc
:
merge
(
use_desc
:
toTString
())
end
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/class/interface/Archery.lua
+
14
−
2
View file @
e32005b7
...
...
@@ -323,8 +323,20 @@ local function archery_projectile(tx, ty, tg, self, tmp)
print
(
"[ATTACK] after counterstrike"
,
dam
)
end
if
weapon
and
weapon
.
inc_damage_type
then
local
inc
=
0
for
k
,
v
in
pairs
(
weapon
.
inc_damage_type
)
do
if
target
:
checkClassification
(
tostring
(
k
))
then
inc
=
math.max
(
inc
,
v
)
end
end
dam
=
dam
+
dam
*
inc
/
100
print
(
"[ATTACK] after inc by type (weapon)"
,
dam
)
end
if
ammo
and
ammo
.
inc_damage_type
then
local
inc
=
0
local
inc
=
0
for
k
,
v
in
pairs
(
ammo
.
inc_damage_type
)
do
if
target
:
checkClassification
(
tostring
(
k
))
then
inc
=
math.max
(
inc
,
v
)
end
...
...
@@ -332,7 +344,7 @@ local function archery_projectile(tx, ty, tg, self, tmp)
dam
=
dam
+
dam
*
inc
/
100
print
(
"[ATTACK] after inc by type"
,
dam
)
print
(
"[ATTACK] after inc by type
(ammo)
"
,
dam
)
end
dam
,
crit
=
self
:
physicalCrit
(
dam
,
ammo
,
target
,
atk
,
def
,
tg
.
archery
.
crit_chance
or
0
,
tg
.
archery
.
crit_power
or
0
)
...
...
This diff is collapsed.
Click to expand it.
ideas/irdc2015-t-engine.odp
+
0
−
0
View file @
e32005b7
No preview for this file type
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