nmbd

expansions/script/c33331554.lua

@@ -44,7 +44,7 @@ function c33331554.tfilter2(c)
 		and c:IsSSetable()
 end
 function c33331554.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c33331554.tfilter2,tp,LOCATION_DECK,0,1,nil) end
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 and Duel.IsExistingMatchingCard(c33331554.tfilter2,tp,LOCATION_DECK,0,1,nil) end
 end
 function c33331554.ofilter2(c,e,tp,zone)
 	return c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP,tp,zone)

expansions/script/c33331559.lua

@@ -61,7 +61,7 @@ function c33331559.con2(e)
 end
 --
 function c33331559.tfilter3(c)
-	return c:IsAbleToDeck() and c:IsSetCard(0x55e)
+	return c:IsAbleToDeck() and c:IsSetCard(0x55e) and c:IsFaceup()
 end
 function c33331559.tg3(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
@@ -79,7 +79,7 @@ function c33331559.op3(e,tp,eg,ep,ev,re,r,rp)
 	if sg:GetCount()>2 then
 		sg:AddCard(c)
 		if Duel.SendtoDeck(sg,nil,2,REASON_EFFECT)<1 then return end
-		Duel.ShuffleDeck()
+		Duel.ShuffleDeck(tp)
 		Duel.Draw(tp,1,REASON_EFFECT)
 	end
 end

expansions/script/c33331560.lua

@@ -95,7 +95,7 @@ function cm.setfilter(c)
 	--return (c:IsType(TYPE_SPELL) or c:IsType(TYPE_TRAP)) and c:IsSetCard(0x55e) 
 end
 function cm.tftg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.setfilter,tp,LOCATION_DECK,0,1,nil) end
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 and Duel.IsExistingMatchingCard(cm.setfilter,tp,LOCATION_DECK,0,1,nil) end
 end
 function cm.tfop(e,tp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)