stake stuff

Author: lord-ruby

assets/1x/stake_cry.png

@@ -1206,17 +1206,37 @@ local rework = {
 	order = 406,
 	pos = { x = 10, y = 3 },
 	cost = 4,
-	loc_vars = function(self, info_queue)
-		info_queue[#info_queue + 1] =
-			{ set = "Tag", key = "tag_cry_rework", specific_vars = { "[edition]", "[joker]", "n" } }
-		return { vars = {} }
+	loc_vars = function(self, info_queue, card)
+		local cards = Cryptid.get_highlighted_cards({ G.jokers }, card, 1, 1, function(card)
+			return card.ability.set == "Joker"
+		end)
+		local jkr = cards[1]
+		if not jkr then return {
+			vars = {
+				"None"
+			}
+		} end
+		local found_index = 1
+		if jkr.edition then
+			for i, v in ipairs(G.P_CENTER_POOLS.Edition) do
+				if v.key == jkr.edition.key then
+					found_index = i
+					break
+				end
+			end
+		end
+		found_index = found_index + 1
+		if found_index > #G.P_CENTER_POOLS.Edition then
+			found_index = found_index - #G.P_CENTER_POOLS.Edition
+		end
+		local rework_edition = G.P_CENTER_POOLS.Edition[found_index].key
+		return { vars = {(G.localization.descriptions.Edition[rework_edition] or {}).name or "ERROR"} }
 	end,
 	can_use = function(self, card)
 		local cards = Cryptid.get_highlighted_cards({ G.jokers }, card, 1, 1, function(card)
 			return card.ability.set == "Joker"
 		end)
 		return #cards == 1
-			and not cards[1].ability.eternal
 			and cards[1].ability.name
 				~= ("cry-meteor" or "cry-exoplanet" or "cry-stardust" or "cry_cursed" or "Diet Cola")
 	end,
@@ -1225,6 +1245,7 @@ local rework = {
 			return card.ability.set == "Joker"
 		end)
 		local jkr = cards[1]
+		if not jkr then return end
 		local found_index = 1
 		if jkr.edition then
 			for i, v in ipairs(G.P_CENTER_POOLS.Edition) do
@@ -1238,22 +1259,13 @@ local rework = {
 		if found_index > #G.P_CENTER_POOLS.Edition then
 			found_index = found_index - #G.P_CENTER_POOLS.Edition
 		end
-		local tag = Tag("tag_cry_rework")
-		if not tag.ability then
-			tag.ability = {}
-		end
-		if jkr.config.center.key == "c_base" then
-			jkr.config.center.key = "j_scholar"
-		end
-		tag.ability.rework_key = jkr.config.center.key
-		tag.ability.rework_edition = G.P_CENTER_POOLS.Edition[found_index].key
-		add_tag(tag)
+		local rework_edition = G.P_CENTER_POOLS.Edition[found_index].key
 		--SMODS.Tags.tag_cry_rework.apply(tag, {type = "store_joker_create"})
 		G.E_MANAGER:add_event(Event({
 			trigger = "before",
 			delay = 0.75,
 			func = function()
-				jkr:start_dissolve()
+				jkr:set_edition(rework_edition)
 				return true
 			end,
 		}))
@@ -1263,84 +1275,6 @@ local rework = {
 		self:use(card, area)
 	end,
 }
--- Rework Tag
--- Upgraded edition refers to the next edition along in the collection; base -> foil -> holo -> poly -> negative -> etc
-local rework_tag = {
-	cry_credits = {
-		idea = {
-			"HexaCryonic",
-		},
-		art = {
-			"HexaCryonic",
-		},
-		code = {
-			"Math",
-		},
-	},
-	dependencies = {
-		items = {
-			"c_cry_rework",
-		},
-	},
-	object_type = "Tag",
-	atlas = "tag_cry",
-	name = "cry-Rework Tag",
-	order = 610,
-	pos = { x = 0, y = 3 },
-	config = { type = "store_joker_create" },
-	key = "rework",
-	ability = { rework_edition = nil, rework_key = nil },
-	loc_vars = function(self, info_queue, tag)
-		local function p(w)
-			r = ""
-			local vowels = { "a", "e", "i", "o", "u" }
-			for i, v in ipairs(vowels) do
-				if string.sub(string.lower(w), 1, 1) == v then
-					r = "n"
-					break
-				end
-			end
-			return r
-		end
-		local ed = Cryptid.safe_get(tag, "ability", "rework_edition")
-				and localize({ type = "name_text", set = "Edition", key = tag.ability.rework_edition })
-			or "[" .. string.lower(localize("k_edition")) .. "]"
-		return {
-			vars = {
-				ed,
-				Cryptid.safe_get(tag, "ability", "rework_key")
-						and localize({ type = "name_text", set = "Joker", key = tag.ability.rework_key })
-					or "[" .. string.lower(localize("k_joker")) .. "]",
-				string.sub(ed, 1, 1) ~= "[" and p(ed) or "n",
-			},
-		}
-	end,
-	apply = function(self, tag, context)
-		if context.type == "store_joker_create" then
-			local card = create_card("Joker", context.area, nil, nil, nil, nil, (tag.ability.rework_key or "j_scholar"))
-			create_shop_card_ui(card, "Joker", context.area)
-			card:set_edition((tag.ability.rework_edition or "e_foil"), true, nil, true)
-			card.states.visible = false
-			tag:yep("+", G.C.FILTER, function()
-				card:start_materialize()
-				return true
-			end)
-			tag.triggered = true
-			G.E_MANAGER:add_event(Event({
-				trigger = "after",
-				delay = 0.5,
-				func = function()
-					save_run() --fixes savescum bugs hopefully?
-					return true
-				end,
-			}))
-			return card
-		end
-	end,
-	in_pool = function()
-		return false
-	end,
-}
 -- ://Merge
 -- Merges a selected consumable and playing card, destroying the consumable and turning the playing card into a CCD of that consumable
 local merge = {
@@ -4234,7 +4168,7 @@ local ctrl_v = {
 	end,
 	can_use = function(self, card)
 		local cards = Cryptid.get_highlighted_cards({ G.hand, G.consumeables, G.pack_cards }, card, 1, 1, function(card)
-			return card.area ~= G.pack_Cards or card.ability.set == "Default" or card.ability.set == "Enhanced"
+			return (card.area ~= G.pack_Cards or card.ability.set == "Default" or card.ability.set == "Enhanced") and not card.config.center.hidden
 		end)
 		return #cards == 1
 	end,
@@ -5178,7 +5112,6 @@ local code_cards = {
 	malware,
 	crynperror,
 	rework,
-	rework_tag,
 	merge,
 	commit,
 	machinecode,

assets/2x/stake_cry.png

@@ -49,7 +49,7 @@ local equilibrium = {
 	name = "cry-Equilibrium",
 	key = "equilibrium",
 	order = 3,
-	config = { vouchers = { "v_overstock_norm", "v_overstock_plus" } },
+	config = { vouchers = { "v_overstock_norm" } },
 	pos = { x = 0, y = 1 },
 	atlas = "atlasdeck",
 	apply = function(self)
@@ -84,7 +84,7 @@ local misprint = {
 	name = "cry-Misprint",
 	key = "misprint",
 	order = 4,
-	config = { cry_misprint_min = 0.1, cry_misprint_max = 10 },
+	config = { cry_misprint_min = 0.25, cry_misprint_max = 4 },
 	pos = { x = 4, y = 2 },
 	atlas = "atlasdeck",
 	apply = function(self)
@@ -217,29 +217,19 @@ local wormhole = {
 	name = "cry-Wormhole",
 	key = "wormhole",
 	order = 6,
-	config = { cry_negative_rate = 20, joker_slot = -2 },
 	pos = { x = 3, y = 4 },
 	atlas = "atlasdeck",
-	apply = function(self)
-		G.GAME.modifiers.cry_negative_rate = self.config.cry_negative_rate
-		G.E_MANAGER:add_event(Event({
-			func = function()
-				if G.jokers then
-					local card = create_card("Joker", G.jokers, nil, "cry_exotic", nil, nil, nil, "cry_wormhole")
-					card:add_to_deck()
-					card:start_materialize()
-					G.jokers:emplace(card)
-					return true
-				end
-			end,
-		}))
-	end,
-	init = function(self)
-		SMODS.Edition:take_ownership("negative", {
-			get_weight = function(self)
-				return self.weight * (G.GAME.modifiers.cry_negative_rate or 1)
-			end,
-		}, true)
+	calculate = function(self, back, context)
+		if context.end_of_round
+			and not context.individual
+			and not context.repetition
+			and not context.blueprint and G.GAME.blind and G.GAME.blind.config.blind and G.GAME.blind.config.blind.boss then
+			if G.jokers.cards[1] and G.jokers.cards[1].config.center.rarity ~= "cry_exotic" then
+				Cryptid.with_deck_effects(G.jokers.cards[1], function(card)
+					Cryptid.upgrade_rarity(card, "cry_wormhole")
+				end)
+			end
+		end
 	end,
 	unlocked = false,
 	check_for_unlock = function(self, args)

items/code.lua

@@ -416,13 +416,6 @@ local pointer = {
 					end
 					t.ability.orbital_hand = pseudorandom_element(_poker_hands, pseudoseed("cry_pointer_orbital"))
 				end
-				if current_card == "tag_cry_rework" then
-					--tbh this is the most unbalanced part of the card
-					t.ability.rework_edition =
-						pseudorandom_element(G.P_CENTER_POOLS.Edition, pseudoseed("cry_pointer_edition")).key
-					t.ability.rework_key =
-						pseudorandom_element(G.P_CENTER_POOLS.Joker, pseudoseed("cry_pointer_joker")).key
-				end
 				G.CHOOSE_CARD:remove()
 				G.GAME.USING_CODE = false
 				G.GAME.USING_POINTER = false
@@ -2000,7 +1993,7 @@ local aliases = {
 		"Rerollsurplus",
 		"Reroll Voucher",
 	},
-	v_reroll_glut = {
+	v__glut = {
 		"Reroll Glut",
 		"Rerollglut",
 		"Reroll Surplus+",
@@ -2563,10 +2556,10 @@ local aliases = {
 	},
 	tag_cry_epic = {
 		"Epic Tag",
-		"Half-price Epic Joker",
-		"Half price Epic Joker",
-		"Half price Epic",
-		"Half-price Epic",
+		"Full-price Epic Joker",
+		"Full price Epic Joker",
+		"Full price Epic",
+		"Full-price Epic",
 	},
 	tag_cry_gambler = {
 		"Gambler Tag",
@@ -2629,13 +2622,6 @@ local aliases = {
 		"Quadruple",
 		"Quadruple Tag",
 	},
-	tag_cry_quintuple = {
-		"Quintuple",
-		"Quintuple Tag",
-	},
-	tag_cry_rework = {
-		"Rework Tag",
-	},
 	tag_cry_schematic = {
 		"Schematic",
 		"Schematic Tag",
@@ -2699,6 +2685,7 @@ return {
 			--print("[CRYPTID] Inserting Pointer Aliases")
 			local alify = Cryptid.pointeraliasify
 			Cryptid.pointerblistifytype("rarity", "cry_exotic", nil)
+			Cryptid.pointerblistifytype("misc", "hidden", nil)
 			for key, aliasesTable in pairs(aliases) do
 				for _, alias in pairs(aliasesTable) do
 					alify(key, alias, nil)

items/deck.lua

@@ -68,7 +68,7 @@ if CardSleeves then
 
 		trigger_effect = function(self, args) end,
 		apply = function(self)
-			change_shop_size(2)
+			change_shop_size(1)
 			G.GAME.modifiers.cry_equilibrium = true
 		end,
 	})
@@ -78,7 +78,7 @@ if CardSleeves then
 		name = "Misprinted Sleeve",
 		atlas = "atlasSleeves",
 		pos = { x = 3, y = 0 },
-		config = { cry_misprint_min = 0.1, cry_misprint_max = 10 },
+		config = { cry_misprint_min = 0.24, cry_misprint_max = 4 },
 		unlocked = true,
 		unlock_condition = { deck = "Misprint Deck", stake = 1 },
 		apply = function(self)
@@ -112,28 +112,22 @@ if CardSleeves then
 		name = "Wormhole Sleeve",
 		atlas = "atlasSleeves",
 		pos = { x = 0, y = 0 },
-		config = { cry_wormhole = true, cry_negative_rate = 20, joker_slot = -2 },
 		unlocked = true,
 		unlock_condition = { deck = "Wormhole Deck", stake = 1 },
 		loc_vars = function(self)
 			return { vars = {} }
 		end,
-		apply = function(self)
-			G.E_MANAGER:add_event(Event({
-				func = function()
-					if G.jokers then
-						local card =
-							create_card("Joker", G.jokers, nil, "cry_exotic", nil, nil, nil, "cry_wormholesleeve")
-						card:add_to_deck()
-						card:start_materialize()
-						G.jokers:emplace(card)
-						return true
-					end
-				end,
-			}))
-			G.GAME.modifiers.cry_negative_rate = (G.GAME.modifiers.cry_negative_rate or 1)
-				* self.config.cry_negative_rate
-			G.GAME.starting_params.joker_slots = G.GAME.starting_params.joker_slots + self.config.joker_slot
+		calculate = function(self, back, context)
+			if context.end_of_round
+				and not context.individual
+				and not context.repetition
+				and not context.blueprint and G.GAME.blind and G.GAME.blind.config.blind and G.GAME.blind.config.blind.boss then
+				if G.jokers.cards[1] and G.jokers.cards[1].config.center.rarity ~= "cry_exotic" then
+					Cryptid.with_deck_effects(G.jokers.cards[1], function(card)
+						Cryptid.upgrade_rarity(card, "cry_wormhole")
+					end)
+				end
+			end
 		end,
 	})