tax and chromatic no longer use scoring calcs

Author: Jevonnissocoolman

items/blind.lua

@@ -294,13 +294,14 @@ local tax = {
 		return { vars = { localize("cry_tax_placeholder") } }
 	end,
 	set_blind = function(self, reset, silent)
-		SMODS.set_scoring_calculation("cry_tax")
+		G.GAME.tax_mod = 0.4
+		--SMODS.set_scoring_calculation("cry_tax")
 	end,
 	defeat = function(self, silent)
-		SMODS.set_scoring_calculation("multiply")
+		G.GAME.tax_mod = nil
 	end,
 	disable = function(self, silent)
-		SMODS.set_scoring_calculation("multiply")
+		G.GAME.tax_mod = nil
 	end,
 	in_pool = function()
 		return math.floor(G.GAME.round_resets.hands) >= 3
@@ -937,15 +938,15 @@ local chromatic = {
 	boss_colour = HEX("a34f98"),
 	set_blind = function(self, reset, silent)
 		G.GAME.chromatic_mod = 0
-		SMODS.set_scoring_calculation("cry_chromatic")
+		--SMODS.set_scoring_calculation("cry_chromatic")
 	end,
 	defeat = function(self, silent)
 		G.GAME.chromatic_mod = nil
-		SMODS.set_scoring_calculation("multiply")
+		--SMODS.set_scoring_calculation("multiply")
 	end,
 	disable = function(self, silent)
 		G.GAME.chromatic_mod = nil
-		SMODS.set_scoring_calculation("multiply")
+		--SMODS.set_scoring_calculation("multiply")
 	end,
 	press_play = function(self)
 		if not G.GAME.blind.disabled then

lib/overrides.lua

@@ -2272,3 +2272,32 @@ function SMODS.calculate_individual_effect(effect, scored_card, key, amount, fro
 end
 
 SMODS.scoring_parameter_keys[#SMODS.scoring_parameter_keys + 1] = "cry_broken_swap"
+
+local smods_calculate_round_score_stuff = SMODS.calculate_round_score
+function SMODS.calculate_round_score(flames)
+	if not G.GAME.current_scoring_calculation then
+		return 0
+	end
+	if Cryptid.safe_get(G, "GAME", "chromatic_mod") then
+		if G.GAME.chromatic_mod % 2 == 1 then
+			return G.GAME.current_scoring_calculation:func(
+				SMODS.get_scoring_parameter("chips", flames),
+				SMODS.get_scoring_parameter("mult", flames),
+				flames
+			) * -1
+		end
+	end
+	if G.GAME.tax_mod then
+		return math.floor(
+			math.min(
+				G.GAME.tax_mod * G.GAME.blind.chips,
+				G.GAME.current_scoring_calculation:func(
+					SMODS.get_scoring_parameter("chips", flames),
+					SMODS.get_scoring_parameter("mult", flames),
+					flames
+				)
+			) + 0.5
+		)
+	end
+	return smods_calculate_round_score_stuff(flames)
+end