54188

expansions/script/c18700136.lua

---奇物收容与探寻
+--朔月寻物 奇归黑塔
 local m=18700136
 local cm=_G["c"..m]
 xpcall(function() require("expansions/script/1") end,function() require("script/1") end)
@@ -51,7 +51,7 @@ function cm.filter2(c)
 	return c:IsSetCard(0x822) and not c:IsPublic()
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chk==0 then return Duel.IsPlayerCanDraw(tp,g1:GetCount()) and Duel.IsExistingMatchingCard(nil,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil) end
+	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) and Duel.IsExistingMatchingCard(nil,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil) end
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local g1=Duel.SelectMatchingCard(tp,cm.filter2,tp,LOCATION_HAND+LOCATION_DECK,0,1,8,nil,tp)

expansions/script/c79201012.lua

@@ -37,7 +37,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	local cl=c:GetLevel()
 	local g=Duel.GetMatchingGroup(s.filter,tp,LOCATION_DECK,0,nil)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>1 and c:IsAbleToDeck() and g:CheckWithSumEqual(Card.GetLevel,cl,1,99)
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsAbleToDeck() and g:CheckWithSumEqual(Card.GetLevel,cl,1,99)
 		and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,g,tp,LOCATION_DECK)
 end

expansions/script/c79250035.lua

@@ -114,15 +114,12 @@ function s.retop(e,tp,eg,ep,ev,re,r,rp)
 		tc=sg:GetNext()
 	end
 end
-function s.chfilter1(c,e)
-	return c:IsFaceup() and c:IsType(TYPE_MONSTER) and c:IsLevelAbove(1) and c:IsCanBeEffectTarget(e) and not c:IsType(TYPE_LINK+TYPE_XYZ)
-end
-function s.chfilter2(c)
-	return c:IsFaceup() and c:IsType(TYPE_MONSTER) and c:IsLevelAbove(1)
+function s.chfilter(c,e)
+	return c:IsFaceup() and c:IsType(TYPE_MONSTER) and c:IsLevelAbove(1) and c:IsCanBeEffectTarget(e) and c:IsHasLevel()
 end
 function s.chtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chkc then return c.chfilter1() and chkc:IsControler(tp) end
-	if chk==0 then return Duel.IsExistingMatchingCard(s.chfilter1,tp,LOCATION_MZONE,0,1,nil,e,tp) end
+	if chkc then return c.chfilter() and chkc:IsControler(tp) end
+	if chk==0 then return Duel.IsExistingMatchingCard(s.chfilter,tp,LOCATION_MZONE,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local g=Duel.SelectTarget(tp,s.lvfilter,tp,LOCATION_MZONE,0,1,1,nil,e)
 	e:SetLabel(g:GetFirst():GetOriginalLevel())
@@ -131,7 +128,7 @@ function s.chop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local lv=e:GetLabel()
 	if c:IsRelateToEffect(e) and c:IsFaceup() then
-		local g=Duel.GetMatchingGroup(s.chfilter2,tp,LOCATION_MZONE,0,nil)
+		local g=Duel.GetMatchingGroup(s.chfilter,tp,LOCATION_MZONE,0,nil)
 		local tc=g:GetFirst()
 		while tc do
 			local e1=Effect.CreateEffect(c)