continue quest line

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

game/modules/tome/class/Game.lua

@@ -480,7 +480,10 @@ function _M:setupCommands()
 --				self:changeLevel(1, "town-gates-of-morning")
 				self:changeLevel(1, "wilderness-arda-fareast")
 				game.memory_levels["wilderness-arda-fareast-1"] = game.level
+				self.player:grantQuest("spydric-infestation")
+				self.player:setQuestStatus("spydric-infestation", engine.Quest.COMPLETED)
 				self.player:grantQuest("orc-pride")
+				self.player:setQuestStatus("orc-pride", engine.Quest.COMPLETED)
 --				self.player:grantQuest("escort-duty")
 			end
 		end,

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 to hunt for clue about the staff.", jump="clues", cond=function(npc, player) return not player:hasQuest("orc-pride") end},
+		{"The Prides are no more, their masters lay dead.", jump="prides-dead", cond=function(npc, player) return player:hasQuest("orc-pride") and player:hasQuest("orc-pride"):isCompleted() 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!"},
 	}
@@ -38,12 +39,28 @@ The name comes from the earliest days of the world when the world was flat and t
 	},
 }
 
+newChat{ id="prides-dead",
+	text = [[The news has indeed reached me, I could not believe it, for so long have we been at war with the Pride.
+Now they are dead? At the hands of just one @playerdescriptor.race@? Truly I am amazed by your power.
+While you were busy bringing their end to the orcs we managed to discover some parts of truth from a captive orc.
+He talked about the shield protecting the High Peak, it seems to be controlled by "orbs of command" which the masters of the Prides had in their possession.
+Look for them if you have not yet found them.
+He also said the only way to enter the peak and de-activate the shield is through the "slime tunnels", located somewhere in one of the Prides, probably Grushnak.
+]],
+	answers = {
+		{"Thanks my lady I will look for the tunnel and venture inside the Peak.", action=function(npc, player)
+			player:setQuestStatus("orc-pride", engine.Quest.DONE)
+			player:grantQuest("high-peak")
+		end},
+	},
+}
+
 newChat{ id="clues",
-	text = [[I much as I would like to help our forces are already spread too thin, we can not provide you direct power.
+	text = [[I much as I would like to help our forces are already spread too thin, we can not provide you with direct power.
 But I might be able to help you by explaining how the Pride is organised, we could help each others.
-Recently we have heard the pride speaking about a new master, or masters. They might be the ones behind the staff mystery of yours.
-We suppose their main place of power is the High Peek in the center of the continent but it is innaccessible and covered by some kind of shield.
-You must investigate the bastions of the Pride, maybe you will find more information about the High Peek, and any orcs you kill is one less that will attack us.
+Recently we have heard the pride speaking about a new master, or masters. They might be the ones behind that staff mystery of yours.
+We suppose their main place of power is the High Peak in the center of the continent but it is innaccessible and covered by some kind of shield.
+You must investigate the bastions of the Pride, maybe you will find more information about the High Peak, and any orcs you kill is one less that will attack us.
 The known bastions of the Pride are:
 - Rak'shor Pride, in the south west of the High Peak
 - Gorbat Pride, in the southern desert

game/modules/tome/data/maps/wilderness/arda-fareast.lua

@@ -30,7 +30,7 @@ quickEntity('m', {always_remember = true, show_tooltip=true, name='mountains', d
 quickEntity('h', {always_remember = true, show_tooltip=true, name='low hills', display='^', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/hills.png", can_encounter="plain", equilibrium_level=-10})
 
 quickEntity('A', {always_remember = true, show_tooltip=true, name="Sun Wall Outpost (Town)", display='*', color=colors.GOLD, notice = true, change_level=1, change_zone="town-sunwall-outpost"})
-quickEntity('B', {always_remember = true, show_tooltip=true, name="High Peek", display='>', color=colors.VIOLET, notice = true, change_level=1, change_zone="high_peek"})
+quickEntity('B', {always_remember = true, show_tooltip=true, name="High Peak", display='>', color=colors.VIOLET, notice = true, change_level=1, change_zone="high-peak"})
 
 quickEntity('1', {always_remember = true, show_tooltip=true, name="Gates of Morning", desc="A massive hole in the Sun Wall", display='*', color=colors.GOLD, back_color=colors.CRIMSON, image="terrain/gate-morning.png", tint=colors.GOLD, notice = true, change_level=1, change_zone="town-gates-of-morning"})
 

game/modules/tome/data/quests/high-peak.lua

+-- ToME - Tales of Middle-Earth
+-- 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
+
+name = "Falling Toward Apotheosis"
+desc = function(self, who)
+	local desc = {}
+	desc[#desc+1] = "You have vanquished the masters of the Orc Pride, now you must venture inside the most dangerous place of this world, the High Peak."
+	desc[#desc+1] = "Seek the Blue Wizards and stop them before they bend the world to their will."
+	desc[#desc+1] = "To enter you will need the four orbs of command to remove the shield over the peak."
+	desc[#desc+1] = "The entrance to the peak passes through a place called 'the slime tunnels', probably located inside or near Grushnak Pride."
+
+	return table.concat(desc, "\n")
+end
+
+on_grant = function(self, who)
+end

game/modules/tome/data/quests/master-jeweler.lua

@@ -103,7 +103,7 @@ ritual_end = function(self)
 	end
 
 	game.player:setQuestStatus(self.id, engine.Quest.COMPLETED, "limmir-survived")
-	game.player:setQuestStatus(self.id, engine.Quest.COMPLETED)
+	game.player:setQuestStatus(self.id, engine.Quest.DONE)
 
 	for i = #game.level.e_array, 1, -1 do
 		local e = game.level.e_array[i]

game/modules/tome/data/quests/orc-pride.lua

@@ -49,6 +49,12 @@ desc = function(self, who)
 	else
 		desc[#desc+1] = "#SLATE#* Gorbat Pride, in the southern desert.#WHITE#"
 	end
+
+	if self:isCompleted() then
+		desc[#desc+1] = ""
+		desc[#desc+1] = "#LIGHT_GREEN#* All prides lie in ruins, their masters destroyed. High Sun Paladin Aeryn would surely be glad of the news!#WHITE#"
+	end
+
 	return table.concat(desc, "\n")
 end
 
@@ -99,3 +105,11 @@ on_grant = function(self, who)
 
 	game.logPlayer(game.player, "Aeryn points the known locations on your map.")
 end
+
+on_status_change = function(self, who, status, sub)
+	if sub then
+		if self:isCompleted("rak-shor") and self:isCompleted("vor") and self:isCompleted("grushnak") and self:isCompleted("gorbat") then
+			who:setQuestStatus(self.id, engine.Quest.COMPLETED)
+		end
+	end
+end