Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into refactor

Author: MathIsFun0

items/misc_joker.lua

@@ -2565,7 +2565,6 @@ local sapling = {
 	dependencies = {
 		items = {
 			"set_cry_misc_joker",
-			"set_cry_epic",
 		},
 	},
 	name = "cry-sapling",
@@ -2578,7 +2577,14 @@ local sapling = {
 	blueprint_compat = false,
 	eternal_compat = false,
 	loc_vars = function(self, info_queue, center)
-		return { vars = { center.ability.extra.score, center.ability.extra.req } }
+		return {
+			vars = {
+				center.ability.extra.score,
+				center.ability.extra.req,
+				cry_card_enabled("set_cry_epic") == true and localize("k_cry_epic") or localize("k_rare"),
+				colours = { G.C.RARITY[cry_card_enabled("set_cry_epic") == true and "cry_epic" or 3] },
+			},
+		}
 	end,
 	atlas = "atlasone",
 	calculate = function(self, card, context)
@@ -2600,6 +2606,7 @@ local sapling = {
 			end
 		elseif context.selling_self and not context.blueprint and not context.retrigger_joker then
 			if card.ability.extra.score >= card.ability.extra.req then
+				local value = cry_card_enabled("set_cry_epic") == true and "cry_epic" or 0.99
 				card_eval_status_text(
 					card,
 					"extra",
@@ -2608,7 +2615,7 @@ local sapling = {
 					nil,
 					{ message = localize("k_plus_joker"), colour = G.C.RARITY["cry_epic"] }
 				)
-				local card = create_card("Joker", G.jokers, nil, "cry_epic", nil, nil, nil, "cry_sapling")
+				local card = create_card("Joker", G.jokers, nil, value, nil, nil, nil, "cry_sapling")
 				card:add_to_deck()
 				G.jokers:emplace(card)
 				card:start_materialize()
@@ -6052,7 +6059,8 @@ local busdriver = {
 			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))
+				< 1
+					- (1 / (cry_prob(card.ability.cry_prob, card.ability.extra.odds, card.ability.cry_rigged) * oddy))
 			then
 				return {
 					message = localize({ type = "variable", key = "a_mult", vars = { card.ability.extra.mult } }),

localization/en-us.lua

@@ -2160,7 +2160,7 @@ return {
 				text = {
 					"After scoring {C:attention}#2#{} {C:inactive}[#1#]{} Enhanced",
 					"cards, sell this card to",
-					"create an {C:cry_epic}Epic{} {C:attention}Joker{}",
+                    "create a(n) {V:1}#3#{} {C:attention}Joker{}",
 				},
 			},
 			j_cry_savvy = {