Commit 1f4dd54e authored by POLYMER's avatar POLYMER

fix

parent b82ff3be
...@@ -76,7 +76,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -76,7 +76,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
e:SetProperty(c:GetProperty()) e:SetProperty(c:GetProperty())
local target=c:GetTarget() local target=c:GetTarget()
if target then target(e,tp,eg,ep,ev,re,r,rp,1) end if target then target(e,tp,eg,ep,ev,re,r,rp,1) end
if tp==Duel.GetTurnPlayer() then Duel.IsPlayerAffectedByEffect(tp,11451425):GetHandler():RegisterFlagEffect(11451425,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1) end if tp==Duel.GetTurnPlayer() and Duel.IsPlayerAffectedByEffect(tp,11451425) then Duel.IsPlayerAffectedByEffect(tp,11451425):GetHandler():RegisterFlagEffect(11451425,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1) end
Duel.ClearOperationInfo(0) Duel.ClearOperationInfo(0)
Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,0,0) Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,0,0)
end end
......
...@@ -75,7 +75,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -75,7 +75,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
e:SetProperty(c:GetProperty()) e:SetProperty(c:GetProperty())
local target=c:GetTarget() local target=c:GetTarget()
if target then target(e,tp,eg,ep,ev,re,r,rp,1) end if target then target(e,tp,eg,ep,ev,re,r,rp,1) end
if tp==Duel.GetTurnPlayer() then Duel.IsPlayerAffectedByEffect(tp,11451425):GetHandler():RegisterFlagEffect(11451425,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1) end if tp==Duel.GetTurnPlayer() and Duel.IsPlayerAffectedByEffect(tp,11451425) then Duel.IsPlayerAffectedByEffect(tp,11451425):GetHandler():RegisterFlagEffect(11451425,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1) end
Duel.ClearOperationInfo(0) Duel.ClearOperationInfo(0)
Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,0,0) Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,0,0)
end end
......
...@@ -75,7 +75,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -75,7 +75,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
e:SetProperty(c:GetProperty()) e:SetProperty(c:GetProperty())
local target=c:GetTarget() local target=c:GetTarget()
if target then target(e,tp,eg,ep,ev,re,r,rp,1) end if target then target(e,tp,eg,ep,ev,re,r,rp,1) end
if tp==Duel.GetTurnPlayer() then Duel.IsPlayerAffectedByEffect(tp,11451425):GetHandler():RegisterFlagEffect(11451425,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1) end if tp==Duel.GetTurnPlayer() and Duel.IsPlayerAffectedByEffect(tp,11451425) then Duel.IsPlayerAffectedByEffect(tp,11451425):GetHandler():RegisterFlagEffect(11451425,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1) end
Duel.ClearOperationInfo(0) Duel.ClearOperationInfo(0)
Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,0,0) Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,0,0)
end end
......
...@@ -52,10 +52,10 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -52,10 +52,10 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
local c=g:GetFirst() local c=g:GetFirst()
Duel.ConfirmCards(1-tp,c) Duel.ConfirmCards(1-tp,c)
Duel.ShuffleHand(tp) Duel.ShuffleHand(tp)
if tp==Duel.GetTurnPlayer() then Duel.IsPlayerAffectedByEffect(tp,11451425):GetHandler():RegisterFlagEffect(11451425,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1) end
end end
function cm.target(e,tp,eg,ep,ev,re,r,rp,chk) function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end if chk==0 then return e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
if tp==Duel.GetTurnPlayer() and Duel.IsPlayerAffectedByEffect(tp,11451425) then Duel.IsPlayerAffectedByEffect(tp,11451425):GetHandler():RegisterFlagEffect(11451425,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,tp,LOCATION_HAND) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,tp,LOCATION_HAND)
end end
function cm.operation(e,tp,eg,ep,ev,re,r,rp) function cm.operation(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -63,10 +63,10 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -63,10 +63,10 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
local c=g:GetFirst() local c=g:GetFirst()
Duel.ConfirmCards(1-tp,c) Duel.ConfirmCards(1-tp,c)
Duel.ShuffleHand(tp) Duel.ShuffleHand(tp)
if tp==Duel.GetTurnPlayer() then Duel.IsPlayerAffectedByEffect(tp,11451425):GetHandler():RegisterFlagEffect(11451425,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1) end
end end
function cm.target(e,tp,eg,ep,ev,re,r,rp,chk) function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end if chk==0 then return e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
if tp==Duel.GetTurnPlayer() and Duel.IsPlayerAffectedByEffect(tp,11451425) then Duel.IsPlayerAffectedByEffect(tp,11451425):GetHandler():RegisterFlagEffect(11451425,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,tp,LOCATION_HAND) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,tp,LOCATION_HAND)
end end
function cm.operation(e,tp,eg,ep,ev,re,r,rp) function cm.operation(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -58,7 +58,10 @@ function cm.check0(e,tp,eg,ep,ev,re,r,rp) ...@@ -58,7 +58,10 @@ function cm.check0(e,tp,eg,ep,ev,re,r,rp)
local rc=re:GetOwner() local rc=re:GetOwner()
if rc:IsOriginalSetCard(0x6978) and rc.hand_effect then if rc:IsOriginalSetCard(0x6978) and rc.hand_effect then
local te=rc.hand_effect[rc] local te=rc.hand_effect[rc]
if te:GetOperation()==re:GetOperation() then cm[rc.hand_effect]=Duel.GetTurnCount() end if te:GetOperation()==re:GetOperation() then
cm[rc.hand_effect]=cm[rc.hand_effect] or {}
cm[rc.hand_effect][re:GetHandlerPlayer()]=Duel.GetTurnCount()
end
end end
end end
function cm.tbfilter(c) function cm.tbfilter(c)
...@@ -97,7 +100,7 @@ function cm.acfilter(c,tp,eg,ep,ev,re,r,rp) ...@@ -97,7 +100,7 @@ function cm.acfilter(c,tp,eg,ep,ev,re,r,rp)
if not c:IsSetCard(0x6978) then return end if not c:IsSetCard(0x6978) then return end
if c:IsType(TYPE_SPELL+TYPE_TRAP) and ((c:CheckActivateEffect(false,false,false)~=nil and c:GetActivateEffect():GetCode()~=EVENT_CHAINING and Duel.GetLocationCount(tp,LOCATION_SZONE)>0) or (c:IsType(TYPE_CONTINUOUS) and c:GetActivateEffect():IsActivatable(tp)) or (c:IsType(TYPE_FIELD) and c:GetActivateEffect():IsActivatable(tp,true,true))) then return true end if c:IsType(TYPE_SPELL+TYPE_TRAP) and ((c:CheckActivateEffect(false,false,false)~=nil and c:GetActivateEffect():GetCode()~=EVENT_CHAINING and Duel.GetLocationCount(tp,LOCATION_SZONE)>0) or (c:IsType(TYPE_CONTINUOUS) and c:GetActivateEffect():IsActivatable(tp)) or (c:IsType(TYPE_FIELD) and c:GetActivateEffect():IsActivatable(tp,true,true))) then return true end
local te=c.hand_effect local te=c.hand_effect
if not te or (te[c]:GetCode()==EVENT_CHAINING and te[c]:IsHasType(EFFECT_TYPE_QUICK_O)) or (c:IsType(TYPE_MONSTER) and cm[te] and cm[te]==Duel.GetTurnCount()) then return false end if not te or (te[c]:GetCode()==EVENT_CHAINING and te[c]:IsHasType(EFFECT_TYPE_QUICK_O)) or (c:IsType(TYPE_MONSTER) and cm[te] and cm[te][tp] and cm[te][tp]==Duel.GetTurnCount()) then return false end
te=te[c] te=te[c]
local con=te:GetCondition() or aux.TRUE local con=te:GetCondition() or aux.TRUE
if te:IsHasType(EFFECT_TYPE_TRIGGER_O) then con=aux.TRUE end if te:IsHasType(EFFECT_TYPE_TRIGGER_O) then con=aux.TRUE end
...@@ -130,7 +133,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -130,7 +133,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
local b1,b2=false,false local b1,b2=false,false
if c:IsType(TYPE_SPELL+TYPE_TRAP) and ((c:CheckActivateEffect(false,false,false)~=nil and c:GetActivateEffect():GetCode()~=EVENT_CHAINING and Duel.GetLocationCount(tp,LOCATION_SZONE)>0) or (c:IsType(TYPE_CONTINUOUS) and c:GetActivateEffect():IsActivatable(tp)) or (c:IsType(TYPE_FIELD) and c:GetActivateEffect():IsActivatable(tp,true,true))) then b1=true end if c:IsType(TYPE_SPELL+TYPE_TRAP) and ((c:CheckActivateEffect(false,false,false)~=nil and c:GetActivateEffect():GetCode()~=EVENT_CHAINING and Duel.GetLocationCount(tp,LOCATION_SZONE)>0) or (c:IsType(TYPE_CONTINUOUS) and c:GetActivateEffect():IsActivatable(tp)) or (c:IsType(TYPE_FIELD) and c:GetActivateEffect():IsActivatable(tp,true,true))) then b1=true end
local te=c.hand_effect local te=c.hand_effect
if te and not (te[c]:GetCode()==EVENT_CHAINING and te[c]:IsHasType(EFFECT_TYPE_QUICK_O)) and not (c:IsType(TYPE_MONSTER) and cm[te] and cm[te]==Duel.GetTurnCount()) then if te and not (te[c]:GetCode()==EVENT_CHAINING and te[c]:IsHasType(EFFECT_TYPE_QUICK_O)) and not (c:IsType(TYPE_MONSTER) and cm[te] and cm[te][tp] and cm[te][tp]==Duel.GetTurnCount()) then
te=te[c] te=te[c]
local con=te:GetCondition() or aux.TRUE local con=te:GetCondition() or aux.TRUE
if te:IsHasType(EFFECT_TYPE_TRIGGER_O) then con=aux.TRUE end if te:IsHasType(EFFECT_TYPE_TRIGGER_O) then con=aux.TRUE end
......
...@@ -61,7 +61,7 @@ function c22022580.activate2(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,7 +61,7 @@ function c22022580.activate2(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c22022580.cfilter(c,tp) function c22022580.cfilter(c,tp)
return c:GetSummonLocation()==LOCATION_DECK or c:GetSummonLocation()==LOCATION_EXTRA and c:GetPreviousControler()==1-tp return (c:GetSummonLocation()==LOCATION_DECK or c:GetSummonLocation()==LOCATION_EXTRA) and c:GetPreviousControler()==1-tp
end end
function c22022580.spcon(e,tp,eg,ep,ev,re,r,rp) function c22022580.spcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c22022580.cfilter,1,nil,tp) return eg:IsExists(c22022580.cfilter,1,nil,tp)
......
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