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
8e3fba36
Commit
8e3fba36
authored
11 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
Aether Beam and Gravitic Trap can not be placed in walls
parent
23705675
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/cunning/traps.lua
+1
-0
1 addition, 0 deletions
game/modules/tome/data/talents/cunning/traps.lua
game/modules/tome/data/talents/spells/aether.lua
+1
-0
1 addition, 0 deletions
game/modules/tome/data/talents/spells/aether.lua
with
2 additions
and
0 deletions
game/modules/tome/data/talents/cunning/traps.lua
+
1
−
0
View file @
8e3fba36
...
@@ -648,6 +648,7 @@ newTalent{
...
@@ -648,6 +648,7 @@ newTalent{
if
not
x
or
not
y
then
return
nil
end
if
not
x
or
not
y
then
return
nil
end
local
_
_
,
x
,
y
=
self
:
canProject
(
tg
,
x
,
y
)
local
_
_
,
x
,
y
=
self
:
canProject
(
tg
,
x
,
y
)
if
game
.
level
.
map
(
x
,
y
,
Map
.
TRAP
)
then
game
.
logPlayer
(
self
,
"You somehow fail to set the trap."
)
return
nil
end
if
game
.
level
.
map
(
x
,
y
,
Map
.
TRAP
)
then
game
.
logPlayer
(
self
,
"You somehow fail to set the trap."
)
return
nil
end
if
game
.
level
.
map
:
checkEntity
(
x
,
y
,
Map
.
TERRAIN
,
"block_move"
)
then
game
.
logPlayer
(
self
,
"You somehow fail to set the trap."
)
return
nil
end
local
dam
=
t
.
getDamage
(
self
,
t
)
local
dam
=
t
.
getDamage
(
self
,
t
)
-- Need to pass the actor in to the triggered function for the apply_power to work correctly
-- Need to pass the actor in to the triggered function for the apply_power to work correctly
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/data/talents/spells/aether.lua
+
1
−
0
View file @
8e3fba36
...
@@ -62,6 +62,7 @@ newTalent{
...
@@ -62,6 +62,7 @@ newTalent{
if
not
x
or
not
y
then
return
nil
end
if
not
x
or
not
y
then
return
nil
end
local
_
_
,
x
,
y
=
self
:
canProject
(
tg
,
x
,
y
)
local
_
_
,
x
,
y
=
self
:
canProject
(
tg
,
x
,
y
)
if
game
.
level
.
map
(
x
,
y
,
Map
.
TRAP
)
then
game
.
logPlayer
(
self
,
"You somehow fail to set the aether beam."
)
return
nil
end
if
game
.
level
.
map
(
x
,
y
,
Map
.
TRAP
)
then
game
.
logPlayer
(
self
,
"You somehow fail to set the aether beam."
)
return
nil
end
if
game
.
level
.
map
:
checkEntity
(
x
,
y
,
Map
.
TERRAIN
,
"block_move"
)
then
game
.
logPlayer
(
self
,
"You somehow fail to set the aether beam."
)
return
nil
end
local
t
=
basetrap
(
self
,
t
,
x
,
y
,
44
,
{
local
t
=
basetrap
(
self
,
t
,
x
,
y
,
44
,
{
type
=
"aether"
,
name
=
"aether beam"
,
color
=
colors
.
VIOLET
,
image
=
"trap/trap_glyph_explosion_01_64.png"
,
type
=
"aether"
,
name
=
"aether beam"
,
color
=
colors
.
VIOLET
,
image
=
"trap/trap_glyph_explosion_01_64.png"
,
...
...
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