Fix Urkis quests

game/modules/tome/data/chats/angolwen-leader.lua

@@ -22,10 +22,10 @@ newChat{ id="welcome",
 I am Linaniil of the Kar'Krul. Welcome to our city, @playerdescriptor.subclass@. What may I do for thee?]],
 	answers = {
 		{"I require all the help I can get, not for my sake but for the town of Derth, to the northeast of here.", jump="save-derth", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and q:isCompleted("saved-derth") and not q:isCompleted("tempest-located") and not q:isStatus(q.DONE) end},
-		{"I am ready! Send me to Urkis!", jump="teleport-urkis", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and not q:isEnded("tempest-located") and q:isCompleted("tempest-located") and not q:isCompleted("tempest-urkis-slain") end},
+		{"I am ready! Send me to Urkis!", jump="teleport-urkis", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and not q:isEnded("tempest-located") and q:isCompleted("tempest-located") and not q:isCompleted("angolwen-reward") end},
 		{"Urkis has been slain.", jump="reward-urkis", cond=function(npc, player) 
 			local q = player:hasQuest("lightning-overload") 
-			return q and q:isCompleted("tempest-urkis-slain") and not q:isStatus(q.DONE) end},
+			return q and q:isCompleted("tempest-urkis-slain") and not q:isCompleted("angolwen-reward") and not q:isStatus(q.DONE) end},
 		{"Nothing for now. Sorry to have taken your time. Farewell, my lady."},
 	}
 }
@@ -60,13 +60,13 @@ newChat{ id="reward-urkis",
 	text = [[I see the storm is calmed.  Take this rune as a token of my appreciation.]],
 	answers = {
 		{"Thank you.", action=function(npc, player)
-			local q = player:hasQuest("lightning-overload") 
 			local o = game.zone:makeEntityByName(game.level, "object", "RUNE_DISSIPATION")
-			if q then player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED) end
 			if not o then return end
 			o:identify(true)
 			game.zone:addEntity(game.level, o, "object")
 			player:addObject(player:getInven("INVEN"), o)
+			player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED, "angolwen-reward")
+			player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED)
 		end},
 	}
 }

game/modules/tome/data/chats/myssil.lua

@@ -36,7 +36,10 @@ newChat{ id="welcome",
 I am Protector Myssil. Welcome to Zigur.]],
 	answers = {
 		{"I require all the help I can get, not for my sake but for the town of Derth, to the northwest of here.", jump="save-derth", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and q:isCompleted("saved-derth") and not q:isCompleted("tempest-entrance") and not q:isStatus(q.DONE) end},
-		{"Protector, I have dispatched the Tempest as you commanded.", jump="tempest-dead", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and q:isCompleted("tempest-entrance") and not q:isCompleted("antimagic-reward") and q:isStatus(q.DONE) end},
+		{"Protector, I have dispatched the Tempest as you commanded.", jump="tempest-dead", cond=function(npc, player) 
+			local q = player:hasQuest("lightning-overload") 
+			return q and q:isCompleted("tempest-urkis-slain") and not q:isCompleted("antimagic-reward")
+		end},
 		{"Farewell, Protector."},
 	}
 }
@@ -76,6 +79,7 @@ This shall help you on your travels. Farewell!]],
 				game.party:learnLore("zigur-purging-trap")
 			end	
 			player:hasQuest("lightning-overload"):setStatus(engine.Quest.COMPLETED, "antimagic-reward")
+			player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED)
 		end},
 	}
 }

game/modules/tome/data/quests/lightning-overload.lua

@@ -31,11 +31,11 @@ desc = function(self, who)
 	if self:isCompleted("tempest-entrance") then
 		desc[#desc+1] = " * You have learned the real threat comes from a rogue Archmage, a Tempest. You have been shown a secret entrance to his stronghold."
 	end
-	--if self:isCompleted("tempest-urkis-slain") then
-	--	desc[#desc+1] = " * You have slain Urkis.  Return to Angolwen for a reward."
-	--end
+	if self:isCompleted("tempest-urkis-slain") then
+		desc[#desc+1] = " * You have slain Urkis.  Return to Angolwen or Zigur for a reward."
+	end
 	if self:isCompleted() then
-		desc[#desc+1] = " * Urkis has been dealt with. Permanently.  Return to Angolwen or Zigur for a reward."
+		desc[#desc+1] = " * Urkis has been dealt with. Permanently."
 	end
 
 	return table.concat(desc, "\n")