diff --git a/game/modules/tome/data/general/traps/complex.lua b/game/modules/tome/data/general/traps/complex.lua index 1c93b5414bae9f8d8670effd287baf9413bcab01..10f52cd34d47716e00467e3c93d1d27e095f19b1 100644 --- a/game/modules/tome/data/general/traps/complex.lua +++ b/game/modules/tome/data/general/traps/complex.lua @@ -143,7 +143,7 @@ newEntity{ base = "TRAP_COMPLEX", 5, nil, {type="vapour"}, nil, 0, 0 - ) + ) self:useEnergy(game.energy_to_act * 7) end, act = function(self) @@ -160,5 +160,3 @@ newEntity{ base = "TRAP_COMPLEX", end end, } - --- you do NOT want native UI widgets \ No newline at end of file diff --git a/game/modules/tome/data/zones/ancient-elven-ruins/traps.lua b/game/modules/tome/data/zones/ancient-elven-ruins/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/ancient-elven-ruins/traps.lua +++ b/game/modules/tome/data/zones/ancient-elven-ruins/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/arena/traps.lua b/game/modules/tome/data/zones/arena/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/arena/traps.lua +++ b/game/modules/tome/data/zones/arena/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/blighted-ruins/traps.lua b/game/modules/tome/data/zones/blighted-ruins/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/blighted-ruins/traps.lua +++ b/game/modules/tome/data/zones/blighted-ruins/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/crypt-kryl-feijan/traps.lua b/game/modules/tome/data/zones/crypt-kryl-feijan/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/crypt-kryl-feijan/traps.lua +++ b/game/modules/tome/data/zones/crypt-kryl-feijan/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/dreadfell/traps.lua b/game/modules/tome/data/zones/dreadfell/traps.lua index b67dac6f8d625bbe082da960b9356181e3d1aa46..cb70b58153d7a7a1f2002ddd8b427b4921b5432a 100644 --- a/game/modules/tome/data/zones/dreadfell/traps.lua +++ b/game/modules/tome/data/zones/dreadfell/traps.lua @@ -17,6 +17,6 @@ -- Nicolas Casalini "DarkGod" -- 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/alarm.lua") diff --git a/game/modules/tome/data/zones/halfling-ruins/traps.lua b/game/modules/tome/data/zones/halfling-ruins/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/halfling-ruins/traps.lua +++ b/game/modules/tome/data/zones/halfling-ruins/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/high-peak/traps.lua b/game/modules/tome/data/zones/high-peak/traps.lua index b67dac6f8d625bbe082da960b9356181e3d1aa46..cb70b58153d7a7a1f2002ddd8b427b4921b5432a 100644 --- a/game/modules/tome/data/zones/high-peak/traps.lua +++ b/game/modules/tome/data/zones/high-peak/traps.lua @@ -17,6 +17,6 @@ -- Nicolas Casalini "DarkGod" -- 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/alarm.lua") diff --git a/game/modules/tome/data/zones/illusory-castle/traps.lua b/game/modules/tome/data/zones/illusory-castle/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/illusory-castle/traps.lua +++ b/game/modules/tome/data/zones/illusory-castle/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/infinite-dungeon/traps.lua b/game/modules/tome/data/zones/infinite-dungeon/traps.lua index bc3296681ef08696d0894ae312baed91547cb710..8ff8ca64a9675c4d07de5138c81a4f8754b5cfa7 100644 --- a/game/modules/tome/data/zones/infinite-dungeon/traps.lua +++ b/game/modules/tome/data/zones/infinite-dungeon/traps.lua @@ -18,5 +18,6 @@ -- 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/natural_forest.lua") diff --git a/game/modules/tome/data/zones/maze/traps.lua b/game/modules/tome/data/zones/maze/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/maze/traps.lua +++ b/game/modules/tome/data/zones/maze/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/paradox-plane/traps.lua b/game/modules/tome/data/zones/paradox-plane/traps.lua index 3d9b489391178cdeac8d9734c3c0d635ab53101d..7b9123b05edfe8ce0ef9d91b16205100fbae1da5 100644 --- a/game/modules/tome/data/zones/paradox-plane/traps.lua +++ b/game/modules/tome/data/zones/paradox-plane/traps.lua @@ -17,5 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") load("/data/general/traps/alarm.lua") diff --git a/game/modules/tome/data/zones/reknor-escape/traps.lua b/game/modules/tome/data/zones/reknor-escape/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/reknor-escape/traps.lua +++ b/game/modules/tome/data/zones/reknor-escape/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/reknor/traps.lua b/game/modules/tome/data/zones/reknor/traps.lua index 3d9b489391178cdeac8d9734c3c0d635ab53101d..ea9c0b4b32ba31ec692d3c3081faf0226d0efc25 100644 --- a/game/modules/tome/data/zones/reknor/traps.lua +++ b/game/modules/tome/data/zones/reknor/traps.lua @@ -17,5 +17,5 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") load("/data/general/traps/alarm.lua") diff --git a/game/modules/tome/data/zones/rhaloren-camp/traps.lua b/game/modules/tome/data/zones/rhaloren-camp/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/rhaloren-camp/traps.lua +++ b/game/modules/tome/data/zones/rhaloren-camp/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/ring-of-blood/traps.lua b/game/modules/tome/data/zones/ring-of-blood/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/ring-of-blood/traps.lua +++ b/game/modules/tome/data/zones/ring-of-blood/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/ruined-dungeon/traps.lua b/game/modules/tome/data/zones/ruined-dungeon/traps.lua index bc3296681ef08696d0894ae312baed91547cb710..3481105a5b11d6bdc932748bbed4e48dbf5872df 100644 --- a/game/modules/tome/data/zones/ruined-dungeon/traps.lua +++ b/game/modules/tome/data/zones/ruined-dungeon/traps.lua @@ -17,6 +17,6 @@ -- Nicolas Casalini "DarkGod" -- 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/natural_forest.lua") diff --git a/game/modules/tome/data/zones/ruins-kor-pul/traps.lua b/game/modules/tome/data/zones/ruins-kor-pul/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/ruins-kor-pul/traps.lua +++ b/game/modules/tome/data/zones/ruins-kor-pul/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/shadow-crypt/traps.lua b/game/modules/tome/data/zones/shadow-crypt/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/shadow-crypt/traps.lua +++ b/game/modules/tome/data/zones/shadow-crypt/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/tannen-tower/traps.lua b/game/modules/tome/data/zones/tannen-tower/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/tannen-tower/traps.lua +++ b/game/modules/tome/data/zones/tannen-tower/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/telmur/traps.lua b/game/modules/tome/data/zones/telmur/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/telmur/traps.lua +++ b/game/modules/tome/data/zones/telmur/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/tempest-peak/traps.lua b/game/modules/tome/data/zones/tempest-peak/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/tempest-peak/traps.lua +++ b/game/modules/tome/data/zones/tempest-peak/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/unremarkable-cave/traps.lua b/game/modules/tome/data/zones/unremarkable-cave/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..58ee61831634d0e15d5d747b666aa8191ea763a6 100644 --- a/game/modules/tome/data/zones/unremarkable-cave/traps.lua +++ b/game/modules/tome/data/zones/unremarkable-cave/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/complex.lua") diff --git a/game/modules/tome/data/zones/valley-moon/traps.lua b/game/modules/tome/data/zones/valley-moon/traps.lua index 3764c090a4cd639cd613c5d1863c7ca965af18ec..47c172b72bc64362e8ac54797c40d75079ecdc18 100644 --- a/game/modules/tome/data/zones/valley-moon/traps.lua +++ b/game/modules/tome/data/zones/valley-moon/traps.lua @@ -17,4 +17,4 @@ -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/traps/elemental.lua") +load("/data/general/traps/natural_forest.lua") diff --git a/game/modules/tome/data/zones/vor-armoury/traps.lua b/game/modules/tome/data/zones/vor-armoury/traps.lua index 079b6644bf8f102e68712189ff4d66395122860f..1fb99c0a8e96894f9bf084becc60dffaf1d9b97a 100644 --- a/game/modules/tome/data/zones/vor-armoury/traps.lua +++ b/game/modules/tome/data/zones/vor-armoury/traps.lua @@ -17,7 +17,7 @@ -- Nicolas Casalini "DarkGod" -- 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/alarm.lua") load("/data/general/traps/teleport.lua")