From b18607ab8b1aea824dbbe425ebcc93f8f5c790eb Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 30 Nov 2012 09:07:39 +0000
Subject: [PATCH] Gloom stun works liek other stuns, it cant put instant
talents on cooldown
git-svn-id: http://svn.net-core.org/repos/t-engine4@5864 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/version.lua | 2 +-
game/engines/default/modules/boot/init.lua | 4 ++--
game/modules/example/init.lua | 2 +-
game/modules/example_realtime/init.lua | 2 +-
game/modules/gruesome/init.lua | 2 +-
game/modules/tome/data/timed_effects/mental.lua | 2 +-
game/modules/tome/init.lua | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/game/engines/default/engine/version.lua b/game/engines/default/engine/version.lua
index d50ae37c4b..72ca4847b2 100644
--- a/game/engines/default/engine/version.lua
+++ b/game/engines/default/engine/version.lua
@@ -18,7 +18,7 @@
-- darkgod@te4.org
-- Engine Version
-engine.version = {0,9,43,"te4",17}
+engine.version = {0,9,44,"te4",17}
engine.require_c_core = engine.version[5]
engine.version_id = ("%s-%d_%d.%d.%d"):format(engine.version[4], engine.require_c_core, engine.version[1], engine.version[2], engine.version[3])
diff --git a/game/engines/default/modules/boot/init.lua b/game/engines/default/modules/boot/init.lua
index 3806c540ac..e898ba48a4 100644
--- a/game/engines/default/modules/boot/init.lua
+++ b/game/engines/default/modules/boot/init.lua
@@ -23,8 +23,8 @@ short_name = "boot"
author = { "DarkGod", "darkgod@te4.org" }
homepage = "http://te4.org/"
is_boot = true
-version = {0,9,40}
-engine = {0,9,40,"te4"}
+version = {0,9,44}
+engine = {0,9,44,"te4"}
description = [[
Bootmenu!
]]
diff --git a/game/modules/example/init.lua b/game/modules/example/init.lua
index acccf8ded9..a8c1fa4d97 100644
--- a/game/modules/example/init.lua
+++ b/game/modules/example/init.lua
@@ -23,7 +23,7 @@ short_name = "example"
author = { "DarkGod", "darkgod@te4.org" }
homepage = "http://te4.org/modules:example"
version = {1,0,0}
-engine = {0,9,43,"te4"}
+engine = {0,9,44,"te4"}
description = [[
This is *NOT* a game, just an example/template to make your own using the T-Engine4.
]]
diff --git a/game/modules/example_realtime/init.lua b/game/modules/example_realtime/init.lua
index dc93de2a16..f128a48595 100644
--- a/game/modules/example_realtime/init.lua
+++ b/game/modules/example_realtime/init.lua
@@ -23,7 +23,7 @@ short_name = "example_realtime"
author = { "DarkGod", "darkgod@te4.org" }
homepage = "http://te4.org/modules:example"
version = {1,0,0}
-engine = {0,9,43,"te4"}
+engine = {0,9,44,"te4"}
description = [[
This is *NOT* a game, just an example/template to make your own using the T-Engine4.
]]
diff --git a/game/modules/gruesome/init.lua b/game/modules/gruesome/init.lua
index 2024df2a83..1e3c6703c2 100644
--- a/game/modules/gruesome/init.lua
+++ b/game/modules/gruesome/init.lua
@@ -23,7 +23,7 @@ short_name = "gruesome"
author = { "Darren Grey", "darrenjohngrey@hotmail.com" }
homepage = "http://gruesomegames.com/"
version = {1,0,0}
-engine = {0,9,37,"te4"}
+engine = {0,9,44,"te4"}
description = [[
"It is pitch black. You are likely to eat someone..."
diff --git a/game/modules/tome/data/timed_effects/mental.lua b/game/modules/tome/data/timed_effects/mental.lua
index 8ee59d723e..a5b616ca66 100644
--- a/game/modules/tome/data/timed_effects/mental.lua
+++ b/game/modules/tome/data/timed_effects/mental.lua
@@ -260,7 +260,7 @@ newEffect{
local tids = {}
for tid, lev in pairs(self.talents) do
local t = self:getTalentFromId(tid)
- if t and not self.talents_cd[tid] and t.mode == "activated" and not t.innate then tids[#tids+1] = t end
+ if t and not self.talents_cd[tid] and t.mode == "activated" and not t.innate and t.no_energy ~= true then tids[#tids+1] = t end
end
for i = 1, 4 do
local t = rng.tableRemove(tids)
diff --git a/game/modules/tome/init.lua b/game/modules/tome/init.lua
index 73bf82ae69..5ad2869add 100644
--- a/game/modules/tome/init.lua
+++ b/game/modules/tome/init.lua
@@ -22,8 +22,8 @@ long_name = "Tales of Maj'Eyal: Age of Ascendancy"
short_name = "tome"
author = { "DarkGod", "darkgod@te4.org" }
homepage = "http://te4.org/"
-version = {0,9,43}
-engine = {0,9,43,"te4"}
+version = {0,9,44}
+engine = {0,9,44,"te4"}
description = [[
Welcome to Maj'Eyal.
--
GitLab