1145141919810

13e48ff0 · Tachibana · 3ef4103b · 13e48ff0 · 13e48ff0 · 13e48ff0
Commit 13e48ff0 authored Aug 01, 2022 by Tachibana
20 changed files
--- a/expansions/222DIY.cdb
+++ b/expansions/222DIY.cdb
--- a/expansions/script/c12852008.lua
+++ b/expansions/script/c12852008.lua
@@ -5,6 +5,7 @@ function c12852008.initial_effect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCountLimit(1,12852008+EFFECT_COUNT_CODE_OATH)
 	e1:SetTarget(c12852008.target)
 	e1:SetOperation(c12852008.activate)
 	c:RegisterEffect(e1)	

--- a/expansions/script/c12895001.lua
+++ b/expansions/script/c12895001.lua
@@ -34,6 +34,7 @@ function c12895001.initial_effect(c)
 	e8:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e8:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e8:SetCode(EVENT_REMOVE)
+	e8:SetCondition(cm.negcon)
 	e8:SetOperation(cm.regop)
 	c:RegisterEffect(e8)
    local e4=Effect.CreateEffect(c)
@@ -101,6 +102,9 @@ function cm.rmop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 --效果2
+function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()~=PHASE_END
+end
 function cm.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	c:RegisterFlagEffect(12895301,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)

--- a/expansions/script/c12895002.lua
+++ b/expansions/script/c12895002.lua
@@ -2,9 +2,9 @@
 local m = 12895002
 local cm=_G["c"..m]
 function c12895002.initial_effect(c)
-	c:SetSPSummonOnce(12895002)
+    c:SetSPSummonOnce(12895002)
-	c:EnableReviveLimit()
+    c:EnableReviveLimit()
-	local e1=Effect.CreateEffect(c)
+    local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_SPSUMMON_PROC)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
@@ -12,15 +12,14 @@ function c12895002.initial_effect(c)
 	e1:SetCondition(cm.spcon)
 	e1:SetOperation(cm.spop)
 	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
+    local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,1))
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetTarget(cm.tgtg)
 	e2:SetOperation(cm.tgop)
 	c:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(c)
+    local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_TOHAND)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e3:SetCode(EVENT_PHASE+PHASE_END)
@@ -33,9 +32,10 @@ function c12895002.initial_effect(c)
 	e8:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e8:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e8:SetCode(EVENT_REMOVE)
+	e8:SetCondition(cm.negcon)
 	e8:SetOperation(cm.regop)
 	c:RegisterEffect(e8)
-	local e4=Effect.CreateEffect(c)
+    local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(m,2))
 	e4:SetCategory(CATEGORY_TOHAND)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
@@ -83,19 +83,22 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 --效果1
 function cm.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,2,nil) end
 	local g=Duel.GetMatchingGroup(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
-	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,2,0,0)
 end
 function cm.tgop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,2,2,nil)
-	if g:GetCount()>0 then
+	if g:GetCount()>1 then
 		Duel.HintSelection(g)
 		Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
 	end
 end
 --效果2
+function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()~=PHASE_END
+end
 function cm.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	c:RegisterFlagEffect(12895302,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)

--- a/expansions/script/c12895003.lua
+++ b/expansions/script/c12895003.lua
@@ -2,9 +2,9 @@
 local m = 12895003
 local cm=_G["c"..m]
 function c12895003.initial_effect(c)
-	c:EnableReviveLimit()
+    c:EnableReviveLimit()
-	c:SetSPSummonOnce(12895003)
+    c:SetSPSummonOnce(12895003)
-	local e1=Effect.CreateEffect(c)
+    local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_SPSUMMON_PROC)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
@@ -12,7 +12,7 @@ function c12895003.initial_effect(c)
 	e1:SetCondition(cm.spcon)
 	e1:SetOperation(cm.spop)
 	c:RegisterEffect(e1)
-		--special summon
+    	--special summon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,0))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_REMOVE)
@@ -24,7 +24,7 @@ function c12895003.initial_effect(c)
 	e2:SetTarget(cm.rptg)
 	e2:SetOperation(cm.rpop)
 	c:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(c)
+    local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_TOHAND)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e3:SetCode(EVENT_PHASE+PHASE_END)
@@ -37,9 +37,10 @@ function c12895003.initial_effect(c)
 	e8:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e8:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e8:SetCode(EVENT_REMOVE)
+	e8:SetCondition(cm.negcon)
 	e8:SetOperation(cm.regop)
 	c:RegisterEffect(e8)
-	local e4=Effect.CreateEffect(c)
+    local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(m,2))
 	e4:SetCategory(CATEGORY_TOHAND)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
@@ -58,7 +59,7 @@ function c12895003.initial_effect(c)
 		ge1:SetLabel(12895003)
 		ge1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 		ge1:SetOperation(aux.sumreg)
-		Duel.RegisterEffect(ge1,0)
+        Duel.RegisterEffect(ge1,0)
 	end
 	local e9=Effect.CreateEffect(c)
 	e9:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
@@ -111,22 +112,19 @@ function cm.rpop(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,cm.rpfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
 		local tc=g:GetFirst()
 		if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and tc:IsCanBeSpecialSummoned(e,0,tp,true,false) then
-			if Duel.SpecialSummonStep(tc,0,tp,tp,true,false,POS_FACEUP) then
+			Duel.SpecialSummon(tc,0,tp,tp,true,false,POS_FACEUP)
-				local e2=Effect.CreateEffect(c)
+		local fid=e:GetHandler():GetFieldID()
-				e2:SetType(EFFECT_TYPE_SINGLE)
+		tc:RegisterFlagEffect(12895103,RESET_EVENT+RESETS_STANDARD,0,1,fid)
-				e2:SetCode(EFFECT_TO_HAND_REDIRECT)
+		local e1=Effect.CreateEffect(e:GetHandler())
-				e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-				e2:SetReset(RESET_EVENT+RESETS_REDIRECT)
+		e1:SetCode(EVENT_PHASE+PHASE_END)
-				e2:SetValue(LOCATION_GRAVE)
+		e1:SetCountLimit(1)
-				tc:RegisterEffect(e2,true)
+		e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
-				--local e3=e2:Clone()
+		e1:SetLabel(fid)
-				--e3:SetCode(EFFECT_REMOVE_REDIRECT)
+		e1:SetLabelObject(tc)
-				--tc:RegisterEffect(e3,true)
+		e1:SetCondition(cm.thcon)
-				--local e4=e2:Clone()
+		e1:SetOperation(cm.thop)
-				--e4:SetCode(EFFECT_TO_DECK_REDIRECT)
+		Duel.RegisterEffect(e1,tp)
-				--tc:RegisterEffect(e4,true)
-			end
-			Duel.SpecialSummonComplete()
 		end
 	end
 end
@@ -141,6 +139,9 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SendtoGrave(e:GetLabelObject(),nil,REASON_EFFECT)
 end
 --效果2
+function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()~=PHASE_END
+end
 function cm.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	c:RegisterFlagEffect(12895303,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)

--- a/expansions/script/c12895004.lua
+++ b/expansions/script/c12895004.lua
@@ -26,6 +26,7 @@ function c12895004.initial_effect(c)
 	e8:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e8:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e8:SetCode(EVENT_REMOVE)
+	e8:SetCondition(cm.negcon)
 	e8:SetOperation(cm.regop)
 	c:RegisterEffect(e8)
    local e3=Effect.CreateEffect(c)
@@ -104,6 +105,9 @@ function cm.aclimit(e,re,tp)
 	return re:GetHandler():IsOnField() or re:IsHasType(EFFECT_TYPE_ACTIVATE)
 end
 --效果2
+function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()~=PHASE_END
+end
 function cm.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	c:RegisterFlagEffect(12895304,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
@@ -123,7 +127,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 end
 --效果3
 function cm.retcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetFlagEffect(m)~=0
+	return e:GetHandler():GetFlagEffect(12895404)~=0
 end
 function cm.rettg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

--- a/expansions/script/c12895005.lua
+++ b/expansions/script/c12895005.lua
@@ -24,6 +24,7 @@ function c12895005.initial_effect(c)
 	e8:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e8:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e8:SetCode(EVENT_REMOVE)
+	e8:SetCondition(cm.negcon)
 	e8:SetOperation(cm.regop)
 	c:RegisterEffect(e8)
    local e3=Effect.CreateEffect(c)
@@ -62,6 +63,9 @@ function c12895005.initial_effect(c)
 	e9:SetOperation(cm.rcop)
 	c:RegisterEffect(e9)
 end
+function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()~=PHASE_END
+end
 function cm.spfilter(c)
 	return c:IsSetCard(0xa74) and c:IsAbleToRemoveAsCost()
 end

--- a/expansions/script/c12895006.lua
+++ b/expansions/script/c12895006.lua
@@ -25,6 +25,7 @@ function c12895006.initial_effect(c)
 	e8:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e8:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e8:SetCode(EVENT_REMOVE)
+	e8:SetCondition(cm.negcon)
 	e8:SetOperation(cm.regop)
 	c:RegisterEffect(e8)
    local e3=Effect.CreateEffect(c)
@@ -63,6 +64,9 @@ function c12895006.initial_effect(c)
 	e9:SetOperation(cm.rcop)
 	c:RegisterEffect(e9)
 end
+function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()~=PHASE_END
+end
 function cm.spfilter(c)
 	return c:IsSetCard(0xa74) and c:IsAbleToRemoveAsCost()
 end

--- a/expansions/script/c12895007.lua
+++ b/expansions/script/c12895007.lua
@@ -2,9 +2,9 @@
 local m = 12895007
 local cm=_G["c"..m]
 function c12895007.initial_effect(c)
-	c:EnableReviveLimit()
+    c:EnableReviveLimit()
-	c:SetSPSummonOnce(12895007)
+    c:SetSPSummonOnce(12895007)
-	local e1=Effect.CreateEffect(c)
+    local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_SPSUMMON_PROC)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
@@ -12,7 +12,7 @@ function c12895007.initial_effect(c)
 	e1:SetCondition(cm.spcon)
 	e1:SetOperation(cm.spop)
 	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
+    local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,0))
 	e2:SetCategory(CATEGORY_HANDES)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
@@ -25,9 +25,10 @@ function c12895007.initial_effect(c)
 	e8:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e8:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e8:SetCode(EVENT_REMOVE)
+	e8:SetCondition(cm.negcon)
 	e8:SetOperation(cm.regop)
 	c:RegisterEffect(e8)
-	local e3=Effect.CreateEffect(c)
+    local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_TOHAND)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e3:SetCode(EVENT_PHASE+PHASE_END)
@@ -36,7 +37,7 @@ function c12895007.initial_effect(c)
 	e3:SetTarget(cm.thtg)
 	e3:SetOperation(cm.thop)
 	c:RegisterEffect(e3)
-	local e4=Effect.CreateEffect(c)
+    local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(m,2))
 	e4:SetCategory(CATEGORY_TOHAND)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
@@ -94,9 +95,12 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetFieldGroup(ep,LOCATION_HAND,0)
 	if g:GetCount()==0 then return end
 	local sg=g:RandomSelect(1-tp,1)
-	Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
+	Duel.SendtoGrave(sg,REASON_DISCARD+REASON_EFFECT)
 end
 --效果2
+function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()~=PHASE_END
+end
 function cm.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	c:RegisterFlagEffect(12895307,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)

--- a/expansions/script/c12895008.lua
+++ b/expansions/script/c12895008.lua
@@ -25,6 +25,7 @@ function c12895008.initial_effect(c)
 	e8:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e8:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e8:SetCode(EVENT_REMOVE)
+	e8:SetCondition(cm.negcon)
 	e8:SetOperation(cm.regop)
 	c:RegisterEffect(e8)
 	local e3=Effect.CreateEffect(c)
@@ -63,6 +64,9 @@ function c12895008.initial_effect(c)
 	e9:SetOperation(cm.rcop)
 	c:RegisterEffect(e9)
 end
+function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()~=PHASE_END
+end
 function cm.spfilter(c)
 	return c:IsSetCard(0xa74) and c:IsAbleToRemoveAsCost()
 end

--- a/expansions/script/c12895009.lua
+++ b/expansions/script/c12895009.lua
@@ -37,6 +37,7 @@ function c12895009.initial_effect(c)
 	e8:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e8:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e8:SetCode(EVENT_REMOVE)
+	e8:SetCondition(cm.negcon)
 	e8:SetOperation(cm.regop)
 	c:RegisterEffect(e8)
 	local e3=Effect.CreateEffect(c)
@@ -75,6 +76,9 @@ function c12895009.initial_effect(c)
 	e9:SetOperation(cm.rcop)
 	c:RegisterEffect(e9)
 end
+function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()~=PHASE_END
+end
 function cm.spfilter(c)
 	return c:IsSetCard(0xa74) and c:IsAbleToRemoveAsCost()
 end
@@ -96,7 +100,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 --效果1
 function cm.thfilter(c)
-	return c:IsSetCard(0xa74)  and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() and c:IsFaceup()
+	return c:IsSetCard(0xa74)  and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function cm.sthtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_REMOVED,0,1,nil) end
@@ -104,22 +108,24 @@ function cm.sthtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_REMOVED)
 end
 function cm.sthop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local tc=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_REMOVED,0,1,1,nil):GetFirst()
 	if   Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.GetMatchingGroupCount(nil,tp,LOCATION_MZONE,0,nil)==0 and tc:IsCanBeSpecialSummoned(e,0,tp,true,true,POS_FACEUP) 
 	and Duel.SelectYesNo(tp,aux.Stringid(m,0)) 
 	 then
-		if Duel.SpecialSummonStep(tc,0,tp,tp,true,false,POS_FACEUP) then
+		Duel.SpecialSummon(tc,0,tp,tp,true,true,POS_FACEUP)
-			local e2=Effect.CreateEffect(c)
+		local fid=tc:GetFieldID()
-			e2:SetType(EFFECT_TYPE_SINGLE)
+		tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1,fid)
-			e2:SetCode(EFFECT_TO_HAND_REDIRECT)
+		local e1=Effect.CreateEffect(tc)
-			e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-			e2:SetReset(RESET_EVENT+RESETS_REDIRECT)
+		e1:SetCode(EVENT_PHASE+PHASE_END)
-			e2:SetValue(LOCATION_GRAVE)
+		e1:SetCountLimit(1)
-			tc:RegisterEffect(e2,true)
+		e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
-		end
+		e1:SetLabel(fid)
-		Duel.SpecialSummonComplete()
+		e1:SetLabelObject(tc)
+		e1:SetCondition(cm.thcon2)
+		e1:SetOperation(cm.thop2)
+		Duel.RegisterEffect(e1,tp)
 	else
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,tc)

--- a/expansions/script/c12895010.lua
+++ b/expansions/script/c12895010.lua
@@ -20,7 +20,6 @@ function c12895010.initial_effect(c)
 	e2:SetCode(EVENT_SPSUMMON)
 	e2:SetRange(LOCATION_PZONE)
 	e2:SetCondition(cm.discon)
-	e2:SetCountLimit(1)
 	e2:SetCost(cm.discost)
 	e2:SetTarget(cm.distg)
 	e2:SetOperation(cm.disop)
@@ -38,6 +37,7 @@ function c12895010.initial_effect(c)
 	e8:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e8:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e8:SetCode(EVENT_REMOVE)
+	e8:SetCondition(cm.negcon)
 	e8:SetOperation(cm.regop)
 	c:RegisterEffect(e8)
 	local e3=Effect.CreateEffect(c)
@@ -76,6 +76,9 @@ function c12895010.initial_effect(c)
 	e9:SetOperation(cm.rcop)
 	c:RegisterEffect(e9)
 end
+function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()~=PHASE_END
+end
 function cm.spfilter(c)
 	return c:IsSetCard(0xa74) and c:IsAbleToRemoveAsCost()
 end

--- a/expansions/script/c13257310.lua
+++ b/expansions/script/c13257310.lua
@@ -49,7 +49,7 @@ end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	local f=tama.cosmicFighters_equipGetFormation(c)
-	if chk==0 then return f and f:GetCount()<c:GetFlagEffect(m) end
+	if chk==0 then return f and f:GetCount()>c:GetFlagEffect(m) end
 	c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 end
 function cm.econ(e,tp,eg,ep,ev,re,r,rp)

--- a/expansions/script/c13257317.lua
+++ b/expansions/script/c13257317.lua
@@ -38,6 +38,6 @@ end
 function cm.efilter1(e,te)
 	local ec=e:GetHandler():GetEquipTarget()
 	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
-	return not te:GetOwnerPlayer()~=e:GetHandlerPlayer() and not (g==nil and {g:IsContains(ec)})[1]
+	return te:GetOwnerPlayer()~=e:GetHandlerPlayer() and not(g==nil or {g:IsContains(e:GetHandler():GetEquipTarget())})[1]
 	--return te:GetOwnerPlayer()~=e:GetHandlerPlayer() and not te:IsHasProperty(EFFECT_FLAG_CARD_TARGET)
 end
--- a/expansions/script/c13257318.lua
+++ b/expansions/script/c13257318.lua
@@ -44,6 +44,6 @@ end
 function cm.efilter1(e,te)
 	local ec=e:GetHandler():GetEquipTarget()
 	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
-	return not te:GetOwnerPlayer()~=e:GetHandlerPlayer() and (g==nil and {g:IsContains(ec)})[1]
+	return te:GetOwnerPlayer()~=e:GetHandlerPlayer() and (g and g:IsContains(ec))
 	--return te:GetOwnerPlayer()~=e:GetHandlerPlayer() and not te:IsHasProperty(EFFECT_FLAG_CARD_TARGET)
 end
--- a/expansions/script/c13257322.lua
+++ b/expansions/script/c13257322.lua
@@ -35,7 +35,7 @@ end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	local f=tama.cosmicFighters_equipGetFormation(c)
-	if chk==0 then return f and f:GetCount()<c:GetFlagEffect(m) end
+	if chk==0 then return f and f:GetCount()>c:GetFlagEffect(m) end
 	c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 end
 function cm.desfilter(c)

--- a/expansions/script/c13257323.lua
+++ b/expansions/script/c13257323.lua
@@ -44,7 +44,7 @@ end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	local f=tama.cosmicFighters_equipGetFormation(c)
-	if chk==0 then return f and f:GetCount()<c:GetFlagEffect(m) end
+	if chk==0 then return f and f:GetCount()>c:GetFlagEffect(m) end
 	c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 end
 function cm.descon(e,tp,eg,ep,ev,re,r,rp)

--- a/expansions/script/c13257324.lua
+++ b/expansions/script/c13257324.lua
@@ -37,7 +37,7 @@ end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	local f=tama.cosmicFighters_equipGetFormation(c)
-	if chk==0 then return f and f:GetCount()<c:GetFlagEffect(m) end
+	if chk==0 then return f and f:GetCount()>c:GetFlagEffect(m) end
 	c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 end
 function cm.descon(e,tp,eg,ep,ev,re,r,rp)

--- a/expansions/script/c13257325.lua
+++ b/expansions/script/c13257325.lua
@@ -27,6 +27,7 @@ function cm.initial_effect(c)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCode(EFFECT_IMMUNE_EFFECT)
 	e3:SetTargetRange(LOCATION_MZONE,0)
+	e3:SetCondition(cm.econ)
 	e3:SetTarget(cm.etarget)
 	e3:SetValue(cm.efilter)
 	c:RegisterEffect(e3)
@@ -169,6 +170,9 @@ end
 function cm.tokendes(e)
 	return not e:GetOwner():GetCardTarget():IsContains(e:GetHandler())
 end
+function cm.econ(e)
+	return Duel.GetTurnPlayer()==e:GetHandlerPlayer()
+end
 function cm.etarget(e,c)
 	return c:IsSetCard(0x351)
 end
@@ -212,5 +216,5 @@ function cm.upop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.bgmop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(11,0,aux.Stringid(m,7))
+	Duel.Hint(HINT_MUSIC,0,aux.Stringid(m,7))
 end
--- a/expansions/script/c13257326.lua
+++ b/expansions/script/c13257326.lua
@@ -28,6 +28,7 @@ function cm.initial_effect(c)
 	e3:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetTargetRange(LOCATION_MZONE,0)
+	e3:SetCondition(cm.econ)
 	e3:SetTarget(cm.etarget)
 	e3:SetValue(1)
 	c:RegisterEffect(e3)
@@ -39,6 +40,7 @@ function cm.initial_effect(c)
 	e5:SetCode(EFFECT_UPDATE_ATTACK)
 	e5:SetRange(LOCATION_MZONE)
 	e5:SetTargetRange(LOCATION_MZONE,0)
+	e5:SetCondition(cm.econ)
 	e5:SetTarget(cm.etarget)
 	e5:SetValue(1300)
 	c:RegisterEffect(e5)
@@ -182,6 +184,9 @@ end
 function cm.tokendes(e)
 	return not e:GetOwner():GetCardTarget():IsContains(e:GetHandler())
 end
+function cm.econ(e)
+	return Duel.GetTurnPlayer()==e:GetHandlerPlayer()
+end
 function cm.etarget(e,c)
 	return c:IsSetCard(0x351)
 end
@@ -222,5 +227,5 @@ function cm.efilter(e,re)
 	return e:GetOwnerPlayer()~=re:GetOwnerPlayer()
 end
 function cm.bgmop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(11,0,aux.Stringid(m,7))
+	Duel.Hint(HINT_MUSIC,0,aux.Stringid(m,7))
 end