update cryptid

Cryptid/.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

Cryptid/.github/workflows/pull_request.yml

@@ -0,0 +1,30 @@
+name: Stylua
+
+on:
+  push:
+    branches:
+      - '*'
+
+jobs:
+  stylua:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run stylua
+        uses: JohnnyMorganz/stylua-action@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          version: latest
+          args: .
+
+      - name: Commit changes
+        run: |
+          git config --global user.name "jolly[bot]"
+          git config --global user.email "jolly[bot]@users.noreply.github.com"
+          git add .
+          git diff --cached --quiet || git commit -m "jolly-bot: auto-format Lua files using Stylua"
+          git push

Cryptid/.gitignore

@@ -0,0 +1,4 @@
+# LSP setting files (add more if applicable)
+.vscode/*
+.luarc.json
+.lovelyignore

Cryptid/Cryptid.json

@@ -9,9 +9,13 @@
 	"priority": 114,
 	"badge_colour": "708b91",
 	"badge_text_colour": "FFFFFF",
-	"version": "0.5.5",
+	"version": "0.5.5b",
 	"dependencies": [
 		"Talisman (>=2.0.9)",
-		"Steamodded (>=1.0.0~BETA-0308a)"
+		"Steamodded (>=1.0.0~BETA-0314c)"
+	],
+	"conflicts": [
+		"Saturn",
+		"AntePreview (>= 2.0.0~0c16a) (<<3.0.0)"
 	]
 }

Cryptid/Cryptid.lua

@@ -14,20 +14,15 @@ Cryptid_config = SMODS.current_mod.config
 SMODS.current_mod.optional_features = {
 	retrigger_joker = true,
 	post_trigger = true,
-	cardareas = {
-		unscored = true,
-	},
+	quantum_enhancements = false,
 	-- Here are some other ones Steamodded has
 	-- Cryptid doesn't use them YET, but these should be uncommented if Cryptid uses them
-	--[[
-	quantum_enhancements = true,
 	-- These ones add new card areas that Steamodded will calculate through
 	-- Might already be useful for sticker calc
 	cardareas = {
-		deck = true,
-		discard = true,
-	}
-	]]
+		--deck = true,
+		discard = true, -- used by scorch
+	},
 }
 
 --Load Library Files
@@ -58,11 +53,11 @@ local function process_items(f, mod)
 					if item.key then
 						if item.object_type and SMODS[item.object_type].class_prefix then
 							item.key = SMODS[item.object_type].class_prefix .. "_" .. mod.prefix .. "_" .. item.key
-						else
+						elseif string.find(item.key, mod.prefix .. "_") ~= 1 then
 							item.key = mod.prefix .. "_" .. item.key
 						end
 					end
-					if item.atlas then
+					if item.atlas and string.find(item.atlas, mod.prefix .. "_") ~= 1 then
 						item.atlas = mod.prefix .. "_" .. item.atlas
 					end
 					-- this will also display the mod's own badge
@@ -237,6 +232,12 @@ local cryptidConfigTab = function()
 		ref_table = Cryptid_config,
 		ref_value = "experimental",
 	})
+	cry_nodes[#cry_nodes + 1] = create_toggle({
+		label = localize("cry_force_tooltips"),
+		active_colour = HEX("22c705"),
+		ref_table = Cryptid_config,
+		ref_value = "force_tooltips",
+	})
 	cry_nodes[#cry_nodes + 1] = create_toggle({
 		label = localize("cry_feat_https module"),
 		active_colour = HEX("b1c78d"),

Cryptid/README.md

@@ -1,16 +1,19 @@
+
 # Cryptid
 An unbalanced Balatro mod.
 
-Note: Cryptid requires [Steamodded **1.0.0-Alpha**](https://github.com/Steamopollys/Steamodded/archive/refs/heads/main.zip) and [Talisman](https://github.com/MathIsFun0/Talisman/releases/latest).
+Note: Cryptid requires [Steamodded **1.0.0~BETA-0314c**](https://github.com/Steamopollys/Steamodded/archive/refs/heads/main.zip) and [Talisman](https://github.com/MathIsFun0/Talisman/releases/latest).
 
 Cryptid currently adds:
-![image](https://github.com/user-attachments/assets/0a03d6b2-d57f-4f92-9f42-a9ff201c5f2f)
-![image](https://github.com/user-attachments/assets/c3f26d4d-2fb4-4b07-8f43-0d7a730e986d)
+
+![image](https://github.com/user-attachments/assets/fa426832-2910-4bff-86d3-97b973c79801)
+![image](https://github.com/user-attachments/assets/a99b29fb-93c0-4f24-9dbd-f0ef82050aa5) 
+![image](https://github.com/user-attachments/assets/2441010d-1f0d-4b3f-80f7-de45e071ad06)
 
 
-### [Official Discord](https://discord.gg/eUf9Ur6RyB)
-
-### [Video Installation Guide](https://www.youtube.com/watch?v=aUr0gXE77rk)
+### [Official Discord](https://discord.gg/cryptid)
+### [Mac Video Installation Guide](https://youtu.be/l5ni7fHgwTE?si=GAN5t5-y_IuEv8uA)
+### [Not Mac Video Installation Guide](https://www.youtube.com/watch?v=aUr0gXE77rk)
 
 ### Frequently asked questions
 * Credit to @jenwalter666 for creating this FAQ (forwarded from Cryptid Discord)
@@ -49,12 +52,3 @@ Talisman may be configured to be on **BigNum** mode, which has a maximum limit o
 
 Be sure to give us as much information about the bug/crash as possible. A way to reproduce the bug/crash is also especially useful information to help us fix it.
 Remember; just saying you're crashing doesn't tell us anything. We need to know the details!
-
-> *How can I disable a specific boss blind/joker/etc.?*
-
-Let's use Blinds as an example.
-
-In your Balatro mods folder, navigate to `\Cryptid\Items` and find `Blinds.lua`. (Different types of items will be contained in different Lua files in this folder.)
-
-Towards the end of the file, there's an array named `items_togo`, near line 1230.  You can disable specific Blinds by deleting the relevant lines here.  These settings will take effect on a restart.
-Most other files will have a similar items array near the bottom of the file that you can modify to remove specific things from Cryptid. This system will be changed to be in-game before Cryptid 0.6.0.

Cryptid/config.lua

@@ -8,6 +8,7 @@ return {
 	},
 	["family_mode"] = false,
 	["experimental"] = false,
+	["force_tooltips"] = true,
 	["HTTPS"] = true,
 	["menu"] = true,
 }

Cryptid/items/achievement.lua

@@ -269,10 +269,25 @@ local ult_full_skip = {
 	end,
 }
 
+local youre_fucking_kidding = {
+	object_type = "Achievement",
+	key = "youre_fucking_kidding",
+	order = 15,
+	hidden_text = true,
+	bypass_all_unlocked = true,
+	atlas = "cry_achievements",
+	-- reset_on_startup = true,
+	unlock_condition = function(self, args)
+		if args.type == "discard_custom" and next(evaluate_poker_hand(args.cards)["cry_WholeDeck"]) then
+			return true
+		end
+	end,
+}
+
 local patience_virtue = {
 	object_type = "Achievement",
 	key = "patience_virtue",
-	order = 15,
+	order = 16,
 	bypass_all_unlocked = true,
 	hidden_text = true,
 	pos = { x = 2, y = 0 },
@@ -299,7 +314,7 @@ local patience_virtue = {
 local pull_request = {
 	object_type = "Achievement",
 	key = "pull_request",
-	order = 16,
+	order = 17,
 	bypass_all_unlocked = true,
 	hidden_text = true,
 	pos = { x = 2, y = 0 },
@@ -315,7 +330,7 @@ local pull_request = {
 local ace_through_crash = {
 	object_type = "Achievement",
 	key = "ace_in_crash",
-	order = 17,
+	order = 18,
 	bypass_all_unlocked = true,
 	pos = { x = 2, y = 0 },
 	atlas = "cry_achievements",
@@ -330,7 +345,7 @@ local ace_through_crash = {
 local home_realtor = {
 	object_type = "Achievement",
 	key = "home_realtor",
-	order = 18,
+	order = 19,
 	bypass_all_unlocked = true,
 	hidden_text = true,
 	pos = { x = 2, y = 0 },
@@ -347,7 +362,7 @@ local home_realtor = {
 local traffic_jam = {
 	object_type = "Achievement",
 	key = "traffic_jam",
-	order = 19,
+	order = 20,
 	bypass_all_unlocked = true,
 	hidden_text = true,
 	pos = { x = 2, y = 0 },
@@ -377,7 +392,7 @@ local traffic_jam = {
 local perfectly_balanced = {
 	object_type = "Achievement",
 	key = "perfectly_balanced",
-	order = 20,
+	order = 21,
 	bypass_all_unlocked = true,
 	hidden_text = true,
 	pos = { x = 2, y = 0 },
@@ -397,7 +412,7 @@ local perfectly_balanced = {
 local pin = {
 	object_type = "Achievement",
 	key = "pin",
-	order = 21,
+	order = 22,
 	hidden_text = true,
 	pos = { x = 3, y = 0 },
 	atlas = "cry_achievements",
@@ -430,6 +445,7 @@ local pin = {
 -- Ultimate Full Skip: Win in 1 round
 -- Legally Blind: Obtain a Blurred Blurred Joker
 -- Cryptid the Cryptid: Use Cryptid on Cryptid
+-- You're Fucking Kidding/You Can't Be Serious: Discard your entire deck
 -- Implemented (Platinum)
 -- Patience is a Virtue: Wait out Lavender Loop for 2 minutes before playing first hand and beat it
 -- Pull Request: Have ://COMMIT spawn the same Joker that it destroyed
@@ -455,6 +471,7 @@ local achievement_objects = {
 	jokes_on_you,
 	freak_house,
 	ult_full_skip,
+	youre_fucking_kidding,
 	patience_virtue,
 	ace_through_crash,
 	home_realtor,

Cryptid/items/blind.lua

@@ -258,6 +258,28 @@ local tax = {
 	loc_vars = function(self, info_queue, card)
 		return { vars = { 0.4 * get_blind_amount(G.GAME.round_resets.ante) * 2 * G.GAME.starting_params.ante_scaling } } -- no bignum?
 	end,
+	preview_ui = function(self)
+		local value = self:loc_vars().vars[1]
+		return {
+			n = G.UIT.C,
+			nodes = {
+				{
+					n = G.UIT.R,
+					nodes = {
+						{ n = G.UIT.O, config = { object = get_stake_sprite(G.GAME.stake, 0.25) } },
+						{
+							n = G.UIT.T,
+							config = {
+								text = number_format(value),
+								colour = G.C.RED,
+								scale = score_number_scale(0.5, value),
+							},
+						},
+					},
+				},
+			},
+		}
+	end,
 	collection_loc_vars = function(self)
 		return { vars = { localize("cry_tax_placeholder") } }
 	end,
@@ -327,7 +349,7 @@ local clock = {
 		if G.SETTINGS.paused then
 			return 0
 		else
-			return 0.1 * dt / 3
+			return 0.1 * (dt * math.min(G.SETTINGS.GAMESPEED, 4) / 4) / 3
 		end
 	end,
 }
@@ -394,11 +416,18 @@ local joke = {
 			},
 		}
 	end,
+	preview_ui = function(self)
+		local value = self:loc_vars().vars[2]
+		return {
+			n = G.UIT.T,
+			config = { text = number_format(value), colour = G.C.ORANGE, scale = score_number_scale(0.5, value) },
+		}
+	end,
 	collection_loc_vars = function(self)
 		return { vars = { "8", localize("cry_joke_placeholder") } }
 	end,
 	cry_calc_ante_gain = function(self)
-		if to_big(G.GAME.chips) >= to_big(G.GAME.blind.chips) * 2 then
+		if to_big(G.GAME.chips) > to_big(G.GAME.blind.chips) * 2 then
 			if G.GAME.round_resets.ante == 1 then
 				G.GAME.cry_ach_conditions.the_jokes_on_you_triggered = true
 			end
@@ -427,7 +456,7 @@ local hammer = {
 	recalc_debuff = function(self, card, from_blind)
 		if card.area ~= G.jokers and not G.GAME.blind.disabled then
 			if
-				card.ability.effect ~= "Stone Card"
+				not SMODS.has_no_rank(card)
 				and (
 					card.base.value == "3"
 					or card.base.value == "5"
@@ -462,7 +491,7 @@ local magic = {
 	recalc_debuff = function(self, card, from_blind)
 		if card.area ~= G.jokers and not G.GAME.blind.disabled then
 			if
-				card.ability.effect ~= "Stone Card"
+				not SMODS.has_no_rank(card)
 				and (
 					card.base.value == "2"
 					or card.base.value == "4"
@@ -599,6 +628,53 @@ local pin = {
 		return false
 	end,
 }
+-- Must play 5 cards,
+-- Destroy all played and discarded cards
+-- (only appears in endless)
+local scorch = {
+	dependencies = {
+		items = {
+			"set_cry_blind",
+		},
+	},
+	object_type = "Blind",
+	name = "cry-scorch",
+	key = "scorch",
+	pos = { x = 0, y = 18 }, -- use Trick as placeholder icon
+	boss = {
+		min = 1,
+		max = 10,
+	},
+	atlas = "blinds",
+	order = 21,
+	boss_colour = HEX("77261a"),
+	debuff = { -- must play 5 cards
+		h_size_ge = 5,
+		h_size_le = 5,
+	},
+	calculate = function(self, blind, context)
+		if
+			context.full_hand
+			and context.destroy_card
+			and (context.cardarea == G.play or context.cardarea == "unscored")
+			and not G.GAME.blind.disabled
+		then
+			return { remove = not context.destroy_card.ability.eternal }
+		end
+		if context.discard and not G.GAME.blind.disabled then
+			for i, card in ipairs(G.hand.highlighted) do
+				return { remove = not card.ability.eternal }
+			end
+		end
+	end,
+	in_pool = function(self) -- only appears in endless
+		if G.GAME.round_resets.blind_ante > G.GAME.win_ante then
+			return true
+		else
+			return false
+		end
+	end,
+}
 --It seems Showdown blind order is seperate from normal blind collection order? convenient for me at least
 --Nvm they changed it
 local lavender_loop = {
@@ -637,14 +713,17 @@ local lavender_loop = {
 			and G.GAME.cry_ach_conditions.patience_virtue_earnable ~= true
 		then
 			G.GAME.cry_ach_conditions.patience_virtue_timer = G.GAME.cry_ach_conditions.patience_virtue_timer
-				- dt * (G.GAME.modifiers.cry_rush_hour_iii and 0.5 or 1) * (G.SETTINGS.paused and 0 or 1)
+				- dt
+					* (G.GAME.modifiers.cry_rush_hour_iii and 0.5 or 1)
+					* (G.SETTINGS.paused and 0 or 1)
+					* G.SETTINGS.GAMESPEED
 		elseif G.GAME.current_round.hands_played == 0 then
 			G.GAME.cry_ach_conditions.patience_virtue_earnable = true
 		end
-		if G.SETTINGS.paused then
+		if G.SETTINGS.paused or G.STATE == G.STATES.HAND_PLAYED then
 			return 1
 		else
-			return 1.25 ^ (dt / 1.5)
+			return 1.25 ^ (dt / (1.5 / math.min(G.SETTINGS.GAMESPEED, 4) * 4))
 		end
 	end,
 }
@@ -774,15 +853,22 @@ local sapphire_stamp = {
 	end,
 	set_blind = function(self, reset, silent)
 		if not reset then
+			G.GAME.stamp_mod = true
 			G.hand.config.highlighted_limit = G.hand.config.highlighted_limit + 1
 		end
 	end,
 	defeat = function(self, silent)
+		if G.GAME.stamp_mod then
+			G.GAME.stamp_mod = nil
+		end
 		if not G.GAME.blind.disabled then
 			G.hand.config.highlighted_limit = G.hand.config.highlighted_limit - 1
 		end
 	end,
 	disable = function(self, silent)
+		if G.GAME.stamp_mod then
+			G.GAME.stamp_mod = nil
+		end
 		if not G.GAME.blind.disabled then
 			G.hand.config.highlighted_limit = G.hand.config.highlighted_limit - 1
 		end
@@ -1340,6 +1426,7 @@ local items_togo = {
 	striker,
 	shackle,
 	pin,
+	scorch,
 	vermillion_virus,
 	tornado,
 	sapphire_stamp,

Cryptid/items/challenge.lua

@@ -283,11 +283,10 @@ local rng = {
 			{ id = "tag_rare" },
 			{ id = "tag_top_up" },
 			{ id = "tag_cry_epic" },
+			{ id = "tag_cry_gourmand" },
 		},
 		banned_cards = {
-			{ id = "j_cry_equilib" },
 			{ id = "c_cry_delete" },
-			{ id = "p_cry_meme_1", ids = { "p_cry_meme_1", "p_cry_meme_two", "p_cry_meme_three" } },
 		},
 		banned_other = {},
 	},

Cryptid/items/deck.lua

@@ -24,6 +24,20 @@ local very_fair = {
 			return avts(...)
 		end
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.type == "win_deck" then
+			if get_deck_win_stake("b_cry_blank") > 0 then
+				unlock_card(self)
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local equilibrium = {
 	object_type = "Back",
@@ -69,6 +83,24 @@ local equilibrium = {
 			return gp(k, t)
 		end
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if Cryptid.safe_get(G, "jokers") then
+			local count = 0
+			for i = 1, #G.jokers.cards do
+				count = count + 1
+			end
+			if count >= 10 then
+				unlock_card(self)
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local misprint = {
 	object_type = "Back",
@@ -87,6 +119,23 @@ local misprint = {
 		G.GAME.modifiers.cry_misprint_min = (G.GAME.modifiers.cry_misprint_min or 1) * self.config.cry_misprint_min
 		G.GAME.modifiers.cry_misprint_max = (G.GAME.modifiers.cry_misprint_max or 1) * self.config.cry_misprint_max
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if Cryptid.safe_get(G, "jokers") then
+			for i = 1, #G.jokers.cards do
+				if G.jokers.cards[i].edition and G.jokers.cards[i].edition.cry_glitched then
+					unlock_card(self)
+					break
+				end
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local infinite = {
 	object_type = "Back",
@@ -104,6 +153,20 @@ local infinite = {
 	apply = function(self)
 		G.GAME.modifiers.cry_highlight_limit = self.config.cry_highlight_limit
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.type == "hand_contents" then
+			if #args.cards >= 6 then
+				unlock_card(self)
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local conveyor = {
 	object_type = "Back",
@@ -120,6 +183,18 @@ local conveyor = {
 	apply = function(self)
 		G.GAME.modifiers.cry_conveyor = true
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.cry_used_consumable == "c_cry_analog" then
+			unlock_card(self)
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local CCD = {
 	object_type = "Back",
@@ -137,6 +212,18 @@ local CCD = {
 	apply = function(self)
 		G.GAME.modifiers.cry_ccd = true
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.cry_used_consumable == "c_cry_hammerspace" then
+			unlock_card(self)
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local wormhole = {
 	object_type = "Back",
@@ -173,6 +260,22 @@ local wormhole = {
 			end,
 		}, true)
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if Cryptid.safe_get(G, "jokers") then
+			for i = 1, #G.jokers.cards do
+				if G.jokers.cards[i].config.center.rarity == "cry_exotic" then
+					unlock_card(self)
+				end
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local redeemed = {
 	object_type = "Back",
@@ -193,6 +296,7 @@ local redeemed = {
 		local cr = Card.redeem
 		function Card:redeem()
 			cr(self)
+
 			if G.GAME.modifiers.cry_redeemed then
 				if
 					#G.play.cards == 0
@@ -220,7 +324,9 @@ local redeemed = {
 								else
 									area = G.play
 								end
-								if not G.cry_redeemed_buffer then G.cry_redeemed_buffer = {} end
+								if not G.cry_redeemed_buffer then
+									G.cry_redeemed_buffer = {}
+								end
 								if not G.cry_redeemed_buffer[v.key] and v.unlocked then
 									local card = create_card("Voucher", area, nil, nil, nil, nil, v.key)
 									G.cry_redeemed_buffer[v.key] = true
@@ -247,6 +353,20 @@ local redeemed = {
 			end
 		end
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.type == "discover_amount" then
+			if G.DISCOVER_TALLIES.vouchers.tally / G.DISCOVER_TALLIES.vouchers.of >= 1 then
+				unlock_card(self)
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local legendary = {
 	object_type = "Back",
@@ -309,6 +429,26 @@ local legendary = {
 			end,
 		}))
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if Cryptid.safe_get(G, "jokers") then
+			local count = 0
+			for i = 1, #G.jokers.cards do
+				if G.jokers.cards[i].config.center.rarity == 4 then
+					count = count + 1
+				end
+			end
+			if count >= 2 then
+				unlock_card(self)
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local critical = {
 	object_type = "Back",
@@ -373,6 +513,23 @@ local critical = {
 			end
 		end
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if Cryptid.safe_get(G, "jokers") then
+			for i = 1, #G.jokers.cards do
+				if G.jokers.cards[i].ability.cry_rigged then
+					unlock_card(self)
+					break
+				end
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local glowing = {
 	object_type = "Back",
@@ -402,6 +559,20 @@ local glowing = {
 			end
 		end
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.type == "win_deck" then
+			if get_deck_win_stake("b_cry_beige") > 0 then
+				unlock_card(self)
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local beta = {
 	object_type = "Back",
@@ -419,6 +590,20 @@ local beta = {
 	apply = function(self)
 		G.GAME.modifiers.cry_beta = true
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.type == "win_deck" then
+			if get_deck_win_stake() >= 9 then
+				unlock_card(self)
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local bountiful = {
 	object_type = "Back",
@@ -436,6 +621,23 @@ local bountiful = {
 	apply = function(self)
 		G.GAME.modifiers.cry_forced_draw_amount = self.config.cry_forced_draw_amount
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.type == "round_win" then
+			if
+				G.GAME.blind.name == "The Serpent"
+				and G.GAME.current_round.discards_left == G.GAME.round_resets.discards
+			then
+				unlock_card(self)
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local beige = {
 	object_type = "Back",
@@ -452,6 +654,20 @@ local beige = {
 	apply = function(self)
 		G.GAME.modifiers.cry_common_value_quad = true
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.type == "discover_amount" then
+			if args.amount >= 200 then
+				unlock_card(self)
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local blank = {
 	object_type = "Back",
@@ -492,81 +708,29 @@ local antimatter = {
 	pos = { x = 2, y = 0 },
 	calculate = function(self, back, context)
 		if context.context ~= "final_scoring_step" then
-			Cryptid.antimatter_trigger(self, context)
+			Cryptid.antimatter_trigger(self, context, Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness")
 		else
-			return Cryptid.antimatter_trigger_final_scoring(self, context)
+			return Cryptid.antimatter_trigger_final_scoring(
+				self,
+				context,
+				Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness"
+			)
 		end
 	end,
 	apply = function(self)
-		Cryptid.antimatter_apply()
+		Cryptid.antimatter_apply(Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness")
 	end,
 	atlas = "atlasdeck",
 	init = function(self)
-		function Cryptid.antimatter_apply()
-			local bluecheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_blue", "wins", 8)
-			local yellowcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_yellow", "wins", 8)
-			local abandonedcheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_abandoned", "wins", 8)
-			local ghostcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_ghost", "wins", 8)
-			local redcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_red", "wins", 8)
-			local checkeredcheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_checkered", "wins", 8)
-			local erraticcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_erratic", "wins", 8)
-			local blackcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_black", "wins", 8)
-			local paintedcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_painted", "wins", 8)
-			local greencheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_green", "wins", 8)
-			local spookycheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_spooky", "wins", 8)
-			local equilibriumcheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_equilibrium", "wins", 8)
-			local misprintcheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_misprint", "wins", 8)
-			local infinitecheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_infinite", "wins", 8)
-			local wormholecheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_wormhole", "wins", 8)
-			local redeemedcheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_redeemed", "wins", 8)
-			local legendarycheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_legendary", "wins", 8)
-			local encodedcheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_encoded", "wins", 8)
-			local world = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_world_deck", "wins", 8)
-			local sun = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_sun_deck", "wins", 8)
-			local star = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_star_deck", "wins", 8)
-			local moon = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_moon_deck", "wins", 8)
-
-			if Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness" then
-				bluecheck = 1
-				yellowcheck = 1
-				abandonedcheck = 1
-				ghostcheck = 1
-				redcheck = 1
-				checkeredcheck = 1
-				erraticcheck = 1
-				blackcheck = 1
-				paintedcheck = 1
-				greencheck = 1
-				spookycheck = 1
-				equilibriumcheck = 1
-				misprintcheck = 1
-				infinitecheck = 1
-				wormholecheck = 1
-				redeemedcheck = 1
-				legendarycheck = 1
-				encodedcheck = 1
-				world = 1
-				sun = 1
-				star = 1
-				moon = 1
-			end
-
+		function Cryptid.antimatter_apply(skip)
 			--Blue Deck
-			if (bluecheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_blue", "wins", 8) or 0 ~= 0) or skip
+			then
 				G.GAME.starting_params.hands = G.GAME.starting_params.hands + 1
 			end
 			--All Consumables (see Cryptid.get_antimatter_consumables)
-			local querty = Cryptid.get_antimatter_consumables()
+			local querty = Cryptid.get_antimatter_consumables(nil, skip)
 			if #querty > 0 then
 				delay(0.4)
 				G.E_MANAGER:add_event(Event({
@@ -583,23 +747,33 @@ local antimatter = {
 				}))
 			end
 			--Yellow Deck
-			if (yellowcheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_yellow", "wins", 8) or 0) ~= 0
+				or skip
+			then
 				G.GAME.starting_params.dollars = G.GAME.starting_params.dollars + 10
 			end
 			--Abandoned Deck
-			if (abandonedcheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_abandoned", "wins", 8) or 0) ~= 0
+				or skip
+			then
 				G.GAME.starting_params.no_faces = true
 			end
 			--Ghost Deck
-			if (ghostcheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_ghost", "wins", 8) or 0) ~= 0 or skip
+			then
 				G.GAME.spectral_rate = 2
 			end
 			-- Red Deck
-			if (redcheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_red", "wins", 8) or 0) ~= 0 or skip
+			then
 				G.GAME.starting_params.discards = G.GAME.starting_params.discards + 1
 			end
 			-- All Decks with Vouchers (see Cryptid.get_antimatter_vouchers)
-			local vouchers = Cryptid.get_antimatter_vouchers()
+			local vouchers = Cryptid.get_antimatter_vouchers(nil, skip)
 			if #vouchers > 0 then
 				for k, v in pairs(vouchers) do
 					if G.P_CENTERS[v] then
@@ -615,7 +789,10 @@ local antimatter = {
 				end
 			end
 			-- Checkered Deck
-			if (checkeredcheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_checkered", "wins", 8) or 0) ~= 0
+				or skip
+			then
 				G.E_MANAGER:add_event(Event({
 					func = function()
 						for k, v in pairs(G.playing_cards) do
@@ -631,57 +808,89 @@ local antimatter = {
 				}))
 			end
 			-- Erratic Deck
-			if (erraticcheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_erratic", "wins", 8) or 0) ~= 0
+				or skip
+			then
 				G.GAME.starting_params.erratic_suits_and_ranks = true
 			end
 			-- Black Deck
-			if (blackcheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_black", "wins", 8) or 0) ~= 0 or skip
+			then
 				G.GAME.starting_params.joker_slots = G.GAME.starting_params.joker_slots + 1
 			end
 			-- Painted Deck
-			if (paintedcheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_painted", "wins", 8) or 0) ~= 0
+				or skip
+			then
 				G.GAME.starting_params.hand_size = G.GAME.starting_params.hand_size + 2
 			end
 			-- Green Deck
-			if (greencheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_green", "wins", 8) or 0) ~= 0 or skip
+			then
 				G.GAME.modifiers.money_per_hand = (G.GAME.modifiers.money_per_hand or 1) + 1
 				G.GAME.modifiers.money_per_discard = (G.GAME.modifiers.money_per_discard or 0) + 1
 			end
 			-- Spooky Deck
-			if (spookycheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_spooky", "wins", 8) or 0)
+					~= 0
+				or skip
+			then
 				G.GAME.modifiers.cry_spooky = true
 				G.GAME.modifiers.cry_curse_rate = 0
-				--[[
-				G.E_MANAGER:add_event(Event({
-					func = function()
-						if G.jokers then
-							local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_cry_chocolate_dice")
-							card:add_to_deck()
-							card:start_materialize()
-							G.jokers:emplace(card)
-							return true
-						end
-					end,
-				}))
-				]]
-				--
+				if Cryptid.enabled("j_cry_chocolate_dice") == true then
+					G.E_MANAGER:add_event(Event({
+						func = function()
+							if G.jokers then
+								local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_cry_chocolate_dice")
+								card:add_to_deck()
+								card:start_materialize()
+								G.jokers:emplace(card)
+								return true
+							end
+						end,
+					}))
+				end
 			end
 			-- Deck of Equilibrium
-			if (equilibriumcheck or 0) ~= 0 then
+			if
+				(
+						Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_equilibrium", "wins", 8)
+						or 0
+					)
+					~= 0
+				or skip
+			then
 				G.GAME.modifiers.cry_equilibrium = true
 			end
 			-- Misprint Deck
-			if (misprintcheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_misprint", "wins", 8) or 0)
+					~= 0
+				or skip
+			then
 				G.GAME.modifiers.cry_misprint_min = 1
 				G.GAME.modifiers.cry_misprint_max = 10
 			end
 			-- Infinite Deck
-			if (infinitecheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_infinite", "wins", 8) or 0)
+					~= 0
+				or skip
+			then
 				G.GAME.modifiers.cry_highlight_limit = 1e20
 				G.GAME.starting_params.hand_size = G.GAME.starting_params.hand_size + 1
 			end
 			-- Wormhole deck
-			if (wormholecheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_wormhole", "wins", 8) or 0)
+					~= 0
+				or skip
+			then
 				G.GAME.modifiers.cry_negative_rate = 20
 
 				if Cryptid.enabled("set_cry_exotic") == true then
@@ -700,24 +909,26 @@ local antimatter = {
 				end
 			end
 			-- Redeemed deck
-			if (redeemedcheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_redeemed", "wins", 8) or 0)
+					~= 0
+				or skip
+			then
 				G.GAME.modifiers.cry_redeemed = true
 			end
-			-- Deck of the Moon, Deck of the Sun, Deck of the Stars, Deck of the World
-			if (world or 0) ~= 0 then
-				G.GAME.bosses_used["bl_goad"] = 1e308
-			end
-			if (star or 0) ~= 0 then
-				G.GAME.bosses_used["bl_window"] = 1e308
-			end
-			if (sun or 0) ~= 0 then
-				G.GAME.bosses_used["bl_head"] = 1e308
-			end
-			if (moon or 0) ~= 0 then
-				G.GAME.bosses_used["bl_club"] = 1e308
-			end
+			--[[
+			G.GAME.bosses_used["bl_goad"] = 1e308
+			G.GAME.bosses_used["bl_window"] = 1e308
+			G.GAME.bosses_used["bl_head"] = 1e308
+			G.GAME.bosses_used["bl_club"] = 1e308
+			]]
+			--
 			--Legendary Deck
-			if (legendarycheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_legendary", "wins", 8) or 0)
+					~= 0
+				or skip
+			then
 				G.E_MANAGER:add_event(Event({
 					func = function()
 						if G.jokers then
@@ -731,13 +942,18 @@ local antimatter = {
 				}))
 			end
 			--Encoded Deck
-			if (encodedcheck or 0) ~= 0 then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_encoded", "wins", 8) or 0)
+					~= 0
+				or skip
+			then
 				G.E_MANAGER:add_event(Event({
 					func = function()
 						if G.jokers then
 							if
 								G.P_CENTERS["j_cry_CodeJoker"]
 								and (G.GAME.banned_keys and not G.GAME.banned_keys["j_cry_CodeJoker"])
+								and Cryptid.enabled("j_cry_CodeJoker") == true
 							then
 								local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_cry_CodeJoker")
 								card:add_to_deck()
@@ -746,6 +962,7 @@ local antimatter = {
 							end
 							if
 								G.P_CENTERS["j_cry_copypaste"]
+								and Cryptid.enabled("j_cry_copypaste") == true
 								and (G.GAME.banned_keys and not G.GAME.banned_keys["j_cry_copypaste"])
 							then
 								local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_cry_copypaste")
@@ -758,23 +975,28 @@ local antimatter = {
 					end,
 				}))
 			end
+			--Beige Deck
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_beige", "wins", 8) or 0) ~= 0
+				or skip
+			then
+				G.GAME.modifiers.cry_common_value_quad = true
+			end
 		end
 
-		function Cryptid.antimatter_trigger_final_scoring(self, context)
-			local critcheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_critical", "wins", 8)
-			local plasmacheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_plasma", "wins", 8)
-
-			if Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness" then
-				critcheck = 1
-				plasmacheck = 1
-			end
-
+		function Cryptid.antimatter_trigger_final_scoring(self, context, skip)
 			if context.context == "final_scoring_step" then
 				local crit_poll = pseudorandom(pseudoseed("cry_critical"))
 				crit_poll = crit_poll / (G.GAME.probabilities.normal or 1)
 				--Critical Deck
-				if (critcheck or 0) ~= 0 then
+				if
+					(
+							Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_critical", "wins", 8)
+							or 0
+						)
+						~= 0
+					or skip
+				then
 					if crit_poll < self.config.cry_crit_rate then
 						context.mult = context.mult ^ 2
 						update_hand_text({ delay = 0 }, { mult = context.mult, chips = context.chips })
@@ -797,7 +1019,11 @@ local antimatter = {
 				end
 				--Plasma Deck
 				local tot = context.chips + context.mult
-				if (plasmacheck or 0) ~= 0 then
+				if
+					(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_plasma", "wins", 8) or 0)
+						~= 0
+					or skip
+				then
 					context.chips = math.floor(tot / 2)
 					context.mult = math.floor(tot / 2)
 					update_hand_text({ delay = 0 }, { mult = context.mult, chips = context.chips })
@@ -852,24 +1078,17 @@ local antimatter = {
 				return context.chips, context.mult
 			end
 		end
-
-		function Cryptid.antimatter_trigger(self, context)
-			local glowingcheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_glowing", "wins", 8)
-			local legendarycheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_legendary", "wins", 8)
-			local anaglyphcheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_anaglyph", "wins", 8)
-
-			if Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness" then
-				glowingcheck = 1
-				legendarycheck = 1
-				anaglyphcheck = 1
-			end
-
+		function Cryptid.antimatter_trigger(self, context, skip)
 			if context.context == "eval" and Cryptid.safe_get(G.GAME, "last_blind", "boss") then
 				--Glowing Deck
-				if (glowingcheck or 0) ~= 0 then
+				if
+					(
+							Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_glowing", "wins", 8)
+							or 0
+						)
+						~= 0
+					or skip
+				then
 					for i = 1, #G.jokers.cards do
 						Cryptid.with_deck_effects(G.jokers.cards[i], function(card)
 							Cryptid.misprintize(card, { min = 1.25, max = 1.25 }, nil, true)
@@ -877,16 +1096,40 @@ local antimatter = {
 					end
 				end
 				--Legendary Deck
-				if G.jokers and (legendarycheck or 0) ~= 0 then
-					if #G.jokers.cards < G.jokers.config.card_limit then
-						local legendary_poll = pseudorandom(pseudoseed("cry_legendary"))
-						legendary_poll = legendary_poll / (G.GAME.probabilities.normal or 1)
-						if legendary_poll < self.config.cry_legendary_rate then
-							local card = create_card("Joker", G.jokers, true, 4, nil, nil, nil, "")
-							card:add_to_deck()
-							card:start_materialize()
-							G.jokers:emplace(card)
-							return true
+				if G.jokers then
+					if
+						(
+								Cryptid.safe_get(
+									G.PROFILES,
+									G.SETTINGS.profile,
+									"deck_usage",
+									"b_cry_legendary",
+									"wins",
+									8
+								) or 0
+							)
+							~= 0
+						or skip
+					then
+						if #G.jokers.cards < G.jokers.config.card_limit then
+							local legendary_poll = pseudorandom(pseudoseed("cry_legendary"))
+							legendary_poll = legendary_poll / (G.GAME.probabilities.normal or 1)
+							if legendary_poll < self.config.cry_legendary_rate then
+								local card = create_card("Joker", G.jokers, true, 4, nil, nil, nil, "")
+								card:add_to_deck()
+								card:start_materialize()
+								G.jokers:emplace(card)
+								return true
+							else
+								card_eval_status_text(
+									G.jokers,
+									"jokers",
+									nil,
+									nil,
+									nil,
+									{ message = localize("k_nope_ex"), colour = G.C.RARITY[4] }
+								)
+							end
 						else
 							card_eval_status_text(
 								G.jokers,
@@ -894,22 +1137,17 @@ local antimatter = {
 								nil,
 								nil,
 								nil,
-								{ message = localize("k_nope_ex"), colour = G.C.RARITY[4] }
+								{ message = localize("k_no_room_ex"), colour = G.C.RARITY[4] }
 							)
 						end
-					else
-						card_eval_status_text(
-							G.jokers,
-							"jokers",
-							nil,
-							nil,
-							nil,
-							{ message = localize("k_no_room_ex"), colour = G.C.RARITY[4] }
-						)
 					end
 				end
 				--Anaglyph Deck
-				if (anaglyphcheck or 0) ~= 0 then
+				if
+					(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_anaglyph", "wins", 8) or 0)
+						~= 0
+					or skip
+				then
 					G.E_MANAGER:add_event(Event({
 						func = function()
 							add_tag(Tag("tag_double"))
@@ -921,19 +1159,15 @@ local antimatter = {
 				end
 			end
 		end
-
-		function Cryptid.get_antimatter_vouchers(voucher_table)
+		function Cryptid.get_antimatter_vouchers(voucher_table, skip)
 			-- Create a table or use one that is passed into the function
 			if not voucher_table or type(voucher_table) ~= "table" then
 				voucher_table = {}
 			end
-			local skip = (Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness")
-
 			-- Add Vouchers into the table by key
 			local function already_exists(t, voucher)
 				for _, v in ipairs(t) do
 					if v == voucher then
-						--print("sus")
 						return true
 					end
 				end
@@ -944,58 +1178,73 @@ local antimatter = {
 					table.insert(t, voucher)
 				end
 			end
-
-			local nebulacheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_nebula", "wins", 8)
-			local magiccheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_magic", "wins", 8)
-			local zodiaccheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_zodiac", "wins", 8)
-			local equilibriumcheck =
-				Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_equilibrium", "wins", 8)
-
 			--Nebula Deck
-			if (nebulacheck or 0) ~= 0 or skip then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_nebula", "wins", 8) or 0 ~= 0)
+				or skip
+			then
 				Add_voucher_to_the_table(voucher_table, "v_telescope")
 			end
 			-- Magic Deck
-			if (magiccheck or 0) ~= 0 or skip then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_magic", "wins", 8) or 0 ~= 0) or skip
+			then
 				Add_voucher_to_the_table(voucher_table, "v_crystal_ball")
 			end
-
 			-- Zodiac Deck
-			if (zodiaccheck or 0) ~= 0 or skip then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_zodiac", "wins", 8) or 0 ~= 0)
+				or skip
+			then
 				Add_voucher_to_the_table(voucher_table, "v_tarot_merchant")
 				Add_voucher_to_the_table(voucher_table, "v_planet_merchant")
 				Add_voucher_to_the_table(voucher_table, "v_overstock_norm")
 			end
 			-- Deck Of Equilibrium
-			if (equilibriumcheck or 0) ~= 0 or skip then
+			if
+				(
+					Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_equilibrium", "wins", 8)
+					or 0 ~= 0
+				) or skip
+			then
 				Add_voucher_to_the_table(voucher_table, "v_overstock_norm")
 				Add_voucher_to_the_table(voucher_table, "v_overstock_plus")
 			end
 			return voucher_table
 		end
 		--Does this even need to be a function idk
-		function Cryptid.get_antimatter_consumables(consumable_table)
-			local skip = (Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness")
+		function Cryptid.get_antimatter_consumables(consumable_table, skip)
 			if not consumable_table or type(consumable_table) ~= "table" then
 				consumable_table = {}
 			end
-
-			-- Add Consumables into the table by key
-
-			local magiccheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_magic", "wins", 8)
-			local ghostcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_ghost", "wins", 8)
-
-			if (magiccheck or 0) ~= 0 or skip then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_magic", "wins", 8) or 0 ~= 0) or skip
+			then
 				table.insert(consumable_table, "c_fool")
 				table.insert(consumable_table, "c_fool")
 			end
-			if (ghostcheck or 0) ~= 0 or skip then
+			if
+				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_ghost", "wins", 8) or 0 ~= 0) or skip
+			then
 				table.insert(consumable_table, "c_hex")
 			end
-
 			return consumable_table
 		end
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.type == "win_deck" then
+			if get_deck_win_stake("b_cry_blank") > 0 and get_deck_win_stake() >= 8 then
+				unlock_card(self)
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 
 return {

Cryptid/items/enhanced.lua

@@ -119,6 +119,20 @@ local e_deck = {
 			end,
 		}))
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.type == "discover_amount" then
+			if G.DISCOVER_TALLIES.editions.tally / G.DISCOVER_TALLIES.editions.of >= 1 then
+				unlock_card(self)
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local et_deck = {
 	object_type = "Back",
@@ -150,6 +164,18 @@ local et_deck = {
 		}))
 	end,
 	draw = cry_edeck_draw,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.cry_used_consumable == "c_cry_vacuum" then
+			unlock_card(self)
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local sk_deck = {
 	object_type = "Back",
@@ -189,6 +215,18 @@ local sk_deck = {
 			end,
 		}))
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.cry_used_consumable == "c_cry_lock" then
+			unlock_card(self)
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local st_deck = {
 	object_type = "Back",
@@ -228,6 +266,18 @@ local st_deck = {
 			end,
 		}))
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.cry_used_consumable == "c_cry_replica" then
+			unlock_card(self)
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local sl_deck = {
 	object_type = "Back",
@@ -258,6 +308,18 @@ local sl_deck = {
 			end,
 		}))
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if args.cry_used_consumable == "c_cry_typhoon" then
+			unlock_card(self)
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 
 return {
@@ -272,43 +334,9 @@ return {
 			-- D Invisible Joker
 
 			if
-				center.name == "Fortune Teller"
-				or center.name == "Shoot the Moon"
-				or center.name == "Riff-raff"
-				or center.name == "Chaos the Clown"
-				or center.name == "Dusk"
-				or center.name == "Mime"
-				or center.name == "Hack"
-				or center.name == "Sock and Buskin"
-				or center.name == "Invisible Joker"
-				or center.name == "Swashbuckler"
-				or center.name == "Smeared Joker"
-				or center.name == "Certificate"
-				or center.name == "Mr. Bones"
-				or center.name == "Diet Cola"
-				or center.name == "Luchador"
-				or center.name == "Midas Mask"
-				or center.name == "Shortcut"
-				or center.name == "Seance"
-				or center.name == "Superposition"
-				or center.name == "Sixth Sense"
-				or center.name == "DNA"
-				or center.name == "Splash"
-				or center.name == "Supernova"
-				or center.name == "Pareidolia"
-				or center.name == "Raised Fist"
-				or center.name == "Marble Joker"
-				or center.name == "Four Fingers"
-				or center.name == "Joker Stencil"
-				or center.name == "Showman"
-				or center.name == "Blueprint"
-				or center.name == "Oops! All 6s"
-				or center.name == "Brainstorm"
-				or center.name == "Cartomancer"
-				or center.name == "Astronomer"
-				or center.name == "Burnt Joker"
-				or center.name == "Chicot"
-				or center.name == "Perkeo"
+				center
+				and center.name
+					== ("Fortune Teller" or "Shoot the Moon" or "Riff-raff" or "Chaos the Clown" or "Dusk" or "Mime" or "Hack" or "Sock and Buskin" or "Invisible Joker" or "Swashbuckler" or "Smeared Joker" or "Certificate" or "Mr. Bones" or "Diet Cola" or "Luchador" or "Midas Mask" or "Shortcut" or "Seance" or "Superposition" or "Sixth Sense" or "DNA" or "Splash" or "Supernova" or "Pareidolia" or "Raised Fist" or "Marble Joker" or "Four Fingers" or "Joker Stencil" or "Showman" or "Blueprint" or "Oops! All 6s" or "Brainstorm" or "Cartomancer" or "Astronomer" or "Burnt Joker" or "Chicot" or "Perkeo")
 			then
 				self.config.center.immutable = true
 			end

Cryptid/items/epic.lua

@@ -398,11 +398,6 @@ local error_joker = {
 			"set_cry_epic",
 		},
 	},
-	conflicts = {
-		mods = {
-			"jen",
-		},
-	},
 	immutable = true,
 	rarity = "cry_epic",
 	cost = 1,
@@ -599,6 +594,7 @@ local error_joker = {
 			{ string = "Jolly", colour = G.C.CRY_JOLLY },
 			{ string = "Tags", colour = G.C.RED },
 			{ string = "Cryptids", colour = G.C.SECONDARY_SET.Spectral },
+			{ string = "Glop", colour = G.C.CRY_ALTGREENGRADIENT },
 			{ string = "%%ERROR", colour = G.C.CRY_ASCENDANT }, --temp string, this will be modified
 		}
 
@@ -939,7 +935,6 @@ local double_scale = {
 	atlas = "atlasepic",
 	--todo: support jokers that scale multiple variables
 	cry_scale_mod = function(self, card, joker, orig_scale_scale, true_base, orig_scale_base, new_scale_base)
-		print(orig_scale_scale, true_base, orig_scale_base, new_scale_base)
 		if Cryptid.gameset(self) == "exp_modest" then
 			return true_base * 2
 		end
@@ -1228,11 +1223,6 @@ local curse_sob = {
 	gameset_config = {
 		modest = { cost = 20, center = { rarity = 4 } },
 	},
-	conflicts = {
-		mods = {
-			"jen",
-		},
-	},
 	rarity = "cry_epic",
 	cost = 9,
 	order = 82,
@@ -1355,7 +1345,7 @@ local bonusjoker = {
 	atlas = "atlasepic",
 	calculate = function(self, card, context)
 		if context.individual and context.cardarea == G.play then
-			if context.other_card.ability.effect == "Bonus Card" then
+			if SMODS.has_enhancement(context.other_card, "m_bonus") then
 				if
 					pseudorandom("bonusjoker")
 						< cry_prob(card.ability.cry_prob, card.ability.extra.odds, card.ability.cry_rigged) / card.ability.extra.odds
@@ -1442,7 +1432,7 @@ local multjoker = {
 	calculate = function(self, card, context)
 		if context.individual and context.cardarea == G.play then
 			if
-				context.other_card.ability.effect == "Mult Card"
+				SMODS.has_enhancement(context.other_card, "m_mult")
 				and #G.consumeables.cards + G.GAME.consumeable_buffer < G.consumeables.config.card_limit
 			then
 				if
@@ -1512,7 +1502,7 @@ local goldjoker = {
 	end,
 	calculate = function(self, card, context)
 		if context.cardarea == G.play and context.individual and not context.blueprint then
-			if context.other_card.ability.effect == "Gold Card" then
+			if SMODS.has_enhancement(context.other_card, "m_gold") then
 				card.ability.extra.percent = card.ability.extra.percent + card.ability.extra.percent_mod
 				return {
 					extra = { focus = card, message = localize("k_upgrade_ex") },
@@ -1522,7 +1512,7 @@ local goldjoker = {
 			end
 		end
 		if context.individual and context.cardarea == G.play then
-			if context.other_card.ability.effect == "Gold Card" then
+			if SMODS.has_enhancement(context.other_card, "m_gold") then
 				card.ability.extra.percent = card.ability.extra.percent + card.ability.extra.percent_mod
 				return {
 					message = localize("k_upgrade_ex"),
@@ -1871,7 +1861,12 @@ local spectrogram = {
 			end
 		end
 
-		if context.retrigger_joker_check and not context.retrigger_joker and context.other_card ~= self then
+		if
+			context.retrigger_joker_check
+			and not context.retrigger_joker
+			and context.other_card == G.jokers.cards[#G.jokers.cards]
+			and context.other_card ~= self
+		then
 			if card.ability.extra.echonum and card.ability.extra.echonum > 0 then
 				return {
 					message = localize("k_again_ex"),
@@ -1936,6 +1931,164 @@ local jtron = {
 		code = { "candycanearter" },
 	},
 }
+-- Retriggers steels every 2nd hand, scaling xmult every 3rd hand, first card to steel every 5th hand, stronger steels every 7th hand
+local clockwork = { -- Steel Support: The Joker
+	object_type = "Joker",
+	dependencies = {
+		items = {
+			"set_cry_epic",
+		},
+	},
+	name = "cry-clockwork",
+	key = "clockwork",
+	pos = { x = 5, y = 5 },
+	config = {
+		limits = { l1 = 2, l2 = 3, l3 = 5, l4 = 7 },
+		counters = { c1 = 0, c2 = 0, c3 = 0, c4 = 0 },
+		extra = { xmult = 1, xmult_mod = 0.25, steelenhc = 1, steel_mod = 0.1 },
+	},
+	order = 135,
+	immutable = false,
+	rarity = "cry_epic",
+	cost = 12,
+	blueprint_compat = true,
+	atlas = "atlasone",
+	enhancement_gate = "m_steel", -- lucky joker uses this? hopefully it works
+	loc_vars = function(self, info_queue, center)
+		local function process_var(m, cap)
+			if m >= cap - 1 then
+				return localize("k_active_ex")
+			end
+			return cap - m - 1
+		end
+		return {
+			vars = {
+				process_var(center.ability.counters.c1, center.ability.limits.l1),
+				process_var(center.ability.counters.c2, center.ability.limits.l2),
+				process_var(center.ability.counters.c3, center.ability.limits.l3),
+				process_var(center.ability.counters.c4, center.ability.limits.l4),
+				center.ability.extra.xmult,
+				center.ability.extra.xmult_mod,
+				center.ability.extra.steelenhc,
+				center.ability.extra.steel_mod,
+				center.ability.limits.l1,
+				center.ability.limits.l2,
+				center.ability.limits.l3,
+				center.ability.limits.l4,
+			},
+		}
+	end,
+	calculate = function(self, card, context)
+		if context.before and context.cardarea == G.jokers and not context.blueprint and not context.retrigger then
+			local function clamp(c, l)
+				local m = c + 1
+				if c + 1 >= l then
+					return 0
+				end
+				return m
+			end
+
+			card.ability.counters.c1 = clamp(card.ability.counters.c1, card.ability.limits.l1) -- ticker 1
+
+			card.ability.counters.c2 = clamp(card.ability.counters.c2, card.ability.limits.l2) -- ticker 2
+			if card.ability.counters.c2 == 0 then
+				card.ability.extra.xmult = card.ability.extra.xmult + card.ability.extra.xmult_mod
+			end
+
+			card.ability.counters.c3 = clamp(card.ability.counters.c3, card.ability.limits.l3) -- ticker 3
+
+			card.ability.counters.c4 = clamp(card.ability.counters.c4, card.ability.limits.l4) -- ticker 4
+			if card.ability.counters.c4 == 0 then
+				card.ability.extra.steelenhc = card.ability.extra.steelenhc + card.ability.extra.steel_mod
+			end
+		end
+		if context.repetition and context.cardarea == G.hand and card.ability.counters.c1 == 0 then -- effect 1
+			if SMODS.has_enhancement(context.other_card, "m_steel") then
+				return {
+					message = localize("k_again_ex"),
+					repetitions = 1,
+					card = card,
+				}
+			end
+		end
+		if
+			context.joker_main and context.cardarea == G.jokers -- effect 2
+		then
+			return { xmult = card.ability.extra.xmult }
+		end
+		if
+			context.before
+			and context.cardarea == G.jokers
+			and not context.blueprint_card
+			and not context.retrigger_joker
+			and card.ability.counters.c3 == 0
+		then -- effect 3
+			context.full_hand[1]:set_ability(G.P_CENTERS["m_steel"], nil, true)
+		end
+		if
+			context.individual
+			and context.cardarea == G.hand
+			and not context.end_of_round
+			and SMODS.has_enhancement(context.other_card, "m_steel")
+			and card.ability.extra.steelenhc ~= 1
+		then
+			if context.other_card.debuff then
+				return {
+					message = localize("k_debuffed"),
+					colour = G.C.RED,
+					card = card,
+				}
+			else -- effect 4
+				return { xmult = card.ability.extra.steelenhc }
+			end
+		end
+		--imo this secret effect can be madness only -Math
+		if
+			context.after
+			and context.cardarea == G.jokers
+			and not context.blueprint_card
+			and not context.retrigger_joker
+		then -- The Clockwork Joker is canonically a non-binary self-replicating machine amoeba, that self replicates every 21 minutes. Their pronouns are any/all; they are several billion tiny jokers
+			if -- in a trench coat, constantly ticking in an almost perfect yet flawed mechanism. Its only purpose is the strengthening and spreading of the steel world; everything else is meaningless to it.
+				card.ability.counters.c1 == 0 -- lore by nova :3
+				and card.ability.counters.c2 == 0
+				and card.ability.counters.c3 == 0
+				and card.ability.counters.c4 == 0
+			then
+				G.E_MANAGER:add_event(Event({
+					func = function()
+						local m = copy_card(card)
+						m:add_to_deck()
+						G.jokers:emplace(m)
+						return true
+					end,
+				}))
+				return {
+					message = localize("k_duplicated_ex"),
+					card = card,
+				}
+			end
+		end
+	end,
+	set_ability = function(self, card, initial, delay_sprites)
+		card.ability.counters.c1 = math.floor(pseudorandom("Clockwork1") * (card.ability.limits.l1 - 1) + 0.5)
+		card.ability.counters.c2 = math.floor(pseudorandom("Clockwork2") * (card.ability.limits.l2 - 1) + 0.5)
+		card.ability.counters.c3 = math.floor(pseudorandom("Clockwork3") * (card.ability.limits.l3 - 1) + 0.5)
+		card.ability.counters.c4 = math.floor(pseudorandom("Clockwork4") * (card.ability.limits.l4 - 1) + 0.5)
+	end,
+	cry_credits = {
+		idea = {
+			"cassknows",
+		},
+		code = {
+			"Nova",
+			"Math",
+		},
+		art = {
+			"unexian",
+		},
+	},
+}
 return {
 	name = "Epic Jokers",
 	items = {
@@ -1963,5 +2116,6 @@ return {
 		fleshpanopticon,
 		spectrogram,
 		jtron,
+		clockwork,
 	},
 }

Cryptid/items/exotic.lua

@@ -784,7 +784,7 @@ local stella_mortis = {
 							type = "variable",
 							key = "a_powmult",
 							vars = {
-								number_format(to_big(card.ability.extra.Emult + card.ability.extra.Emult_mod * quota)),
+								number_format(to_big(card.ability.extra.Emult)),
 							},
 						}),
 					})
@@ -831,6 +831,7 @@ local circulus_pistoris = {
 	cost = 10 * math.pi,
 	order = 509,
 	blueprint_compat = true,
+	immutable = true,
 	atlas = "atlasexotic",
 	soul_pos = { x = 2, y = 3, extra = { x = 1, y = 3 } },
 	loc_vars = function(self, info_queue, center)
@@ -916,78 +917,6 @@ local aequilibrium = {
 			return nil, true
 		end
 	end,
-	--[[
-	add_to_deck = function(self, card, from_debuff)
-		if not from_debuff then
-			if card.ability.extra.card then
-				card.ability.extra.card = nil
-			end
-			card.ability.extra.card =
-				Card(G.jokers.T.x, G.jokers.T.y, G.CARD_W * 0.675, G.CARD_H * 0.675, G.P_CARDS.S_A, G.P_CENTERS.c_base)
-			--G.hand:emplace(card.ability.extra.card)
-			--card.ability.extra.card:set_card_area(G.hand)
-			card.ability.extra.card:start_materialize({ G.C.WHITE, G.C.WHITE }, nil, 1.2)
-			card.ability.extra.card:set_seal("Gold", true, true)
-			card.ability.extra.card:set_edition({ cry_glitched = true }, true)
-			--card.ability.extra.card.T.x = card.T.x
-
-			if card.ability.extra.card and G.P_CENTERS.j_blueprint.unlocked then
-				local viable_unlockables = {}
-				for k, v in ipairs(G.P_LOCKED) do
-					if (v.set == "Voucher" or v.set == "Joker") and not v.demo then
-						viable_unlockables[#viable_unlockables + 1] = v
-					end
-				end
-				if #viable_unlockables > 0 then
-					local card2 = card.ability.extra.card
-					G.E_MANAGER:add_event(Event({
-						trigger = "after",
-						delay = 4.04,
-						func = function()
-							card2 = Card(
-								G.jokers.T.x,
-								G.jokers.T.y,
-								G.CARD_W * 0.675,
-								G.CARD_H * 0.675,
-								nil,
-								pseudorandom_element(viable_unlockables) or self.P_CENTERS.j_joker
-							)
-							card2.no_ui = #viable_unlockables == 0
-							card2.states.visible = false
-							card.ability.extra.card.parent = nil
-							card.ability.extra.card:start_dissolve({ G.C.BLACK, G.C.ORANGE, G.C.RED, G.C.GOLD })
-							return true
-						end,
-					}))
-					G.E_MANAGER:add_event(Event({
-						trigger = "after",
-						delay = 1.04,
-						func = function()
-							card2:start_materialize()
-							--G.:emplace(card)
-							return true
-						end,
-					}))
-				end
-			end
-		end
-	end,
-	--Known bug: card does not reappear after save reopened
-	update = function(self, card, front)
-		if card.ability.extra.card then
-			if card.ability.extra.card.states and not card.ability.extra.card.states.drag.is then
-				card.ability.extra.card.T.x = card.T.x + card.T.w / 5
-				card.ability.extra.card.T.y = card.T.y + card.T.h / 5
-			end
-		end
-	end,
-	remove_from_deck = function(self, card, from_debuff)
-		if not from_debuff and card.ability.extra.card then
-			card.ability.extra.card:start_dissolve()
-		end
-	end,
-	]]
-	--
 	cry_credits = {
 		idea = { "Elial2" },
 		art = { "Elial2", "unexian", "hydro" },
@@ -1509,34 +1438,6 @@ local items = {
 }
 return {
 	name = "Exotic Jokers",
-	init = function()
-		--I have no clue what this patch does
-		local cc = copy_card
-		function copy_card(card, a, b, c, d)
-			local m
-			if
-				card
-				and card.ability
-				and card.ability.extra
-				and type(card.ability.extra) == "table"
-				and card.ability.extra.card
-			then
-				m = card.ability.extra.card
-				card.ability.extra.card = nil
-			end
-			local ret = cc(card, a, b, c, d)
-			if
-				card
-				and card.ability
-				and card.ability.extra
-				and type(card.ability.extra) == "table"
-				and card.ability.extra.card
-				and m
-			then
-				card.ability.extra.card = m
-			end
-			return ret
-		end
-	end,
+	init = function() end,
 	items = items,
 }

Cryptid/items/joker_display.lua

@@ -223,13 +223,34 @@ if JokerDisplay then
 	JokerDisplay.Definitions["j_cry_kidnap"] = {
 		text = {
 			{ text = "+$" },
-			{ ref_table = "card.ability.extra", ref_value = "money" },
+			{ ref_table = "card.joker_display_values", ref_value = "extra" },
 		},
 		text_config = { colour = G.C.GOLD },
 		reminder_text = {
 			{ ref_table = "card.joker_display_values", ref_value = "localized_text" },
 		},
 		calc_function = function(card)
+			local abc = 0
+			if G.GAME and G.GAME.jokers_sold then
+				for _, v in ipairs(G.GAME.jokers_sold) do
+					if
+						G.P_CENTERS[v].effect == "Type Mult"
+						or G.P_CENTERS[v].effect == "Cry Type Mult"
+						or G.P_CENTERS[v].effect == "Cry Type Chips"
+						or G.P_CENTERS[v].effect == "Boost Kidnapping"
+						or (
+							G.P_CENTERS[v].name == "Sly Joker"
+							or G.P_CENTERS[v].name == "Wily Joker"
+							or G.P_CENTERS[v].name == "Clever Joker"
+							or G.P_CENTERS[v].name == "Devious Joker"
+							or G.P_CENTERS[v].name == "Crafty Joker"
+						)
+					then
+						abc = abc + 1
+					end
+				end
+			end
+			card.joker_display_values.extra = card.ability.extra * abc
 			card.joker_display_values.localized_text = "(" .. localize("k_round") .. ")"
 		end,
 	}

Cryptid/items/m.lua

@@ -1061,7 +1061,7 @@ local smallestm = {
 			--This isn't retrigger joker compatible for some reason
 			if context.scoring_name == card.ability.extra.type then
 				local tag = Tag("tag_cry_double_m")
-				tag.ability.shiny = cry_rollshinybool()
+				tag.ability.shiny = Cryptid.is_shiny()
 				add_tag(tag)
 				play_sound("generic1", 0.9 + math.random() * 0.1, 0.8)
 				play_sound("holo1", 1.2 + math.random() * 0.1, 0.4)
@@ -1443,7 +1443,7 @@ local longboi = {
 			}
 		end
 	end,
-	set_ability = function(self, card, from_debuff)
+	set_ability = function(self, card, initial, delay_sprites)
 		card.ability.extra.monster = G.GAME and G.GAME.monstermult or 1
 		if card.ability.extra.monster >= 1234567654321 then
 			card.children.center:set_sprite_pos({ x = 7, y = 5 })
@@ -1482,6 +1482,7 @@ local ret_items = {
 	smallestm,
 	biggestm,
 	mprime,
+	scrabble,
 }
 --retriggering system for M Vouchers
 function Cryptid.get_m_retriggers(self, card, context)

Cryptid/items/misc.lua

@@ -41,7 +41,7 @@ local meme1 = {
 			and not (G.GAME.used_jokers["j_cry_waluigi"] and not next(find_joker("Showman")))
 		then
 			if pseudorandom("meme1_" .. G.GAME.round_resets.ante) > 0.997 then
-				return create_card(nil, G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
+				return create_card("Meme", G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
 			end
 		end
 		return create_card("Meme", G.pack_cards, nil, nil, true, true, nil, "cry_meme")
@@ -98,7 +98,7 @@ local meme2 = {
 			and not (G.GAME.used_jokers["j_cry_waluigi"] and not next(find_joker("Showman")))
 		then
 			if pseudorandom("memetwo_" .. G.GAME.round_resets.ante) > 0.997 then
-				return create_card(nil, G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
+				return create_card("Meme", G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
 			end
 		end
 		return create_card("Meme", G.pack_cards, nil, nil, true, true, nil, "cry_memetwo")
@@ -155,7 +155,7 @@ local meme3 = {
 			and not (G.GAME.used_jokers["j_cry_waluigi"] and not next(find_joker("Showman")))
 		then
 			if pseudorandom("memethree_" .. G.GAME.round_resets.ante) > 0.997 then
-				return create_card(nil, G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
+				return create_card("Meme", G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
 			end
 		end
 		return create_card("Meme", G.pack_cards, nil, nil, true, true, nil, "cry_memethree")
@@ -340,7 +340,7 @@ local oversat = {
 					end,
 				}))
 				update_hand_text({ delay = 1.3 }, { mult = G.GAME.hands[hand].mult, StatusText = true })
-			elseif hand == G.handlist[#G.handlist] then
+			elseif Aurinko.VerboseMode then
 				G.E_MANAGER:add_event(Event({
 					trigger = "after",
 					delay = 0.2,
@@ -350,7 +350,10 @@ local oversat = {
 						return true
 					end,
 				}))
-				update_hand_text({ delay = 1.3 }, { chips = (amount > 0 and "++" or "--"), StatusText = true })
+				update_hand_text(
+					{ delay = 1.3 },
+					{ chips = (to_big(amount) > to_big(0) and "++" or "--"), StatusText = true }
+				)
 				G.E_MANAGER:add_event(Event({
 					trigger = "after",
 					delay = 0.2,
@@ -360,7 +363,10 @@ local oversat = {
 						return true
 					end,
 				}))
-				update_hand_text({ delay = 1.3 }, { mult = (amount > 0 and "++" or "--"), StatusText = true })
+				update_hand_text(
+					{ delay = 1.3 },
+					{ mult = (to_big(amount) > to_big(0) and "++" or "--"), StatusText = true }
+				)
 			end
 		end
 	end,
@@ -570,7 +576,7 @@ local glitched = {
 					StatusText = true,
 				})
 				update_hand_text({ delay = 1.3 }, { mult = G.GAME.hands[hand].mult })
-			elseif hand == G.handlist[#G.handlist] then
+			elseif Aurinko.VerboseMode then
 				G.E_MANAGER:add_event(Event({
 					trigger = "after",
 					delay = 0.2,
@@ -938,6 +944,90 @@ local noisy = {
 		desc_nodes[#desc_nodes + 1] = chip_ui
 	end,
 	init = function(self)
+		local randtext = {
+			"A",
+			"B",
+			"C",
+			"D",
+			"E",
+			"F",
+			"G",
+			"H",
+			"I",
+			"J",
+			"K",
+			"L",
+			"M",
+			"N",
+			"O",
+			"P",
+			"Q",
+			"R",
+			"S",
+			"T",
+			"U",
+			"V",
+			"W",
+			"X",
+			"Y",
+			"Z",
+			" ",
+			"a",
+			"b",
+			"c",
+			"d",
+			"e",
+			"f",
+			"g",
+			"h",
+			"i",
+			"j",
+			"k",
+			"l",
+			"m",
+			"n",
+			"o",
+			"p",
+			"q",
+			"r",
+			"s",
+			"t",
+			"u",
+			"v",
+			"w",
+			"x",
+			"y",
+			"z",
+			"0",
+			"1",
+			"2",
+			"3",
+			"4",
+			"5",
+			"6",
+			"7",
+			"8",
+			"9",
+			"+",
+			"-",
+			"?",
+			"!",
+			"$",
+			"%",
+			"[",
+			"]",
+			"(",
+			")",
+		}
+
+		local function obfuscatedtext(length)
+			local str = ""
+			for i = 1, length do
+				str = str .. randtext[math.random(#randtext)]
+			end
+			return str
+		end
+
 		AurinkoAddons.cry_noisy = function(card, hand, instant, amount)
 			local modc = pseudorandom("cry_noisy_chips_aurinko", noisy_stats.min.chips, noisy_stats.max.chips)
 			local modm = pseudorandom("cry_noisy_mult_aurinko", noisy_stats.min.mult, noisy_stats.max.mult)
@@ -959,10 +1049,10 @@ local noisy = {
 						return true
 					end,
 				}))
-				update_hand_text(
-					{ delay = 0 },
-					{ chips = (amount > to_big(0) and "+" or "-") .. number_format(math.abs(modc)), StatusText = true }
-				)
+				update_hand_text({ delay = 0 }, {
+					chips = (to_big(amount) > to_big(0) and "+" or "-") .. number_format(math.abs(modc)),
+					StatusText = true,
+				})
 				update_hand_text({ delay = 1.3 }, { chips = G.GAME.hands[hand].chips })
 				for i = 1, math.random(2, 4) do
 					update_hand_text(
@@ -979,10 +1069,10 @@ local noisy = {
 						return true
 					end,
 				}))
-				update_hand_text(
-					{ delay = 0 },
-					{ mult = (amount > to_big(0) and "+" or "-") .. number_format(math.abs(modm)), StatusText = true }
-				)
+				update_hand_text({ delay = 0 }, {
+					mult = (to_big(amount) > to_big(0) and "+" or "-") .. number_format(math.abs(modm)),
+					StatusText = true,
+				})
 				update_hand_text({ delay = 1.3 }, { mult = G.GAME.hands[hand].mult })
 			elseif hand == G.handlist[#G.handlist] then
 				G.E_MANAGER:add_event(Event({
@@ -994,7 +1084,10 @@ local noisy = {
 						return true
 					end,
 				}))
-				update_hand_text({ delay = 1.3 }, { chips = (amount > 0 and "+" or "-") .. "???", StatusText = true })
+				update_hand_text(
+					{ delay = 1.3 },
+					{ chips = (to_big(amount) > to_big(0) and "+" or "-") .. "???", StatusText = true }
+				)
 				G.E_MANAGER:add_event(Event({
 					trigger = "after",
 					delay = 0.2,
@@ -1004,7 +1097,10 @@ local noisy = {
 						return true
 					end,
 				}))
-				update_hand_text({ delay = 1.3 }, { mult = (amount > 0 and "+" or "-") .. "???", StatusText = true })
+				update_hand_text(
+					{ delay = 1.3 },
+					{ mult = (to_big(amount) > to_big(0) and "+" or "-") .. "???", StatusText = true }
+				)
 			end
 		end
 	end,
@@ -1094,18 +1190,12 @@ local jollyedition = {
 				gcui(_c, full_UI_table, specific_vars, card_type, badges, hide_desc, main_start, main_end, card)
 			if
 				card
-				and card.edition
-				and card.edition.cry_m
-				and (not card.ability or card.ability.set ~= "Edition")
-				and full_UI_table
-				and full_UI_table.name
-				and type(full_UI_table.name) == "table"
-				and full_UI_table.name[1]
-				and full_UI_table.name[1].config
-				and full_UI_table.name[1].config.object
-				and full_UI_table.name[1].config.object.config
+				and Cryptid.safe_get(card, "edition", "cry_m")
+				and ((not card.ability) or card.ability.set ~= "Edition")
+				and type(Cryptid.safe_get(full_UI_table, "name")) == "table"
+				and Cryptid.safe_get(full_UI_table.name, 1, "nodes", 1, "config", "object", "config")
 			then
-				local conf = full_UI_table.name[1].config.object.config
+				local conf = full_UI_table.name[1].nodes[1].config.object.config
 				if conf.string and #conf.string > 0 then
 					local function m_ify_word(text)
 						-- Define a pattern for vowels
@@ -1140,8 +1230,8 @@ local jollyedition = {
 						return result
 					end
 					conf.string[1] = m_ify(conf.string[1])
-					full_UI_table.name[1].config.object:remove()
-					full_UI_table.name[1].config.object = DynaText(conf)
+					full_UI_table.name[1].nodes[1].config.object:remove()
+					full_UI_table.name[1].nodes[1].config.object = DynaText(conf)
 				end
 			end
 			return full_UI_table
@@ -1216,7 +1306,7 @@ local glass_edition = {
 		then
 			if
 				not card.ability.eternal
-				and (
+				and not (
 					pseudorandom(pseudoseed("cry_fragile"))
 					> ((self.config.shatter_chance - 1) / self.config.shatter_chance)
 				)
@@ -1440,147 +1530,6 @@ local double_sided = {
 				end,
 			}))
 		end
-		local use_and_sell_buttonsref = G.UIDEF.use_and_sell_buttons
-		function G.UIDEF.use_and_sell_buttons(card)
-			local retval = use_and_sell_buttonsref(card)
-			if
-				card.area
-				and card.edition
-				and (card.area == G.jokers or card.area == G.consumeables or card.area == G.hand)
-				and card.edition.cry_double_sided
-				and not Card.no(card, "dbl")
-			then
-				local use = {
-					n = G.UIT.C,
-					config = { align = "cr" },
-					nodes = {
-						{
-							n = G.UIT.C,
-							config = {
-								ref_table = card,
-								align = "cr",
-								maxw = 1.25,
-								padding = 0.1,
-								r = 0.08,
-								hover = true,
-								shadow = true,
-								colour = G.C.UI.BACKGROUND_INACTIVE,
-								one_press = true,
-								button = "flip",
-								func = "can_flip_card",
-							},
-							nodes = {
-								{ n = G.UIT.B, config = { w = 0.1, h = 0.3 } },
-								{
-									n = G.UIT.T,
-									config = {
-										text = localize("b_flip"),
-										colour = G.C.UI.TEXT_LIGHT,
-										scale = 0.3,
-										shadow = true,
-									},
-								},
-							},
-						},
-					},
-				}
-				local m = retval.nodes[1]
-				if not card.added_to_deck then
-					use.nodes[1].nodes = { use.nodes[1].nodes[2] }
-					if card.ability.consumeable then
-						m = retval
-					end
-				end
-				m.nodes = m.nodes or {}
-				table.insert(m.nodes, { n = G.UIT.R, config = { align = "cl" }, nodes = {
-					use,
-				} })
-				return retval
-			end
-			if
-				card.area
-				and (card.area == G.jokers or card.area == G.consumeables or card.area == G.hand)
-				and (not card.edition or not card.edition.cry_double_sided)
-				and not card.ability.eternal
-				and not Card.no(card, "dbl")
-			then
-				for i = 1, #card.area.cards do
-					if card.area.cards[i].edition and card.area.cards[i].edition.cry_double_sided then
-						local use = {
-							n = G.UIT.C,
-							config = { align = "cr" },
-							nodes = {
-								{
-									n = G.UIT.C,
-									config = {
-										ref_table = card,
-										align = "cr",
-										maxw = 1.25,
-										padding = 0.1,
-										r = 0.08,
-										hover = true,
-										shadow = true,
-										colour = G.C.UI.BACKGROUND_INACTIVE,
-										one_press = true,
-										button = "flip_merge",
-										func = "can_flip_merge_card",
-									},
-									nodes = {
-										{ n = G.UIT.B, config = { w = 0.1, h = 0.3 } },
-										{
-											n = G.UIT.T,
-											config = {
-												text = localize("b_merge"),
-												colour = G.C.UI.TEXT_LIGHT,
-												scale = 0.3,
-												shadow = true,
-											},
-										},
-									},
-								},
-							},
-						}
-						local m = retval.nodes[1]
-						if not card.added_to_deck then
-							use.nodes[1].nodes = { use.nodes[1].nodes[2] }
-							if card.ability.consumeable then
-								m = retval
-							end
-						end
-						m.nodes = m.nodes or {}
-						table.insert(m.nodes, { n = G.UIT.R, config = { align = "cl" }, nodes = {
-							use,
-						} })
-						return retval
-					end
-				end
-			end
-			return retval
-		end
-		local cupd = Card.update
-		function Card:update(dt)
-			cupd(self, dt)
-			if self.area then
-				if self.area.config.type == "discard" or self.area.config.type == "deck" then
-					return --prevent lagging event queues with unneeded flips
-				end
-			end
-			if self.sprite_facing == "back" and self.edition and self.edition.cry_double_sided then
-				self.sprite_facing = "front"
-				self.facing = "front"
-				if self.flipping == "f2b" then
-					self.flipping = "b2f"
-				end
-				self:dbl_side_flip()
-			end
-			if self.ability.cry_absolute then -- feedback loop... may be problematic
-				self.cry_absolute = true
-			end
-			if self.cry_absolute then
-				self.ability.cry_absolute = true
-				self.ability.eternal = true
-			end
-		end
 		function Cryptid.copy_dbl_card(C, c, deck_effects)
 			if not deck_effects then
 				Cdeck = C.added_to_deck
@@ -2057,7 +2006,12 @@ local azure_seal = {
 	pos = { x = 0, y = 2 },
 	-- This is still quite jank
 	calculate = function(self, card, context)
-		if context.destroying_card and not card.will_shatter then
+		if context.destroying_card and not card.will_shatter and context.cardarea == G.play then
+			for i, cards in ipairs(context.full_hand) do
+				if cards ~= card then
+					return
+				end
+			end
 			card.will_shatter = true
 			G.E_MANAGER:add_event(Event({
 				trigger = "before",
@@ -2130,6 +2084,7 @@ local typhoon = {
 	pos = { x = 0, y = 4 },
 	use = function(self, card, area, copier) --Good enough
 		local used_consumable = copier or card
+		check_for_unlock({ cry_used_consumable = "c_cry_typhoon" })
 		for i = 1, #G.hand.highlighted do
 			local highlighted = G.hand.highlighted[i]
 			G.E_MANAGER:add_event(Event({
@@ -2224,8 +2179,8 @@ local miscitems = {
 	blessing,
 	typhoon,
 	azure_seal,
-	double_sided,
-	meld,
+	--double_sided,
+	--meld,
 	absolute,
 	light,
 	seraph,

Cryptid/items/misc_joker.lua

@@ -221,7 +221,7 @@ local potofjokes = {
 	},
 	name = "cry-Pot of Jokes",
 	key = "pot_of_jokes",
-	config = { extra = { h_size = -2, h_mod = 1 } },
+	config = { extra = { h_size = -2, h_mod = 1 }, immutable = { h_added = 0, h_mod_max = 1000 } },
 	pos = { x = 5, y = 0 },
 	rarity = 3,
 	order = 104,
@@ -234,13 +234,39 @@ local potofjokes = {
 				center.ability.extra.h_size < 0 and center.ability.extra.h_size
 					or "+" .. math.min(1000, center.ability.extra.h_size),
 				center.ability.extra.h_mod,
+				"+" .. center.ability.immutable.h_mod_max,
 			},
 		}
 	end,
 	calculate = function(self, card, context)
 		if context.end_of_round and not context.individual and not context.repetition and not context.blueprint then
-			G.hand:change_size(math.min(math.max(0, 1000 - card.ability.extra.h_size), card.ability.extra.h_mod))
+			if
+				to_big(card.ability.extra.h_size) + to_big(card.ability.extra.h_mod)
+				>= to_big(card.ability.immutable.h_mod_max)
+			then
+				card.ability.extra.h_size = card.ability.immutable.h_mod_max
+				card.ability.extra.h_mod = 0
+
+				-- Fallback for if Pot of Jokes comes into this calcuate function with large h_size
+				if card.ability.immutable.h_added < card.ability.immutable.h_mod_max then
+					local delta = card.ability.immutable.h_mod_max - card.ability.immutable.h_added
+
+					G.hand:change_size(delta)
+
+					card.ability.immutable.h_added = card.ability.immutable.h_mod_max
+				end
+			end
+
+			local delta = math.min(
+				math.max(0, card.ability.immutable.h_mod_max - card.ability.extra.h_size),
+				card.ability.extra.h_mod
+			)
+
+			G.hand:change_size(delta)
+
 			card.ability.extra.h_size = card.ability.extra.h_size + card.ability.extra.h_mod
+			card.ability.immutable.h_added = card.ability.immutable.h_added + delta
+
 			return {
 				message = localize({ type = "variable", key = "a_handsize", vars = { card.ability.extra.h_mod } }),
 				colour = G.C.FILTER,
@@ -249,10 +275,10 @@ local potofjokes = {
 		end
 	end,
 	add_to_deck = function(self, card, from_debuff)
-		G.hand:change_size(math.min(1000, card.ability.extra.h_size))
+		G.hand:change_size(math.min(card.ability.immutable.h_mod_max, card.ability.extra.h_size))
 	end,
 	remove_from_deck = function(self, card, from_debuff)
-		G.hand:change_size(-1 * math.min(1000, card.ability.extra.h_size))
+		G.hand:change_size(-1 * math.min(card.ability.immutable.h_mod_max, card.ability.extra.h_size))
 	end,
 	cry_credits = {
 		idea = {
@@ -263,6 +289,7 @@ local potofjokes = {
 		},
 		code = {
 			"Math",
+			"BobJoe400",
 		},
 	},
 	unlocked = false,
@@ -629,7 +656,7 @@ local pickle = {
 						end
 						tag.ability.orbital_hand = pseudorandom_element(_poker_hands, pseudoseed("cry_pickle_orbital"))
 					end
-					tag.ability.shiny = cry_rollshinybool()
+					tag.ability.shiny = Cryptid.is_shiny()
 					add_tag(tag)
 				end
 			end
@@ -739,18 +766,6 @@ local cube = {
 			"Math",
 		},
 	},
-	init = function(self)
-		local sc = Card.set_cost
-		function Card:set_cost()
-			sc(self)
-			if self.ability.name == "cry-Cube" then
-				self.cost = -27
-			end
-			if self.ability.name == "cry-Big Cube" then
-				self.cost = 27
-			end
-		end
-	end,
 }
 local triplet_rhythm = {
 	object_type = "Joker",
@@ -981,7 +996,7 @@ local big_cube = {
 	name = "cry-Big Cube",
 	key = "big_cube",
 	joker_gate = "cry-Cube",
-	config = { extra = { x_chips = 6 } },
+	config = { extra = { x_chips = 6 }, override_x_chips_check = true },
 	pos = { x = 4, y = 4 },
 	rarity = 1,
 	order = 105,
@@ -1369,7 +1384,12 @@ local sus = {
 		local function is_impostor(card)
 			return card.base.value and SMODS.Ranks[card.base.value].key == "King" and card:is_suit("Hearts")
 		end
-		if context.end_of_round and context.cardarea == G.jokers and not context.blueprint and not context.retrigger_joker then
+		if
+			context.end_of_round
+			and context.cardarea == G.jokers
+			and not context.blueprint
+			and not context.retrigger_joker
+		then
 			if not card.ability.used_round or card.ability.used_round ~= G.GAME.round then
 				card.ability.chosen_card = nil
 			end
@@ -1605,7 +1625,7 @@ local wario = {
 			"Auto Watto",
 		},
 		art = {
-			"Linus Goof Balls",
+			"MarioFan597",
 		},
 		code = {
 			"Auto Watto",
@@ -3761,6 +3781,7 @@ local rnjoker = {
 		G.hand:change_size(-hand_size)
 	end,
 	generate_ui = function(self, info_queue, card, desc_nodes, specific_vars, full_UI_table)
+		card = card or self:create_fake_card()
 		local len = (
 			card.ability
 			and card.ability.abilities
@@ -3791,6 +3812,7 @@ local rnjoker = {
 			end
 			new_loc.text_parsed = card.ability.abilities[1].text_parsed
 		end
+		new_loc.text_parsed = new_loc.text_parsed or {}
 		if not full_UI_table.name then
 			full_UI_table.name =
 				localize({ type = "name", set = self.set, key = target.key or self.key, nodes = full_UI_table.name })
@@ -6691,63 +6713,69 @@ local kittyprinter = {
 	end,
 }
 local kidnap = {
-	object_type = "Joker",
 	dependencies = {
 		items = {
 			"set_cry_misc_joker",
 		},
 	},
+	object_type = "Joker",
 	name = "cry-kidnap",
 	key = "kidnap",
 	order = 23,
 	pos = { x = 1, y = 2 },
 	config = {
-		extra = { money = 1, money_mod = 3 },
+		extra = 4,
 	},
 	rarity = 1,
 	cost = 4,
 	blueprint_compat = false,
 	loc_vars = function(self, info_queue, center)
-		return { vars = { center.ability.extra.money_mod, center.ability.extra.money } }
+		local value = 0
+		if G.GAME and G.GAME.jokers_sold then
+			for _, v in ipairs(G.GAME.jokers_sold) do
+				if
+					G.P_CENTERS[v].effect == "Type Mult"
+					or G.P_CENTERS[v].effect == "Cry Type Mult"
+					or G.P_CENTERS[v].effect == "Cry Type Chips"
+					or G.P_CENTERS[v].effect == "Boost Kidnapping"
+					or (
+						G.P_CENTERS[v].name == "Sly Joker"
+						or G.P_CENTERS[v].name == "Wily Joker"
+						or G.P_CENTERS[v].name == "Clever Joker"
+						or G.P_CENTERS[v].name == "Devious Joker"
+						or G.P_CENTERS[v].name == "Crafty Joker"
+					)
+				then
+					value = value + 1
+				end
+			end
+		end
+		return { vars = { center.ability.extra, center.ability.extra * value } }
 	end,
 	atlas = "atlasone",
-	calculate = function(self, card, context)
-		if
-			context.selling_card
-			and (
-				(
-					context.card.ability.name == "Sly Joker"
-					or context.card.ability.name == "Wily Joker"
-					or context.card.ability.name == "Clever Joker"
-					or context.card.ability.name == "Devious Joker"
-					or context.card.ability.name == "Crafty Joker"
-				)
-				or context.card.ability.effect == "Type Mult"
-				or context.card.ability.effect == "Cry Type Mult"
-				or context.card.ability.effect == "Cry Type Chips"
-				--[[
-				Other developers can add effect == "Boost Kidnapping"
-                to their joker config if they want it to boost kidnapping when sold
-				]]
-				--
-				or context.card.ability.effect == "Boost Kidnapping"
-				or context.card:is_jolly()
-			)
-			and not context.blueprint
-		then
-			card.ability.extra.money = card.ability.extra.money + card.ability.extra.money_mod
-			return {
-				card_eval_status_text(card, "extra", nil, nil, nil, {
-					message = localize("k_upgrade_ex"),
-					colour = G.C.MONEY,
-				}),
-			}
-		end
-	end,
 	calc_dollar_bonus = function(self, card)
-		if card.ability.extra.money > 0 then
-			return card.ability.extra.money
+		local value = 0
+		for _, v in ipairs(G.GAME.jokers_sold) do
+			if
+				G.P_CENTERS[v].effect == "Type Mult"
+				or G.P_CENTERS[v].effect == "Cry Type Mult"
+				or G.P_CENTERS[v].effect == "Cry Type Chips"
+				or G.P_CENTERS[v].effect == "Boost Kidnapping"
+				or (
+					G.P_CENTERS[v].name == "Sly Joker"
+					or G.P_CENTERS[v].name == "Wily Joker"
+					or G.P_CENTERS[v].name == "Clever Joker"
+					or G.P_CENTERS[v].name == "Devious Joker"
+					or G.P_CENTERS[v].name == "Crafty Joker"
+				)
+			then
+				value = value + 1
+			end
 		end
+		if value == 0 then
+			return
+		end
+		return card.ability.extra * value
 	end,
 	cry_credits = {
 		idea = {
@@ -6871,6 +6899,7 @@ local tropical_smoothie = {
 	cost = 5,
 	order = 125,
 	atlas = "atlastwo",
+	pools = { ["Food"] = true },
 	loc_vars = function(self, info_queue, center)
 		return { vars = { center.ability.extra } }
 	end,
@@ -7132,6 +7161,8 @@ local necromancer = {
 			and context.card.config.center.set == "Joker"
 			and G.GAME.jokers_sold
 			and #G.GAME.jokers_sold > 0
+			and not context.blueprint
+			and not context.retrigger_joker
 		then
 			local card = create_card(
 				"Joker",
@@ -7311,7 +7342,7 @@ local tax_fraud = {
 		},
 	},
 }
---TODO update desc
+
 local pity_prize = {
 	object_type = "Joker",
 	dependencies = {
@@ -7321,6 +7352,7 @@ local pity_prize = {
 	},
 	name = "cry-Pity-Prize",
 	key = "pity_prize",
+	blueprint_compat = true,
 	pos = { x = 5, y = 5 },
 	config = {},
 	rarity = 1,
@@ -7338,7 +7370,7 @@ local pity_prize = {
 			until tag_key ~= "tag_boss" --I saw pickle not generating boss tags because it apparently causes issues, so I did the same here
 			-- this is my first time seeing repeat... wtf
 			local tag = Tag(tag_key)
-			tag.ability.shiny = cry_rollshinybool()
+			tag.ability.shiny = Cryptid.is_shiny()
 			if tag.name == "Orbital Tag" then
 				local _poker_hands = {}
 				for k, v in pairs(G.GAME.hands) do
@@ -7623,14 +7655,16 @@ local zooble = {
 			if not (next(context.poker_hands["Straight"]) or next(context.poker_hands["Straight Flush"])) then
 				local unique_ranks = {}
 				for i, v in pairs(context.scoring_hand) do
-					local not_unique = false
-					for i = 1, #unique_ranks do
-						if unique_ranks[i] == v:get_id() then
-							not_unique = true
+					if not (SMODS.has_no_rank(v) and not v.vampired) then
+						local not_unique = false
+						for i = 1, #unique_ranks do
+							if unique_ranks[i] == v:get_id() then
+								not_unique = true
+							end
+						end
+						if not not_unique then
+							unique_ranks[#unique_ranks + 1] = v:get_id()
 						end
-					end
-					if not not_unique then
-						unique_ranks[#unique_ranks + 1] = v:get_id()
 					end
 				end
 				if #unique_ranks >= 1 then
@@ -7643,7 +7677,7 @@ local zooble = {
 				end
 			end
 		end
-		if context.joker_main and context.cardarea == G.jokers then
+		if context.joker_main and card.ability.extra.mult > 0 then
 			return {
 				message = localize({ type = "variable", key = "a_mult", vars = { card.ability.extra.mult } }),
 				mult_mod = card.ability.extra.mult,
@@ -7674,6 +7708,7 @@ local lebaron_james = {
 	key = "lebaron_james",
 	pos = { x = 2, y = 5 },
 	config = { extra = { h_mod = 1 } },
+	blueprint_compat = true,
 	rarity = 3,
 	cost = 6,
 	atlas = "atlasone",
@@ -7771,6 +7806,166 @@ local huntingseason = { -- If played hand contains three cards, destroy the midd
 		},
 	},
 }
+local cat_owl = { -- Lucky Cards are considered Echo Cards and vice versa
+	object_type = "Joker",
+	dependencies = {
+		items = {
+			"set_cry_misc_joker",
+			"m_cry_echo",
+			"set_cry_misc",
+		},
+	},
+	name = "cry-cat_owl",
+	pools = { ["Meme"] = true },
+	key = "cat_owl",
+	pos = { x = 6, y = 5 },
+	order = 135,
+	rarity = 3,
+	cost = 8,
+	blueprint_compat = false,
+	atlas = "atlasone",
+	loc_vars = function(self, info_queue, center)
+		info_queue[#info_queue + 1] = G.P_CENTERS.m_lucky
+		info_queue[#info_queue + 1] = G.P_CENTERS.m_cry_echo
+	end,
+	calculate = function(self, card, context)
+		if context.check_enhancement then
+			if context.other_card.config.center.key == "m_lucky" then
+				return { m_cry_echo = true }
+			end
+			if context.other_card.config.center.key == "m_cry_echo" then
+				return { m_lucky = true }
+			end
+		end
+	end,
+	cry_credits = {
+		idea = {
+			"Math",
+		},
+		code = {
+			"Math",
+		},
+		art = {
+			"George the Rat",
+		},
+	},
+}
+local eyeofhagane = {
+	object_type = "Joker",
+	dependencies = {
+		items = {
+			"set_cry_misc_joker",
+		},
+	},
+	name = "cry-eyeofhagane",
+	key = "eyeofhagane",
+	order = 136,
+	pos = { x = 5, y = 6 },
+	rarity = 2,
+	cost = 6,
+	blueprint_compat = false,
+	immutable = true,
+	atlas = "atlastwo", -- https://discord.com/channels/1264429948970733782/1274103559113150629/1351479917367263312
+	calculate = function(self, card, context)
+		if context.before then
+			local faces = {}
+			for k, v in ipairs(context.scoring_hand) do
+				if v:is_face() then
+					faces[#faces + 1] = v
+					v:set_ability(G.P_CENTERS.m_steel, nil, true)
+					G.E_MANAGER:add_event(Event({
+						func = function()
+							v:juice_up()
+							return true
+						end,
+					}))
+				end
+			end
+			if #faces > 0 then
+				return {
+					message = "Steel",
+					colour = G.C.UI.TEXT_INACTIVE,
+					card = self,
+				}
+			end
+		end
+	end,
+	cry_credits = {
+		idea = { "Soren" },
+		code = { "Lexi" },
+		art = { "Soren" },
+	},
+}
+
+local highfive = {
+	object_type = "Joker",
+	dependencies = {
+		items = {
+			"set_cry_misc_joker",
+		},
+	},
+	name = "cry-highfive",
+	key = "highfive",
+	order = 137,
+	atlas = "atlastwo",
+	pos = { x = 4, y = 1 },
+	blueprint_compat = false,
+	eternal_compat = true,
+	perishable_compat = true,
+	rarity = 3,
+	cost = 5,
+	calculate = function(self, card, context)
+		if context.final_scoring_step then
+			local maximum = -1
+			local fives = 0
+			for k, v in ipairs(context.scoring_hand) do
+				if not SMODS.has_no_rank(v) then
+					local thunk = v:get_id() == 14 and 1 or v:get_id()
+					if thunk == 5 then
+						fives = fives + 1
+					end
+					if thunk > maximum then
+						maximum = thunk
+					end
+				end
+			end
+
+			local whapoosh = false
+			if maximum == 5 and fives ~= #context.scoring_hand then
+				for index = 1, #context.scoring_hand do
+					local v = context.scoring_hand[index]
+					if v:get_id() ~= 5 and not SMODS.has_no_rank(v) then
+						whapoosh = true
+						G.E_MANAGER:add_event(Event({
+							func = function()
+								assert(SMODS.change_base(v, _, "5"))
+								v:juice_up()
+								return true
+							end,
+						}))
+					end
+				end
+
+				if whapoosh then
+					G.E_MANAGER:add_event(Event({
+						func = function()
+							play_sound("cry_whapoosh")
+							return true
+						end,
+					}))
+					return {
+						message = localize("cry_highfive_ex"),
+					}
+				end
+			end
+		end
+	end,
+	cry_credits = {
+		idea = { "cassknows" },
+		art = { "MarioFan597" },
+		code = { "astrapboy" },
+	},
+}
 local miscitems = {
 	jimball_sprite,
 	dropshot,
@@ -7859,8 +8054,8 @@ local miscitems = {
 	exposed,
 	mask,
 	tropical_smoothie,
-	pumpkin,
-	carved_pumpkin,
+	--pumpkin,
+	--carved_pumpkin,
 	cookie,
 	necromancer,
 	oil_lamp,
@@ -7884,6 +8079,9 @@ local miscitems = {
 	translucent,
 	lebaron_james,
 	huntingseason,
+	--cat_owl,
+	--eyeofhagane, (apparently this wasn't screened)
+	highfive,
 }
 return {
 	name = "Misc. Jokers",

Cryptid/items/planet.lua

@@ -29,40 +29,35 @@ local timantti = {
 		return true
 	end,
 	loc_vars = function(self, info_queue, center)
-		local levelone = G.GAME.hands["High Card"].level or 1
-		local leveltwo = G.GAME.hands["Pair"].level or 1
-		local levelthree = G.GAME.hands["Two Pair"].level or 1
-		local planetcolourone = G.C.HAND_LEVELS[math.min(levelone, 7)]
-		local planetcolourtwo = G.C.HAND_LEVELS[math.min(leveltwo, 7)]
-		local planetcolourthree = G.C.HAND_LEVELS[math.min(levelthree, 7)]
-		if levelone == 1 or leveltwo == 1 or levelthree == 1 then --Level 1 colour is white (The background), so this sets it to black
-			if levelone == 1 then
-				planetcolourone = G.C.UI.TEXT_DARK
-			end
-			if leveltwo == 1 then
-				planetcolourtwo = G.C.UI.TEXT_DARK
-			end
-			if levelthree == 1 then
-				planetcolourthree = G.C.UI.TEXT_DARK
-			end
-		end
 		return {
 			vars = {
 				localize("High Card", "poker_hands"),
 				localize("Pair", "poker_hands"),
 				localize("Two Pair", "poker_hands"),
-				G.GAME.hands["High Card"].level,
-				G.GAME.hands["Pair"].level,
-				G.GAME.hands["Two Pair"].level,
-				colours = { planetcolourone, planetcolourtwo, planetcolourthree },
+				number_format(G.GAME.hands["High Card"].level),
+				number_format(G.GAME.hands["Pair"].level),
+				number_format(G.GAME.hands["Two Pair"].level),
+				colours = {
+					(
+						to_big(G.GAME.hands["High Card"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["High Card"].level)):to_number()]
+					),
+					(to_big(G.GAME.hands["Pair"].level) == to_big(1) and G.C.UI.TEXT_DARK or G.C.HAND_LEVELS[to_big(
+						math.min(7, G.GAME.hands["Pair"].level)
+					):to_number()]),
+					(
+						to_big(G.GAME.hands["Two Pair"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["Two Pair"].level)):to_number()]
+					),
+				},
 			},
 		}
 	end,
 	use = function(self, card, area, copier)
-		Cryptid.suit_level_up(self, card, area, copier)
+		Cryptid.suit_level_up(card, copier, 1, card.config.center.config.hand_types)
 	end,
 	bulk_use = function(self, card, area, copier, number)
-		Cryptid.suit_level_up(self, card, area, copier, number)
+		Cryptid.suit_level_up(card, copier, number, card.config.center.config.hand_types)
 	end,
 	calculate = function(self, card, context)
 		if
@@ -113,40 +108,35 @@ local klubi = {
 		return true
 	end,
 	loc_vars = function(self, info_queue, center)
-		local levelone = G.GAME.hands["Three of a Kind"].level or 1
-		local leveltwo = G.GAME.hands["Straight"].level or 1
-		local levelthree = G.GAME.hands["Flush"].level or 1
-		local planetcolourone = G.C.HAND_LEVELS[math.min(levelone, 7)]
-		local planetcolourtwo = G.C.HAND_LEVELS[math.min(leveltwo, 7)]
-		local planetcolourthree = G.C.HAND_LEVELS[math.min(levelthree, 7)]
-		if levelone == 1 or leveltwo == 1 or levelthree == 1 then --Level 1 colour is white (The background), so this sets it to black
-			if levelone == 1 then
-				planetcolourone = G.C.UI.TEXT_DARK
-			end
-			if leveltwo == 1 then
-				planetcolourtwo = G.C.UI.TEXT_DARK
-			end
-			if levelthree == 1 then
-				planetcolourthree = G.C.UI.TEXT_DARK
-			end
-		end
 		return {
 			vars = {
 				localize("Three of a Kind", "poker_hands"),
 				localize("Straight", "poker_hands"),
 				localize("Flush", "poker_hands"),
-				G.GAME.hands["Three of a Kind"].level,
-				G.GAME.hands["Straight"].level,
-				G.GAME.hands["Flush"].level,
-				colours = { planetcolourone, planetcolourtwo, planetcolourthree },
+				number_format(G.GAME.hands["Three of a Kind"].level),
+				number_format(G.GAME.hands["Straight"].level),
+				number_format(G.GAME.hands["Flush"].level),
+				colours = {
+					(
+						to_big(G.GAME.hands["Three of a Kind"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["Three of a Kind"].level)):to_number()]
+					),
+					(
+						to_big(G.GAME.hands["Straight"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["Straight"].level)):to_number()]
+					),
+					(to_big(G.GAME.hands["Flush"].level) == to_big(1) and G.C.UI.TEXT_DARK or G.C.HAND_LEVELS[to_big(
+						math.min(7, G.GAME.hands["Flush"].level)
+					):to_number()]),
+				},
 			},
 		}
 	end,
 	use = function(self, card, area, copier)
-		Cryptid.suit_level_up(self, card, area, copier)
+		Cryptid.suit_level_up(card, copier, 1, card.config.center.config.hand_types)
 	end,
 	bulk_use = function(self, card, area, copier, number)
-		Cryptid.suit_level_up(self, card, area, copier, number)
+		Cryptid.suit_level_up(card, copier, number, card.config.center.config.hand_types)
 	end,
 	calculate = function(self, card, context)
 		if
@@ -197,40 +187,36 @@ local sydan = {
 		return true
 	end,
 	loc_vars = function(self, info_queue, center)
-		local levelone = G.GAME.hands["Full House"].level or 1
-		local leveltwo = G.GAME.hands["Four of a Kind"].level or 1
-		local levelthree = G.GAME.hands["Straight Flush"].level or 1
-		local planetcolourone = G.C.HAND_LEVELS[math.min(levelone, 7)]
-		local planetcolourtwo = G.C.HAND_LEVELS[math.min(leveltwo, 7)]
-		local planetcolourthree = G.C.HAND_LEVELS[math.min(levelthree, 7)]
-		if levelone == 1 or leveltwo == 1 or levelthree == 1 then --Level 1 colour is white (The background), so this sets it to black
-			if levelone == 1 then
-				planetcolourone = G.C.UI.TEXT_DARK
-			end
-			if leveltwo == 1 then
-				planetcolourtwo = G.C.UI.TEXT_DARK
-			end
-			if levelthree == 1 then
-				planetcolourthree = G.C.UI.TEXT_DARK
-			end
-		end
 		return {
 			vars = {
 				localize("Full House", "poker_hands"),
 				localize("Four of a Kind", "poker_hands"),
 				localize("Straight Flush", "poker_hands"),
-				G.GAME.hands["Full House"].level,
-				G.GAME.hands["Four of a Kind"].level,
-				G.GAME.hands["Straight Flush"].level,
-				colours = { planetcolourone, planetcolourtwo, planetcolourthree },
+				number_format(G.GAME.hands["Full House"].level),
+				number_format(G.GAME.hands["Four of a Kind"].level),
+				number_format(G.GAME.hands["Straight Flush"].level),
+				colours = {
+					(
+						to_big(G.GAME.hands["Full House"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["Full House"].level)):to_number()]
+					),
+					(
+						to_big(G.GAME.hands["Four of a Kind"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["Four of a Kind"].level)):to_number()]
+					),
+					(
+						to_big(G.GAME.hands["Straight Flush"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["Straight Flush"].level)):to_number()]
+					),
+				},
 			},
 		}
 	end,
 	use = function(self, card, area, copier)
-		Cryptid.suit_level_up(self, card, area, copier)
+		Cryptid.suit_level_up(card, copier, 1, card.config.center.config.hand_types)
 	end,
 	bulk_use = function(self, card, area, copier, number)
-		Cryptid.suit_level_up(self, card, area, copier, number)
+		Cryptid.suit_level_up(card, copier, number, card.config.center.config.hand_types)
 	end,
 	calculate = function(self, card, context)
 		if
@@ -281,40 +267,36 @@ local lapio = {
 		return true
 	end,
 	loc_vars = function(self, info_queue, center)
-		local levelone = G.GAME.hands["Five of a Kind"].level or 1
-		local leveltwo = G.GAME.hands["Flush House"].level or 1
-		local levelthree = G.GAME.hands["Flush Five"].level or 1
-		local planetcolourone = G.C.HAND_LEVELS[math.min(levelone, 7)]
-		local planetcolourtwo = G.C.HAND_LEVELS[math.min(leveltwo, 7)]
-		local planetcolourthree = G.C.HAND_LEVELS[math.min(levelthree, 7)]
-		if levelone == 1 or leveltwo == 1 or levelthree == 1 then --Level 1 colour is white (The background), so this sets it to black
-			if levelone == 1 then
-				planetcolourone = G.C.UI.TEXT_DARK
-			end
-			if leveltwo == 1 then
-				planetcolourtwo = G.C.UI.TEXT_DARK
-			end
-			if levelthree == 1 then
-				planetcolourthree = G.C.UI.TEXT_DARK
-			end
-		end
 		return {
 			vars = {
 				localize("Five of a Kind", "poker_hands"),
 				localize("Flush House", "poker_hands"),
 				localize("Flush Five", "poker_hands"),
-				G.GAME.hands["Five of a Kind"].level,
-				G.GAME.hands["Flush House"].level,
-				G.GAME.hands["Flush Five"].level,
-				colours = { planetcolourone, planetcolourtwo, planetcolourthree },
+				number_format(G.GAME.hands["Five of a Kind"].level),
+				number_format(G.GAME.hands["Flush House"].level),
+				number_format(G.GAME.hands["Flush Five"].level),
+				colours = {
+					(
+						to_big(G.GAME.hands["Five of a Kind"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["Five of a Kind"].level)):to_number()]
+					),
+					(
+						to_big(G.GAME.hands["Flush House"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["Flush House"].level)):to_number()]
+					),
+					(
+						to_big(G.GAME.hands["Flush Five"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["Flush Five"].level)):to_number()]
+					),
+				},
 			},
 		}
 	end,
 	use = function(self, card, area, copier)
-		Cryptid.suit_level_up(self, card, area, copier)
+		Cryptid.suit_level_up(card, copier, 1, card.config.center.config.hand_types)
 	end,
 	bulk_use = function(self, card, area, copier, number)
-		Cryptid.suit_level_up(self, card, area, copier, number)
+		Cryptid.suit_level_up(card, copier, number, card.config.center.config.hand_types)
 	end,
 	calculate = function(self, card, context)
 		if
@@ -372,17 +354,7 @@ local kaikki = {
 		local planetcolourone = G.C.HAND_LEVELS[math.min(levelone, 7)]
 		local planetcolourtwo = G.C.HAND_LEVELS[math.min(leveltwo, 7)]
 		local planetcolourthree = G.C.HAND_LEVELS[math.min(levelthree, 7)]
-		if levelone == 1 or leveltwo == 1 or levelthree == 1 then --Level 1 colour is white (The background), so this sets it to black
-			if levelone == 1 then
-				planetcolourone = G.C.UI.TEXT_DARK
-			end
-			if leveltwo == 1 then
-				planetcolourtwo = G.C.UI.TEXT_DARK
-			end
-			if levelthree == 1 then
-				planetcolourthree = G.C.UI.TEXT_DARK
-			end
-		end
+
 		return {
 			vars = {
 				localize("cry_Bulwark", "poker_hands"),
@@ -391,15 +363,28 @@ local kaikki = {
 				G.GAME.hands["cry_Bulwark"].level,
 				G.GAME.hands["cry_Clusterfuck"].level,
 				G.GAME.hands["cry_UltPair"].level,
-				colours = { planetcolourone, planetcolourtwo, planetcolourthree },
+				colours = {
+					(
+						to_big(G.GAME.hands["cry_Bulwark"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["cry_Bulwark"].level)):to_number()]
+					),
+					(
+						to_big(G.GAME.hands["cry_Clusterfuck"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["cry_Clusterfuck"].level)):to_number()]
+					),
+					(
+						to_big(G.GAME.hands["cry_UltPair"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["cry_UltPair"].level)):to_number()]
+					),
+				},
 			},
 		}
 	end,
 	use = function(self, card, area, copier)
-		Cryptid.suit_level_up(self, card, area, copier)
+		Cryptid.suit_level_up(card, copier, 1, card.config.center.config.hand_types)
 	end,
 	bulk_use = function(self, card, area, copier, number)
-		Cryptid.suit_level_up(self, card, area, copier, number)
+		Cryptid.suit_level_up(card, copier, number, card.config.center.config.hand_types)
 	end,
 	calculate = function(self, card, context)
 		if
@@ -766,7 +751,7 @@ local nstar = {
 
 		--Add +1 to amount of neutron stars used this run
 		G.GAME.neutronstarsusedinthisrun = G.GAME.neutronstarsusedinthisrun + 1
-		local neutronhand = Cryptid.get_random_hand() --Random poker hand
+		local neutronhand = Cryptid.get_random_hand(nil, "nstar" .. G.GAME.round_resets.ante) --Random poker hand
 		update_hand_text({ sound = "button", volume = 0.7, pitch = 0.8, delay = 0.3 }, {
 			handname = localize(neutronhand, "poker_hands"),
 			chips = G.GAME.hands[neutronhand].chips,
@@ -888,6 +873,9 @@ local sunplanet = {
 	aurinko = true,
 	atlas = "atlasnotjokers",
 	order = 7,
+	config = {
+		extra = 0.05,
+	},
 	set_card_type_badge = function(self, card, badges)
 		badges[1] = create_badge(localize("cry_p_star"), get_type_colour(self or card.config, card), nil, 1.2)
 	end,
@@ -896,11 +884,12 @@ local sunplanet = {
 	end,
 	use = function(self, card, area, copier)
 		local used_consumable = copier or card
-		local sunlevel = (G.GAME.sunnumber and G.GAME.sunnumber or 0) + 1
+		local sunlevel = (G.GAME.sunlevel and G.GAME.sunlevel or 0) + 1
+		G.GAME.sunlevel = (G.GAME.sunlevel or 0) + 1
 		delay(0.4)
 		update_hand_text(
 			{ sound = "button", volume = 0.7, pitch = 0.8, delay = 0.3 },
-			{ handname = localize("cry_asc_hands"), chips = "...", mult = "...", level = sunlevel }
+			{ handname = localize("cry_asc_hands"), chips = "...", mult = "...", level = to_big(sunlevel) }
 		)
 		delay(1.0)
 		G.E_MANAGER:add_event(Event({
@@ -926,9 +915,9 @@ local sunplanet = {
 				return true
 			end,
 		}))
-		update_hand_text({ sound = "button", volume = 0.7, pitch = 0.9, delay = 0 }, { level = sunlevel + 1 })
+		update_hand_text({ sound = "button", volume = 0.7, pitch = 0.9, delay = 0 }, { level = to_big(sunlevel + 1) })
 		delay(2.6)
-		G.GAME.sunnumber = G.GAME.sunnumber ~= nil and G.GAME.sunnumber + 1 or 1
+		G.GAME.sunnumber = G.GAME.sunnumber ~= nil and G.GAME.sunnumber + card.ability.extra or card.ability.extra
 		update_hand_text(
 			{ sound = "button", volume = 0.7, pitch = 1.1, delay = 0 },
 			{ mult = 0, chips = 0, handname = "", level = "" }
@@ -936,11 +925,12 @@ local sunplanet = {
 	end,
 	bulk_use = function(self, card, area, copier, number)
 		local used_consumable = copier or card
-		local sunlevel = (G.GAME.sunnumber and G.GAME.sunnumber or 0) + 1
+		local sunlevel = (G.GAME.sunlevel and G.GAME.sunlevel or 0) + 1
+		G.GAME.sunlevel = (G.GAME.sunlevel or 0) + 1
 		delay(0.4)
 		update_hand_text(
 			{ sound = "button", volume = 0.7, pitch = 0.8, delay = 0.3 },
-			{ handname = localize("cry_asc_hands"), chips = "...", mult = "...", level = sunlevel }
+			{ handname = localize("cry_asc_hands"), chips = "...", mult = "...", level = to_big(sunlevel) }
 		)
 		delay(1.0)
 		G.E_MANAGER:add_event(Event({
@@ -966,9 +956,13 @@ local sunplanet = {
 				return true
 			end,
 		}))
-		update_hand_text({ sound = "button", volume = 0.7, pitch = 0.9, delay = 0 }, { level = sunlevel + number })
+		update_hand_text(
+			{ sound = "button", volume = 0.7, pitch = 0.9, delay = 0 },
+			{ level = to_big(sunlevel + number) }
+		)
 		delay(2.6)
-		G.GAME.sunnumber = G.GAME.sunnumber ~= nil and G.GAME.sunnumber + number or number
+		G.GAME.sunnumber = G.GAME.sunnumber ~= nil and G.GAME.sunnumber + number * card.ability.extra
+			or number * card.ability.extra
 		update_hand_text(
 			{ sound = "button", volume = 0.7, pitch = 1.1, delay = 0 },
 			{ mult = 0, chips = 0, handname = "", level = "" }
@@ -988,15 +982,16 @@ local sunplanet = {
 		end
 	end,
 	loc_vars = function(self, info_queue, center)
-		local levelone = (G.GAME.sunnumber and G.GAME.sunnumber or 0) + 1
+		local levelone = (G.GAME.sunlevel and G.GAME.sunlevel or 0) + 1
 		local planetcolourone = G.C.HAND_LEVELS[math.min(levelone, 7)]
 		if levelone == 1 then
 			planetcolourone = G.C.UI.TEXT_DARK
 		end
 		return {
 			vars = {
-				(G.GAME.sunnumber and G.GAME.sunnumber or 0) + 1,
-				((G.GAME.sunnumber and G.GAME.sunnumber or 0) / 20) + 1.25,
+				(G.GAME.sunlevel or 0) + 1,
+				center.ability.extra or 0.05,
+				(G.GAME.sunnumber and G.GAME.sunnumber or 0) + 1.25,
 				colours = { planetcolourone },
 			},
 		}
@@ -1037,18 +1032,18 @@ local abelt = {
 		badges[1] = create_badge(localize("k_planet_disc"), get_type_colour(self or card.config, card), nil, 1.2)
 	end,
 	loc_vars = function(self, info_queue, center)
-		local levelone = G.GAME.hands["cry_Bulwark"].level or 1
-		local planetcolourone = G.C.HAND_LEVELS[math.min(levelone, 7)]
-		if levelone == 1 then
-			planetcolourone = G.C.UI.TEXT_DARK
-		end
 		return {
 			vars = {
 				localize("cry_hand_bulwark"),
 				G.GAME.hands["cry_Bulwark"].level,
 				G.GAME.hands["cry_Bulwark"].l_mult,
 				G.GAME.hands["cry_Bulwark"].l_chips,
-				colours = { planetcolourone },
+				colours = {
+					(
+						to_big(G.GAME.hands["cry_Bulwark"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["cry_Bulwark"].level)):to_number()]
+					),
+				},
 			},
 		}
 	end,
@@ -1083,18 +1078,18 @@ local void = {
 		badges[1] = create_badge("", get_type_colour(self or card.config, card), nil, 1.2)
 	end,
 	loc_vars = function(self, info_queue, center)
-		local levelone = G.GAME.hands["cry_Clusterfuck"].level or 1
-		local planetcolourone = G.C.HAND_LEVELS[math.min(levelone, 7)]
-		if levelone == 1 then
-			planetcolourone = G.C.UI.TEXT_DARK
-		end
 		return {
 			vars = {
 				localize("cry_Clusterfuck"),
 				G.GAME.hands["cry_Clusterfuck"].level,
 				G.GAME.hands["cry_Clusterfuck"].l_mult,
 				G.GAME.hands["cry_Clusterfuck"].l_chips,
-				colours = { planetcolourone },
+				colours = {
+					(
+						to_big(G.GAME.hands["cry_Clusterfuck"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["cry_Clusterfuck"].level)):to_number()]
+					),
+				},
 			},
 		}
 	end,
@@ -1140,7 +1135,12 @@ local marsmoons = {
 				G.GAME.hands["cry_UltPair"].level,
 				G.GAME.hands["cry_UltPair"].l_mult,
 				G.GAME.hands["cry_UltPair"].l_chips,
-				colours = { planetcolourone },
+				colours = {
+					(
+						to_big(G.GAME.hands["cry_UltPair"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["cry_UltPair"].level)):to_number()]
+					),
+				},
 			},
 		}
 	end,
@@ -1175,29 +1175,42 @@ local universe = {
 		badges[1] = create_badge(localize("k_planet_universe"), get_type_colour(self or card.config, card), nil, 1.2)
 	end,
 	loc_vars = function(self, info_queue, center)
-		local levelone = G.GAME.hands["cry_WholeDeck"].level or 1
-		local planetcolourone = G.C.HAND_LEVELS[math.min(levelone, 7)]
-		if levelone == 1 then
-			planetcolourone = G.C.UI.TEXT_DARK
-		end
 		return {
 			vars = {
 				localize("cry_UltPair"),
 				G.GAME.hands["cry_WholeDeck"].level,
 				G.GAME.hands["cry_WholeDeck"].l_mult,
 				G.GAME.hands["cry_WholeDeck"].l_chips,
-				colours = { planetcolourone },
+				colours = {
+					(
+						to_big(G.GAME.hands["cry_Bulwark"].level) == to_big(1) and G.C.UI.TEXT_DARK
+						or G.C.HAND_LEVELS[to_big(math.min(7, G.GAME.hands["cry_WholeDeck"].level)):to_number()]
+					),
+				},
 			},
 		}
 	end,
 	generate_ui = 0,
 }
-function Cryptid.suit_level_up(center, card, area, copier, number)
+function Cryptid.suit_level_up(card, copier, number, poker_hands, message)
 	local used_consumable = copier or card
 	if not number then
 		number = 1
 	end
-	for _, v in pairs(card.config.center.config.hand_types) do
+	if not poker_hands then
+		poker_hands = { "Two Pair", "Straight Flush" }
+	end
+	if message then
+		card_eval_status_text(
+			card,
+			"extra",
+			nil,
+			nil,
+			nil,
+			{ message = localize("k_level_up_ex"), colour = G.C.FILTER }
+		)
+	end
+	for _, v in pairs(poker_hands) do
 		update_hand_text({ sound = "button", volume = 0.7, pitch = 0.8, delay = 0.3 }, {
 			handname = localize(v, "poker_hands"),
 			chips = G.GAME.hands[v].chips,

Cryptid/items/sleeve.lua

@@ -448,7 +448,7 @@ if CardSleeves then
 		key = "antimatter_sleeve",
 		name = "Antimatter Sleeve",
 		atlas = "atlasSleeves",
-		pos = { x = 0, y = 2 },
+		pos = { x = 0, y = 1 },
 		config = {
 			cry_antimatter = true,
 			cry_crit_rate = 0.25, --Critical Deck

Cryptid/items/spectral.lua

@@ -152,6 +152,7 @@ local vacuum = {
 	use = function(self, card, area, copier)
 		local used_consumable = copier or card
 		local earnings = 0
+		check_for_unlock({ cry_used_consumable = "c_cry_vacuum" })
 		G.E_MANAGER:add_event(Event({
 			trigger = "after",
 			delay = 0.4,
@@ -235,6 +236,7 @@ local hammerspace = {
 	end,
 	use = function(self, card, area, copier)
 		local used_consumable = copier or card
+		check_for_unlock({ cry_used_consumable = "c_cry_hammerspace" })
 		G.E_MANAGER:add_event(Event({
 			trigger = "after",
 			delay = 0.4,
@@ -309,6 +311,7 @@ local lock = {
 	end,
 	use = function(self, card, area, copier)
 		local used_consumable = copier or card
+		check_for_unlock({ cry_used_consumable = "c_cry_lock" })
 		local target = #G.jokers.cards == 1 and G.jokers.cards[1] or G.jokers.cards[math.random(#G.jokers.cards)]
 		G.E_MANAGER:add_event(Event({
 			trigger = "after",
@@ -566,6 +569,7 @@ local analog = {
 		return #G.jokers.cards > 0
 	end,
 	use = function(self, card, area, copier)
+		check_for_unlock({ cry_used_consumable = "c_cry_analog" })
 		local used_consumable = copier or card
 		local deletable_jokers = {}
 		for k, v in pairs(G.jokers.cards) do
@@ -715,6 +719,7 @@ local replica = {
 	end,
 	use = function(self, card, area, copier)
 		local used_consumable = copier or card
+		check_for_unlock({ cry_used_consumable = "c_cry_replica" })
 		local chosen_card = pseudorandom_element(G.hand.cards, pseudoseed("cry_replica_choice"))
 		G.E_MANAGER:add_event(Event({
 			trigger = "after",

Cryptid/items/spooky.lua

@@ -135,7 +135,7 @@ local choco_dice = {
 		then
 			--todo: check if duplicates of event are already started/finished
 			SMODS.Events["ev_cry_choco" .. card.ability.extra.roll]:finish()
-			card.ability.extra.roll = Cryptid.roll("cry_choco", 1, 10, { ignore_value = card.ability.extra.roll })
+			card.ability.extra.roll = Cryptid.roll("cry_choco", 2, 10, { ignore_value = card.ability.extra.roll })
 			SMODS.Events["ev_cry_choco" .. card.ability.extra.roll]:start()
 			return {
 				message = tostring(card.ability.extra.roll),
@@ -651,7 +651,7 @@ local spy = {
 		G.jokers.config.card_limit = G.jokers.config.card_limit - 1
 	end,
 	calculate = function(self, card, context)
-		if context.cardarea == G.jokers and not context.before and not context.after then
+		if context.joker_main then
 			return {
 				message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.x_mult } }),
 				Xmult_mod = card.ability.x_mult,
@@ -1122,6 +1122,22 @@ local spookydeck = {
 			end
 		end
 	end,
+	unlocked = false,
+	check_for_unlock = function(self, args)
+		if Cryptid.safe_get(G, "jokers") then
+			for i = 1, #G.jokers.cards do
+				if G.jokers.cards[i].config.center.rarity == "cry_candy" then
+					unlock_card(self)
+				end
+			end
+		end
+		if args.type == "cry_lock_all" then
+			lock_card(self)
+		end
+		if args.type == "cry_unlock_all" then
+			unlock_card(self)
+		end
+	end,
 }
 local candy_dagger = {
 	object_type = "Joker",
@@ -1688,12 +1704,51 @@ local candy_sticks = {
 		},
 	},
 }
+-- Wonka Bar
+-- Sell this card to permanently gain +1 card selection limit
+local wonka_bar = {
+	object_type = "Joker",
+	dependencies = {
+		items = {
+			"set_cry_spooky",
+		},
+	},
+	key = "wonka_bar",
+	name = "cry_wonka_bar",
+	config = { extra = 1 },
+	pos = { x = 1, y = 3 },
+	order = 146,
+	rarity = "cry_candy",
+	cost = 10,
+	eternal_compat = false,
+	atlas = "atlasspooky",
+	loc_vars = function(self, info_queue, center)
+		return { vars = { center.ability.extra } }
+	end,
+	calculate = function(self, card, context)
+		if context.selling_self and not context.blueprint then
+			card.ability.extra = math.floor(card.ability.extra)
+			G.hand.config.highlighted_limit = G.hand.config.highlighted_limit + card.ability.extra
+		end
+	end,
+	cry_credits = {
+		idea = {
+			"Inspector_B",
+		},
+		art = {
+			"George the Rat",
+		},
+		code = {
+			"Glitchkat10",
+		},
+	},
+}
 items = {
 	cotton_candy,
 	wrapped,
 	choco_dice,
 	choco_base_event,
-	choco1,
+	--choco1,
 	choco2,
 	choco3,
 	potion,
@@ -1709,7 +1764,7 @@ items = {
 	trick_or_treat,
 	candy_basket,
 	blacklist,
-	ghost,
+	--ghost,
 	possessed,
 	spookydeck,
 	candy_dagger,
@@ -1720,38 +1775,10 @@ items = {
 	brittle,
 	monopoly_money,
 	candy_sticks,
+	wonka_bar,
 }
 return {
 	name = "Spooky",
-	init = function()
-		--Cursed rarity patches
-		local sc = Card.set_cost
-		function Card:set_cost()
-			sc(self)
-			if self.config and self.config.center and self.config.center.rarity == "cry_cursed" then
-				self.sell_cost = 0
-				self.sell_cost_label = 0
-			end
-		end
-		--Really hacky patch to remove sell button for cursed jokers
-		local G_UIDEF_use_and_sell_buttons_ref = G.UIDEF.use_and_sell_buttons
-		function G.UIDEF.use_and_sell_buttons(card)
-			local m = G_UIDEF_use_and_sell_buttons_ref(card)
-			if
-				card.area
-				and card.area.config.type == "joker"
-				and card.config
-				and card.config.center
-				and card.config.center.rarity == "cry_cursed"
-				and card.ability.name ~= "cry-Monopoly"
-			then
-				table.remove(m.nodes[1].nodes, 1)
-			end
-			if card.config and card.config.center and card.config.center.key == "c_cry_potion" then
-				table.remove(m.nodes[1].nodes, 1)
-			end
-			return m
-		end
-	end,
+	init = function() end,
 	items = items,
 }

Cryptid/items/stake.lua

@@ -526,24 +526,6 @@ return {
 				SMODS.calculate_context({ remove_playing_cards = true, removed = destroyed_cards })
 			end,
 		}, true)
-
-		local sc = Card.set_cost
-		function Card:set_cost()
-			sc(self)
-			if self.ability.set == "Voucher" and G.GAME.modifiers.cry_voucher_price_hike then
-				self.cost = math.floor(self.cost * G.GAME.modifiers.cry_voucher_price_hike)
-				--Update related costs
-				self.sell_cost = math.max(1, math.floor(self.cost / 2)) + (self.ability.extra_value or 0)
-				if
-					self.area
-					and self.ability.couponed
-					and (self.area == G.shop_jokers or self.area == G.shop_booster)
-				then
-					self.cost = 0
-				end
-				self.sell_cost_label = self.facing == "back" and "?" or self.sell_cost
-			end
-		end
 		for _, v in pairs(self.items) do
 			if v.object_type == "Stake" then
 				v.sticker_pos = v.pos

Cryptid/items/tag.lua

@@ -197,11 +197,13 @@ local empoweredPack = {
 		if
 			i % 2 == 1
 			and Cryptid.enabled("c_cry_gateway") == true
-			and not G.GAME.used_jokers["c_cry_gateway"]
-			and not next(find_joker("Showman"))
+			and not G.GAME.banned_keys["c_cry_gateway"]
+			and not (G.GAME.used_jokers["c_cry_gateway"] and not next(find_joker("Showman")))
 		then
 			return create_card("Spectral", G.pack_cards, nil, nil, true, true, "c_cry_gateway")
-		elseif not G.GAME.used_jokers["c_soul"] and not next(find_joker("Showman")) then
+		elseif
+			not (G.GAME.used_jokers["c_soul"] and not next(find_joker("Showman"))) and not G.GAME.banned_keys["c_soul"]
+		then
 			return create_card("Spectral", G.pack_cards, nil, nil, true, true, "c_soul")
 		else
 			return create_card("Spectral", G.pack_cards, nil, nil, true, true)
@@ -333,7 +335,7 @@ local gambler = {
 				tag:yep("+", G.C.SECONDARY_SET.Spectral, function()
 					local emp = Tag("tag_cry_empowered")
 					if tag.ability.shiny then -- good fucking luck
-						emp.ability.shiny = cry_rollshinybool()
+						emp.ability.shiny = Cryptid.is_shiny()
 					end
 					add_tag(emp)
 					tag.triggered = true
@@ -397,7 +399,7 @@ local bundle = {
 				local tags = { "standard", "charm", "meteor", "buffoon" }
 				for i, v in ipairs(tags) do
 					local _tag = Tag("tag_" .. v)
-					_tag.ability.shiny = cry_rollshinybool()
+					_tag.ability.shiny = Cryptid.is_shiny()
 					add_tag(_tag)
 					if i == 1 then
 						tag.triggered = true
@@ -444,6 +446,28 @@ local memory = {
 			or localize("k_none")
 		return { vars = { self.config.num, loc_tag } }
 	end,
+	preview_ui = function(self, tag)
+		if G.GAME.cry_last_tag_used then
+			local last_tag = Tag(G.GAME.cry_last_tag_used, true)
+			last_tag.ability.orbital_hand = G.GAME.cry_memory_orbital
+			local tag_sprite
+			_, tag_sprite = last_tag:generate_UI(0.4)
+			return {
+				n = G.UIT.C,
+				nodes = {
+					{
+						n = G.UIT.R,
+						nodes = {
+							{ n = G.UIT.T, config = { text = ">", colour = G.C.WHITE, scale = 0.4 } },
+							{ n = G.UIT.O, config = { object = tag_sprite } },
+							G.P_TAGS[G.GAME.cry_last_tag_used].preview_ui
+								and G.P_TAGS[G.GAME.cry_last_tag_used]:preview_ui(last_tag),
+						},
+					},
+				},
+			}
+		end
+	end,
 	apply = function(self, tag, context)
 		if context.type == "immediate" and G.GAME.cry_last_tag_used then
 			local lock = tag.ID

Cryptid/items/test.lua

@@ -37,7 +37,7 @@ local test = {
 	end,
 	calculate = function(self, card, context)
 		local gameset = Card.get_gameset(card)
-		if context.cardarea == G.jokers and not context.before and not context.after then
+		if context.joker_main then
 			return {
 				message = localize({ type = "variable", key = "a_chips", vars = { card.ability.extra.chips } }),
 				chip_mod = card.ability.extra.chips,
@@ -108,20 +108,15 @@ local test3 = {
 	pos = { x = 2, y = 1 },
 	rarity = 1,
 	cost = 2,
+	blueprint_compat = true,
 	discovered = true,
 	atlas = "atlastwo",
 	loc_txt = {
-		name = "Loc var man B)",
+		name = "function dump man B)",
 		text = {
-			"{C:attention}#1#",
-			"{C:green}#2#",
-			"{C:inactive}#3##4##5#",
+			"{C:attention}What does the fox say?",
 		},
 	},
-	loc_vars = function(self, info_queue, card)
-		local a, b, c, d, e = Cryptid.enhanced_deck_info()
-		return { vars = { a, b, c, d, e } }
-	end,
 	cry_credits = {
 		idea = {
 			"Jevonn",
@@ -133,6 +128,45 @@ local test3 = {
 			"Jevonn",
 		},
 	},
+	calculate = function(self, card, context)
+		if context.end_of_round and not context.individual and not context.repetition then
+			Cryptid.suit_level_up(context.blueprint_card or card, nil, 1, {
+				"High Card",
+				"Pair",
+				"Two Pair",
+				"Three of a Kind",
+				"Straight",
+				"Flush",
+				"Full House",
+				"Four of a Kind",
+				"Straight Flush",
+			}, true)
+		elseif context.pre_discard and not context.hook then
+			local text, loc_disp_text, poker_hands, scoring_hand, disp_text =
+				G.FUNCS.get_poker_hand_info(G.hand.highlighted)
+			if disp_text == "cry-Cluster Bulwark" then
+				card_eval_status_text(
+					context.blueprint_card or card,
+					"extra",
+					nil,
+					nil,
+					nil,
+					{ message = localize("k_upgrade_ex") }
+				)
+				update_hand_text({ sound = "button", volume = 0.7, pitch = 0.8, delay = 0.3 }, {
+					handname = localize(text, "poker_hands"),
+					chips = G.GAME.hands[text].chips,
+					mult = G.GAME.hands[text].mult,
+					level = G.GAME.hands[text].level,
+				})
+				level_up_hand(context.blueprint_card or card, text, nil, 6)
+				update_hand_text(
+					{ sound = "button", volume = 0.7, pitch = 1.1, delay = 0 },
+					{ mult = 0, chips = 0, handname = "", level = "" }
+				)
+			end
+		end
+	end,
 }
 local test4 = {
 	object_type = "Joker",
@@ -161,7 +195,6 @@ local test4 = {
 	end,
 	update = function(self, card, front)
 		if G.STAGE == G.STAGES.RUN then
-			G.GAME.round_resets.discards = G.GAME.round_resets.discards + 1
 			other_joker = G.jokers.cards[1]
 			if other_joker then
 				if G.GAME.current_round.discards_used % 3 == 0 then
@@ -190,4 +223,84 @@ local test4 = {
 		end
 	end,
 }
-return { items = { test, test2, test3, test4 }, disabled = true }
+local kidnap2 = {
+	object_type = "Joker",
+	name = "cry-kidnap2",
+	key = "kidnap2",
+	pos = { x = 1, y = 2 },
+	config = {
+		extra = 1,
+	},
+	rarity = 1,
+	cost = 4,
+	loc_txt = {
+		name = "asd",
+		text = {
+			"Earn {C:money}$#1#{} at end of round",
+			"per unique {C:attention}Type Mult{} or",
+			"{C:attention}Type Chips{} Joker sold this run",
+			"{C:inactive}(Currently {C:money}$#2#{C:inactive})",
+		},
+	},
+	blueprint_compat = false,
+	loc_vars = function(self, info_queue, center)
+		local value = 0
+		if G.GAME and G.GAME.jokers_sold then
+			for _, v in ipairs(G.GAME.jokers_sold) do
+				if
+					G.P_CENTERS[v].effect == "Type Mult"
+					or G.P_CENTERS[v].effect == "Cry Type Mult"
+					or G.P_CENTERS[v].effect == "Cry Type Chips"
+					or G.P_CENTERS[v].effect == "Boost Kidnapping"
+					or (
+						G.P_CENTERS[v].name == "Sly Joker"
+						or G.P_CENTERS[v].name == "Wily Joker"
+						or G.P_CENTERS[v].name == "Clever Joker"
+						or G.P_CENTERS[v].name == "Devious Joker"
+						or G.P_CENTERS[v].name == "Crafty Joker"
+					)
+				then
+					value = value + 1
+				end
+			end
+		end
+		return { vars = { center.ability.extra, center.ability.extra * value } }
+	end,
+	atlas = "atlasone",
+	calc_dollar_bonus = function(self, card)
+		local value = 0
+		for _, v in ipairs(G.GAME.jokers_sold) do
+			if
+				G.P_CENTERS[v].effect == "Type Mult"
+				or G.P_CENTERS[v].effect == "Cry Type Mult"
+				or G.P_CENTERS[v].effect == "Cry Type Chips"
+				or G.P_CENTERS[v].effect == "Boost Kidnapping"
+				or (
+					G.P_CENTERS[v].name == "Sly Joker"
+					or G.P_CENTERS[v].name == "Wily Joker"
+					or G.P_CENTERS[v].name == "Clever Joker"
+					or G.P_CENTERS[v].name == "Devious Joker"
+					or G.P_CENTERS[v].name == "Crafty Joker"
+				)
+			then
+				value = value + 1
+			end
+		end
+		if value == 0 then
+			return
+		end
+		return card.ability.extra * value
+	end,
+	cry_credits = {
+		idea = {
+			"Jevonn",
+		},
+		art = {
+			"Jevonn",
+		},
+		code = {
+			"Jevonn",
+		},
+	},
+}
+return { items = { test, test2, test3, test4, kidnap2 }, disabled = true }

Cryptid/items/voucher.lua

@@ -37,20 +37,22 @@ local copies = { --Double tags become Triple Tags and are 2X as common
 	init = function(self)
 		--Copies and upgrades
 		local tinit = Tag.init
-		function Tag:init(tag, y, z)
-			if tag == "tag_double" and G.GAME.used_vouchers.v_cry_copies then
-				tag = "tag_cry_triple"
+		function Tag:init(tag, for_collection, _blind_type)
+			if not for_collection then
+				if tag == "tag_double" and G.GAME.used_vouchers.v_cry_copies then
+					tag = "tag_cry_triple"
+				end
+				if (tag == "tag_double" or tag == "tag_cry_triple") and G.GAME.used_vouchers.v_cry_tag_printer then
+					tag = "tag_cry_quadruple"
+				end
+				if
+					(tag == "tag_double" or tag == "tag_cry_triple" or tag == "tag_cry_quadruple")
+					and G.GAME.used_vouchers.v_cry_clone_machine
+				then
+					tag = "tag_cry_quintuple"
+				end
 			end
-			if (tag == "tag_double" or tag == "tag_cry_triple") and G.GAME.used_vouchers.v_cry_tag_printer then
-				tag = "tag_cry_quadruple"
-			end
-			if
-				(tag == "tag_double" or tag == "tag_cry_triple" or tag == "tag_cry_quadruple")
-				and G.GAME.used_vouchers.v_cry_clone_machine
-			then
-				tag = "tag_cry_quintuple"
-			end
-			return tinit(self, tag, y, z)
+			return tinit(self, tag, for_collection, _blind_type)
 		end
 	end,
 }

Cryptid/lib/ascended.lua

@@ -8,10 +8,31 @@ G.FUNCS.cry_asc_UI_set = function(e)
 	end
 	e.config.object:update_text()
 end
+
+-- Needed because get_poker_hand_info isnt called at the end of the road
+local evaluateroundref = G.FUNCS.evaluate_round
+function G.FUNCS.evaluate_round()
+	evaluateroundref()
+	-- This is just the easiest way to check if its gold because lua is annoying
+	if G.C.UI_CHIPS[1] == G.C.GOLD[1] then
+		ease_colour(G.C.UI_CHIPS, G.C.BLUE, 0.3)
+		ease_colour(G.C.UI_MULT, G.C.RED, 0.3)
+	end
+end
+
 -- this is a hook to make funny "x of a kind"/"flush x" display text
 local pokerhandinforef = G.FUNCS.get_poker_hand_info
 function G.FUNCS.get_poker_hand_info(_cards)
 	local text, loc_disp_text, poker_hands, scoring_hand, disp_text = pokerhandinforef(_cards)
+	-- Display text if played hand contains a Cluster and a Bulwark
+	-- Not Ascended hand related but this hooks in the same spot so i'm lumping it here anyways muahahahahahaha
+	if text == "cry_Clusterfuck" then
+		if next(poker_hands["cry_Bulwark"]) then
+			disp_text = "cry-Cluster Bulwark"
+			loc_disp_text = localize(disp_text, "poker_hands")
+		end
+	end
+
 	if G.SETTINGS.language == "en-us" then
 		if #scoring_hand > 5 and (text == "Flush Five" or text == "Five of a Kind") then
 			local rank_array = {}
@@ -108,7 +129,14 @@ function G.FUNCS.get_poker_hand_info(_cards)
 		["cry_UltPair"] = 8,
 		["cry_WholeDeck"] = 52,
 	}
-
+	-- Change mult and chips colors if hand is ascended
+	if hand_table[text] and next(scoring_hand) and #scoring_hand > hand_table[text] then
+		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)
+	else
+		ease_colour(G.C.UI_CHIPS, G.C.BLUE, 0.3)
+		ease_colour(G.C.UI_MULT, G.C.RED, 0.3)
+	end
 	-- this is where all the logic for asc hands is. currently it's very simple but if you want more complex logic, here's the place to do it
 	if hand_table[text] and Cryptid.enabled("set_cry_poker_hand_stuff") == true then
 		G.GAME.current_round.current_hand.cry_asc_num = G.GAME.used_vouchers.v_cry_hyperspacetether
@@ -124,7 +152,12 @@ function G.FUNCS.get_poker_hand_info(_cards)
 	end
 
 	G.GAME.current_round.current_hand.cry_asc_num_text = (
-		G.GAME.current_round.current_hand.cry_asc_num and G.GAME.current_round.current_hand.cry_asc_num > 0
+		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(0))
+			or G.GAME.current_round.current_hand.cry_asc_num > 0
+		)
 	)
 			and " (+" .. G.GAME.current_round.current_hand.cry_asc_num .. ")"
 		or ""
@@ -148,14 +181,21 @@ function Cryptid.ascend(num) -- edit this function at your leisure
 				* (
 					1
 					+ 0.1
-					+ (0.05 * (G.GAME.sunnumber or 0))
-					+ ((0.1 + (0.05 * (G.GAME.sunnumber or 0))) * (G.GAME.current_round.current_hand.cry_asc_num or 0))
+					+ to_big(0.05 * (G.GAME.sunnumber or 0))
+					+ to_big(
+						(0.1 + (0.05 * (G.GAME.sunnumber or 0)))
+							* to_big(G.GAME.current_round.current_hand.cry_asc_num or 0)
+					)
 				)
 		)
 	else
 		return math.max(
 			num,
-			num * ((1.25 + (0.05 * (G.GAME.sunnumber or 0))) ^ (G.GAME.current_round.current_hand.cry_asc_num or 0))
+			num
+				* to_big(
+					(1.25 + (0.05 * (G.GAME.sunnumber or 0)))
+						^ to_big(G.GAME.current_round.current_hand.cry_asc_num or 0)
+				)
 		)
 	end
 end

Cryptid/lib/calculate.lua

@@ -263,7 +263,11 @@ function Card:cry_double_scale_calc(orig_ability, in_context_scaling)
 		end
 		if #dbl_info.scaler == 2 then
 			if
-				not (not orig_ability[dbl_info.scaler[1]] or not orig_ability[dbl_info.scaler[1]][dbl_info.scaler[2]])
+				not (
+					not orig_ability[dbl_info.scaler[1]]
+					or type(orig_ability[dbl_info.scaler[1]]) == "number"
+					or not orig_ability[dbl_info.scaler[1]][dbl_info.scaler[2]]
+				)
 			then
 				orig_scale_scale = orig_ability[dbl_info.scaler[1]][dbl_info.scaler[2]]
 			end
@@ -474,7 +478,7 @@ function SMODS.calculate_context(context, return_table)
 			SMODS.trigger_effects(effects, _card)
 		end
 	end
-	smcc(context, return_table)
+	local ret = smcc(context, return_table)
 	for k, v in pairs(SMODS.Events) do
 		if G.GAME.events and G.GAME.events[k] then
 			context.post_jokers = true
@@ -482,6 +486,7 @@ function SMODS.calculate_context(context, return_table)
 			context.post_jokers = nil
 		end
 	end
+	return ret
 end
 
 function Card:calculate_joker(context)
@@ -592,7 +597,12 @@ function Card:calculate_joker(context)
 	if active_side.ability.cry_rigged then
 		G.GAME.probabilities.normal = ggpn
 	end
-	active_side:cry_double_scale_calc(orig_ability, in_context_scaling)
+	if
+		(next(find_joker("cry-Scalae")) or next(find_joker("cry-Double Scale")))
+		or (active_side.ability.name == "cry-Exponentia" or "cry-Compound Interest")
+	then
+		active_side:cry_double_scale_calc(orig_ability, in_context_scaling)
+	end
 	return ret, trig
 end
 
@@ -615,6 +625,9 @@ function Cryptid.exponentia_scale_mod(self, orig_scale_scale, orig_scale_base, n
 				end
 			end
 		end
+		if not dbl_info then
+			dbl_info = {}
+		end
 		if G.GAME.cry_double_scale[jkr.sort_id] and not G.GAME.cry_double_scale[jkr.sort_id].scaler then
 			dbl_info.base = { "extra", "Emult" }
 			dbl_info.scaler = { "extra", "Emult_mod" }

Cryptid/lib/content.lua

@@ -1,5 +1,12 @@
 -- content.lua - adds SMODS objects for content that should always be loaded
 
+SMODS.Atlas({
+	key = "poker_hands",
+	path = "hands.png",
+	px = 53,
+	py = 13,
+})
+
 SMODS.PokerHand({
 	key = "Bulwark",
 	visible = false,
@@ -14,13 +21,18 @@ SMODS.PokerHand({
 		{ "S_A", true, "m_stone" },
 		{ "S_A", true, "m_stone" },
 	},
+	atlas = "poker_hands",
+	pos = { x = 0, y = 0 },
 	evaluate = function(parts, hand)
 		if Cryptid.enabled("set_cry_poker_hand_stuff") ~= true or Cryptid.enabled("c_cry_asteroidbelt") ~= true then
 			return {}
 		end
 		local stones = {}
 		for i, card in ipairs(hand) do
-			if card.config.center_key == "m_stone" or (card.config.center.no_rank and card.config.center.no_suit) then
+			if
+				card.config.center_key == "m_stone"
+				or (card.config.center.no_rank and card.config.center.no_suit and not card.config.center.not_stoned)
+			then
 				stones[#stones + 1] = card
 			end
 		end
@@ -35,7 +47,7 @@ SMODS.PokerHandPart({
 		end
 		local eligible_cards = {}
 		for i, card in ipairs(hand) do
-			if true then --card.ability.name ~= "Gold Card"
+			if not card.config.center.not_fucked then --card.ability.name ~= "Gold Card"
 				eligible_cards[#eligible_cards + 1] = card
 			end
 		end
@@ -62,6 +74,8 @@ SMODS.PokerHand({
 		{ "S_6", true },
 		{ "C_5", true },
 	},
+	atlas = "poker_hands",
+	pos = { x = 0, y = 1 },
 	evaluate = function(parts, hand)
 		local other_hands = next(parts._flush) or next(parts._straight) or next(parts._all_pairs)
 		if next(parts.cry_cfpart) then
@@ -89,6 +103,8 @@ SMODS.PokerHand({
 		{ "H_7", true },
 		{ "H_7", true },
 	},
+	atlas = "poker_hands",
+	pos = { x = 0, y = 2 },
 	evaluate = function(parts, hand)
 		if Cryptid.enabled("set_cry_poker_hand_stuff") ~= true or Cryptid.enabled("c_cry_marsmoons") ~= true then
 			return
@@ -439,6 +455,10 @@ SMODS.Sound({
 	key = "studiofromhelsinki",
 	path = "studiofromhelsinki.ogg",
 })
+SMODS.Sound({
+	key = "whapoosh",
+	path = "whapoosh.ogg",
+})
 SMODS.Sound({
 	key = "music_jimball",
 	path = "music_jimball.ogg",
@@ -631,12 +651,6 @@ SMODS.Atlas({
 	px = 71,
 	py = 95,
 })
-SMODS.Atlas({
-	key = "code",
-	path = "c_cry_code.png",
-	px = 71,
-	py = 95,
-})
 SMODS.Atlas({
 	key = "pack",
 	path = "pack_cry.png",
@@ -645,17 +659,17 @@ SMODS.Atlas({
 })
 SMODS.UndiscoveredSprite({
 	key = "Code",
-	atlas = "code",
-	path = "c_cry_code.png",
-	pos = { x = 2, y = 5 },
+	atlas = "atlasnotjokers",
+	path = "atlasnotjokers.png",
+	pos = { x = 9, y = 5 },
 	px = 71,
 	py = 95,
 })
 SMODS.UndiscoveredSprite({
 	key = "Unique",
-	atlas = "code",
-	path = "c_cry_code.png",
-	pos = { x = 2, y = 5 },
+	atlas = "atlasnotjokers",
+	path = "atlasnotjokers.png",
+	pos = { x = 9, y = 5 },
 	px = 71,
 	py = 95,
 })

Cryptid/lib/cross-mod.lua

@@ -103,3 +103,40 @@ if (SMODS.Mods["malverk"] or {}).can_load then
 		},
 	})
 end
+
+--Make extra modifiers display on the Next Ante Preview
+if (SMODS.Mods["AntePreview"] or {}).can_load then
+	local predict_hook = predict_next_ante
+	function predict_next_ante()
+		local small = "bl_small"
+		local big = "bl_big"
+		if G.GAME.modifiers.cry_big_boss_rate and pseudorandom("cry_big_boss") < G.GAME.modifiers.cry_big_boss_rate then
+			big = get_new_boss()
+		elseif G.GAME.modifiers.cry_rush_hour_ii then
+			small = get_new_boss()
+			big = get_new_boss()
+		end
+		local predictions = predict_hook()
+		if next(SMODS.find_card("j_cry_kittyprinter")) then
+			predictions.Small.tag = "tag_cry_cat"
+			predictions.Big.tag = "tag_cry_cat"
+		end
+		if G.GAME.modifiers.cry_no_tags then
+			for _, pred in pairs(predictions) do
+				pred.tag = nil
+			end
+		end
+		predictions.Small.blind = small
+		predictions.Big.blind = big
+		if G.P_BLINDS[predictions.Small.blind].boss then
+			G.GAME.bosses_used[predictions.Small.blind] = G.GAME.bosses_used[predictions.Small.blind] - 1
+		end
+		if G.P_BLINDS[predictions.Big.blind].boss then
+			G.GAME.bosses_used[predictions.Big.blind] = G.GAME.bosses_used[predictions.Big.blind] - 1
+		end
+		if G.GAME.modifiers.cry_no_small_blind then
+			predictions.Small = nil
+		end
+		return predictions
+	end
+end

Cryptid/lib/gameset.lua

@@ -15,7 +15,6 @@
 Cryptid.cross_mod_names = {
 	CardSleeves = "Card Sleeves",
 	Cryptid = "Cryptid",
-	jen = "Jen's Almanac",
 	sdm0sstuff = "SDM_0's Stuff",
 	magic_the_jokering = "Magic the Jokering",
 }
@@ -600,6 +599,9 @@ function Card:get_gameset(center)
 end
 local csa = Card.set_ability
 function Card:set_ability(center, y, z)
+	if not center then
+		return
+	end
 	if not center.config then
 		center.config = {} --crashproofing
 	end
@@ -1194,8 +1196,8 @@ SMODS.ContentSet({
 })
 SMODS.ContentSet({
 	key = "code",
-	atlas = "code",
-	pos = { x = 0, y = 0 }, --://CRASH
+	atlas = "atlasnotjokers",
+	pos = { x = 7, y = 0 }, --://CRASH
 	cry_order = -39,
 })
 SMODS.ContentSet({

Cryptid/lib/https.lua

@@ -1,16 +1,20 @@
 -- Update the Cryptid member count using HTTPS
-local member_fallback = 24000
-local https = require("SMODS.https")
+local member_fallback = 29332
+local succ, https = pcall(require, "SMODS.https")
 local last_update_time = 0
 local initial = true
 Cryptid.member_count = member_fallback
+if not succ then
+	sendErrorMessage("HTTP module could not be loaded. " .. tostring(https), "Cryptid")
+end
+
 local function apply_discord_member_count(code, body, headers)
 	if body then
-		Cryptid.member_count = string.match(body, '"approximate_member_count"%s*:%s*(%d+)')
+		Cryptid.member_count = string.match(body, '"approximate_member_count"%s*:%s*(%d+)') or Cryptid.member_count
 	end
 end
 function Cryptid.update_member_count()
-	if Cryptid_config.HTTPS then
+	if Cryptid_config.HTTPS and https and https.asyncRequest then
 		if (os.time() - last_update_time >= 60) or initial then
 			initial = false
 			last_update_time = os.time()

Cryptid/lib/misc.lua

@@ -184,6 +184,9 @@ function Cryptid.pluralize(str, vars)
 			table.insert(_table, v)
 		end
 		local num = vars[tonumber(string.match(str, ">(%d+)"))] -- gets reference variable
+		if type(num) == "string" then
+			num = (Big and to_number(to_big(num))) or num
+		end
 		local plural = _table[1] -- default
 		local checks = { [1] = "=" } -- checks 1 by default
 		local checks1mod = false -- tracks if 1 was modified
@@ -216,7 +219,7 @@ function Cryptid.pluralize(str, vars)
 		end)
 		for _, k in ipairs(keys) do
 			if fch(checks[k], "=") then
-				if math.abs(to_big(num) - k) < to_big(0.001) then
+				if to_big(math.abs(num - k)) < to_big(0.001) then
 					return string.sub(checks[k], 2, -1)
 				end
 			elseif fch(checks[k], "<") then
@@ -277,7 +280,7 @@ end
 
 -- checks for Jolly Jokers or cards that are supposed to be treated as jolly jokers
 function Card:is_jolly()
-	if self.ability.name == "Jolly Joker" then
+	if self.ability.name == "Jolly Joker" or self.ability.name == "cry-jollysus Joker" then
 		return true
 	end
 	if self.edition and self.edition.key == "e_cry_m" then
@@ -575,7 +578,7 @@ end
 function Cryptid.safe_get(t, ...)
 	local current = t
 	for _, k in ipairs({ ... }) do
-		if current[k] == nil then
+		if not current or current[k] == nil then
 			return false
 		end
 		current = current[k]
@@ -708,3 +711,52 @@ end
 function Cryptid.forced_edition()
 	return G.GAME.modifiers.cry_force_edition or G.GAME.used_vouchers.v_cry_curate
 end
+
+-- Add Ctrl+Space for Pointer UI in Debug Mode
+local ckpu = Controller.key_press_update
+function Controller:key_press_update(key, dt)
+	ckpu(self, key, dt)
+	if
+		key == "space"
+		and G.STAGE == G.STAGES.RUN
+		and not _RELEASE_MODE
+		and (self.held_keys["lctrl"] or self.held_keys["rctrl"] or self.held_keys["lgui"] or self.held_keys["rgui"])
+		and not G.GAME.USING_CODE
+	then
+		G.GAME.USING_CODE = true
+		G.GAME.USING_POINTER = true
+		G.DEBUG_POINTER = true
+		G.ENTERED_CARD = ""
+		G.CHOOSE_CARD = UIBox({
+			definition = create_UIBox_pointer(card),
+			config = {
+				align = "cm",
+				offset = { x = 0, y = 10 },
+				major = G.ROOM_ATTACH,
+				bond = "Weak",
+				instance_type = "POPUP",
+			},
+		})
+		G.CHOOSE_CARD.alignment.offset.y = 0
+		G.ROOM.jiggle = G.ROOM.jiggle + 1
+		G.CHOOSE_CARD:align_to_major()
+	end
+end
+
+function Cryptid.roll_shiny()
+	local prob = 1
+	if next(SMODS.find_card("j_lucky_cat")) then
+		prob = 3
+	end
+	if pseudorandom("cry_shiny") < prob / 4096 then
+		return "shiny"
+	end
+	return "normal"
+end
+
+function Cryptid.is_shiny()
+	if Cryptid.roll_shiny() == "shiny" then
+		return true
+	end
+	return false
+end

Cryptid/lib/misprintize.lua

@@ -9,6 +9,7 @@ function Cryptid.misprintize_tbl(name, ref_tbl, ref_value, clear, override, stac
 			if (type(tbl[k]) ~= "table") or is_number(tbl[k]) then
 				if
 					is_number(tbl[k])
+					and not (k == "perish_tally")
 					and not (k == "id")
 					and not (k == "colour")
 					and not (k == "suit_nominal")
@@ -16,6 +17,8 @@ function Cryptid.misprintize_tbl(name, ref_tbl, ref_value, clear, override, stac
 					and not (k == "face_nominal")
 					and not (k == "qty")
 					and not (k == "x_mult" and v == 1 and not tbl.override_x_mult_check)
+					and not (k == "x_chips" and v == 1 and not tbl.override_x_chips_check)
+					and not (k == "h_x_chips")
 					and not (k == "selected_d6_face")
 				then --Temp fix, even if I did clamp the number to values that wouldn't crash the game, the fact that it did get randomized means that there's a higher chance for 1 or 6 than other values
 					if not Cryptid.base_values[name] then
@@ -38,18 +41,19 @@ function Cryptid.misprintize_tbl(name, ref_tbl, ref_value, clear, override, stac
 						big
 					)
 				end
-			else
+			elseif not (k == "immutable") then
 				for _k, _v in pairs(tbl[k]) do
 					if
 						is_number(tbl[k][_k])
 						and not (_k == "id")
-						and not (k == "perish_tally")
 						and not (k == "colour")
 						and not (_k == "suit_nominal")
 						and not (_k == "base_nominal")
 						and not (_k == "face_nominal")
 						and not (_k == "qty")
 						and not (k == "x_mult" and v == 1 and not tbl[k].override_x_mult_check)
+						and not (k == "x_chips" and v == 1 and not tbl[k].override_x_chips_check)
+						and not (k == "h_x_chips")
 						and not (_k == "selected_d6_face")
 					then --Refer to above
 						if not Cryptid.base_values[name] then

Cryptid/lib/modifiers.lua

@@ -307,6 +307,26 @@ end
 local updateref = Card.update
 function Card:update(dt)
 	updateref(self, dt)
+	if self.area then
+		if self.area.config.type == "discard" or self.area.config.type == "deck" then
+			return --prevent lagging event queues with unneeded flips
+		end
+	end
+	if self.sprite_facing == "back" and self.edition and self.edition.cry_double_sided then
+		self.sprite_facing = "front"
+		self.facing = "front"
+		if self.flipping == "f2b" then
+			self.flipping = "b2f"
+		end
+		self:dbl_side_flip()
+	end
+	if self.ability.cry_absolute then -- feedback loop... may be problematic
+		self.cry_absolute = true
+	end
+	if self.cry_absolute then
+		self.ability.cry_absolute = true
+		self.ability.eternal = true
+	end
 	if self.ability.pinned then
 		self.pinned = true
 	end -- gluing these variables together
@@ -371,7 +391,7 @@ function cry_best_interest_cap()
 	local vouchers = {
 		SMODS.find_card("v_seed_money"),
 		SMODS.find_card("v_money_tree"),
-		SMODS.find_card("v_cry_money_beanstalk"),
+		SMODS.find_card("v_cry_moneybean"),
 	}
 	for _, table in ipairs(vouchers) do
 		for i, v in ipairs(table) do
@@ -382,11 +402,25 @@ function cry_best_interest_cap()
 	end
 	return best
 end
-
 local evaluateroundref = G.FUNCS.evaluate_round
 G.FUNCS.evaluate_round = function()
 	G.GAME.interest_cap = cry_best_interest_cap() -- blehhhhhh
-	evaluateroundref()
+	--Semicolon Stuff
+	if G.GAME.current_round.semicolon then
+		add_round_eval_row({ dollars = 0, name = "blind1", pitch = 0.95, saved = true })
+		G.E_MANAGER:add_event(Event({
+			trigger = "before",
+			delay = 1.3 * math.min(G.GAME.blind.dollars + 2, 7) / 2 * 0.15 + 0.5,
+			func = function()
+				G.GAME.blind:defeat()
+				return true
+			end,
+		}))
+		delay(0.2)
+		add_round_eval_row({ name = "bottom", dollars = 0 })
+	else
+		return evaluateroundref()
+	end
 end
 function Cryptid.edition_to_table(edition) -- look mom i figured it out (this does NOT need to be a function)
 	if edition then
@@ -749,7 +783,7 @@ function Tag:set_ability()
 		G.GAME.cry_shiny_choices[G.GAME.round_resets.ante] = G.GAME.cry_shiny_choices[G.GAME.round_resets.ante] or {}
 
 		if not G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] then
-			G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] = cry_rollshiny()
+			G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] = Cryptid.roll_shiny()
 		end
 		self.ability.shiny = G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] == "shiny"
 			and true

Cryptid/lib/overrides.lua

@@ -176,6 +176,7 @@ function Game:init_game_object()
 	g.monstermult = 1
 	-- Create G.GAME.events when starting a run, so there's no errors
 	g.events = {}
+	g.jokers_sold = {}
 	return g
 end
 
@@ -190,7 +191,7 @@ function reset_castle_card()
 	G.GAME.current_round.cry_dropshot_card.suit = "Spades"
 	local valid_castle_cards = {}
 	for k, v in ipairs(G.playing_cards) do
-		if v.ability.effect ~= "Stone Card" then
+		if not SMODS.has_no_suit(v) then
 			valid_castle_cards[#valid_castle_cards + 1] = v
 		end
 	end
@@ -285,7 +286,7 @@ function Game:update(dt)
 	if G.P_CENTERS and G.P_CENTERS.c_cry_pointer and cry_pointer_dt > 0.5 then
 		cry_pointer_dt = 0
 		local pointerobj = G.P_CENTERS.c_cry_pointer
-		pointerobj.pos.x = (pointerobj.pos.x == 4) and 5 or 4
+		pointerobj.pos.x = (pointerobj.pos.x == 11) and 12 or 11
 	end
 	if G.P_CENTERS and G.P_CENTERS.j_cry_jimball and cry_jimball_dt > 0.1 then
 		cry_jimball_dt = 0
@@ -474,6 +475,38 @@ function Card:set_cost()
 		self.sell_cost_label = 0
 	end
 end
+local sell_card_stuff = Card.sell_card
+function Card:sell_card()
+	if self.config.center.set == "Joker" then
+		if self.config.center.key ~= "j_cry_necromancer" then
+			local contained = false
+			for _, v in ipairs(G.GAME.jokers_sold) do
+				if v == self.config.center.key then
+					contained = true
+					break
+				end
+			end
+			if not contained then
+				table.insert(G.GAME.jokers_sold, self.config.center.key)
+			end
+		end
+		-- Add Jolly Joker to the pool if card was treated as Jolly Joker
+		if self:is_jolly() then
+			local contained = false
+			for _, v in ipairs(G.GAME.jokers_sold) do
+				if v == "j_jolly" then
+					contained = true
+					break
+				end
+			end
+			if not contained then
+				table.insert(G.GAME.jokers_sold, "j_jolly")
+			end
+		end
+	end
+	--G.P_CENTERS.j_jolly
+	sell_card_stuff(self)
+end
 
 -- Modify to display badges for credits and some gameset badges
 -- todo: make this optional
@@ -681,14 +714,11 @@ function create_card(_type, area, legendary, _rarity, skip_materialize, soulable
 		ps = Cryptid.predict_pseudoseed
 	end
 	local center = G.P_CENTERS.b_red
-	if (_type == "Joker") and G.GAME and G.GAME.modifiers and G.GAME.modifiers.all_rnj then
+	if (_type == "Joker" or _type == "Meme") and G.GAME and G.GAME.modifiers and G.GAME.modifiers.all_rnj then
 		forced_key = "j_cry_rnjoker"
 	end
 	local function aeqviable(center)
-		return center.unlocked
-			and not Cryptid.no(center, "doe")
-			and not Cryptid.no(center, "aeq")
-			and not (center.rarity == 6 or center.rarity == "cry_exotic")
+		return center.unlocked and not Cryptid.no(center, "doe") and not (center.rarity == "cry_exotic")
 	end
 	if _type == "Joker" and not _rarity and not legendary then
 		if not G.GAME.aequilibriumkey then
@@ -1002,12 +1032,12 @@ function create_card(_type, area, legendary, _rarity, skip_materialize, soulable
 	if not (card.edition and (card.edition.cry_oversat or card.edition.cry_glitched)) then
 		Cryptid.misprintize(card)
 	end
-	if _type == "Joker" and G.GAME.modifiers.cry_common_value_quad then
+	if card.ability.set == "Joker" and G.GAME.modifiers.cry_common_value_quad then
 		if card.config.center.rarity == 1 then
 			Cryptid.misprintize(card, { min = 4, max = 4 }, nil, true)
 		end
 	end
-	if _type == "Joker" and G.GAME.modifiers.cry_uncommon_value_quad then
+	if card.ability.set == "Joker" and G.GAME.modifiers.cry_uncommon_value_quad then
 		if card.config.center.rarity == 2 then
 			Cryptid.misprintize(card, { min = 4, max = 4 }, nil, true)
 		end

Cryptid/lib/ui.lua

@@ -241,6 +241,9 @@ function Card:move(dt)
 	end
 end
 
+function Card:get_banned_force_popup_areas()
+	return { G.pack_cards }
+end
 -- This defines when we should show a card's description even when it's not hovered
 function Card:force_popup()
 	-- Must be selected
@@ -262,8 +265,10 @@ function Card:force_popup()
 			return false
 		end
 		-- Other areas where it doesn't work well
-		if self.area == G.pack_cards then
-			return false
+		for i, v in ipairs(self:get_banned_force_popup_areas()) do
+			if self.area == v then
+				return false
+			end
 		end
 		return true
 	end
@@ -285,7 +290,7 @@ function CardArea:can_highlight(card)
 	if self.config.collection then
 		return true
 	end
-	return cach(self)
+	return cach(self, card)
 end
 
 -- Prevent hover UI from being redrawn
@@ -296,3 +301,209 @@ function Card:hover()
 	end
 	ch(self)
 end
+
+local G_UIDEF_use_and_sell_buttons_ref = G.UIDEF.use_and_sell_buttons
+function G.UIDEF.use_and_sell_buttons(card)
+	local abc = G_UIDEF_use_and_sell_buttons_ref(card)
+	-- Allow code cards to be reserved
+	if (card.area == G.pack_cards and G.pack_cards) and card.ability.consumeable then --Add a use button
+		if card.ability.set == "Code" then
+			return {
+				n = G.UIT.ROOT,
+				config = { padding = -0.1, colour = G.C.CLEAR },
+				nodes = {
+					{
+						n = G.UIT.R,
+						config = {
+							ref_table = card,
+							r = 0.08,
+							padding = 0.1,
+							align = "bm",
+							minw = 0.5 * card.T.w - 0.15,
+							minh = 0.7 * card.T.h,
+							maxw = 0.7 * card.T.w - 0.15,
+							hover = true,
+							shadow = true,
+							colour = G.C.UI.BACKGROUND_INACTIVE,
+							one_press = true,
+							button = "use_card",
+							func = "can_reserve_card",
+						},
+						nodes = {
+							{
+								n = G.UIT.T,
+								config = {
+									text = localize("b_pull"),
+									colour = G.C.UI.TEXT_LIGHT,
+									scale = 0.55,
+									shadow = true,
+								},
+							},
+						},
+					},
+					{
+						n = G.UIT.R,
+						config = {
+							ref_table = card,
+							r = 0.08,
+							padding = 0.1,
+							align = "bm",
+							minw = 0.5 * card.T.w - 0.15,
+							maxw = 0.9 * card.T.w - 0.15,
+							minh = 0.1 * card.T.h,
+							hover = true,
+							shadow = true,
+							colour = G.C.UI.BACKGROUND_INACTIVE,
+							one_press = true,
+							button = "Do you know that this parameter does nothing?",
+							func = "can_use_consumeable",
+						},
+						nodes = {
+							{
+								n = G.UIT.T,
+								config = {
+									text = localize("b_use"),
+									colour = G.C.UI.TEXT_LIGHT,
+									scale = 0.45,
+									shadow = true,
+								},
+							},
+						},
+					},
+					{ n = G.UIT.R, config = { align = "bm", w = 7.7 * card.T.w } },
+					{ n = G.UIT.R, config = { align = "bm", w = 7.7 * card.T.w } },
+					{ n = G.UIT.R, config = { align = "bm", w = 7.7 * card.T.w } },
+					{ n = G.UIT.R, config = { align = "bm", w = 7.7 * card.T.w } },
+					-- Betmma can't explain it, neither can I
+				},
+			}
+		end
+	end
+	-- Remove sell button from cursed jokers
+	if
+		card.area
+		and card.area.config.type == "joker"
+		and card.config
+		and card.config.center
+		and card.config.center.rarity == "cry_cursed"
+		and card.ability.name ~= "cry-Monopoly"
+	then
+		table.remove(abc.nodes[1].nodes, 1)
+	end
+	if card.config and card.config.center and card.config.center.key == "c_cry_potion" then
+		table.remove(abc.nodes[1].nodes, 1)
+	end
+	if
+		card.area
+		and card.edition
+		and (card.area == G.jokers or card.area == G.consumeables or card.area == G.hand)
+		and card.edition.cry_double_sided
+		and not Card.no(card, "dbl")
+	then
+		local use = {
+			n = G.UIT.C,
+			config = { align = "cr" },
+			nodes = {
+				{
+					n = G.UIT.C,
+					config = {
+						ref_table = card,
+						align = "cr",
+						maxw = 1.25,
+						padding = 0.1,
+						r = 0.08,
+						hover = true,
+						shadow = true,
+						colour = G.C.UI.BACKGROUND_INACTIVE,
+						one_press = true,
+						button = "flip",
+						func = "can_flip_card",
+					},
+					nodes = {
+						{ n = G.UIT.B, config = { w = 0.1, h = 0.3 } },
+						{
+							n = G.UIT.T,
+							config = {
+								text = localize("b_flip"),
+								colour = G.C.UI.TEXT_LIGHT,
+								scale = 0.3,
+								shadow = true,
+							},
+						},
+					},
+				},
+			},
+		}
+		local m = abc.nodes[1]
+		if not card.added_to_deck then
+			use.nodes[1].nodes = { use.nodes[1].nodes[2] }
+			if card.ability.consumeable then
+				m = abc
+			end
+		end
+		m.nodes = m.nodes or {}
+		table.insert(m.nodes, { n = G.UIT.R, config = { align = "cl" }, nodes = {
+			use,
+		} })
+		return abc
+	end
+	if
+		card.area
+		and (card.area == G.jokers or card.area == G.consumeables or card.area == G.hand)
+		and (not card.edition or not card.edition.cry_double_sided)
+		and not card.ability.eternal
+		and not Card.no(card, "dbl")
+	then
+		for i = 1, #card.area.cards do
+			if card.area.cards[i].edition and card.area.cards[i].edition.cry_double_sided then
+				local use = {
+					n = G.UIT.C,
+					config = { align = "cr" },
+					nodes = {
+						{
+							n = G.UIT.C,
+							config = {
+								ref_table = card,
+								align = "cr",
+								maxw = 1.25,
+								padding = 0.1,
+								r = 0.08,
+								hover = true,
+								shadow = true,
+								colour = G.C.UI.BACKGROUND_INACTIVE,
+								one_press = true,
+								button = "flip_merge",
+								func = "can_flip_merge_card",
+							},
+							nodes = {
+								{ n = G.UIT.B, config = { w = 0.1, h = 0.3 } },
+								{
+									n = G.UIT.T,
+									config = {
+										text = localize("b_merge"),
+										colour = G.C.UI.TEXT_LIGHT,
+										scale = 0.3,
+										shadow = true,
+									},
+								},
+							},
+						},
+					},
+				}
+				local m = abc.nodes[1]
+				if not card.added_to_deck then
+					use.nodes[1].nodes = { use.nodes[1].nodes[2] }
+					if card.ability.consumeable then
+						m = abc
+					end
+				end
+				m.nodes = m.nodes or {}
+				table.insert(m.nodes, { n = G.UIT.R, config = { align = "cl" }, nodes = {
+					use,
+				} })
+				return abc
+			end
+		end
+	end
+	return abc
+end

Cryptid/localization/de.lua

@@ -167,7 +167,7 @@ return {
 				name = "Die Uhr",
 				text = {
 					"+0.1X Blindgröße für alle",
-					"3 Sekunden, die du in dieser Ante verbringst.",
+					"12 Sekunden, die du in dieser Ante verbringst.",
 				},
 			},
 			bl_cry_hammer = {
@@ -195,7 +195,7 @@ return {
 				name = "Lavendelschleife",
 				text = {
 					"1.25X Blindgröße für alle",
-					"1.5 Sekunden, die du in dieser Runde verbringst",
+					"6 Sekunden, die du in dieser Runde verbringst",
 				},
 			},
 			bl_cry_obsidian_orb = {
@@ -1304,6 +1304,7 @@ return {
 			j_cry_kidnap = {
 				name = "Entführung",
 				text = {
+					"{C:red}Outdated Description{}",
 					"Verdiene {C:money}$#2#{} am Ende der Runde",
 					"Erhöhe Auszahlung um {C:money}$#1#{}",
 					"wenn ein {C:attention}Mult Typ{} oder",

Cryptid/localization/en-us.lua

@@ -7,6 +7,11 @@ return {
 					"Applies the {C:legendary,E:1}upsides{}",
 					"of {C:attention}every{} deck",
 				},
+				unlock = {
+					"Win a run",
+					"with {C:attention}Blank Deck",
+					"on {C:attention}Gold Stake",
+				},
 			},
 			b_cry_antimatter_balanced = {
 				name = "Antimatter Deck",
@@ -22,6 +27,11 @@ return {
 					"{C:attention}Common{} Jokers have",
 					"{C:attention}quadrupled{} values",
 				},
+				unlock = {
+					"Discover at least",
+					"{C:attention}200{} items from",
+					"your collection",
+				},
 			},
 			b_cry_beta = {
 				name = "Nostalgic Deck",
@@ -31,6 +41,10 @@ return {
 					"{C:attention}Nostalgic{} Blinds replace",
 					"their updated Blind",
 				},
+				unlock = {
+					"Win a run",
+					"on {C:attention}Pink Stake",
+				},
 			},
 			b_cry_blank = {
 				name = "Blank Deck",
@@ -44,6 +58,10 @@ return {
 					"After {C:blue}Play{} or {C:red}Discard{},",
 					"always draw {C:attention}5{} cards",
 				},
+				unlock = {
+					"Beat {C:attention}The Serpent",
+					"without {C:red}discarding",
+				},
 			},
 			b_cry_CCD = {
 				name = "CCD Deck",
@@ -51,6 +69,9 @@ return {
 					"Every card is also",
 					"a {C:attention}random{} consumable",
 				},
+				unlock = {
+					"Use {C:spectral}Hammerspace",
+				},
 			},
 			b_cry_conveyor = {
 				name = "Conveyor Deck",
@@ -60,6 +81,9 @@ return {
 					"{C:attention}duplicate{} rightmost Joker",
 					"and {C:attention}destroy{} leftmost Joker",
 				},
+				unlock = {
+					"Use {C:spectral}Analog",
+				},
 			},
 			b_cry_critical = {
 				name = "Critical Deck",
@@ -68,6 +92,9 @@ return {
 					"{C:green}#1# in 4{} chance for {X:dark_edition,C:white} ^2 {} Mult",
 					"{C:green}#1# in 8{} chance for {X:dark_edition,C:white} ^0.5 {} Mult",
 				},
+				unlock = {
+					"Obtain a {C:attention}Rigged Joker",
+				},
 			},
 			b_cry_e_deck = {
 				name = "Edition Deck",
@@ -76,6 +103,10 @@ return {
 					"Cards cannot change editions",
 					"{C:inactive}(Click to edit)",
 				},
+				unlock = {
+					"Discover every",
+					"{C:dark_edition}Edition",
+				},
 			},
 			b_cry_encoded = {
 				name = "Encoded Deck",
@@ -84,6 +115,9 @@ return {
 					"and a {C:cry_code,T:j_cry_copypaste}Copy/Paste{}",
 					"Only {C:cry_code}Code Cards{} appear in shop",
 				},
+				unlock = {
+					"Use {C:spectral}POINTER://",
+				},
 			},
 			b_cry_equilibrium = {
 				name = "Deck of Equilibrium",
@@ -94,6 +128,10 @@ return {
 					"start run with",
 					"{C:attention,T:v_overstock_plus}Overstock Plus",
 				},
+				unlock = {
+					"Have {C:attention}100 Jokers",
+					"at the same time",
+				},
 			},
 			b_cry_et_deck = {
 				name = "Enhancement Deck",
@@ -102,6 +140,9 @@ return {
 					"are {C:attention}#1#{}(s)",
 					"{C:inactive}(Click to edit)",
 				},
+				unlock = {
+					"Use {C:spectral}Vacuum",
+				},
 			},
 			b_cry_glowing = {
 				name = "Glowing Deck",
@@ -111,6 +152,10 @@ return {
 					"when Boss Blind is defeated",
 					"{X:cry_jolly,C:white,s:0.8} Jolly#1#Open#1#Winner#1#-#1#wawa#1#person", --peak loc_vars right here
 				},
+				unlock = {
+					"Win a run",
+					"with {C:attention}Beige Deck",
+				},
 			},
 			b_cry_infinite = {
 				name = "Infinite Deck",
@@ -119,6 +164,10 @@ return {
 					"number of cards",
 					"{C:attention}+1{} hand size",
 				},
+				unlock = {
+					"Play a hand containing",
+					"{C:attention}6{} or more cards",
+				},
 			},
 			b_cry_misprint = {
 				name = "Misprint Deck",
@@ -127,6 +176,9 @@ return {
 					"and poker hands",
 					"are {C:attention}randomized",
 				},
+				unlock = {
+					"Obtain a {C:dark_edition}Glitched{C:attention} Joker",
+				},
 			},
 			b_cry_redeemed = {
 				name = "Redeemed Deck",
@@ -134,6 +186,10 @@ return {
 					"When a {C:attention}Voucher{} is purchased,",
 					"gain its {C:attention}extra tiers",
 				},
+				unlock = {
+					"Discover every",
+					"{C:attention}Voucher",
+				},
 			},
 			b_cry_sk_deck = {
 				name = "Sticker Deck",
@@ -141,6 +197,9 @@ return {
 					"All cards are {C:attention}#1#{}",
 					"{C:inactive}(Click to edit)",
 				},
+				unlock = {
+					"Use {C:spectral}Lock",
+				},
 			},
 			b_cry_sl_deck = {
 				name = "Seal Deck",
@@ -149,6 +208,9 @@ return {
 					"Cards cannot change seals",
 					"{C:inactive}(Click to edit)",
 				},
+				unlock = {
+					"Use {C:spectral}Typhoon",
+				},
 			},
 			b_cry_spooky = {
 				name = "Spooky Deck",
@@ -157,6 +219,9 @@ return {
 					"After each {C:attention}Ante{}, create a",
 					"{C:cry_candy}Candy{} or {X:cry_cursed,C:white}Cursed{} Joker",
 				},
+				unlock = {
+					"Obtain a {C:cry_candy}Candy{C:attention} Joker",
+				},
 			},
 			b_cry_st_deck = {
 				name = "Suit Deck",
@@ -165,6 +230,9 @@ return {
 					"and cannot change suits",
 					"{C:inactive}(Click to edit)",
 				},
+				unlock = {
+					"Use {C:spectral}Replica",
+				},
 			},
 			b_cry_very_fair = {
 				name = "Very Fair Deck",
@@ -174,6 +242,10 @@ return {
 					"{C:attention}Vouchers{} no longer",
 					"appear in the shop",
 				},
+				unlock = {
+					"Win a run",
+					"with {C:attention}Blank Deck",
+				},
 			},
 			b_cry_wormhole = {
 				name = "Wormhole Deck",
@@ -183,6 +255,9 @@ return {
 					"likely to be {C:dark_edition}Negative",
 					"{C:attention}-2{} Joker slots",
 				},
+				unlock = {
+					"Obtain an {C:cry_exotic}Exotic{C:attention} Joker",
+				},
 			},
 			b_cry_legendary = {
 				name = "Legendary Deck",
@@ -191,6 +266,10 @@ return {
 					"{C:green}1 in 5{} chance to create another",
 					"when Boss Blind is defeated {C:inactive}(must have room){}",
 				},
+				unlock = {
+					"Have {C:attention}2 Legendary Jokers",
+					"at the same time",
+				},
 			},
 		},
 		Blind = {
@@ -205,7 +284,7 @@ return {
 				name = "The Clock",
 				text = {
 					"+0.1X blind requirements every",
-					"3 seconds spent this ante",
+					"12 seconds spent this ante",
 				},
 			},
 			bl_cry_hammer = {
@@ -233,7 +312,7 @@ return {
 				name = "Lavender Loop",
 				text = {
 					"1.25X blind requirements every",
-					"1.5 seconds spent this round",
+					"6 seconds spent this round",
 				},
 			},
 			bl_cry_obsidian_orb = {
@@ -309,6 +388,14 @@ return {
 					"rarity are debuffed",
 				},
 			},
+			bl_cry_scorch = {
+				name = "The Scorch",
+				text = {
+					"Must play 5 cards,",
+					"destroy played and",
+					"discarded cards",
+				},
+			},
 			bl_cry_pinkbow = {
 				name = "Pink Bow",
 				text = {
@@ -486,8 +573,9 @@ return {
 			c_cry_patch = {
 				name = "://PATCH",
 				text = {
-					"Remove all debuffs and stickers",
+					"Remove all {C:cry_code}debuffs",
 					"from currently visible items",
+					"{C:cry_code}Resets{} shop state",
 				},
 			},
 			c_cry_payload = {
@@ -1080,6 +1168,15 @@ return {
 					"for the next {C:attention}#2#{} round#<s>2#",
 				},
 			},
+			j_cry_cat_owl = {
+				name = "Cat Owl",
+				text = {
+					"{C:attention}Lucky Cards{} are also",
+					"considered {C:attention}Echo Cards",
+					"{C:attention}Echo Cards{} are also",
+					"considered {C:attention}Lucky Cards",
+				},
+			},
 			j_cry_chad = {
 				name = "Chad",
 				text = {
@@ -1148,6 +1245,15 @@ return {
 					"you {C:attention}click",
 				},
 			},
+			j_cry_clockwork = {
+				name = "Clockwork Joker",
+				text = {
+					"Retrigger held Steel Cards every {C:attention}#9#{} {C:inactive}(#1#){} hands",
+					"This Joker gains {X:mult,C:white}X#6#{} Mult {C:inactive}(X#5#){} every {C:attention}#10#{} {C:inactive}(#2#){} hands",
+					"Turn the first played card Steel every {C:attention}#11#{} {C:inactive}(#3#){} hands",
+					"Held Steel Cards give +{X:mult,C:white}X#8#{} Mult {C:inactive}(X#7#){} every {C:attention}#12#{} {C:inactive}(#4#){} hands",
+				},
+			},
 			j_cry_CodeJoker = {
 				name = "Code Joker",
 				text = {
@@ -1445,6 +1551,23 @@ return {
 					"All {C:attention}face{} cards are debuffed",
 				},
 			},
+			j_cry_eyeofhagane = {
+				name = "Eye of Hagane",
+				text = {
+					"All played {C:attention}face{} cards",
+					"become {C:attention}Steel{} cards",
+					"when scored",
+				},
+			},
+			j_cry_highfive = {
+				name = "High Five",
+				text = {
+					"If highest {C:attention}scoring rank{}",
+					"is {C:attention}5{}, convert {C:attention}all{} scoring cards",
+					"into {C:attention}5{}s",
+					"{s:0.8,C:inactive}Aces are considered 1",
+				},
+			},
 			j_cry_facile = {
 				name = "Facile",
 				text = {
@@ -1693,10 +1816,10 @@ return {
 			j_cry_kidnap = {
 				name = "Kidnapping",
 				text = {
-					"Earn {C:money}$#2#{} at end of round",
-					"Increase payout by {C:money}$#1#{}",
-					"when a {C:attention}Type Mult{} or",
-					"{C:attention}Type Chips{} Joker is sold",
+					"Earn {C:money}$#1#{} at end of round",
+					"per unique {C:attention}Type Mult{} or",
+					"{C:attention}Type Chips{} Joker sold this run",
+					"{C:inactive}(Currently {C:money}$#2#{C:inactive})",
 				},
 			},
 			j_cry_kittyprinter = {
@@ -2029,7 +2152,7 @@ return {
 				},
 			},
 			j_cry_notebook = {
-				name = "The Motebook",
+				name = "Motebook",
 				text = {
 					"{C:green} #1# in #2#{} chance to gain {C:dark_edition}+#6#{} Joker",
 					"slot#<s>6# per {C:attention}reroll{} in the shop",
@@ -2150,6 +2273,7 @@ return {
 					"{C:attention}#1#{} hand size,",
 					"increases by",
 					"{C:blue}#2#{} every round",
+					"{C:inactive}(Maximum {}{C:attention}#3#{}{C:inactive} hand size){}",
 				},
 				unlock = {
 					"Increase your {C:attention}handsize",
@@ -2673,6 +2797,14 @@ return {
 					"{C:inactive}(Currently {X:mult,C:white} X#2# {C:inactive} Mult)",
 				},
 			},
+			j_cry_wonka_bar = {
+				name = "Wonka Bar",
+				text = {
+					"Sell this card to",
+					"permanently gain {C:attention}+#1#{}",
+					"card selection limit",
+				},
+			},
 			j_cry_wrapped = {
 				name = "Wrapped Candy",
 				text = {
@@ -2817,8 +2949,8 @@ return {
 				text = {
 					"{S:0.8}({S:0.8,V:1}lvl.#1#{S:0.8}){}",
 					"Increase power of",
-					"{C:attention}Ascended{} hands by {X:gold,C:white}0.05{}",
-					"{C:inactive}(Currently {X:gold,C:white}X(#2#^asc){C:inactive})",
+					"{C:attention}Ascended{} hands by {X:gold,C:white}#2#{}",
+					"{C:inactive}(Currently {X:gold,C:white}X(#3#^asc){C:inactive})",
 				},
 			},
 		},
@@ -3001,7 +3133,7 @@ return {
 				name = "Conduit",
 				text = {
 					"Swap the {C:attention}editions{} of",
-					"{C:attention}2{} selected cards or {C:attention}Jokers{}",
+					"{C:attention}2{} selected playing cards or {C:attention}Jokers{}",
 				},
 			},
 			c_cry_gateway = {
@@ -4165,7 +4297,7 @@ return {
 				},
 			},
 			p_cry_empowered = {
-				name = "Spectral Pack [Empowered Tag]",
+				name = "Empowered Pack",
 				text = {
 					"Choose {C:attention}#1#{} of up to",
 					"{C:attention}#2#{C:spectral} Spectral{} card#<s>2#",
@@ -4318,6 +4450,7 @@ return {
 			["cry_Clusterfuck"] = Cryptid_config.family_mode and "Cluster" or "Clusterfuck",
 			["cry_UltPair"] = "Ultimate Pair",
 			["cry_WholeDeck"] = Cryptid_config.family_mode and "The Entire Deck" or "The Entire Fucking Deck",
+			["cry-Cluster Bulwark"] = "Clusterwark",
 		},
 		poker_hand_descriptions = {
 			["cry_Bulwark"] = {
@@ -4360,6 +4493,8 @@ return {
 			ach_cry_used_crash = "We Told You Not To",
 			ach_cry_what_have_you_done = "WHAT HAVE YOU DONE?!",
 			ach_cry_pin = "Pin of Shame",
+			ach_cry_youre_fucking_kidding = Cryptid_config.family_mode and "You Can't Be Serious"
+				or "You're Fucking Kidding",
 		},
 		achievement_descriptions = {
 			ach_cry_ace_in_crash = 'check_for_unlock({type = "ace_in_crash"})',
@@ -4383,6 +4518,7 @@ return {
 			ach_cry_used_crash = "Use ://CRASH",
 			ach_cry_what_have_you_done = "Delete or Sacrifice an Exotic Joker",
 			ach_cry_pin = "Lose a run to The Pin",
+			ach_cry_youre_fucking_kidding = "Discard " .. localize("cry_WholeDeck", "poker_hands"),
 		},
 		challenge_names = {
 			c_cry_ballin = "Ballin'",
@@ -4430,6 +4566,7 @@ return {
 			cry_mus_exotic = "Exotic Jokers (Joker in Latin by AlexZGreat)",
 			cry_mus_high_score = "High Score (Final Boss [For Your Computer] by AlexZGreat)",
 			cry_mus_alt_bg = "Background Music (by MathIsFun_)",
+			cry_force_tooltips = "Force Tooltips",
 			cry_family = "Family Friendly Mode",
 			cry_experimental = "Experimental Mode",
 
@@ -4503,6 +4640,7 @@ return {
 			cry_good_luck_ex = "Good luck!",
 			cry_sus_ex = "Impostor!",
 			cry_jolly_ex = "Jolly Up!",
+			cry_highfive_ex = "High Five!",
 			cry_m_minus = "m",
 			cry_m = "M",
 			cry_m_ex = "M!",

Cryptid/localization/es_419.lua

@@ -154,7 +154,7 @@ return {
 				name = "El reloj",
 				text = {
 					"+0.1X requisitos de ciega por cada",
-					"3 segundos pasados en esta apuesta",
+					"12 segundos pasados en esta apuesta",
 				},
 			},
 			bl_cry_hammer = {
@@ -182,7 +182,7 @@ return {
 				name = "Ciclo lavanda",
 				text = {
 					"1.25X requisitos de ciega por cada",
-					"1.5 segundos pasados en esta ronda",
+					"6 segundos pasados en esta ronda",
 				},
 			},
 			bl_cry_obsidian_orb = {
@@ -1278,6 +1278,7 @@ return {
 			j_cry_kidnap = {
 				name = "Secuestro",
 				text = {
+					"{C:red}Outdated Description{}",
 					"Gana {C:money}$#2#{} al final de la ronda",
 					"Aumenta el pago por {C:money}$#1#{}",
 					"cuando un comodín de {C:attention}tipo multi{}",

Cryptid/localization/es_ES.lua

@@ -206,7 +206,7 @@ return {
 				name = "El reloj",
 				text = {
 					"+0.1X requisitos de ciega por cada",
-					"3 segundos pasados en esta apuesta",
+					"12 segundos pasados en esta apuesta",
 				},
 			},
 			bl_cry_hammer = {
@@ -234,7 +234,7 @@ return {
 				name = "Ciclo lavanda",
 				text = {
 					"1.25X requisitos de ciega por cada",
-					"1.5 segundos pasados en esta ronda",
+					"6 segundos pasados en esta ronda",
 				},
 			},
 			bl_cry_obsidian_orb = {
@@ -1701,6 +1701,7 @@ return {
 			j_cry_kidnap = {
 				name = "Secuestro",
 				text = {
+					"{C:red}Outdated Description{}",
 					"Gana {C:money}$#2#{} al final de la ronda",
 					"Aumenta el pago por {C:money}$#1#{}",
 					"cuando un comodín de {C:attention}tipo multi{}",
@@ -2823,8 +2824,8 @@ return {
 				text = {
 					"{S:0.8}({S:0.8,V:1}lvl.#1#{S:0.8}){}",
 					"Aumenta el poder de",
-					"las {C:attention}manos ascendidas{} por {X:gold,C:white}0.05{}",
-					"{C:inactive}(Actual: {X:gold,C:white}X(#2#^asc){C:inactive})",
+					"las {C:attention}manos ascendidas{} por {X:gold,C:white}#2#{}",
+					"{C:inactive}(Actual: {X:gold,C:white}X(#3#^asc){C:inactive})",
 				},
 			},
 		},

Cryptid/localization/fr.lua

@@ -29,15 +29,44 @@ return {
 					"Applique les {C:legendary,E:1}effets{}",
 					"de {C:attention}tous{} les jeux",
 				},
+				unlock = {
+					"Gagner une partie",
+					"avec le {C:attention}Jeu à Blanc",
+					"et la {C:attention}Mise Or",
+				},
+			},
+			b_cry_antimatter_balanced = {
+				name = "Jeu d'Antimatière",
+				text = {
+					"Applique les {C:legendary,E:1}effets{}",
+					"de {C:attention}tous{} les jeux",
+					"battus avec la {C:attention}Mise Or",
+				},
+			},
+			b_cry_beige = {
+				name = "Jeu Beige",
+				text = {
+					"Les Jokers {C:attention}communs{} ont",
+					"leur valeurs {C:attention}quadruplées{}",
+				},
+				unlock = {
+					"Découvrir au moins",
+					"{C:attention}200{} objets dans",
+					"la collection",
+				},
 			},
 			b_cry_beta = {
-				name = "Nostalgic Deck",
+				name = "Jeu Nostalgique",
 				text = {
 					"{C:attention}Joker{} and {C:attention}Consumable{}",
 					"slots are {C:attention}combined",
 					"{C:attention}Nostalgic{} Blinds replace",
 					"their updated Blind",
 				},
+				unlock = {
+					"Gagner une partie",
+					"avec la {C:attention}Mise Rose",
+				},
 			},
 			b_cry_blank = {
 				name = "Jeu à blanc",
@@ -45,12 +74,16 @@ return {
 					"{C:inactive,E:1}Ne fait rien?",
 				},
 			},
-			b_cry_bontiful = {
+			b_cry_bountiful = {
 				name = "Jeu généreux",
 				text = {
 					"Après avoir utilisé une {C:blue}main{} ou une {C:red}défausse{},",
 					"{C:attention}5{} cartes sont toujours tirées",
 				},
+				unlock = {
+					"Battre {C:attention}le Serpent",
+					"sans {C:red}défausser",
+				},
 			},
 			b_cry_CCD = {
 				name = "Jeu CCD",
@@ -58,6 +91,9 @@ return {
 					"Chaque carte est aussi",
 					"un consommable {C:attention}aléatoire{}",
 				},
+				unlock = {
+					"Utiliser {C:spectral}Hammerspace",
+				},
 			},
 			b_cry_conveyor = {
 				name = "Jeu Convoyeur",
@@ -67,6 +103,9 @@ return {
 					"{C:attention}copie{} le Joker le plus à droite",
 					"and {C:attention}destroy{} le Joker le plus à gauche",
 				},
+				unlock = {
+					"Utiliser {C:spectral}Analogue",
+				},
 			},
 			b_cry_critical = {
 				name = "Jeu Critique",
@@ -75,6 +114,21 @@ return {
 					"{C:green}#1# chance#<s>1# sur 4{} d'obtenir {X:dark_edition,C:white} ^2 {} Multi",
 					"{C:green}#1# chance#<s>1# sur 8{} d'obtenir {X:dark_edition,C:white} ^0.5 {} Multi",
 				},
+				unlock = {
+					"Obtenir un {C:attention}Joker Truqué",
+				},
+			},
+			b_cry_e_deck = {
+				name = "Jeu Édition",
+				text = {
+					"Toutes les cartes sont {C:dark_edition}#1#{}",
+					"Les cartes ne peuvent pas changer d'édition",
+					"{C:inactive}(Cliquez pour modifier)",
+				},
+				unlock = {
+					"Découvrir toutes",
+					"les {C:dark_edition}Éditions",
+				},
 			},
 			b_cry_encoded = {
 				name = "Jeu Encodé",
@@ -83,6 +137,9 @@ return {
 					"et un {C:cry_code,T:j_cry_copypaste}Copier/Coller{}",
 					"Seules les {C:cry_code}Cartes Code{} apparaissent dans la boutique",
 				},
+				unlock = {
+					"Utiliser {C:spectral}POINTEUR://",
+				},
 			},
 			b_cry_equilibrium = {
 				name = "Jeu de l'Équilibrium",
@@ -93,6 +150,10 @@ return {
 					"démarre la partie avec",
 					"{C:attention,T:v_overstock_plus}Excédent Plus",
 				},
+				unlock = {
+					"Avoir {C:attention}100 Jokers",
+					"en même temps",
+				},
 			},
 			b_cry_et_deck = {
 				name = "Jeu Amélioré",
@@ -101,6 +162,9 @@ return {
 					"sont {C:attention}#1#{}(s)",
 					"{C:inactive}(Cliquez pour modifier)",
 				},
+				unlock = {
+					"Utiliser {C:spectral}Aspiration",
+				},
 			},
 			b_cry_glowing = {
 				name = "Jeu Brillant", --wtf is glowing?
@@ -110,6 +174,10 @@ return {
 					"quand la Boss Blinde est battue",
 					"{X:cry_jolly,C:white,s:0.8} Jolly#1#Open#1#Winner#1#-#1#wawa#1#person", --peak loc_vars right here
 				},
+				unlock = {
+					"Gagner une partie",
+					"avec le {C:attention}Jeu Beige",
+				},
 			},
 			b_cry_infinite = {
 				name = "Jeu Infini",
@@ -118,6 +186,10 @@ return {
 					"nombre de cartes",
 					"Taille de la main {C:attention}+1{} ",
 				},
+				unlock = {
+					"Jouer une main avec",
+					"{C:attention}6{} cartes ou plus",
+				},
 			},
 			b_cry_misprint = {
 				name = "Jeu Mal Imprimé",
@@ -126,6 +198,9 @@ return {
 					"et des mains de poker",
 					"sont {C:attention}aléatoires",
 				},
+				unlock = {
+					"Obtenir un Joker {C:dark_edition}Glitché{C:attention}",
+				},
 			},
 			b_cry_redeemed = {
 				name = "Jeu Acheté",
@@ -133,6 +208,20 @@ return {
 					"Quand un {C:attention}Bon d'Achat{} est acheté,",
 					"gagne son {C:attention}amélioration",
 				},
+				unlock = {
+					"Découvrir tous les",
+					"{C:attention}Coupons",
+				},
+			},
+			b_cry_sk_deck = {
+				name = "Jeu d'autocollants",
+				text = {
+					"Toutes les cartes sont {C:attention}#1#{}",
+					"{C:inactive}(Cliquez pour modifier)",
+				},
+				unlock = {
+					"Utiliser {C:spectral}Verrou",
+				},
 			},
 			b_cry_sl_deck = {
 				name = "Jeu scellé",
@@ -141,6 +230,9 @@ return {
 					"Les cartes ne peuvent pas changer de sceau",
 					"{C:inactive}(Cliquez pour modifier)",
 				},
+				unlock = {
+					"Utiliser {C:spectral}Typhon",
+				},
 			},
 			b_cry_spooky = {
 				name = "Jeu fantôme",
@@ -149,6 +241,9 @@ return {
 					"Après chaque {C:attention}Ante{}, crée un",
 					"{C:cry_candy}Bonbon{} ou un Joker {X:cry_cursed,C:white}Maudit{}",
 				},
+				unlock = {
+					"Obtenir un Joker {C:cry_candy}Bonbon{C:attention}",
+				},
 			},
 			b_cry_st_deck = {
 				name = "Jeu Couleur",
@@ -157,6 +252,9 @@ return {
 					"et ne peuvent pas changer de couleur",
 					"{C:inactive}(Cliquez pour modifier)",
 				},
+				unlock = {
+					"Utiliser {C:spectral}Réplique",
+				},
 			},
 			b_cry_very_fair = {
 				name = "Jeu Très Équilibré",
@@ -166,6 +264,10 @@ return {
 					"Les {C:attention}Bons d'Achat{} n'apparaissent",
 					"plus dans la boutique",
 				},
+				unlock = {
+					"Gagner une partie",
+					"avec le {C:attention}Jeu à Blanc",
+				},
 			},
 			b_cry_wormhole = {
 				name = "Jeu Vortex",
@@ -175,6 +277,9 @@ return {
 					"plus susceptibles d'être {C:dark_edition}Négatifs",
 					"{C:attention}-2{} emplacements de Joker",
 				},
+				unlock = {
+					"Obtenir un Joker {C:cry_exotic}Exotique{C:attention}",
+				},
 			},
 			b_cry_legendary = {
 				name = "Jeu Légendaire",
@@ -184,6 +289,10 @@ return {
 					"lorsque la Blinde de Boss est battue",
 					"{C:inactive}(selon la place disponible)",
 				},
+				unlock = {
+					"Avoir {C:attention}2 Jokers Légendaires",
+					"en même temps",
+				},
 			},
 		},
 		Blind = {
@@ -198,7 +307,7 @@ return {
 				name = "L'Horloge",
 				text = {
 					"+0.1X du score requis toutes",
-					"les 3 secondes passées dans cette Ante",
+					"les 12 secondes passées dans cette Ante",
 				},
 			},
 			bl_cry_hammer = {
@@ -226,7 +335,7 @@ return {
 				name = "Boucle Lavande",
 				text = {
 					"1.25X du score requis toutes les",
-					"1.5 secondes passées dans cette manche",
+					"6 secondes passées dans cette manche",
 				},
 			},
 			bl_cry_obsidian_orb = {
@@ -310,6 +419,14 @@ return {
 					"est altéré de manière aléatoire",
 				},
 			},
+			bl_cry_scorch = {
+				name = "La Grille",
+				text = {
+					"Must play 5 cards,",
+					"destroy played and",
+					"discarded cards",
+				},
+			},
 			bl_cry_sapphire_stamp = {
 				name = "Tampon Saphir",
 				text = {
@@ -352,6 +469,13 @@ return {
 					"les cartes visibles en main",
 				},
 			},
+			bl_cry_trophy = {
+				name = "Trophée Citron",
+				text = {
+					"Le multi ne peut pas",
+					"dépasser les jetons",
+				},
+			},
 			bl_cry_vermillion_virus = {
 				name = "Virus Vermillion",
 				text = {
@@ -409,8 +533,9 @@ return {
 				name = "://EFFACER",
 				text = {
 					"Enlève de manière {C:cry_code}permanente{}",
-					"un objet {C:cry_code}choisi{} de la boutique",
-					"{C:inactive,s:0.8}L'objet n'apparaîtra plus pendant le reste de la partie",
+					"un objet {C:cry_code}choisi{} de la boutique, il n'apparaîtra plus",
+					"pendant le reste de la partie",
+					"{C:inactive}Multiuse: ({C:cry_code}#1#{C:inactive} restantes)",
 				},
 			},
 			c_cry_divide = {
@@ -474,8 +599,9 @@ return {
 			c_cry_patch = {
 				name = "://PATCH",
 				text = {
-					"Enlève tous les affaiblissements et",
-					"stickers de tous les objets visibles",
+					"Enlève tous les {C:cry_code}affaiblissements",
+					"de tous les objets visibles",
+					"{C:cry_code}Réinitialise{} la boutique",
 				},
 			},
 			c_cry_payload = {
@@ -701,6 +827,8 @@ return {
 					"Cette carte peut être",
 					"{C:attention}retournée{} pour révéler",
 					"une autre carte",
+					"{C:inactive}(La face vierge peut être fusionnée",
+					"{C:inactive}avec une autre carte)",
 				},
 			},
 			e_cry_glass = {
@@ -709,7 +837,7 @@ return {
 				text = {
 					"{C:white,X:mult} X#3# {} Multi",
 					"{C:green}#1# chance#<s>1# sur #2#{} de",
-					"ne pas {C:red}détruite{} cette carte",
+					"ne pas {C:red}détruire{} cette carte",
 					"lorsqu'elle est déclenchée",
 				},
 			},
@@ -827,6 +955,16 @@ return {
 					"{C:inactive,s:0.8}Ne copie pas les Carte Googol Play Nostalgiques{}",
 				},
 			},
+			j_cry_altgoogol_balanced = {
+				name = "Carte Googol Play Nostalgique",
+				text = {
+					"Vendre cette carte crée",
+					"{C:attention}2{} copies du {C:attention}Joker{} le plus à gauche",
+					"{C:inactive,s:0.8}Ne copie pas les Carte Googol Play Nostalgiques{}",
+					"{C:inactive}(Selon la place disponible){}",
+					--todo: add "removes negative from copy" like Ankh/Invis Joker
+				},
+			},
 			j_cry_antennastoheaven = {
 				name = "...Like Antennas to Heaven",
 				text = {
@@ -858,6 +996,23 @@ return {
 					"un {C:attention}Joker{} aléatoire",
 				},
 			},
+			j_cry_astral_bottle_mainline = {
+				name = "Astres en Bouteille",
+				text = {
+					"Lorsque cette carte est vendue,",
+					"applique {C:dark_edition}Astral{}",
+					"et {C:attention}Périssable{} à",
+					"des Jokers {C:attention}Jokers{} différents, aléatoirement",
+				},
+			},
+			j_cry_astral_bottle_madness = {
+				name = "Astres en Bouteille",
+				text = {
+					"Lorsque cette carte est vendue,",
+					"applique {C:dark_edition}Astral{}",
+					"à un {C:attention}Joker{} aléatoire",
+				},
+			},
 			j_cry_big_cube = {
 				name = "Gros cube",
 				text = {
@@ -1025,6 +1180,20 @@ return {
 					"en une main",
 				},
 			},
+			j_cry_canvas_balanced = {
+				name = "Canevas",
+				text = {
+					"{C:attention}Redéclenche{} tous les {C:attention}Jokers{} à gauche",
+					"une fois pour {C:attention}chaque{C:attention} Joker{} non-{C:blue}Commun",
+					"à droite de ce Joker",
+					"{C:inactive}(Jusqu'à 2 redéclenchements)", -- wow il s'est fait grave nerf
+				},
+				unlock = {
+					"Redéclencher un {C:attention}Joker",
+					"{C:attention}114{} fois",
+					"en une main",
+				},
+			},
 			j_cry_caramel = {
 				name = "Caramel",
 				text = {
@@ -1033,6 +1202,15 @@ return {
 					"pour les {C:attention}#2#{} prochaines manches",
 				},
 			},
+			j_cry_cat_owl = {
+				name = "Chat Hibou",
+				text = {
+					"Les {C:attention}Cartes Chance{} sont aussi",
+					"considérées des {C:attention}Cartes Écho",
+					"Les {C:attention}Cartes Écho{} sont aussi",
+					"considérées des {C:attention}Cartes Chance",
+				},
+			},
 			j_cry_chad = {
 				name = "Chad",
 				text = {
@@ -1075,6 +1253,11 @@ return {
 					"Les Jokers {C:legendary}Légendaires{} donnent chacun {X:mult,C:white} X#3# {} Multi",
 					"Les Jokers {C:cry_exotic}Exotiques{} donnent chacun {X:mult,C:white} X#4# {} Multi",
 				},
+				unlock = {
+					"Obtenir un Joker {C:red}Rare{},",
+					"{C:cry_epic}Épique{} et {C:legendary}Légendaire{}",
+					"avant l'{C:attention}Ante 9",
+				},
 			},
 			j_cry_clash = {
 				name = "Le clash",
@@ -1097,6 +1280,15 @@ return {
 					"{C:attention}clic",
 				},
 			},
+			j_cry_clockwork = {
+				name = "Joker horloger",
+				text = {
+					"Redéclenche toutes les cartes Acier toutes les {C:attention}#9#{} {C:inactive}(#1#){} mains",
+					"Ce Joker gagne {X:mult,C:white}X#6#{} Multi {C:inactive}(X#5#){} toutes les {C:attention}#10#{} {C:inactive}(#2#){} mains",
+					"Ajoute Acier à la première carte jouée toutes les {C:attention}#11#{} {C:inactive}(#3#){} mains",
+					"Les cartes Acier en main donnent +{X:mult,C:white}X#8#{} Multi {C:inactive}(X#7#){} toutes les {C:attention}#12#{} {C:inactive}(#4#){} mains",
+				},
+			},
 			j_cry_CodeJoker = {
 				name = "Joker Code",
 				text = {
@@ -1109,6 +1301,18 @@ return {
 					"les {C:cry_code}Cartes Code",
 				},
 			},
+			j_cry_CodeJoker_modest = {
+				name = "Joker Code",
+				text = {
+					"Crée une {C:cry_code}Carte Code",
+					"{C:dark_edition}Négative{} lorsque",
+					"la {C:attention}Blinde Boss{} est sélectionnée",
+				},
+				unlock = {
+					"Découvrir {C:attention}toutes",
+					"les {C:cry_code}Cartes Code",
+				},
+			},
 			j_cry_coin = {
 				name = "Crypto-monnaie",
 				text = {
@@ -1128,6 +1332,24 @@ return {
 			},
 			j_cry_copypaste = {
 				name = "Copier/Coller",
+				text = {
+					"Lorsqu'une carte {C:cry_code}Code{} est utilisée,",
+					"{C:green}#1# chance#<s>1# sur #2#{} pour ajouter une copie",
+					"dans votre zone de consommables",
+					"{C:red}Ne fonctionne qu'une seule fois par manche{}",
+					"{C:inactive}(Selon la place disponible)",
+				},
+			},
+			j_cry_copypaste_modest = {
+				name = "Copy/Paste",
+				text = {
+					"Duplique les",
+					"cartes {C:cry_code}Code{} tirées",
+					"{C:inactive}(Selon la place disponible)",
+				},
+			},
+			j_cry_copypaste_madness = {
+				name = "Copy/Paste",
 				text = {
 					"Lorsqu'une carte {C:cry_code}Code{} est utilisée,",
 					"{C:green}#1# chance#<s>1# sur #2#{} pour ajouter une copie",
@@ -1239,6 +1461,14 @@ return {
 					"{C:inactive,s:0.8}(grandit comme +1, +2, +3)",
 				},
 			},
+			["j_cry_Double Scale_modest"] = {
+				name = "Double Échelle",
+				text = {
+					"Les {C:attention}Jokers{} augmentant",
+					"augmentent {C:attention}deux fois{} plus vite",
+					"{C:inactive,s:0.8}\"Ça s'appelle la double échelle, pas l'échelle quadratique!\"",
+				},
+			},
 			j_cry_dropshot = {
 				name = "Tir Amorti",
 				text = {
@@ -1320,6 +1550,15 @@ return {
 				},
 			},
 			j_cry_eternalflame = {
+				name = "Flamme éternelle",
+				text = {
+					"Ce Joker gagne {X:mult,C:white} X#1# {} Multi",
+					"pour chaque carte {C:attention}vendue{} avec",
+					"une {C:attention}valeur de vente{} de {C:money}$3{} ou plus",
+					"{C:inactive}(Actuellement {X:mult,C:white} X#2# {C:inactive} Multi)",
+				},
+			},
+			j_cry_eternalflame2 = {
 				name = "Flamme éternelle",
 				text = {
 					"Ce Joker gagne {X:mult,C:white} X#1# {} Multi",
@@ -1350,6 +1589,22 @@ return {
 					"Les cartes {C:attention}figure{} sont affaiblies",
 				},
 			},
+			j_cry_eyeofhagane = {
+				name = "l'Œil d'Hagane",
+				text = {
+					"Toutes les cartes {C:attention}Figure{} marquées",
+					"deviennent des cartes {C:attention}Acier{}",
+				},
+			},
+			j_cry_highfive = {
+				name = "High five",
+				text = {
+					"Si le rang le plus haut {C:attention}marqué{}",
+					"est un {C:attention}5{}, convertit {C:attention}toutes{} les cartes marquées",
+					"en des {C:attention}5{}",
+					"{s:0.8,C:inactive}Les As sont considérés des 1",
+				},
+			},
 			j_cry_facile = {
 				name = "Facile",
 				text = {
@@ -1376,6 +1631,11 @@ return {
 				text = {
 					"{C:attention}+#1#{} à la limite de sélection de cartes",
 				},
+				unlock = {
+					"Jouer une {C:attention}Quinte Flush{}",
+					"où la {C:attention}Quinte",
+					"n'est pas un {C:attention}Flush",
+				},
 			},
 			j_cry_flip_side = {
 				name = "De l'autre côté",
@@ -1535,6 +1795,13 @@ return {
 					"{C:attention}consommable{} est utilisé",
 				},
 			},
+			j_cry_huntingseason = {
+				name = "Saison de chasse",
+				text = {
+					"Si la main jouée contient exactement {C:attention}3{} cartes,",
+					"{C:red}détruit{} la carte du {C:attention}centre{} après qu'elle soit comptée",
+				},
+			},
 			j_cry_iterum = {
 				name = "Iterum",
 				text = {
@@ -1589,10 +1856,18 @@ return {
 			j_cry_kidnap = {
 				name = "Kidnapping",
 				text = {
-					"Gagne {C:money}$#2#{} à la fin de la manche",
-					"Augmente le gain de {C:money}$#1#{}",
-					"lorsqu'un Joker {C:attention}type {C:mult}multi{} ou",
-					"{C:attention}type chips{} est vendu",
+					"Donne {C:money}$#1#{} à la fin de la manche",
+					"pour chaque Joker {C:attention}type {C:mult}multi{}",
+					"ou {C:attention}type chips{} vendu durant cette partie",
+					"{C:inactive}(Actuellement {C:money}$#2#{C:inactive})",
+				},
+			},
+			j_cry_kittyprinter = {
+				name = "Chat-primante",
+				text = {
+					"{X:mult,C:white} X#1# {} Multi",
+					"Tous les badges {C:attention}passés{}",
+					"deviennent des {C:attention}Badges Chat{}",
 				},
 			},
 			j_cry_kooky = {
@@ -1787,6 +2062,15 @@ return {
 					"{C:blue,s:0.7}https://discord.gg/cryptid{}",
 				},
 			},
+			j_cry_membershipcardtwo_balanced = {
+				name = "Vieille carte de membre", --Could probably have a diff Name imo
+				text = {
+					"{C:chips}+#1#{} Jeton#<s>1# tous les {C:attention}8{} membres",
+					"dans le {C:attention}serveur Discord{} de {C:attention}Cryptid{}",
+					"{C:inactive}(Actuellement {C:chips}+#2#{C:inactive} Jeton#<s>2#)",
+					"{C:blue,s:0.7}https://discord.gg/cryptid{}",
+				},
+			},
 			j_cry_meteor = {
 				name = "Pluie de météores",
 				text = {
@@ -2014,12 +2298,20 @@ return {
 					"{C:inactive}(Actuellement {X:chips,C:white} X#1# {C:inactive} Jetons)",
 				},
 			},
+			j_cry_pity_prize = {
+				name = "Lot de pitié",
+				text = {
+					"Lorsqu'un {C:attention}Paquet Booster{} est passé,",
+					"donne un {C:attention}Badge{} aléatoire",
+				},
+			},
 			j_cry_pot_of_jokes = {
 				name = "Pot de Blagues",
 				text = {
 					"{C:attention}#1#{} à la taille de la main,",
 					"mais augmente de",
 					"{C:blue}#2#{} à la fin de la manche",
+					"{C:inactive}({}{C:attention}#3#{}{C:inactive} taille de main maximum){}",
 				},
 				unlock = {
 					"Augmenter la {C:attention}taille de la main",
@@ -2146,9 +2438,7 @@ return {
 				text = {
 					"Après avoir marqué {C:attention}#2#{} {C:inactive}[#1#]{}",
 					"cartes améliorées, vendre cette carte",
-					"crée un {C:attention}Joker{} {C:cry_epic}Épique{}",
-					"{C:inactive,s:0.8}Crée un {C:attention,s:0.8}Joker{} {C:red,s:0.8}Rare{}",
-					"{C:inactive,s:0.8}si les Jokers {C:cry_epic,s:0.8}Épiques{} {C:inactive,s:0.8}sont désactivés{}",
+					"crée un {C:attention}Joker{} {V:1}#3#",
 				},
 			},
 			j_cry_savvy = {
@@ -2167,6 +2457,7 @@ return {
 					"élève le degré de {C:attention}#2#{}",
 					"à la fin de la manche",
 					"{C:inactive,s:0.8}({C:attention,s:0.8}Scalae{C:inactive,s:0.8} exclu)",
+					"{C:inactive,s:0.8}(par ex. +1, +#3#, +#4#, +#5#)",
 				},
 			},
 			j_cry_scrabble = {
@@ -2216,14 +2507,29 @@ return {
 					"{C:attention}+#1#{} Joker max",
 					"{C:attention}+#1#{} Paquet Booster max",
 					"{C:attention}+#1#{} taille de main",
-					"{C:attention}+#1#{} emplacement de consommable",
-					"{C:attention}+#1#{} carte dans la boutique",
+					"{C:attention}+#1#{} emplacement#<s>1# de consommable",
+					"{C:attention}+#1#{} carte#<s>1# dans la boutique",
+					"{C:attention}+#1#{} emplacement#<s>1# de coupon",
 				},
 				unlock = {
 					"Gagner une partie",
 					"en ne jouant que des {C:attention}Carte Haute",
 				},
 			},
+			j_cry_soccer_balanced = {
+				name = "One for All", --changed the name from latin because this isn't exotic
+				text = {
+					"{C:attention}+#1#{} Booster Pack max",
+					"{C:attention}+#1#{} taille de main",
+					"{C:attention}+#1#{} emplacement#<s>1# de consommable",
+					"{C:attention}+#1#{} carte#<s>1# dans la boutique",
+					"{C:attention}+#1#{} emplacement#<s>1# de coupon",
+				},
+				unlock = {
+					"Win a run with",
+					"only {C:attention}High Card",
+				},
+			},
 			j_cry_fleshpanopticon = {
 				name = "Flesh Panopticon",
 				text = {
@@ -2243,6 +2549,14 @@ return {
 					"{C:inactive}(Actuellement{} {X:chips,C:white}X#1#{} {C:inactive}Jetons){}",
 				},
 			},
+			j_cry_spectrogram = {
+				name = "Spectrogramme",
+				text = {
+					"{C:attention}Redéclenche{} le Joker le plus à droite",
+					"une fois pour chaque {C:attention}Carte Écho",
+					"jouée et comptée",
+				},
+			},
 			j_cry_speculo = {
 				name = "Speculo",
 				text = {
@@ -2308,6 +2622,14 @@ return {
 					"la fin de la manche",
 				},
 			},
+			j_cry_supercell_balanced = {
+				name = "Supercell",
+				text = {
+					"{X:chips,C:white}X#2#{} Jetons, {X:mult,C:white}X#2#{} Multi",
+					"Gagne {C:money}$#3#{} à",
+					"la fin de la manche",
+				},
+			},
 			j_cry_sus = {
 				name = "SUS",
 				text = {
@@ -2518,6 +2840,14 @@ return {
 					"{C:inactive}(Actuellement {X:mult,C:white} X#2# {C:inactive} Multi)",
 				},
 			},
+			j_cry_wonka_bar = {
+				name = "Wonka Bar",
+				text = {
+					"Vendre cette carte",
+					"augmente de {C:attention}+#1#{} la",
+					"limite de sélection de cartes",
+				},
+			},
 			j_cry_wrapped = {
 				name = "Bonbon enveloppé",
 				text = {
@@ -2664,12 +2994,42 @@ return {
 				text = {
 					"{S:0.8}({S:0.8,V:1}lvl.#1#{S:0.8}){}",
 					"Augmente la puissance des",
-					"mains {C:attention}ascensionnées{} de {X:gold,C:white}0.05{}",
-					"{C:inactive}(Actuellement {X:gold,C:white}X(#2#^asc){C:inactive})",
+					"mains {C:attention}ascensionnées{} de {X:gold,C:white}#2#{}",
+					"{C:inactive}(Actuellement {X:gold,C:white}X(#3#^asc){C:inactive})",
 				},
 			},
 		},
 		Sleeve = {
+			sleeve_cry_beige_sleeve = {
+				name = "Pochette Beige",
+				text = {
+					"Les Jokers {C:attention}Communs{} ont leur",
+					"valeurs {C:attention}quadruplées{}",
+				},
+			},
+			sleeve_cry_beige_sleeve_alt = {
+				name = "Beige Sleeve",
+				text = {
+					"Les Jokers {C:attention}peu communs{} ont leur",
+					"valeurs {C:attention}quadruplées{}",
+				},
+			},
+			sleeve_cry_beta_sleeve = {
+				name = "Nostalgic Sleeve",
+				text = {
+					"Les emplacements de {C:attention}Joker{} et {C:attention}Consommable{}",
+					"sont {C:attention}combinés",
+					"Les blindes {C:attention}Nostalgiques{} remplacent",
+					"leur équivalent",
+				},
+			},
+			sleeve_cry_bountiful_sleeve = {
+				name = "Pochette généreuse",
+				text = {
+					"Après chaque main {C:blue}jouée{} ou {C:red}défaussée{},",
+					"tire toujours {C:attention}5{} cartes",
+				},
+			},
 			sleeve_cry_ccd_sleeve = {
 				name = "Pochette CCD",
 				text = {
@@ -2712,6 +3072,15 @@ return {
 					"{C:attention,T:v_overstock_plus}+2 cartes dans la boutique",
 				},
 			},
+			sleeve_cry_glowing_sleeve = {
+				name = "Pochette brillante",
+				text = {
+					"Multiplie les valeurs de",
+					"tous les Jokers de {X:dark_edition,C:white} X1.25 {}",
+					"lorsque la Blinde Boss est battue",
+					"{X:cry_jolly,C:white,s:0.8} Jolly#1#Open#1#Winner#1#-#1#wawa#1#person", --peak loc_vars right here
+				},
+			},
 			sleeve_cry_infinite_sleeve = {
 				name = "Pochette illimitée",
 				text = {
@@ -2734,6 +3103,23 @@ return {
 					"gagne ses {C:attention}améliorations",
 				},
 			},
+			sleeve_cry_spooky_sleeve = {
+				name = "Pochette Effroi",
+				text = {
+					"Démarre avec un {C:attention,T:j_cry_chocolate_dice}Dé en chocolat{} {C:eternal}éternel",
+					"Après chaque {C:attention}Ante{}, crée un",
+					"{C:cry_candy}Bonbon{} ou un Joker {X:cry_cursed,C:white}Maudit{}",
+				},
+			},
+			sleeve_cry_very_fair_sleeve = {
+				name = "Pochette Super Équilibrée",
+				text = {
+					"{C:blue}-2{} mains, {C:red}-2{} défausses",
+					"à chaque manche",
+					"Les {C:attention}Bons d'Achat{} n'apparaissent",
+					"plus dans la boutique",
+				},
+			},
 			sleeve_cry_wormhole_sleeve = {
 				name = "Pochette Vortex",
 				text = {
@@ -2752,6 +3138,15 @@ return {
 					"{C:inactive}(selon la place disponible)",
 				},
 			},
+			sleeve_cry_antimatter_sleeve = {
+				name = "Pochette d'Antimatière",
+				text = {
+					"Applique les {C:attention}effects{}",
+					"et autres {C:attention}effets spéciaux{}",
+					"de toutes les autres pochettes",
+					"{C:red}WIP",
+				},
+			},
 		},
 		Spectral = {
 			c_cry_adversary = {
@@ -2765,7 +3160,7 @@ return {
 			c_cry_analog = {
 				name = "Analogue",
 				text = {
-					"Crée {C:attention}#1#{} copies d'un",
+					"Crée {C:attention}#1#{} copie#<s>1# d'un",
 					"{C:attention}Joker{} aléatoire, détruit",
 					"tous les autres Jokers, {C:attention}+#2#{} Ante",
 				},
@@ -2773,7 +3168,7 @@ return {
 			c_cry_chambered = {
 				name = "Chambré",
 				text = {
-					"Crée {C:attention}#1#{} copies {C:dark_edition}Négatives{}",
+					"Crée {C:attention}#1#{} copie#<s>1# {C:dark_edition}Négatives{}",
 					"d'un consommable {C:attention}aléatoire",
 					"{C:inactive,s:0.8}Ne copie pas Chambré{}",
 				},
@@ -2796,9 +3191,9 @@ return {
 			c_cry_hammerspace = {
 				name = "Hammerspace",
 				text = {
-					"Apply random {C:attention}consumables{}",
-					"as if they were {C:dark_edition}Enhancements{}",
-					"to cards held in hand",
+					"Applique des {C:attention}consommables{} aléatoires",
+					"comme des {C:dark_edition}Améliorations{}",
+					"à toutes les cartes tenues en main",
 				},
 			},
 			c_cry_lock = {
@@ -3461,8 +3856,9 @@ return {
 			v_cry_overstock_multi = {
 				name = "Multi-stock",
 				text = {
-					"{C:attention}+#1#{} emplacement#<s>1# de carte#<s>1# et",
-					"{C:attention}+#1#{} emplacement#<s>1# de paquet#<s>1#",
+					"{C:attention}+#1#{} emplacement#<s>1# de carte#<s>1#,",
+					"{C:attention}+#1#{} emplacement#<s>1# de paquet#<s>1# et",
+					"and {C:attention}+#1#{} emplacements#<s>1# de coupon",
 					"disponibles dans la boutique",
 				},
 				unlock = {
@@ -3577,7 +3973,7 @@ return {
 			v_cry_threers = {
 				name = "Les 3 R",
 				text = {
-					"{C:red}#1#{} défausses",
+					"{C:red}+#1#{} défausse#<s>1#",
 					"par manche",
 				},
 				unlock = {
@@ -4099,6 +4495,7 @@ return {
 			["cry_Clusterfuck"] = Cryptid_config.family_mode and "Capharnaüm" or "Foutoir",
 			["cry_UltPair"] = "Super Paire",
 			["cry_WholeDeck"] = Cryptid_config.family_mode and "Jeu complet" or "un putain de jeu complet",
+			["cry-Cluster Bulwark"] = "Capharna-rempart",
 		},
 		poker_hand_descriptions = {
 			["cry_Bulwark"] = {
@@ -4140,6 +4537,9 @@ return {
 			ach_cry_ult_full_skip = "Je passe",
 			ach_cry_used_crash = "Tu t'attendais à quoi ?",
 			ach_cry_what_have_you_done = "QU'EST-CE QUE TU AS FAIT ?!",
+			ach_cry_pin = "L'épingle de la honte",
+			ach_cry_youre_fucking_kidding = Cryptid_config.family_mode and "J'ai plus besoin de ça"
+				or "Tu te fous de moi",
 		},
 		achievement_descriptions = {
 			ach_cry_ace_in_crash = 'check_for_unlock({type = "ace_in_crash"})',
@@ -4162,6 +4562,8 @@ return {
 			ach_cry_ult_full_skip = "Gagner en 1 tour",
 			ach_cry_used_crash = "Utiliser ://CRASH",
 			ach_cry_what_have_you_done = "Supprimer ou sacrifier un Joker exotique",
+			ach_cry_pin = "Perdre une partie face à l'Épingle",
+			ach_cry_youre_fucking_kidding = "Défausser " .. localize("cry_WholeDeck", "poker_hands"),
 		},
 		challenge_names = {
 			c_cry_ballin = "Ballin'",
@@ -4208,7 +4610,8 @@ return {
 			cry_mus_code = "Cartes Code (://LETS_BREAK_THE_GAME par HexaCryonic)",
 			cry_mus_exotic = "Jokers exotiques (Joker in Latin par AlexZGreat)",
 			cry_mus_high_score = "High Score (Final Boss [For Your Computer] par AlexZGreat)",
-			cry_mus_alt_bg = "Musique de titre (by MathIsFun_)",
+			cry_mus_alt_bg = "Musique de titre (par MathIsFun_)",
+			cry_force_tooltips = "Forcer l'affichage des info-bulles",
 			cry_family = "Mode family-friendly",
 			cry_experimental = "Mode expérimental",
 
@@ -4248,6 +4651,7 @@ return {
 			b_pull = "TIRER",
 			cry_hooked_ex = "Accroché!",
 			k_end_blind = "Finir la blinde",
+			k_cry_shiny = "Étincelant",
 
 			cry_code_rank = "ENTRER UN RANG",
 			cry_code_enh = "ENTRER UNE AMELIORATION",
@@ -4278,8 +4682,10 @@ return {
 			cry_sobbing = "À l'aide...",
 			cry_gaming = "Gaming",
 			cry_gaming_ex = "Gaming!",
+			cry_good_luck_ex = "Bonne chance!",
 			cry_sus_ex = "Imposteur!",
 			cry_jolly_ex = "Plus joyeux!",
+			cry_highfive_ex = "Tope-là!",
 			cry_m_minus = "m",
 			cry_m = "M",
 			cry_m_ex = "M!",
@@ -4324,6 +4730,10 @@ return {
 
 			cry_view_set_contents = "Voir les objets dans le set",
 
+			-- These two are left empty because they aren't used here
+			cry_sapling_an = "", -- "un Joker Exotique"
+			cry_sapling_a = "", -- "un Joker Rare"
+
 			b_reset_gameset_modest = "Réinitialiser la configuration du style (Modeste)",
 			b_reset_gameset_mainline = "Réinitialiser la configuration du style (Médian)",
 			b_reset_gameset_madness = "Réinitialiser la configuration du style (Maboul)",
@@ -4331,6 +4741,8 @@ return {
 		labels = {
 			food_jokers = "Jokers nourriture",
 			banana = "Banane",
+			pinned = "Épinglé",
+			cry_absolute = "Absolu",
 			code = "Code",
 			unique = "Unique",
 			cry_rigged = "Truqué",

Cryptid/localization/id.lua

@@ -138,7 +138,7 @@ return {
 				name = "The Clock",
 				text = {
 					"+0.1X blind requirements every",
-					"3 seconds spent this ante",
+					"12 seconds spent this ante",
 				},
 			},
 			bl_cry_hammer = {
@@ -166,7 +166,7 @@ return {
 				name = "Lavender Loop",
 				text = {
 					"1.25X blind requirements every",
-					"1.5 seconds spent this round",
+					"6 seconds spent this round",
 				},
 			},
 			bl_cry_obsidian_orb = {

Cryptid/localization/ja.lua

@@ -138,7 +138,7 @@ return {
 				name = "The Clock",
 				text = {
 					"+0.1X blind requirements every",
-					"3 seconds spent this ante",
+					"12 seconds spent this ante",
 				},
 			},
 			bl_cry_hammer = {
@@ -166,7 +166,7 @@ return {
 				name = "Lavender Loop",
 				text = {
 					"1.25X blind requirements every",
-					"1.5 seconds spent this round",
+					"6 seconds spent this round",
 				},
 			},
 			bl_cry_obsidian_orb = {

Cryptid/localization/ko.lua

@@ -138,7 +138,7 @@ return {
 				name = "The Clock",
 				text = {
 					"+0.1X blind requirements every",
-					"3 seconds spent this ante",
+					"12 seconds spent this ante",
 				},
 			},
 			bl_cry_hammer = {
@@ -166,7 +166,7 @@ return {
 				name = "Lavender Loop",
 				text = {
 					"1.25X blind requirements every",
-					"1.5 seconds spent this round",
+					"6 seconds spent this round",
 				},
 			},
 			bl_cry_obsidian_orb = {

Cryptid/localization/nl.lua

@@ -144,7 +144,7 @@ return {
 				name = "The Clock",
 				text = {
 					"+0.1X blind requirements every",
-					"3 seconds spent this ante",
+					"12 seconds spent this ante",
 				},
 			},
 			bl_cry_hammer = {
@@ -172,7 +172,7 @@ return {
 				name = "Lavender Loop",
 				text = {
 					"1.25X blind requirements every",
-					"1.5 seconds spent this round",
+					"6 seconds spent this round",
 				},
 			},
 			bl_cry_obsidian_orb = {

Cryptid/localization/pl.lua

@@ -154,7 +154,7 @@ return {
 				name = "Zegar",
 				text = {
 					"+0.1X wymagań przeszkadzajki",
-					"co 3 sekundy tego wejścia",
+					"co 12 sekundy tego wejścia",
 				},
 			},
 			bl_cry_hammer = {
@@ -182,7 +182,7 @@ return {
 				name = "Lawendowa Pętla",
 				text = {
 					"1,25x wymagań przeszkadzajki",
-					"co 1,5 sekundy tego wejścia",
+					"co 6 sekundy tego wejścia",
 				},
 			},
 			bl_cry_obsidian_orb = {
@@ -1278,6 +1278,7 @@ return {
 			j_cry_kidnap = {
 				name = "Porwanie",
 				text = {
+					"{C:red}Outdated Description{}",
 					"Zyskujesz {C:money}$#2#{} na końcu rundy",
 					"Wypłata rośnie o {C:money}$#1#{}",
 					"kiedy Joker {C:attention}mnożnikowy{} lub",

Cryptid/localization/ru.lua

@@ -170,7 +170,7 @@ return {
 				name = "Часы",
 				text = {
 					"+0.1X минимум очков каждые",
-					"3 секунды в этом анте",
+					"12 секунды в этом анте",
 				},
 			},
 			bl_cry_hammer = {
@@ -198,7 +198,7 @@ return {
 				name = "Лавандовый круг",
 				text = {
 					"1.25X минимум очков каждые",
-					"1.5 секунды потраченные в этом раунде",
+					"6 секунды потраченные в этом раунде",
 				},
 			},
 			bl_cry_obsidian_orb = {

Cryptid/localization/vi.lua

@@ -197,7 +197,7 @@ return {
 			bl_cry_clock = {
 				name = "The Clock",
 				text = {
-					"+0.1X điểm yêu cầu mỗi 3 giây",
+					"+0.1X điểm yêu cầu mỗi 12 giây",
 					"đã trôi trong ante này",
 				},
 			},
@@ -225,7 +225,7 @@ return {
 			bl_cry_lavender_loop = {
 				name = "Lavender Loop",
 				text = {
-					"1.25X điểm yêu cầu mỗi 1.5 giây",
+					"1.25X điểm yêu cầu mỗi 6 giây",
 					"đã trôi trong ván này",
 				},
 			},
@@ -1610,10 +1610,11 @@ return {
 			j_cry_kidnap = {
 				name = "Bắt Cóc",
 				text = {
-					"Nhận {C:money}$#2#{} ở cuối ván",
+					"Nhận {C:money}$#1#{} ở cuối ván",
 					"Tiền thưởng tăng thêm {C:money}$#1#{}",
 					"khi một Joker {C:attention}+Nhân Tay Bài{} hoặc",
 					"{C:attention}+Chip Tay Bài{} được bán",
+					"{C:inactive}(Hiện tại là {C:money}$#2#{C:inactive})",
 				},
 			},
 			j_cry_kooky = {
@@ -2692,8 +2693,8 @@ return {
 				text = {
 					"{S:0.8}({S:0.8,V:1}lvl.#1#{S:0.8}){}",
 					"Nâng sức mạnh cho",
-					"các tay bài {C:attention}Thăng Thiên{} lên {X:gold,C:white}0.05{}",
-					"{C:inactive}(Hiện tại là {X:gold,C:white}X(#2#^asc){C:inactive})",
+					"các tay bài {C:attention}Thăng Thiên{} lên {X:gold,C:white}#2#{}",
+					"{C:inactive}(Hiện tại là {X:gold,C:white}X(#3#^asc){C:inactive})",
 				},
 			},
 		},
@@ -3986,7 +3987,7 @@ return {
 				},
 			},
 			p_cry_empowered = {
-				name = "Gói Siêu Linh [Nhãn Siêu Cường]",
+				name = "Nhãn Siêu Cường",
 				text = {
 					"Chọn {C:attention}#1#{} trong tối đa",
 					"{C:attention}#2#{} lá {C:spectral}Siêu Linh",

Cryptid/localization/zh_CN.lua

@@ -474,7 +474,7 @@ return {
 			bl_cry_lavender_loop = {
 				name = "薰衣草环",
 				text = {
-					"在boss回合中每经过1.5秒",
+					"在boss回合中每经过6秒",
 					"盲注要求增加1.25倍",
 				},
 			},
@@ -1588,6 +1588,7 @@ return {
 			j_cry_kidnap = {
 				name = "绑架",
 				text = {
+					"{C:red}Outdated Description{}",
 					"每回合结尾获得{C:money}$#2#{}",
 					"每卖掉一张{C:attention}倍率{}或者{C:attention}筹码{}小丑时",
 					"增加{C:money}$#1#{}",
@@ -2867,8 +2868,8 @@ return {
 				text = {
 					"{S:0.8}({S:0.8,V:1}等级.#1#{S:0.8}){}",
 					"使{C:attention}晋升{}牌型的指数",
-					"增加{X:gold,C:white}0.05{}",
-					"{C:inactive}(目前指数 {X:gold,C:white}X(#2#^晋升数){C:inactive})",
+					"增加{X:gold,C:white}#2#{}",
+					"{C:inactive}(目前指数 {X:gold,C:white}X(#3#^晋升数){C:inactive})",
 				},
 			},
 		},

Cryptid/localization/zh_TW.lua

@@ -138,7 +138,7 @@ return {
 				name = "The Clock",
 				text = {
 					"+0.1X blind requirements every",
-					"3 seconds spent this ante",
+					"12 seconds spent this ante",
 				},
 			},
 			bl_cry_hammer = {
@@ -166,7 +166,7 @@ return {
 				name = "Lavender Loop",
 				text = {
 					"1.25X blind requirements every",
-					"1.5 seconds spent this round",
+					"6 seconds spent this round",
 				},
 			},
 			bl_cry_obsidian_orb = {

Cryptid/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 > (G.GAME.cry_exploit_override and 1 or 0) then
+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
 	G.GAME.cry_asc_played = G.GAME.cry_asc_played and G.GAME.cry_asc_played+1 or 1
 end
 '''

Cryptid/version

@@ -1 +0,0 @@
-0.5.5

Steamodded/.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

Steamodded/.github/CODEOWNERS

@@ -0,0 +1,7 @@
+* @Aurelius7309
+
+src/crash_handler.lua @WilsontheWolf
+libs/https/ @WilsontheWolf
+lovely/crash_handler.toml @WilsontheWolf
+lovely/libs.toml @WilsontheWolf
+lsp_def/ @GauntletGames-2086

Steamodded/.github/pull_request_template.md

@@ -0,0 +1,7 @@
+
+
+## Additional Info:
+<!-- Don't worry too much if you don't know what these are or how to fill them. It's mostly reminders for maintainers ;) -->
+- [ ] I didn't modify api's or I've made a PR to the [wiki repo](https://github.com/Steamodded/wiki).
+- [ ] I didn't modify api's or I've updated lsp definitions.
+- [ ] I didn't make new lovely files or all new lovely files have appropriate priority.

Steamodded/.gitignore

@@ -0,0 +1,202 @@
+# Created by https://www.toptal.com/developers/gitignore/api/python
+# Edit at https://www.toptal.com/developers/gitignore?templates=python
+
+*~
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+### Python Patch ###
+# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration
+poetry.toml
+
+# ruff
+.ruff_cache/
+
+# LSP config files
+pyrightconfig.json
+
+## IntelliJ
+/.idea/
+/shelf/
+/workspace.xml
+/httpRequests/
+/dataSources/
+/dataSources.local.xml
+
+# End of https://www.toptal.com/developers/gitignore/api/python
+
+# Mac
+.DS_Store
+
+/injector/steamodded_injector.dist/
+/injector/steamodded_injector.exe
+/steamodded_injector.build/
+/steamodded_injector.dist/
+/steamodded_injector.onefile-build/
+/steamodded_injector.exe
+
+*.Identifier
+core/EditionAPI.lua
+
+# LSP/Editor settings
+.vscode
+.luarc.json

Steamodded/LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Steamodded/libs/https/smods-https.lua

@@ -231,7 +231,7 @@ if not isThread then -- In main thread
 				sendMessageToConsole(msg.level, msg.logger .. "(" .. tostring(msg.id) .. ")", msg.msg)
 			elseif msgType == "cb" then -- NOTE: cb removes the thread so it must be the last message
 				t.cb(msg.code, msg.body, msg.headers)
-				threads[id] = nil
+				threads[msg.id] = nil
 			end
 		end
 	end
@@ -268,9 +268,10 @@ if not isThread then -- In main thread
 		assert(type(cb) == "function", "Callback is not a function")
 		checkAndHandleInput(url, options, true) -- That way we aren't erroring in the thread as much
 		local thread = love.thread.newThread(getContent())
-		local obj = {thread = thread, cb = cb, id = id}
-		threads[id] = obj
-		thread:start(userAgent, url, options, id)
+		local tID = tostring(id)
+		local obj = {thread = thread, cb = cb, id = tID}
+		threads[tID] = obj
+		thread:start(userAgent, url, options, tID)
 		id = id + 1
 	end
 

Steamodded/localization/en-us.lua

@@ -197,6 +197,7 @@ return {
             b_unknown = 'Unknown',
             b_lovely_mod = '(Lovely Mod) ',
             b_by = ' By: ',
+            b_priority = 'Priority: ',
 			b_config = "Config",
 			b_additions = 'Additions',
       		b_stickers = 'Stickers',