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

Author: HuyTheKiller

Cryptid.lua

@@ -6,7 +6,7 @@
 --- MOD_DESCRIPTION: Adds unbalanced ideas to Balatro.
 --- BADGE_COLOUR: 708b91
 --- DEPENDENCIES: [Talisman>=2.0.0-beta8<=2.0.9, Steamodded>=1.0.0~ALPHA-1225a<=1.0.0~ALPHA-1304a]
---- VERSION: 0.5.3c
+--- VERSION: 0.5.3d
 --- PRIORITY: 2147483647
 
 ----------------------------------------------

Items/CodeCards.lua

@@ -601,10 +601,7 @@ local commit = {
 	can_use = function(self, card)
 		return #G.jokers.highlighted == 1
 			and not G.jokers.highlighted[1].ability.eternal
-			and not (
-				type(G.jokers.highlighted[1].config.center.rarity) == "number"
-				and G.jokers.highlighted[1].config.center.rarity >= 5
-			)
+			and (not Jen or not Jen.overpowered(G.jokers.highlighted[1].config.center.rarity))
 	end,
 	use = function(self, card, area, copier)
 		local deleted_joker_key = G.jokers.highlighted[1].config.center.key
@@ -1123,6 +1120,7 @@ local rework = {
 		if not tag.ability then
 			tag.ability = {}
 		end
+		if jkr.config.center.key == "c_base" then jkr.config.center.key = "j_scholar" end
 		tag.ability.rework_key = jkr.config.center.key
 		tag.ability.rework_edition = G.P_CENTER_POOLS.Edition[found_index].key
 		add_tag(tag)

Items/MiscJokers.lua

@@ -6758,7 +6758,7 @@ local digitalhallucinations = {
 						end)
 					}))
 					card_eval_status_text(context.blueprint_card or card, 'extra', nil, nil, nil, {message = localize('k_plus_'..short1[i]), colour = G.C.SECONDARY_SET[short2[i]]})
-					return true	-- this triggers BEFORE a retrigger joker and looks like jank. i can't get a message showing up without status text so this is the best option rn
+					return nil, true	-- this triggers BEFORE a retrigger joker and looks like jank. i can't get a message showing up without status text so this is the best option rn
 				end
 			end
 			if boosty.ability.name:find('code') then
@@ -6774,7 +6774,7 @@ local digitalhallucinations = {
 					end
 				}))
 				card_eval_status_text(context.blueprint_card or card, 'extra', nil, nil, nil, {message = localize('cry_plus_code'), colour = G.C.SET.Code})
-				return true
+				return nil, true
 			end
 			if boosty.ability.name:find('Buffoon') then
 				G.E_MANAGER:add_event(Event({
@@ -6790,7 +6790,7 @@ local digitalhallucinations = {
 					end
 				}))
 				card_eval_status_text(context.blueprint_card or card, 'extra', nil, nil, nil, {message = localize('k_plus_joker'), colour = G.C.FILTER})
-				return true
+				return nil, true
 			end
 			if boosty.ability.name:find('Standard') then
 				G.E_MANAGER:add_event(Event({
@@ -6816,7 +6816,7 @@ local digitalhallucinations = {
 				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 true
+				return nil, true
 			end
 		end
 	end,
@@ -6848,9 +6848,9 @@ local arsonist = {
 	calculate = function(self, card, context)
 		if context.destroying_card then
 			local eval = evaluate_poker_hand(context.full_hand)
-            if next(eval['Full House']) then
-                return true
-            end
+            		if next(eval['Full House']) then
+                		return not context.destroying_card.ability.eternal
+            		end
 		end
 	end,
 	cry_credits = {
@@ -6875,11 +6875,14 @@ local zooble = {
 	cost = 6,
 	atlas = "atlasone",
 	order = 132,
-	loc_vars = function(self, info_queue, center)
-		return { vars = {center.ability.extra.mult,center.ability.extra.a_mult }}
+	blueprint_compat = true,
+	eternal_compat = true,
+	perishable_compat = false,
+	loc_vars = function(self, info_queue, card)
+		return { vars = {card.ability.extra.mult, card.ability.extra.a_mult }}
 	end,
 	calculate = function(self, card, context)
-		if context.before and context.cardarea == G.jokers then
+		if context.before and context.cardarea == G.jokers and not context.blueprint then
 			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