Merge branch 'main' of https://github.com/MathIsFun0/Cryptid

Author: MathIsFun0

Cryptid.lua

@@ -6,7 +6,7 @@
 --- MOD_DESCRIPTION: Adds unbalanced ideas to Balatro.
 --- BADGE_COLOUR: 708b91
 --- DEPENDENCIES: [Talisman>=2.0.9, Steamodded>=1.0.0~ALPHA-1312c]
---- VERSION: 0.5.4
+--- VERSION: 0.5.5
 --- PRIORITY: 2147483647
 
 ----------------------------------------------

items/code.lua

@@ -2105,7 +2105,7 @@ local delete = {
 			a = G.shop_vouchers
 			c = G.shop_vouchers.highlighted[1]
 			if c.shop_voucher then
-				G.GAME.current_round.voucher = nil
+				G.GAME.current_round.voucher.spawn[c.config.center.key] = nil
 				G.GAME.current_round.cry_voucher_edition = nil
 				G.GAME.current_round.cry_voucher_stickers =
 					{ eternal = false, perishable = false, rental = false, pinned = false, banana = false }
@@ -2826,7 +2826,7 @@ local rework = {
 	cost = 4,
 	loc_vars = function(self, info_queue)
 		info_queue[#info_queue + 1] =
-			{ set = "Tag", key = "tag_cry_rework", specific_vars = { "[edition]", "[joker]" } }
+			{ set = "Tag", key = "tag_cry_rework", specific_vars = { "[edition]", "[joker]", "n" } }
 		return { vars = {} }
 	end,
 	can_use = function(self, card)

items/deck.lua

@@ -473,7 +473,10 @@ local antimatter = {
 		},
 	},
 	loc_vars = function(self, info_queue, center)
-		return { key = "b_cry_antimatter" .. (cry_get_gameset(G.P_CENTERS.b_cry_antimatter) == "madness" and "" or "_balanced") }
+		return {
+			key = "b_cry_antimatter"
+				.. (cry_get_gameset(G.P_CENTERS.b_cry_antimatter) == "madness" and "" or "_balanced"),
+		}
 	end,
 	name = "cry-Antimatter",
 	order = 76,

items/enhanced.lua

@@ -363,17 +363,16 @@ return {
 		function Card:click()
 			ccl(self)
 			if
-				Galdur and safe_get(Galdur, "run_setup", "current_page") == 1
+				Galdur
+					and safe_get(Galdur, "run_setup", "current_page") == 1
 					and (self.edeck_select or (self.area == safe_get(Galdur, "run_setup", "selected_deck_area") and safe_get(
 						self,
 						"config",
 						"center",
 						"edeck_type"
 					)))
-				or (not Galdur) and (
-					safe_get(G.GAME, "viewed_back", "effect", "center", "edeck_type")
-					and (self.back == "viewed_back" or self.edeck_select)
-				)
+				or not Galdur
+					and (safe_get(G.GAME, "viewed_back", "effect", "center", "edeck_type") and (self.back == "viewed_back" or self.edeck_select))
 			then
 				if self.edeck_select then
 					G.PROFILES[G.SETTINGS.profile]["cry_edeck_" .. self.config.center.edeck_type] = self.edeck_select

items/misc_joker.lua

@@ -7457,7 +7457,16 @@ local digitalhallucinations = {
 					trigger = "before",
 					delay = 0.0,
 					func = function()
-						local ccard = create_card("Joker", G.jokers, nil, nil, nil, nil, nil, "diha")
+						local ccard = create_card(
+							boosty.ability.name:find("meme") and "Meme" or "Joker",
+							G.jokers,
+							nil,
+							nil,
+							nil,
+							nil,
+							nil,
+							"diha"
+						) -- who up wasting their cycles rn
 						ccard:set_edition({ negative = true }, true)
 						ccard:add_to_deck()
 						G.jokers:emplace(ccard)
@@ -7492,6 +7501,7 @@ local digitalhallucinations = {
 						ccard:set_edition({ negative = true }, true)
 						ccard:start_materialize({ G.C.SECONDARY_SET.Enhanced })
 						G.play:emplace(ccard)
+						playing_card_joker_effects({ ccard }) -- odd timing
 						table.insert(G.playing_cards, ccard)
 						return true
 					end,
@@ -7512,8 +7522,6 @@ local digitalhallucinations = {
 					end,
 				}))
 				draw_card(G.play, G.deck, 90, "up", nil)
-
-				playing_card_joker_effects({ true }) -- who knows what most this stuff does, i just copied it from marble jonkler
 				return nil, true
 			end
 		end

items/spectral.lua

@@ -35,9 +35,16 @@ local white_hole = {
 		for k, v in ipairs(G.handlist) do
 			if to_big(G.GAME.hands[v].level) > to_big(1) then
 				local this_removed_levels = G.GAME.hands[v].level - 1
-				removed_levels = removed_levels + this_removed_levels
-				if v ~= _hand or not modest then
-					level_up_hand(used_consumable, v, true, -this_removed_levels)
+				if
+					-- Due to how these poker hands are loaded they still techically exist even if Poker Hand Stuff is disabled
+					-- Because they still exist, While Hole needs to ignore levels from these if disabled (via Black Hole, Planet.lua, etc...)
+					(v ~= "cry_Bulwark" and v ~= "cry_Clusterfuck" and v ~= "cry_UltPair" and v ~= "cry_WholeDeck")
+					or cry_card_enabled("set_cry_poker_hand_stuff") == true
+				then
+					if v ~= _hand or not modest then
+						removed_levels = removed_levels + this_removed_levels
+						level_up_hand(used_consumable, v, true, -this_removed_levels)
+					end
 				end
 			end
 		end

items/tag.lua

@@ -12,7 +12,7 @@ local cat = {
 	name = "cry-Cat Tag",
 	order = 12,
 	loc_vars = function(self, info_queue, tag)
-		return { vars = { tag.ability.level } }
+		return { vars = { tag.ability.level or 1 } }
 	end,
 }
 local epic_tag = {
@@ -261,12 +261,21 @@ local gambler = {
 						emp.ability.shiny = cry_rollshinybool()
 					end
 					add_tag(emp)
+					tag.triggered = true
 					emp:apply_to_run({ type = "new_blind_choice" })
 					G.CONTROLLER.locks[lock] = nil
 					return true
 				end)
 			else
 				tag:nope()
+				tag.triggered = true
+				for i = 1, #G.GAME.tags do
+					if G.GAME.tags[i] ~= tag then
+						if G.GAME.tags[i]:apply_to_run({ type = "new_blind_choice" }) then
+							break
+						end
+					end
+				end
 			end
 			tag.triggered = true
 			return true
@@ -305,6 +314,7 @@ local bundle = {
 					_tag.ability.shiny = cry_rollshinybool()
 					add_tag(_tag)
 					if i == 1 then
+						tag.triggered = true
 						_tag:apply_to_run({ type = "new_blind_choice" })
 					end
 				end