Merge remote-tracking branch 'upstream/main'

Author: SDM0

.gitignore

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

Cryptid.lua

@@ -5,7 +5,7 @@
 --- MOD_AUTHOR: [MathIsFun_, Cryptid and Balatro Discords]
 --- MOD_DESCRIPTION: Adds unbalanced ideas to Balatro.
 --- BADGE_COLOUR: 708b91
---- DEPENDENCIES: [Talisman>=2.0.9, Steamodded>=1.0.0~ALPHA-1312c]
+--- DEPENDENCIES: [Talisman>=2.0.9, Steamodded>=1.0.0~BETA-0301a]
 --- VERSION: 0.5.5~dev
 --- PRIORITY: 2147483647
 

https/linux-https.so

@@ -1,28 +1,12 @@
 require("love.system")
-
--- mac/linux support?
-
-local script_path = debug.getinfo(1, "S").source:sub(2)
-local script_dir = script_path:match("(.*/)")
-
-package.path = script_dir .. "?.lua;" .. package.path
-package.cpath = script_dir .. "?.so;" .. package.cpath
-
-local index_os = love.system.getOS()
-
-if index_os == "OS X" then
-	loc_https = require("macos-https")
-elseif index_os == "Linux" then
-	loc_https = require("linux-https")
-else
-	loc_https = require("https")
-end
+-- Currently crashes, I think SMODS.https module isn't loaded in the thread
+loc_https = require("SMODS.https")
 
 local last_update_time = 0
 local initial = true
 while true do
 	if (os.time() - last_update_time >= 60) or initial then
-		initial = nil
+		initial = false
 		last_update_time = os.time()
 		local resp, txt = loc_https.request(
 			"https://discord.com/api/v10/invites/eUf9Ur6RyB?with_counts=true" .. "&v=" .. tostring(os.time())

https/macos-https.so

@@ -1207,7 +1207,7 @@ local hooked = {
 					var = localize({ type = "name_text", set = "Joker", key = G.jokers.cards[i].config.center.key })
 				end
 			end
-			var = var or "[no joker found - " .. (card.hook_id or "nil") .. "]"
+			var = var or ("[no joker found - " .. (card.hook_id or "nil") .. "]")
 		end
 		return { vars = { var or "hooked Joker" } }
 	end,

https/thread.lua

@@ -1724,7 +1724,7 @@ local fleshpanopticon = {
 			card.gone = false
 			G.GAME.blind.chips = G.GAME.blind.chips * card.ability.extra.boss_size
 			G.GAME.blind.chip_text = number_format(G.GAME.blind.chips)
-			G.HUD_blind:recalculate(true)
+			G.HUD_blind:recalculate()
 			G.E_MANAGER:add_event(Event({
 				func = function()
 					G.E_MANAGER:add_event(Event({

items/code.lua

@@ -490,11 +490,10 @@ local bonk = {
 	object_type = "Joker",
 	name = "cry-bonk",
 	key = "bonk",
-	pools = { ["M"] = true },
+	pools = { ["M"] = true, ["Meme"] = true },
 	order = 256,
 	pos = { x = 2, y = 2 },
 	config = { extra = { chips = 6, bonus = 1, xchips = 3, type = "Pair" } },
-	pools = { ["Meme"] = true },
 	loc_vars = function(self, info_queue, center)
 		info_queue[#info_queue + 1] = G.P_CENTERS.j_jolly
 		return {

items/epic.lua

@@ -247,7 +247,7 @@ local oversat = {
 				return cry_misprintize_val(val, {
 					min = 2,
 					max = 2,
-				}, is_card_big(card), true)
+				}, is_card_big(card))
 			end)
 		end
 	end,
@@ -347,7 +347,7 @@ local glitched = {
 				return cry_misprintize_val(val, {
 					min = 0.1 * (G.GAME.modifiers.cry_misprint_min or 1),
 					max = 10 * (G.GAME.modifiers.cry_misprint_max or 1),
-				}, is_card_big(card), true)
+				}, is_card_big(card))
 			end)
 		end
 	end,

items/m.lua

@@ -1498,7 +1498,6 @@ local fspinner = {
 	order = 77,
 	blueprint_compat = true,
 	perishable_compat = false,
-	atlas = "fspinner",
 	calculate = function(self, card, context)
 		if context.before and not context.blueprint then
 			local play_more_than = (G.GAME.hands[context.scoring_name].played or 0)
@@ -1753,9 +1752,9 @@ local gardenfork = {
 	calculate = function(self, card, context)
 		if context.cardarea == G.jokers and context.before then
 			for i = 1, #context.full_hand do
-				if context.scoring_hand[i]:get_id() == 14 then
+				if context.full_hand[i]:get_id() == 14 then
 					for j = 1, #context.full_hand do
-						if context.scoring_hand[j]:get_id() == 7 then -- :( ekshpenshive
+						if context.full_hand[j]:get_id() == 7 then -- :( ekshpenshive
 							ease_dollars(card.ability.extra.money)
 							return { message = "$" .. card.ability.extra.money, colour = G.C.MONEY }
 						end