Merge branch 'shield-effect-subtype-consolidation' into 'master'

Shield effect subtype consolidation

1. Limit "shield" effect subtype to effects with a limited damage absorption amount (magical shields affected by getShieldAmount() etc, Psi Damage Shield, and Resonance Shield). Removed subtype from many effects that are not impacted by getShieldAmount, getShieldDuration, or that grant other types of protection, such as damage redirection, damage negation, negative life, and so on.
2. Clarify that only one shield is removed and chosen at random for Shattering Blow, Sunder Armour and Impale.

See merge request !754

@@ -194,7 +194,7 @@ newTalent{
 	info = function(self, t)
 		return ([[Focus your will into a powerful thrust of your telekinetically-wielded weapon to impale your target and then viciously rip it free.
 		This deals %d%% weapon damage and then causes the victim to bleed for %0.1f Physical damage over four turns.
-		At level 3 the thrust is so powerful that it has %d%% chance to shatter a temporary damage shield if one exists.
+		At level 3 the thrust is so powerful that it has %d%% chance to shatter a random temporary magical or psionic damage absorbing shield if one exists.
 		The bleeding damage increases with your Mindpower.]]):
 		tformat(100 * t.getWeaponDamage(self, t), damDesc(self, DamageType.PHYSICAL, t.getDamage(self,t)), t.getShatter(self, t))
 	end,

@@ -315,7 +315,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Hits the target with your weapon, doing %d%% damage. If the attack hits, the target's armour and saves are reduced by %d for %d turns.
-		Also if the target is protected by a temporary damage shield there is %d%% chance to shatter it.
+		Also if the target is protected by any temporary magical or psionic damage absorbing shields there is %d%% chance to shatter one random shield.
 		Armor reduction chance increases with your Physical Power.]])
 		:tformat(100 * self:combatTalentWeaponDamage(t, 1, 1.5),t.getArmorReduc(self, t), t.getDuration(self, t), t.getShatter(self, t))
 	end,

@@ -199,7 +199,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Hits the target with your weapon, doing %d%% damage. If the attack hits, the target's armour and saves are reduced by %d for %d turns.
-		Also if the target is protected by a temporary damage shield there is %d%% chance to shatter it.
+		Also if the target is protected by any temporary magical or psionic damage absorbing shields there is %d%% chance to shatter a random shield.
 		Armor reduction chance increases with your Physical Power.]])
 		:tformat(100 * self:combatTalentWeaponDamage(t, 0.8, 1.5), t.getArmorReduc(self, t), t.getDuration(self, t), t.getShatter(self, t))
 	end,

@@ -367,7 +367,7 @@ newEffect{
 	long_desc = function(self, eff) return ("The target is protected a raging storm deflecting up to %d instances of damage over %d."):
 		tformat(eff.blocks, eff.threshold) end,
 	type = "magical",
-	subtype = { lightning=true, shield=true },
+	subtype = { lightning=true},
 	status = "beneficial",
 	charges = function(self, eff) return math.floor(eff.blocks) end,
 	parameters = {threshold = 1, blocks = 1,},
@@ -1332,7 +1332,7 @@ newEffect{
 	desc = _t"Providence",
 	long_desc = function(self, eff) return ("The target is under protection, removing one negative effect per turn."):tformat() end,
 	type = "magical",
-	subtype = { light=true, shield=true },
+	subtype = { light=true},
 	status = "beneficial",
 	parameters = {},
 	on_timeout = function(self, eff)
@@ -1795,7 +1795,7 @@ newEffect{
 	desc = _t"Bone Shield",
 	long_desc = function(self, eff) return ("Any attacks doing more than %d%% of your life is reduced to %d%%."):tformat(eff.power, eff.power) end,
 	type = "magical",
-	subtype = { arcane=true, shield=true },
+	subtype = { arcane=true},
 	status = "beneficial",
 	parameters = { power=30 },
 	on_gain = function(self, err) return _t"#Target# protected by flying bones.", _t"+Bone Shield" end,
@@ -5507,7 +5507,7 @@ newEffect{
 	desc = _t"Dirge of Pestilence",
 	long_desc = function(self, eff) return ("The target will gain a shield upon suffering a detrimental effect"):tformat() end,
 	type = "magical",
-	subtype = { shield=true },
+	subtype = { dirge=true },
 	status = "beneficial",
 	parameters = { shield=50, cd=5 },
 	callbackOnTemporaryEffectAdd = function(self, eff, eff_id, e_def, eff_incoming)

@@ -2146,7 +2146,7 @@ newEffect{
 	display_desc = function(self, eff) return ("%s Psionic Shield"):tformat(_t(eff.kind):capitalize()) end,
 	long_desc = function(self, eff) return ("Reduces all incoming %s damage by %d."):tformat(eff.what, eff.power) end,
 	type = "mental",
-	subtype = { psionic=true, shield=true },
+	subtype = { psionic=true },
 	status = "beneficial",
 	parameters = { power=10, kind="kinetic" },
 	activate = function(self, eff)
@@ -2687,7 +2687,7 @@ newEffect{
 	desc = _t"Shadow Empathy",
 	long_desc = function(self, eff) return ("%d%% of all damage is redirected to a random shadow."):tformat(eff.power) end,
 	type = "mental",
-	subtype = { mind=true, shield=true },
+	subtype = { mind=true },
 	status = "beneficial",
 	parameters = { power=10 },
 	activate = function(self, eff)
@@ -2704,7 +2704,7 @@ newEffect{
 	desc = _t"Shadow Decoy",
 	long_desc = function(self, eff) return ("A random shadow absorbed a fatal blow for you, granting you a negative shield of %d."):tformat(eff.power) end,
 	type = "mental",
-	subtype = { mind=true, shield=true },
+	subtype = { mind=true},
 	status = "beneficial",
 	parameters = { power=10 },
 	activate = function(self, eff)

@@ -3665,7 +3665,7 @@ newEffect{
 	desc = _t"Stone Link",
 	long_desc = function(self, eff) return ("The target protects all those around it in radius %d by redirecting all damage against them to itself."):tformat(eff.rad) end,
 	type = "physical",
-	subtype = { earth=true, shield=true },
+	subtype = { earth=true },
 	status = "beneficial",
 	parameters = { rad=3 },
 	on_gain = function(self, err) return ("#Target# begins protecting %s friends with a stone shield."):tformat(string.his_her(self)), _t"+Stone Link" end,
@@ -3694,7 +3694,7 @@ newEffect{
 	desc = _t"Stone Link",
 	long_desc = function(self, eff) return ("The target is protected by %s, redirecting all damage to it."):tformat(eff.src:getName()) end,
 	type = "physical",
-	subtype = { earth=true, shield=true },
+	subtype = { earth=true },
 	status = "beneficial",
 	parameters = { },
 	on_gain = function(self, err) return _t"#Target# is protected by a stone shield.", _t"+Stone Link" end,