Merge pull request #1328 from DailyShana/patch-4

fix

script/c19019586.lua

@@ -12,10 +12,11 @@ function c19019586.initial_effect(c)
 	--defup
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(19019586,1))
-	e2:SetCategory(CATEGORY_ATKCHANGE)
+	e2:SetCategory(CATEGORY_DEFCHANGE)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetCondition(c19019586.defcon)
 	e2:SetCost(c19019586.defcost)
 	e2:SetOperation(c19019586.defop)
 	c:RegisterEffect(e2)
@@ -33,6 +34,10 @@ end
 function c19019586.cfilter(c)
 	return c:IsType(TYPE_NORMAL) and c:IsAbleToGraveAsCost()
 end
+function c19019586.defcon(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	return c==Duel.GetAttacker() or c==Duel.GetAttackTarget()
+end
 function c19019586.defcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():GetFlagEffect(19019586)==0
 		and Duel.IsExistingMatchingCard(c19019586.cfilter,tp,LOCATION_HAND,0,1,nil) end

script/c22227683.lua

@@ -2,6 +2,7 @@
 function c22227683.initial_effect(c)
 	--atk/def up
 	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_TOGRAVE+CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
 	e1:SetRange(LOCATION_MZONE)
@@ -20,7 +21,7 @@ function c22227683.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c22227683.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetAttackTarget()~=nil
+	return e:GetHandler():GetBattleTarget()~=nil
 end
 function c22227683.tgfilter(c)
 	return c:IsSetCard(0xab) and c:IsType(TYPE_MONSTER) and not c:IsCode(22227683) and c:IsAbleToGrave()

script/c31801517.lua

@@ -7,11 +7,9 @@ function c31801517.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(31801517,0))
 	e1:SetCategory(CATEGORY_ATKCHANGE)
-	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
-	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetHintTiming(TIMING_DAMAGE_CAL)
 	e1:SetCondition(c31801517.atkcon)
 	e1:SetCost(c31801517.atkcost)
 	e1:SetOperation(c31801517.atkop)
@@ -36,8 +34,7 @@ end
 c31801517.xyz_number=62
 function c31801517.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return (c==Duel.GetAttacker() or c==Duel.GetAttackTarget())
-		and Duel.GetCurrentPhase()==PHASE_DAMAGE_CAL and not Duel.IsDamageCalculated()
+	return c==Duel.GetAttacker() or c==Duel.GetAttackTarget()
 end
 function c31801517.atkcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

script/c54366836.lua

@@ -28,6 +28,7 @@ function c54366836.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
 	e3:SetRange(LOCATION_MZONE)
+	e3:SetCondition(c54366836.damcon2)
 	e3:SetCost(c54366836.damcost2)
 	e3:SetOperation(c54366836.damop2)
 	c:RegisterEffect(e3)
@@ -47,6 +48,9 @@ function c54366836.damop(e,tp,eg,ep,ev,re,r,rp)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
 	Duel.Damage(p,d,REASON_EFFECT)
 end
+function c54366836.damcon2(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetBattleTarget()~=nil
+end
 function c54366836.damcost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return c:GetFlagEffect(54366836)==0 and c:CheckRemoveOverlayCard(tp,1,REASON_COST) end

script/c96864105.lua

@@ -7,11 +7,9 @@ function c96864105.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(96864105,0))
 	e1:SetCategory(CATEGORY_ATKCHANGE)
-	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
-	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetHintTiming(TIMING_DAMAGE_CAL)
 	e1:SetCondition(c96864105.atkcon)
 	e1:SetCost(c96864105.atkcost)
 	e1:SetOperation(c96864105.atkop)
@@ -31,7 +29,6 @@ function c96864105.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local a=Duel.GetAttacker()
 	local d=Duel.GetAttackTarget()
 	return d and a:GetControler()~=d:GetControler()
-		and Duel.GetCurrentPhase()==PHASE_DAMAGE_CAL and not Duel.IsDamageCalculated()
 end
 function c96864105.atkcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()