fix

expansions/script/c11602200.lua

@@ -46,11 +46,11 @@ function c11602200.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 end
 function c11602200.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsFaceup,tp,LOCATION_MZONE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
 end
 function c11602200.thop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local tc=Duel.SelectMatchingCard(tp,Card.IsFaceup,tp,LOCATION_MZONE,0,1,1,nil):GetFirst()
+	local tc=Duel.SelectMatchingCard(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil):GetFirst()
 	if tc then
 		local e1=Effect.CreateEffect(c)
 		e1:SetDescription(aux.Stringid(11602200,0))

expansions/script/c11602280.lua

@@ -54,7 +54,8 @@ function c11602280.caop(e,tp,eg,ep,ev,re,r,rp)
 	local des=eg:GetFirst()
 	local rc=des:GetReasonCard()
 	local re2=des:GetReasonEffect()
-	local rc2=re2:GetHandler()
+	local rc2
+	if re2 then rc2=re2:GetHandler() end
 	local rg=Group.CreateGroup()
 	while des do 
 		if des:IsReason(REASON_BATTLE) then 
@@ -137,7 +138,7 @@ function c11602280.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=g:GetFirst()
 	if tc then
 		if tc:IsType(0x1) then
-			Duel.SendtoHand()
+			Duel.SendtoHand(tc,nil,0x40)
 			Duel.ConfirmCards(1-tp,tc)
 		else
 			Duel.SSet(tp,tc)

expansions/script/c11605030.lua

@@ -55,7 +55,7 @@ function c11605030.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c11605030.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,0,LOCATION_GRAVE,1,3,nil)
+	local g=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,0,LOCATION_GRAVE,1,1,nil)
 	if #g>0 then
 		Duel.HintSelection(g)
 		Duel.Remove(g,POS_FACEUP,REASON_EFFECT)

expansions/script/c11605040.lua

@@ -175,7 +175,7 @@ function c11605040.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local rec=c:GetAttack()
 	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,rec)
 end
-function c11605040.rmfilter(c)
+function c11605040.rmfilter(c,tp)
 	return c:IsControler(1-tp) and c:IsAbleToRemove(tp,POS_FACEDOWN) and c:GetSequence()<5
 end
 function c11605040.op(e,tp,eg,ep,ev,re,r,rp)
@@ -183,7 +183,7 @@ function c11605040.op(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToBattle() and c:IsFaceup() then
 		if Duel.NegateAttack() and Duel.Recover(tp,c:GetAttack(),REASON_EFFECT)>0 then
 			local g=c:GetColumnGroup()
-			local sg=g:Filter(c11605040.rmfilter,nil)
+			local sg=g:Filter(c11605040.rmfilter,nil,tp)
 			if #sg>0 then
 				Duel.BreakEffect()
 				Duel.Remove(sg,POS_FACEDOWN,REASON_RULE)

expansions/script/c1200165.lua

@@ -54,10 +54,14 @@ function s.checkop(e,tp,eg,ep,ev,re,r,rp)
 		tc=eg:GetNext()
 	end
 end
+function s.studyfilter(c,tp)
+	return c:IsCode(1200200) and c.studycon(c,tp)
+end
 function s.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local count=Duel.GetFlagEffect(tp,id)+1
-	if count>=2 then
+	local study=Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
+	if count>=2 or study then
 		--battle
 		local e11=Effect.CreateEffect(c)
 		e11:SetType(EFFECT_TYPE_SINGLE)
@@ -73,7 +77,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e12)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0))
 	end
-	if count>=3 then
+	if count>=3 or study then
 		--attack all
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_SINGLE)
@@ -83,7 +87,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e2)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1))
 	end
-	if count>=4 then
+	if count>=4 or study then
 		--cannot active
 		local e3=Effect.CreateEffect(c)
 		e3:SetType(EFFECT_TYPE_FIELD)
@@ -97,10 +101,10 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e3)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2))
 	end
-	if count>=5 then
+	if count>=5 or study then
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,3))
 	end
-	if count==6 then
+	if count==6 or study then
 		--atk down
 		local e4=Effect.CreateEffect(c)
 		e4:SetDescription(aux.Stringid(id,6))
@@ -120,7 +124,7 @@ function s.tdfilter(c)
 end
 function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return Duel.GetFlagEffect(tp,id)>=4
+	return Duel.GetFlagEffect(tp,id)>=4 or Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
 end
 function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c1200170.lua

@@ -54,10 +54,14 @@ function s.checkop(e,tp,eg,ep,ev,re,r,rp)
 		tc=eg:GetNext()
 	end
 end
+function s.studyfilter(c,tp)
+	return c:IsCode(1200200) and c.studycon(c,tp)
+end
 function s.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local count=Duel.GetFlagEffect(tp,id)+1
-	if count>=2 then
+	local study=Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
+	if count>=2 or study then
 		--indes
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
@@ -69,7 +73,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e1)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0))
 	end
-	if count>=3 then
+	if count>=3 or study then
 		--cannot target
 		local e2=Effect.CreateEffect(c)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -81,7 +85,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e2)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1))
 	end
-	if count>=4 then
+	if count>=4 or study then
 		--activate limit
 		local e3=Effect.CreateEffect(c)
 		e3:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -95,10 +99,10 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e3)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2))
 	end
-	if count>=5 then
+	if count>=5 or study then
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,3))
 	end
-	if count==6 then
+	if count==6 or study then
 	
 		--negate
 		local e4=Effect.CreateEffect(c)
@@ -119,7 +123,7 @@ function s.tdfilter(c)
 end
 function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return Duel.GetFlagEffect(tp,id)>=4
+	return Duel.GetFlagEffect(tp,id)>=4 or Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
 end
 function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c1200175.lua

@@ -79,10 +79,14 @@ function s.checkop(e,tp,eg,ep,ev,re,r,rp)
 		tc=eg:GetNext()
 	end
 end
+function s.studyfilter(c,tp)
+	return c:IsCode(1200200) and c.studycon(c,tp)
+end
 function s.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local count=Duel.GetFlagEffect(tp,id)+1
-	if count>=2 then
+	local study=Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
+	if count>=2 or study then
 		--cannot be material
 		local e11=Effect.CreateEffect(c)
 		e11:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -104,7 +108,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e14)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0))
 	end
-	if count>=3 then
+	if count>=3 or study then
 		--immune
 		local e2=Effect.CreateEffect(c)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -116,7 +120,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e2)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1))
 	end
-	if count>=4 then
+	if count>=4 or study then
 	
 		--destroy
 		local e3=Effect.CreateEffect(c)
@@ -134,10 +138,10 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e3)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2))
 	end
-	if count>=5 then
+	if count>=5 or study then
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,3))
 	end
-	if count==6 then
+	if count==6 or study then
 		--mark
 		local e4=Effect.CreateEffect(c)
 		e4:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -157,7 +161,7 @@ function s.tdfilter(c)
 end
 function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return Duel.GetFlagEffect(tp,id)>=4
+	return Duel.GetFlagEffect(tp,id)>=4 or Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
 end
 function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c1200180.lua

@@ -55,10 +55,14 @@ function s.checkop(e,tp,eg,ep,ev,re,r,rp)
 		tc=eg:GetNext()
 	end
 end
+function s.studyfilter(c,tp)
+	return c:IsCode(1200200) and c.studycon(c,tp)
+end
 function s.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local count=Duel.GetFlagEffect(tp,id)+1
-	if count>=2 then
+	local study=Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
+	if count>=2 or study then
 	
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
@@ -68,7 +72,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e1)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0))
 	end
-	if count>=3 then
+	if count>=3 or study then
 		--immune
 		local e2=Effect.CreateEffect(c)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -80,7 +84,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e2)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1))
 	end
-	if count>=4 then
+	if count>=4 or study then
 		--activate limit
 		local e3=Effect.CreateEffect(c)
 		e3:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -94,10 +98,10 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e3)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2))
 	end
-	if count>=5 then
+	if count>=5 or study then
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,3))
 	end
-	if count==6 then
+	if count==6 or study then
 		--activate cost
 		local e41=Effect.CreateEffect(c)
 		e41:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -114,6 +118,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		e43:SetReset(RESET_EVENT+RESETS_STANDARD)
 		e43:SetType(EFFECT_TYPE_FIELD)
 		e43:SetCode(EFFECT_SUMMON_COST)
+		e43:SetRange(LOCATION_MZONE)
 		e43:SetTargetRange(0,0xff)
 		e43:SetCost(s.costchk)
 		e43:SetOperation(s.costop)
@@ -128,7 +133,6 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		e42:SetCode(EFFECT_FLAG_EFFECT+id)
 		e42:SetRange(LOCATION_MZONE)
 		e42:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-		e42:SetCondition(s.costcon)
 		e42:SetTargetRange(0,1)
 		c:RegisterEffect(e42)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,4))
@@ -140,7 +144,7 @@ function s.tdfilter(c)
 end
 function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return Duel.GetFlagEffect(tp,id)>=4
+	return Duel.GetFlagEffect(tp,id)>=4 or Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
 end
 function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c1200185.lua

@@ -89,10 +89,14 @@ function s.checkop(e,tp,eg,ep,ev,re,r,rp)
 		tc=eg:GetNext()
 	end
 end
+function s.studyfilter(c,tp)
+	return c:IsCode(1200200) and c.studycon(c,tp)
+end
 function s.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local count=Duel.GetFlagEffect(tp,id)+1
-	if count>=2 then
+	local study=Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
+	if count>=2 or study then
 		--cannot be material
 		local e11=Effect.CreateEffect(c)
 		e11:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -107,7 +111,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e12)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0))
 	end
-	if count>=3 then
+	if count>=3 or study then
 		--immune
 		local e2=Effect.CreateEffect(c)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -119,7 +123,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e2)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1))
 	end
-	if count>=4 then
+	if count>=4 or study then
 		--negate
 		local e3=Effect.CreateEffect(c)
 		e3:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -136,10 +140,10 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e3)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2))
 	end
-	if count>=5 then
+	if count>=5 or study then
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,3))
 	end
-	if count==6 then
+	if count==6 or study then
 		--only one
 		local e4=Effect.CreateEffect(c)
 		e4:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -158,7 +162,7 @@ function s.tdfilter(c)
 end
 function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return Duel.GetFlagEffect(tp,id)>=4
+	return Duel.GetFlagEffect(tp,id)>=4 or Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
 end
 function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c1200190.lua

@@ -55,10 +55,14 @@ function s.checkop(e,tp,eg,ep,ev,re,r,rp)
 		tc=eg:GetNext()
 	end
 end
+function s.studyfilter(c,tp)
+	return c:IsCode(1200200) and c.studycon(c,tp)
+end
 function s.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local count=Duel.GetFlagEffect(tp,id)+1
-	if count>=2 then
+	local study=Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
+	if count>=2 or study then
 		--indes
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
@@ -70,7 +74,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e1)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0))
 	end
-	if count>=3 then
+	if count>=3 or study then
 		--immune
 		local e2=Effect.CreateEffect(c)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -82,7 +86,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e2)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1))
 	end
-	if count>=4 then
+	if count>=4 or study then
 		--不能对应
 		local e3=Effect.CreateEffect(e:GetHandler())
 		e3:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -94,10 +98,10 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.RegisterEffect(e3,tp)
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2))
 	end
-	if count>=5 then
+	if count>=5 or study then
 		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,3))
 	end
-	if count==6 then
+	if count==6 or study then
 		--active limit
 		local e4=Effect.CreateEffect(c)
 		e4:SetReset(RESET_EVENT+RESETS_STANDARD)
@@ -119,7 +123,7 @@ function s.tdfilter(c)
 end
 function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return Duel.GetFlagEffect(tp,id)>=4
+	return Duel.GetFlagEffect(tp,id)>=4 or Duel.IsExistingMatchingCard(s.studyfilter,tp,LOCATION_MZONE,0,1,nil,tp)
 end
 function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c12823200.lua

@@ -79,18 +79,18 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
+	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e2:SetCode(id)
 	e2:SetTargetRange(1,1)
-	e2:Reset(RESET_EVENT+PHASE_END)
+	e2:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e2,tp)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e3:SetCode(EVENT_ADJUST)
 	e3:SetCondition(s.discon)
 	e3:SetOperation(s.disop)
-	e3:Reset(RESET_EVENT+PHASE_END)
+	e3:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e3,tp)
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(id,0))
@@ -117,26 +117,31 @@ function s.checkintab(tab,v)
 	end
 	return false
 end
-function s.discon(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_TO_HAND) then
-		local effect_record={Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_TO_HAND)}
-		for _,ke in ipairs(effect_record) do
-			if not s.checkintab(record_tab2,ke) then
-				return true
+function s.discon(e)
+	for tp=0,1 do
+		if Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_TO_HAND) then
+			local effect_record={Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_TO_HAND)}
+			for _,ke in ipairs(effect_record) do
+				if not s.checkintab(record_tab2,ke) then
+					return true
+				end
 			end
 		end
 	end
 	return false
 end
-function s.disop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_TO_HAND) then
-		local effect_record={Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_TO_HAND)}
-		for _,ke in ipairs(effect_record) do
-			if not s.checkintab(record_tab2,ke) then
-				ke:SetCondition(function(ce,ctp,...)
-								   return not Duel.IsPlayerAffectedByEffect(ctp,id) and ke:GetCondition()(...)
-								end)
-				table.insert(record_tab2,ke)
+function s.disop(e)
+	for tp=0,1 do
+		if Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_TO_HAND) then
+			local effect_record={Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_TO_HAND)}
+			for _,ke in ipairs(effect_record) do
+				if not s.checkintab(record_tab2,ke) then
+					local condition=ke:GetCondition() or aux.TRUE
+					ke:SetCondition(function(...)
+									   return not Duel.IsPlayerAffectedByEffect(0,id) and condition(...)
+									end)
+					table.insert(record_tab2,ke)
+				end
 			end
 		end
 	end

expansions/script/c12866765.lua

@@ -56,11 +56,11 @@ function s.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA) or aux.fuslimit(e,se,sp,st)
 end
 function s.eqfilter(c,tp)
-	return c:IsType(TYPE_MONSTER) and c:CheckUniqueOnField(tp) and c:GetBaseAttack()<=1500
+	return c:IsType(TYPE_MONSTER) and c:CheckUniqueOnField(tp) and c:GetBaseAttack()<=1500 and c:IsFaceup()
 end
 function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc~=c end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc~=c and s.eqfilter(chkc,tp) end
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0
 		and Duel.IsExistingTarget(s.eqfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,c,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)

expansions/script/c12866775.lua

@@ -53,30 +53,27 @@ end
 function s.matfilter2(c)
 	return c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsAttribute(ATTRIBUTE_DARK)
 end
-function s.eqfilter1(c,tp)
+function s.eqfilter1(c,e,tp)
 	return (c:IsRace(RACE_WARRIOR) or c:IsRace(RACE_FIEND)) and 
-	c:CheckUniqueOnField(tp) and not c:IsForbidden()
+	c:CheckUniqueOnField(tp) and not c:IsForbidden() and c:IsCanBeEffectTarget(e)
 end
-function s.eqfilter2(c,tp)
-	return aux.IsCodeListed(c,12866755) and c:IsType(TYPE_FUSION) and
-	c:CheckUniqueOnField(tp) and (c:IsRace(RACE_WARRIOR) or c:IsRace(RACE_FIEND)) and not c:IsForbidden()
+function s.eqfilter2(c)
+	return aux.IsCodeListed(c,12866755) and c:IsType(TYPE_FUSION)
+end
+function s.check(g)
+	return g:IsExists(s.eqfilter2,1,nil)
 end
 function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
-	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and s.eqfilter2(chkc,tp) and 
-	chkc:IsControler(tp) end
+	local g=Duel.GetMatchingGroup(s.eqfilter1,tp,LOCATION_GRAVE,0,nil,e,tp)
+	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and s.eqfilter1(chkc,e,tp) and chkc:IsControler(tp) end
 	local ft=Duel.GetLocationCount(tp,LOCATION_SZONE)
-	if chk==0 then return ft>0
-	and Duel.IsExistingTarget(s.eqfilter2,tp,LOCATION_GRAVE,0,1,nil,tp) end
+	if chk==0 then return ft>0 and #g>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
 	local ct=math.min(ft,2)
-	local g1=Duel.SelectTarget(tp,s.eqfilter2,tp,LOCATION_GRAVE,0,1,1,nil,tp)
-	if ct>1 and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
-		local g2=Duel.SelectTarget(tp,s.eqfilter1,tp,LOCATION_GRAVE,0,1,1,g1,tp)
-		g1:Merge(g2)
-	end
-	Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,g1,g1:GetCount(),0,0)
+	local sg=g:SelectSubGroup(tp,s.check,false,1,ct)
+	Duel.SetTargetCard(sg)
+	Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,sg,#sg,0,0)
 end
 function s.eqop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c12866785.lua

@@ -30,6 +30,7 @@ function s.initial_effect(c)
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetCondition(s.descon1)
 	e2:SetCost(s.descost)
 	e2:SetTarget(s.destg)
 	e2:SetOperation(s.desop)
@@ -38,7 +39,7 @@ function s.initial_effect(c)
 	e5:SetType(EFFECT_TYPE_QUICK_O)
 	e5:SetCode(EVENT_FREE_CHAIN)
 	e5:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
-	e5:SetCondition(s.descon)
+	e5:SetCondition(s.descon2)
 	c:RegisterEffect(e5)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE)
@@ -133,7 +134,10 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Destroy(g,REASON_EFFECT)
 	end
 end
-function s.descon(e,tp,eg,ep,ev,re,r,rp)
+function s.descon1(e,tp,eg,ep,ev,re,r,rp)
+	return not e:GetLabel()==1
+end
+function s.descon2(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetLabel()==1
 end
 function s.valcheck(e,c)

expansions/script/c16103033.lua

@@ -55,7 +55,6 @@ function cm.tgfilter(c)
 end
 function cm.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.tgfilter,tp,LOCATION_REMOVED,LOCATION_REMOVED,1,nil) and Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,16103021) end
-	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_DECK)
 end
 function cm.tgop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,16103021) then return end

expansions/script/c18017408.lua

@@ -46,22 +46,6 @@ function s.initial_effect(c)
 	e5:SetTarget(s.eqtg2)
 	e5:SetOperation(s.eqop2)
 	c:RegisterEffect(e5)
-	local ee=Effect.CreateEffect(c)
-	ee:SetType(EFFECT_TYPE_SINGLE)
-	ee:SetCode(EFFECT_MATERIAL_CHECK)
-	ee:SetValue(s.valcheck)
-	c:RegisterEffect(ee)
-end
-function s.valcheck(e,c)
-	local g=c:GetMaterial()
-	if g:IsExists(Card.IsType,2,nil,TYPE_TUNER) then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-		e1:SetCode(21142671)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD+RESET_PHASE+PHASE_END)
-		c:RegisterEffect(e1)
-	end
 end
 function s.mfilter(c)
 	return c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsRace(RACE_MACHINE)

expansions/script/c18017409.lua

@@ -46,22 +46,6 @@ function s.initial_effect(c)
 	e5:SetTarget(s.eqtg2)
 	e5:SetOperation(s.eqop2)
 	c:RegisterEffect(e5)
-	local ee=Effect.CreateEffect(c)
-	ee:SetType(EFFECT_TYPE_SINGLE)
-	ee:SetCode(EFFECT_MATERIAL_CHECK)
-	ee:SetValue(s.valcheck)
-	c:RegisterEffect(ee)
-end
-function s.valcheck(e,c)
-	local g=c:GetMaterial()
-	if g:IsExists(Card.IsType,2,nil,TYPE_TUNER) then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-		e1:SetCode(21142671)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD+RESET_PHASE+PHASE_END)
-		c:RegisterEffect(e1)
-	end
 end
 function s.mfilter(c)
 	return c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsRace(RACE_MACHINE)

expansions/script/c18017410.lua

@@ -46,22 +46,6 @@ function s.initial_effect(c)
 	e5:SetTarget(s.eqtg2)
 	e5:SetOperation(s.eqop2)
 	c:RegisterEffect(e5)
-	local ee=Effect.CreateEffect(c)
-	ee:SetType(EFFECT_TYPE_SINGLE)
-	ee:SetCode(EFFECT_MATERIAL_CHECK)
-	ee:SetValue(s.valcheck)
-	c:RegisterEffect(ee)
-end
-function s.valcheck(e,c)
-	local g=c:GetMaterial()
-	if g:IsExists(Card.IsType,2,nil,TYPE_TUNER) then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-		e1:SetCode(21142671)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD+RESET_PHASE+PHASE_END)
-		c:RegisterEffect(e1)
-	end
 end
 function s.mfilter(c)
 	return c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsRace(RACE_MACHINE)

expansions/script/c18017411.lua

@@ -46,22 +46,6 @@ function s.initial_effect(c)
 	e5:SetTarget(s.eqtg3)
 	e5:SetOperation(s.eqop3)
 	c:RegisterEffect(e5)
-	local ee=Effect.CreateEffect(c)
-	ee:SetType(EFFECT_TYPE_SINGLE)
-	ee:SetCode(EFFECT_MATERIAL_CHECK)
-	ee:SetValue(s.valcheck)
-	c:RegisterEffect(ee)
-end
-function s.valcheck(e,c)
-	local g=c:GetMaterial()
-	if g:IsExists(Card.IsType,2,nil,TYPE_TUNER) then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-		e1:SetCode(21142671)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD+RESET_PHASE+PHASE_END)
-		c:RegisterEffect(e1)
-	end
 end
 function s.mfilter(c)
 	return c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsRace(RACE_MACHINE)

expansions/script/c18032713.lua

@@ -141,8 +141,10 @@ function s.olvop(e,tp,eg,ep,ev,re,r,rp)
 		g:GetFirst():RegisterEffect(e1)
 		local e2=Effect.CreateEffect(e:GetHandler())
 		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_EXTRA_ATTACK)
-		e2:SetValue(1)
+		e2:SetCode(EFFECT_CHANGE_INVOLVING_BATTLE_DAMAGE)
+		e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+		e2:SetRange(LOCATION_MZONE)
+		e2:SetValue(aux.ChangeBattleDamage(1,DOUBLE_DAMAGE))
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 		g:GetFirst():RegisterEffect(e2)
 	end

expansions/script/c62625120.lua

 --世界猫咪联盟·Fam
 function c62625120.initial_effect(c)
-	--xyz summon
+	--xyz summon（正确，无需修改）
 	aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x6d1),4,2)
 	c:EnableReviveLimit()
-	--summon limit
+	
+	--summon limit（简化，只保留召唤成功后的限制）
 	local e0=Effect.CreateEffect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
@@ -11,55 +12,50 @@ function c62625120.initial_effect(c)
 	e0:SetCondition(c62625120.regcon)
 	e0:SetOperation(c62625120.regop)
 	c:RegisterEffect(e0)
-	local e00=Effect.CreateEffect(c)
-	e00:SetType(EFFECT_TYPE_SINGLE)
-	e00:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e00:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e00:SetValue(c62625120.splimit)
-	c:RegisterEffect(e00)
-	if not c62625120.global_check then
-		c62625120.global_check=true
-		local ge1=Effect.CreateEffect(c)
-		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge1:SetCode(EVENT_SPSUMMON_SUCCESS)
-		ge1:SetOperation(c62625120.checkop)
-		Duel.RegisterEffect(ge1,0)
-	end
-	--search
+	
+	--search（效果①，无需修改）
 	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(62625120,0))
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetCountLimit(1)
+	e1:SetCountLimit(1,62625120)
 	e1:SetTarget(c62625120.target)
 	e1:SetOperation(c62625120.operation)
 	c:RegisterEffect(e1)
-	--disable
+	
+	--destroy（效果②，无需修改）
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_DISABLE)
+	e2:SetDescription(aux.Stringid(62625120,1))
+	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetCode(EVENT_CHAINING)
+	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1)
-	e2:SetCondition(c62625120.discon)
-	e2:SetCost(c62625120.discost)
-	e2:SetTarget(c62625120.distg)
-	e2:SetOperation(c62625120.disop)
+	e2:SetCountLimit(1,62625120+1)
+	e2:SetCondition(c62625120.descon)
+	e2:SetCost(c62625120.descost)
+	e2:SetTarget(c62625120.destg)
+	e2:SetOperation(c62625120.desop)
 	c:RegisterEffect(e2)
 end
+
+-- 效果①相关函数（保持不变）
 function c62625120.filter(c,mc)
 	return c:IsSetCard(0x6d1) and (c:IsAbleToHand() or (mc:IsType(TYPE_XYZ) and c:IsCanOverlay()))
 end
+
 function c62625120.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c62625120.filter,tp,LOCATION_GRAVE,0,1,nil,e:GetHandler()) end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,0,tp,LOCATION_GRAVE)
 end
+
 function c62625120.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local c=e:GetHandler()
 	local g=Duel.SelectMatchingCard(tp,c62625120.filter,tp,LOCATION_GRAVE,0,1,1,nil,c)
 	local tc=g:GetFirst()
 	if tc then
-		if c:IsType(TYPE_XYZ) and tc:IsCanOverlay() and (not tc:IsAbleToHand() or Duel.SelectOption(tp,1190,aux.Stringid(62625120,0))==1) then
+		if c:IsType(TYPE_XYZ) and tc:IsCanOverlay() and (not tc:IsAbleToHand() or Duel.SelectOption(tp,1190,aux.Stringid(62625120,2))==1) then
 			Duel.Overlay(c,Group.FromCards(tc))
 		else
 			Duel.SendtoHand(tc,nil,REASON_EFFECT)
@@ -67,39 +63,37 @@ function c62625120.operation(e,tp,eg,ep,ev,re,r,rp)
 		end
 	end
 end
-function c62625120.discon(e,tp,eg,ep,ev,re,r,rp)
-	return ep==1-tp
+
+-- 效果②相关函数（保持不变）
+function c62625120.descon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2
 end
-function c62625120.discost(e,tp,eg,ep,ev,re,r,rp,chk)
+
+function c62625120.descost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 end
-function c62625120.distg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
-	Duel.SetOperationInfo(0,CATEGORY_DISABLE,eg,1,0,0)
-end
-function c62625120.disop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.NegateEffect(ev)
+
+function c62625120.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end
+	if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
+	local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,0,LOCATION_MZONE,1,1,nil)
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
 end
-function c62625120.checkop(e,tp,eg,ep,ev,re,r,rp)
-	local tc=eg:GetFirst()
-	local p1=false
-	local p2=false
-	while tc do
-		if not tc:IsSetCard(0x6d1) then
-			if tc:IsSummonPlayer(0) then p1=true else p2=true end
-		end
-		tc=eg:GetNext()
+
+function c62625120.desop(e,tp,eg,ep,ev,re,r,rp)
+	local tc=Duel.GetFirstTarget()
+	if tc and tc:IsRelateToEffect(e) then
+		Duel.Destroy(tc,REASON_EFFECT)
 	end
-	if p1 then Duel.RegisterFlagEffect(0,62625120,RESET_PHASE+PHASE_END,0,1) end
-	if p2 then Duel.RegisterFlagEffect(1,62625120,RESET_PHASE+PHASE_END,0,1) end
-end
-function c62625120.xyzfilter(c)
-	return Duel.GetFlagEffect(c:GetControler(),62625120)==0 and c:IsSetCard(0x6d1)
 end
+
+-- 召唤限制函数（简化版）
 function c62625120.regcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
+
 function c62625120.regop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
@@ -110,9 +104,7 @@ function c62625120.regop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetTarget(c62625120.sumlimit)
 	Duel.RegisterEffect(e1,tp)
 end
+
 function c62625120.sumlimit(e,c,sump,sumtype,sumpos,targetp,se)
 	return not c:IsSetCard(0x6d1)
-end
-function c62625120.splimit(e,se,sp,st,spos,tgp)
-	return bit.band(st,SUMMON_TYPE_XYZ)~=SUMMON_TYPE_XYZ or Duel.GetFlagEffect(tgp,62625120)==0
 end
\ No newline at end of file