fix

expansions/script/c30000220.lua

@@ -3,7 +3,7 @@ if not pcall(function() require("expansions/script/c10199990") end) then require
 local m,cm=rscf.DefineCard(30000220)
 function cm.initial_effect(c)
 	local e1=rsef.ACT(c,nil,nil,nil,"td,dr",nil,nil,nil,cm.tg,cm.act)
-	local e2=rsef.I(c,{m,0},nil,"td,dr","tg",LOCATION_GRAVE,aux.exccon,nil,rstg.target({cm.tdfilter,"td",LOCATION_GRAVE+LOCATION_REMOVED,0,2 },rsop.list(Card.IsAbleToDeck,"td"),rsop.list(nil,"dr",1)),cm.drop)
+	local e2=rsef.I(c,{m,0},nil,"td,dr","tg",LOCATION_GRAVE,aux.exccon,nil,rstg.target({cm.tdfilter,"td",LOCATION_GRAVE+LOCATION_REMOVED,0,2 },rsop.list(Card.IsAbleToDeck,"td"),rsop.list(1,"dr")),cm.drop)
 	if cm.actct then return end
 	cm.actct=0
 	local ge1=Effect.CreateEffect(c)
@@ -43,6 +43,10 @@ function cm.act(e,tp)
 	end
 	Duel.HintSelection(tg-hg)
 	if Duel.SendtoDeck(tg,nil,2,REASON_EFFECT)>0 then
+		local og=Duel.GetOperatedGroup()
+		if og:IsExists(Card.IsLocation,1,nil,LOCATION_DECK) then
+			Duel.ShuffleDeck(tp)
+		end
 		Duel.Draw(tp,cm.actct+2,REASON_EFFECT)
 	end
 end

expansions/script/c33401058.lua

@@ -26,7 +26,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function cm.cfilter(c,tp)
-	return c:IsReason(REASON_BATTLE+REASON_EFFECT) and c:IsSetCard(0x9341) and c:GetPreviousControler()==tp
+	return c:IsReason(REASON_BATTLE+REASON_EFFECT) and c:IsSetCard(0x9341) and c:IsType(TYPE_MONSTER) and c:GetPreviousControler()==tp
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(cm.cfilter,1,nil,tp)

expansions/script/c33401303.lua

@@ -23,7 +23,7 @@ function c33401303.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x341+0x5344))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x341,0x5344))
 	e2:SetValue(c33401303.atkval)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
@@ -69,7 +69,7 @@ function c33401303.desop(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function c33401303.pd(c)
-	return c:IsSetCard(0x341+0x5344+0x340) 
+	return c:IsSetCard(0x341,0x5344,0x340) 
 end
 function c33401303.atkval(e,c)
 	return Duel.GetMatchingGroupCount(c33401303.pd,e:GetHandlerPlayer(),LOCATION_GRAVE,0,nil)*100