Commit fc2e3f55 authored by mercury233's avatar mercury233

fix

parent f8cfcb52
......@@ -70,19 +70,19 @@ function c37310367.disop(e,tp,eg,ep,ev,re,r,rp)
local sc=g:GetFirst()
if sc==rc then sc=g:GetNext() end
if sc:IsControler(tp) and sc:IsRace(RACE_CYBERS) and rc:IsControler(1-tp) then
while tc do
Duel.NegateRelatedChain(tc,RESET_TURN_SET)
while sc do
Duel.NegateRelatedChain(sc,RESET_TURN_SET)
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_DISABLE)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e1)
sc:RegisterEffect(e1)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e2)
tc=g:GetNext()
sc:RegisterEffect(e2)
sc=g:GetNext()
end
end
end
......@@ -76,7 +76,7 @@ function c59934749.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
return true
end
function c59934749.cfilter(c)
return c:IsType(TYPE_SPELL) and c:IsType(TYPE_EQUIP) and c:IsAbleToGrave()
return c:IsType(TYPE_SPELL) and c:IsType(TYPE_EQUIP) and c:IsAbleToGraveAsCost()
end
function c59934749.spfilter(c,e,tp,lv)
return c:IsRace(RACE_WARRIOR) and c:IsLevelBelow(lv) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
......@@ -87,7 +87,7 @@ function c59934749.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if e:GetLabel()~=100 then return false end
e:SetLabel(0)
local cg=Duel.GetMatchingGroup(c59934749.cfilter,tp,LOCATION_DECK,0,nil)
return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and cg:GetCount()>0
and Duel.IsExistingMatchingCard(c59934749.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp,cg:GetClassCount(Card.GetCode))
end
local cg=Duel.GetMatchingGroup(c59934749.cfilter,tp,LOCATION_DECK,0,nil)
......
......@@ -32,7 +32,8 @@ function c85216896.matfilter(c)
end
function c85216896.cfilter(c,tp,zone)
local seq=c:GetPreviousSequence()
return c:GetPreviousControler()==tp and bit.extract(zone,seq)~=0 and c:GetSummonLocation()==LOCATION_EXTRA and c:IsReason(REASON_BATTLE+REASON_EFFECT)
return c:GetPreviousControler()==tp and bit.extract(zone,seq)~=0 and c:GetSummonLocation()==LOCATION_EXTRA
and (c:IsReason(REASON_BATTLE) or c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()~=tp)
end
function c85216896.thcon(e,tp,eg,ep,ev,re,r,rp)
local zone=e:GetHandler():GetLinkedZone()
......
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