Merge pull request #216 from Brawmario/feature/rework-taxes-ante-scaling

Refactor Taxes Joker logic to track sells per ante and update multiplier calculation

Author: V-rtualized

core.lua

@@ -105,6 +105,7 @@ function MP.reset_game_states()
 			skips = 0,
 			lives = MP.LOBBY.config.starting_lives,
 			sells = 0,
+			sells_per_ante = {},
 			spent_in_shop = {},
 			highest_score = MP.INSANE_INT.empty(),
 		},

localization/en-us.lua

@@ -64,11 +64,10 @@ return {
 			j_mp_taxes = {
 				name = "Taxes",
 				text = {
-					"{C:mult}+#1#{} Mult for every card your",
-					"{X:purple,C:white}Nemesis{} {C:attention}sold{} this run, updates",
-					"when {C:attention}PvP Blind{} is selected",
-					"{C:inactive}(Currently {C:mult}+#2#{C:inactive} Mult,",
-					"{C:inactive}will be at {C:mult}+#3#{C:inactive} Mult)",
+					"Gains {C:mult}+#1#{} Mult for every card your",
+					"{X:purple,C:white}Nemesis{} {C:attention}sold{} since last {C:attention}PvP Blind{},",
+					"updates when {C:attention}PvP Blind{} is selected",
+					"{C:inactive}(Currently {C:mult}+#2#{C:inactive} Mult)",
 				},
 			},
 			j_mp_magnet = {

localization/pt_BR.lua

@@ -68,11 +68,10 @@ return {
 			j_mp_taxes = {
 				name = "Impostos",
 				text = {
-					"{C:mult}+#1#{} Multi para cada carta seu",
-					"{X:purple,C:white}Rival{} {C:attention}vender{} nesta partida, atualizando",
-					"quando um {C:attention}Blind de Duelo{} for selecionado",
-					"{C:inactive}(Atualmente {C:mult}+#2#{C:inactive} Multi,",
-					"{C:inactive}atualizará para {C:mult}+#3#{C:inactive} Multi)",
+					"Este Curinga ganha {C:mult}+#1#{} Multi para cada carta que seu",
+					"{X:purple,C:white}Rival{} {C:attention}vender{} desde a última {C:attention}Blind de Duelo{},",
+					"atualizando quando um {C:attention}Blind de Duelo{} for selecionado",
+					"{C:inactive}(Atualmente {C:mult}+#2#{C:inactive} Multi)",
 				},
 			},
 			j_mp_magnet = {

networking/action_handlers.lua

@@ -409,7 +409,9 @@ local action_asteroid = action_asteroid
 local function action_sold_joker()
 	-- HACK: this action is being sent when any card is being sold, since Taxes is now reworked
 	MP.GAME.enemy.sells = MP.GAME.enemy.sells + 1
-	SMODS.calculate_context({ mp_sold_joker = true })
+	MP.GAME.enemy.sells_per_ante[G.GAME.round_resets.ante] = (
+		(MP.GAME.enemy.sells_per_ante[G.GAME.round_resets.ante] or 0) + 1
+	)
 end
 
 local function action_lets_go_gambling_nemesis()
@@ -565,7 +567,7 @@ local function action_send_game_stats()
 	end
 
 	local stats_str = string.format("reroll_count:%d,reroll_cost_total:%d",
-		MP.GAME.stats.reroll_count, 
+		MP.GAME.stats.reroll_count,
 		MP.GAME.stats.reroll_cost_total)
 
 	-- Extract voucher keys where value is true and join them with a dash

objects/jokers/taxes.lua

@@ -1,5 +1,14 @@
-local function calculate_taxes_mult(card)
-	return MP.GAME.enemy.sells * card.ability.extra.mult_gain
+local function next_taxes_total_mult_gain(card)
+	local sells = MP.GAME.enemy.sells_per_ante[G.GAME.round_resets.ante] or 0
+
+	-- If PvP hasn't been reached for the first time, accumulate sells from previous Antes
+	if G.GAME.round_resets.ante <= MP.LOBBY.config.pvp_start_round then
+		for i = 1, G.GAME.round_resets.ante - 1 do
+			sells = sells + (MP.GAME.enemy.sells_per_ante[i] or 0)
+		end
+	end
+
+	return sells * card.ability.extra.mult_gain
 end
 
 SMODS.Atlas({
@@ -22,7 +31,7 @@ SMODS.Joker({
 	config = { extra = { mult_gain = 4, mult = 0 } },
 	loc_vars = function(self, info_queue, card)
 		MP.UTILS.add_nemesis_info(info_queue)
-		return { vars = { card.ability.extra.mult_gain, card.ability.extra.mult, calculate_taxes_mult(card) } }
+		return { vars = { card.ability.extra.mult_gain, card.ability.extra.mult } }
 	end,
 	in_pool = function(self)
 		return MP.LOBBY.code and MP.LOBBY.config.multiplayer_jokers
@@ -38,12 +47,10 @@ SMODS.Joker({
 			and not context.blueprint
 			and context.blind.key == "bl_mp_nemesis"
 		then
-			card.ability.extra.mult = calculate_taxes_mult(card)
+			card.ability.extra.mult = card.ability.extra.mult + next_taxes_total_mult_gain(card)
 			return {
 				message = localize("k_filed_ex"),
 			}
-		elseif context.mp_sold_joker and not context.blueprint then
-			card:juice_up()
 		end
 	end,
 	mp_credits = {