ndyd

expansions/script/c81028015.lua

@@ -46,13 +46,13 @@ end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
 		local check=Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-			and Duel.IsExistingMatchingCard(cm.dfilter,tp,LOCATION_MZONE,0,1,nil)
+			and not Duel.IsExistingMatchingCard(cm.dfilter,tp,LOCATION_MZONE,0,1,nil)
 		return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil,e,tp,check)
 	end
 end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	local check=Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(cm.dfilter,tp,LOCATION_MZONE,0,1,nil)
+		and not Duel.IsExistingMatchingCard(cm.dfilter,tp,LOCATION_MZONE,0,1,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
 	local tc=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp,check):GetFirst()
 	if tc then

expansions/script/c81028017.lua

@@ -63,22 +63,22 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetTargetRange(1,0)
-	e1:SetTarget(cm.splimit)
+	e1:SetTarget(cm.ssplimit)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 end
-function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
+function cm.ssplimit(e,c,sump,sumtype,sumpos,targetp,se)
 	return c:IsType(TYPE_SYNCHRO) and not c:IsType(TYPE_TUNER)
 end
-function cm.thfilter(c,lv)
-	return c:IsType(TYPE_TUNER) and not c:IsLevel(lv) and c:IsAbleToHand()
+function cm.thfilter(c)
+	return c:IsType(TYPE_TUNER) and c:IsAbleToHand()
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
 	local lv=c:GetLevel()
-	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and cm.thfilter(chkc,lv) end
-	if chk==0 then return c:IsLevelAbove(1) and c:IsRelateToEffect(e)
-		and Duel.IsExistingTarget(cm.thfilter,tp,LOCATION_GRAVE,0,1,nil,lv) end
+	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and cm.thfilter(chkc) end
+	if chk==0 then return  c:IsLevelAbove(1)
+	and Duel.IsExistingTarget(cm.thfilter,tp,LOCATION_GRAVE,0,1,nil,lv) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectTarget(tp,cm.thfilter,tp,LOCATION_GRAVE,0,1,1,nil,lv)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)