fix

expansions/script/c11452000.lua

@@ -42,21 +42,10 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local g1r=g1:Select(tp,math.min(15,#g1),math.min(15,#g1),nil)
 	local exg1r=exg1:Select(tp,math.min(5,#exg1),math.min(5,#exg1),nil)
 	if Duel.Remove(g1r+exg1r,POS_FACEUP,REASON_EFFECT)>0 then
-		Duel.SendtoDeck(g1r+exg1r,tp,1,REASON_EFFECT)
+		Duel.SendtoDeck(g1r+exg1r,tp,0,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g1r+exg1r)
 		sg1=Duel.GetOperatedGroup()
 	end
-	sg1=sg1:Filter(cm.dfilter,nil,tp)
-	if #sg1>0 then
-		Duel.ShuffleDeck(tp)
-		local tg=sg1:GetMinGroup(Card.GetSequence)
-		while tg and #tg>0 do
-			local tc=tg:GetFirst()
-			Duel.MoveSequence(tc,0)
-			sg1:RemoveCard(tc)
-			tg=sg1:GetMinGroup(Card.GetSequence)
-		end
-	end
 	if Duel.SelectYesNo(1-tp,aux.Stringid(m,0)) then
 		local g2=Duel.GetFieldGroup(1-tp,0,LOCATION_DECK)
 		local exg2=Duel.GetFieldGroup(1-tp,0,LOCATION_EXTRA)
@@ -66,10 +55,21 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 		exg2r=exg2:Select(1-tp,math.min(5,#exg2),math.min(5,#exg2),nil)
 	end
 	if Duel.Remove(g2r+exg2r,POS_FACEUP,REASON_EFFECT)>0 then
-		Duel.SendtoDeck(g2r+exg2r,1-tp,1,REASON_EFFECT)
+		Duel.SendtoDeck(g2r+exg2r,1-tp,0,REASON_EFFECT)
 		Duel.ConfirmCards(tp,g2r+exg2r)
 		sg2=Duel.GetOperatedGroup()
 	end
+	sg1=sg1:Filter(cm.dfilter,nil,tp)
+	if #sg1>0 then
+		Duel.ShuffleDeck(tp)
+		local tg=sg1:GetMinGroup(Card.GetSequence)
+		while tg and #tg>0 do
+			local tc=tg:GetFirst()
+			Duel.MoveSequence(tc,0)
+			sg1:RemoveCard(tc)
+			tg=sg1:GetMinGroup(Card.GetSequence)
+		end
+	end
 	sg2=sg2:Filter(cm.dfilter,nil,1-tp)
 	if #sg2>0 then
 		Duel.ShuffleDeck(1-tp)

expansions/script/c71402001.lua

@@ -105,10 +105,13 @@ function c71402001.discon(e)
 	return c:IsFaceup() and (c:IsType(TYPE_SPELL+TYPE_TRAP)
 		or c:IsType(TYPE_EFFECT) or c:GetOriginalType()&TYPE_EFFECT~=0)
 end
+function c71402001.filter2(c)
+	return not c:IsPublic()
+end
 function c71402001.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsPublic,tp,LOCATION_HAND,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c71402001.filter2,tp,LOCATION_HAND,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
-	local g=Duel.SelectMatchingCard(tp,Card.IsPublic,tp,LOCATION_HAND,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,c71402001.filter2,tp,LOCATION_HAND,0,1,1,nil)
 	Duel.ConfirmCards(1-tp,g)
 	Duel.ShuffleHand(tp)
 	Duel.SetTargetCard(g)

expansions/strings.conf

@@ -1157,7 +1157,7 @@
 !setname  0x5224 海爬兽
 
 #Qwe.3359™
-!counter 0x1041 蓄电指示物
+!counter 0x6371 蓄电指示物
 
 #Solid Steve 988 0x980-0x98f
 !setname 0x988 寻芳精