Update c20161.lua 格子检测

script/c20161.lua

@@ -31,21 +31,18 @@ function c20161.initial_effect(c)
 end
 function c20161.spfilter(c,e,tp)
     return c:IsSetCard(0x123) and c:IsAttribute(ATTRIBUTE_LIGHT+ATTRIBUTE_DARK) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) 
+        and (c:IsLocation(LOCATION_DECK) and Duel.GetMZoneCount(tp)>0 or c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0)
 end
 function c20161.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return ((Duel.GetLocationCountFromEx(tp)>0 and Duel.IsExistingMatchingCard(c20161.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp)) or (Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(c20161.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp))) end
+    if chk==0 then return Duel.IsExistingMatchingCard(c20161.spfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,nil,e,tp) end
     Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_EXTRA)
 end
 function c20161.operation(e,tp,eg,ep,ev,re,r,rp)
-	if not e:GetHandler():IsRelateToEffect(e) then return end
-	if Duel.GetLocationCountFromEx(tp)>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
     local g=Duel.SelectMatchingCard(tp,c20161.spfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,1,nil,e,tp)
     if g:GetCount()>0 then
         local tc=g:GetFirst()
-			Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)
-			tc:CompleteProcedure()
-			Duel.SpecialSummonComplete()
+        Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
         local e1=Effect.CreateEffect(e:GetHandler())
         e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
         e1:SetCode(EVENT_BE_MATERIAL)
@@ -55,43 +52,6 @@ function c20161.operation(e,tp,eg,ep,ev,re,r,rp)
         e1:SetOperation(c20161.cop)
         tc:RegisterEffect(e1)
     end
-	else
-		if Duel.GetLocationCountFromEx(tp)>0 then
-			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-			local g=Duel.SelectMatchingCard(tp,c20161.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
-			if g:GetCount()>0 then
-				local tc=g:GetFirst()
-				Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)
-				tc:CompleteProcedure()
-				Duel.SpecialSummonComplete()
-				local e1=Effect.CreateEffect(e:GetHandler())
-				e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-				e1:SetCode(EVENT_BE_MATERIAL)
-				e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-				e1:SetReset(RESET_EVENT+0x1620000)
-				e1:SetCondition(c20161.ccon)
-				e1:SetOperation(c20161.cop)
-				tc:RegisterEffect(e1)
-			end
-		else
-			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-			local g=Duel.SelectMatchingCard(tp,c20161.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
-			if g:GetCount()>0 then
-				local tc=g:GetFirst()
-				Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)
-				tc:CompleteProcedure()
-				Duel.SpecialSummonComplete()
-				local e1=Effect.CreateEffect(e:GetHandler())
-				e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-				e1:SetCode(EVENT_BE_MATERIAL)
-				e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-				e1:SetReset(RESET_EVENT+0x1620000)
-				e1:SetCondition(c20161.ccon)
-				e1:SetOperation(c20161.cop)
-				tc:RegisterEffect(e1)
-			end
-		end
-	end
 end
 function c20161.ccon(e,tp,eg,ep,ev,re,r,rp)
     return r==REASON_SYNCHRO