@@ -2987,25 +2987,22 @@ local declare = {
29872987 local ranks = {}
29882988 local suits = {}
29892989 for i , v in pairs (cards ) do
2990- if not ranks [v :get_id ()] then
2991- ranks [v :get_id ()] = true
2992- complexity = complexity + 0.85
2993- end
2994- if not suitless then
2995- if (SMODS .has_no_suit (v ) and not suits [" suitless" ]) or not suits [v .base .suit ] then
2996- suits [SMODS .has_no_suit (v ) and " suitless" or v .base .suit ] = true
2997- complexity = complexity + 0.65
2998- end
2990+ if not ranks [v .base .value ] then
2991+ ranks [v .base .value ] = true
29992992 end
30002993 end
3001- if # cards > 5 then
3002- complexity = complexity * 1.25 ^ (# cards - 5 )
2994+ for i , v in pairs (cards ) do
2995+ if not suits [v .base .suit ] and not suitless then
2996+ suits [v .base .suit ] = true
2997+ end
30032998 end
3004- complexity = complexity * 0.75
3005- local mult = complexity
3006- local chips = complexity * 8.45 -- arbitrary just shake it up a little
3007- local l_mult = math.min (complexity * 0.15 , 0.5 )
3008- local l_chips = math.min (complexity * 1.5 , 5 )
2999+ local s = # suits - 1
3000+ local r = # ranks - 1
3001+ local mult = math.floor ((complexity / 1.41428 )^ 2.25 + s + r )
3002+ if mult < 1 then mult = 1 end
3003+ local chips = math.floor (mult * 9.55 )
3004+ local l_chips = chips * 0.25
3005+ local l_mult = mult * 0.25
30093006 local declare_cards = {}
30103007 for i , v in pairs (cards ) do
30113008 local card = {
0 commit comments