Human, Halfling and Elven archmages now start in Angolwen

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

game/modules/tome/class/Game.lua

@@ -216,6 +216,7 @@ function _M:newGame()
 		save:close()
 
 		self.player:check("before_starting_zone")
+		self.player:check("class_start_check")
 
 		-- Configure & create the worldmap
 		self.player.last_wilderness = self.player.default_wilderness[3] or "wilderness"

game/modules/tome/data/birth/classes/mage.lua

@@ -76,10 +76,15 @@ newBirthDescriptor{
 	},
 	copy = {
 		-- Mages start in angolwen
-		default_wilderness = {"zone-pop", "angolwen-portal"},
-		starting_zone = "town-angolwen",
-		starting_quest = "start-archmage",
-		starting_intro = "archmage",
+		class_start_check = function(self)
+			if self.descriptor.race == "Human" or self.descriptor.race == "Elf" or self.descriptor.race == "Halfling" then
+				self.archmage_race_start_quest = self.starting_quest
+				self.default_wilderness = {"zone-pop", "angolwen-portal"}
+				self.starting_zone = "town-angolwen"
+				self.starting_quest = "start-archmage"
+				self.starting_intro = "archmage"
+			end
+		end,
 
 		-- All mages are of angolwen faction
 		faction = "angolwen",

game/modules/tome/data/quests/start-archmage.lua

@@ -37,7 +37,7 @@ on_status_change = function(self, who, status, sub)
 	if sub then
 		if self:isCompleted("abashed") then
 			who:setQuestStatus(self.id, engine.Quest.DONE)
-			who:grantQuest("starter-allied")
+			who:grantQuest(who.archmage_race_start_quest)
 		end
 	end
 end

game/modules/tome/data/zones/abashed-expanse/npcs.lua

@@ -61,6 +61,6 @@ newEntity{ base="BASE_NPC_LOSGOROTH", define_as = "SPACIAL_DISTURBANCE",
 	on_die = function(self, who)
 		local q = game.player:hasQuest("start-archmage")
 		if q then q:stabilized() end
-		game.player:resolveSource():setQuestStatus("start-archmage", engine.Quest.COMPLETED, "expanse")
+		game.player:resolveSource():setQuestStatus("start-archmage", engine.Quest.COMPLETED, "abashed")
 	end,
 }