moar

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

game/engines/default/engine/generator/map/Forest.lua

@@ -184,17 +184,19 @@ function _M:generate(lev, old_lev)
 	local nb_room = util.getval(self.data.nb_rooms or 0)
 	local rooms = {}
 	local end_room
-	local axis
-	local direction
+	local axis = "x"
+	local direction = 1
 	local ending
 
 	-- get the axis and direction
-	if self.data.edge_entrances[1] == 2 or self.data.edge_entrances[1] == 8 then axis = "y"
-	else axis = "x"
-	end
+	if self.data.edge_entrances then
+		if self.data.edge_entrances[1] == 2 or self.data.edge_entrances[1] == 8 then axis = "y"
+		else axis = "x"
+		end
 
-	if self.data.edge_entrances[1] == 2 or self.data.edge_entrances[1] == 4 then direction = 1
-	else direction = -1
+		if self.data.edge_entrances[1] == 2 or self.data.edge_entrances[1] == 4 then direction = 1
+		else direction = -1
+		end
 	end
 
 	-- Add the "requested" end room first (must be at least 66% into the level)

game/modules/tome/data/general/npcs/naga.lua

@@ -56,8 +56,7 @@ newEntity{
 
 newEntity{ base = "BASE_NPC_NAGA",
 	name = "naga myrmidon", color=colors.DARK_UMBER, image="npc/naga_myrmidon.png",
-	desc = [[A naga warrior, wielding a menacing trident.
-Myrmidons are the most devoted warriors of the nagas.]],
+	desc = [[Before you stands a tall figure - a very tall figure, propped high by a thick serpent's tail in place of where his legs should rightly be. His torso is human-like, with bulging muscles beneath fitted armour, and large hands gripping a fiercely sharp trident. He glares at you with dark intensity, like a wolf about to pounce on unsuspecting prey.]],
 	level_range = {30, nil}, exp_worth = 1,
 	rarity = 1,
 	max_life = resolvers.rngavg(120,150), life_rating = 16,
@@ -77,8 +76,7 @@ Myrmidons are the most devoted warriors of the nagas.]],
 
 newEntity{ base = "BASE_NPC_NAGA",
 	name = "naga tide huntress", color=colors.RED, image="npc/naga_tide_huntress.png",
-	desc = [[A naga hunter, wielding a long bow.
-Tide huntresses wield both magic and hunting skills, making them terrible foes.]],
+	desc = [[Though the sharp point of an arrow pointed steadily at your head is of concern, more unnerving is the creature that wields it. A slim and lithe woman from the waist up, but a terrifying giant serpent beneath, her tail stretching for several feet behind her. Her eyes turn cold and ice seems to magically condense on the tip of her barbed arrow. Suddenly it is of concern again.]],
 	level_range = {34, nil}, exp_worth = 1,
 	rarity = 4,
 	rank = 3,
@@ -104,8 +102,7 @@ Tide huntresses wield both magic and hunting skills, making them terrible foes.]
 
 newEntity{ base = "BASE_NPC_NAGA",
 	name = "naga psyren", color=colors.YELLOW, image="npc/naga_psyren.png",
-	desc = [[A naga psyren; she looks at you with great intensity.
-Psyrens are dangerous nagas that can directly assault your mind.]],
+	desc = [[Such a mix of enchanting beauty and reviling horror you have never before seen combined. Above, a beautiful, ethereal woman, of scant form and entrancing grace. Below, the thick, smooth scales of a snake, its stretched tail gently waving back and forth in the air behind her. The movement is eye-catching and hypnotic, and whilst you watch a mysterious smile plays across her seductive lips.]],
 	level_range = {36, nil}, exp_worth = 1,
 	rarity = 4,
 	rank = 3,

game/modules/tome/data/rooms/zones/zoisla.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011 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
+
+return function(gen, id)
+	local w = 4
+	local h = 4
+	return { name="zoisla"..w.."x"..h, w=w, h=h, generator = function(self, x, y, is_lit)
+		local spots = {}
+		for i = 1, self.w do
+			for j = 1, self.h do
+				gen.map.room_map[i-1+x][j-1+y].room = id
+				gen.map(i-1+x, j-1+y, Map.TERRAIN, gen:resolve('near_portal'))
+
+				spots[#spots+1] = {x=i-1+x, y=j-1+y}
+			end
+		end
+
+		local s = rng.tableRemove(spots)
+		gen.map(s.x, s.y, Map.TERRAIN, gen:resolve('portal'))
+		print("Zoisla portal at", s.x, s.y)
+
+		local s = rng.tableRemove(spots)
+		gen.spots[#gen.spots+1] = {x=s.x, y=s.y, type="guardian", subtype="guardian"}
+	end}
+end

game/modules/tome/data/texts/intro-sunwall.lua

@@ -18,9 +18,9 @@
 -- darkgod@te4.org
 
 return [[Welcome #LIGHT_GREEN#@name@#WHITE#.
-You are a valiant defender of the Sunwall. For most of your live you have fought and repelled the Orc Prides onslaught.
-But the situation is growing dire, nagas have been sighted in the slazish fens on the other side of the sunwall mountains.
-Fearing an invasion, High Sun Paladin Aeryn sent you to investigate and deal with the threat.
+You are a citizen of the Sunwall, and like many of your age you have been trained in combat and magic. It can be a harsh life, and though you dream at times of venturing to distant lands you know your duty is to help defend the outpost against the vicious onslaught from the Orc Prides. But now High Sun Paladin Aeryn has advised you of a new threat.
 
-Stop the invading troops!
+Nagas have been sighted in the Slazish Fens on the other side of the Sunwall Mountains. Their objective is unclear, but an assault from both sides would be truly devastating at such a pivotal time for your people. Though there are few forces to spare on the front line against the Prides, you have volunteered to investigate the naga threat and stop them if need be.
+
+By the power of the Sun and the blessings of the Moon you step forth to find your fate.
 ]]

game/modules/tome/data/zones/slazish-fen/grids.lua

@@ -49,3 +49,14 @@ newEntity{ base="BOGWATER",
 	nice_tiler = { method="replace", base={"BOGWATER_MISC", 100, 1, 7}},
 }
 for i = 1, 7 do newEntity{ base="BOGWATER_MISC", define_as = "BOGWATER_MISC"..i, add_mos={{image="terrain/misc_bog"..i..".png"}}} end
+
+newEntity{ base="BOGWATER",
+	define_as = "PORTAL",
+	add_displays = {class.new{z=18, image="terrain/naga_portal.png", display_h=2, display_y=-1}},
+	does_block_move = true,
+	pass_projectile = true,
+	block_move = function(self, x, y, who, act, couldpass)
+		if not who or not who.player or not act then return true end
+		return true
+	end,
+}

game/modules/tome/data/zones/slazish-fen/npcs.lua

@@ -65,7 +65,7 @@ newEntity{
 
 newEntity{ base = "BASE_NPC_NAGA",
 	name = "naga tidewarden", color=colors.DARK_UMBER,
-	desc = [[A naga warrior, wielding a menacing trident.]],
+	desc = [[Before you stands a tall figure, propped high by a serpent's tail in place of where his legs should rightly be. His torso is slim and muscular, and his face has an elven beauty to it, framed by locks of blonde hair. But there is a fierceness to this creature too, and his bright eyes veil a smouldering anger.]],
 	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/humanoid_naga_naga_tidewarden.png", display_h=2, display_y=-1}}},
 	level_range = {1, nil}, exp_worth = 3,
 	rarity = 1,
@@ -79,27 +79,45 @@ newEntity{ base = "BASE_NPC_NAGA",
 }
 
 newEntity{ base = "BASE_NPC_NAGA",
-	name = "naga mage", color=colors.DARK_UMBER,
-	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/humanoid_naga_naga_mage.png", display_h=2, display_y=-1}}},
-	desc = [[A naga mage, casting water spells at you.]],
+	name = "naga tidecaller", color=colors.BLUE,
+	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/humanoid_naga_naga_tidecaller.png", display_h=2, display_y=-1}}},
+	desc = [[A slithering noise accompanies the movement of this strange creature, whose snake-like tail gives rise to the body of a beautiful elf-like woman. As she moves her delicate hands water rises from the ground, and you feel that here is no mere monster, but a creature of awe and power.]],
 	level_range = {2, nil}, exp_worth = 3, female = true,
 	rarity = 1,
 	max_life = resolvers.rngavg(50,60), life_rating = 10,
+	autolevel = "caster",
 	resolvers.equip{
 		{type="weapon", subtype="staff", autoreq=true},
 	},
 	resolvers.talents{
-		[Talents.T_SPIT_POISON]={base=1, every=10, max=5},
-		[Talents.T_WATER_JET]={base=1, every=10, max=5},
+		[Talents.T_SPIT_POISON]={base=2, every=7, max=5},
+		[Talents.T_WATER_JET]={base=2, every=7, max=5},
+	},
+}
+
+newEntity{ base = "BASE_NPC_NAGA",
+	name = "naga nereid", color=colors.YELLOW,
+	desc = [[Green eyes stare out from behind strands of long, golden hair, which falls down in waves over smooth, pale skin. Your eyes are drawn to the bare flesh, but as they look further they see dark scales stretching out into a long serpent's tail. You look up as she moves, her hair parting to reveal a slim and beautiful face with high cheekbones and full lips. Yet for all the allure of this wondrous creature the terror of the serpentine tail sends shivers down your spine.]],
+	level_range = {2, nil}, exp_worth = 3, female = true,
+	rarity = 1,
+	max_life = resolvers.rngavg(80,90), life_rating = 11,
+	autolevel = "caster",
+	resolvers.equip{
+		{type="weapon", subtype="staff", autoreq=true},
+	},
+	resolvers.talents{
+		[Talents.T_SPIT_POISON]={base=2, every=7, max=5},
+		[Talents.T_MIND_SEAR]={base=2, every=7, max=5},
+		[Talents.T_TELEKINETIC_BLAST]={base=2, every=7, max=5},
 	},
 }
 
 newEntity{ base="BASE_NPC_NAGA", define_as = "ZOISLA",
 	unique = true,
-	name = "Zoisla the Invader",
-	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/humanoid_naga_zoisla_the_invader.png", display_h=2, display_y=-1}}},
+	name = "Lady Zoisla the Tidebringer",
+	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/humanoid_naga_lady_zoisla_the_tidebringer.png", display_h=2, display_y=-1}}},
 	color=colors.VIOLET, female = true,
-	desc = [[A female naga wielding both a trident and a staff.]],
+	desc = [[Water circles slowly on the ground around this naga's tail, some droplets leaping up now and then as if they are impatient to do their mistress' bidding. Her dark tail is coiled tight, making her look short, but her calm and confident stare assure you that she will not be easily overcome. As the water begins to rise around her the air starts to simmer, and you feel her dark eyes are penetrating into you deeper than is comfortable.]],
 	killer_message = "and brougth back to Vargh for experimentations",
 	level_range = {7, nil}, exp_worth = 2,
 	max_life = 150, life_rating = 15, fixed_rating = true,
@@ -120,10 +138,11 @@ newEntity{ base="BASE_NPC_NAGA", define_as = "ZOISLA",
 		[Talents.T_SPIT_POISON]={base=2, every=10, max=5},
 		[Talents.T_WATER_BOLT]={base=2, every=10, max=5},
 		[Talents.T_MIND_SEAR]={base=2, every=10, max=5},
+		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=6, max=13},
 	},
 	resolvers.inscriptions(1, {"movement infusion"}),
 
-	autolevel = "warrior",
+	autolevel = "warriormage",
 	ai = "tactical", ai_state = { talent_in=2, ai_move="move_astar", },
 	ai_tactic = resolvers.tactic"melee",
 

game/modules/tome/data/zones/slazish-fen/zone.lua

@@ -59,6 +59,7 @@ return {
 			nb_npc = {7, 10},
 			filters = { {max_ood=2}, },
 			guardian = "ZOISLA",
+			guardia_spot = {type="guardian", subtype="guardian"},
 		},
 		object = {
 			class = "engine.generator.object.Random",
@@ -79,6 +80,9 @@ return {
 		[3] = {
 			generator = { map = {
 				force_last_stair = true,
+				end_road_room = "zones/zoisla",
+				portal = "PORTAL",
+				near_portal = "BOGWATER",
 				down = "GRASS",
 			}, },
 		},

game/modules/tome/data/zones/temple-of-creation/npcs.lua

@@ -30,7 +30,7 @@ newEntity{ define_as = "SLASUL",
 	faction="temple-of-creation",
 	display = "@", color=colors.VIOLET,
 	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/humanoid_naga_slasul.png", display_h=2, display_y=-1}}},
-	desc = [[This powerful naga is at home in the Temple of Creation, and unlike his followers he uses a mace and a shield.]],
+	desc = [[This towering naga exudes power, and radiates a certain charismatic charm as well. His masculine face stares at you with great intensity, and you struggle to meet his gaze. His torso is bare apart from an exquisite pearl set directly in his chest, and in his muscular arms he holds ready a heavy mace and shield. You sense there is more to him also, as if the very power of the ocean were concentrated in this great creature, and that the wrath of it may come flooding out at any moment.]],
 	killer_message = "and perverted into a monstrous aberration as a warning to the surface",
 	global_speed = 1.7,
 	level_range = {30, nil}, exp_worth = 4,