ndyd

expansions/script/c12037024.lua

@@ -13,14 +13,21 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function cm.spfilter(c)
-	return c:IsRace(RACE_WINDBEAST) and c:IsAbleToRemove()
+	return c:IsRace(RACE_WINDBEAST) and c:IsAbleToRemove() and c:IsFaceup()
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+<<<<<<< HEAD
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and cm.spfilter1(chkc,e,tp) end
 	if chk==0 then return Duel.IsExistingTarget(cm.spfilter,tp,LOCATION_MZONE,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	Duel.SelectTarget(tp,cm.spfilter,tp,LOCATION_MZONE,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK)
+=======
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and cm.spfilter(chkc) end
+	if chk==0 then return Duel.IsExistingTarget(cm.spfilter,tp,LOCATION_MZONE,0,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+	local g=Duel.SelectTarget(tp,cm.spfilter1,tp,LOCATION_MZONE,LOCAITON_MZONE,1,1,nil)
+>>>>>>> 03371a95ca80eea2b6bc12257b176083cf8421c4
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
 end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
@@ -31,7 +38,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetCode(EVENT_PHASE+PHASE_END)
 		e1:SetRange(LOCATION_REMOVED)
 		e1:SetCountLimit(1)
-		e1:SetReset(RESET_EVENT+RESET_PHASE+PHASE_END)
+		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
 		e1:SetOperation(cm.retop)
 		tc:RegisterEffect(e1)
 		local b1=( Duel.IsExistingMatchingCard(nil,tp,0,LOCATION_ONFIELD,1,nil) )