Commit d30d2780 authored by songtongtong's avatar songtongtong

update 10.26

parent 93839bed
Pipeline #17455 passed with stages
in 30 minutes and 7 seconds
...@@ -57,8 +57,8 @@ function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -57,8 +57,8 @@ function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsOnField() end if chkc then return chkc:IsOnField() end
if chk==0 then return Duel.IsExistingTarget(nil,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) end if chk==0 then return Duel.IsExistingTarget(nil,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectTarget(tp,aux.NegateAnyFilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,2,nil) local g=Duel.SelectTarget(tp,aux.NegateAnyFilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,3,nil)
Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,2,0,0) Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,3,0,0)
local tc= g:GetFirst() local tc= g:GetFirst()
while tc do while tc do
Duel.SetChainLimit(cm.limit(tc)) Duel.SetChainLimit(cm.limit(tc))
......
...@@ -80,6 +80,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -80,6 +80,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
if #g>0 then if #g>0 then
Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
end end
end
end end
function cm.matfilter(c) function cm.matfilter(c)
......
...@@ -48,19 +48,16 @@ function cm.distg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -48,19 +48,16 @@ function cm.distg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function cm.disop(e,tp,eg,ep,ev,re,r,rp) function cm.disop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) and Duel.Destroy(eg,REASON_EFFECT)~=0
and c:IsRelateToEffect(e) and c:IsLocation(LOCATION_HAND) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectMatchingCard(tp,cm.exfilter,tp,LOCATION_EXTRA,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,cm.exfilter,tp,LOCATION_EXTRA,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
-- Duel.HintSelection(g) if Duel.Remove(g,POS_FACEUP,REASON_EFFECT)~=0 then
-- Duel.Destroy(g,REASON_EFFECT) Duel.NegateActivation(ev)
Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
end end
end end
end end
function cm.exfilter(c) function cm.exfilter(c)
return c:IsSetCard(0x5a2) and c:IsAbleToRemove(POS_FACEUP) return c:IsSetCard(0x5a2) and c:IsAbleToRemove()
end end
--e2 --e2
function cm.spcon1(e,tp,eg,ep,ev,re,r,rp) function cm.spcon1(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -82,7 +82,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -82,7 +82,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
tc:CompleteProcedure() tc:CompleteProcedure()
else else
local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc) local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc)
mg:AddCard(mg2) mg:Merge(mg2)
if tc.mat_filter then if tc.mat_filter then
mg=mg:Filter(tc.mat_filter,tc,tp) mg=mg:Filter(tc.mat_filter,tc,tp)
else else
......
...@@ -59,7 +59,6 @@ end ...@@ -59,7 +59,6 @@ end
end end
--global part --global part
table=require("table") table=require("table")
yume.RustFlag=false
function yume.AddYumeSummonLimit(c,ssm) function yume.AddYumeSummonLimit(c,ssm)
--1=special summon monster, 0=non special summon monster --1=special summon monster, 0=non special summon monster
ssm=ssm or 0 ssm=ssm or 0
......
...@@ -37,11 +37,11 @@ function cm.setfilter(c) ...@@ -37,11 +37,11 @@ function cm.setfilter(c)
return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSSetable() and c:IsFaceup() return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSSetable() and c:IsFaceup()
end end
function cm.settg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function cm.settg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_REMOED) and cm.setfilter(chkc) end if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_REMOVED) and cm.setfilter(chkc) end
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0
and Duel.IsExistingTarget(cm.setfilter,tp,LOCATION_REMOED,0,1,nil) end and Duel.IsExistingTarget(cm.setfilter,tp,LOCATION_REMOVED,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
local g=Duel.SelectTarget(tp,cm.setfilter,tp,LOCATION_REMOED,0,1,1,nil) local g=Duel.SelectTarget(tp,cm.setfilter,tp,LOCATION_REMOVED,0,1,1,nil)
end end
function cm.setop(e,tp,eg,ep,ev,re,r,rp) function cm.setop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
......
...@@ -77,7 +77,7 @@ function c98800213.splimit(e,c,sump,sumtype,sumpos,targetp,se) ...@@ -77,7 +77,7 @@ function c98800213.splimit(e,c,sump,sumtype,sumpos,targetp,se)
end end
function c98800213.thcon(e,tp,eg,ep,ev,re,r,rp) function c98800213.thcon(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst() local tc=eg:GetFirst()
return ep==tp and Duel.GetTurnPlayer()==tp and eg:GetCount()==1 and tc:IsSummonPlayer(tp) and tc:IsFaceup() and tc:IsType(TYPE_XYZ) and c:IsSetCard(0xad2) return ep==tp and Duel.GetTurnPlayer()==tp and eg:GetCount()==1 and tc:IsSummonPlayer(tp) and tc:IsFaceup() and tc:IsType(TYPE_XYZ) and tc:IsSetCard(0xad2)
end end
function c98800213.thfilter(c) function c98800213.thfilter(c)
return c:IsSetCard(0x95) and c:IsAbleToHand() return c:IsSetCard(0x95) and c:IsAbleToHand()
......
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