byd

expansions/script/c21185825.lua

@@ -90,7 +90,11 @@ function c21185825.LCheckGoal2(sg,tp,lc,lmat)
 		and Duel.GetLocationCountFromEx(tp,tp,sg,lc)>0
 		and not sg:IsExists(aux.LUncompatibilityFilter,1,nil,sg,lc,tp)
 		and (not lmat or sg:IsContains(lmat))
+<<<<<<< HEAD
 		and #sg==sg:Filter(Card.IsLinkType,nil,TYPE_EFFECT):GetCount()
+=======
+		and #sg==sg:Filter(Card.IsLinkType,nil,TYPE_EFFECT)
+>>>>>>> 2fa844ca23e3330bd8cf354b5ad5228e099a6547
 end
 function c21185825.linkcon()
 	return	function(e,c,og,lmat,min,max)

expansions/script/c60002207.lua

@@ -16,7 +16,7 @@ function cm.initial_effect(c)
 	--tohand
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,1))
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_DRAW)
+	e1:SetCategory(CATEGORY_COUNTER)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)

expansions/script/c60002281.lua

@@ -60,10 +60,11 @@ function c60002281.thop(e,tp,eg,ep,ev,re,r,rp)
 		end
 		Duel.ShuffleDeck(tp)
 		Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
+		Duel.ConfirmCards(1-tp,cg)
 		local tg=cg:Select(1-tp,1,1,nil)
-		Duel.ConfirmCards(1-tp,tg)
 		local tc=tg:GetFirst()
 		if tc:IsAbleToHand() and Duel.SendtoHand(tc,nil,REASON_EFFECT)~=0 then
+			Duel.ConfirmCards(1-tp,tc)
 		   cg:RemoveCard(tc)
 		end
 		Duel.SendtoDeck(cg,tp,SEQ_DECKSHUFFLE,REASON_EFFECT)
@@ -95,8 +96,8 @@ function c60002281.spop(e,tp,eg,ep,ev,re,r,rp)
 		end
 		Duel.ShuffleDeck(tp)
 		Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
+		Duel.ConfirmCards(1-tp,cg)
 		local tg=cg:Select(1-tp,1,1,nil)
-		Duel.ConfirmCards(1-tp,tg)
 		local tc=tg:GetFirst()
 		if tc:IsAbleToHand() and Duel.SendtoHand(tc,nil,REASON_EFFECT)~=0 then
 		   Duel.ConfirmCards(1-tp,tc)  

expansions/script/c9310049.lua

@@ -40,9 +40,10 @@ function c9310049.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c9310049.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c9310049.thfilter),tp,LOCATION_GRAVE,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,c9310049.thfilter,tp,LOCATION_GRAVE,0,1,1,nil)
 	if #g>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
+		Duel.ConfirmCards(1-tp,g)
 	end
 end
 function c9310049.tnval(e,c)