Commit a6bd95a6 authored by argon.sun's avatar argon.sun

fix

parent 89a2d427
...@@ -46,19 +46,20 @@ function c13959634.hdop(e,tp,eg,ep,ev,re,r,rp) ...@@ -46,19 +46,20 @@ function c13959634.hdop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoGrave(g,REASON_EFFECT+REASON_DISCARD) Duel.SendtoGrave(g,REASON_EFFECT+REASON_DISCARD)
end end
function c13959634.leaveop(e,tp,eg,ep,ev,re,r,rp) function c13959634.leaveop(e,tp,eg,ep,ev,re,r,rp)
local effp=e:GetHandler():GetPreviousControler()
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_SKIP_BP) e1:SetCode(EFFECT_SKIP_BP)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetTargetRange(1,0) e1:SetTargetRange(1,0)
if Duel.GetTurnPlayer()==tp then if Duel.GetTurnPlayer()==effp then
e1:SetLabel(Duel.GetTurnCount()) e1:SetLabel(Duel.GetTurnCount())
e1:SetCondition(c13959634.skipcon) e1:SetCondition(c13959634.skipcon)
e1:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,2) e1:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,2)
else else
e1:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,1) e1:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,1)
end end
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,effp)
end end
function c13959634.skipcon(e) function c13959634.skipcon(e)
return Duel.GetTurnCount()~=e:GetLabel() return Duel.GetTurnCount()~=e:GetLabel()
......
...@@ -46,7 +46,7 @@ end ...@@ -46,7 +46,7 @@ end
function c61344030.operation(e,tp,eg,ep,ev,re,r,rp) function c61344030.operation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsFaceup() and tc:IsRelateToEffect(e) then if tc:IsFaceup() and tc:IsRelateToEffect(e) and tc:GetAttack()>0 then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetCode(EFFECT_SET_ATTACK_FINAL)
......
...@@ -55,19 +55,20 @@ function c61468779.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -55,19 +55,20 @@ function c61468779.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c61468779.leaveop(e,tp,eg,ep,ev,re,r,rp) function c61468779.leaveop(e,tp,eg,ep,ev,re,r,rp)
local effp=e:GetHandler():GetPreviousControler()
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_SKIP_BP) e1:SetCode(EFFECT_SKIP_BP)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetTargetRange(1,0) e1:SetTargetRange(1,0)
if Duel.GetTurnPlayer()==tp then if Duel.GetTurnPlayer()==effp then
e1:SetLabel(Duel.GetTurnCount()) e1:SetLabel(Duel.GetTurnCount())
e1:SetCondition(c61468779.skipcon) e1:SetCondition(c61468779.skipcon)
e1:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,2) e1:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,2)
else else
e1:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,1) e1:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,1)
end end
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,effp)
end end
function c61468779.skipcon(e) function c61468779.skipcon(e)
return Duel.GetTurnCount()~=e:GetLabel() return Duel.GetTurnCount()~=e:GetLabel()
......
...@@ -73,7 +73,7 @@ end ...@@ -73,7 +73,7 @@ end
function c97617181.atkcon(e,tp,eg,ep,ev,re,r,rp) function c97617181.atkcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=c:GetFirstCardTarget() local tc=c:GetFirstCardTarget()
if tc and tc:IsLocation(LOCATION_MZONE) and tc:IsFaceup() then if tc and tc:IsLocation(LOCATION_MZONE) and tc:IsFaceup() and not c:IsLocation(LOCATION_DECK) then
e:SetLabelObject(tc) e:SetLabelObject(tc)
tc:CreateEffectRelation(e) tc:CreateEffectRelation(e)
return true return true
......
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