ndyd

expansions/script/c28317000.lua

@@ -19,6 +19,9 @@ function cm.initial_effect(c)
 	e3:SetTargetRange(1,0)
 	e3:SetTarget(cm.sumlimit)
 	c:RegisterEffect(e3)
+	local e4=e3:Clone()
+	e4:SetCode(EFFECT_CANNOT_SUMMON)
+	c:RegisterEffect(e4)
 end
 function cm.cfilter(c)
 	return c:IsFaceup() and c:IsRace(RACE_FAIRY)

expansions/script/c33500933.lua

@@ -31,6 +31,9 @@ function cm.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetValue(cm.atkval)
 	c:RegisterEffect(e2)
+	local e2_1=e2:Clone()
+	e2_1:SetCode(EFFECT_UPDATE_DEFENSE)
+	c:RegisterEffect(e2_1)
 	--indestructable
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
@@ -91,23 +94,17 @@ end
 function cm.refilter1(c)
 	return c:IsXyzType(TYPE_XYZ) and c:IsType(TYPE_MONSTER) and c:IsSetCard(0x6341) 
 end
-function cm.refilter2(c)
-	return c:IsXyzType(TYPE_XYZ) and c:IsType(TYPE_MONSTER)  
-end
-function cm.refilter3(c)
-	return c:IsXyzType(TYPE_XYZ) and c:IsType(TYPE_MONSTER) and c:IsSetCard(0x341)
+function cm.refilter2(c,tp)
+	return c:IsXyzType(TYPE_XYZ) and c:IsType(TYPE_MONSTER) and c:IsSetCard(0x341) and Duel.IsExistingMatchingCard(cm.refilter1,tp,LOCATION_GRAVE,0,1,nil)
 end
 function cm.check(g)
-	return   g:IsExists(Card.IsSetCard,1,nil,0x6341)
+	return g:IsExists(Card.IsSetCard,1,nil,0x6341)
 end
 function cm.xyzop(e,tp,chk,c)
 	local g1nm=Duel.GetMatchingGroupCount(cm.refilter1,tp,LOCATION_GRAVE,0,nil)
-	local g2nm=Duel.GetMatchingGroupCount(cm.refilter2,tp,LOCATION_GRAVE,0,nil)
-	local g3nm=Duel.GetMatchingGroupCount(cm.refilter3,tp,LOCATION_GRAVE,0,nil)
-	local cnm=g1nm+g2nm
-	local cnm2=g3nm-cnm
-	if chk==0 then return cnm>=3 or (g1nm==1 and g2nm==1 and  cnm2>=1) end
-	local g=Duel.GetMatchingGroup(cm.refilter3,tp,LOCATION_GRAVE,0,nil)
+	local g2nm=Duel.GetMatchingGroupCount(cm.refilter2,tp,LOCATION_GRAVE,0,nil,tp)
+	if chk==0 then return g1nm>0 and g2nm>2  end
+	local g=Duel.GetMatchingGroup(cm.refilter2,tp,LOCATION_GRAVE,0,nil,tp)
 	 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local g1=g:SelectSubGroup(tp,cm.check,false,3,99)   
 	Duel.Remove(g1,POS_FACEUP,REASON_COST)

expansions/script/c60002005.lua

@@ -60,8 +60,8 @@ function c60002005.cnop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 end
-function c60002005.actfilter(e,c)
-	return not c:IsLevelAbove(1)
+function c60002005.actfilter(e,re,tp)
+	return re:IsActiveType(TYPE_MONSTER) and not re:GetHandler():IsLevelAbove(1) and re:GetHandler()~=e:GetHandler()
 end
 function c60002005.cxcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end