wadashimo

expansions/script/c12018004.lua

@@ -123,9 +123,6 @@ end
 function c12018004.efilter(e,te)
 	return e:GetOwner()~=te:GetOwner()
 end
-function c12018004.efilter(e,re)
-	return not re:GetHandler():IsSetCard(0xa656)
-end
 function c12018004.tgfilter(c)
 	return c:IsSetCard(0x3fb7) and c:IsFaceup()
 end

expansions/script/c33700941.lua

@@ -14,22 +14,26 @@ function cm.initial_effect(c)
 		if g:GetClassCount(Card.GetCode)<#g then return end
 		local rc=rscf.GetFaceUpSelf(e) 
 		if rc then
-			e:GetLabelObject():SetLabel(1)
+			rc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,0)
 		end
 	end)
-	local f1=function(tp)
-		local g=Duel.GetFieldGroup(tp,LOCATION_GRAVE,0)
-		return g:GetClassCount(Card.GetCode)==#g
-	end
-	local e4=rsef.QO(c,EVENT_CHAINING,{m,0},1,"rm,neg","dsp,dcal",LOCATION_MZONE,rscon.negcon(f1),nil,cm.tg,cm.op)
-	e3:SetLabelObject(e4)
-	local f2=function(e)
-		return Duel.GetCurrentChain()==0
-	end
-	local e4=rsef.QO(c,EVENT_SPSUMMON,{m,0},1,"rm,diss",nil,LOCATION_MZONE,f2,nil,cm.tg2,cm.op2)
+	local e4=rsef.QO(c,EVENT_CHAINING,{m,0},1,"rm,neg","dsp,dcal",LOCATION_MZONE,cm.con1,cm.cost,cm.tg,cm.op)
+	local e5=rsef.QO(c,EVENT_SPSUMMON,{m,0},1,"rm,diss",nil,LOCATION_MZONE,cm.con2,cm.cost,cm.tg2,cm.op2)
+end
+function cm.con1(e,tp,eg,ep,ev,re,r,rp)
+	local g=Duel.GetFieldGroup(tp,LOCATION_GRAVE,0)
+	return g:GetClassCount(Card.GetCode)==g:GetCount()
+end
+function cm.con2(e,tp,eg,ep,ev,re,r,rp)
+	local g=Duel.GetFieldGroup(tp,LOCATION_GRAVE,0)
+		return g:GetClassCount(Card.GetCode)==g:GetCount() and Duel.GetCurrentChain()==0
+end
+function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return e:GetHandler():GetFlagEffect(m+1)==0 end
+	e:GetHandler():RegisterFlagEffect(m+1,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 end
 function cm.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return e:GetHandler():GetFlagEffect(m)~=0 end
 	Duel.SetOperationInfo(0,CATEGORY_DISABLE_SUMMON,eg,eg:GetCount(),0,0)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,eg,eg:GetCount(),0,0)
 end
@@ -38,7 +42,7 @@ function cm.op2(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Remove(eg,POS_FACEUP,REASON_EFFECT)
 end
 function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return re:GetHandler():IsAbleToRemove() and e:GetLabel()==1 end
+	if chk==0 then return re:GetHandler():IsAbleToRemove() and e:GetHandler():GetFlagEffect(m)~=0 end
 	Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
 	if re:GetHandler():IsRelateToEffect(re) then
 		Duel.SetOperationInfo(0,CATEGORY_REMOVE,eg,1,0,0)