ndyd

expansions/script/c17060820.lua

@@ -101,10 +101,10 @@ end
 function cm.spcon(e,c)
 	if c==nil then return true end
 	local tp=c:GetControler()
-	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
-	if ft<=0 then return false end
 	local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_PZONE,0,c)
-	return g:CheckWithSumGreater(Card.GetCurrentScale,8)
+	return ((c:IsLocation(LOCATION_HAND) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0) or
+		(c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0))
+		and g:CheckWithSumGreater(Card.GetCurrentScale,8)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_PZONE,0,c)

expansions/script/c33300154.lua

@@ -95,7 +95,7 @@ function cm.thfilter(c)
 end
 function cm.spop2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if not c:IsRelateToEffect(e) or Duel.SendtoGrave(c,REASON_EFFECT)==0 then return end
+	--if not c:IsRelateToEffect(e) or Duel.SendtoGrave(c,REASON_EFFECT)==0 then return end
 	local ft=2
 	if Duel.IsPlayerAffectedByEffect(tp,59822133) then ft=1 end
 	ft=math.min(ft,(Duel.GetMZoneCount(tp,e:GetHandler(),tp)))