ybb

expansions/script/c18019020.lua

@@ -22,6 +22,7 @@ function cm.boolfunction(e,tp,eg,ep,ev,re,r,rp)
 		local tg=sg:Select(1-tp,1,1,nil)
 		Duel.SendtoHand(tg,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,tg)
-		Duel.SendtoDeck(sg:Sub(tg),nil,2,REASON_EFFECT)
+		Group.Sub(sg,tg)
+		Duel.SendtoDeck(sg,nil,2,REASON_EFFECT)
 	end
 end
\ No newline at end of file

expansions/script/c37901010.lua

@@ -59,13 +59,13 @@ function cm.initial_effect(c)
 	e3:SetCode(EVENT_DESTROYED)
 	e3:SetTarget(function(e,tp,eg,ep,ev,re,r,rp)
 		if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-			and Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_GRAVE,0,1,e:GetHandler(),0x388,e,tp) end
+			and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(cm.tgf3),tp,LOCATION_GRAVE,0,1,e:GetHandler(),e,tp) end
 		Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
 	end)
 	e3:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
 		if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-			local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(Card.IsSetCard),tp,LOCATION_GRAVE,0,1,1,e:GetHandler(),0x388,e,tp)
+			local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.tgf3),tp,LOCATION_GRAVE,0,1,1,e:GetHandler(),e,tp)
 			if g:GetCount()>0 then
 				Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 			end
@@ -81,5 +81,8 @@ end
 function cm.cf2(c,lg)
 	return lg:IsContains(c)
 end
-
+--e3
+function cm.tgf3(c,e,tp)
+	return c:IsSetCard(0x388) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+end