byd

expansions/script/c21185631.lua

@@ -54,11 +54,11 @@ function c21185631.op(e,tp,eg,ep,ev,re,r,rp)
 		end
 	end	
 end
-function c21185631.w(c)
-	return c:IsReason(REASON_EFFECT) and rc:IsPreviousLocation(LOCATION_ONFIELD) and not e:GetHandler()==re:GetHandler()
+function c21185631.w(c,e)
+	return c:IsReason(REASON_EFFECT) and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c21185631.con3(e,tp,eg,ep,ev,re,r,rp)
-	return eg and eg:IsExists(c21185631.w,1,nil)
+	return eg and eg:IsExists(c21185631.w,1,e:GetHandler())
 end
 function c21185631.con2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c96038003.lua

@@ -91,7 +91,6 @@ function cm.thfilter(c)
 	return c:IsSetCard(0x5ef7) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	local c=e:GetHandler()
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 	Duel.SetOperationInfo(0,CATEGORY_SUMMON,nil,0,0,0)
@@ -100,15 +99,18 @@ function cm.sumfilter(c)
 	return c:IsSummonable(true,nil) and c:IsRace(RACE_FAIRY+RACE_FIEND+RACE_ZOMBIE)
 end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
-	local tg=Duel.GetFirstMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,nil)
-	if tg and Duel.SendtoHand(tg,nil,REASON_EFFECT)~=0
-		and  Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SelectYesNo(tp,aux.Stringid(m,3)) then
-			Duel.ShuffleHand(tp)
-			Duel.BreakEffect()
-			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON)
-			local g=Duel.SelectMatchingCard(tp,cm.sumfilter,tp,LOCATION_HAND,0,1,1,nil)
-			if g:GetCount()>0 then
-				Duel.Summon(tp,g:GetFirst(),true,nil)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+	local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK,0,1,1,nil)
+	if g:GetCount()>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
+		Duel.SendtoHand(g,nil,REASON_EFFECT)
+		Duel.ConfirmCards(1-tp,g)
+		Duel.ShuffleHand(tp)
+		Duel.SelectYesNo(tp,aux.Stringid(m,3))
+		Duel.BreakEffect()
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON)
+		local g=Duel.SelectMatchingCard(tp,cm.sumfilter,tp,LOCATION_HAND,0,1,1,nil)
+		if g:GetCount()>0 then
+			Duel.Summon(tp,g:GetFirst(),true,nil)
 		end
 	end
 end