nmbd

expansions/script/c21520237.lua

@@ -90,8 +90,8 @@ end
 function c21520237.igfilter(c)
 	return c:IsAbleToHand() and c:IsType(TYPE_TRAP)
 end
-function c21520237.igfilter2(fc) 
-	return fc:IsCode(21520133) and fc:IsFaceup() 
+function c21520237.effectfilter(c) 
+	return c:IsCode(21520133) and c:IsFaceup() and not c:IsStatus(STATUS_BATTLE_DESTROYED)
 end
 function c21520237.igtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>0 end
@@ -121,9 +121,9 @@ function c21520237.igop(e,tp,eg,ep,ev,re,r,rp)
 			Duel.Destroy(c,REASON_EFFECT)
 		end
 		Duel.ShuffleDeck(tp)
-		if not Duel.IsExistingMatchingCard(c21520237.igfilter2,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) then 
+	end
+	if not Duel.IsExistingMatchingCard(c21520237.effectfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) then 
 		Duel.BreakEffect()
 		Duel.Damage(tp,1500,REASON_RULE)
 	end
-	end
 end

expansions/script/c21520238.lua

@@ -90,8 +90,8 @@ end
 function c21520238.igfilter(c)
 	return c:IsAbleToHand() and c:IsType(TYPE_SPELL)
 end
-function c21520238.igfilter2(fc)
-	return fc:IsCode(21520133) and fc:IsFaceup() 
+function c21520238.effectfilter(c)
+	return c:IsCode(21520133) and c:IsFaceup() and not c:IsStatus(STATUS_BATTLE_DESTROYED)
 end
 function c21520238.igtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>0 end
@@ -121,9 +121,9 @@ function c21520238.igop(e,tp,eg,ep,ev,re,r,rp)
 			Duel.Destroy(c,REASON_EFFECT)
 		end
 		Duel.ShuffleDeck(tp)
-		if not Duel.IsExistingMatchingCard(c21520238.igfilter2,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) then 
+	end
+	if not Duel.IsExistingMatchingCard(c21520238.effectfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) then 
 		Duel.BreakEffect()
 		Duel.Damage(tp,2000,REASON_RULE)
 	end
-	end
 end

expansions/script/c81024020.lua

@@ -42,9 +42,6 @@ function cm.ssop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SpecialSummon(token,0,tp,tp,false,false,POS_FACEUP)
 	end
 end
-function cm.rfcon(e)
-	return Duel.GetAttacker()==e:GetHandler() or Duel.GetAttackTarget()==e:GetHandler()
-end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end