Commit 959698e2 authored by mercury233's avatar mercury233

fix

parent 639cbfbc
...@@ -52,7 +52,7 @@ function s.valcheck(e,c) ...@@ -52,7 +52,7 @@ function s.valcheck(e,c)
end end
end end
function s.thfilter(c) function s.thfilter(c)
return c:IsSetCard(0x295) and c:IsAbleToHand() return c:IsSetCard(0x193) and c:IsAbleToHand()
end end
function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
......
...@@ -83,18 +83,19 @@ end ...@@ -83,18 +83,19 @@ end
function s.dfilter(c) function s.dfilter(c)
return c:IsCode(id+o) and c:IsFaceup() return c:IsCode(id+o) and c:IsFaceup()
end end
function s.sfilter(c,tp,seq,loc) function s.sfilter(c,p,seq,loc)
local sseq=c:GetSequence() local sseq=c:GetSequence()
if c:IsControler(1-tp) and loc==LOCATION_MZONE then if c:IsControler(1-p) then
return sseq==5 and seq==3 or sseq==6 and seq==1 return loc==LOCATION_MZONE and c:IsLocation(LOCATION_MZONE)
and (sseq==5 and seq==3 or sseq==6 and seq==1)
end end
if c:IsLocation(LOCATION_SZONE) then if c:IsLocation(LOCATION_SZONE) then
return sseq<5 and (sseq==seq or loc==LOCATION_SZONE and math.abs(sseq-seq)==1) return sseq<5 and (sseq==seq or loc==LOCATION_SZONE and math.abs(sseq-seq)==1)
end end
if sseq<5 then if sseq<5 then
return math.abs(sseq-seq)==1 return sseq==seq or loc==LOCATION_MZONE and math.abs(sseq-seq)==1
else else
return sseq==5 and seq==1 or sseq==6 and seq==3 return loc==LOCATION_MZONE and (sseq==5 and seq==1 or sseq==6 and seq==3)
end end
end end
function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
...@@ -109,7 +110,8 @@ end ...@@ -109,7 +110,8 @@ end
function s.desop(e,tp,eg,ep,ev,re,r,rp) function s.desop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) then if tc:IsRelateToEffect(e) then
local g=Duel.GetMatchingGroup(s.sfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,tc,tc:GetControler(),tc:GetSequence(),tc:GetLocation())+tc local g=Duel.GetMatchingGroup(s.sfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,tc,tc:GetControler(),tc:GetSequence(),tc:GetLocation())
g:AddCard(tc)
Duel.Destroy(g,REASON_EFFECT) Duel.Destroy(g,REASON_EFFECT)
end end
end end
...@@ -53,7 +53,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -53,7 +53,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end
end end
function s.filter(c) function s.filter(c)
return c:IsSetCard(0x290) and c:IsType(TYPE_TRAP) and c:IsAbleToHand() return c:IsSetCard(0x192) and c:IsType(TYPE_TRAP) and c:IsAbleToHand()
end end
function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK,0,1,nil) end
...@@ -66,10 +66,10 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -66,10 +66,10 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
function s.afilter(c) function s.afilter(c)
return c:IsFaceup() and c:IsSetCard(0x290) and c:IsSummonLocation(LOCATION_EXTRA) return c:IsFaceup() and c:IsSetCard(0x192) and c:IsSummonLocation(LOCATION_EXTRA)
end end
function s.rfilter(c) function s.rfilter(c)
return c:IsSetCard(0x290) and c:IsAbleToRemove() return c:IsSetCard(0x192) and c:IsAbleToRemove()
end end
function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and s.afilter(chkc) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and s.afilter(chkc) end
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
local s,id,o=GetID() local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
--link summon --link summon
aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x290),2,2,s.lcheck) aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x192),2,2,s.lcheck)
c:EnableReviveLimit() c:EnableReviveLimit()
--destroy --destroy
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
...@@ -14,10 +14,10 @@ function s.initial_effect(c) ...@@ -14,10 +14,10 @@ function s.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function s.thfilter(c,code) function s.thfilter(c,code)
return not c:IsCode(code) and c:IsSetCard(0x290) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() return not c:IsCode(code) and c:IsSetCard(0x192) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
end end
function s.cfilter(c,tp) function s.cfilter(c,tp)
return not c:IsPublic() and c:IsSetCard(0x290) and c:IsType(TYPE_MONSTER) return not c:IsPublic() and c:IsSetCard(0x192) and c:IsType(TYPE_MONSTER)
and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil,c:GetCode()) and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil,c:GetCode())
end end
function s.target(e,tp,eg,ep,ev,re,r,rp,chk) function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
...@@ -31,7 +31,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -31,7 +31,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
return c:IsSetCard(0x290) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsSetCard(0x192) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function s.activate(e,tp,eg,ep,ev,re,r,rp) function s.activate(e,tp,eg,ep,ev,re,r,rp)
local code=e:GetLabel() local code=e:GetLabel()
......
...@@ -21,7 +21,7 @@ function s.dgfilter(c,e,tp) ...@@ -21,7 +21,7 @@ function s.dgfilter(c,e,tp)
return c:IsSummonPlayer(1-tp) and c:IsCanBeEffectTarget(e) return c:IsSummonPlayer(1-tp) and c:IsCanBeEffectTarget(e)
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
return c:IsSetCard(0x290) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsSetCard(0x192) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return eg:IsContains(chkc) and s.dgfilter(chkc,e,tp) end if chkc then return eg:IsContains(chkc) and s.dgfilter(chkc,e,tp) end
......
...@@ -55,7 +55,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -55,7 +55,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end
end end
function s.filter(c,e,tp) function s.filter(c,e,tp)
return not c:IsRace(RACE_WARRIOR) and c:IsSetCard(0x290) return not c:IsRace(RACE_WARRIOR) and c:IsSetCard(0x192)
and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
end end
function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
...@@ -79,18 +79,18 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -79,18 +79,18 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function s.splimit(e,c) function s.splimit(e,c)
return not c:IsSetCard(0x290) and c:IsLocation(LOCATION_EXTRA) return not c:IsSetCard(0x192) and c:IsLocation(LOCATION_EXTRA)
end end
function s.scon(e,tp,eg,ep,ev,re,r,rp) function s.scon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()~=tp and (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2) return Duel.GetTurnPlayer()~=tp and (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2)
end end
function s.stg(e,tp,eg,ep,ev,re,r,rp,chk) function s.stg(e,tp,eg,ep,ev,re,r,rp,chk)
local g=Duel.GetMatchingGroup(Card.IsSetCard,tp,LOCATION_MZONE,0,nil,0x290) local g=Duel.GetMatchingGroup(Card.IsSetCard,tp,LOCATION_MZONE,0,nil,0x192)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,1,nil,nil,g) end if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,1,nil,nil,g) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
end end
function s.sop(e,tp,eg,ep,ev,re,r,rp) function s.sop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetMatchingGroup(Card.IsSetCard,tp,LOCATION_MZONE,0,nil,0x290) local g=Duel.GetMatchingGroup(Card.IsSetCard,tp,LOCATION_MZONE,0,nil,0x192)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local sc=Duel.SelectMatchingCard(tp,Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,1,1,nil,nil,g):GetFirst() local sc=Duel.SelectMatchingCard(tp,Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,1,1,nil,nil,g):GetFirst()
if sc then Duel.SynchroSummon(tp,sc,nil,g) end if sc then Duel.SynchroSummon(tp,sc,nil,g) 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