Merge pull request #771 from SpectralPack/temp

sync changes with branch

Author: lord-ruby

Cryptid.json

@@ -9,7 +9,7 @@
 	"priority": 114,
 	"badge_colour": "708b91",
 	"badge_text_colour": "FFFFFF",
-	"version": "0.5.11",
+	"version": "0.5.12~dev",
 	"dependencies": [
 		"Steamodded (>=1.0.0~BETA-0711a)"
 	],

Cryptid.lua

@@ -187,6 +187,9 @@ function SMODS.injectItems(...)
 			end
 		end
 	end
+	if G.PROFILES[G.SETTINGS.profile].all_unlocked then
+		G.PROFILES[G.SETTINGS.profile].cry_none = (Cryptid.enabled("set_cry_poker_hand_stuff") == true)
+	end
 	G.P_CENTERS.j_stencil.immutable = true
 	G.P_CENTERS.j_four_fingers.immutable = true
 	G.P_CENTERS.j_mime.immutable = true

items/blind.lua

@@ -743,22 +743,24 @@ local greed = {
 		}
 	end,
 	set_blind = function(self, reset, silent)
-		if to_big(G.GAME.dollars) < to_big(5000) then
-			G.GAME.blind.chips = -- go my equations
-				((get_blind_amount(G.GAME.round_resets.ante) * G.GAME.starting_params.ante_scaling) + (math.floor(
-					G.GAME.dollars / 5
-				) * (get_blind_amount(G.GAME.round_resets.ante) * 0.25)))
-		else
-			G.GAME.blind.chips = -- set cap at $5000
-				(
-					(get_blind_amount(G.GAME.round_resets.ante) * G.GAME.starting_params.ante_scaling)
-					+ (
-						math.floor(5000 / 5) -- 1000 extra increments
-						* (get_blind_amount(G.GAME.round_resets.ante) * 0.25)
+		if to_big(G.GAME.dollars) > to_big(0) then
+			if to_big(G.GAME.dollars) < to_big(5000) then
+				G.GAME.blind.chips = -- go my equations
+					((get_blind_amount(G.GAME.round_resets.ante) * G.GAME.starting_params.ante_scaling) + (math.floor(
+						G.GAME.dollars / 5
+					) * (get_blind_amount(G.GAME.round_resets.ante) * 0.25)))
+			else
+				G.GAME.blind.chips = -- set cap at $5000
+					(
+						(get_blind_amount(G.GAME.round_resets.ante) * G.GAME.starting_params.ante_scaling)
+						+ (
+							math.floor(5000 / 5) -- 1000 extra increments
+							* (get_blind_amount(G.GAME.round_resets.ante) * 0.25)
+						)
 					)
-				)
+			end
+			G.GAME.blind.chip_text = number_format(G.GAME.blind.chips)
 		end
-		G.GAME.blind.chip_text = number_format(G.GAME.blind.chips)
 	end,
 	disable = function(self, silent)
 		G.GAME.blind.chips = get_blind_amount(G.GAME.round_resets.ante) * G.GAME.starting_params.ante_scaling
@@ -1049,7 +1051,7 @@ local tornado = {
 	order = 94,
 	boss_colour = HEX("3dd9ca"),
 	loc_vars = function(self)
-		return { vars = { "" .. ((Cryptid.safe_get(G.GAME, "probabilities", "normal") or 1) * 2), 3 } }
+		return { vars = { SMODS.get_probability_vars(self, 2, 3, "Turquoise Tornado") } }
 	end,
 	set_blind = function(self, reset, silent)
 		if not reset then
@@ -1060,12 +1062,12 @@ local tornado = {
 		return #Cryptid.advanced_find_joker("Oops! All 6s", nil, nil, { "eternal" }, nil) == 0
 	end,
 	collection_loc_vars = function(self)
-		return { vars = { "" .. ((Cryptid.safe_get(G.GAME, "probabilities", "normal") or 1) * 2), 3 } }
+		return { vars = { SMODS.get_probability_vars(self, 2, 3, "Turquoise Tornado") } }
 	end,
 	debuff_hand = function(self, cards, hand, handname, check)
 		if
 			not check
-			and (pseudorandom(pseudoseed("tornado")) < ((G.GAME.probabilities.normal * 2) / 3))
+			and SMODS.pseudorandom_probability(self, "tornado", 2, 3, "Turquoise Tornado")
 			and not G.GAME.blind.disabled
 		then
 			--check for guarantee
@@ -1546,7 +1548,7 @@ local obsidian_orb = {
 			if area == G.hand then
 				if
 					s.name == "The Wheel"
-					and pseudorandom(pseudoseed("ObsidianOrb")) < G.GAME.probabilities.normal / 7
+					and SMODS.pseudorandom_probability(self, "ObsidianOrb", 1, 7, "Obsidian Orb")
 				then
 					return true
 				end

items/code.lua

@@ -3387,6 +3387,15 @@ local variable = {
 				local c = SMODS.Ranks[card.base.value] or {}
 				if c.hidden or c.noe_doe or c.no_collection or c.no_variable or c.no_code then
 					card.debuff = true
+				else
+					G.E_MANAGER:add_event(Event({
+						trigger = "after",
+						blocking = false,
+						func = function()
+							card.debuff = false
+							return true
+						end,
+					}))
 				end
 			end
 			return emplace_ref(self, card, ...)
@@ -4469,7 +4478,7 @@ local semicolon = {
 			"HexaCryonic",
 		},
 		code = {
-			"Math",
+			"WilsontheWolf",
 		},
 	},
 	dependencies = {
@@ -4982,16 +4991,21 @@ local cut = {
 				codecard_to_destroy.getting_sliced = true
 				card.ability.extra.Xmult =
 					lenient_bignum(to_big(card.ability.extra.Xmult) + card.ability.extra.Xmult_mod)
+				local msg = SMODS.scale_card(card, {
+					ref_table = card.ability.extra,
+					ref_value = "Xmult",
+					scalar_value = "Xmult_mod",
+				})
 				G.E_MANAGER:add_event(Event({
 					func = function()
 						(context.blueprint_card or card):juice_up(0.8, 0.8)
 						codecard_to_destroy:start_dissolve({ G.C.RED }, nil, 1.6)
 						return true
 					end,
 				}))
-				if not (context.blueprint_card or self).getting_sliced then
+				if not (context.blueprint_card or self).getting_sliced and (not msg or type(msg) == "string") then
 					card_eval_status_text((context.blueprint_card or card), "extra", nil, nil, nil, {
-						message = localize({
+						message = msg or localize({
 							type = "variable",
 							key = "a_xmult",
 							vars = { number_format(to_big(card.ability.extra.Xmult)) },
@@ -5016,14 +5030,19 @@ local cut = {
 		end
 		if context.forcetrigger then
 			card.ability.extra.Xmult = lenient_bignum(to_big(card.ability.extra.Xmult) + card.ability.extra.Xmult_mod)
+			local msg = SMODS.scale_card(card, {
+				ref_table = card.ability.extra,
+				ref_value = "Xmult",
+				scalar_value = "Xmult_mod",
+			})
 			return {
-				message = localize({
+				message = not msg and localize({
 					type = "variable",
 					key = "a_xmult",
 					vars = {
 						number_format(card.ability.extra.Xmult),
 					},
-				}),
+				}) or (type(msg) == "string" and msg) or nil,
 				Xmult_mod = card.ability.extra.Xmult,
 				colour = G.C.MULT,
 			}

items/deck.lua

@@ -357,6 +357,9 @@ local legendary = {
 	pos = { x = 0, y = 6 },
 	atlas = "atlasdeck",
 	order = 15,
+	loc_vars = function(self, info_queue, center)
+		return { vars = { SMODS.get_probability_vars(self, 1, self.config.cry_legendary_rate, "Legendary Deck") } }
+	end,
 	calculate = function(self, back, context)
 		if context.context == "eval" and Cryptid.safe_get(G.GAME, "last_blind", "boss") then
 			SMODS.Events["ev_cry_choco10"]:finish()
@@ -394,18 +397,21 @@ local critical = {
 	name = "cry-Critical",
 	key = "critical",
 	order = 10,
-	config = { cry_crit_rate = 0.25, cry_crit_miss_rate = 0.125 },
+	config = { cry_crit_rate = 4, cry_crit_miss_rate = 8 },
 	pos = { x = 4, y = 5 },
 	atlas = "atlasdeck",
 	loc_vars = function(self, info_queue, center)
-		return { vars = { G.GAME.probabilities.normal or 1 } }
+		local _, aaa = SMODS.get_probability_vars(self, 1, self.config.cry_crit_miss_rate, "Critical Deck")
+		return { vars = { SMODS.get_probability_vars(self, 1, self.config.cry_crit_rate, "Critical Deck"), aaa } }
 	end,
 	calculate = function(self, card, context)
 		if context.final_scoring_step then
+			local aaa =
+				SMODS.pseudorandom_probability(self, "cry_critical", 1, self.config.cry_crit_rate, "Critical Deck")
+			local bbb =
+				SMODS.pseudorandom_probability(self, "cry_critical", 1, self.config.cry_crit_miss_rate, "Critical Deck")
 			local check
-			local crit_poll = pseudorandom(pseudoseed("cry_critical"))
-			crit_poll = crit_poll / (G.GAME.probabilities.normal or 1)
-			if crit_poll < self.config.cry_crit_rate then
+			if aaa then
 				check = 2
 				G.E_MANAGER:add_event(Event({
 					func = function()
@@ -421,7 +427,7 @@ local critical = {
 						return true
 					end,
 				}))
-			elseif crit_poll < self.config.cry_crit_rate + self.config.cry_crit_miss_rate then
+			elseif bbb then
 				check = 0.5
 				G.E_MANAGER:add_event(Event({
 					func = function()
@@ -880,8 +886,6 @@ local antimatter = {
 
 		function Cryptid.antimatter_trigger_final_scoring(self, context, skip)
 			if context.context == "final_scoring_step" then
-				local crit_poll = pseudorandom(pseudoseed("cry_critical"))
-				crit_poll = crit_poll / (G.GAME.probabilities.normal or 1)
 				--Critical Deck
 				if
 					(
@@ -891,7 +895,15 @@ local antimatter = {
 						~= 0
 					or skip
 				then
-					if crit_poll < self.config.cry_crit_rate then
+					if
+						SMODS.pseudorandom_probability(
+							self,
+							"cry_critical",
+							1,
+							self.config.cry_crit_rate,
+							"Antimatter Deck"
+						)
+					then
 						context.mult = context.mult ^ 2
 						update_hand_text({ delay = 0 }, { mult = context.mult, chips = context.chips })
 						G.E_MANAGER:add_event(Event({
@@ -1004,9 +1016,15 @@ local antimatter = {
 						or skip
 					then
 						if #G.jokers.cards < G.jokers.config.card_limit then
-							local legendary_poll = pseudorandom(pseudoseed("cry_legendary"))
-							legendary_poll = legendary_poll / (G.GAME.probabilities.normal or 1)
-							if legendary_poll < self.config.cry_legendary_rate then
+							if
+								SMODS.pseudorandom_probability(
+									self,
+									"cry_legendary",
+									1,
+									self.config.cry_legendary_rate,
+									"Antimatter Deck"
+								)
+							then
 								local card = create_card("Joker", G.jokers, true, 4, nil, nil, nil, "")
 								card:add_to_deck()
 								card:start_materialize()