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

Merge branch 'master' of github.com:Fluorohydride/ygopro

parents 2f1d2e8c 3eab58b9
...@@ -20,7 +20,7 @@ function c19230407.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -20,7 +20,7 @@ function c19230407.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local g=Duel.SelectTarget(tp,c19230407.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) local g=Duel.SelectTarget(tp,c19230407.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
end end
function c19230407.activate(e) function c19230407.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsFaceup() and tc:IsRelateToEffect(e) then if tc:IsFaceup() and tc:IsRelateToEffect(e) then
Duel.Destroy(tc,REASON_EFFECT) Duel.Destroy(tc,REASON_EFFECT)
...@@ -30,6 +30,6 @@ function c19230407.activate(e) ...@@ -30,6 +30,6 @@ function c19230407.activate(e)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetCode(EFFECT_SKIP_DP) e1:SetCode(EFFECT_SKIP_DP)
e1:SetTargetRange(1,0) e1:SetTargetRange(1,0)
e1:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,2) e1:SetReset(RESET_PHASE+PHASE_END,3)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
...@@ -37,7 +37,7 @@ function c3078576.skipop(e,tp,eg,ep,ev,re,r,rp) ...@@ -37,7 +37,7 @@ function c3078576.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_DP) e1:SetCode(EFFECT_SKIP_DP)
e1:SetReset(RESET_PHASE+PHASE_DRAW+RESET_OPPO_TURN) e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function c3078576.retreg(e,tp,eg,ep,ev,re,r,rp) function c3078576.retreg(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -46,7 +46,7 @@ function c34230233.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -46,7 +46,7 @@ function c34230233.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
end end
function c34230233.desop(e,tp,eg,ep,ev,re,r,rp) function c34230233.desop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and Duel.Destroy(tc,REASON_EFFECT)~=0 and rp~=tp then if tc and tc:IsRelateToEffect(e) and Duel.Destroy(tc,REASON_EFFECT)~=0 and rp~=tp then
Duel.BreakEffect() Duel.BreakEffect()
local hg=Duel.GetFieldGroup(tp,0,LOCATION_HAND) local hg=Duel.GetFieldGroup(tp,0,LOCATION_HAND)
local cg=hg:RandomSelect(tp,1) local cg=hg:RandomSelect(tp,1)
......
...@@ -24,6 +24,6 @@ function c37576645.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -24,6 +24,6 @@ function c37576645.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetCode(EFFECT_SKIP_DP) e1:SetCode(EFFECT_SKIP_DP)
e1:SetTargetRange(1,0) e1:SetTargetRange(1,0)
e1:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,3) e1:SetReset(RESET_PHASE+PHASE_END,5)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
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