Skip to content
Snippets Groups Projects
Commit 786e3d1e authored by dg's avatar dg
Browse files

Running over a trap stop running

git-svn-id: http://svn.net-core.org/repos/t-engine4@5284 51575b47-30f0-44d4-a5cc-537603b46e54
parent 7829fcb5
No related branches found
No related tags found
No related merge requests found
......@@ -97,6 +97,13 @@ function _M:canTrigger(x, y, who, no_random)
return true
end
--- Trigger the trap
function _M:trigger(x, y, who)
engine.Trap.trigger(self, x, y, who)
if who.runStop then who:runStop("trap") end
end
function _M:resolveSource()
if self.summoner_gain_exp and self.summoner then
return self.summoner:resolveSource()
......
......@@ -173,6 +173,7 @@ newEntity{ base = "TRAP_COMPLEX",
detect_power = resolvers.mbonus(40, 5), disarm_power = resolvers.mbonus(50, 10),
rarity = 3, level_range = {1, nil},
color=colors.RED,
pressure_trap = true,
message = "Flames start to appear arround @target@.",
dam = resolvers.mbonus_level(300, 15),
triggered = function(self, x, y, who)
......@@ -215,6 +216,7 @@ newEntity{ base = "TRAP_COMPLEX",
detect_power = resolvers.mbonus(40, 5), disarm_power = resolvers.mbonus(50, 10),
rarity = 3, level_range = {1, nil},
color=colors.BLUE,
pressure_trap = true,
message = "Cold flames start to appear arround @target@.",
dam = resolvers.mbonus_level(150, 5),
triggered = function(self, x, y, who)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment