wdnmd

expansions/script/c12042050.lua

@@ -20,7 +20,7 @@ function cm.tgfilter(c)
 	return c:IsAbleToGrave() and c:IsSetCard(0x6fbe)
 end
 function cm.thfilter1(c,e,tp)
-	return c:IsType(TYPE_LINK) and c:IsRace(RACE_INSECT) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_LINK,tp,false,false) and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(cm.spfilter1),tp,LOCATION_GRAVE,0,c:GetLink(),nil)
+	return c:IsType(TYPE_LINK) and c:IsSetCard(0x6fbe) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_LINK,tp,false,false) and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(cm.spfilter1),tp,LOCATION_GRAVE,0,c:GetLink(),nil)
 end
 function cm.spfilter1(c)
 	return c:IsAbleToRemove() and c:IsRace(RACE_INSECT) 

expansions/script/c12066000.lua

@@ -104,28 +104,29 @@ function Sr_skyland.commoneffect_spcon(e,c)
 		and ( Duel.IsExistingMatchingCard(Sr_skyland.commoneffect_filter,tp,LOCATION_HAND,0,1,c) or Duel.IsExistingMatchingCard(Sr_skyland.exfilter,tp,LOCATION_MZONE,0,1,nil) )
 end
 function Sr_skyland.commoneffect_spop(e,tp,eg,ep,ev,re,r,rp,c)
-	if Duel.IsExistingMatchingCard(Sr_skyland.exfilter,tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(Sr_skyland.exfilter,tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(12066012,2)) then
+	if Duel.IsExistingMatchingCard(Sr_skyland.commoneffect_filter,tp,LOCATION_HAND,0,1,nil) and Duel.IsExistingMatchingCard(Sr_skyland.exfilter,tp,LOCATION_MZONE,0,1,nil)  then
+		if Duel.SelectYesNo(tp,aux.Stringid(12066012,2)) then
 		local g=Duel.GetMatchingGroup(Sr_skyland.exfilter,tp,LOCATION_MZONE,0,nil)
-		if #g>1 then
-			Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(12066012,3))
-			local tg=g:Select(tp,1,1,nil)
-			tg:GetFirst():RemoveOverlayCard(tp,1,1,REASON_COST)
-			tg:GetFirst():RegisterFlagEffect(tp,12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
-		else
-			g:GetFirst():RemoveOverlayCard(tp,1,1,REASON_COST)
-			g:GetFirst():RegisterFlagEffect(tp,12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
-		end
-	elseif Duel.IsExistingMatchingCard(Sr_skyland.exfilter,tp,LOCATION_MZONE,0,1,nil) then
-		local g=Duel.GetMatchingGroup(Sr_skyland.exfilter,tp,LOCATION_MZONE,0,nil)
-		if #g>1 then
-			Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(12066012,3))
-			local tg=g:Select(tp,1,1,nil)
-			tg:GetFirst():RemoveOverlayCard(tp,1,1,REASON_COST)
-			tg:GetFirst():RegisterFlagEffect(tp,12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
-		else
-			g:GetFirst():RemoveOverlayCard(tp,1,1,REASON_COST)
-			g:GetFirst():RegisterFlagEffect(tp,12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
-		end
+			if #g>1 then
+				Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(12066012,3))
+				local tg=g:Select(tp,1,1,nil)
+				tg:GetFirst():RemoveOverlayCard(tp,1,1,REASON_COST)
+				tg:GetFirst():RegisterFlagEffect(12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+			else
+				g:GetFirst():RemoveOverlayCard(tp,1,1,REASON_COST)
+				g:GetFirst():RegisterFlagEffect(tp,12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+			end
+		else Duel.IsExistingMatchingCard(Sr_skyland.exfilter,tp,LOCATION_MZONE,0,1,nil) then
+			local g=Duel.GetMatchingGroup(Sr_skyland.exfilter,tp,LOCATION_MZONE,0,nil)
+			if #g>1 then
+				Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(12066012,3))
+				local tg=g:Select(tp,1,1,nil)
+				tg:GetFirst():RemoveOverlayCard(tp,1,1,REASON_COST)
+				tg:GetFirst():RegisterFlagEffect(12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+			else
+				g:GetFirst():RemoveOverlayCard(tp,1,1,REASON_COST)
+				g:GetFirst():RegisterFlagEffect(12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+			end
 	else
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD)
 		local g=Duel.SelectMatchingCard(tp,Sr_skyland.commoneffect_filter,tp,LOCATION_HAND,0,1,1,c)