Ambuscade shadow now will dissipate if out of sight for too long

Fixed Shadowstep to make it respect LOS

game/modules/tome/data/talents/cunning/ambush.lua

@@ -151,6 +151,7 @@ newTalent{
 		m.clone_on_hit = nil
 		m.exp_worth = 0
 		m.no_inventory_access = true
+		m.no_levelup_access = true
 		m.cant_teleport = true
 		m:unlearnTalent(m.T_AMBUSCADE,m:getTalentLevelRaw(m.T_AMBUSCADE))
 		m:unlearnTalent(m.T_PROJECTION,m:getTalentLevelRaw(m.T_PROJECTION)) -- no recurssive projections
@@ -166,6 +167,18 @@ newTalent{
 		m.inc_damage.all = ((100 + (m.inc_damage.all or 0)) * t.getDam(self, t)) - 100
 		m.force_melee_damage_type = DamageType.DARKNESS
 
+		m.on_act = function(self)
+			if self.summoner.dead or not self:hasLOS(self.summoner.x, self.summoner.y) then
+				if not self:hasEffect(self.EFF_AMBUSCADE_OFS) then
+					self:setEffect(self.EFF_AMBUSCADE_OFS, 2, {})
+				end
+			else
+				if self:hasEffect(self.EFF_AMBUSCADE_OFS) then
+					self:removeEffect(self.EFF_AMBUSCADE_OFS)
+				end
+			end
+		end,
+
 		game.zone:addEntity(game.level, m, "actor", x, y)
 		game.level.map:particleEmitter(x, y, 1, "shadow")
 
@@ -195,7 +208,7 @@ newTalent{
 		return ([[You take full control of your own shadow for %d turns.
 		Your shadow possesses your talents and stats, has %d%% life and deals %d%% damage, -30%% all resistances, -100%% light resistance and 100%% darkness resistance.
 		Your shadow is permanently stealthed (%d power), and all melee damage it deals is converted to darkness damage.
-		If you release control early, your shadow will dissipate.]]):
+		If you release control early or if it leaves your sight for too long, your shadow will dissipate.]]):
 		format(t.getDuration(self, t), t.getHealth(self, t) * 100, t.getDam(self, t) * 100, t.getStealthPower(self, t))
 	end,
 }

game/modules/tome/data/talents/cunning/shadow-magic.lua

@@ -112,15 +112,16 @@ newTalent{
 
 		local tg = {type="hit", range=self:getTalentRange(t)}
 		local x, y, target = self:getTarget(tg)
-		if not x or not y or not target then return nil end
-		if core.fov.distance(self.x, self.y, x, y) > self:getTalentRange(t) then return nil end
+		if not x or not y then return nil end
+		local _ _, _, _, x, y = self:canProject(tg, x, y)
+		local target = game.level.map(x, y, Map.ACTOR)
 		if not game.level.map.seens(x, y) then return nil end
 
 		local tx, ty = util.findFreeGrid(x, y, 20, true, {[engine.Map.ACTOR]=true})
 		self:move(tx, ty, true)
 
 		-- Attack ?
-		if core.fov.distance(self.x, self.y, x, y) == 1 then
+		if target and target.x and core.fov.distance(self.x, self.y, target.x, target.y) == 1 then
 			self:attackTarget(target, DamageType.DARKNESS, t.getDamage(self, t), true)
 			if target:canBe("stun") then
 				target:setEffect(target.EFF_DAZED, t.getDuration(self, t), {})

game/modules/tome/data/timed_effects/other.lua

@@ -214,6 +214,33 @@ newEffect{
 	end,
 }
 
+newEffect{
+	name = "AMBUSCADE_OFS", image = "talents/ambuscade.png",
+	desc = "Shadow out of sight",
+	long_desc = function(self, eff) return "The shadow is out of sight of its host; direct control will be lost!" end,
+	type = "other",
+	subtype = { miscellaneous=true },
+	status = "detrimental",
+	parameters = { },
+	on_gain = function(self, err) return "#LIGHT_RED##Target# is out of sight of its master; direct control will break!.", "+Out of sight" end,
+	activate = function(self, eff)
+	end,
+	deactivate = function(self, eff)
+	end,
+	on_timeout = function(self, eff)
+		if game.player ~= self then return true end
+
+		if eff.dur <= 1 then
+			game:onTickEnd(function()
+				game.logPlayer(self, "#LIGHT_RED#You lost sight of your shadow for too long; it dissipates!")
+				game.player:runStop("shadow out of sight")
+				game.player:restStop("shadow out of sight")
+				game.party:setPlayer(self.summoner)
+			end)
+		end
+	end,
+}
+
 newEffect{
 	name = "CONTINUUM_DESTABILIZATION",
 	desc = "Continuum Destabilization",