Trollmire treasure quest will successfully complete

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

game/modules/tome/data/quests/trollmire-treasure.lua

@@ -23,7 +23,7 @@ desc = function(self, who)
 	desc[#desc+1] = "You have found all the clues leading to the hidden treasure, there should be a way on the third level of the trollmire."
 	desc[#desc+1] = "It looks extremely dangerous however, beware."
 	if self:isEnded() then
-		desc[#desc+1] = "You have slain Bill and took his treasure."
+		desc[#desc+1] = "You have slain Bill. His treasure is yours for the taking."
 	end
 	return table.concat(desc, "\n")
 end
@@ -43,6 +43,8 @@ on_grant = function(self)
 end
 
 enter_level3 = function(self)
+	if game.level.hidden_way_to_bill then return end
+
 	-- Reveal entrance to level 4
 	local g = game.zone:makeEntityByName(game.level, "terrain", "GRASS_DOWN6"):clone()
 	g.name = "way to the hidden trollmire treasure"
@@ -56,6 +58,7 @@ enter_level3 = function(self)
 	local level = game.level
 	local spot = level.default_down
 	game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
+	level.hidden_way_to_bill = true
 
 	require("engine.ui.Dialog"):simplePopup("Hidden treasure", "The way to the treasure is to the east. But beware, death probably awaits there.")
 end

game/modules/tome/data/zones/high-peak/npcs.lua

@@ -65,7 +65,7 @@ newEntity{
 	negative_regen = 10,
 	rank = 5,
 	size_category = 3,
-	stats = { str=40, dex=60, cun=60, mag=30, con=40 },
+	stats = { str=40, dex=30, cun=60, mag=60, con=40 },
 
 	see_invisible = 100,
 	instakill_immune = 1,
@@ -77,7 +77,7 @@ newEntity{
 	combat_def = 20,
 
 	no_auto_resists = true,
-	resists = { all = 45, },
+	resists = { all = 40, },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, HEAD=1, FEET=1 },
 	resolvers.equip{
@@ -151,7 +151,7 @@ newEntity{
 	combat_def = 20,
 
 	no_auto_resists = true,
-	resists = { all = 65, },
+	resists = { all = 45, },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, FEET=1, HEAD=1, HANDS=1 },
 	resolvers.equip{

game/modules/tome/data/zones/trollmire/npcs.lua

@@ -114,7 +114,7 @@ This is the troll the notes spoke about, no doubt.]],
 	ai_tactic = resolvers.tactic"melee",
 
 	on_die = function(self, who)
-		game.player:resolveSource():grantQuest("trollmire-treasure")
+		game.player:resolveSource():setQuestStatus("trollmire-treasure", engine.Quest.COMPLETED)
 		if who and who.level and who.level == 1 then
 			world:gainAchievement("KILL_BILL", game.player)
 		end