fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@3748 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Game.lua

@@ -971,7 +971,16 @@ function _M:setupCommands()
 --]]
 		end end,
 		[{"_g","ctrl"}] = function() if config.settings.cheat then
-			self.state:debugRandomZone()
+			game.player:learnLore("shertul-fortress-9")
+			game.player:learnLore("shertul-fortress-8")
+			game.player:learnLore("shertul-fortress-7")
+			game.player:learnLore("shertul-fortress-6")
+			game.player:learnLore("shertul-fortress-5")
+			game.player:learnLore("shertul-fortress-4")
+			game.player:learnLore("shertul-fortress-3")
+			game.player:learnLore("shertul-fortress-2")
+			game.player:learnLore("shertul-fortress-1")
+--			self.state:debugRandomZone()
 --			local m = game.zone:makeEntity(game.level, "actor", {random_boss=true}, nil, true)
 --			if m then game.zone:addEntity(game.level, m, "actor", game.player.x, game.player.y + 1) end
 --			self:changeLevel(1, "test")

game/modules/tome/data/lore/lore.lua

@@ -37,6 +37,7 @@ load("/data/lore/sunwall.lua")
 load("/data/lore/spellhunt.lua")
 load("/data/lore/spellblaze.lua")
 load("/data/lore/orc-prides.lua")
+load("/data/lore/shertul.lua")
 load("/data/lore/age-allure.lua")
 load("/data/lore/age-pyre.lua")
 load("/data/lore/fearscape.lua")

game/modules/tome/data/talents/celestial/glyphs.lua

@@ -236,7 +236,7 @@ newTalent{
 	tactical = { DISABLE = 2 },
 	requires_target = true,
 	range = function(self, t) return math.floor (self:getTalentLevel(t)) end,
-	getSlow = function(self, t) return math.max(self:getTalentLevel(t) * 0.07 + 0.2, 0.65) end,
+	getSlow = function(self, t) return math.min(self:getTalentLevel(t) * 0.07 + 0.2, 0.65) end,
 	getDuration = function(self, t) return 5 + self:getTalentLevel(t) end,
 	action = function(self, t)
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}

game/modules/tome/data/talents/chronomancy/speed-control.lua

@@ -102,7 +102,7 @@ newTalent{
 	target = function(self, t)
 		return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t)}
 	end,
-	getSlow = function(self, t) return math.max((10 + (self:combatTalentSpellDamage(t, 10, 50) * getParadoxModifier(self, pm))) / 100, 0.6) end,
+	getSlow = function(self, t) return math.min((10 + (self:combatTalentSpellDamage(t, 10, 50) * getParadoxModifier(self, pm))) / 100, 0.6) end,
 	getDuration = function(self, t) return 5 + math.ceil(self:getTalentLevel(t)) end,
 	action = function(self, t)
 		local tg = self:getTalentTarget(t)

game/modules/tome/data/talents/psionic/voracity.lua

@@ -40,7 +40,7 @@ newTalent{
 	end,
 	action = function(self, t)
 		local en = ( 3 + self:getTalentLevel(t)) * (100 + self:getWil())/100
-		local dam = math.max(0.1 + 0.03*self:getTalentLevel(t), 0.4)
+		local dam = math.min(0.1 + 0.03*self:getTalentLevel(t), 0.4)
 		local tg = self:getTalentTarget(t)
 		self:project(tg, self.x, self.y, function(tx, ty)
 			local act = game.level.map(tx, ty, engine.Map.ACTOR)

game/modules/tome/data/talents/spells/temporal.lua

@@ -31,7 +31,7 @@ newTalent{
 	range = 6,
 	direct_hit = true,
 	requires_target = true,
-	getSlow = function(self, t) return math.max(self:getTalentLevel(t) * 0.08, 0.6) end,
+	getSlow = function(self, t) return math.min(self:getTalentLevel(t) * 0.08, 0.6) end,
 	action = function(self, t)
 		local tg = {type="beam", range=self:getTalentRange(t), talent=t, display={particle="bolt_arcane"}}
 		local x, y = self:getTarget(tg)

game/modules/tome/dialogs/LorePopup.lua

@@ -21,6 +21,7 @@ require "engine.class"
 local Dialog = require "engine.ui.Dialog"
 local ListColumns = require "engine.ui.ListColumns"
 local TextzoneList = require "engine.ui.TextzoneList"
+local Image = require "engine.ui.Image"
 local Separator = require "engine.ui.Separator"
 
 module(..., package.seeall, class.inherit(Dialog))
@@ -54,9 +55,16 @@ function _M:init(l, w, force_height)
 	}
 	c_text:setTextShadow(false)
 
-	self:loadUI{
-		{left = 3, top = 3, ui=c_text}
-	}
+	local uis = { {left = 3, top = 3, ui=c_text} }
+	if l.image then
+		local image = Image.new{file="lore/"..l.image, auto_width=true, auto_height=true}
+		uis = {
+			{hcenter = 0, top = 3, ui=image},
+			{left = 3, top = 3 + image.h, ui=c_text},
+		}
+	end
+
+	self:loadUI(uis)
 	self.key:addBind("EXIT", function() game:unregisterDialog(self) if fct then fct() end end)
 	self.key:addBind("ACCEPT", function() game:unregisterDialog(self) if fct then fct() end end)
 	self:setupUI(true, true)