Aeryn will correctly complete the "Many prides of the orcs" quest

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

game/modules/tome/data/chats/gates-of-morning-main.lua

@@ -22,6 +22,7 @@ newChat{ id="welcome",
 	answers = {
 		{"Tell me more about the Gates of Morning.", jump="explain-gates"},
 		{"I need help in my hunt for clues about the staff.", jump="clues", cond=function(npc, player) return not player:hasQuest("orc-pride") end},
+		{"I have destroyed the leaders of all the Orc Prides.", jump="prides-dead", cond=function(npc, player) return player:isQuestStatus("orc-pride", engine.Quest.COMPLETED) end},
 		{"I am back from Mount Doom, where the orcs took the staff.", jump="mount-doom", cond=function(npc, player) return player:hasQuest("mount-doom") and player:hasQuest("mount-doom"):isCompleted() end},
 		{"Sorry, I have to go!"},
 	}

game/modules/tome/data/quests/escort-duty.lua

@@ -310,6 +310,7 @@ on_grant = function(self, who)
 	-- Spawn actor
 	local npc = mod.class.NPC.new(self.kind.actor)
 	npc:resolve() npc:resolve(nil, true)
+	npc.x, npc.y = x, y
 	self.kind.actor = nil
 
 	-- Spawn the portal, far enough from the escort
@@ -332,6 +333,7 @@ on_grant = function(self, who)
 	g:resolve() g:resolve(nil, true)
 	game.zone:addEntity(game.level, g, "terrain", gx, gy)
 	npc.escort_target = {x=gx, y=gy}
+	npc.x, npc.y = nil, nil
 	game.zone:addEntity(game.level, npc, "actor", x, y)
 
 	-- Setup quest

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

@@ -42,7 +42,7 @@ return {
 			down = "DOWN",
 			door = "DOOR",
 
-			nb_rooms = {3},
+			nb_rooms = {0,0,0,1},
 			rooms = {"lesser_vault"},
 			lesser_vaults_list = {"orc-armoury", "double-t", "dragon_lair", "hostel"},
 			lite_room_chance = 100,