Merge pull request #540 from MathIsFun0/main

(insert funny title here)

Author: Dragokillfist

.gitignore

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

Cryptid.json

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

Cryptid.lua

@@ -17,14 +17,12 @@ SMODS.current_mod.optional_features = {
 	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
-	--[[
 	-- 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
@@ -234,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"),

README.md

@@ -5,8 +5,10 @@ An unbalanced Balatro mod.
 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/4a06c3ba-6df4-48af-a3b3-fdba4dd3125d)
-![image](https://github.com/user-attachments/assets/2bf58a78-7af9-45c5-930f-f8ac988c2126)
+
+![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/cryptid)