Black Square

expansions/script/c33400006.lua

@@ -54,7 +54,8 @@ function c33400006.thfilter2(c,e,tp)
 end
 function c33400006.thtg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end
-	if chk==0 then return  Duel.IsExistingTarget(c33400006.thfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+		and Duel.IsExistingTarget(c33400006.thfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp)  end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g2=Duel.SelectTarget(tp,c33400006.thfilter2,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,1,0,0)

expansions/script/c33401307.lua

@@ -30,6 +30,7 @@ function c33401307.initial_effect(c)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1,33401307+10000)
 	e3:SetCondition(c33401307.thcon)
+	e3:SetTarget(c33401307.thtg)
 	e3:SetOperation(c33401307.thop)
 	c:RegisterEffect(e3)
 end
@@ -92,6 +93,10 @@ end
 function c33401307.thfilter(c)
 	return c:IsSetCard(0x341) and c:IsSetCard(0x46) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
 end
+function c33401307.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(c33401307.thfilter,tp,LOCATION_DECK,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
+end
 function c33401307.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectMatchingCard(tp,c33401307.thfilter,tp,LOCATION_DECK,0,1,1,nil)

expansions/script/c33401310.lua

@@ -48,6 +48,7 @@ function c33401310.thcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c33401310.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
+ if chk==0 then return Duel.IsExistingTarget(c33401310.thfilter,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,0,tp,LOCATION_GRAVE)
 end
 function c33401310.thfilter(c)