From b5a9bad3bc7b90902f1b2f8ea7c9e1f2e96447bb Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Thu, 12 Dec 2013 22:05:25 +0100
Subject: [PATCH] bump to 1.1.0
---
game/engines/default/engine/version.lua | 8 ++++++--
game/modules/example/init.lua | 4 ++--
game/modules/tome/data/talents/spells/animus.lua | 1 +
game/modules/tome/init.lua | 4 ++--
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/game/engines/default/engine/version.lua b/game/engines/default/engine/version.lua
index 4efbf03404..6aacd8b6ee 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 = {1,0,6,"te4",17}
+engine.version = {1,1,0,"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])
@@ -46,6 +46,10 @@ function engine.version_compare(v, ev)
end
function engine.version_nearly_same(v, ev)
- if v[1] == ev[1] and v[2] == ev[2] and v[3] >= ev[3] then return true end
+ if v[1] == ev[1] then
+ if v[2] == ev[2] and v[3] >= ev[3] then return true
+ elseif v[2] >= ev[2] then return true
+ end
+ end
return false
end
diff --git a/game/modules/example/init.lua b/game/modules/example/init.lua
index 47e79cf9fd..efa3c5d262 100644
--- a/game/modules/example/init.lua
+++ b/game/modules/example/init.lua
@@ -22,8 +22,8 @@ long_name = "Example Module for T-Engine4"
short_name = "example"
author = { "DarkGod", "darkgod@te4.org" }
homepage = "http://te4.org/modules:example"
-version = {1,0,6}
-engine = {1,0,6,"te4"}
+version = {1,1,0}
+engine = {1,1,0,"te4"}
description = [[
This is *NOT* a game, just an example/template to make your own using the T-Engine4.
]]
diff --git a/game/modules/tome/data/talents/spells/animus.lua b/game/modules/tome/data/talents/spells/animus.lua
index b24909af29..7025072624 100644
--- a/game/modules/tome/data/talents/spells/animus.lua
+++ b/game/modules/tome/data/talents/spells/animus.lua
@@ -144,6 +144,7 @@ newTalent{
m.clone_on_hit = nil
if m:knowTalent(m.T_BONE_SHIELD) then m:unlearnTalent(m.T_BONE_SHIELD, m:getTalentLevelRaw(m.T_BONE_SHIELD)) end
if m:knowTalent(m.T_MULTIPLY) then m:unlearnTalent(m.T_MULTIPLY, m:getTalentLevelRaw(m.T_MULTIPLY)) end
+ if m:knowTalent(m.T_SUMMON) then m:unlearnTalent(m.T_SUMMON, m:getTalentLevelRaw(m.T_SUMMON)) end
m.no_points_on_levelup = true
m.faction = self.faction
diff --git a/game/modules/tome/init.lua b/game/modules/tome/init.lua
index 5082f11e67..285d7f4a73 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 = {1,0,6}
-engine = {1,0,6,"te4"}
+version = {1,1,0}
+engine = {1,1,0,"te4"}
description = [[
Welcome to Maj'Eyal.
--
GitLab