improve checks for big numbers

Author: lord-ruby

items/epic.lua

@@ -1227,7 +1227,7 @@ local circus = {
 		if context.forcetrigger then
 			local total = 1
 			for i, v in pairs(card.ability.extra) do
-				if type(v) == "number" or (type(v) == "table" and v.tetrate) then
+				if Cryptid.is_number(v) then
 					total = total * v
 				end
 			end

lib/ascended.lua

@@ -132,7 +132,7 @@ function G.FUNCS.get_poker_hand_info(_cards)
 			ease_colour(G.C.UI_CHIPS, copy_table(G.C.GOLD), 0.3)
 			ease_colour(G.C.UI_MULT, copy_table(G.C.GOLD), 0.3)
 			G.GAME.current_round.current_hand.cry_asc_num_text = (
-				a_power and (type(a_power) == "table" and a_power:gt(to_big(0)) or a_power > 0)
+				a_power and (Cryptid.is_big(a_power) and a_power:gt(to_big(0)) or a_power > 0)
 			)
 					and " (+" .. a_power .. ")"
 				or ""

lib/calculate.lua

@@ -24,7 +24,7 @@ function Card:cry_copy_ability()
 	local orig_ability = {}
 	if self.ability then
 		for i, j in pairs(self.ability) do
-			if (type(j) == "table") and is_number(j) then
+			if Cryptid.is_big(j) then
 				orig_ability[i] = to_big(j)
 			elseif type(j) == "table" then
 				orig_ability[i] = {}

lib/misc.lua

@@ -1466,3 +1466,11 @@ function Card_Character:say_stuff(n, not_first, quip_key)
 		return say_stuff_ref(self, n, not_first, quip_key)
 	end
 end
+
+
+function Cryptid.is_number(x)
+	return type(x) == "number" or (type(x) == "table" and is_number(x)) or (is_big and is_big(x))
+end
+function Cryptid.is_big(x)
+	return (type(x) == "table" and is_number(x)) or (is_big and is_big(x))
+end

lib/misprintize.lua

@@ -229,11 +229,12 @@ function Cryptid.misprintize_val(val, override, big, grow_type, pow_level)
 	return val
 end
 function Cryptid.sanity_check(val, is_big)
+	if not Talisman then return val end
 	if is_big then
 		if not val or type(val) == "number" and (val ~= val or val > 1e300 or val < -1e300) then
 			val = 1e300
 		end
-		if type(val) == "table" then
+		if Cryptid.is_big(val) then
 			return val
 		end
 		if val > 1e100 or val < -1e100 then
@@ -243,7 +244,7 @@ function Cryptid.sanity_check(val, is_big)
 	if not val or type(val) == "number" and (val ~= val or val > 1e300 or val < -1e300) then
 		return 1e300
 	end
-	if type(val) == "table" then
+	if Cryptid.is_big(val) then
 		if val > to_big(1e300) then
 			return 1e300
 		end
@@ -333,7 +334,7 @@ function Cryptid.misprintize(card, override, force_reset, stack, grow_type, pow_
 	end
 	if clamps then
 		for i, v in pairs(clamps) do
-			if type(v) == "table" and not v.tetrate then
+			if type(v) == "table" and not Cryptid.is_big(v) then
 				for i2, v2 in pairs(v) do
 					if to_big(card.ability[i][i2]) > to_big(v2) then
 						card.ability[i][i2] = Cryptid.sanity_check(v2, Cryptid.is_card_big(card))
@@ -345,7 +346,7 @@ function Cryptid.misprintize(card, override, force_reset, stack, grow_type, pow_
 						end
 					end
 				end
-			elseif (type(v) == "table" and v.tetrate) or type(v) == "number" then
+			elseif Cryptid.is_number(v) then
 				if to_big(card.ability[i]) > to_big(v) then
 					card.ability[i] = Cryptid.sanity_check(v, Cryptid.is_card_big(card))
 					if to_big(card.ability[i]) > to_big(-1e100) or to_big(card.ability[i]) < to_big(1e100) then
@@ -396,11 +397,12 @@ function Card:get_nominal(mod)
 end
 
 function Cryptid.manipulate(card, args)
+	if not card or not card.config or not card.config.center then return end
 	if not Card.no(card, "immutable", true) or (args and args.bypass_checks) then
 		if not args then
 			return Cryptid.manipulate(card, {
-				min = (G.GAME.modifiers.cry_misprint_min or 1) * (G.GAME.modifiers.cry_jkr_misprint_mod or 1),
-				max = (G.GAME.modifiers.cry_misprint_max or 1) * (G.GAME.modifiers.cry_jkr_misprint_mod or 1),
+				min = (G.GAME.modifiers.cry_misprint_min or 1),
+				max = (G.GAME.modifiers.cry_misprint_max or 1),
 				type = "X",
 				dont_stack = true,
 				no_deck_effects = true,
@@ -438,13 +440,13 @@ function Cryptid.manipulate(card, args)
 				end
 				if caps then
 					for i, v in pairs(caps) do
-						if type(v) == "table" and not v.tetrate then
+						if Cryptid.is_big(v) then
 							for i2, v2 in pairs(v) do
 								if to_big(card.ability[i][i2]) > to_big(v2) then
 									card.ability[i][i2] = Cryptid.sanity_check(v2, Cryptid.is_card_big(card))
 								end
 							end
-						elseif (type(v) == "table" and v.tetrate) or type(v) == "number" then
+						elseif Cryptid.is_number(v) then
 							if to_big(card.ability[i]) > to_big(v) then
 								card.ability[i] = Cryptid.sanity_check(v, Cryptid.is_card_big(card))
 							end
@@ -456,7 +458,7 @@ function Cryptid.manipulate(card, args)
 			if not Cryptid.base_values[card.config.center.key] then
 				Cryptid.base_values[card.config.center.key] = {}
 				for i, v in pairs(config) do
-					if (type(v) == "table" and v.tetrate) or type(v) == "number" and to_big(v) ~= to_big(0) then
+					if Cryptid.is_number(v) and to_big(v) ~= to_big(0) then
 						Cryptid.base_values[card.config.center.key][i .. "ability"] = v
 					elseif type(v) == "table" then
 						for i2, v2 in pairs(v) do
@@ -488,7 +490,7 @@ function Cryptid.manipulate_table(card, ref_table, ref_value, args, tblkey)
 	end
 	for i, v in pairs(ref_table[ref_value]) do
 		if
-			(type(v) == "number" or (type(v) == "table" and v.tetrate))
+			Cryptid.is_number(v)
 			and Cryptid.misprintize_value_blacklist[i] ~= false
 		then
 			local num = v
@@ -504,19 +506,12 @@ function Cryptid.manipulate_table(card, ref_table, ref_value, args, tblkey)
 						or Cryptid.base_values[card.config.center.key][i .. "consumeable"]
 				end
 			end
-			local new_val = Cryptid.manipulate_value(num, args, args.big or Cryptid.is_card_big(card), i)
-			ref_table[ref_value][i] = new_val
-
-			-- take double scale / scalae into account
-			if ref_value == "ability" and ref_table.ability.cry_scaling_info then
-				ref_table.ability.cry_scaling_info[i] = new_val
+			if args.big ~= nil then
+				ref_table[ref_value][i] = Cryptid.manipulate_value(num, args, args.big, i)
+			else
+				ref_table[ref_value][i] = Cryptid.manipulate_value(num, args, Cryptid.is_card_big(card), i)
 			end
-		elseif
-			i ~= "immutable"
-			and not (ref_value == "ability" and i == "cry_scaling_info")
-			and type(v) == "table"
-			and Cryptid.misprintize_value_blacklist[i] ~= false
-		then
+		elseif i ~= "immutable" and type(v) == "table" and Cryptid.misprintize_value_blacklist[i] ~= false then
 			Cryptid.manipulate_table(card, ref_table[ref_value], i, args)
 		end
 	end
@@ -547,7 +542,7 @@ function Cryptid.manipulate_value(num, args, is_big, name)
 				end
 			elseif args.type == "^" then
 				num = to_big(num) ^ new_value
-			elseif args.type == "hyper" then
+			elseif args.type == "hyper" and SMODS.Mods.Talisman and SMODS.Mods.Talisman.can_load then
 				if to_big(num) ~= to_big(0) and to_big(num) ~= to_big(1) then
 					num = to_big(num):arrow(args.value.arrows, to_big(new_value))
 				end
@@ -565,7 +560,7 @@ function Cryptid.manipulate_value(num, args, is_big, name)
 				end
 			elseif args.type == "^" then
 				num = to_big(num) ^ args.value
-			elseif args.type == "hyper" then
+			elseif args.type == "hyper" and SMODS.Mods.Talisman and SMODS.Mods.Talisman.can_load then
 				num = to_big(num):arrow(args.value.arrows, to_big(args.value.height))
 			end
 		end

lovely/Ascended.toml

@@ -39,7 +39,7 @@ G.GAME.hands[text].played_this_round = G.GAME.hands[text].played_this_round + 1
 '''
 position = "before"
 payload = '''
-if G.GAME.current_round.current_hand.cry_asc_num and (((type(G.GAME.current_round.current_hand.cry_asc_num) == "table" and G.GAME.current_round.current_hand.cry_asc_num:gt(to_big(G.GAME.cry_exploit_override and 1 or 0)) or G.GAME.current_round.current_hand.cry_asc_num > (G.GAME.cry_exploit_override and 1 or 0)))) then
+if G.GAME.current_round.current_hand.cry_asc_num and (((Cryptid.is_big(G.GAME.current_round.current_hand.cry_asc_num) and G.GAME.current_round.current_hand.cry_asc_num:gt(to_big(G.GAME.cry_exploit_override and 1 or 0)) or G.GAME.current_round.current_hand.cry_asc_num > (G.GAME.cry_exploit_override and 1 or 0)))) then
 	G.GAME.cry_asc_played = G.GAME.cry_asc_played and G.GAME.cry_asc_played+1 or 1
 end
 '''

lovely/misc.toml

@@ -207,10 +207,8 @@ payload = '''
 if args and args.vars and type(args.vars) == "table" then
     local reset = {}
     for i, j in pairs(args.vars) do
-        if type(j) == 'table' then
-            if (j.new and type(j.new) == "function") and ((j.m and j.e) or (j.array and j.sign and (type(j.array) == "table"))) then
-                reset[i] = number_format(j)
-            end
+        if Cryptid.is_big(j) then
+            reset[i] = number_format(j)
         end
     end
     for i, j in pairs(reset) do