more max

c93053159.lua

@@ -3,7 +3,6 @@ local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,68468459)
 	aux.AddMaterialCodeList(c,68468459)
-	--aux.AddFusionProcCodeFun(c,68468459,s.mfilter,6,true,true)
     Fusion.AddFusionProcedure(c,{
 		slots={
 			Fusion.Slot.Code(68468459),           -- Fallen of Albaz
@@ -18,13 +17,6 @@ function s.initial_effect(c)
 		}
 	})
 	c:EnableReviveLimit()
-	-- local e0=Effect.CreateEffect(c)
-	-- e0:SetType(EFFECT_TYPE_SINGLE)
-	-- e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	-- e0:SetCode(EFFECT_FUSION_MATERIAL)
-	-- e0:SetCondition(s.Alba_System_Drugmata_Fusion_Condition())
-	-- e0:SetOperation(s.Alba_System_Drugmata_Fusion_Operation())
-	-- c:RegisterEffect(e0)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
@@ -58,80 +50,6 @@ end
 function s.splimit(e,se,sp,st)
 	return bit.band(st,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION
 end
-function s.Alba_System_Drugmata_Fusion_Filter(c,mg,fc,tp,chkf,gc)
-	if not c:IsFusionCode(68468459) and not c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE) then return false end
-	local g=mg:Filter(s.matfilter,c,tp)
-	aux.GCheckAdditional=aux.dncheck
-	local res=g:CheckSubGroup(s.Alba_System_Drugmata_Fusion_Gcheck,6,6,fc,tp,c,chkf,gc)
-	aux.GCheckAdditional=nil
-	return res
-end
-function s.matfilter(c,tp)
-	return c:IsLocation(LOCATION_GRAVE) and c:IsControler(tp) and not c:IsHasEffect(6205579)
-end
-function s.Alba_System_Drugmata_Fusion_Gcheck(g,fc,tp,ec,chkf,gc)
-	local sg=g:Clone()
-	sg:AddCard(ec)
-	if sg:IsExists(aux.TuneMagicianCheckX,1,nil,sg,EFFECT_TUNE_MAGICIAN_F) then return false end
-	if gc and not sg:IsContains(gc) then return false end
-	if aux.FCheckAdditional and not aux.FCheckAdditional(tp,sg,fc)
-		or aux.FGoalCheckAdditional and not aux.FGoalCheckAdditional(tp,sg,fc) then return false end
-	return g:GetClassCount(Card.GetFusionCode)==g:GetCount()
-		and (chkf==PLAYER_NONE or Duel.GetLocationCountFromEx(tp,tp,sg,fc)>0)
-end
-function s.Alba_System_Drugmata_Fusion_Condition()
-	return function(e,g,gc,chkf)
-			if g==nil then return aux.MustMaterialCheck(nil,e:GetHandlerPlayer(),EFFECT_MUST_BE_FMATERIAL) end
-			local fc=e:GetHandler()
-			local tp=e:GetHandlerPlayer()
-			if gc then
-				if not g:IsContains(gc) then return false end
-				return g:IsExists(s.Alba_System_Drugmata_Fusion_Filter,1,nil,g,fc,tp,chkf,gc)
-			end
-			return g:IsExists(s.Alba_System_Drugmata_Fusion_Filter,1,nil,g,fc,tp,chkf,nil)
-		end
-end
-function s.Alba_System_Drugmata_Fusion_Operation()
-	return function(e,tp,eg,ep,ev,re,r,rp,gc,chkf)
-			local fc=e:GetHandler()
-			local tp=e:GetHandlerPlayer()
-			local fg=eg:Clone()
-			local g=nil
-			local sg=nil
-			while not sg do
-				if g then
-					fg:AddCard(g:GetFirst())
-				end
-				if gc then
-					if s.Alba_System_Drugmata_Fusion_Filter(gc,fg,fc,tp,chkf) then
-						g=Group.FromCards(gc)
-						fg:RemoveCard(gc)
-						local mg=fg:Filter(s.matfilter,fc,tp)
-						Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
-						sg=mg:SelectSubGroup(tp,s.Alba_System_Drugmata_Fusion_Gcheck,false,6,6,fc,tp,g:GetFirst(),chkf,gc)
-					else
-						Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
-						g=fg:FilterSelect(tp,s.Alba_System_Drugmata_Fusion_Filter,1,1,nil,fg,fc,tp,chkf,gc)
-						fg:Sub(g)
-						local mg=fg:Filter(s.matfilter,fc,tp)
-						Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
-						sg=mg:SelectSubGroup(tp,s.Alba_System_Drugmata_Fusion_Gcheck,true,6,6,fc,tp,g:GetFirst(),chkf,gc)
-					end
-				else
-					Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
-					g=fg:FilterSelect(tp,s.Alba_System_Drugmata_Fusion_Filter,1,1,nil,fg,fc,tp,chkf,nil)
-					fg:Sub(g)
-					local mg=fg:Filter(s.matfilter,fc,tp)
-					aux.GCheckAdditional=aux.dncheck
-					Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
-					sg=mg:SelectSubGroup(tp,s.Alba_System_Drugmata_Fusion_Gcheck,true,6,6,fc,tp,g:GetFirst(),chkf)
-					aux.GCheckAdditional=nil
-				end
-			end
-			g:Merge(sg)
-			Duel.SetFusionMaterial(g)
-		end
-end
 function s.costfilter(c)
 	return c:IsAbleToGraveAsCost()
 end

procedure.lua

@@ -3556,14 +3556,17 @@ function Fusion.FusionOperation(slots)
         local strict_cond=Fusion.FusionCondition(slots,false)
         -- precompute minimum materials required
         local min_req=0
+		local max_req=0
         for _,slot in ipairs(slots) do
             if slot.group then
                 min_req=min_req+slot.group.min
+				max_req=max_req+slot.group.max
             else
                 min_req=min_req+1
+				max_req=max_req+1
             end
         end
-        local max_req=eg:GetCount()
+        local max_req=math.min(max_req,eg:GetCount())
 
         -- prompt player
         Duel.Hint(HINT_SELECTMSG, tp, HINTMSG_FMATERIAL)