ndyd

expansions/script/c33500211.lua

@@ -51,7 +51,7 @@ function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
 end
 function cm.thfilter(c)
-	return c:IsSetCard(0xa82) and c:IsAbleToHand()
+	return c:IsSetCard(0xa82) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c33500311.lua

@@ -13,7 +13,7 @@ function cm.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetCountLimit(1,m)
-	e1:SetCondition(cm.setcon)
+	e1:SetTarget(cm.tg)
 	e1:SetOperation(cm.setop)
 	c:RegisterEffect(e1)
 	--2
@@ -27,8 +27,8 @@ function cm.initial_effect(c)
 	e3:SetOperation(cm.nop)
 	c:RegisterEffect(e3)
 end
-function cm.setcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(cm.setfilter,tp,LOCATION_GRAVE,0,1,nil)
+function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.setfilter,tp,LOCATION_GRAVE,0,1,nil) end
 end
 function cm.setfilter(c)
 	return c:IsType(TYPE_SPELL) and c:IsSSetable()