scalae&double scale more in line with originals

Author: lord-ruby

items/epic.lua

@@ -1050,6 +1050,13 @@ local double_scale = {
 	immutable = true,
 	atlas = "atlasepic",
 	calc_scaling = function(self, card, other, current_scaling, current_scalar, args)
+		if to_big(times_current) >= to_big(times_needed) then
+			times_current = times_current - times_needed
+		else
+			return {
+				message = number_format(times_current).."/"..number_format(times_needed)
+			}
+		end
 		if not G.GAME.cryptid_base_scales then
 			G.GAME.cryptid_base_scales = {}
 		end
@@ -1084,6 +1091,18 @@ local double_scale = {
 			"Mathguy",
 		},
 	},
+	config = {
+		times_needed = 4
+		times_current = 0
+	},
+	loc_vars = function(sef, queue, card)
+		return {
+			vars = {
+				card.ability.times_needed,
+				card.ability.times_current
+			}
+		}
+	end
 }
 
 -- Nostalgic Candy

items/exotic.lua

@@ -882,7 +882,7 @@ local scalae = {
 	demicoloncompat = true,
 	calculate = function(self, card, context)
 		if
-			(context.end_of_round and not context.individual and not context.repetition and not context.blueprint)
+			(context.end_of_round and not context.individual and not context.repetition and not context.blueprint and G.GAME.blind_on_deck == "Boss")
 			or context.forcetrigger
 		then
 			card.ability.extra.scale = lenient_bignum(to_big(card.ability.extra.scale) + card.ability.extra.scale_mod)
@@ -934,10 +934,17 @@ local scalae = {
 		end
 	end,
 	loc_vars = function(self, info_queue, card)
+		local example = { 2, 3, 4 }
+		for i = 1, #example do
+			example[i] = to_big(example[i]) ^ (card.ability.extra.scale + 1)
+		end
 		return {
 			vars = {
-				number_format(card.ability.extra.scale),
+				number_format(card.ability.extra.scale + 1),
 				number_format(card.ability.extra.scale_mod),
+				example[1],
+				example[2],
+				example[3],
 			},
 		}
 	end,

localization/en-us.lua

@@ -1553,21 +1553,14 @@ return {
 					"for each {C:attention}Jolly Joker{}",
 				},
 			},
-			-- ["j_cry_Double Scale"] = { -- ?????????????
-			-- 	name = "Double Scale",
-			-- 	text = {
-			-- 		"Scaling {C:attention}Jokers{}",
-			-- 		"scale {C:attention}quadratically",
-			-- 		"{C:inactive,s:0.8}(ex. +1, +3, +6, +10)",
-			-- 		"{C:inactive,s:0.8}(grows by +1, +2, +3)",
-			-- 	},
-			-- },
-			["j_cry_Double Scale"] = {
+			["j_cry_Double Scale"] = { -- ?????????????
 				name = "Double Scale",
 				text = {
 					"Scaling {C:attention}Jokers{}",
-					"scale {C:attention}twice{} as fast",
-					'{C:inactive,s:0.8}"It\'s called double scale, not quadratic scale!"',
+					"scale {C:attention}quadratically",
+					"every {C:attention}#1#{} {C:inactive}[#2#]{} Scales"
+					"{C:inactive,s:0.8}(ex. +1, +3, +6, +10)",
+					"{C:inactive,s:0.8}(grows by +1, +2, +3)",
 				},
 			},
 			j_cry_dropshot = {
@@ -2590,10 +2583,11 @@ return {
 				name = "Scalae",
 				text = {
 					"Scaling {C:attention}Jokers{} scale",
-					"{X:dark_edition,C:white}X#1#{} as fast",
-					"increase multiplier by {C:attention}#2#{}",
-					"at end of round",
+					"as a degree-{C:attention}#1#{} polynomial",
+					"raise degree by {C:attention}#2#{}",
+					"when a Boss Blind is defeated",
 					"{C:inactive,s:0.8}({C:attention,s:0.8}Scalae{C:inactive,s:0.8} excluded)",
+					"{C:inactive,s:0.8}(ex. +1, +#3#, +#4#, +#5#)",
 				},
 			},
 			j_cry_scrabble = {