Merge branch 'master' into more_fixes

game/modules/tome/class/NPC.lua

@@ -228,6 +228,8 @@ function _M:seen_by(who)
 	if self:reactionToward(who) <= 0 then return end
 	-- Check if we can actually see the ally (range and obstacles)
 	if not who.x or not self:hasLOS(who.x, who.y) then return end
+	-- Check if it's actually a being of cold machinery and not of blood and flesh
+	if not who.aiSeeTargetPos then return end
 	if self.ai_target.actor then
 		-- Pass last seen coordinates
 		if self.ai_target.actor == who.ai_target.actor then

game/modules/tome/class/Player.lua

@@ -820,7 +820,7 @@ local function spotHostiles(self, actors_only)
 		-- Check for projectiles in line of sight
 		core.fov.calc_circle(self.x, self.y, game.level.map.w, game.level.map.h, self.sight or 10, function(_, x, y) return game.level.map:opaque(x, y) end, function(_, x, y)
 			local proj = game.level.map(x, y, game.level.map.PROJECTILE)
-			if not proj then return end
+			if not proj or not game.level.map.seens(x, y) then return end
 
 			-- trust ourselves but not our friends
 			if proj.src and self == proj.src then return end
@@ -836,7 +836,7 @@ local function spotHostiles(self, actors_only)
 			if tx and ty then
 				local dist_to_line = math.abs((self.x - sx) * (ty - sy) - (self.y - sy) * (tx - sx)) / core.fov.distance(sx, sy, tx, ty)
 				local our_way = ((self.x - x) * (tx - x) + (self.y - y) * (ty - y)) > 0
-				if our_way and dist_to_line < 1.5 then
+				if our_way and dist_to_line < 1.0 then
 					seen[#seen+1] = {x=x, y=y, projectile=proj, entity=proj, name=(proj.getName and proj:getName()) or proj.name}
 				end
 			end

game/modules/tome/data/talents/misc/misc.lua

@@ -382,7 +382,7 @@ newTalent{
 		local mental_reduction = math.floor(self:combatMentalResist(true)/5)
 		return ([[Not the Master himself, nor all the orcs in fallen Reknor, nor even the terrifying unknown beyond Reknor's portal could slow your pursuit of the Staff of Absorption.
 		Children will hear of your relentlessness in song for years to come.
-		When activated, this ability reduces the duration of all active detrimental effects by 20% of your appropriate save value..
+		When activated, this ability reduces the duration of all active detrimental effects by 20%% of your appropriate save value.
 		Physical effect durations reduced by %d turns
 		Magical effect durations reduced by %d turns
 		Mental effect durations reduced by %d turns]]):