bring stuff over

Author: lord-ruby

items/code.lua

@@ -3499,7 +3499,7 @@ local log = {
 			G.CHOOSE_CARD = UIBox({
 				definition = create_UIBox_log({
 					bl and G.localization.descriptions.Blind[bl].name or "None",
-					voucher and G.localization.descriptions.Voucher[voucher[1]].name or "None",
+					voucher and G.P_CENTERS[voucher[1]] and localize { type = 'name_text', set = G.P_CENTERS[voucher[1]].set, key = voucher[1] } or "None",
 				}, localize("cry_code_antevoucher")),
 				config = {
 					align = "cm",
@@ -3519,8 +3519,18 @@ local log = {
 			local pseudorandom = copy_table(G.GAME.pseudorandom)
 			local j = {}
 			for i = 1, 5 do
-				local next_joker = G.localization.descriptions["Joker"][Cryptid.predict_joker("sho")]
-				j[#j + 1] = next_joker and next_joker.name or "[NOT A JOKER]"
+				local key = Cryptid.predict_joker("sho")
+				local next_joker = G.P_CENTERS[key] and localize { type = 'name_text', set = G.P_CENTERS[key].set, key = key } 
+				or "ERROR"
+				if next_joker == "ERROR" then
+					local try = (G.localization.descriptions[G.P_CENTERS[key].set] or {})[key]
+					try = try and try.name or "[ERROR]"
+					if type(try or "a") == "table" then
+						try = try[1]
+					end
+					next_joker = try
+				end
+				j[#j + 1] = next_joker
 			end
 			G.GAME.pseudorandom = copy_table(pseudorandom)
 			G.GAME.USING_CODE = true
@@ -3544,7 +3554,9 @@ local log = {
 			local j = {}
 			for i = 1, 10 do
 				local card = G.deck.cards[#G.deck.cards + 1 - i]
-				j[#j + 1] = localize(card.base.value, "ranks") .. " of " .. localize(card.base.suit, "suits_plural")
+				if card then
+					j[#j + 1] = localize(card.base.value, "ranks") .. " of " .. localize(card.base.suit, "suits_plural")
+				end
 			end
 			G.GAME.USING_CODE = true
 			G.CHOOSE_CARD = UIBox({
@@ -3601,7 +3613,7 @@ local log = {
 							}),
 						},
 					},
-					G.GAME.blind and G.GAME.blind.in_blind and {
+					G.GAME.blind and G.GAME.blind.in_blind and G.deck and #(G.deck.cards or {}) > 0 and {
 						n = G.UIT.R,
 						config = { align = "cm" },
 						nodes = {

lib/overrides.lua

@@ -471,6 +471,86 @@ function Game:update(dt)
 		G.STATE = G.STATES.SELECTING_HAND
 		G.STATE_COMPLETE = false
 	end
+	if 
+		G.STATE == G.STATES.HAND_PLAYED
+		and to_big(G.GAME.chips) > to_big(G.GAME.blind.chips)
+		and not G.hand.cards[1]
+		and not G.deck.cards[1]
+	then
+		--im having to manually recreate some of this idk why
+		G.RESET_BLIND_STATES = true
+        G.RESET_JIGGLES = true
+		G.GAME.blind.in_blind = false
+		G.E_MANAGER:add_event(Event({
+			trigger = 'after',
+			delay = 0.3,
+			func = function()
+				if G.GAME.blind.config.blind.cry_before_cash and not G.GAME.blind.disabled then
+					G.GAME.blind:cry_before_cash()
+				else
+				G.GAME.cry_make_a_decision = nil
+				
+				G.STATE = G.STATES.ROUND_EVAL
+				G.STATE_COMPLETE = false
+				end
+
+				if G.GAME.blind_on_deck == 'Small' then
+					G.GAME.round_resets.blind_states.Small = 'Defeated'
+				elseif G.GAME.blind_on_deck == 'Big' then
+					G.GAME.round_resets.blind_states.Big = 'Defeated'
+				else
+					if G.GAME.current_round.cry_voucher_stickers.pinned == false then
+						G.GAME.current_round.voucher = SMODS.get_next_vouchers()
+						G.GAME.current_round.cry_voucher_stickers = Cryptid.next_voucher_stickers()
+						G.GAME.current_round.cry_voucher_edition = cry_get_next_voucher_edition() or {}
+						G.GAME.current_round.cry_bonusvouchers = {}
+						G.GAME.cry_bonusvouchersused = {}	-- i'm not sure why i'm putting these in two separate tables but it doesn't matter much
+						for i = 1, G.GAME.cry_bonusvouchercount do
+							G.GAME.current_round.cry_bonusvouchers[i] = SMODS.get_next_vouchers()
+						end
+						if G.GAME.modifiers.cry_no_vouchers then
+							very_fair_quip = pseudorandom_element(G.localization.misc.very_fair_quips, pseudoseed("cry_very_fair"))
+						end
+					end
+					G.GAME.round_resets.blind_states.Boss = 'Defeated'
+					for k, v in ipairs(G.playing_cards) do
+						v.ability.played_this_ante = nil
+					end
+				end
+
+				if G.GAME.round_resets.temp_handsize then G.hand:change_size(-G.GAME.round_resets.temp_handsize); G.GAME.round_resets.temp_handsize = nil end
+				if G.GAME.round_resets.temp_reroll_cost then G.GAME.round_resets.temp_reroll_cost = nil; calculate_reroll_cost(true) end
+				for _, v in pairs(find_joker("cry-loopy")) do
+					if v.ability.extra.retrigger ~= 0 then
+						v.ability.extra.retrigger = 0
+						card_eval_status_text(v, 'extra', nil, nil, nil, {message = localize("k_reset"), colour = G.C.GREEN})
+					end
+				end
+				for _, v in pairs(G.deck.cards) do
+					v.sus = nil
+				end
+				if G.GAME.sus_cards then
+					SMODS.calculate_context({ remove_playing_cards = true, removed = G.GAME.sus_cards })
+					G.GAME.sus_cards = nil
+				end
+
+				reset_idol_card()
+				reset_mail_rank()
+				reset_ancient_card()
+				reset_castle_card()                        
+				for _, mod in ipairs(SMODS.mod_list) do
+					if mod.reset_game_globals and type(mod.reset_game_globals) == 'function' then
+						mod.reset_game_globals(false)
+					end
+				end
+				for k, v in ipairs(G.playing_cards) do
+					v.ability.discarded = nil
+					v.ability.forced_selection = nil
+				end
+			return true
+			end
+		}))
+	end
 end
 
 -- All the scattered set_cost hooks from all the pre refactor files moved into one hook