Fix Shadows in the shadow crupt

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

game/modules/tome/ai/shadow.lua

@@ -24,7 +24,7 @@ local function clearTarget(self)
 end
 
 local function shadowChooseActorTarget(self)
-	
+
 	-- taken from "target_simple" but selects a target the summoner can see within the shadow's max range from the summoner
 	local arr = self.summoner.fov.actors_dist
 	local act
@@ -36,7 +36,7 @@ local function shadowChooseActorTarget(self)
 		if act and act ~= self.summoner and self.summoner:reactionToward(act) < 0 and not act.dead and
 			(
 				-- If it has lite we can always see it
-				(act.lite > 0)
+				((act.lite or 0) > 0)
 				or
 				-- Otherwise check if we can see it with our "senses"
 				(self.summoner:canSee(act) and self.summoner.fov.actors[act].sqdist <= sqsense)
@@ -45,22 +45,22 @@ local function shadowChooseActorTarget(self)
 			actors[#actors+1] = act
 		end
 	end
-		
+
 	if #actors > 0 then
 		--game.logPlayer(self.summoner, "#PINK#%s has chosen an actor.", self.name:capitalize())
 		self.ai_target.actor = actors[rng.range(1, #actors)]
 		self:check("on_acquire_target", act)
 		act:check("on_targeted", self)
-			
+
 		return true
 	end
-	
+
 	return false
 end
 
 local function shadowMoveToActorTarget(self)
 	local range = core.fov.distance(self.x, self.y, self.ai_target.actor.x, self.ai_target.actor.y)
-	
+
 	if range <= 1 and self.ai_state.close_attack_spell_chance and rng.percent(self.ai_state.close_attack_spell_chance) then
 		-- chance for close spell
 		if self:closeAttackSpell() then return true end
@@ -68,11 +68,11 @@ local function shadowMoveToActorTarget(self)
 		-- chance for a far spell
 		if self:farAttackSpell() then return true end
 	end
-	
+
 	if range <= 1 and self.ai_state.dominate_chance and rng.percent(self.ai_state.dominate_chance) then
 		if self:dominate() then return true end
 	end
-	
+
 	-- use the target blindside chance if it was assigned; otherwise, use the normal chance
 	local blindsideChance = self.ai_target.blindside_chance or self.ai_state.blindside_chance
 	self.ai_target.blindside_chance = nil
@@ -83,13 +83,13 @@ local function shadowMoveToActorTarget(self)
 		if self:getTalentRange(t) and self:preUseTalent(t, true, true) then
 			if self:useTalent(self.T_SHADOW_BLINDSIDE) then
 				self.ai_state.target_time = self.ai_state.target_timeout
-				
+
 				--game.logPlayer(self.summoner, "#PINK#%s -> blindside", self.name:capitalize())
 				return true
 			end
 		end
 	end
-	
+
 	-- chance to reset target next turn if we are attacking (unless we have been focused)
 	if range <= 1 and rng.percent(20) then
 		--game.logPlayer(self.summoner, "#PINK#%s is about to attack.", self.name:capitalize())
@@ -97,11 +97,11 @@ local function shadowMoveToActorTarget(self)
 			self.ai_state.target_time = self.ai_state.target_timeout
 		end
 	end
-	
+
 	-- move to target
 	if self:runAI("move_dmap") then
 		self.turns_on_target = (self.turns_on_target or 0) + 1
-		
+
 		--game.logPlayer(self.summoner, "#PINK#%s -> move_dmap", self.name:capitalize())
 		return true
 	end
@@ -110,11 +110,11 @@ local function shadowMoveToActorTarget(self)
 end
 
 local function shadowChooseLocationTarget(self)
-	
+
 	local locations = {}
 	local range = math.floor(self.ai_state.location_range)
 	local x, y = self.summoner.x, self.summoner.y
-	
+
 	for i = x - range, x + range do
 		for j = y - range, y + range do
 			if game.level.map:isBound(i, j)
@@ -128,10 +128,10 @@ local function shadowChooseLocationTarget(self)
 	if #locations > 0 then
 		local location = locations[rng.range(1, #locations)]
 		self.ai_target.x, self.ai_target.y = location[1], location[2]
-		
+
 		return true
 	end
-	
+
 	return false
 end
 
@@ -140,7 +140,7 @@ local function shadowMoveToLocationTarget(self)
 		-- already at target
 		return false
 	end
-	
+
 	if rng.percent(self.ai_state.phasedoor_chance) then
 		--game.logPlayer(self.summoner, "#PINK#%s is about to phase door.", self.name:capitalize())
 		-- try a phase door
@@ -148,23 +148,23 @@ local function shadowMoveToLocationTarget(self)
 		if self:getTalentRange(t) and self:preUseTalent(t, true, true) then
 			if self:useTalent(self.T_SHADOW_PHASE_DOOR) then
 				--game.logPlayer(self.summoner, "#PINK#%s -> phase door", self.name:capitalize())
-				
+
 				return true
 			end
 		end
 	end
-	
+
 	local tx, ty = self.ai_target.x, self.ai_target.y
 	local path = self.shadow_path
 	if not path or #path == 0 then
 		local a = Astar.new(game.level.map, self)
 		path = a:calc(self.x, self.y, tx, ty)
 	end
-	
+
 	if path then
 		self.shadow_path = {}
 		tx, ty = path[1].x, path[1].y
-		
+
 		-- try to move around actors..if we fail we will just try a a new target
 		if not self:canMove(tx, ty, false) then
 			local dir = util.getDir(tx, ty, self.x, self.y)
@@ -180,7 +180,7 @@ local function shadowMoveToLocationTarget(self)
 
 		self:move(tx, ty)
 		self.turns_on_target = (self.turns_on_target or 0) + 1
-		
+
 		--game.logPlayer(self.summoner, "#PINK#%s -> move", self.name:capitalize())
 		return true
 	end
@@ -197,24 +197,24 @@ newAI("shadow", function(self)
 		self:die()
 	end
 	self.summon_time = self.summon_time - 1
-	
+
 	-- make sure no one has turned us against our summoner
 	if self.ai_target.actor == self.summoner then
 		clearTarget(self)
 	end
-	
+
 	-- shadow wall
 	if self.ai_state.shadow_wall then
-		
+
 		clearTarget(self)
-		
+
 		local defendant = self.ai_state.shadow_wall_target
-	
+
 		if self.ai_state.shadow_wall_time <= 0 or defendant.dead then
 			self.ai_state.shadow_wall = false
 		else
 			self.ai_state.shadow_wall_time = self.ai_state.shadow_wall_time - 1
-		
+
 			local range = core.fov.distance(self.x, self.y, defendant.x, defendant.y)
 			if range >= 3 then
 				-- phase door into range
@@ -240,75 +240,75 @@ newAI("shadow", function(self)
 					newX, newY = x, y
 				end
 			end
-			
+
 			if newX and newY then
 				self:move(newX, newY)
 			end
 			return true
 		end
 	end
-	
+
 	-- out of summoner range?
 	if core.fov.distance(self.x, self.y, self.summoner.x, self.summoner.y) > self.ai_state.summoner_range then
 		--game.logPlayer(self.summoner, "#PINK#%s is out of range.", self.name:capitalize())
-		
+
 		clearTarget(self)
-		
+
 		-- phase door into range
 		self:useTalent(self.T_SHADOW_PHASE_DOOR)
 		--game.logPlayer(self.summoner, "#PINK#%s -> phase door", self.name:capitalize())
 		return true
 	end
-	
+
 	-- out of time on current target?
 	if (self.turns_on_target or 0) >= 10 then
 		--game.logPlayer(self.summoner, "#PINK#%s is out of time for target.", self.name:capitalize())
-		
+
 		clearTarget(self)
 	end
-	
+
 	-- chance to heal
 	if self.life < self.max_life * 0.75 and rng.percent(5) then
 		self:healSelf()
 		return true
 	end
-	
+
 	-- move to live target?
 	if self.ai_target.actor and not self.ai_target.actor.dead then
 		if shadowMoveToActorTarget(self) then
 			return true
 		end
 	end
-	
+
 	-- move to location target?
 	if self.ai_target.x and self.ai_target.y then
 		if shadowMoveToLocationTarget(self) then
 			return true
 		end
 	end
-	
+
 	-- no current target..start a new action
 	clearTarget(self)
-	
+
 	-- choose an actor target? this determines their aggressiveness
 	if rng.percent(65) and shadowChooseActorTarget(self) then
 		--game.logPlayer(self.summoner, "#PINK#%s choose an actor.", self.name:capitalize())
-		
+
 		-- start moving to the target
 		if shadowMoveToActorTarget(self) then
 			return true
 		end
 	end
-	
+
 	-- choose a location target?
 	if shadowChooseLocationTarget(self) then
 		--game.logPlayer(self.summoner, "#PINK#%s choose a location.", self.name:capitalize())
-		
+
 		if shadowMoveToLocationTarget(self) then
 			return true
 		end
 	end
-	
+
 	-- fail
 	--game.logPlayer(self.summoner, "#PINK#%s -> failed to make a move.", self.name:capitalize())
 	return true