Reroll minor fixes

- Reroll Exchange no longer increases reroll cost to $2 if it is less than $2
- Candy Buttons no longer increases reroll cost to $1 if it is less than $1
- Fixed Candy Buttons not reducing reroll cost when initially obtained in some situations

Author: Jevonnissocoolman

items/spooky.lua

@@ -1530,7 +1530,10 @@ local candy_buttons = {
 		end
 	end,
 	add_to_deck = function(self, card, from_debuff)
+	        -- The find_joker check in calculate_reroll_cost doesn't work if this is the only copy when added to deck (Too early)
+		G.GAME.reroll_limit_buffer = 1
 		calculate_reroll_cost(true)
+		G.GAME.reroll_limit_buffer = nil
 	end,
 	remove_from_deck = function(self, card, from_debuff)
 		calculate_reroll_cost(true)

lib/overrides.lua

@@ -748,21 +748,31 @@ end
 
 -- This is short enough that I'm fine overriding it
 function calculate_reroll_cost(skip_increment)
+	local limit = G.GAME.reroll_limit_buffer or nil
+	if not limit then
+		if next(find_joker("cry-candybuttons")) then
+			limit = 1
+		elseif G.GAME.used_vouchers.v_cry_rerollexchange then
+			limit = 2
+		end
+	end
 	if not G.GAME.current_round.free_rerolls or G.GAME.current_round.free_rerolls < 0 then
 		G.GAME.current_round.free_rerolls = 0
 	end
 	if next(find_joker("cry-crustulum")) or G.GAME.current_round.free_rerolls > 0 then
 		G.GAME.current_round.reroll_cost = 0
 		return
 	end
-	if next(find_joker("cry-candybuttons")) then
-		G.GAME.current_round.reroll_cost = 1
-		return
-	end
-	if G.GAME.used_vouchers.v_cry_rerollexchange then
-		G.GAME.current_round.reroll_cost = 2
+	if
+		limit
+		and (G.GAME.round_resets.temp_reroll_cost or G.GAME.round_resets.reroll_cost)
+				+ G.GAME.current_round.reroll_cost_increase
+			>= limit
+	then
+		G.GAME.current_round.reroll_cost = limit
 		return
 	end
+
 	G.GAME.current_round.reroll_cost_increase = G.GAME.current_round.reroll_cost_increase or 0
 	if not skip_increment then
 		G.GAME.current_round.reroll_cost_increase = G.GAME.current_round.reroll_cost_increase