tuning 白の枢機竜

procedure.lua

@@ -3646,51 +3646,77 @@ function Fusion.StrictGroup(e,leftovers,mg_base,grp,tc,fgoalcheck,chkf)
 	return Fusion.FinalCheck(e,mg,tc,fgoalcheck,chkf)
 end
 
--- Search mode: find *some* size‐grp.min subset that passes
+-- Search mode: find *some* subset of size [grp.min…grp.max] that passes
 function Fusion.SearchGroup(e,leftovers,mg_base,grp,tc,fgoalcheck,chkf)
-	-- filter leftovers by grp.filter
+    -- pre‐filter by grp.filter
     local matched={}
     for _,c in ipairs(leftovers) do
         if not grp.filter or grp.filter(c,tc) then
             table.insert(matched,c)
         end
     end
-	if #matched<grp.min then return false end
-
-	local comb={}
-	local function dfs_comb(start,depth)
-		if depth>grp.min then
-			-- subset built in comb[1..grp.min]
-			local subG=Group.FromCards(table.unpack(comb))
-			-- has_same
-			if grp.has_same and not Fusion.CheckHasSame(grp,subG,e) then
+    if #matched<grp.min then
         return false
     end
-			-- unique_by
+
+    -- early UniqueByMatching prune for max size
     if grp.unique_by then
         local matcher=Fusion.UniqueByMatching(grp.unique_by,grp.min)
-				if not matcher(comb) then
+        if not matcher(matched) then
             return false
         end
     end
-			-- merge & final
-			local mg=mg_base:Clone()
-			mg:Merge(subG)
-			return Fusion.FinalCheck(e,mg,tc,fgoalcheck,chkf)
+
+    local comb={}
+
+    local function dfs(start,depth)
+        -- If we have at least grp.min cards, test this subset immediately
+        if depth>=grp.min then
+            -- build subset group and merged material group
+            local subG=Group.FromCards(table.unpack(comb,1,depth))
+            local mg_tmp=mg_base:Clone()
+            mg_tmp:Merge(subG)
+
+			-- has_same check
+			local ok_same=not grp.has_same or Fusion.CheckHasSame(grp,subG,e)
+			-- unique_by check
+			local ok_unique=true
+			if grp.unique_by then
+				local matcher=Fusion.UniqueByMatching(grp.unique_by,depth)
+				ok_unique=matcher(comb)
+			end
+			-- final fusion checks
+			if ok_same and ok_unique and Fusion.FinalCheck(e,mg_tmp,tc,fgoalcheck,chkf) then
+				return true
+			end
+        end
+
+        -- Stop recursing if we've hit grp.max
+        if depth==grp.max then
+            return false
         end
 
-		for i=start,#matched-(grp.min-depth)+1 do
-			comb[depth]=matched[i]
-			if dfs_comb(i+1,depth+1) then
+        -- Prune if not enough cards remain to reach grp.min
+        if #matched-start+1+depth<grp.min then
+            return false
+        end
+
+        -- Otherwise, try adding one more card
+        for i=start,#matched do
+            comb[depth+1]=matched[i]
+            if dfs(i+1,depth+1) then
                 return true
             end
+            comb[depth+1]=nil
         end
         return false
     end
 
-	return dfs_comb(1,1)
+    -- kick off the DFS
+    return dfs(1,0)
 end
 
+
 -- Shared has_same checker (bitmask or key‐list)
 function Fusion.CheckHasSame(grp,group_obj,e)
 	local cards={}