Commit 26919cfe authored by Nemo Ma's avatar Nemo Ma

fix

parent 9bee6857
...@@ -210,11 +210,11 @@ end ...@@ -210,11 +210,11 @@ end
function cm.sp2con(e,tp,eg,ep,ev,re,r,rp) function cm.sp2con(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetEquipTarget() return e:GetHandler():GetEquipTarget()
end end
function cm.sp2filter(c,e,tp) function cm.sp3filter(c,e,tp)
return c:IsSetCard(0x5f3c) and c:IsType(TYPE_LINK) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_LINK,tp,false,true) return c:IsSetCard(0x5f3c) and c:IsType(TYPE_LINK) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_LINK,tp,false,true)
end end
function cm.sp2tg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.sp2tg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(cm.sp2filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(cm.sp3filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
end end
function cm.sp2cost(e,tp,eg,ep,ev,re,r,rp,chk) function cm.sp2cost(e,tp,eg,ep,ev,re,r,rp,chk)
...@@ -227,7 +227,7 @@ function cm.sp2op(e,tp,eg,ep,ev,re,r,rp) ...@@ -227,7 +227,7 @@ function cm.sp2op(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tp=c:GetControler() local tp=c:GetControler()
if c:IsRelateToEffect(e) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then if c:IsRelateToEffect(e) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
local tc=Duel.SelectMatchingCard(tp,cm.sp2filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp):GetFirst() local tc=Duel.SelectMatchingCard(tp,cm.sp3filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp):GetFirst()
if tc then if tc then
Duel.SpecialSummon(tc,SUMMON_TYPE_LINK,tp,tp,false,true,POS_FACEUP) Duel.SpecialSummon(tc,SUMMON_TYPE_LINK,tp,tp,false,true,POS_FACEUP)
end end
......
...@@ -65,7 +65,8 @@ function c33200105.smtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -65,7 +65,8 @@ function c33200105.smtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c33200105.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) if chk==0 then return Duel.IsExistingMatchingCard(c33200105.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(33200105,0)) Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(33200105,0))
Duel.SelectTarget(tp,c33200105.filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) local g=Duel.SelectTarget(tp,c33200105.filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
Duel.HintSelection(g)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
end end
function c33200105.smop(e,tp,eg,ep,ev,re,r,rp) function c33200105.smop(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -62,7 +62,7 @@ function c33200118.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -62,7 +62,7 @@ function c33200118.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetCode(EFFECT_SET_ATTACK_FINAL)
e1:SetValue(0) e1:SetValue(0)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
at:RegisterEffect(e1) at:RegisterEffect(e1)
end end
end end
...@@ -77,6 +77,8 @@ function c33200509.tzop(e,tp,eg,ep,ev,re,r,rp) ...@@ -77,6 +77,8 @@ function c33200509.tzop(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Recover(tp,800,REASON_EFFECT) Duel.Recover(tp,800,REASON_EFFECT)
end end
else
Duel.ShuffleDeck(tp)
end end
else else
Duel.ConfirmDecktop(tp,5) Duel.ConfirmDecktop(tp,5)
...@@ -101,6 +103,8 @@ function c33200509.tzop(e,tp,eg,ep,ev,re,r,rp) ...@@ -101,6 +103,8 @@ function c33200509.tzop(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Recover(tp,800,REASON_EFFECT) Duel.Recover(tp,800,REASON_EFFECT)
end end
else
Duel.ShuffleDeck(tp)
end end
end end
end end
\ No newline at end of file
...@@ -72,7 +72,6 @@ function c9910871.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -72,7 +72,6 @@ function c9910871.target(e,tp,eg,ep,ev,re,r,rp,chk)
local mg1=Duel.GetFusionMaterial(tp) local mg1=Duel.GetFusionMaterial(tp)
aux.FCheckAdditional=c9910871.fcheck aux.FCheckAdditional=c9910871.fcheck
local res=Duel.IsExistingMatchingCard(c9910871.spfilter1,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,chkf) local res=Duel.IsExistingMatchingCard(c9910871.spfilter1,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,chkf)
if res then return true end
local mg2=Duel.GetMatchingGroup(c9910871.mfilter2,tp,LOCATION_GRAVE,LOCATION_GRAVE,nil) local mg2=Duel.GetMatchingGroup(c9910871.mfilter2,tp,LOCATION_GRAVE,LOCATION_GRAVE,nil)
mg2:Merge(mg1) mg2:Merge(mg1)
local mg3=Duel.GetMatchingGroup(c9910871.mfilter3,tp,0,LOCATION_MZONE,nil) local mg3=Duel.GetMatchingGroup(c9910871.mfilter3,tp,0,LOCATION_MZONE,nil)
...@@ -81,16 +80,13 @@ function c9910871.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -81,16 +80,13 @@ function c9910871.target(e,tp,eg,ep,ev,re,r,rp,chk)
mg4:Merge(mg1) mg4:Merge(mg1)
aux.FCheckAdditional=c9910871.fcheck2 aux.FCheckAdditional=c9910871.fcheck2
aux.GCheckAdditional=c9910871.gcheck2 aux.GCheckAdditional=c9910871.gcheck2
res=Duel.IsExistingMatchingCard(c9910871.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg2,nil,chkf,9910881) res=res or Duel.IsExistingMatchingCard(c9910871.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg2,nil,chkf,9910881)
if res then return true end
aux.FCheckAdditional=c9910871.fcheck3 aux.FCheckAdditional=c9910871.fcheck3
aux.GCheckAdditional=c9910871.gcheck3(tp) aux.GCheckAdditional=c9910871.gcheck3(tp)
res=Duel.IsExistingMatchingCard(c9910871.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg3,nil,chkf,9910885) res=res or Duel.IsExistingMatchingCard(c9910871.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg3,nil,chkf,9910885)
if res then return true end
aux.FCheckAdditional=c9910871.fcheck4 aux.FCheckAdditional=c9910871.fcheck4
aux.GCheckAdditional=c9910871.gcheck4 aux.GCheckAdditional=c9910871.gcheck4
res=Duel.IsExistingMatchingCard(c9910871.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg4,nil,chkf,9910890) res=res or Duel.IsExistingMatchingCard(c9910871.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg4,nil,chkf,9910890)
if res then return true end
aux.FCheckAdditional=c9910871.fcheck aux.FCheckAdditional=c9910871.fcheck
aux.GCheckAdditional=nil aux.GCheckAdditional=nil
if not res then if not res then
......
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