vme50

expansions/script/c64800217.lua

@@ -58,7 +58,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.desfilter(c,e,tp)
-	return  Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_EXTRA+LOCATION_REMOVED,0,1,nil,e,tp,Group.FromCards(c))
+	return c:IsSetCard(0x541a) and c:IsType(TYPE_PENDULUM)and  Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_EXTRA+LOCATION_REMOVED,0,1,nil,e,tp,Group.FromCards(c))
 end
 function s.spfilter(c,e,tp,dg)
 	local tc=dg:GetFirst()

expansions/script/c64800225.lua

@@ -9,7 +9,6 @@ function s.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetRange(LOCATION_PZONE)
 	e2:SetCode(EVENT_CHAINING)
-	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e2:SetCountLimit(1,id)
 	e2:SetCondition(s.condition)
 	e2:SetTarget(s.target)
@@ -30,7 +29,9 @@ function s.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_CHAINING)
 	e3:SetRange(LOCATION_MZONE)
+	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e3:SetCountLimit(1,id+20000)
+	e3:SetCondition(s.chcon)
 	e3:SetTarget(s.chtg)
 	e3:SetOperation(s.chop)
 	c:RegisterEffect(e3)
@@ -85,6 +86,9 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 
+function s.chcon(e,tp,eg,ep,ev,re,r,rp)
+	return  ep~=tp 
+end
 function s.dsfilter(c)
 	return c:IsType(TYPE_PENDULUM)  and c:IsFaceup()
 end