high peak fight tweak

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

game/modules/tome/class/Player.lua

@@ -590,21 +590,7 @@ end
 function _M:useOrbPortal(portal)
 	if portal.special then portal:special(self) return end
 
-	local wait = function()
-		local co = coroutine.running()
-		local ok = false
-		self:restInit(20, "using the portal", "used the poral", function(cnt, max)
-			if cnt > max then ok = true end
-			coroutine.resume(co)
-		end)
-		coroutine.yield()
-		if not ok then
-			game.logPlayer(self, "You have been interrupted!")
-			return false
-		end
-		return true
-	end
-	if not wait() then return end
+	if spotHostiles(self) then game.logPlayer(self, "You can not use the Orb with foes in sight.") end
 
 	if portal.teleport_level then
 		local x, y = util.findFreeGrid(portal.teleport_level.x, portal.teleport_level.y, 2, true, {[Map.ACTOR]=true})

game/modules/tome/class/generator/actor/HighPeakFinal.lua

@@ -36,7 +36,7 @@ end
 function _M:tick()
 	local val = rng.float(0,1)
 	for i = 1,self.max_rate - 1 do
-		if val < rng.poissonProcess(i, self.turn_scale, 0.25) then
+		if val < rng.poissonProcess(i, self.turn_scale, 0.1) then
 			self:generateOne()
 		else
 			break

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

@@ -75,7 +75,7 @@ This one seems to go to an unknown place, seemingly out of this world. You dare
 }
 
 local invocation_close = function(self, who)
-	if not who:hasQuest("high-peak") or who:hasQuest("high-peak"):isCompleted() then return end
+	if not who:hasQuest("high-peak") or who:hasQuest("high-peak"):isEnded() then return end
 	game.logPlayer(who, "#LIGHT_BLUE#You use the orb on the portal, shutting it down easily.")
 	-- Remove the level spot
 	local spot = game.level:pickSpot{type="portal", subtype=self.summon}

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

@@ -121,41 +121,50 @@ newEntity{
 	max_life = 1000, life_rating = 36, fixed_rating = true,
 	max_mana = 10000,
 	mana_regen = 10,
+	vim_regen = 50,
 	rank = 5,
 	size_category = 3,
 	stats = { str=40, dex=60, cun=60, mag=30, con=40 },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
 	resolvers.equip{
-		{type="weapon", subtype="staff", ego_chance=100, autoreq=true},
-		{type="armor", subtype="cloth", ego_chance=100, autoreq=true},
+		{type="weapon", subtype="sword", ego_chance=100, autoreq=true},
+		{type="weapon", subtype="waraxe", ego_chance=100, autoreq=true},
+		{type="armor", subtype="massive", ego_chance=100, autoreq=true},
 	},
 	resolvers.drops{chance=100, nb=1, {defined="PEARL_LIFE_DEATH"} },
 	resolvers.drops{chance=100, nb=5, {ego_chance=100} },
 
 	resolvers.talents{
-		[Talents.T_FLAME]=5,
-		[Talents.T_FREEZE]=5,
-		[Talents.T_LIGHTNING]=5,
-		[Talents.T_MANATHRUST]=5,
-		[Talents.T_INFERNO]=5,
-		[Talents.T_FLAMESHOCK]=5,
-		[Talents.T_STONE_SKIN]=5,
-		[Talents.T_STRIKE]=5,
-		[Talents.T_HEAL]=5,
-		[Talents.T_REGENERATION]=5,
-		[Talents.T_ILLUMINATE]=5,
-		[Talents.T_QUICKEN_SPELLS]=5,
-		[Talents.T_SPELL_SHAPING]=5,
-		[Talents.T_ARCANE_POWER]=5,
-		[Talents.T_METAFLOW]=5,
-		[Talents.T_PHASE_DOOR]=5,
-		[Talents.T_ESSENCE_OF_SPEED]=5,
+		[Talents.T_BONE_GRAB]=5,
+		[Talents.T_BONE_SPEAR]=5,
+		[Talents.T_BONE_SHIELD]=5,
+		[Talents.T_BURNING_HEX]=5,
+		[Talents.T_EMPATHIC_HEX]=5,
+		[Talents.T_CURSE_OF_VULNERABILITY]=5,
+		[Talents.T_CURSE_OF_DEFENSELESSNESS]=5,
+		[Talents.T_CURSE_OF_DEATH]=5,
+		[Talents.T_VIRULENT_DISEASE]=5,
+		[Talents.T_CYST_BURST]=5,
+		[Talents.T_CATALEPSY]=5,
+		[Talents.T_EPIDEMIC]=5,
+		[Talents.T_REND]=5,
+		[Talents.T_RUIN]=5,
+		[Talents.T_DARK_SURPRISE]=5,
+		[Talents.T_CORRUPTED_STRENGTH]=5,
+		[Talents.T_BLOODLUST]=5,
+		[Talents.T_ACID_BLOOD]=5,
+		[Talents.T_DRAIN]=5,
+
+		[Talents.T_WEAPON_COMBAT]=10,
+		[Talents.T_SWORD_MASTERY]=7,
+		[Talents.T_AXE_MASTERY]=7,
+		[Talents.T_MASSIVE_ARMOUR_TRAINING]=5,
 	},
 	resolvers.sustains_at_birth(),
 
-	autolevel = "caster",
-	ai = "dumb_talented_simple", ai_state = { talent_in=1, ai_move="move_astar" },
+	autolevel = "warriormage",
+	ai = "dumb_talented_simple", ai_state = { talent_in=3, ai_move="move_astar" },
 
 	on_die = function(self, who)
 		game.player:resolveSource():setQuestStatus("high-peak", engine.Quest.COMPLETED, "pallando-dead")