tnndx

expansions/script/c15000720.lua

@@ -92,7 +92,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SendtoDeck(g,nil,1,REASON_EFFECT)
 		Duel.ShuffleDeck(tp)  
 	end  
-	if ct~=3 and c:IsAbleToHand() then
+	if ct~=3 and c:IsRelateToEffect(e) and c:IsAbleToHand() then
 		Duel.BreakEffect()
 		Duel.SendtoHand(c,nil,REASON_EFFECT)
 	end

expansions/script/c15000748.lua

@@ -18,6 +18,7 @@ function cm.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
+	e2:SetRange(LOCATION_GRAVE)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetCountLimit(1,15000749)
 	e2:SetCondition(aux.exccon)
@@ -59,16 +60,15 @@ end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_EXTRA) and cm.spfilter(chkc,e,tp) end
-	if chk==0 then return Duel.IsExistingTarget(cm.spfilter,tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,nil,e,tp) and c:IsAbleToDeck() end
+	if chk==0 then return Duel.IsExistingTarget(aux.NecroValleyFilter(cm.spfilter),tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,nil,e,tp) and c:IsAbleToDeck() end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectTarget(tp,cm.spfilter,tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,1,nil,e,tp)
+	local g=Duel.SelectTarget(tp,aux.NecroValleyFilter(cm.spfilter),tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,c,1,0,0)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if Duel.SendtoDeck(e:GetHandler(),nil,2,REASON_EFFECT)~=0 and tc:IsRelateToEffect(e) and cm.spfilter(tc,e,tp) then
-		Duel.BreakEffect()
 		Duel.SpecialSummon(tc,SUMMON_TYPE_PENDULUM,tp,tp,false,false,POS_FACEUP)
 	end
 end
\ No newline at end of file