Commit 7260dd59 authored by POLYMER's avatar POLYMER

fix

parent 3fa4fb09
...@@ -53,7 +53,8 @@ function cm.spfilter(c,e,tp) ...@@ -53,7 +53,8 @@ function cm.spfilter(c,e,tp)
return c:IsLevel(8) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsLevel(8) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end 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.IsExistingMatchingCard(cm.thfilter1,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter1,tp,LOCATION_DECK,0,1,nil) Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) end
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
end end
......
...@@ -48,7 +48,7 @@ function cm.setop(e,tp,eg,ep,ev,re,r,rp) ...@@ -48,7 +48,7 @@ function cm.setop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) then Duel.SSet(tp,tc) end if tc:IsRelateToEffect(e) then Duel.SSet(tp,tc) end
end end
function cm.thfilter(c,check) function cm.thfilter(c,e,tp,check)
return c:IsSetCard(0x15b) and not c:IsCode(m) and c:IsType(TYPE_MONSTER) and (c:IsAbleToHand() return c:IsSetCard(0x15b) and not c:IsCode(m) and c:IsType(TYPE_MONSTER) and (c:IsAbleToHand()
or check and c:IsCanBeSpecialSummoned(e,0,tp,false,false)) or check and c:IsCanBeSpecialSummoned(e,0,tp,false,false))
end end
......
...@@ -29,7 +29,7 @@ function c60151013.initial_effect(c) ...@@ -29,7 +29,7 @@ function c60151013.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c60151013.filter(c,e,tp) function c60151013.filter(c,e,tp)
return c:IsRace(RACE_SPELLCASTER) and c:IsSetCard(0x5b23) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsSetCard(0x5b23) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c60151013.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c60151013.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c60151013.filter(chkc,e,tp) end if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c60151013.filter(chkc,e,tp) 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