Merge branch 'annihilator-bugs' into 'master'

Fixes to block callback and archery AI

callbackOnBlock now passes in the blocked parameter, fixes a bug with Annihilator's shield capacitor.
The addition to shoot is so that the mecha knows it can shoot through the player and turrets, makes it a bit less dumb.
Also added archery_pass_friendly to the thoughtform archer so it's less useless.


See merge request !591

game/modules/tome/data/talents/psionic/thought-forms.lua

@@ -199,9 +199,9 @@ newTalent{
 			body = { INVEN = 10, MAINHAND = 1, BODY = 1, QUIVER=1, HANDS = 1, FEET = 1},
 
 			ai = "summoned", ai_real = "tactical",
-			ai_state = { ai_move="move_complex", talent_in=3, ally_compassion=10 },
+			ai_state = { ai_move="move_complex", talent_in=1, ally_compassion=10 },
 			ai_tactic = resolvers.tactic("ranged"),
-			
+			archery_pass_friendly = 1,
 			max_life = resolvers.rngavg(100,110),
 			life_rating = 12,
 			combat_armor = 0, combat_def = 0,

game/modules/tome/data/talents/techniques/archery.lua

@@ -69,6 +69,13 @@ newTalent{
 	hide = true,
 	innate = true,
 	points = 1,
+	target = function(self, t)
+		local ff = true
+		if self.archery_pass_friendly then ff = false end
+		return {type="bolt", range=self:getTalentRange(t), talent=t, display = {particle=particle, trail=trail}, friendlyfire=ff,
+			friendlyblock=ff,
+		}
+	end,
 	stamina = function(self, t)
 		if not self:isTalentActive("T_SKIRMISHER_BOMBARDMENT") or not wardenPreUse(self, t, false, "sling") then return nil end
 

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

@@ -2366,7 +2366,7 @@ newEffect{
 			end
 		end
 		eff.did_block = true
-		self:fireTalentCheck("callbackOnBlock", eff, dam, type, src)
+		self:fireTalentCheck("callbackOnBlock", eff, dam, type, src, blocked)
 
 		return amt
 	end,