Can not escort magic people when you have been trained by the ziguranth

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

game/modules/tome/data/chats/escort-quest-start.lua

@@ -17,6 +17,24 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
+local p = game.party:findMember{main=true}
+if p:attr("forbid_arcane") and not npc.antimagic_ok then
+
+newChat{ id="welcome",
+	text = text,
+	answers =
+	{
+		{"Go away; I do help filthy arcane users!", action=function(npc, player)
+			npc:disappear()
+			npc:removed()
+			player:hasQuest(npc.quest_id).abandoned = true
+			player:setQuestStatus(npc.quest_id, engine.Quest.FAILED)
+		end},
+	},
+}
+
+else
+
 newChat{ id="welcome",
 	text = text,
 	answers =
@@ -39,4 +57,6 @@ newChat{ id="welcome",
 	},
 }
 
+end
+
 return "welcome"

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

@@ -61,6 +61,7 @@ local possible_types = {
 			lite = 4,
 			rank = 2,
 			exp_worth = 1,
+			antimagic_ok = true,
 
 			max_life = 50, life_regen = 0,
 			life_rating = 12,
@@ -113,6 +114,7 @@ local possible_types = {
 			lite = 4,
 			rank = 2,
 			exp_worth = 1,
+			antimagic_ok = true,
 
 			max_life = 50, life_regen = 0,
 			life_rating = 11,
@@ -219,6 +221,7 @@ local possible_types = {
 			lite = 4,
 			rank = 2,
 			exp_worth = 1,
+			antimagic_ok = true,
 
 			max_life = 50, life_regen = 0,
 			life_rating = 10,
@@ -369,7 +372,7 @@ on_grant = function(self, who)
 	self.name = "Escort: "..self.kind.name.." (level "..self.level_name..")"
 
 	local Chat = require "engine.Chat"
-	Chat.new("escort-quest-start", npc, game.player, {text=self.kind.text}):invoke()
+	Chat.new("escort-quest-start", npc, game.player, {text=self.kind.text, npc=npc}):invoke()
 
 	-- Check if we found sunpaladins/anorithils before going east
 	if npc.sunwall_query then