Commit ef2127c3 authored by POLYMER's avatar POLYMER

fix

parent ade74b99
...@@ -44,7 +44,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -44,7 +44,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp)
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
return c:IsSetCard(0x3226) and c:GetType()==TYPE_SPELL return c:IsSetCard(0x3226) and c:GetType()==TYPE_SPELL
and Duel.IsPlayerCanSpecialSummonMonster(tp,id,0x3226,0x11,0,0,1,RACE_CYBERSE,ATTRIBUTE_LIGHT) and Duel.IsPlayerCanSpecialSummonMonster(tp,id,0x3226,0x11,0,0,1,RACE_CYBERSE,ATTRIBUTE_LIGHT) and c:IsFaceupEx()
end end
function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
......
...@@ -61,10 +61,10 @@ function s.splimit(e,c) ...@@ -61,10 +61,10 @@ function s.splimit(e,c)
return c:IsLocation(LOCATION_EXTRA) and not (c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION)) return c:IsLocation(LOCATION_EXTRA) and not (c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION))
end end
function s.filter1(c,e) function s.filter1(c,e)
return c:IsRace(RACE_MACHINE) and not c:IsImmuneToEffect(e) return not c:IsImmuneToEffect(e)
end end
function s.filter2(c,e,tp,m,f,chkf) function s.filter2(c,e,tp,m,f,chkf)
return c:IsType(TYPE_FUSION) and (not f or f(c)) return c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION) and (not f or f(c))
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
end end
function s.fusop(e,tp,eg,ep,ev,re,r,rp) function s.fusop(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -60,10 +60,10 @@ function s.splimit(e,c) ...@@ -60,10 +60,10 @@ function s.splimit(e,c)
return c:IsLocation(LOCATION_EXTRA) and not (c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION)) return c:IsLocation(LOCATION_EXTRA) and not (c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION))
end end
function s.filter1(c,e) function s.filter1(c,e)
return c:IsRace(RACE_MACHINE) and not c:IsImmuneToEffect(e) return not c:IsImmuneToEffect(e)
end end
function s.filter2(c,e,tp,m,f,chkf) function s.filter2(c,e,tp,m,f,chkf)
return c:IsType(TYPE_FUSION) and (not f or f(c)) return c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION) and (not f or f(c))
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
end end
function s.fusop(e,tp,eg,ep,ev,re,r,rp) function s.fusop(e,tp,eg,ep,ev,re,r,rp)
...@@ -138,12 +138,10 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp) ...@@ -138,12 +138,10 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp)
local e3=e1:Clone() local e3=e1:Clone()
e3:SetCode(EFFECT_DISABLE_TRAPMONSTER) e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
tc:RegisterEffect(e3) tc:RegisterEffect(e3)
end end
if tc:IsDisabled() then if Duel.SelectYesNo(tp,aux.Stringid(id,3)) then
Duel.BreakEffect() Duel.BreakEffect()
if Duel.SelectYesNo(tp,aux.Stringid(id,3)) then Duel.Destroy(tc,REASON_EFFECT)
Duel.Destroy(tc,REASON_EFFECT)
end
end end
end end
end end
......
...@@ -61,10 +61,10 @@ function s.splimit(e,c) ...@@ -61,10 +61,10 @@ function s.splimit(e,c)
return c:IsLocation(LOCATION_EXTRA) and not (c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION)) return c:IsLocation(LOCATION_EXTRA) and not (c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION))
end end
function s.filter1(c,e) function s.filter1(c,e)
return c:IsRace(RACE_MACHINE) and not c:IsImmuneToEffect(e) return not c:IsImmuneToEffect(e)
end end
function s.filter2(c,e,tp,m,f,chkf) function s.filter2(c,e,tp,m,f,chkf)
return c:IsType(TYPE_FUSION) and (not f or f(c)) return c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION) and (not f or f(c))
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
end end
function s.fusop(e,tp,eg,ep,ev,re,r,rp) function s.fusop(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -61,10 +61,10 @@ function s.splimit(e,c) ...@@ -61,10 +61,10 @@ function s.splimit(e,c)
return c:IsLocation(LOCATION_EXTRA) and not (c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION)) return c:IsLocation(LOCATION_EXTRA) and not (c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION))
end end
function s.filter1(c,e) function s.filter1(c,e)
return c:IsRace(RACE_MACHINE) and not c:IsImmuneToEffect(e) return not c:IsImmuneToEffect(e)
end end
function s.filter2(c,e,tp,m,f,chkf) function s.filter2(c,e,tp,m,f,chkf)
return c:IsType(TYPE_FUSION) and (not f or f(c)) return c:IsRace(RACE_MACHINE) and c:IsType(TYPE_FUSION) and (not f or f(c))
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
end end
function s.fusop(e,tp,eg,ep,ev,re,r,rp) function s.fusop(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -79,7 +79,7 @@ function c28333723.tdcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -79,7 +79,7 @@ function c28333723.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SendtoDeck(e:GetHandler(),nil,SEQ_DECKSHUFFLE,REASON_COST) Duel.SendtoDeck(e:GetHandler(),nil,SEQ_DECKSHUFFLE,REASON_COST)
end end
function c28333723.tdfilter(c) function c28333723.tdfilter(c)
return Duel.GetTurnCount()~=c:GetTurnID() or c:IsReason(REASON_DESTROY+REASON_RETURN) return Duel.GetTurnCount()~=c:GetTurnID() or c:IsReason(REASON_DESTROY+REASON_RETURN) and c:IsType(TYPE_MONSTER)
end end
function c28333723.tdtg(e,tp,eg,ep,ev,re,r,rp,chk) function c28333723.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c28333723.tdfilter,tp,LOCATION_GRAVE,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c28333723.tdfilter,tp,LOCATION_GRAVE,0,1,nil) 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