Added more lore

Flameshock has got a cooldown again, oups!


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

game/engines/default/engine/utils.lua

@@ -573,7 +573,7 @@ function tstring:splitLines(max_width, font)
 			ret[#ret+1] = v
 		elseif tv == "table" and v[1] == "uid" then
 			local e = __uids[v[2]]
-			if e then
+			if e and game.level then
 				local surf = e:getEntityFinalSurface(game.level.map.tiles, font:lineSkip(), font:lineSkip())
 				if surf then
 					local w, h = surf:getSize()

game/modules/tome/data/general/grids/forest.lua

@@ -64,7 +64,7 @@ newEntity{
 	define_as = "TREE_DARK"..i,
 	name = "tree", image = "terrain/grass_dark1.png",
 	force_clone = true,
-	add_displays = class:makeTrees("terrain/tree_alpha"),
+	add_displays = class:makeTrees("terrain/tree_dark_alpha"),
 	display = '#', color=colors.GREEN, back_color={r=44,g=95,b=43},
 	always_remember = true,
 	can_pass = {pass_tree=1},
@@ -79,7 +79,7 @@ newEntity{
 	define_as = "HARDTREE_DARK"..i,
 	name = "tall thick tree", image = "terrain/grass_dark1.png",
 	force_clone = true,
-	add_displays = class:makeTrees("terrain/tree_alpha"),
+	add_displays = class:makeTrees("terrain/tree_dark_alpha"),
 	display = '#', color=colors.GREEN, back_color={r=44,g=95,b=43},
 	always_remember = true,
 	does_block_move = true,

game/modules/tome/data/general/objects/lore/spellhunt.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+newEntity{ base = "BASE_SCROLL",
+	name = "memories of archmage Varil", lore="spellhunt-note-1", unique=true,
+	desc = [[A collection of thoughts and memories of the archmage Varil, during the Age of Dusk]],
+	rarity = 20,
+	is_magic_device = false,
+	encumberance = 0,
+}

game/modules/tome/data/general/objects/objects.lua

@@ -79,6 +79,9 @@ loadIfNot("/data/general/objects/leather-belt.lua")
 -- Mounts
 loadIfNot("/data/general/objects/mounts.lua")
 
+-- Lore
+loadIfNot("/data/general/objects/lore/spellhunt.lua")
+
 -- Artifacts
 loadIfNot("/data/general/objects/world-artifacts.lua")
 loadIfNot("/data/general/objects/quest-artifacts.lua")

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

@@ -20,3 +20,4 @@
 load("/data/lore/trollshaws.lua")
 load("/data/lore/tol-falas.lua")
 load("/data/lore/sunwall.lua")
+load("/data/lore/spellhunt.lua")

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

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+
+newLore{
+	id = "spellhunt-note-1",
+	category = "age of dusk",
+	name = "memories of archmage Varil",
+	lore = [[
+From an objective viewpoint, you would think the Spellhunt futile, but it was not so. You couldn't imagine the barbarism of the magehunting mobs; they would abuse and persectute any they saw as eccentric, many of whom had no connection to magic at all.
+...
+True mages would sometimes speak up in an act of altruism, just to stop the suffering of the innocent, but this only fuelled the horde's anger...
+...
+Other mages, those less forgiving and more given to action, would attack the roving mobs, but they soon learnt that against sufficent numbers magic is not omnipotent...
+...
+Ones I saw were set upon by dozens, their conjured flames and bolts of energy failing against the maddened crowds... they would often literally rip the mage limb from limb. It was horrific.
+...
+Angolwen, Linaniil calls it. I have known Linaniil for many years, and I know she has lost many loved ones to the Spellhunt, but she still holds true to her belief that one day we will be accepted once again. If this is the course of action she desires, I will follow her without question.]],
+}

game/modules/tome/data/maps/wilderness/maj-eyal.lua

@@ -30,7 +30,7 @@ quickEntity('#', {always_remember = true, show_tooltip=true, name='Iron Throne',
 quickEntity('T', {always_remember = true, show_tooltip=true, name='forest', force_clone=true, display='#', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/grass.png", resolvers.generic(function(e) e.add_displays = e:makeTrees("terrain/tree_alpha") end), block_move=true})
 quickEntity('t', {always_remember = true, show_tooltip=true, name='cold forest', display='#', color=colors.LIGHT_GREEN, back_color=colors.DARK_GREEN, image="terrain/rocky_snowy_tree.png", block_move=true})
 quickEntity('_', {always_remember = true, show_tooltip=true, name='burnt forest', display='#', color=colors.UMBER, back_color=colors.DARK_GREY, image="terrain/burnt-tree.png", block_move=true})
-quickEntity('v', {always_remember = true, show_tooltip=true, name='old forest', force_clone=true, display='#', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/grass_dark1.png", resolvers.generic(function(e) e.add_displays = e:makeTrees("terrain/tree_alpha") end), block_move=true})
+quickEntity('v', {always_remember = true, show_tooltip=true, name='old forest', force_clone=true, display='#', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/grass_dark1.png", resolvers.generic(function(e) e.add_displays = e:makeTrees("terrain/tree_dark_alpha") end), block_move=true})
 
 quickEntity('.', {always_remember = true, show_tooltip=true, name='plains', display='.', color=colors.LIGHT_GREEN, back_color=colors.DARK_GREEN, image="terrain/grass.png", can_encounter=true, equilibrium_level=-10})
 quickEntity('|', {always_remember = true, show_tooltip=true, name='desert', display='.', color={r=203,g=189,b=72}, back_color={r=163,g=149,b=42}, image="terrain/sand.png", can_encounter="desert", equilibrium_level=-10})

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

@@ -53,7 +53,7 @@ newTalent{
 	points = 5,
 	random_ego = "attack",
 	mana = 30,
---	cooldown = 18,
+	cooldown = 18,
 	tactical = {
 		ATTACKAREA = 10,
 	},

game/modules/tome/data/zones/ardhungol/objects.lua

@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 load("/data/general/objects/objects-far-east.lua")
-load("/data/general/objects/lore-sunwall.lua")
+load("/data/general/objects/lore/sunwall.lua")
 
 newEntity{ base = "BASE_WAND",
 	define_as = "ROD_SPYDRIC_POISON",

game/modules/tome/data/zones/eruan/objects.lua

@@ -18,4 +18,4 @@
 -- darkgod@te4.org
 
 load("/data/general/objects/objects-far-east.lua")
-load("/data/general/objects/lore-sunwall.lua")
+load("/data/general/objects/lore/sunwall.lua")

game/modules/tome/data/zones/gorbat-pride/objects.lua

@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 load("/data/general/objects/objects-far-east.lua")
-load("/data/general/objects/lore-sunwall.lua")
+load("/data/general/objects/lore/sunwall.lua")
 
 local Talents = require("engine.interface.ActorTalents")
 local Stats = require"engine.interface.ActorStats"

game/modules/tome/data/zones/grushnak-pride/objects.lua

@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 load("/data/general/objects/objects-far-east.lua")
-load("/data/general/objects/lore-sunwall.lua")
+load("/data/general/objects/lore/sunwall.lua")
 
 local Talents = require"engine.interface.ActorTalents"
 local Stats = require"engine.interface.ActorStats"

game/modules/tome/data/zones/high-peak/objects.lua

@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 load("/data/general/objects/objects-far-east.lua")
-load("/data/general/objects/lore-sunwall.lua")
+load("/data/general/objects/lore/sunwall.lua")
 
 local Stats = require "engine.interface.ActorStats"
 

game/modules/tome/data/zones/rak-shor-pride/objects.lua

@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 load("/data/general/objects/objects-far-east.lua")
-load("/data/general/objects/lore-sunwall.lua")
+load("/data/general/objects/lore/sunwall.lua")
 
 local Stats = require"engine.interface.ActorStats"