Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
tome
Tales of MajEyal
Commits
3cff8084
Commit
3cff8084
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@3820
51575b47-30f0-44d4-a5cc-537603b46e54
parent
36a2e1e3
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/engines/default/engine/GameEnergyBased.lua
+1
-1
1 addition, 1 deletion
game/engines/default/engine/GameEnergyBased.lua
game/modules/tome/class/Object.lua
+2
-2
2 additions, 2 deletions
game/modules/tome/class/Object.lua
with
3 additions
and
3 deletions
game/engines/default/engine/GameEnergyBased.lua
+
1
−
1
View file @
3cff8084
...
...
@@ -100,7 +100,7 @@ function _M:tickLevel(level)
for
i
=
1
,
#
arr
do
e
=
arr
[
i
]
if
e
and
e
.
act
and
e
.
energy
then
if
e
.
actBase
then
if
e
.
actBase
and
e
.
energyBase
then
if
e
.
energyBase
<
self
.
energy_to_act
then
e
.
energyBase
=
e
.
energyBase
+
self
.
energy_per_tick
end
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/class/Object.lua
+
2
−
2
View file @
3cff8084
...
...
@@ -988,7 +988,7 @@ function _M:getPriceFlags()
if
w
.
combat_def_ranged
then
price
=
price
+
w
.
combat_def_ranged
*
1
end
if
w
.
combat_armor
then
price
=
price
+
w
.
combat_armor
*
1
end
if
w
.
combat_physcrit
then
price
=
price
+
w
.
combat_physcrit
*
1
.
4
end
if
w
.
combat_critical_power
then
price
=
price
+
w
.
critical_power
*
2
end
if
w
.
combat_critical_power
then
price
=
price
+
w
.
combat_
critical_power
*
2
end
if
w
.
combat_atk
then
price
=
price
+
w
.
combat_atk
*
1
end
if
w
.
combat_apr
then
price
=
price
+
w
.
combat_apr
*
0
.
3
end
if
w
.
combat_dam
then
price
=
price
+
w
.
combat_dam
*
3
end
...
...
@@ -1010,7 +1010,7 @@ function _M:getPriceFlags()
if
w
.
size_category
then
price
=
price
+
w
.
size_category
*
25
end
if
w
.
esp_all
then
price
=
price
+
w
.
esp_all
*
25
end
if
w
.
esp_range
then
price
=
price
+
w
.
esp_range
*
15
end
if
w
.
can_breath
then
price
=
price
+
w
.
can_breath
*
1
0
end
if
w
.
can_breath
then
for
t
,
v
in
pairs
(
w
.
can_breath
)
do
price
=
price
+
v
*
3
0
end
end
--resists
if
w
.
resists
then
for
t
,
v
in
pairs
(
w
.
resists
)
do
price
=
price
+
v
*
0
.
15
end
end
...
...
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