remove hard talisman dependency

lord-ruby · lord-ruby · commit 875e02b10fca · 2025-07-05T23:16:41.000+01:00
diff --git a/Cryptid.json b/Cryptid.json
@@ -11,7 +11,6 @@
 	"badge_text_colour": "FFFFFF",
 	"version": "0.5.10~dev3",
 	"dependencies": [
-		"Talisman (>=2.2.0a)",
 		"Steamodded (>=1.0.0~BETA-0614a)"
 	],
 	"conflicts": [
diff --git a/README.md b/README.md
@@ -2,7 +2,9 @@
 # Cryptid
 An unbalanced Balatro mod.
 
-Note: Cryptid requires [Steamodded](https://github.com/Steamopollys/Steamodded/archive/refs/heads/main.zip) and [Talisman](https://github.com/SpectralPack/Talisman/archive/refs/heads/main.zip).
+Note: Cryptid requires [Steamodded](https://github.com/Steamopollys/Steamodded/archive/refs/heads/main.zip) 
+[Talisman](https://github.com/SpectralPack/Talisman/archive/refs/heads/main.zip) may be used to increase the score cap but isnt required.
+
 
 Cryptid currently adds:
 
@@ -23,7 +25,6 @@ Cryptid currently adds:
 > *My game is crashing on startup/something doesn't appear to be loading!*
 
 Make sure everything is properly installed.
-For Talisman, the folder that contains Talisman should be named `Talisman`. If you've downloaded the source code from GitHub (by clicking on [Code] and then [Download ZIP]), the folder within the ZIP may be called `Talisman-main`, which will cause a problem. Simply rename the folder(s) so that the `-main` part of the name is removed, so that the folder is just called `Talisman`.
 Whenever you are manually updating Talisman or Cryptid, or any other mod for that matter, it's a good approach to instead delete the contents of the folder, then install the contents of the folder from the ZIP into the existing folder to avoid having to constantly rename the folder over and over.
 For automatic updates, try using the [automatic update script](https://discord.com/channels/1264429948970733782/1268911536638787625).
 It could also be that Steamodded is out of date, sometimes mods may use features of a new version that's absent in an older version, but don't change the version that they ask for.
@@ -43,7 +44,7 @@ If they show up red, that means there's a problem. Hover over the mod icon (whic
 You can disable some features of the mod by opening your Mods, clicking [Cryptid], going over to the Config tab, and clicking Thematic Sets. There, you can toggle various Cryptid additions on or off as you see fit.
 You can also enable/disable certain music tracks in the Music tab. If you're a streamer, consider disabling the Jimball music for your safety!
 
-> *I'm hitting infinity very often, is there any way to raise the limit of the scoring system?*
+> *I'm hitting "naneinf"/"Infinity" very often, is there any way to raise the limit of the scoring system?*
 
 Talisman may be configured to be on **BigNum** mode, which has a maximum limit of ee308. You can make the limit virtually disappear by changing it to **OmegaNum**, which can handle e10##1000. You can configure it by going into Mods, then clicking Talisman, and changing the Score Limit under Config. Be careful; if you have a saved run that was on a different number system, you won't be able to load it (unless if you switch back)!
 
diff --git a/assets/sounds/ExponentialChips.wav b/assets/sounds/ExponentialChips.wav
diff --git a/assets/sounds/ExponentialMult.wav b/assets/sounds/ExponentialMult.wav
diff --git a/assets/sounds/MultiplicativeChips.wav b/assets/sounds/MultiplicativeChips.wav
diff --git a/items/deck.lua b/items/deck.lua
@@ -451,7 +451,7 @@ local critical = {
 				check = 2
 				G.E_MANAGER:add_event(Event({
 					func = function()
-						play_sound("talisman_emult", 1)
+						play_sound("cryptid_emult", 1)
 						attention_text({
 							scale = 1.4,
 							text = localize("cry_critical_hit_ex"),
@@ -978,7 +978,7 @@ local antimatter = {
 						update_hand_text({ delay = 0 }, { mult = context.mult, chips = context.chips })
 						G.E_MANAGER:add_event(Event({
 							func = function()
-								play_sound("talisman_emult", 1)
+								play_sound("cryptid_emult", 1)
 								attention_text({
 									scale = 1.4,
 									text = localize("cry_critical_hit_ex"),
diff --git a/items/exotic.lua b/items/exotic.lua
@@ -169,7 +169,7 @@ local universum = {
 		--Universum Patches
 		local uht = update_hand_text
 		function update_hand_text(config, vals)
-			if next(find_joker("cry-Universum")) and not Talisman.config_file.disable_anims then
+			if next(find_joker("cry-Universum")) and (not Talisman or not Talisman.config_file.disable_anims) then
 				G.E_MANAGER:add_event(Event({ --This is the Hand name text for the poker hand
 					trigger = "before",
 					blockable = not config.immediate,
diff --git a/items/m.lua b/items/m.lua
@@ -684,7 +684,7 @@ local bonk = {
 		end
 		if context.other_joker and context.other_joker.ability.set == "Joker" then
 			if context.other_joker:is_jolly() then
-				if not Talisman.config_file.disable_anims then
+				if Talisman and not Talisman.config_file.disable_anims then
 					G.E_MANAGER:add_event(Event({
 						func = function()
 							context.other_joker:juice_up(0.5, 0.5)
@@ -703,7 +703,7 @@ local bonk = {
 					chip_mod = lenient_bignum(to_big(card.ability.extra.chips) * card.ability.extra.xchips),
 				}
 			else
-				if not Talisman.config_file.disable_anims then
+				if Talisman and not Talisman.config_file.disable_anims then
 					G.E_MANAGER:add_event(Event({
 						func = function()
 							context.other_joker:juice_up(0.5, 0.5)
@@ -1557,7 +1557,7 @@ local mprime = {
 					context.other_joker:is_jolly() or Cryptid.safe_get(context.other_joker.config.center, "pools", "M")
 				)
 			then
-				if not Talisman.config_file.disable_anims then
+				if Talisman and not Talisman.config_file.disable_anims then
 					G.E_MANAGER:add_event(Event({
 						func = function()
 							context.other_joker:juice_up(0.5, 0.5)
diff --git a/items/misc_joker.lua b/items/misc_joker.lua
@@ -1924,7 +1924,7 @@ local waluigi = {
 	calculate = function(self, card, context)
 		if context.post_trigger or context.forcetrigger then
 			if not context.forcetrigger then
-				if not Talisman.config_file.disable_anims then
+				if Talisman and not Talisman.config_file.disable_anims then
 					G.E_MANAGER:add_event(Event({
 						func = function()
 							context.other_card:juice_up(0.5, 0.5)
@@ -1979,18 +1979,6 @@ local wario = {
 			return {
 				dollars = lenient_bignum(card.ability.extra.money),
 				card = context.other_context and context.other_context.blueprint_card or context.other_card or nil,
-				-- This function isn't working properly :sob:
-				--[[func = function()
-					G.E_MANAGER:add_event(Event({
-						func = function()
-							if not Talisman.config_file.disable_anims then
-								(context.blueprint_card or card):juice_up(0.5, 0.5)
-							end
-							return true
-						end,
-					}))
-					return true
-				end,--]]
 			}
 		end
 	end,
@@ -3589,7 +3577,7 @@ local meteor = {
 			and context.other_joker.edition.foil == true
 			and card ~= context.other_joker
 		then
-			if not Talisman.config_file.disable_anims then
+			if Talisman and not Talisman.config_file.disable_anims then
 				G.E_MANAGER:add_event(Event({
 					func = function()
 						context.other_joker:juice_up(0.5, 0.5)
@@ -3685,7 +3673,7 @@ local exoplanet = {
 			and context.other_joker.edition.holo == true
 			and card ~= context.other_joker
 		then
-			if not Talisman.config_file.disable_anims then
+			if Talisman and not Talisman.config_file.disable_anims then
 				G.E_MANAGER:add_event(Event({
 					func = function()
 						context.other_joker:juice_up(0.5, 0.5)
@@ -3781,7 +3769,7 @@ local stardust = {
 			and context.other_joker.edition.polychrome == true
 			and card ~= context.other_joker
 		then
-			if not Talisman.config_file.disable_anims then
+			if Talisman and not Talisman.config_file.disable_anims then
 				G.E_MANAGER:add_event(Event({
 					func = function()
 						context.other_joker:juice_up(0.5, 0.5)
@@ -8458,7 +8446,7 @@ local universe = {
 			and context.other_joker.edition.cry_astral == true
 			and card ~= context.other_joker
 		then
-			if not Talisman.config_file.disable_anims then
+			if Talisman and not Talisman.config_file.disable_anims then
 				G.E_MANAGER:add_event(Event({
 					func = function()
 						context.other_joker:juice_up(0.5, 0.5)
diff --git a/items/test.lua b/items/test.lua
@@ -85,7 +85,7 @@ local test2 = {
 			end
 		elseif context.other_joker and card ~= context.other_joker then
 			if card.T.x + card.T.w / 2 < context.other_joker.T.x + context.other_joker.T.w / 2 then
-				if not Talisman.config_file.disable_anims then
+				if Talisman and not Talisman.config_file.disable_anims then
 					G.E_MANAGER:add_event(Event({
 						func = function()
 							context.other_joker:juice_up(0.5, 0.5)
diff --git a/lib/content.lua b/lib/content.lua
@@ -522,6 +522,18 @@ SMODS.Sound({
 	key = "e_golden",
 	path = "e_golden.ogg",
 })
+SMODS.Sound({
+	key = "emult",
+	path = "ExponentialMult.wav",
+})
+SMODS.Sound({
+	key = "echips",
+	path = "ExponentialChips.wav",
+})
+SMODS.Sound({
+	key = "xchip",
+	path = "MultiplicativeChips.wav"
+})
 SMODS.Sound({
 	key = "studiofromhelsinki",
 	path = "studiofromhelsinki.ogg",
diff --git a/lib/forcetrigger.lua b/lib/forcetrigger.lua
@@ -25,7 +25,7 @@ function Cryptid.forcetrigger(card, context)
 	end
 	local results = {}
 	local check = Cryptid.forcetriggerVanillaCheck(card)
-	if not Talisman.config_file.disable_anims then
+	if Talisman and not Talisman.config_file.disable_anims then
 		G.E_MANAGER:add_event(Event({
 			trigger = "before",
 			func = function()
diff --git a/lib/misc.lua b/lib/misc.lua
@@ -563,6 +563,7 @@ Cryptid.mod_whitelist = {
 }
 
 function Cryptid.is_card_big(joker)
+	if not Talisman then return false end
 	local center = joker.config and joker.config.center
 	if not center then
 		return false
diff --git a/lib/misprintize.lua b/lib/misprintize.lua
@@ -523,7 +523,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
@@ -541,7 +541,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
diff --git a/lib/overrides.lua b/lib/overrides.lua
@@ -2016,3 +2016,68 @@ function poll_edition(_key, _mod, _no_neg, _guaranteed)
 	end
 	return poll_editionref(_key, _mod, _no_neg, _guaranteed)
 end
+
+if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.can_load) then
+	local smods_xchips = false
+	for _, v in pairs(SMODS.calculation_keys) do
+	  if v == 'x_chips' then
+		smods_xchips = true
+		break
+	  end
+	end
+	local scie = SMODS.calculate_individual_effect
+	function SMODS.calculate_individual_effect(effect, scored_card, key, amount, from_edition)
+		local ret = scie(effect, scored_card, key, amount, from_edition)
+		if ret then
+		return ret
+		end
+		if (key == 'e_chips' or key == 'echips' or key == 'Echip_mod') and amount ~= 1 then 
+			if effect.card then juice_card(effect.card) end
+			hand_chips = mod_chips(hand_chips ^ amount)
+			update_hand_text({delay = 0}, {chips = hand_chips, mult = mult})
+			if not effect.remove_default_message then
+				if from_edition then
+					card_eval_status_text(scored_card, 'jokers', nil, percent, nil, {message = "^"..amount, colour =  G.C.EDITION, edition = true})
+				elseif key ~= 'Echip_mod' then
+					if effect.echip_message then
+						card_eval_status_text(scored_card or effect.card or effect.focus, 'extra', nil, percent, nil, effect.echip_message)
+					else
+						card_eval_status_text(scored_card or effect.card or effect.focus, 'e_chips', amount, percent)
+					end
+				end
+			end
+			return true
+		end
+		if (key == 'e_mult' or key == 'emult' or key == 'Emult_mod') and amount ~= 1 then 
+			if effect.card then juice_card(effect.card) end
+			mult = mod_mult(mult ^ amount)
+			update_hand_text({delay = 0}, {chips = hand_chips, mult = mult})
+			if not effect.remove_default_message then
+				if from_edition then
+					card_eval_status_text(scored_card, 'jokers', nil, percent, nil, {message = "^"..amount.." "..localize("k_mult"), colour =  G.C.EDITION, edition = true})
+				elseif key ~= 'Emult_mod' then
+					if effect.emult_message then
+						card_eval_status_text(scored_card or effect.card or effect.focus, 'extra', nil, percent, nil, effect.emult_message)
+					else
+						card_eval_status_text(scored_card or effect.card or effect.focus, 'e_mult', amount, percent)
+					end
+				end
+			end
+			return true
+		end
+	end
+	for _, v in ipairs({'e_mult', 'e_chips', 'ee_mult', 'ee_chips', 'eee_mult', 'eee_chips', 'hyper_mult', 'hyper_chips',
+	'emult', 'echips', 'eemult', 'eechips', 'eeemult', 'eeechips', 'hypermult', 'hyperchips',
+	'Emult_mod', 'Echip_mod', 'EEmult_mod', 'EEchip_mod', 'EEEmult_mod', 'EEEchip_mod', 'hypermult_mod', 'hyperchip_mod'}) do
+	table.insert(SMODS.calculation_keys, v)
+	end
+	if not smods_xchips then
+		for _, v in ipairs({'x_chips', 'xchips', 'Xchip_mod'}) do
+		table.insert(SMODS.calculation_keys, v)
+		end
+	end
+	function to_number(a) return a end
+	function to_big(a) return a end
+	function lenient_bignum(a) return a end
+	function is_number(x) return type(x) == "number" end
+end
diff --git a/lovely/misc.toml b/lovely/misc.toml
@@ -683,4 +683,27 @@ payload = '''
 local safe_seal = type(other.ability.seal) == "table" and other.ability.seal or {}
 for k, v in pairs(safe_seal) do
 '''
-match_indent = true
+match_indent = true
+
+[[patches]]
+[patches.pattern]
+target = "functions/common_events.lua"
+pattern = "elseif eval_type == 'dollars' then"
+position = "before"
+payload = '''
+elseif eval_type == 'e_chips' then 
+	sound = 'cry_echip'
+	amt = amt
+	text = '^' .. amt
+	colour = G.C.CHIPS
+	config.type = 'fade'
+	config.scale = 0.7
+elseif eval_type == 'e_mult' then 
+	sound = 'cry_emult'
+	amt = amt
+	text = '^' .. amt .. ' ' .. localize('k_mult')
+	colour = G.C.MULT
+	config.type = 'fade'
+	config.scale = 0.7
+'''
+match_indent = true
