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
edc148db
Commit
edc148db
authored
13 years ago
by
dg
Browse files
Options
Downloads
Patches
Plain Diff
limit
git-svn-id:
http://svn.net-core.org/repos/t-engine4@4115
51575b47-30f0-44d4-a5cc-537603b46e54
parent
778e4b09
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/spells/shades.lua
+6
-3
6 additions, 3 deletions
game/modules/tome/data/talents/spells/shades.lua
src/wait.c
+5
-0
5 additions, 0 deletions
src/wait.c
with
11 additions
and
3 deletions
game/modules/tome/data/talents/spells/shades.lua
+
6
−
3
View file @
edc148db
...
...
@@ -219,6 +219,7 @@ newTalent{
tactical
=
{
ATTACK
=
2
,
ESCAPE
=
1
},
requires_target
=
true
,
getDuration
=
function
(
self
,
t
)
return
math.floor
(
3
+
self
:
getTalentLevel
(
t
))
end
,
getHealth
=
function
(
self
,
t
)
return
0
.
2
+
self
:
combatTalentSpellDamage
(
t
,
20
,
500
)
/
1000
end
,
action
=
function
(
self
,
t
)
-- Find space
local
x
,
y
=
util
.
findFreeGrid
(
self
.
x
,
self
.
y
,
1
,
true
,
{[
Map
.
ACTOR
]
=
true
})
...
...
@@ -242,7 +243,8 @@ newTalent{
m
.
on_added_to_level
=
nil
m
.
energy
.
value
=
0
m
.
life
=
m
.
life
m
.
max_life
=
m
.
max_life
*
t
.
getHealth
(
self
,
t
)
m
.
life
=
util
.
bound
(
m
.
life
,
0
,
m
.
max_life
)
m
.
forceLevelup
=
function
()
end
m
.
on_die
=
nil
m
.
on_acquire_target
=
nil
...
...
@@ -269,7 +271,8 @@ newTalent{
return
true
end
,
info
=
function
(
self
,
t
)
return
(
[[Through the shadows you forge a temporary copy of yourself, existing for %d turns.]]
):
format
(
t
.
getDuration
(
self
,
t
))
return
(
[[Through the shadows you forge a temporary copy of yourself, existing for %d turns.
The copy possess your exact talents and stats and has %d%% life.]]
):
format
(
t
.
getDuration
(
self
,
t
),
t
.
getHealth
(
self
,
t
)
*
100
)
end
,
}
This diff is collapsed.
Click to expand it.
src/wait.c
+
5
−
0
View file @
edc148db
...
...
@@ -93,6 +93,11 @@ static void hook_wait_display(lua_State *L, lua_Debug *ar)
{
waited_count
++
;
SDL_PumpEvents
();
static
int
last_tick
=
0
;
int
now
=
SDL_GetTicks
();
if
(
now
-
last_tick
<
300
)
return
;
last_tick
=
now
;
on_redraw
();
}
...
...
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