54188

expansions/script/c65030007.lua

@@ -20,7 +20,7 @@ function c65030007.initial_effect(c)
    --search
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(65030007,1))
-	e3:SetCategory(CATEGORY_TOHAND)
+	e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_HAND)
 	e3:SetCountLimit(1,65030007)
@@ -32,7 +32,7 @@ function c65030007.initial_effect(c)
 	Duel.AddCustomActivityCounter(65030007,ACTIVITY_SPSUMMON,c65030007.counterfilter)
 end
 function c65030007.counterfilter(c)
-	return c:GetSummonLocation(LOCATION_EXTRA) 
+	return c:GetSummonLocation(LOCATION_EXTRA) and not c:IsType(TYPE_TOKEN)
 end
 function c65030007.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsDiscardable() end
@@ -47,7 +47,7 @@ function c65030007.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c65030007.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c65030007.thfilter),tp,LOCATION_GRAVE,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,c65030007.thfilter,tp,LOCATION_GRAVE,0,1,1,nil)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
@@ -76,7 +76,7 @@ function c65030007.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e3,tp)
 end
 function c65030007.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not c:IsLocation(LOCATION_EXTRA)
+	return c:IsType(TYPE_TOKEN) or not c:IsLocation(LOCATION_EXTRA)
 end
 function c65030007.filter0(c)
 	return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove() and c:IsSetCard(0x6da1)

expansions/script/c65030008.lua

@@ -17,7 +17,7 @@ function c65030008.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e2:SetValue(1)
 	c:RegisterEffect(e2)
-	--search
+   --search
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(65030008,1))
 	e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
@@ -76,7 +76,7 @@ function c65030008.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e3,tp)
 end
 function c65030008.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not c:IsLocation(LOCATION_EXTRA)
+	return c:IsType(TYPE_TOKEN) or not c:IsLocation(LOCATION_EXTRA)
 end
 function c65030008.filter0(c)
 	return (c:IsLocation(LOCATION_ONFIELD+LOCATION_GRAVE) or c:IsFaceup()) and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToDeck()