Merge branch 'master' of git.net-core.org:tome/t-engine4

@@ -6073,6 +6073,7 @@ local sustainCallbackCheck = {
 	callbackOnPartyRemove = "talents_on_party_remove",
 	callbackOnTargeted = "talents_on_targeted",
 	callbackOnCloned = "talents_on_cloned",
+	callbackOnAITalentTactics = "talents_on_ai_talent_tactics",
 }
 _M.sustainCallbackCheck = sustainCallbackCheck
 

@@ -1386,6 +1386,10 @@ function _M:aiTalentTactics(t, aitarget, target_list, tactic, tg, wt_mod)
 			end --(DEBUGGING transitional)
 			if type(tactical) == "function" then tactical = tactical(self, t, aitarget) end
 		end
+		local hd = {"ActorAI:aiTalentTactics", tactical=table.clone(tactical, true), t=t, ai_target=ai_target}
+		self:triggerHook(hd)
+		self:fireTalentCheck("callbackOnAITalentTactics", hd)
+		tactical = hd.tactical
 		if log_detail >= 2 then print("[aiTalentTactics]__ using talent tactical table for", t.id) table.print(tactical, "\t___") end
 		if not tactical then return false end
 

@@ -40,10 +40,11 @@ newTalent{
 		local hit = self:attackTarget(target, nil, t.getDamage(self, t), true)
 		
 		if hit then
+			target:setEffect(target.EFF_BRUTALIZED, t.getDuration(self, t), {apply_power=self:combatPhysicalpower()})
 			if target:canBe("stun") then
-				target:setEffect(target.EFF_BRUTALIZED, t.getDuration(self, t), {apply_power=self:combatPhysicalpower()})
+				target:setEffect(target.EFF_STUNNED, t.getDuration(self, t), {apply_power=self:combatPhysicalpower()})
 			else
-				game.logSeen(target, "%s resists the brutality!", target.name:capitalize())
+				game.logSeen(target, "%s resists the stun!", target.name:capitalize())
 			end
 		end
 		

@@ -316,7 +316,7 @@ local function createShadow(self, level, tCallShadows, tShadowWarriors, tShadowM
 				value = value * self.avoid_master_damage
 			end
 
-			if self:knowTalent(self.T_SHADOW_FADE) and not self:isTalentCoolingDown(self.T_SHADOW_FADE) and not (self.avoid_master_damage == 0) then
+			if self:knowTalent(self.T_SHADOW_FADE) and not self:isTalentCoolingDown(self.T_SHADOW_FADE) and (value > 0) then
 				self:forceUseTalent(self.T_SHADOW_FADE, {ignore_energy=true})
 			end
 

@@ -28,7 +28,7 @@ newTalent{
 	range = 1,
 	stamina = 20,
 	require = spells_req1,
-	tactical = { ATTACK = 0.2 },
+	tactical = { ATTACK = {weapon = 2} },
 	is_melee = true,
 	on_pre_use = function(self, t, silent) if not self:hasMHWeapon() then if not silent then game.logPlayer(self, "You require a weapon to use this talent.") end return false end return true end,
 	requires_target = true,

@@ -29,6 +29,23 @@ newTalent{
 	cooldown = 5,
 	tactical = { BUFF = 2 },
 	getChance = function(self, t) return self:combatLimit(self:getTalentLevel(t) * (1 + self:getCun(9, true)), 100, 20, 0, 70, 50) end, -- Limit < 100%
+	callbackOnAITalentTactics = function(self, t, hd)
+		local p = self:isTalentActive(t.id)
+		if not p then return end
+		if hd.t.allow_for_arcane_combat then
+			hd.tactical = {}
+		end
+		if hd.tactical then
+			local tactical = hd.tactical
+			if tactical.attack and type(tactical.attack) == "table" and tactical.attack.weapon then
+				tactical.attack.weapon = tactical.attack.weapon + 1
+			end
+			if tactical.attackarea and type(tactical.attackarea) == "table" and tactical.attackarea.weapon then
+				tactical.attackarea.weapon = tactical.attackarea.weapon + 1
+			end
+		end
+		return true
+	end,
 	canUseTalent = function(self, t, proc) -- Returns true if the actor can currently trigger the "proc" talent with Arcane Combat
 		local talent = self:getTalentFromId(proc)
 		if not talent or not talent.allow_for_arcane_combat then return false end

@@ -292,7 +292,7 @@ local function createLichShadow(self, level, tCallShadows, tShadowWarriors, tSha
 				value = value * self.avoid_master_damage
 			end
 
-			if self:knowTalent(self.T_SHADOW_FADE) and not self:isTalentCoolingDown(self.T_SHADOW_FADE) and not (self.avoid_master_damage == 0) then
+			if self:knowTalent(self.T_SHADOW_FADE) and not self:isTalentCoolingDown(self.T_SHADOW_FADE) and (value > 0) then
 				self:forceUseTalent(self.T_SHADOW_FADE, {ignore_energy=true})
 			end
 

@@ -4338,35 +4338,17 @@ newEffect{
 newEffect{
 	name = "Brutalized", image = "effects/stunned.png",
 	desc = _t"Brutalized",
-	long_desc = function(self, eff) return ("The target is brutally stunned, reducing damage by 50%%, movement speed by 50%%, bleed resist by 50%%, and halving talent cooldown."):tformat() end,
+	long_desc = function(self, eff) return ("The target is brutalized, reducing bleed resist by 50%%."):tformat() end,
 	type = "physical",
-	subtype = { stun=true },
+	subtype = { },
 	status = "detrimental",
 	parameters = { },
-	on_gain = function(self, err) return _t"#Target# is stunned by the brutal strike!", _t"+Brutalized" end,
-	on_lose = function(self, err) return _t"#Target# is not stunned anymore.", _t"-Brutalized" end,
+	on_gain = function(self, err) return _t"#Target# is brutalized!", _t"+Brutalized" end,
+	on_lose = function(self, err) return _t"#Target# is not brutalized anymore.", _t"-Brutalized" end,
 	activate = function(self, eff)
-		eff.tmpid = self:addTemporaryValue("stunned", 1)
-		eff.lockid = self:addTemporaryValue("half_talents_cooldown", 1)
-		eff.speedid = self:addTemporaryValue("movement_speed", -0.5)
-		eff.bleedid = self:addTemporaryValue("cut_immune", -0.5)
-		
-		local tids = {}
-		for tid, lev in pairs(self.talents) do
-			local t = self:getTalentFromId(tid)
-			if t and not self.talents_cd[tid] and t.mode == "activated" and not t.innate and util.getval(t.no_energy, self, t) ~= true then tids[#tids+1] = t end
-		end
-		for i = 1, 3 do
-			local t = rng.tableRemove(tids)
-			if not t then break end
-			self:startTalentCooldown(t.id, 1)
-		end
-  end,
-  deactivate = function(self, eff)
-		self:removeTemporaryValue("stunned", eff.tmpid)
-		self:removeTemporaryValue("half_talents_cooldown", eff.lockid)
-		self:removeTemporaryValue("movement_speed", eff.speedid)
-		self:removeTemporaryValue("cut_immune", eff.bleedid)
-  end,
+		self:effectTemporaryValue(eff, "cut_immune", -0.5)
+	end,
+	deactivate = function(self, eff)
+	end,
 }