Commit 2043db6d authored by POLYMER's avatar POLYMER

fix

parent 76496186
...@@ -56,7 +56,7 @@ function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -56,7 +56,7 @@ function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
if not rc:IsRelateToEffect(re) then return end if not rc:IsRelateToEffect(re) then return end
local proc=rc:IsCode(12866705) and c:IsCode(12866600) local proc=rc:IsCode(12866705) and c:IsCode(12866600)
local b1=rc:IsAbleToGrave() and not rc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) local b1=rc:IsAbleToGrave() and not rc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED)
local b2=(Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and (rc:IsCanBeSpecialSummoned(e,0,tp,false,false)) or rc:IsCanBeSpecialSummoned(e,0,tp,proc,proc)) local b2=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and (rc:IsCanBeSpecialSummoned(e,0,tp,false,false) or rc:IsCanBeSpecialSummoned(e,0,tp,proc,proc))
if chk==0 then return b1 or b2 end if chk==0 then return b1 or b2 end
if re:GetHandler():IsAttribute(ATTRIBUTE_DARK) then if re:GetHandler():IsAttribute(ATTRIBUTE_DARK) then
Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1) Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
...@@ -71,7 +71,7 @@ function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -71,7 +71,7 @@ function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
Duel.SetTargetCard(rc) Duel.SetTargetCard(rc)
if rc:IsLocation(LOCATION_GRAVE) then if rc:IsLocation(LOCATION_GRAVE) then
e:SetCategory(CATEGORY_GRAVE_SPSUMMON) e:SetCategory(CATEGORY_GRAVE_SPSUMMON+CATEGORY_LEAVE_GRAVE)
end end
if rc:IsLocation(LOCATION_DECK) then if rc:IsLocation(LOCATION_DECK) then
e:SetCategory(CATEGORY_DECKDES+CATEGORY_SPECIAL_SUMMON) e:SetCategory(CATEGORY_DECKDES+CATEGORY_SPECIAL_SUMMON)
...@@ -85,7 +85,8 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -85,7 +85,8 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
local proc=rc:IsCode(12866705) and c:IsCode(12866600) local proc=rc:IsCode(12866705) and c:IsCode(12866600)
local b1=tc:IsAbleToGrave() and not tc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) local b1=tc:IsAbleToGrave() and not tc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED)
local b2=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and (tc:IsCanBeSpecialSummoned(e,0,tp,false,false) or tc:IsCanBeSpecialSummoned(e,0,tp,proc,proc)) local b2=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and aux.NecroValleyFilter()(tc)
and (tc:IsCanBeSpecialSummoned(e,0,tp,false,false) or tc:IsCanBeSpecialSummoned(e,0,tp,proc,proc))
local off=1 local off=1
local ops={} local ops={}
local opval={} local opval={}
......
...@@ -76,15 +76,15 @@ end ...@@ -76,15 +76,15 @@ end
function s.splimit(e,se,sp,st) function s.splimit(e,se,sp,st)
return se:IsHasType(EFFECT_TYPE_ACTIONS) return se:IsHasType(EFFECT_TYPE_ACTIONS)
end end
function s.rmfilter(c,e,tp) function s.rmfilter(c,tp)
return c:IsAbleToRemove(tp,POS_FACEUP,REASON_ACTION) and c:IsCode(12866615,12866725) and c:IsFaceupEx() return c:IsAbleToRemove(tp,POS_FACEUP,REASON_ACTION) and c:IsCode(12866615,12866725) and c:IsFaceupEx()
end end
function s.spcost(e,c,tp) function s.spcost(e,c,tp)
local g=Duel.GetMatchingGroup(s.rmfilter,tp,LOCATION_MZONE+LOCATION_GRAVE,0,nil) local g=Duel.GetMatchingGroup(s.rmfilter,tp,LOCATION_MZONE+LOCATION_GRAVE,0,nil,tp)
return g:CheckSubGroupEach(s.spchecks,aux.mzctcheck,tp) return g:CheckSubGroupEach(s.spchecks,aux.mzctcheck,tp)
end end
function s.spcop(e,tp,eg,ep,ev,re,r,rp) function s.spcop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.rmfilter),tp,LOCATION_MZONE+LOCATION_GRAVE,0,nil) local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.rmfilter),tp,LOCATION_MZONE+LOCATION_GRAVE,0,nil,tp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local sg=g:SelectSubGroupEach(tp,s.spchecks,true,aux.mzctcheck,tp) local sg=g:SelectSubGroupEach(tp,s.spchecks,true,aux.mzctcheck,tp)
Duel.Remove(sg,POS_FACEUP,REASON_ACTION) Duel.Remove(sg,POS_FACEUP,REASON_ACTION)
......
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