Skip to content
Snippets Groups Projects
Commit 700c5a0b authored by dg's avatar dg
Browse files

New more "complex" traps to replace, in most places, elemental ones

git-svn-id: http://svn.net-core.org/repos/t-engine4@5246 51575b47-30f0-44d4-a5cc-537603b46e54
parent 1821dbb4
No related branches found
No related tags found
No related merge requests found
Showing
with 19 additions and 21 deletions
...@@ -143,7 +143,7 @@ newEntity{ base = "TRAP_COMPLEX", ...@@ -143,7 +143,7 @@ newEntity{ base = "TRAP_COMPLEX",
5, nil, 5, nil,
{type="vapour"}, {type="vapour"},
nil, 0, 0 nil, 0, 0
) )
self:useEnergy(game.energy_to_act * 7) self:useEnergy(game.energy_to_act * 7)
end, end,
act = function(self) act = function(self)
...@@ -160,5 +160,3 @@ newEntity{ base = "TRAP_COMPLEX", ...@@ -160,5 +160,3 @@ newEntity{ base = "TRAP_COMPLEX",
end end
end, end,
} }
-- you do NOT want native UI widgets
\ No newline at end of file
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -17,6 +17,6 @@ ...@@ -17,6 +17,6 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
load("/data/general/traps/annoy.lua") load("/data/general/traps/annoy.lua")
load("/data/general/traps/alarm.lua") load("/data/general/traps/alarm.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -17,6 +17,6 @@ ...@@ -17,6 +17,6 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
load("/data/general/traps/annoy.lua") load("/data/general/traps/annoy.lua")
load("/data/general/traps/alarm.lua") load("/data/general/traps/alarm.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -18,5 +18,6 @@ ...@@ -18,5 +18,6 @@
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/elemental.lua")
load("/data/general/traps/complex.lua")
load("/data/general/traps/alarm.lua") load("/data/general/traps/alarm.lua")
load("/data/general/traps/natural_forest.lua") load("/data/general/traps/natural_forest.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -17,5 +17,4 @@ ...@@ -17,5 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua")
load("/data/general/traps/alarm.lua") load("/data/general/traps/alarm.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -17,5 +17,5 @@ ...@@ -17,5 +17,5 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
load("/data/general/traps/alarm.lua") load("/data/general/traps/alarm.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -17,6 +17,6 @@ ...@@ -17,6 +17,6 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
load("/data/general/traps/alarm.lua") load("/data/general/traps/alarm.lua")
load("/data/general/traps/natural_forest.lua") load("/data/general/traps/natural_forest.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
-- Nicolas Casalini "DarkGod" -- Nicolas Casalini "DarkGod"
-- darkgod@te4.org -- darkgod@te4.org
load("/data/general/traps/elemental.lua") load("/data/general/traps/complex.lua")
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