Merge pull request #18 from mycard/develop-8888

Develop 8888

c1154611.lua

@@ -7,6 +7,7 @@ function c1154611.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetTarget(c1154611.target)
 	e1:SetOperation(c1154611.activate)
 	c:RegisterEffect(e1)

c14731897.lua

@@ -13,14 +13,19 @@ function c14731897.initial_effect(c)
 	e1:SetOperation(c14731897.activate)
 	c:RegisterEffect(e1)
 end
-function c14731897.filter(c)
+function c14731897.sumfilter(c)
 	return c:IsFaceup() and c:IsDefenseAbove(0)
 end
+function c14731897.filter(c,def)
+	return c:IsFaceup() and c:IsDefenseAbove(0) and not c:IsDefense(def)
+end
 function c14731897.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c14731897.filter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(c14731897.filter,tp,LOCATION_MZONE,0,1,nil) end
+	local g=Duel.GetMatchingGroup(c14731897.sumfilter,tp,LOCATION_MZONE,0,nil)
+	local sum=g:GetSum(Card.GetBaseDefense)
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c14731897.filter(chkc,sum) end
+	if chk==0 then return Duel.IsExistingTarget(c14731897.filter,tp,LOCATION_MZONE,0,1,nil,sum) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
-	Duel.SelectTarget(tp,c14731897.filter,tp,LOCATION_MZONE,0,1,1,nil)
+	Duel.SelectTarget(tp,c14731897.filter,tp,LOCATION_MZONE,0,1,1,nil,sum)
 end
 function c14731897.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()

c17548456.lua

@@ -7,7 +7,7 @@ function c17548456.initial_effect(c)
 	--destroy
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(17548456,0))
-	e1:SetCategory(CATEGORY_DESTROY+CATEGORY_SPECIAL_SUMMON)
+	e1:SetCategory(CATEGORY_DESTROY+CATEGORY_SPECIAL_SUMMON+CATEGORY_GRAVE_SPSUMMON)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetCondition(c17548456.descon)

c24903843.lua

@@ -6,6 +6,7 @@ function c24903843.initial_effect(c)
 	e1:SetCategory(CATEGORY_DRAW)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetTarget(c24903843.target)
 	e1:SetOperation(c24903843.activate)
 	c:RegisterEffect(e1)

c3734202.lua

@@ -13,6 +13,7 @@ function c3734202.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCode(EVENT_FREE_CHAIN)
+	e2:SetHintTiming(0,TIMING_END_PHASE)
 	e2:SetCountLimit(1,3734202)
 	e2:SetCost(c3734202.spcost1)
 	e2:SetTarget(c3734202.sptg1)
@@ -25,6 +26,7 @@ function c3734202.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetCode(EVENT_FREE_CHAIN)
+	e3:SetHintTiming(0,TIMING_END_PHASE)
 	e3:SetCountLimit(1,3734202)
 	e3:SetCost(c3734202.spcost2)
 	e3:SetTarget(c3734202.sptg2)

c425934.lua

@@ -8,6 +8,10 @@ function c425934.initial_effect(c)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTargetRange(1,1)
 	e1:SetCode(EFFECT_CANNOT_DISCARD_HAND)
+	e1:SetTarget(c425934.target)
 	e1:SetValue(1)
 	c:RegisterEffect(e1)
 end
+function c425934.target(e,dc,re,r)
+	return r&REASON_COST==REASON_COST
+end

c49655592.lua

@@ -47,6 +47,7 @@ function c49655592.initial_effect(c)
 	e5:SetTargetRange(0,1)
 	e5:SetCode(EFFECT_CANNOT_DISCARD_HAND)
 	e5:SetCondition(c49655592.excon)
+	e5:SetTarget(c49655592.extarget)
 	e5:SetValue(1)
 	c:RegisterEffect(e5)
 	local e6=Effect.CreateEffect(c)
@@ -95,3 +96,6 @@ end
 function c49655592.excon(e)
 	return e:GetHandler():IsLevelAbove(7)
 end
+function c49655592.extarget(e,dc,re,r)
+	return r&REASON_COST==REASON_COST
+end

c51606429.lua

@@ -6,6 +6,7 @@ function c51606429.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetTarget(c51606429.target)
 	e1:SetOperation(c51606429.activate)
 	c:RegisterEffect(e1)

c56246017.lua

@@ -7,6 +7,7 @@ function c56246017.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetCost(c56246017.cost)
 	e1:SetTarget(c56246017.target)
 	e1:SetOperation(c56246017.activate)

c64765016.lua

@@ -6,6 +6,7 @@ function c64765016.initial_effect(c)
 	e1:SetCategory(CATEGORY_TOGRAVE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetTarget(c64765016.target)
 	e1:SetOperation(c64765016.activate)
 	c:RegisterEffect(e1)

c71939275.lua

@@ -186,4 +186,4 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 		tc:RegisterEffect(e1)
 	end
-end
\ No newline at end of file
+end

c71978434.lua

@@ -42,11 +42,13 @@ function c71978434.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,1-tp,LOCATION_HAND)
 end
 function c71978434.rmop(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,0,LOCATION_HAND,nil)
+	local g=Duel.GetMatchingGroup(aux.TRUE,tp,0,LOCATION_HAND,nil)
 	if g:GetCount()==0 then return end
 	Duel.ConfirmCards(tp,g)
+	local g1=g:Filter(Card.IsAbleToRemove,nil)
+	if g1:GetCount()==0 then Duel.ShuffleHand(1-tp) return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local tc=g:Select(tp,1,1,nil):GetFirst()
+	local tc=g1:Select(tp,1,1,nil):GetFirst()
 	Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
 	Duel.ShuffleHand(1-tp)
 	local c=e:GetHandler()

c74139959.lua

@@ -40,7 +40,7 @@ function s.initial_effect(c)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
 	e4:SetCountLimit(1)
-	e4:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
+	e4:SetHintTiming(TIMING_DAMAGE_STEP,TIMINGS_CHECK_MONSTER+TIMING_DAMAGE_STEP+TIMING_END_PHASE)
 	e4:SetCost(s.atkcost)
 	e4:SetOperation(s.atkop)
 	c:RegisterEffect(e4)

c80627281.lua

@@ -54,7 +54,7 @@ function c80627281.activate(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetCondition(c80627281.immcon)
 		e1:SetValue(c80627281.efilter)
 		e1:SetOwnerPlayer(tp)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_CONTROL)
 		tc:RegisterEffect(e1,true)
 		tc:CompleteProcedure()
 	end

c81096431.lua

@@ -17,8 +17,10 @@ function s.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
 	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(id)
-	e2:SetRange(LOCATION_MZONE)
+	e2:SetCode(EFFECT_TREAT_AS_2_XMATERIAL)
+	e2:SetValue(id)
+	e2:SetRange(0xff)
+	e2:SetTarget(s.sxyzfilter)
 	e2:SetCountLimit(1,id+o)
 	c:RegisterEffect(e2)
 	--material effect
@@ -33,134 +35,9 @@ function s.initial_effect(c)
 	e3:SetTarget(s.xyztg)
 	e3:SetOperation(s.xyzop)
 	c:RegisterEffect(e3)
-	if not s.global_check then
-		s.global_check=true
-		Drake_shark_AddXyzProcedure=aux.AddXyzProcedure
-		function aux.AddXyzProcedure(card_c,function_f,int_lv,int_ct,function_alterf,int_dese,int_maxc,function_op)
-			if card_c:IsAttribute(ATTRIBUTE_WATER) and int_ct>=3 then
-				if function_alterf then
-					Drake_shark_XyzLevelFreeOperationAlter=Auxiliary.XyzLevelFreeOperationAlter
-					function Auxiliary.XyzLevelFreeOperationAlter(f,gf,minc,maxc,alterf,alterdesc,alterop)
-						return  function(e,tp,eg,ep,ev,re,r,rp,c,og,min,max)
-									if og and not min then
-										if og:GetCount()==minc and og:IsExists(s.xfilter,1,nil) then
-											local ttc=og:Filter(s.xfilter,nil):GetFirst()
-											local tte=ttc:IsHasEffect(id,tp)
-											tte:UseCountLimit(tp)
-										end
-										local sg=Group.CreateGroup()
-										local tc=og:GetFirst()
-										while tc do
-											local sg1=tc:GetOverlayGroup()
-											sg:Merge(sg1)
-											tc=og:GetNext()
-										end
-										Duel.SendtoGrave(sg,REASON_RULE)
-										c:SetMaterial(og)
-										Duel.Overlay(c,og)
-									else
-										local mg=e:GetLabelObject()
-										if mg:GetCount()==minc and mg:IsExists(s.xfilter,1,nil) then
-											local ttc=mg:Filter(s.xfilter,nil):GetFirst()
-											local tte=ttc:IsHasEffect(id,tp)
-											tte:UseCountLimit(tp)
-										end
-										if e:GetLabel()==1 then
-											local mg2=mg:GetFirst():GetOverlayGroup()
-											if mg2:GetCount()~=0 then
-												Duel.Overlay(c,mg2)
-											end
-										else
-											local sg=Group.CreateGroup()
-											local tc=mg:GetFirst()
-											while tc do
-												local sg1=tc:GetOverlayGroup()
-												sg:Merge(sg1)
-												tc=mg:GetNext()
-											end
-											Duel.SendtoGrave(sg,REASON_RULE)
-										end
-										c:SetMaterial(mg)
-										Duel.Overlay(c,mg)
-										mg:DeleteGroup()
-									end
-								end
-					end
-					aux.AddXyzProcedureLevelFree(card_c,s.f(function_f,int_lv,card_c),s.gf(int_ct,card_c:GetOwner()),int_ct-1,int_ct,function_alterf,int_dese,function_op)
-					Auxiliary.XyzLevelFreeOperationAlter=Drake_shark_XyzLevelFreeOperationAlter
-				else
-					Drake_shark_XyzLevelFreeOperation=Auxiliary.XyzLevelFreeOperation
-					function Auxiliary.XyzLevelFreeOperation(f,gf,minct,maxct)
-						return  function(e,tp,eg,ep,ev,re,r,rp,c,og,min,max)
-									if og and not min then
-										if og:GetCount()==minct and og:IsExists(s.xfilter,1,nil) then
-											local ttc=og:Filter(s.xfilter,nil):GetFirst()
-											local tte=ttc:IsHasEffect(id,tp)
-											tte:UseCountLimit(tp)
-										end
-										local sg=Group.CreateGroup()
-										local tc=og:GetFirst()
-										while tc do
-											local sg1=tc:GetOverlayGroup()
-											sg:Merge(sg1)
-											tc=og:GetNext()
-										end
-										Duel.SendtoGrave(sg,REASON_RULE)
-										c:SetMaterial(og)
-										Duel.Overlay(c,og)
-									else
-										local mg=e:GetLabelObject()
-										if mg:GetCount()==minct and mg:IsExists(s.xfilter,1,nil) then
-											local ttc=mg:Filter(s.xfilter,nil):GetFirst()
-											local tte=ttc:IsHasEffect(id,tp)
-											tte:UseCountLimit(tp)
-										end
-										if e:GetLabel()==1 then
-											local mg2=mg:GetFirst():GetOverlayGroup()
-											if mg2:GetCount()~=0 then
-												Duel.Overlay(c,mg2)
-											end
-										else
-											local sg=Group.CreateGroup()
-											local tc=mg:GetFirst()
-											while tc do
-												local sg1=tc:GetOverlayGroup()
-												sg:Merge(sg1)
-												tc=mg:GetNext()
-											end
-											Duel.SendtoGrave(sg,REASON_RULE)
-										end
-										c:SetMaterial(mg)
-										Duel.Overlay(c,mg)
-										mg:DeleteGroup()
-									end
-								end
-					end
-					aux.AddXyzProcedureLevelFree(card_c,s.f(function_f,int_lv,card_c),s.gf(int_ct,card_c:GetOwner()),int_ct-1,int_ct)
-					Auxiliary.XyzLevelFreeOperation=Drake_shark_XyzLevelFreeOperation
-				end
-			else
-				if function_alterf then
-					Drake_shark_AddXyzProcedure(card_c,function_f,int_lv,int_ct,function_alterf,int_dese,int_maxc,function_op)
-				else
-					Drake_shark_AddXyzProcedure(card_c,function_f,int_lv,int_ct,nil,nil,int_maxc,nil)
-				end
-			end
-		end
-	end
-end
-function s.f(function_f,int_lv,card_c)
-	return function (c)
-			   return c:IsXyzLevel(card_c,int_lv) and (not function_f or function_f(c))
-	end
-end
-function s.gf(int_ct,int_tp)
-	return function (g)
-			   return g:GetCount()==int_ct or g:GetCount()==int_ct-1 and g:IsExists(s.xfilter,1,nil,int_tp)
-	end
 end
-function s.xfilter(c,tp)
-	return c:IsHasEffect(id,tp)
+function s.sxyzfilter(e,c)
+	return c:IsAttribute(ATTRIBUTE_WATER)
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return not e:GetHandler():IsReason(REASON_DRAW)

c87800375.lua

@@ -40,7 +40,10 @@ function c87800375.activate(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local sg=g:Select(tp,1,1,nil)
 	Duel.DisableShuffleCheck()
-	if Duel.SendtoHand(sg,nil,REASON_EFFECT)~=0 then ct=ct-1 end
+	if Duel.SendtoHand(sg,nil,REASON_EFFECT)~=0 then
+		Duel.ConfirmCards(1-tp,sg)
+		ct=ct-1
+	end
 	Duel.ShuffleHand(tp)
 	if ct>0 then Duel.SortDecktop(tp,tp,ct) end
 end

c92586237.lua

@@ -77,6 +77,7 @@ function c92586237.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
 	local g=Duel.SelectMatchingCard(tp,c92586237.thfilter,tp,LOCATION_GRAVE,0,1,1,nil,code)
 	if g:GetCount()>0 then
+		Duel.HintSelection(g)
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 	end
 end

c99788587.lua

@@ -13,16 +13,25 @@ function c99788587.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c99788587.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsAllColumn()
+	return e:GetHandler():IsAllColumn() and e:IsHasType(EFFECT_TYPE_ACTIVATE)
 end
 function c99788587.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
+	local c=e:GetHandler()
+	e:SetLabel(aux.GetColumn(c)+1)
 	local g=e:GetHandler():GetColumnGroup()
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
 end
+function c99788587.opfilter(c,col)
+	return aux.GetColumn(c)==col
+end
 function c99788587.activate(e,tp,eg,ep,ev,re,r,rp)
-	local g=e:GetHandler():GetColumnGroup()
-	if g:GetCount()>0 then
-		Duel.Destroy(g,REASON_EFFECT)
+	local col=e:GetLabel()
+	if col>0 then
+		col=col-1
+		local g=Duel.GetMatchingGroup(c99788587.opfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,aux.ExceptThisCard(e),col)
+		if g:GetCount()>0 then
+			Duel.Destroy(g,REASON_EFFECT)
+		end
 	end
 end

constant.lua

@@ -604,6 +604,7 @@ EFFECT_LIMIT_SPECIAL_SUMMON_POSITION	=368	--不能以特定表示形式特殊召
 EFFECT_TUNER					=369	--同调召唤时可以当作调整（百檎龙-苹果鳞虫）
 EFFECT_KAISER_COLOSSEUM			=370	--皇帝斗技场
 EFFECT_REPLACE_DAMAGE			=371	--伤害由特定行动代替
+EFFECT_TREAT_AS_2_XMATERIAL		=372	--需3只以上作素材的超量怪兽时可以作为2只数量
 EFFECT_FLAG_EFFECT				=0x20000000	--标记类效果，即RegisterFlagEffect()创建的效果
 
 --下面是诱发效果的诱发事件、时点 （如果是TYPE_SINGLE则自己发生以下事件后触发，如果TYPE_FIELD则场上任何卡发生以下事件都触发）

procedure.lua

@@ -430,6 +430,13 @@ end
 ---@param maxct? integer
 ---@param alterop? function
 function Auxiliary.AddXyzProcedure(c,f,lv,ct,alterf,alterdesc,maxct,alterop)
+	if ct>=3 then
+		Auxiliary.AddXyzProcedureWith3MoreMaterial(c,f,lv,ct,alterf,alterdesc,maxct,alterop)
+	else
+		Auxiliary.AddXyzProcedureNormal(c,f,lv,ct,alterf,alterdesc,maxct,alterop)
+	end
+end
+function Auxiliary.AddXyzProcedureNormal(c,f,lv,ct,alterf,alterdesc,maxct,alterop)
 	if not maxct then maxct=ct end
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(1165)
@@ -449,6 +456,53 @@ function Auxiliary.AddXyzProcedure(c,f,lv,ct,alterf,alterdesc,maxct,alterop)
 	e1:SetValue(SUMMON_TYPE_XYZ)
 	c:RegisterEffect(e1)
 end
+function Auxiliary.AddXyzProcedureWith3MoreMaterial(c,f,lv,ct,alterf,alterdesc,maxct,alterop)
+	local ff=function (fc)
+					return fc:IsXyzLevel(c,lv) and (not f or f(fc))
+			end
+	local gf=function (g)
+					local gct=g:GetCount()
+					local eg=g:Filter(Auxiliary.AddXyzProcedureWith3MoreMaterialGfFilter,nil,c:GetOwner(),c)
+					if #eg>0 then
+						gct=gct+eg:GetClassCount(Auxiliary.AddXyzProcedureWith3MoreMaterialGfValue,c:GetOwner(),c)
+					end
+					local tc=g:GetFirst()
+					while tc do
+						local te=tc:IsHasEffect(EFFECT_XYZ_LEVEL,c:GetOwner())
+						if te then
+							local evf=te:GetValue()
+							if evf then
+								local ev=evf(te,tc,c)
+								local lmct=(ev>>12)&0xf
+								if lmct>0 and lmct>g:GetCount() then
+									return false
+								end
+							end
+						end
+						tc=g:GetNext()
+					end
+					return gct>=ct
+			end
+	local minc=ct-2
+	local maxc=ct
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(1165)
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_SPSUMMON_PROC)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetRange(LOCATION_EXTRA)
+	if alterf then
+		e1:SetCondition(Auxiliary.XyzLevelFreeConditionAlter(ff,gf,minc,maxc,alterf,alterdesc,alterop))
+		e1:SetTarget(Auxiliary.XyzLevelFreeTargetAlter(ff,gf,minc,maxc,alterf,alterdesc,alterop))
+		e1:SetOperation(Auxiliary.XyzLevelFreeOperationAlterWith3MoreMaterial(ff,gf,minc,maxc,alterf,alterdesc,alterop))
+	else
+		e1:SetCondition(Auxiliary.XyzLevelFreeCondition(ff,gf,minc,maxc))
+		e1:SetTarget(Auxiliary.XyzLevelFreeTarget(ff,gf,minc,maxc))
+		e1:SetOperation(Auxiliary.XyzLevelFreeOperationWith3MoreMaterial(f,gf,minc,maxc))
+	end
+	e1:SetValue(SUMMON_TYPE_XYZ)
+	c:RegisterEffect(e1)
+end
 --Xyz Summon(normal)
 function Auxiliary.XyzCondition(f,lv,minct,maxct)
 	--og: use special material
@@ -862,6 +916,134 @@ function Auxiliary.XyzLevelFreeOperationAlter(f,gf,minct,maxct,alterf,alterdesc,
 				end
 			end
 end
+--Xyz summon(with EFFECT_TREAT_AS_2_XMATERIAL)
+function Auxiliary.AddXyzProcedureWith3MoreMaterialGfFilter(c,tp,xc)
+	local te=c:IsHasEffect(EFFECT_TREAT_AS_2_XMATERIAL,tp)
+	if te then
+		local etg=te:GetTarget()
+		return not etg or etg(te,xc)
+	end
+	return false
+end
+function Auxiliary.AddXyzProcedureWith3MoreMaterialGfValue(c,tp,xc)
+	local te=c:IsHasEffect(EFFECT_TREAT_AS_2_XMATERIAL,tp)
+	if te then
+		local etg=te:GetTarget()
+		if not etg or etg(te,xc) then
+			return te:GetValue()
+		end
+	end
+end
+function Auxiliary.XyzLevelFreeOperationAlterWith3MoreMaterial(f,gf,minc,maxc,alterf,alterdesc,alterop)
+	return  function(e,tp,eg,ep,ev,re,r,rp,c,og,min,max)
+				if og and not min then
+					Auxiliary.Solve2XMaterial(tp,og,maxc,minc)
+					local sg=Group.CreateGroup()
+					local tc=og:GetFirst()
+					while tc do
+						local sg1=tc:GetOverlayGroup()
+						sg:Merge(sg1)
+						tc=og:GetNext()
+					end
+					Duel.SendtoGrave(sg,REASON_RULE)
+					c:SetMaterial(og)
+					Duel.Overlay(c,og)
+				else
+					local mg=e:GetLabelObject()
+					Auxiliary.Solve2XMaterial(tp,mg,maxc,minc)
+					if e:GetLabel()==1 then
+						local mg2=mg:GetFirst():GetOverlayGroup()
+						if mg2:GetCount()~=0 then
+							Duel.Overlay(c,mg2)
+						end
+					else
+						local sg=Group.CreateGroup()
+						local tc=mg:GetFirst()
+						while tc do
+							local sg1=tc:GetOverlayGroup()
+							sg:Merge(sg1)
+							tc=mg:GetNext()
+						end
+						Duel.SendtoGrave(sg,REASON_RULE)
+					end
+					c:SetMaterial(mg)
+					Duel.Overlay(c,mg)
+					mg:DeleteGroup()
+				end
+			end
+end
+function Auxiliary.XyzLevelFreeOperationWith3MoreMaterial(f,gf,minct,maxct)
+	return  function(e,tp,eg,ep,ev,re,r,rp,c,og,min,max)
+				if og and not min then
+					Auxiliary.Solve2XMaterial(tp,og,maxct,minct)
+					local sg=Group.CreateGroup()
+					local tc=og:GetFirst()
+					while tc do
+						local sg1=tc:GetOverlayGroup()
+						sg:Merge(sg1)
+						tc=og:GetNext()
+					end
+					Duel.SendtoGrave(sg,REASON_RULE)
+					c:SetMaterial(og)
+					Duel.Overlay(c,og)
+				else
+					local mg=e:GetLabelObject()
+					Auxiliary.Solve2XMaterial(tp,mg,maxct,minct)
+					if e:GetLabel()==1 then
+						local mg2=mg:GetFirst():GetOverlayGroup()
+						if mg2:GetCount()~=0 then
+							Duel.Overlay(c,mg2)
+						end
+					else
+						local sg=Group.CreateGroup()
+						local tc=mg:GetFirst()
+						while tc do
+							local sg1=tc:GetOverlayGroup()
+							sg:Merge(sg1)
+							tc=mg:GetNext()
+						end
+						Duel.SendtoGrave(sg,REASON_RULE)
+					end
+					c:SetMaterial(mg)
+					Duel.Overlay(c,mg)
+					mg:DeleteGroup()
+				end
+			end
+end
+function Auxiliary.Solve2XMaterialEffectFilter(c,tp)
+	local te=c:IsHasEffect(EFFECT_TREAT_AS_2_XMATERIAL,tp)
+	return te:GetValue()
+end
+function Auxiliary.Solve2XMaterialGroupCheck(g,tp)
+	return g:GetClassCount(Auxiliary.Solve2XMaterialEffectFilter,tp)==g:GetCount()
+end
+function Auxiliary.Solve2XMaterial(tp,g,maxct,minct)
+	if g:GetCount()<maxct and g:GetCount()>=minct and maxct==minct+2 then
+		local et=maxct-g:GetCount()
+		local exg=g:Filter(Card.IsHasEffect,nil,EFFECT_TREAT_AS_2_XMATERIAL,tp)
+		local ext=exg:GetClassCount(Auxiliary.Solve2XMaterialEffectFilter,tp)
+		if (et==0 or et==ext) and #exg>0 then
+			for ttc in Auxiliary.Next(exg) do
+				local tte=ttc:IsHasEffect(EFFECT_TREAT_AS_2_XMATERIAL,tp)
+				if tte then
+					Duel.Hint(HINT_CARD,0,ttc:GetCode())
+					tte:UseCountLimit(tp)
+				end
+			end
+		elseif #exg>0 then
+			local st=et
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RESOLVECARD)
+			local reg=exg:SelectSubGroup(tp,Auxiliary.Solve2XMaterialGroupCheck,false,st,st,tp)
+			for ttc in Auxiliary.Next(reg) do
+				local tte=ttc:IsHasEffect(EFFECT_TREAT_AS_2_XMATERIAL,tp)
+				if tte then
+					Duel.Hint(HINT_CARD,0,ttc:GetCode())
+					tte:UseCountLimit(tp)
+				end
+			end
+		end
+	end
+end
 
 --Fusion Summon