Commit d6088656 authored by POLYMER's avatar POLYMER

fix

parent e9a0b923
...@@ -130,6 +130,7 @@ function s.sumop(e,tp,eg,ep,ev,re,r,rp) ...@@ -130,6 +130,7 @@ function s.sumop(e,tp,eg,ep,ev,re,r,rp)
local tg=Duel.SelectMatchingCard(tp,aux.NegateAnyFilter,tp,0,LOCATION_ONFIELD,2,2,nil) local tg=Duel.SelectMatchingCard(tp,aux.NegateAnyFilter,tp,0,LOCATION_ONFIELD,2,2,nil)
if tg:GetCount()<1 then return end if tg:GetCount()<1 then return end
Duel.BreakEffect() Duel.BreakEffect()
Duel.HintSelection(tg)
for tc in aux.Next(tg) do for tc in aux.Next(tg) do
if tc:IsCanBeDisabledByEffect(e,false) then if tc:IsCanBeDisabledByEffect(e,false) then
Duel.NegateRelatedChain(tc,RESET_TURN_SET) Duel.NegateRelatedChain(tc,RESET_TURN_SET)
......
...@@ -85,6 +85,7 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) ...@@ -85,6 +85,7 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local sg=g:Select(tp,1,1,nil) local sg=g:Select(tp,1,1,nil)
Duel.HintSelection(sg)
Duel.Destroy(sg,REASON_EFFECT) Duel.Destroy(sg,REASON_EFFECT)
end end
end end
...@@ -132,6 +133,7 @@ function s.sumop(e,tp,eg,ep,ev,re,r,rp) ...@@ -132,6 +133,7 @@ function s.sumop(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local sg=g:Select(tp,2,2,nil) local sg=g:Select(tp,2,2,nil)
Duel.HintSelection(sg)
Duel.Destroy(sg,REASON_EFFECT) Duel.Destroy(sg,REASON_EFFECT)
end end
end end
......
...@@ -42,13 +42,13 @@ function s.atkval(e,c) ...@@ -42,13 +42,13 @@ function s.atkval(e,c)
end end
function s.destg(e,tp,eg,ep,ev,re,r,rp,chk) function s.destg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(nil,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,e:GetHandler(),tp) end if chk==0 then return Duel.IsExistingMatchingCard(nil,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,nil,tp) end
Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,1,tp,LOCATION_HAND+LOCATION_ONFIELD) Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,1,tp,LOCATION_HAND+LOCATION_ONFIELD)
end end
function s.desop(e,tp,eg,ep,ev,re,r,rp) function s.desop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local g=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,3,e:GetHandler()) local g=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,3,nil)
Duel.HintSelection(g) Duel.HintSelection(g)
local oc=Duel.Destroy(g,REASON_EFFECT) local oc=Duel.Destroy(g,REASON_EFFECT)
if oc==0 then return end if oc==0 then return end
......
...@@ -51,7 +51,7 @@ function s.filter(c) ...@@ -51,7 +51,7 @@ function s.filter(c)
return c:IsAttackPos() and c:IsCanChangePosition() return c:IsAttackPos() and c:IsCanChangePosition()
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)
if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,0,LOCATION_MZONE,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
local g=Duel.GetMatchingGroup(s.filter,tp,0,LOCATION_MZONE,nil) local g=Duel.GetMatchingGroup(s.filter,tp,0,LOCATION_MZONE,nil)
Duel.SetOperationInfo(0,CATEGORY_POSITION,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_POSITION,g,1,0,0)
end end
......
...@@ -40,6 +40,13 @@ end ...@@ -40,6 +40,13 @@ end
function cm.spfilter(c,e,tp) function cm.spfilter(c,e,tp)
return cm.BlueDeathster(c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return cm.BlueDeathster(c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function cm.spfilter(c,e,tp)
return cm.BlueDeathster(c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end
function cm.thfilter(c)
return c:IsAbleToHand()
and not c:IsLocation(LOCATION_FZONE)
end
function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.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
and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) end and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) end
...@@ -50,10 +57,10 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -50,10 +57,10 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g1=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp) local g1=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
if g1:GetCount()>0 then if g1:GetCount()>0 then
if Duel.SpecialSummon(g1,0,tp,tp,false,false,POS_FACEUP)~=0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_SZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(m,1)) then if Duel.SpecialSummon(g1,0,tp,tp,false,false,POS_FACEUP)~=0 and Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_SZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(m,1)) then
Duel.BreakEffect() Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g2=Duel.SelectMatchingCard(tp,Card.IsAbleToHand,tp,LOCATION_SZONE,0,1,1,nil) local g2=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_SZONE,0,1,1,nil)
Duel.SendtoHand(g2,nil,REASON_EFFECT) Duel.SendtoHand(g2,nil,REASON_EFFECT)
end end
end end
......
...@@ -42,11 +42,11 @@ function c71403001.tg1(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -42,11 +42,11 @@ function c71403001.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_TOEXTRA,g,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_TOEXTRA,g,1,tp,LOCATION_DECK)
end end
function c71403001.op1(e,tp,eg,ep,ev,re,r,rp) function c71403001.op1(e,tp,eg,ep,ev,re,r,rp)
local zone=0x1f00 local zone=0x1f
local pflag1=Duel.CheckLocation(tp,LOCATION_PZONE,0) local pflag1=Duel.CheckLocation(tp,LOCATION_PZONE,0)
local pflag2=Duel.CheckLocation(tp,LOCATION_PZONE,1) local pflag2=Duel.CheckLocation(tp,LOCATION_PZONE,1)
if pflag1~=pflag2 then if pflag1~=pflag2 then
zone=0xe00 zone=0xe
end end
if Duel.GetLocationCount(tp,LOCATION_SZONE,tp,LOCATION_REASON_TOFIELD,zone)==0 then if Duel.GetLocationCount(tp,LOCATION_SZONE,tp,LOCATION_REASON_TOFIELD,zone)==0 then
return return
......
...@@ -72,11 +72,11 @@ function s.tg1(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -72,11 +72,11 @@ function s.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,1,tp,LOCATION_ONFIELD) Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,1,tp,LOCATION_ONFIELD)
end end
function s.op1(e,tp,eg,ep,ev,re,r,rp) function s.op1(e,tp,eg,ep,ev,re,r,rp)
local zone=0x1f00 local zone=0x1f
local pflag1=Duel.CheckLocation(tp,LOCATION_PZONE,0) local pflag1=Duel.CheckLocation(tp,LOCATION_PZONE,0)
local pflag2=Duel.CheckLocation(tp,LOCATION_PZONE,1) local pflag2=Duel.CheckLocation(tp,LOCATION_PZONE,1)
if pflag1~=pflag2 then if pflag1~=pflag2 then
zone=0xe00 zone=0xe
end end
if Duel.GetLocationCount(tp,LOCATION_SZONE,tp,LOCATION_REASON_TOFIELD,zone)==0 then if Duel.GetLocationCount(tp,LOCATION_SZONE,tp,LOCATION_REASON_TOFIELD,zone)==0 then
return return
......
...@@ -50,7 +50,7 @@ function s.atkfilter(c) ...@@ -50,7 +50,7 @@ function s.atkfilter(c)
return c:IsType(TYPE_TUNER) and c:IsFaceupEx() return c:IsType(TYPE_TUNER) and c:IsFaceupEx()
end end
function s.atkval(e,c) function s.atkval(e,c)
return Duel.GetMatchingGroupCount(s.atkfilter,c:GetControler(),LOCATION_GRAVE+LOCATION_REMOVED,LOCATION_GRAVE+LOCATION_REMOVED,nil)*500 return Duel.GetMatchingGroup(s.atkfilter,c:GetControler(),LOCATION_GRAVE+LOCATION_REMOVED,LOCATION_GRAVE+LOCATION_REMOVED,nil):GetClassCount(Card.GetCode)*500
end end
function s.matcon(e,tp,eg,ep,ev,re,r,rp) function s.matcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetLabel()==1 return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetLabel()==1
......
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