Merge branch 'main' of https://github.com/real-niacat/Cryptid

Author: real-niacat

Cryptid.json

@@ -9,7 +9,7 @@
 	"priority": 114,
 	"badge_colour": "708b91",
 	"badge_text_colour": "FFFFFF",
-	"version": "0.5.8",
+	"version": "0.5.9-dev",
 	"dependencies": [
 		"Talisman (>=2.2.0a)",
 		"Steamodded (>=1.0.0~BETA-0525b)"

Cryptid.lua

@@ -189,6 +189,13 @@ function SMODS.injectItems(...)
 	end
 end
 
+local old_repitions = SMODS.calculate_repetitions
+SMODS.calculate_repetitions = function(card, context, reps)
+	local reps = old_repitions(card, context, reps)
+	reps = reps or { 1 }
+	return reps
+end
+
 local cryptidConfigTab = function()
 	cry_nodes = {
 		{

assets/1x/atlasepic.png

@@ -3966,7 +3966,7 @@ local multiply = {
 		end
 		G.jokers.highlighted[1].config.cry_multiply = G.jokers.highlighted[1].config.cry_multiply * 2
 		Cryptid.with_deck_effects(G.jokers.highlighted[1], function(card)
-			Cryptid.misprintize(card, { min = 2, max = 2 }, nil, true)
+			Cryptid.manipulate(card, { value = 2 })
 		end)
 	end,
 	init = function(self)
@@ -3978,7 +3978,7 @@ local multiply = {
 				if G.jokers.cards[i].config.cry_multiply then
 					m = G.jokers.cards[i].config.cry_multiply
 					Cryptid.with_deck_effects(G.jokers.cards[i], function(card)
-						Cryptid.misprintize(card, { min = 1 / m, max = 1 / m }, nil, true)
+						Cryptid.manipulate(card, { value = 1 / m })
 					end)
 					G.jokers.cards[i].config.cry_multiply = nil
 				end
@@ -4023,9 +4023,26 @@ local delete = {
 		return G.STATE == G.STATES.SHOP
 			and card.area == (G.GAME.modifiers.cry_beta and G.jokers or G.consumeables)
 			and #G.shop_jokers.highlighted + #G.shop_booster.highlighted + #G.shop_vouchers.highlighted == 1
-			and G.shop_jokers.highlighted[1] ~= card
-			and G.shop_booster.highlighted[1] ~= card
-			and G.shop_vouchers.highlighted[1] ~= card
+			and (G.shop_jokers.highlighted[1] ~= card and not Cryptid.safe_get(
+				G,
+				"shop_jokers",
+				"highlighted",
+				1,
+				"ability",
+				"eternal"
+			))
+			and (G.shop_booster.highlighted[1] ~= card and not Cryptid.safe_get(
+				G,
+				"shop_booster",
+				"highlighted",
+				1,
+				"ability",
+				"eternal"
+			))
+			and (
+				G.shop_vouchers.highlighted[1] ~= card
+				and not Cryptid.safe_get(G, "shop_vouchers", "highlighted", 1, "ability", "eternal")
+			)
 	end,
 	use = function(self, card, area, copier)
 		if not G.GAME.banned_keys then

assets/2x/atlasepic.png

@@ -534,7 +534,7 @@ local glowing = {
 			for i = 1, #G.jokers.cards do
 				if not Card.no(G.jokers.cards[i], "immutable", true) then
 					Cryptid.with_deck_effects(G.jokers.cards[i], function(card)
-						Cryptid.misprintize(card, { min = 1.25, max = 1.25 }, nil, true)
+						Cryptid.manipulate(card, { value = 1.25 })
 					end)
 				end
 			end
@@ -1081,7 +1081,7 @@ local antimatter = {
 				then
 					for i = 1, #G.jokers.cards do
 						Cryptid.with_deck_effects(G.jokers.cards[i], function(card)
-							Cryptid.misprintize(card, { min = 1.25, max = 1.25 }, nil, true)
+							Cryptid.manipulate(card, { value = 1.25 })
 						end)
 					end
 				end

items/code.lua

@@ -378,14 +378,18 @@ return {
 			G.P_CENTERS.j_hanging_chad.misprintize_caps = { extra = 40 }
 			G.P_CENTERS.c_high_priestess.misprintize_caps = { planets = 100 }
 			G.P_CENTERS.c_emperor.misprintize_caps = { tarots = 100 }
-			G.P_CENTERS.c_cry_automaton.misprintize_caps = { create = 100 }
+			if G.P_CENTERS.c_cry_automaton then
+				G.P_CENTERS.c_cry_automaton.misprintize_caps = { create = 100 }
+			end
 			G.P_CENTERS.c_familiar.misprintize_caps = { extra = 100 }
 			G.P_CENTERS.c_grim.misprintize_caps = { extra = 100 }
 			G.P_CENTERS.c_incantation.misprintize_caps = { extra = 100 }
 			G.P_CENTERS.c_immolate.misprintize_caps = { destroy = 1e300 }
 			G.P_CENTERS.c_cryptid.misprintize_caps = { extra = 100, max_highlighted = 100 }
 			G.P_CENTERS.c_immolate.misprintize_caps = { destroy = 1e300 }
-			G.P_CENTERS.c_cry_chambered.misprintize_caps = { extra = { num_copies = 100 } }
+			if G.P_CENTERS.c_cry_chambered then
+				G.P_CENTERS.c_cry_chambered.misprintize_caps = { extra = { num_copies = 100 } }
+			end
 			if Cryptid.safe_get(center, "name") == "Default Base" then -- scuffed
 				return sa(
 					self,

items/deck.lua

@@ -238,7 +238,7 @@ local universum = {
 									.. tostring(vals.level)
 								if is_number(vals.level) then
 									G.hand_text_area.hand_level.config.colour =
-										G.C.HAND_LEVELS[to_big(math.min(vals.level, 7)):to_number()]
+										G.C.HAND_LEVELS[to_number(math.min(vals.level, 7))]
 								else
 									G.hand_text_area.hand_level.config.colour = G.C.HAND_LEVELS[1]
 								end
@@ -1239,7 +1239,7 @@ local gemino = {
 			local card = G.jokers.cards[1]
 			if not Card.no(G.jokers.cards[1], "immutable", true) then
 				Cryptid.with_deck_effects(G.jokers.cards[1], function(card)
-					Cryptid.misprintize(card, { min = 2, max = 2 }, nil, true)
+					Cryptid.manipulate(card, { value = 2 })
 				end)
 				check = true
 			end

items/enhanced.lua

@@ -809,9 +809,8 @@ local oversat = {
 	on_apply = function(card)
 		if not card.ability.cry_oversat then
 			Cryptid.with_deck_effects(card, function(card)
-				Cryptid.misprintize(card, {
-					min = 2,
-					max = 2,
+				Cryptid.manipulate(card, {
+					value = 2,
 				}, nil, true)
 			end)
 			if card.config.center.apply_oversat then
@@ -827,8 +826,8 @@ local oversat = {
 	end,
 	on_remove = function(card)
 		Cryptid.with_deck_effects(card, function(card)
-			Cryptid.misprintize(card, { min = 1, max = 1 }, true)
-			Cryptid.misprintize(card) -- Correct me if i'm wrong but this is for misprint deck. or atleast it is after this patch
+			Cryptid.manipulate(card, { value = 1 / 2 })
+			Cryptid.manipulate(card) -- Correct me if i'm wrong but this is for misprint deck. or atleast it is after this patch
 		end)
 		card.ability.cry_oversat = nil
 	end,
@@ -934,16 +933,18 @@ local glitched = {
 	on_apply = function(card)
 		if not card.ability.cry_glitched then
 			Cryptid.with_deck_effects(card, function(card)
-				Cryptid.misprintize(card, {
+				Cryptid.manipulate(card, {
 					min = 0.1,
 					max = 10,
-				}, nil, true)
+				})
 			end)
+
 			if card.config.center.apply_glitched then
 				card.config.center:apply_glitched(card, function(val)
-					return Cryptid.misprintize_val(val, {
+					return Cryptid.manipulate_value(val, {
 						min = 0.1 * (G.GAME.modifiers.cry_misprint_min or 1),
 						max = 10 * (G.GAME.modifiers.cry_misprint_max or 1),
+						type = "X",
 					}, Cryptid.is_card_big(card))
 				end)
 			end
@@ -952,8 +953,8 @@ local glitched = {
 	end,
 	on_remove = function(card)
 		Cryptid.with_deck_effects(card, function(card)
-			Cryptid.misprintize(card, { min = 1, max = 1 }, true)
-			Cryptid.misprintize(card) -- Correct me if i'm wrong but this is for misprint deck. or atleast it is after this patch
+			Cryptid.manipulate(card, { min = 1, max = 1, dont_stack = true })
+			Cryptid.manipulate(card) -- Correct me if i'm wrong but this is for misprint deck. or atleast it is after this patch
 		end)
 		card.ability.cry_glitched = nil
 	end,

items/exotic.lua

@@ -8816,12 +8816,7 @@ local tropical_smoothie = {
 				if v ~= card then
 					if not Card.no(v, "immutable", true) then
 						Cryptid.with_deck_effects(v, function(cards)
-							Cryptid.misprintize(
-								cards,
-								{ min = card.ability.extra, max = card.ability.extra },
-								nil,
-								true
-							)
+							Cryptid.manipulate(cards, { value = card.ability.extra })
 						end)
 						check = true
 					end
@@ -9199,12 +9194,7 @@ local oil_lamp = { --You want it? It's yours my friend
 						if not Card.no(G.jokers.cards[i + 1], "immutable", true) then
 							check = true
 							Cryptid.with_deck_effects(G.jokers.cards[i + 1], function(cards)
-								Cryptid.misprintize(
-									cards,
-									{ min = card.ability.extra.increase, max = card.ability.extra.increase },
-									nil,
-									true
-								)
+								Cryptid.manipulate(cards, { value = card.ability.extra.increase })
 							end)
 						end
 					end