Commit f3a71d34 authored by mercury233's avatar mercury233

fix skip M1 in M1

parent ef8e2324
...@@ -27,6 +27,15 @@ function c55870497.skipop(e,tp,eg,ep,ev,re,r,rp) ...@@ -27,6 +27,15 @@ function c55870497.skipop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCode(EFFECT_SKIP_M1) e1:SetCode(EFFECT_SKIP_M1)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetTargetRange(0,1) e1:SetTargetRange(0,1)
e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN) if Duel.GetTurnPlayer()==1-tp then
e1:SetLabel(Duel.GetTurnCount())
e1:SetCondition(c55870497.turncon)
e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,2)
else
e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,1)
end
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function c55870497.turncon(e)
return Duel.GetTurnCount()~=e:GetLabel()
end
...@@ -36,9 +36,18 @@ function c98287529.skipop(e,tp,eg,ep,ev,re,r,rp) ...@@ -36,9 +36,18 @@ function c98287529.skipop(e,tp,eg,ep,ev,re,r,rp)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetTargetRange(0,1) e1:SetTargetRange(0,1)
e1:SetCode(EFFECT_SKIP_M1) e1:SetCode(EFFECT_SKIP_M1)
e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN) if Duel.GetTurnPlayer()==1-tp then
e1:SetLabel(Duel.GetTurnCount())
e1:SetCondition(c98287529.turncon)
e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,2)
else
e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,1)
end
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function c98287529.turncon(e)
return Duel.GetTurnCount()~=e:GetLabel()
end
function c98287529.distg(e,c) function c98287529.distg(e,c)
return c:IsType(TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ) return c:IsType(TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ)
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment