1145141919810

expansions/script/c81905018.lua

@@ -30,7 +30,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(m,2))
-	e3:SetCategory(CATEGORY_TOHAND)
+	e3:SetCategory(CATEGORY_REMOVE)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetCode(EVENT_REMOVE)
@@ -44,7 +44,7 @@ function cm.sucai(c)
 	return c:IsType(TYPE_MONSTER) and c:IsType(TYPE_EFFECT)
 end
 function cm.sfilter(c)
-	return c:IsType(TYPE_MONSTER) and c:IsAttackAbove(2500) and(c:IsRace(RACE_BEAST) or c:IsRace(RACE_ZOMBIE))
+	return c:IsType(TYPE_MONSTER) and c:GetBaseAttack()>=2500 and(c:IsRace(RACE_BEAST) or c:IsRace(RACE_ZOMBIE))
 end
 function cm.lcheck(g,lc)
 	return g:IsExists(cm.sfilter,1,nil)
@@ -73,7 +73,7 @@ end
 function cm.negop(e,tp,eg,ep,ev,re,r,rp)
 	local g2=Duel.GetMatchingGroup(cm.ofilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
 	local rc=re:GetHandler()
-	if Duel.NegateEffect(ev) and rc:IsRelateToEffect(re) and Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
+	if Duel.NegateEffect(ev) and rc:IsRelateToEffect(re) and Duel.SelectYesNo(tp,aux.Stringid(m,0)) and g2:GetCount()>0 then
 		rc:CancelToGrave()
 		Duel.Hint(HINTMSG_SELECT,tp,HINTMSG_FACEUP)
 		local oc=g2:Select(tp,1,1,nil):GetFirst()