add paved joker

Author: lord-ruby

assets/1x/atlasone.png

@@ -10242,7 +10242,7 @@ local yarnball = { -- +1 to all listed probabilities for the highest cat tag lev
 	end,
 }
 
-local pizza = { -- +1 to all listed probabilities for the highest cat tag level
+local pizza = {
 	cry_credits = {
 		idea = {
 			"Enemui",
@@ -10318,7 +10318,7 @@ local pizza = { -- +1 to all listed probabilities for the highest cat tag level
 	end,
 }
 
-local pizza_slice = { -- +1 to all listed probabilities for the highest cat tag level
+local pizza_slice = {
 	cry_credits = {
 		idea = {
 			"Enemui",
@@ -10375,6 +10375,37 @@ local pizza_slice = { -- +1 to all listed probabilities for the highest cat tag
 	end,
 }
 
+local paved_joker = { -- +1 to all listed probabilities for the highest cat tag level
+	cry_credits = {
+		idea = {
+			"InspectorB",
+		},
+		art = {
+			"gemstonez",
+		},
+		code = {
+			"lord.ruby",
+		},
+	},
+	object_type = "Joker",
+	dependencies = {
+		items = {
+			"set_cry_misc_joker",
+		},
+	},
+	name = "cry-paved_joker",
+	key = "paved_joker",
+	atlas = "atlasone",
+	pos = { x = 1, y = 6 },
+	rarity = 1,
+	cost = 4,
+	order = 142,
+	config = { extra = 1 },
+	loc_vars = function(self, info_queue, card)
+		return { vars = { number_format(math.floor(card.ability.extra)) } }
+	end,
+}
+
 local miscitems = {
 	jimball_sprite,
 	dropshot,
@@ -10503,6 +10534,7 @@ local miscitems = {
 	--yarnball,
 	pizza,
 	pizza_slice,
+	paved_joker
 }
 return {
 	name = "Misc. Jokers",

assets/2x/atlasone.png

@@ -1037,3 +1037,19 @@ function Cryptid.add_circus_rarity(rarity, dontreload)
 		Cryptid.reload_localization()
 	end
 end
+
+function Cryptid.get_paved_joker()
+	local total = 0
+	for i, v in pairs(SMODS.find_card("j_cry_paved_joker")) do
+		total = total + v.ability.extra
+	end
+	local stones = 0
+	for i, v in pairs(G.hand.highlighted) do
+		if v.config.center.key == "m_stone" then stones = stones + 1 end
+	end
+	for i, v in pairs(G.play.cards) do
+		if v.config.center.key == "m_stone" then stones = stones + 1 end
+	end
+	total = math.min(stones, total)
+	return total
+end

items/misc_joker.lua

@@ -1957,3 +1957,15 @@ function CardArea:shuffle(_seed)
 
 	SMODS.calculate_context({ cry_shuffling_area = true, cardarea = self, cry_post_shuffle = true })
 end
+
+local smods_four_fingers = SMODS.four_fingers
+function SMODS.four_fingers()
+	return smods_four_fingers() - Cryptid.get_paved_joker()
+end
+
+get_straight_ref = get_straight
+function get_straight(hand, min_length, skip, wrap)
+    min_length = (min_length or 5)
+	min_length = min_length + Cryptid.get_paved_joker()
+	return get_straight_ref(hand, min_length, skip, wrap)
+end 

lib/misc.lua

@@ -2702,6 +2702,14 @@ return {
 					"{C:inactive}(Currently{} {X:mult,C:white}X#2#{}{C:inactive} Mult){}",
 				},
 			},
+			j_cry_paved_joker = {
+				name = "Paved Joker",
+				text = {
+					"Stone Cards may fill",
+					"gaps of {C:attention}#1#{} in",
+					"{C:attention}Straights{} and {C:attention}Flushes{}"
+				},
+			},
 			j_cry_spaceglobe = {
 				name = "Celestial Globe",
 				text = {

lib/overrides.lua

@@ -20,3 +20,45 @@ position = "at"
 payload = "ret.playing_card = ret.playing_card or {}"
 match_indent = true
 
+[[patches]]
+[patches.pattern]
+target = '''=[SMODS _ "src/overrides.lua"]'''
+pattern = '''
+    local tuples = {}
+    local ret = {}
+'''
+position = "before"
+payload = "local stones = Cryptid.get_paved_joker()"
+match_indent = true
+
+[[patches]]
+[patches.pattern]
+target = '''=[SMODS _ "src/overrides.lua"]'''
+pattern = '''
+if next(ranks[l]) then
+'''
+position = "at"
+payload = "if next(ranks[l]) or stones > 0 then"
+match_indent = true
+
+[[patches]]
+[patches.pattern]
+target = '''=[SMODS _ "src/overrides.lua"]'''
+pattern = '''
+if i > min_length and not any_tuple then
+'''
+position = "at"
+payload = "if i > min_length and not any_tuple or stones > 0 then"
+match_indent = true
+
+[[patches]]
+[patches.pattern]
+target = '''=[SMODS _ "src/overrides.lua"]'''
+pattern = '''
+tuples = new_tuples
+'''
+position = "after"
+payload = '''
+stones = stones - 1
+'''
+match_indent = true