From 3f054f7bce9252bc2e8b8b15ea8b95e5173fce59 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 10 Nov 2011 16:10:28 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@4640 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/interface/ActorTalents.lua | 2 +-
game/modules/tome/ai/tactical.lua | 4 ++--
game/modules/tome/data/general/objects/world-artifacts.lua | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/game/engines/default/engine/interface/ActorTalents.lua b/game/engines/default/engine/interface/ActorTalents.lua
index 33a0923e15..fdf808b9a4 100644
--- a/game/engines/default/engine/interface/ActorTalents.lua
+++ b/game/engines/default/engine/interface/ActorTalents.lua
@@ -279,7 +279,7 @@ function _M:learnTalent(t_id, force, nb)
if position and not self.hotkey[position] then
self.hotkey[position] = {"talent", t_id}
else
- for i = 1, 12 * self.nb_hotkey_pages do
+ for i = 1, 12 * (self.nb_hotkey_pages or 5) do
if not self.hotkey[i] then
self.hotkey[i] = {"talent", t_id}
break
diff --git a/game/modules/tome/ai/tactical.lua b/game/modules/tome/ai/tactical.lua
index a49eba1765..d7c57c5d13 100644
--- a/game/modules/tome/ai/tactical.lua
+++ b/game/modules/tome/ai/tactical.lua
@@ -19,7 +19,7 @@
local DamageType = require "engine.DamageType"
---local print = function() end
+local print = function() end
-- Internal functions
local checkLOS = function(sx, sy, tx, ty)
@@ -316,7 +316,7 @@ newAI("use_tactical", function(self)
table.sort(avail.defend, function(a,b) return a.val > b.val end)
want.defend = 1 + need_heal / 2 + nb_foes_seen * 0.5
end
-
+
-- Need cure (remove detrimental effects)
local nb_detrimental_effs = 0
for eff_id, p in pairs(self.tmp) do
diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua
index 951b4ebfd5..dbf54f6aee 100644
--- a/game/modules/tome/data/general/objects/world-artifacts.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts.lua
@@ -1470,7 +1470,7 @@ newEntity{ base = "BASE_GEM",
game.logPlayer(who, "The fusing fails!")
end
end)
- return true
+ return {id=true, used=true}
end },
}
--
GitLab