Commit fcdaddb8 authored by Amiya's avatar Amiya

修复

parent a3c5e531
Pipeline #42472 failed with stages
in 2 minutes and 50 seconds
...@@ -75,7 +75,9 @@ function s.aclimit(e,re,tp) ...@@ -75,7 +75,9 @@ function s.aclimit(e,re,tp)
end end
function s.checkop(e,tp,eg,ep,ev,re,r,rp) function s.checkop(e,tp,eg,ep,ev,re,r,rp)
for tc in aux.Next(eg) do for tc in aux.Next(eg) do
s[0]=bit.bor(s[0],tc:GetType()) if tc:IsType(TYPE_MONSTER) then
s[0]=bit.bor(s[0],tc:GetType())
end
end end
end end
function s.clearop(e,tp,eg,ep,ev,re,r,rp) function s.clearop(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -92,7 +92,6 @@ function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -92,7 +92,6 @@ function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return aux.bfgcost(e,tp,eg,ep,ev,re,r,rp,chk) and Duel.CheckReleaseGroupEx(tp,s.cfilter,1,REASON_COST,true,nil,tp) end if chk==0 then return aux.bfgcost(e,tp,eg,ep,ev,re,r,rp,chk) and Duel.CheckReleaseGroupEx(tp,s.cfilter,1,REASON_COST,true,nil,tp) end
aux.bfgcost(e,tp,eg,ep,ev,re,r,rp,chk) aux.bfgcost(e,tp,eg,ep,ev,re,r,rp,chk)
local g=Duel.SelectReleaseGroupEx(tp,s.cfilter,1,1,REASON_COST,true,nil,tp) local g=Duel.SelectReleaseGroupEx(tp,s.cfilter,1,1,REASON_COST,true,nil,tp)
g:AddCard(c)
Duel.Release(g,REASON_COST) Duel.Release(g,REASON_COST)
end end
function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
......
...@@ -124,7 +124,7 @@ function s.sumcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -124,7 +124,7 @@ function s.sumcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2 return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2
end end
function s.sumfilter(c) function s.sumfilter(c)
return c:IsSetCard(0x2dc) and (c:IsSummonable(true,nil,1) or c:IsMSetable(true,nil,1)) return c:IsSetCard(0x2dc) and c:IsSummonable(true,nil,1)
end end
function s.sumtg(e,tp,eg,ep,ev,re,r,rp,chk) function s.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_HAND,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_HAND,0,1,nil) end
...@@ -132,15 +132,9 @@ function s.sumtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -132,15 +132,9 @@ function s.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function s.sumop(e,tp,eg,ep,ev,re,r,rp) function s.sumop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON)
local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_HAND,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,s.sumfilter,tp,LOCATION_HAND,0,1,1,nil)
local tc=g:GetFirst() local tc=g:GetFirst()
if tc then if tc then
local s1=tc:IsSummonable(true,nil,1) Duel.Summon(tp,tc,true,nil,1)
local s2=tc:IsMSetable(true,nil,1)
if (s1 and s2 and Duel.SelectPosition(tp,tc,POS_FACEUP_ATTACK+POS_FACEDOWN_DEFENSE)==POS_FACEUP_ATTACK) or not s2 then
Duel.Summon(tp,tc,true,nil,1)
else
Duel.MSet(tp,tc,true,nil,1)
end
end end
end end
\ No newline at end of file
...@@ -74,7 +74,7 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -74,7 +74,7 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local sg=eg:Filter(s.cfilter,1,nil,tp) local sg=eg:Filter(s.cfilter,1,nil,tp)
local ct=0 local ct=0
for tc in aux.Next(sg) do for tc in aux.Next(sg) do
local mt=e:GetHandler():GetMaterialCount() local mt=e:GetHandler():GetMaterial():FilterCount(Card.IsType,nil,TYPE_MONSTER)
if mt>ct then ct=mt end if mt>ct then ct=mt end
end end
if chkc then return chkc:IsOnField() and s.desfilter(chkc) and e:GetHandler()~=chkc end if chkc then return chkc:IsOnField() and s.desfilter(chkc) and e:GetHandler()~=chkc 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