Fixes for some cards that allow other cards to deal double battle damage

Updated the following cards:
- Absolute Powerforce
- Azamina Ilia Silvia
- Cross Counter
- Crusadia Maximus
- Double Iris Magician
- Nagel's Protection
- Pitknight Filly
- Stoic Challenge
- Supreme King Dragon Odd-Eyes
- Tri-Gate Wizard
- X-Krawler Neurogos
- Xyz Armor Fortress

Their effect that doubles battle damage shouldn't affect the monster that's battling.

Author: pyrQ

official/c20145685.lua

@@ -28,6 +28,7 @@ function s.initial_effect(c)
 	--If a monster equipped with this card battles a monster, any battle damage it inflicts to your opponent is doubled
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_EQUIP)
+	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetCode(EFFECT_CHANGE_BATTLE_DAMAGE)
 	e2:SetCondition(function(e) return e:GetHandler():GetEquipTarget():GetBattleTarget() end)
 	e2:SetValue(aux.ChangeBattleDamage(1,DOUBLE_DAMAGE))
@@ -61,4 +62,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SendtoHand(thg,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,thg)
 	end
-end
+end

official/c25919316.lua

@@ -56,6 +56,7 @@ function s.doubleop(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e1)
 		--Also if it battles an opponent's monster, any battle damage it inflicts to your opponent is doubled
 		local e2=e1:Clone()
+		e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
 		e2:SetCode(EFFECT_CHANGE_BATTLE_DAMAGE)
 		e2:SetCondition(function(e) local bc=e:GetHandler():GetBattleTarget() return bc and bc:IsControler(1-e:GetHandlerPlayer()) end)
 		e2:SetValue(aux.ChangeBattleDamage(1,DOUBLE_DAMAGE))

official/c32617464.lua

@@ -2,31 +2,32 @@
 --Tri-Gate Wizard
 local s,id=GetID()
 function s.initial_effect(c)
-	--Link Summon procedure
-	Link.AddProcedure(c,s.matfilter,2)
 	c:EnableReviveLimit()
-	--Double damage
+	--Link Summon procedure: 2+ monsters, except Tokens
+	Link.AddProcedure(c,aux.FilterBoolFunctionEx(aux.NOT(Card.IsType),TYPE_TOKEN),2)
+	--If a monster co-linked to this card battles your opponent's monster, any battle damage it inflicts to your opponent is doubled
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetCode(EFFECT_CHANGE_BATTLE_DAMAGE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e1:SetTarget(s.damtg)
+	e1:SetTarget(s.doubledamtg)
 	e1:SetValue(aux.ChangeBattleDamage(1,DOUBLE_DAMAGE))
 	c:RegisterEffect(e1)
-	--Banish card
+	--Banish 1 card on the field
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,0))
 	e2:SetCategory(CATEGORY_REMOVE)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1)
-	e2:SetCondition(s.rmcon)
+	e2:SetCondition(function(e) return e:GetHandler():GetMutualLinkedGroupCount()>=2 end)
 	e2:SetTarget(s.rmtg)
 	e2:SetOperation(s.rmop)
 	c:RegisterEffect(e2)
-	--Negate activation
+	--Negate the activation of a card or effect, and if you do, banish that card
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(id,1))
 	e3:SetCategory(CATEGORY_NEGATE+CATEGORY_REMOVE)
@@ -40,41 +41,36 @@ function s.initial_effect(c)
 	e3:SetOperation(s.negop)
 	c:RegisterEffect(e3)
 end
-function s.matfilter(c,lc,sumtype,tp)
-	return not c:IsType(TYPE_TOKEN,lc,sumtype,tp)
-end
-function s.damtg(e,c)
+function s.doubledamtg(e,c)
+	local bc=c:GetBattleTarget()
 	local lg=e:GetHandler():GetMutualLinkedGroup()
-	return lg:IsContains(c) and c:GetBattleTarget()~=nil and c:GetBattleTarget():GetControler()==1-e:GetHandlerPlayer()
-end
-function s.rmcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetMutualLinkedGroupCount()>=2
+	return lg:IsContains(c) and bc and bc:IsControler(1-e:GetHandlerPlayer())
 end
 function s.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc:IsAbleToRemove() end
 	if chk==0 then return Duel.IsExistingTarget(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local g=Duel.SelectTarget(tp,Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
-	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,tp,0)
 end
 function s.rmop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc and tc:IsRelateToEffect(e) then
+	if tc:IsRelateToEffect(e) then
 		Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
 	end
 end
 function s.negcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return not c:IsStatus(STATUS_BATTLE_DESTROYED) and Duel.IsChainNegatable(ev) and c:GetMutualLinkedGroupCount()>=3
+	return c:GetMutualLinkedGroupCount()>=3 and not c:IsStatus(STATUS_BATTLE_DESTROYED) and Duel.IsChainNegatable(ev)
 end
 function s.negtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local rc=re:GetHandler()
 	local relation=rc:IsRelateToEffect(re)
 	if chk==0 then return rc:IsAbleToRemove(tp)
 		or (not relation and Duel.IsPlayerCanRemove(tp)) end
-	Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,tp,0)
 	if relation then
-		Duel.SetOperationInfo(0,CATEGORY_REMOVE,rc,1,rc:GetControler(),rc:GetLocation())
+		Duel.SetOperationInfo(0,CATEGORY_REMOVE,rc,1,tp,0)
 	else
 		Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,0,0,rc:GetPreviousLocation())
 	end

official/c37083210.lua

@@ -28,6 +28,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		--Any battle damage your monster inflicts on your opponent during that battle is doubled
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 		e1:SetCode(EFFECT_CHANGE_BATTLE_DAMAGE)
 		e1:SetCondition(function(e) return Duel.GetAttackTarget()==e:GetHandler() end)
 		e1:SetValue(aux.ChangeBattleDamage(1,DOUBLE_DAMAGE))
@@ -42,4 +43,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetOperation(function() if ac:IsRelateToBattle() then Duel.Destroy(ac,REASON_EFFECT) end end)
 	e2:SetReset(RESET_PHASE|PHASE_DAMAGE)
 	Duel.RegisterEffect(e2,tp)
-end
+end

official/c37364101.lua

@@ -2,63 +2,58 @@
 --Stoic Challenge
 local s,id=GetID()
 function s.initial_effect(c)
+	--You can only control 1 "Stoic Challenge"
 	c:SetUniqueOnField(1,0,id)
-	aux.AddEquipProcedure(c,nil,s.filter)
-	--Increase ATK
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_EQUIP)
-	e1:SetCode(EFFECT_UPDATE_ATTACK)
-	e1:SetValue(s.atkval)
-	c:RegisterEffect(e1)
-	--Change damage
+	--Equip only to a face-up Xyz Monster that has Xyz Material
+	aux.AddEquipProcedure(c,nil,function(c) return c:IsXyzMonster() and c:GetOverlayCount()>0 end)
+	--It gains 600 ATK for each Xyz Material attached to a monster you control
+	local e1a=Effect.CreateEffect(c)
+	e1a:SetType(EFFECT_TYPE_EQUIP)
+	e1a:SetCode(EFFECT_UPDATE_ATTACK)
+	e1a:SetValue(function(e,c) return Duel.GetOverlayCount(e:GetHandlerPlayer(),1,0)*600 end)
+	c:RegisterEffect(e1a)
+	--And any battle damage your opponent takes from battles involving it and their monster is doubled
+	local e1b=Effect.CreateEffect(c)
+	e1b:SetType(EFFECT_TYPE_EQUIP)
+	e1b:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
+	e1b:SetCode(EFFECT_CHANGE_BATTLE_DAMAGE)
+	e1b:SetCondition(function(e) local bc=e:GetHandler():GetEquipTarget():GetBattleTarget() return bc and bc:IsControler(1-e:GetHandlerPlayer()) end)
+	e1b:SetValue(aux.ChangeBattleDamage(1,DOUBLE_DAMAGE))
+	c:RegisterEffect(e1b)
+	--But its effects cannot be activated
+	local e1c=Effect.CreateEffect(c)
+	e1c:SetType(EFFECT_TYPE_EQUIP)
+	e1c:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
+	e1c:SetCode(EFFECT_CANNOT_TRIGGER)
+	c:RegisterEffect(e1c)
+	--Send this card to the Graveyard
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_EQUIP)
-	e2:SetCode(EFFECT_CHANGE_BATTLE_DAMAGE)
-	e2:SetCondition(s.damcon)
-	e2:SetValue(aux.ChangeBattleDamage(1,DOUBLE_DAMAGE))
+	e2:SetDescription(aux.Stringid(id,0))
+	e2:SetCategory(CATEGORY_TOGRAVE)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
+	e2:SetCode(EVENT_PHASE+PHASE_END)
+	e2:SetRange(LOCATION_SZONE)
+	e2:SetCountLimit(1)
+	e2:SetCondition(function(e,tp) return Duel.IsTurnPlayer(1-tp) end)
+	e2:SetTarget(s.tgtg)
+	e2:SetOperation(s.tgop)
 	c:RegisterEffect(e2)
-	--Prevent activation
+	--When this card leaves the field, destroy the equipped monster
 	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_EQUIP)
-	e3:SetCode(EFFECT_CANNOT_TRIGGER)
+	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+	e3:SetCode(EVENT_LEAVE_FIELD)
+	e3:SetOperation(s.desop)
 	c:RegisterEffect(e3)
-	--Send to the graveyard
-	local e4=Effect.CreateEffect(c)
-	e4:SetDescription(aux.Stringid(id,0))
-	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e4:SetCode(EVENT_PHASE+PHASE_END)
-	e4:SetRange(LOCATION_SZONE)
-	e4:SetCountLimit(1)
-	e4:SetCondition(s.tgcon)
-	e4:SetTarget(s.tgtg)
-	e4:SetOperation(s.tgop)
-	c:RegisterEffect(e4)
-	--Destroy monster
-	local e5=Effect.CreateEffect(c)
-	e5:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE)
-	e5:SetCode(EVENT_LEAVE_FIELD)
-	e5:SetOperation(s.desop)
-	c:RegisterEffect(e5)
-end
-function s.filter(c)
-	return c:GetOverlayCount()>0
-end
-function s.atkval(e,c)
-	return Duel.GetOverlayCount(e:GetHandlerPlayer(),1,0)*600
-end
-function s.damcon(e)
-	return e:GetHandler():GetEquipTarget():GetBattleTarget()~=nil
-end
-function s.tgcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsTurnPlayer(1-tp)
 end
+s.listed_names={id}
 function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,tp,0)
 end
 function s.tgop(e,tp,eg,ep,ev,re,r,rp)
-	if e:GetHandler():IsRelateToEffect(e) then
-		Duel.SendtoGrave(e:GetHandler(),REASON_EFFECT)
+	local c=e:GetHandler()
+	if c:IsRelateToEffect(e) then
+		Duel.SendtoGrave(c,REASON_EFFECT)
 	end
 end
 function s.desop(e,tp,eg,ep,ev,re,r,rp)

official/c46396218.lua

@@ -9,6 +9,7 @@ function s.initial_effect(c)
 	--Battle damage of other "Azamina" monsters is doubled
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetCode(EFFECT_CHANGE_BATTLE_DAMAGE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTargetRange(LOCATION_MZONE,0)

official/c49684352.lua

@@ -3,66 +3,62 @@
 local s,id=GetID()
 function s.initial_effect(c)
 	Pendulum.AddProcedure(c)
-	--Double damage
+	--Make 1 DARK Spellcaster monster you control inflict double battle damage to your opponent this turn if it battles an opponent's monster, then destroy this card
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
 	e1:SetCategory(CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetRange(LOCATION_PZONE)
 	e1:SetCountLimit(1)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e1:SetCondition(s.dbcon)
-	e1:SetTarget(s.dbtg)
-	e1:SetOperation(s.dbop)
+	e1:SetCondition(function() return Duel.IsAbleToEnterBP() end)
+	e1:SetTarget(s.destg)
+	e1:SetOperation(s.desop)
 	c:RegisterEffect(e1)
-	--Search
+	--Add 1 "Pendulumgraph" card from your Deck to your hand
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,1))
 	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_DESTROYED)
-	e2:SetCondition(s.thcon)
+	e2:SetCondition(function(e) return e:GetHandler():IsReason(REASON_BATTLE|REASON_EFFECT) end)
 	e2:SetTarget(s.thtg)
 	e2:SetOperation(s.thop)
 	c:RegisterEffect(e2)
 end
-s.listed_series={SET_PENDULUMGRAPH}
-function s.dbcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsAbleToEnterBP()
-end
-function s.dbfilter(c)
-	return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_SPELLCASTER) and c:GetFlagEffect(id)==0
+s.listed_series={SET_PENDULUM_DRAGON,SET_PENDULUMGRAPH}
+function s.tgfilter(c)
+	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_SPELLCASTER) and c:IsFaceup() and not c:HasFlagEffect(id)
 end
-function s.dbtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and s.dbfilter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(s.dbfilter,tp,LOCATION_MZONE,0,1,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
-	Duel.SelectTarget(tp,s.dbfilter,tp,LOCATION_MZONE,0,1,1,nil)
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,e:GetHandler(),1,0,0)
+function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and s.tgfilter(chkc) end
+	if chk==0 then return Duel.IsExistingTarget(s.tgfilter,tp,LOCATION_MZONE,0,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_APPLYTO)
+	Duel.SelectTarget(tp,s.tgfilter,tp,LOCATION_MZONE,0,1,1,nil)
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,e:GetHandler(),1,tp,0)
 end
-function s.dbop(e,tp,eg,ep,ev,re,r,rp)
+function s.desop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if c:IsRelateToEffect(e) and tc and tc:IsRelateToEffect(e) then
+	if tc:IsRelateToEffect(e) then
 		tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,0)
+		--Double any battle damage that monster inflicts to your opponent this turn if it battles an opponent's monster
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetDescription(aux.Stringid(id,0))
+		e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE+EFFECT_FLAG_CLIENT_HINT)
 		e1:SetCode(EFFECT_CHANGE_BATTLE_DAMAGE)
-		e1:SetCondition(s.damcon)
+		e1:SetCondition(function(e) local bc=e:GetHandler():GetBattleTarget() return bc and bc:IsControler(1-e:GetHandlerPlayer()) end)
 		e1:SetValue(aux.ChangeBattleDamage(1,DOUBLE_DAMAGE))
 		e1:SetReset(RESETS_STANDARD_PHASE_END)
 		tc:RegisterEffect(e1)
-		Duel.BreakEffect()
-		Duel.Destroy(c,REASON_EFFECT)
+		if c:IsRelateToEffect(e) then
+			Duel.BreakEffect()
+			Duel.Destroy(c,REASON_EFFECT)
+		end
 	end
 end
-function s.damcon(e)
-	return e:GetHandler():GetBattleTarget()~=nil
-end
-function s.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return r&REASON_EFFECT+REASON_BATTLE~=0
-end
 function s.thfilter(c)
 	return c:IsSetCard(SET_PENDULUMGRAPH) and c:IsAbleToHand()
 end