Skip to content

Y
ygopro
Commit 164270ed authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

fix

parent 0b9249bb
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 9 deletions
script/c36970611.lua
View file @ 164270ed
...@@ -33,7 +33,7 @@ function c36970611.initial_effect(c) ...@@ -33,7 +33,7 @@ function c36970611.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c36970611.cfilter(c) function c36970611.cfilter(c)
return c:IsSetCard(0xc1) and (c:IsLocation(LOCATION_HAND) or c:IsFaceup()) and c:IsAbleToRemoveAsCost() return c:IsSetCard(0xc1) and c:IsType(TYPE_MONSTER) and (c:IsLocation(LOCATION_HAND) or c:IsFaceup()) and c:IsAbleToRemoveAsCost()
and Duel.IsExistingTarget(Card.IsAbleToRemove,0,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c) and Duel.IsExistingTarget(Card.IsAbleToRemove,0,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c)
end end
function c36970611.target1(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c36970611.target1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
......
script/c37192109.lua
View file @ 164270ed
...@@ -45,11 +45,17 @@ function c37192109.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -45,11 +45,17 @@ function c37192109.rmop(e,tp,eg,ep,ev,re,r,rp)
if not c:IsRelateToEffect(e) or not tc:IsRelateToEffect(e) then return end if not c:IsRelateToEffect(e) or not tc:IsRelateToEffect(e) then return end
local g=Group.FromCards(c,tc) local g=Group.FromCards(c,tc)
if Duel.Remove(g,0,REASON_EFFECT+REASON_TEMPORARY)~=0 then if Duel.Remove(g,0,REASON_EFFECT+REASON_TEMPORARY)~=0 then
local fid=e:GetHandler():GetFieldID() local fid=c:GetFieldID()
local rct=1
if Duel.GetTurnPlayer()==tp and Duel.GetCurrentPhase()==PHASE_STANDBY then rct=2 end
local og=Duel.GetOperatedGroup() local og=Duel.GetOperatedGroup()
local oc=og:GetFirst() local oc=og:GetFirst()
while oc do while oc do
oc:RegisterFlagEffect(37192109,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY,0,2,fid) if oc:IsControler(tp) then
oc:RegisterFlagEffect(37192109,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,0,rct,fid)
else
oc:RegisterFlagEffect(37192109,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY+RESET_OPPO_TURN,0,1,fid)
end
oc=og:GetNext() oc=og:GetNext()
end end
og:KeepAlive() og:KeepAlive()
...@@ -57,12 +63,18 @@ function c37192109.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,12 +63,18 @@ function c37192109.rmop(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e1:SetCode(EVENT_PHASE+PHASE_STANDBY) e1:SetCode(EVENT_PHASE+PHASE_STANDBY)
e1:SetReset(RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN)
e1:SetCountLimit(1) e1:SetCountLimit(1)
e1:SetLabel(fid) e1:SetLabel(fid)
e1:SetLabelObject(og) e1:SetLabelObject(og)
e1:SetCondition(c37192109.retcon) e1:SetCondition(c37192109.retcon)
e1:SetOperation(c37192109.retop) e1:SetOperation(c37192109.retop)
if Duel.GetTurnPlayer()==tp and Duel.GetCurrentPhase()==PHASE_STANDBY then
e1:SetReset(RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,2)
e1:SetValue(Duel.GetTurnCount())
else
e1:SetReset(RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN)
e1:SetValue(0)
end
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
end end
...@@ -70,7 +82,7 @@ function c37192109.retfilter(c,fid) ...@@ -70,7 +82,7 @@ function c37192109.retfilter(c,fid)
return c:GetFlagEffectLabel(37192109)==fid return c:GetFlagEffectLabel(37192109)==fid
end end
function c37192109.retcon(e,tp,eg,ep,ev,re,r,rp) function c37192109.retcon(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetTurnPlayer()~=tp then return false end if Duel.GetTurnPlayer()~=tp or Duel.GetTurnCount()==e:GetValue() then return false end
local g=e:GetLabelObject() local g=e:GetLabelObject()
if not g:IsExists(c37192109.retfilter,1,nil,e:GetLabel()) then if not g:IsExists(c37192109.retfilter,1,nil,e:GetLabel()) then
g:DeleteGroup() g:DeleteGroup()
......
script/c74586817.lua
View file @ 164270ed
...@@ -55,11 +55,15 @@ function c74586817.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -55,11 +55,15 @@ function c74586817.rmop(e,tp,eg,ep,ev,re,r,rp)
local rs=g:RandomSelect(1-tp,1) local rs=g:RandomSelect(1-tp,1)
local rg=Group.FromCards(c,rs:GetFirst()) local rg=Group.FromCards(c,rs:GetFirst())
if Duel.Remove(rg,POS_FACEUP,REASON_EFFECT+REASON_TEMPORARY)~=0 then if Duel.Remove(rg,POS_FACEUP,REASON_EFFECT+REASON_TEMPORARY)~=0 then
local fid=e:GetHandler():GetFieldID() local fid=c:GetFieldID()
local og=Duel.GetOperatedGroup() local og=Duel.GetOperatedGroup()
local oc=og:GetFirst() local oc=og:GetFirst()
while oc do while oc do
oc:RegisterFlagEffect(74586817,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY,0,2,fid) if oc:IsControler(tp) then
oc:RegisterFlagEffect(74586817,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,0,1,fid)
else
oc:RegisterFlagEffect(74586817,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY+RESET_OPPO_TURN,0,1,fid)
end
oc=og:GetNext() oc=og:GetNext()
end end
og:KeepAlive() og:KeepAlive()
...@@ -67,12 +71,12 @@ function c74586817.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -67,12 +71,12 @@ function c74586817.rmop(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e1:SetCode(EVENT_PHASE+PHASE_STANDBY) e1:SetCode(EVENT_PHASE+PHASE_STANDBY)
e1:SetReset(RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN)
e1:SetCountLimit(1) e1:SetCountLimit(1)
e1:SetLabel(fid) e1:SetLabel(fid)
e1:SetLabelObject(og) e1:SetLabelObject(og)
e1:SetCondition(c74586817.retcon) e1:SetCondition(c74586817.retcon)
e1:SetOperation(c74586817.retop) e1:SetOperation(c74586817.retop)
e1:SetReset(RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
end end
...@@ -121,7 +125,7 @@ function c74586817.retop(e,tp,eg,ep,ev,re,r,rp) ...@@ -121,7 +125,7 @@ function c74586817.retop(e,tp,eg,ep,ev,re,r,rp)
end end
function c74586817.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c74586817.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsAbleToDeck() and chkc~=e:GetHandler() end if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsAbleToDeck() and chkc~=e:GetHandler() end
if chk==0 then return e:GetHandler():IsAbleToDeck() if chk==0 then return e:GetHandler():IsAbleToExtra()
and Duel.IsExistingTarget(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,e:GetHandler()) end and Duel.IsExistingTarget(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,e:GetHandler()) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local g=Duel.SelectTarget(tp,Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,e:GetHandler()) local g=Duel.SelectTarget(tp,Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,e:GetHandler())
......
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