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
Lisa Greene
Tales of MajEyal
Commits
76460660
Commit
76460660
authored
8 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
blahblah
parent
01ec0cf5
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/Actor.lua
+4
-8
4 additions, 8 deletions
game/modules/tome/class/Actor.lua
with
4 additions
and
8 deletions
game/modules/tome/class/Actor.lua
+
4
−
8
View file @
76460660
...
...
@@ -1324,7 +1324,7 @@ function _M:move(x, y, force)
self.did_energy = nil
-- Try to detect traps
if
not force and
self:knowTalent
(
self.T_HEIGHTENED_SENSES
)
then
if self:knowTalent
(
self.T_HEIGHTENED_SENSES
)
then
local power = self:callTalent
(
self.T_HEIGHTENED_SENSES,"
trapPower
"
)
local grids = core.fov.circle_grids
(
self.x, self.y, 1, true
)
for x, yy in pairs
(
grids
)
do for y, _ in pairs
(
yy
)
do
...
...
@@ -3430,8 +3430,7 @@ function _M:onStatChange(stat, v)
self
.
max_life
=
math.max
(
1
,
self
.
max_life
+
multi_life
*
v
)
-- no negative max life
-- heal mod
if
self
.
stats
.
hf_id
then
self
:
removeTemporaryValue
(
"healing_factor"
,
self
.
stats
.
hf_id
)
end
self
.
stats
.
hf_id
=
self
:
addTemporaryValue
(
"healing_factor"
,
((
self
:
getCon
()
/
10
)
^
.
5
-
1
)
*
.
25
)
-- 0 @ 10, 1.54 @ 100
self
.
healing_factor
=
self
.
healing_factor
+
v
*
0
.
005
elseif
stat
==
self
.
STAT_DEX
then
self
.
ignore_direct_crits
=
(
self
.
ignore_direct_crits
or
0
)
+
0
.
3
*
v
elseif
stat
==
self
.
STAT_WIL
then
...
...
@@ -3578,8 +3577,8 @@ end
--- Update tile for races that can handle it
function
_M
:
updateModdableTile
()
if
not
self
.
moddable_tile
or
Map
.
tiles
.
no_moddable_tiles
then
local
selfbase
=
self
.
replace_display
or
self
local
selfbase
=
self
.
replace_display
or
self
if
not
selfbase
.
moddable_tile
or
Map
.
tiles
.
no_moddable_tiles
then
local
add
=
selfbase
.
add_mos
or
{}
if
self
.
shader_auras
and
next
(
self
.
shader_auras
)
then
local
base
,
baseh
,
basey
,
base1
=
nil
...
...
@@ -3592,9 +3591,6 @@ function _M:updateModdableTile()
base1
=
false
baseh
,
basey
=
selfbase
.
display_h
,
selfbase
.
display_y
end
print
(
"!!!!!!!!!!"
)
print
(
"!!!!!!!!!!"
,
base
)
print
(
"!!!!!!!!!!"
)
if
base
then
selfbase
.
add_mos
=
add
...
...
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