Commit 40bbdac9 authored by wind2009's avatar wind2009

Fix

parent f3fb5ecd
Pipeline #37762 failed with stages
in 2 minutes and 52 seconds
...@@ -98,4 +98,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp) ...@@ -98,4 +98,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToChain() and aux.NecroValleyFilter()(c) then if c:IsRelateToChain() and aux.NecroValleyFilter()(c) then
Duel.SSet(tp,c) Duel.SSet(tp,c)
end end
end end
\ No newline at end of file
...@@ -107,4 +107,4 @@ function s.eqop(e,tp,eg,ep,ev,re,r,rp) ...@@ -107,4 +107,4 @@ function s.eqop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.eqlimit(e,c) function s.eqlimit(e,c)
return c==e:GetLabelObject() return c==e:GetLabelObject()
end end
\ No newline at end of file
...@@ -62,4 +62,4 @@ function s.atcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -62,4 +62,4 @@ function s.atcost(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function s.atop(e,tp,eg,ep,ev,re,r,rp) function s.atop(e,tp,eg,ep,ev,re,r,rp)
Duel.ChainAttack() Duel.ChainAttack()
end end
\ No newline at end of file
...@@ -81,4 +81,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -81,4 +81,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
if #g>0 then if #g>0 then
Duel.SpecialSummon(g,0,tp,tp,false,true,POS_FACEUP) Duel.SpecialSummon(g,0,tp,tp,false,true,POS_FACEUP)
end end
end end
\ No newline at end of file
...@@ -65,4 +65,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,4 +65,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
local g=Group.FromCards(c,tc) local g=Group.FromCards(c,tc)
Duel.Destroy(g,REASON_EFFECT) Duel.Destroy(g,REASON_EFFECT)
end end
end end
\ No newline at end of file
...@@ -65,4 +65,4 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,4 +65,4 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
and Duel.NegateEffect(ev) and re:GetHandler():IsRelateToChain(ev) then and Duel.NegateEffect(ev) and re:GetHandler():IsRelateToChain(ev) then
Duel.Destroy(eg,REASON_EFFECT) Duel.Destroy(eg,REASON_EFFECT)
end end
end end
\ No newline at end of file
...@@ -49,7 +49,7 @@ function s.descost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -49,7 +49,7 @@ function s.descost(e,tp,eg,ep,ev,re,r,rp,chk)
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)
if chkc then return chkc:IsLocation(LOCATION_ONFIELD) and chkc:IsControler(1-tp) end if chkc then return chkc:IsLocation(LOCATION_ONFIELD) and chkc:IsControler(1-tp) end
if chk==0 then return Duel.IsExistingTarget(aux.TRUE,tp,0,LOCATION_ONFIELD,2,nil) end if chk==0 then return Duel.IsExistingTarget(aux.TRUE,tp,0,LOCATION_ONFIELD,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local g=Duel.SelectTarget(tp,aux.TRUE,tp,0,LOCATION_ONFIELD,1,2,nil) local g=Duel.SelectTarget(tp,aux.TRUE,tp,0,LOCATION_ONFIELD,1,2,nil)
g:AddCard(e:GetHandler()) g:AddCard(e:GetHandler())
...@@ -68,4 +68,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -68,4 +68,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
Duel.Damage(1-tp,dam*500,REASON_EFFECT) Duel.Damage(1-tp,dam*500,REASON_EFFECT)
end end
end end
end end
\ No newline at end of file
...@@ -88,4 +88,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -88,4 +88,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.splimit(e,c) function s.splimit(e,c)
return c:IsLocation(LOCATION_EXTRA) and not (c:IsRace(RACE_MACHINE) and c:IsAttackBelow(1500)) return c:IsLocation(LOCATION_EXTRA) and not (c:IsRace(RACE_MACHINE) and c:IsAttackBelow(1500))
end end
\ No newline at end of file
...@@ -66,4 +66,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -66,4 +66,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
end end
\ No newline at end of file
...@@ -79,4 +79,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -79,4 +79,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
end end
end end
\ No newline at end of file
...@@ -40,7 +40,7 @@ function s.splimit(e,c) ...@@ -40,7 +40,7 @@ function s.splimit(e,c)
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
return c:IsSetCard(0x2d2) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsSetCard(0x2d2) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
and not Duel.IsExistingMatchingCard(aux.AND(Card.IsFaceup,Card.IsCode),tp,LOCATION_ONFIELD,0,1,nil,e:GetCode()) and not Duel.IsExistingMatchingCard(aux.AND(Card.IsFaceup,Card.IsCode),tp,LOCATION_ONFIELD,0,1,nil,c:GetCode())
and (c:IsLocation(LOCATION_DECK) and Duel.GetMZoneCount(tp)>0 and (c:IsLocation(LOCATION_DECK) and Duel.GetMZoneCount(tp)>0
or c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0) or c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0)
end end
...@@ -68,4 +68,4 @@ function s.repval(e,c) ...@@ -68,4 +68,4 @@ function s.repval(e,c)
end end
function s.repop(e,tp,eg,ep,ev,re,r,rp) function s.repop(e,tp,eg,ep,ev,re,r,rp)
Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_EFFECT) Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_EFFECT)
end end
\ No newline at end of file
...@@ -89,4 +89,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -89,4 +89,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
end end
\ No newline at end of file
...@@ -65,4 +65,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,4 +65,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
end end
function s.splimit(e,c,tp,sumtp,sumpos) function s.splimit(e,c,tp,sumtp,sumpos)
return not c:IsAttribute(ATTRIBUTE_WIND) return not c:IsAttribute(ATTRIBUTE_WIND)
end end
\ No newline at end of file
...@@ -47,4 +47,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,4 +47,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
end end
\ No newline at end of file
...@@ -47,4 +47,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,4 +47,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
end end
\ No newline at end of file
...@@ -95,4 +95,4 @@ end ...@@ -95,4 +95,4 @@ end
function s.indescon(e) function s.indescon(e)
local tp=e:GetHandlerPlayer() local tp=e:GetHandlerPlayer()
return not Duel.IsExistingMatchingCard(s.cfilter,tp,0,LOCATION_ONFIELD,1,nil) return not Duel.IsExistingMatchingCard(s.cfilter,tp,0,LOCATION_ONFIELD,1,nil)
end end
\ No newline at end of file
...@@ -84,4 +84,4 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -84,4 +84,4 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Destroy(rc,REASON_EFFECT) Duel.Destroy(rc,REASON_EFFECT)
end end
end end
\ No newline at end of file
...@@ -77,4 +77,4 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp) ...@@ -77,4 +77,4 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
end end
end end
\ No newline at end of file
...@@ -110,4 +110,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -110,4 +110,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
if #g>0 then if #g>0 then
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
end end
end end
\ No newline at end of file
...@@ -126,4 +126,4 @@ function s.thop3(e,tp,eg,ep,ev,re,r,rp) ...@@ -126,4 +126,4 @@ function s.thop3(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
end end
\ No newline at end of file
...@@ -103,4 +103,4 @@ function s.rsop(e,tp,eg,ep,ev,re,r,rp) ...@@ -103,4 +103,4 @@ function s.rsop(e,tp,eg,ep,ev,re,r,rp)
tc:CompleteProcedure() tc:CompleteProcedure()
end end
aux.RCheckAdditional=nil aux.RCheckAdditional=nil
end end
\ No newline at end of file
...@@ -91,4 +91,4 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp) ...@@ -91,4 +91,4 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp)
Duel.Release(g,REASON_EFFECT) Duel.Release(g,REASON_EFFECT)
end end
end end
end end
\ No newline at end of file
...@@ -85,4 +85,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -85,4 +85,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.actcon(e) function s.actcon(e)
return Duel.GetAttacker()==e:GetHandler() or Duel.GetAttackTarget()==e:GetHandler() return Duel.GetAttacker()==e:GetHandler() or Duel.GetAttackTarget()==e:GetHandler()
end end
\ No newline at end of file
...@@ -83,4 +83,4 @@ function s.thop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -83,4 +83,4 @@ function s.thop2(e,tp,eg,ep,ev,re,r,rp)
end end
function s.atlimit(e,c) function s.atlimit(e,c)
return c~=e:GetHandler() return c~=e:GetHandler()
end end
\ No newline at end of file
...@@ -128,4 +128,4 @@ function s.fspop(e,tp,eg,ep,ev,re,r,rp) ...@@ -128,4 +128,4 @@ function s.fspop(e,tp,eg,ep,ev,re,r,rp)
end end
tc:CompleteProcedure() tc:CompleteProcedure()
end end
end end
\ No newline at end of file
...@@ -61,4 +61,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,4 +61,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
if tc then if tc then
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
end end
end end
\ No newline at end of file
...@@ -86,4 +86,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp) ...@@ -86,4 +86,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToChain() and aux.NecroValleyFilter()(c) then if c:IsRelateToChain() and aux.NecroValleyFilter()(c) then
Duel.SSet(tp,c) Duel.SSet(tp,c)
end end
end end
\ No newline at end of file
...@@ -85,4 +85,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp) ...@@ -85,4 +85,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToChain() and aux.NecroValleyFilter()(c) then if c:IsRelateToChain() and aux.NecroValleyFilter()(c) then
Duel.SSet(tp,c) Duel.SSet(tp,c)
end end
end end
\ No newline at end of file
...@@ -98,4 +98,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp) ...@@ -98,4 +98,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToChain() and aux.NecroValleyFilter()(c) then if c:IsRelateToChain() and aux.NecroValleyFilter()(c) then
Duel.SSet(tp,c) Duel.SSet(tp,c)
end end
end end
\ No newline at end of file
...@@ -120,4 +120,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -120,4 +120,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
end end
function s.pendvalue(e,c) function s.pendvalue(e,c)
return c:IsSetCard(0x162) return c:IsSetCard(0x162)
end end
\ No newline at end of file
...@@ -115,4 +115,4 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp) ...@@ -115,4 +115,4 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp)
Duel.Release(g,REASON_EFFECT) Duel.Release(g,REASON_EFFECT)
end end
end end
end end
\ No newline at end of file
...@@ -135,4 +135,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp) ...@@ -135,4 +135,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToChain() and aux.NecroValleyFilter()(c) then if c:IsRelateToChain() and aux.NecroValleyFilter()(c) then
Duel.SSet(tp,c) Duel.SSet(tp,c)
end end
end end
\ No newline at end of file
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