Add new upstream features: Bloodstone joker, Judgement consumable, updated localization

Copilot · FilPag · Copilot · commit fa920f0da550 · 2025-08-05T08:22:13.000Z
Co-authored-by: FilPag &lt;1493826+FilPag@users.noreply.github.com&gt;
diff --git a/localization/en-us.lua b/localization/en-us.lua
@@ -1,5 +1,15 @@
 return {
 	descriptions = {
+		Tag = {
+			tag_mp_sandbox_rare = {
+				name = "Gambling Tag",
+				text = {
+					"{C:green}#1# in #2#{} chance",
+					"Shop has a free",
+					"{C:red}Rare Joker{}",
+				},
+			},
+		},
 		Joker = {
 			j_broken = {
 				name = "BROKEN",
@@ -15,6 +25,7 @@ return {
 					"{C:chips}+#1#{} Chips for every {C:red,E:1}life{}",
 					"less than your {X:purple,C:white}Nemesis{}",
 					"{C:inactive}(Currently {C:chips}+#2#{C:inactive} Chips)",
+					"{C:inactive}(Stake-dependent)",
 				},
 			},
 			j_mp_skip_off = {
@@ -78,7 +89,6 @@ return {
 					"your {X:purple,C:white}Nemesis'{} highest ",
 					"sell cost {C:attention}Joker{}",
 					"{C:inactive}(Currently {C:attention}#2#{C:inactive}/#3# rounds)",
-					"{C:inactive,s:0.8}(Does not copy Joker state)",
 				},
 			},
 			j_mp_pizza = {
@@ -105,6 +115,25 @@ return {
 					"{C:attention}#1#{} additional time",
 				},
 			},
+			j_mp_cloud_9 = {
+				name = "Cloud 9",
+				text = {
+					"Earn {C:money}$1{} for each {C:attention}9{} in deck",
+					"(max {C:money}$4{}), then {C:money}$#1#{} for each",
+					"additional {C:attention}9{} at end of round",
+					"{C:inactive}(Currently {C:money}$#2#{}{C:inactive})",
+				},
+			},
+			j_mp_bloodstone = {
+				name = "Bloodstone",
+				text = {
+					"{C:green}#1# in #2#{} chance for",
+					"played cards with",
+					"{C:hearts}Heart{} suit to give",
+					"{X:mult,C:white} X#3# {} Mult when scored",
+					"{C:inactive}(Includes experimental variance){}",
+				},
+			},
 		},
 		Planet = {
 			c_mp_asteroid = {
@@ -161,6 +190,7 @@ return {
 		},
 		challenge_names = {
 			c_mp_standard = "Standard",
+			c_mp_sandbox = "Sandbox",
 			c_mp_badlatro = "Badlatro",
 			c_mp_tournament = "Tournament",
 			c_mp_weekly = "Weekly",
@@ -184,6 +214,7 @@ return {
 			b_lobby_options = "LOBBY OPTIONS",
 			b_copy_clipboard = "Copy to clipboard",
 			b_view_code = "VIEW CODE",
+			b_copy_code = "COPY CODE",
 			b_leave = "LEAVE",
 			b_opts_cb_money = "Give comeback $ on life loss",
 			b_opts_no_gold_on_loss = "Don't get blind rewards on round loss",
@@ -208,6 +239,19 @@ return {
 			b_view_nemesis_deck = "View Decks",
 			b_toggle_jokers = "Toggle Jokers",
 			b_skip_tutorial = "Skip Tutorial",
+			k_yes = "Yes",
+			k_no = "No",
+			k_has_multiplayer_content = "Has Multiplayer Content",
+			k_forces_lobby_options = "Forces Lobby Options",
+			k_forces_gamemode = "Forces Gamemode",
+			k_values_are_modifiable = "* Values are modifiable",
+			k_rulesets = "Rulesets",
+			k_gamemodes = "Gamemodes",
+			k_competitive = "Competitive",
+			k_other = "Other",
+			k_battle = "Battle",
+			k_challenge = "Challenge",
+			k_info = "Info",
 			k_continue_singleplayer_tooltip = "This will overwrite your current singleplayer run",
 			k_enemy_score = "Current Enemy score",
 			k_enemy_hands = "Enemy hands left: ",
@@ -234,7 +278,8 @@ return {
 			k_warning_unlock_profile = "The profile you are playing on is not fully unlocked. If this is a ranked/tournament game, please create a new profile and hit unlock all in the profile settings",
 			k_warning_nemesis_unlock = "Your opponent is playing on a profile that is not fully unlocked. Please instruct them to create a new profile and hit unlock all in the profile settings",
 			k_warning_no_order = "One player has The Order integration enabled while the other does not. This will cause the seeds to differ.",
-			k_warning_cheating = "If you are seeing this, your opponent may be cheating. If this is a ranked game, please send the message '%s' and then open a support ticket in #support",
+			k_warning_cheating1 = "If you are seeing this, your opponent may be cheating.",
+			k_warning_cheating2 = "If this is a ranked game, please send the message '%s' and then open a support ticket in #support",
 			k_message1 = "Hold on, my mom made pizza pops",
 			k_message2 = "One sec, i gotta grab my slow cooker pork roast",
 			k_message3 = "One moment, getting a call from my mom",
@@ -252,40 +297,39 @@ return {
 			k_opts_pvp_timer = "Timer",
 			k_opts_showdown_starting_antes = "Showdown Starts at Ante",
 			k_opts_pvp_timer_increment = "Timer Increment",
+			k_opts_pvp_countdown_seconds = "PvP Countdown Seconds",
 			k_bl_life = "Life",
 			k_bl_or = "or",
 			k_bl_death = "Death",
 			k_bl_mostchips = "Most chips wins",
 			k_current_seed = "Current seed: ",
 			k_random = "Random",
+			k_standard = "Standard",
+			k_sandbox = "Steph's Sandbox",
+			k_sandbox_description = "Like normal mode but someone gave the cards coffee and they're\nfeeling chatty.",
 			k_vanilla = "Vanilla",
-			k_vanilla_description = "The vanilla ruleset, no Multiplayer cards, no modifications to base game content. This ruleset includes Multiplayer features like the timer",
+			k_vanilla_description = "This ruleset removes all Multiplayer content,\nallowing you to play the game as originally designed.\n\nThis ruleset still includes Multiplayer features like the timer.\n\n(Disableable in Lobby Options)",
 			k_blitz = "Blitz",
-			k_blitz_description = "The blitz ruleset, includes Multiplayer cards and changes to the base game to fit the Multiplayer meta. This ruleset includes cards and features that encourage fast play and using time as a resource.",
+			k_blitz_description = "This ruleset includes cards and features that encourage fast play and\nusing time as a resource.\n\nSome cards are balanced in this ruleset to better fit the Multiplayer meta:\n- Hanging Chad is reworked\n- Justice is removed\n- Glass is reworked\n\n(See the bans and reworks tabs for more info)",
 			k_traditional = "Traditional",
-			k_traditional_description = "The traditional ruleset, includes Multiplayer cards and changes to the base game to fit the Multiplayer meta. This ruleset removes aspects of Multiplayer that use time as a resource, allowing you to play a more traditional and methodical game.",
+			k_traditional_description = "This ruleset removes the aspects of Multiplayer that use time as a resource.\n\nThis ruleset allows you to play with the Multiplayer content,\nwhile still allowing for a methodical game.\n\nSome cards are balanced in this ruleset to better fit the Multiplayer meta:\n- Hanging Chad is reworked\n- Justice is removed\n- Glass is reworked\n\n(See the bans and reworks tabs for more info)",
 			k_majorleague = "Major League",
-			k_majorleague_description = "The major league ruleset, it follows the rules for Major League Balatro.",
+			k_majorleague_description = "This is the official ruleset for Major League Balatro.\n\nThis ruleset is the same as the Vanilla ruleset with a few exceptions:\n- You must have The Order Integration disabled\n- The timer is set to 180 seconds\n- The first time the timer hits 0 seconds you will not lose a life",
 			k_minorleague = "Minor League",
-			k_minorleague_description = "The minor league ruleset, it follows the rules for Minor League Balatro.",
+			k_minorleague_description = "This is the official ruleset for Minor League Balatro.\n\nThis ruleset is the same as the Vanilla ruleset with a few exceptions:\n- You must have The Order Integration enabled\n- The timer is set to 180 seconds\n- The first time the timer hits 0 seconds you will not lose a life",
 			k_ranked = "Ranked",
-			k_ranked_description = "The ranked ruleset, this ruleset is the same as Blitz right now, but also forces the correct gamemode, lobby options, and The Order integration.",
-			k_weekly = "Weekly",
-			k_weekly_description = "A special ruleset that changes weekly or bi-weekly. I guess you'll have to find out what it is! Currently: ",
-			k_tournament = "Tournament",
-			k_tournament_description = "The tournament ruleset, this is the same as the standard ruleset but doesn't allow changing the lobby options.",
+			k_ranked_description = "This is the official ruleset for playing Ranked Balatro Multiplayer.\n\nThis ruleset is the same as the Blitz ruleset with a few exceptions:\n- You must have The Order Integration enabled\n- You must be on the recommended Steamodded version",
 			k_badlatro = "Badlatro",
-			k_badlatro_description = "A weekly ruleset designed by @dr_monty_the_snek on the discord server that has been added to the mod permanently.",
+			k_badlatro_description = "A weekly ruleset designed by @dr_monty_the_snek on the discord server\nthat has been added to the mod permanently.\n\nThis ruleset bans 48 jokers, consumables, tags, etc.",
 			k_attrition = "Attrition",
-			k_attrition_description = "Every boss blind is a Nemesis blind. No time to prepare. This gamemode forces you to be battle-ready from the start.",
+			k_attrition_description = "After the first ante, every boss blind is a Nemesis blind. No time to prepare. This gamemode forces you to be battle-ready from the start.",
 			k_showdown = "Showdown",
 			k_showdown_description = "After the first 2 antes, every blind is a Nemesis blind. This gamemode gives you time to prepare before battle.",
 			k_survival = "Survival",
 			k_survival_description = "The player who beats the farthest blind wins. No Nemesis blinds. This gamemode is a test of your ability to gradually build-up to the highest scoring Vanilla hands.",
-			k_coop = "Co-op",
-			k_coop_description = "The vanilla ruleset, but with no banned blinds.",
-			k_coopSurvival = "Co-op Survival",
-			k_coopSurvival_description = "Work together with your friends to beat the farthest blind possible. No Nemesis blinds. This gamemode is a test of your ability to gradually build-up to the highest scoring Vanilla hands.",
+			k_weekly = "Weekly",
+			k_weekly_description = "A special ruleset that changes weekly or bi-weekly. I guess you'll have to find out what it is! Currently: ",
+			k_weekly_smallworld = "Small World",
 			k_oops_ex = "Oops!",
 			k_asteroids = "Asteroids",
 			k_amount_short = "Amt.",
@@ -299,8 +343,11 @@ return {
 			k_the_order_credit = "*Credit to @MathIsFun_",
 			k_the_order_integration_desc = "This will patch card creation to not be ante-based and use a single pool for every type/rarity",
 			k_requires_restart = "*Requires a restart to take effect",
+			k_new_weekly_ruleset = "A new weekly ruleset is available!",
+			k_currently_colon = "Currently: ",
+			k_sync_locally = "Sync locally (Restarts game)",
 			k_bans = "Bans",
-			k_reworks = "Additions/Reworks",
+			k_reworks = "Reworks",
 			k_ruleset_disabled_the_order_required = "The Order is Required",
 			k_ruleset_disabled_the_order_banned = "The Order is Banned",
 			k_ruleset_not_found = "Unknown ruleset",
@@ -315,8 +362,7 @@ return {
 				"you like it consider",
 			},
 			ml_lobby_info = { "Lobby", "Info" },
-			loc_ready_pvp = "Ready for PvP",
-			loc_ready_boss = "Ready for Boss",
+			loc_ready = "Ready for PvP",
 			loc_selecting = "Selecting a Blind",
 			loc_shop = "Shopping",
 			loc_playing = "Playing ",
@@ -330,10 +376,14 @@ return {
 			a_mp_skips_tied = { "Tied" },
 			k_banned_objs = "Banned #1#",
 			k_no_banned_objs = "No Banned #1#",
-			k_reworked_objs = "Added/Reworked #1#",
-			k_no_reworked_objs = "No Added/Reworked #1#",
+			k_reworked_objs = "Reworked #1#",
+			k_no_reworked_objs = "No Reworked #1#",
 			k_ruleset_disabled_smods_version = "SMODS Version #1# Required",
 			k_failed_to_join_lobby = "Failed to join lobby: #1#",
+			k_ante_number = "Ante #1#",
+			k_ante_range = "Ante #1#-#2#", -- For example, "Ante 1-2"
+			k_ante_min = "Ante #1#+", -- For example, "Ante 2+"
+			k_credits_list = "#1# and many more!" -- #1# gets replaced with a list of names
 		},
 		v_text = {
 			ch_c_hanging_chad_rework = { "{C:attention}Hanging Chad{} is {C:dark_edition}reworked" },
diff --git a/objects/consumables/judgement.lua b/objects/consumables/judgement.lua
@@ -0,0 +1,76 @@
+-- gotta redefine the logic
+MP.ReworkCenter({
+	key = "c_judgement",
+	ruleset = MP.UTILS.get_standard_rulesets(),
+	silent = true,
+	use = function(self, card, area, copier)
+		local _card = copier or card
+		G.E_MANAGER:add_event(Event({trigger = 'after', delay = 0.4, func = function()
+			play_sound('timpani')
+			if MP.INTEGRATIONS.TheOrder then -- this only matters if order exists
+				local done = false
+				while not done do -- AHHH we have to do so much boilerplate
+					done = true
+					
+					local card = { stickers = { eternal = false, perishable = false, rental = false } }
+					local rarity = SMODS.poll_rarity("Joker", 'rarity0')
+					local str_rarity = rarity
+					if type(rarity) == 'number' then 
+						str_rarity = ({'Common', 'Uncommon', 'Rare', 'Legendary'})[rarity] -- kill me now
+					end
+					local _pool = get_current_pool('Joker', str_rarity, nil, '')
+					local _pool_key = 'Joker'..rarity..'0'
+
+					center = pseudorandom_element(_pool, pseudoseed(_pool_key))
+					local it = 1
+					while center == 'UNAVAILABLE' do
+						it = it + 1
+						center = pseudorandom_element(_pool, pseudoseed(_pool_key))
+					end
+					
+					card.key = center
+					
+					local eternal_perishable_poll = pseudorandom(center..'etperpoll0')
+					local rental_poll = pseudorandom(center..'ssjr0')
+				
+					if G.GAME.modifiers.enable_eternals_in_shop 
+					and eternal_perishable_poll > 0.7 
+					and G.P_CENTERS[center].eternal_compat then
+						card.stickers.eternal = true
+						done = false
+					end
+					
+					if G.GAME.modifiers.enable_perishables_in_shop 
+					and ((eternal_perishable_poll > 0.4) and (eternal_perishable_poll <= 0.7)) 
+					and G.P_CENTERS[center].perishable_compat then
+						card.stickers.perishable = true
+						done = false
+					end
+					
+					if G.GAME.modifiers.enable_rentals_in_shop 
+					and rental_poll > 0.7 then
+						card.stickers.rental = true
+						done = false
+					end
+					
+					if done then
+						table.insert(G.GAME.MP_joker_overrides, 1, card) -- start, so it gets created immediately
+					else
+						table.insert(G.GAME.MP_joker_overrides, card) -- end
+					end
+				end
+			end
+
+
+			G.MP_JUDGEMENT_OVERRIDE = true
+			local joker = create_card('Joker', G.jokers, nil, nil, nil, nil, nil, 'jud') -- just call create card since override will kick in
+			G.MP_JUDGEMENT_OVERRIDE = nil
+			joker:add_to_deck()
+			G.jokers:emplace(joker)
+			_card:juice_up(0.3, 0.5)
+			
+			return true
+		end}))
+		delay(0.6)
+	end,
+})
diff --git a/objects/jokers/bloodstone.lua b/objects/jokers/bloodstone.lua
@@ -0,0 +1,31 @@
+-- this is kinda strange but we can just override the logic for pvp only rather than re-implementing it again, bc if we don't return anything, it'll run the normal logic
+MP.ReworkCenter({
+	key = "j_bloodstone",
+	ruleset = MP.UTILS.get_standard_rulesets(),
+	silent = true,
+	calculate = function(self, card, context)
+		if MP.is_pvp_boss() then
+			if not context.blueprint then
+				if context.before then
+					G.GAME.round_resets.mp_bloodstone = G.GAME.round_resets.mp_bloodstone or {}
+					G.GAME.round_resets.mp_bloodstone[MP.order_round_based(true)] = G.GAME.round_resets.mp_bloodstone[MP.order_round_based(true)] or {}
+					G.GAME.round_resets.mp_bsindex = 0
+				end
+			end
+			if context.individual and context.cardarea == G.play then
+				if context.other_card:is_suit("Hearts") then
+					local stored_queue = G.GAME.round_resets.mp_bloodstone[MP.order_round_based(true)]
+					G.GAME.round_resets.mp_bsindex = G.GAME.round_resets.mp_bsindex + 1 -- increment before indexing
+					stored_queue[G.GAME.round_resets.mp_bsindex] = stored_queue[G.GAME.round_resets.mp_bsindex] or pseudorandom('bloodstone'..MP.order_round_based(true))
+					if stored_queue[G.GAME.round_resets.mp_bsindex] < G.GAME.probabilities.normal/card.ability.extra.odds then
+						return {
+							x_mult = card.ability.extra.Xmult,
+							card = card
+						}
+					end
+					return nil, true -- prevents normal logic from triggering
+				end
+			end
+		end
+	end,
+})
