Merge branch 'balance-things' into temp

Author: lord-ruby

Cryptid.json

@@ -11,7 +11,6 @@
 	"badge_text_colour": "FFFFFF",
 	"version": "0.5.10",
 	"dependencies": [
-		"Talisman (>=2.2.0a)",
 		"Steamodded (>=1.0.0~BETA-0711a)"
 	],
 	"conflicts": [

items/deck.lua

@@ -358,58 +358,16 @@ local legendary = {
 	},
 	name = "cry-Legendary",
 	key = "legendary",
-	config = { cry_legendary = true, cry_legendary_rate = 0.2 },
+	config = { cry_legendary = true, cry_legendary_rate = 0.33 },
 	pos = { x = 0, y = 6 },
 	atlas = "atlasdeck",
 	order = 15,
 	calculate = function(self, back, context)
 		if context.context == "eval" and Cryptid.safe_get(G.GAME, "last_blind", "boss") then
-			if G.jokers 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
-						local card = create_card("Joker", G.jokers, true, 4, nil, nil, nil, "")
-						card:add_to_deck()
-						card:start_materialize()
-						G.jokers:emplace(card)
-						return true
-					else
-						card_eval_status_text(
-							G.jokers,
-							"jokers",
-							nil,
-							nil,
-							nil,
-							{ message = localize("k_nope_ex"), colour = G.C.RARITY[4] }
-						)
-					end
-				else
-					card_eval_status_text(
-						G.jokers,
-						"jokers",
-						nil,
-						nil,
-						nil,
-						{ message = localize("k_no_room_ex"), colour = G.C.RARITY[4] }
-					)
-				end
-			end
+			SMODS.Events["ev_cry_choco10"]:finish()
+			SMODS.Events["ev_cry_choco10"]:start()
 		end
 	end,
-	apply = function(self)
-		G.E_MANAGER:add_event(Event({
-			func = function()
-				if G.jokers then
-					local card = create_card("Joker", G.jokers, true, 4, nil, nil, nil, "")
-					card:add_to_deck()
-					card:start_materialize()
-					G.jokers:emplace(card)
-					return true
-				end
-			end,
-		}))
-	end,
 	unlocked = false,
 	check_for_unlock = function(self, args)
 		if Cryptid.safe_get(G, "jokers") then
@@ -677,7 +635,7 @@ local antimatter = {
 	config = {
 		cry_antimatter = true,
 		cry_crit_rate = 0.25, --Critical Deck
-		cry_legendary_rate = 0.2, --Legendary Deck
+		cry_legendary_rate = 0.33, --Legendary Deck
 		-- Enhanced Decks
 		cry_force_enhancement = "random",
 		cry_force_edition = "random",
@@ -912,23 +870,6 @@ local antimatter = {
 			]]
 			--
 			--Legendary Deck
-			if
-				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_legendary", "wins", 8) or 0)
-					~= 0
-				or skip
-			then
-				G.E_MANAGER:add_event(Event({
-					func = function()
-						if G.jokers then
-							local card = create_card("Joker", G.jokers, true, 4, nil, nil, nil, "")
-							card:add_to_deck()
-							card:start_materialize()
-							G.jokers:emplace(card)
-							return true
-						end
-					end,
-				}))
-			end
 			--Encoded Deck
 			if
 				(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_encoded", "wins", 8) or 0)

items/exotic.lua

@@ -1067,9 +1067,6 @@ local aequilibrium = {
 	demicoloncompat = true,
 	immutable = true,
 	loc_vars = function(self, info_queue, center)
-		if not center.edition or (center.edition and not center.edition.negative) then
-			info_queue[#info_queue + 1] = G.P_CENTERS.e_negative
-		end
 		local joker_generated = "???"
 		if G.GAME.aequilibriumkey and G.GAME.aequilibriumkey > 1 then
 			joker_generated = localize({
@@ -1085,11 +1082,14 @@ local aequilibrium = {
 			(context.cardarea == G.jokers and context.before and not context.retrigger_joker) or context.forcetrigger
 		then
 			for i = 1, math.floor(math.min(25, card.ability.extra.jokers)) do
-				local newcard = create_card("Joker", G.jokers, nil, nil, nil, nil, nil)
-				newcard:add_to_deck()
-				G.jokers:emplace(newcard)
-				newcard:set_edition({ negative = true }, true)
+				if #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit then
+					local newcard = create_card("Joker", G.jokers, nil, nil, nil, nil, nil)
+					newcard:add_to_deck()
+					G.jokers:emplace(newcard)
+					G.GAME.joker_buffer = G.GAME.joker_buffer + 1
+				end
 			end
+			G.GAME.joker_buffer = nil
 			return nil, true
 		end
 	end,

items/m.lua

@@ -565,8 +565,12 @@ local notebook = {
 			end
 			if
 				to_number(jollycount) >= to_number(card.ability.extra.jollies) --if there are 5 or more jolly jokers
-				or pseudorandom("cry_notebook")
-					< cry_prob(card.ability.cry_prob, card.ability.extra.odds, card.ability.cry_rigged) / card.ability.extra.odds
+				or SMODS.pseudorandom_probability(
+					card,
+					"cry_notebook",
+					1,
+					card and card.ability.extra.odds or self.config.extra.odds
+				)
 			then
 				card.ability.immutable.slots = to_number(
 					math.min(
@@ -842,9 +846,12 @@ local scrabble = {
 		if context.cardarea == G.jokers and context.before and not context.retrigger_joker then
 			local check = false
 			if
-				pseudorandom("scrabbleother")
-				< cry_prob(card.ability.cry_prob, card.ability.extra.odds, card.ability.cry_rigged)
-					/ card.ability.extra.odds
+				SMODS.pseudorandom_probability(
+					card,
+					"scrabbleother",
+					1,
+					card and card.ability.extra.odds or self.config.extra.odds
+				)
 			then
 				check = true
 				local card = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "scrabbletile")

items/misc.lua

@@ -35,8 +35,7 @@ local echo = {
 	calculate = function(self, card, context)
 		if
 			context.repetition
-			and pseudorandom("echo")
-				< cry_prob(card.ability.cry_prob or 1, card.ability.extra or 2, card.ability.cry_rigged) / (card.ability.extra or 2)
+			and SMODS.pseudorandom_probability(card, "cry_echo", 1, card and card.ability.extra or self.config.extra)
 		then
 			return {
 				message = localize("k_again_ex"),

items/misc_joker.lua

@@ -7928,9 +7928,12 @@ local busdriver = {
 		if context.joker_main and (to_big(card.ability.extra.mult) > to_big(0)) then
 			local oddy = math.max(1, card.ability.extra.odds)
 			if
-				pseudorandom("busdriver")
-				< 1
-					- (1 / (cry_prob(card.ability.cry_prob, card.ability.extra.odds, card.ability.cry_rigged) * oddy))
+				SMODS.pseudorandom_probability(
+					card,
+					"cry_busdriver",
+					3,
+					card and card.ability.extra.odds or self.config.extra.odds
+				)
 			then
 				return {
 					message = localize({
@@ -9488,10 +9491,7 @@ local digitalhallucinations = {
 
 		if
 			context.open_booster
-			and (
-				pseudorandom("digi")
-				< cry_prob(card.ability.cry_prob, card.ability.odds, card.ability.cry_rigged) / card.ability.odds
-			)
+			and (SMODS.pseudorandom_probability(card, "digi", 1, card and card.ability.odds or self.config.odds))
 		then
 			local boosty = context.card
 			-- finally mod compat?

items/sleeve.lua

@@ -366,7 +366,7 @@ if CardSleeves then
 		name = "Legendary Sleeve",
 		atlas = "atlasSleeves",
 		pos = { x = 1, y = 1 },
-		config = { cry_legendary = true, cry_legendary_rate = 0.2 },
+		config = { cry_legendary = true, cry_legendary_rate = 0.33 },
 		unlocked = true,
 		unlock_condition = { deck = "Legendary Deck", stake = 1 },
 		loc_vars = function(self)
@@ -407,19 +407,6 @@ if CardSleeves then
 				end
 			end
 		end,
-		apply = function(self)
-			G.E_MANAGER:add_event(Event({
-				func = function()
-					if G.jokers then
-						local card = create_card("Joker", G.jokers, true, 4, nil, nil, nil, "")
-						card:add_to_deck()
-						card:start_materialize()
-						G.jokers:emplace(card)
-						return true
-					end
-				end,
-			}))
-		end,
 	})
 	local spookysleeve = CardSleeves.Sleeve({
 		key = "spooky_sleeve",
@@ -460,7 +447,7 @@ if CardSleeves then
 			voucher = {},
 			cry_antimatter = true,
 			cry_crit_rate = 0.25, -- Critical Sleeve, Effect Rate
-			cry_legendary_rate = 0.2, -- Legendary Sleeve, Effect Rate
+			cry_legendary_rate = 0.33, -- Legendary Sleeve, Effect Rate
 			cry_negative_rate = 20,
 			cry_highlight_limit = 1e20,
 		},
@@ -829,32 +816,6 @@ if CardSleeves then
 				}))
 			end
 
-			-- Legendary Sleeve, Start Joker
-			if
-				(
-					Cryptid.safe_get(
-						G.PROFILES,
-						G.SETTINGS.profile,
-						"sleeve_usage",
-						"sleeve_cry_legendary_sleeve",
-						"wins_by_key",
-						"stake_gold"
-					) or 0
-				) ~= 0
-			then
-				G.E_MANAGER:add_event(Event({
-					func = function()
-						if G.jokers then
-							local card = create_card("Joker", G.jokers, true, 4, nil, nil, nil, "")
-							card:add_to_deck()
-							card:start_materialize()
-							G.jokers:emplace(card)
-							return true
-						end
-					end,
-				}))
-			end
-
 			-- Encoded Sleeve
 			if
 				(

items/voucher.lua

@@ -898,8 +898,11 @@ local asteroglyph = { -- Heiroglyph T3; Set Ante to 0
 	pos = { x = 5, y = 2 },
 	requires = { "v_petroglyph" },
 	pools = { ["Tier3"] = true },
-	loc_vars = function(self, info_queue)
-		return { vars = { Cryptid.asteroglyph_ante() } }
+	config = {
+		ante_mod = 2,
+	},
+	loc_vars = function(self, info_queue, card)
+		return { vars = { card.ability.ante_mod } }
 	end,
 	redeem = function(self)
 		local mod = -G.GAME.round_resets.ante + Cryptid.asteroglyph_ante()

lib/calculate.lua

@@ -15,10 +15,6 @@ function eval_card(card, context)
 		return {}, {}
 	end
 	-- Store old probability for later reference
-	local ggpn = G.GAME.probabilities.normal
-	if card.ability.cry_rigged then
-		G.GAME.probabilities.normal = 1e9
-	end
 	local ret, post = ec(card, context)
 	if card.ability.cry_rigged then
 		G.GAME.probabilities.normal = ggpn
@@ -461,10 +457,6 @@ function Card:cry_double_scale_calc(orig_ability, in_context_scaling)
 									for r = 1, rep.repetitions do
 										card_eval_status_text(rep.card, "jokers", nil, nil, nil, rep)
 										-- now, same thing as before, apply the scale-joker
-										local ggpn = G.GAME.probabilities.normal
-										if G.jokers.cards[i].ability.cry_rigged then
-											G.GAME.probabilities.normal = 1e9
-										end
 										local o = obj:cry_scale_mod(
 											G.jokers.cards[i],
 											self,
@@ -473,9 +465,6 @@ function Card:cry_double_scale_calc(orig_ability, in_context_scaling)
 											orig_scale_base,
 											new_scale_base
 										)
-										if G.jokers.cards[i].ability.cry_rigged then
-											G.GAME.probabilities.normal = ggpn
-										end
 
 										if o then
 											if #dbl_info.scaler[info_i] == 2 then
@@ -815,9 +804,6 @@ function Cryptid.apply_scale_mod(jkr, orig_scale_scale, orig_scale_base, new_sca
 								orig_scale_base,
 								new_scale_base
 							)
-							if G.jokers.cards[i].ability.cry_rigged then
-								G.GAME.probabilities.normal = ggpn
-							end
 
 							if o then
 								if #dbl_info.scaler[info_i] == 2 then

lib/overrides.lua

@@ -516,11 +516,6 @@ function Game:update(dt)
 		G.STATE = G.STATES.SELECTING_HAND
 		G.STATE_COMPLETE = false
 	end
-	if G.STATE == G.STATES.NEW_ROUND or G.STATE == G.STATES.HAND_PLAYED then
-		none_eval = none_eval + dt
-	else
-		none_eval = 0
-	end
 end
 
 -- All the scattered set_cost hooks from all the pre refactor files moved into one hook