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

Author: MathIsFun0

items/epic.lua

@@ -2044,9 +2044,9 @@ local clockwork = { -- Steel Support: The Joker
 			and context.cardarea == G.jokers
 			and not context.blueprint_card
 			and not context.retrigger_joker
-		then
-			if
-				card.ability.counters.c1 == 0
+		then -- The Clockwork Joker is canonically a non-binary self-replicating machine amoeba, that self replicates every 21 minutes. Their pronouns are any/all; they are several billion tiny jokers
+			if -- in a trench coat, constantly ticking in an almost perfect yet flawed mechanism. Its only purpose is the strengthening and spreading of the steel world; everything else is meaningless to it.
+				card.ability.counters.c1 == 0 -- lore by nova :3
 				and card.ability.counters.c2 == 0
 				and card.ability.counters.c3 == 0
 				and card.ability.counters.c4 == 0

items/exotic.lua

@@ -855,8 +855,8 @@ local circulus_pistoris = {
 				pi = 2 * pi
 			end
 			return {
-				Echip_mod = pi * 10,
-				Emult_mod = pi * 10,
+				Echip_mod = pi,
+				Emult_mod = pi,
 				message = localize({
 					type = "variable",
 					key = "a_powmultchips",

items/misc.lua

@@ -938,6 +938,90 @@ local noisy = {
 		desc_nodes[#desc_nodes + 1] = chip_ui
 	end,
 	init = function(self)
+		local randtext = {
+			"A",
+			"B",
+			"C",
+			"D",
+			"E",
+			"F",
+			"G",
+			"H",
+			"I",
+			"J",
+			"K",
+			"L",
+			"M",
+			"N",
+			"O",
+			"P",
+			"Q",
+			"R",
+			"S",
+			"T",
+			"U",
+			"V",
+			"W",
+			"X",
+			"Y",
+			"Z",
+			" ",
+			"a",
+			"b",
+			"c",
+			"d",
+			"e",
+			"f",
+			"g",
+			"h",
+			"i",
+			"j",
+			"k",
+			"l",
+			"m",
+			"n",
+			"o",
+			"p",
+			"q",
+			"r",
+			"s",
+			"t",
+			"u",
+			"v",
+			"w",
+			"x",
+			"y",
+			"z",
+			"0",
+			"1",
+			"2",
+			"3",
+			"4",
+			"5",
+			"6",
+			"7",
+			"8",
+			"9",
+			"+",
+			"-",
+			"?",
+			"!",
+			"$",
+			"%",
+			"[",
+			"]",
+			"(",
+			")",
+		}
+
+		local function obfuscatedtext(length)
+			local str = ""
+			for i = 1, length do
+				str = str .. randtext[math.random(#randtext)]
+			end
+			return str
+		end
+
 		AurinkoAddons.cry_noisy = function(card, hand, instant, amount)
 			local modc = pseudorandom("cry_noisy_chips_aurinko", noisy_stats.min.chips, noisy_stats.max.chips)
 			local modm = pseudorandom("cry_noisy_mult_aurinko", noisy_stats.min.mult, noisy_stats.max.mult)
@@ -959,10 +1043,10 @@ local noisy = {
 						return true
 					end,
 				}))
-				update_hand_text(
-					{ delay = 0 },
-					{ chips = (amount > to_big(0) and "+" or "-") .. number_format(math.abs(modc)), StatusText = true }
-				)
+				update_hand_text({ delay = 0 }, {
+					chips = (to_big(amount) > to_big(0) and "+" or "-") .. number_format(math.abs(modc)),
+					StatusText = true,
+				})
 				update_hand_text({ delay = 1.3 }, { chips = G.GAME.hands[hand].chips })
 				for i = 1, math.random(2, 4) do
 					update_hand_text(
@@ -979,10 +1063,10 @@ local noisy = {
 						return true
 					end,
 				}))
-				update_hand_text(
-					{ delay = 0 },
-					{ mult = (amount > to_big(0) and "+" or "-") .. number_format(math.abs(modm)), StatusText = true }
-				)
+				update_hand_text({ delay = 0 }, {
+					mult = (to_big(amount) > to_big(0) and "+" or "-") .. number_format(math.abs(modm)),
+					StatusText = true,
+				})
 				update_hand_text({ delay = 1.3 }, { mult = G.GAME.hands[hand].mult })
 			elseif hand == G.handlist[#G.handlist] then
 				G.E_MANAGER:add_event(Event({

items/misc_joker.lua

@@ -7617,14 +7617,16 @@ local zooble = {
 			if not (next(context.poker_hands["Straight"]) or next(context.poker_hands["Straight Flush"])) then
 				local unique_ranks = {}
 				for i, v in pairs(context.scoring_hand) do
-					local not_unique = false
-					for i = 1, #unique_ranks do
-						if unique_ranks[i] == v:get_id() then
-							not_unique = true
+					if not (SMODS.has_no_rank(v) and not v.vampired) then
+						local not_unique = false
+						for i = 1, #unique_ranks do
+							if unique_ranks[i] == v:get_id() then
+								not_unique = true
+							end
+						end
+						if not not_unique then
+							unique_ranks[#unique_ranks + 1] = v:get_id()
 						end
-					end
-					if not not_unique then
-						unique_ranks[#unique_ranks + 1] = v:get_id()
 					end
 				end
 				if #unique_ranks >= 1 then
@@ -7637,7 +7639,7 @@ local zooble = {
 				end
 			end
 		end
-		if context.joker_main and context.cardarea == G.jokers then
+		if context.joker_main and card.ability.extra.mult > 0 then
 			return {
 				message = localize({ type = "variable", key = "a_mult", vars = { card.ability.extra.mult } }),
 				mult_mod = card.ability.extra.mult,
@@ -7806,7 +7808,7 @@ local cat_owl = { -- Lucky Cards are considered Echo Cards and vice versa
 		},
 		art = {
 			"George the Rat",
-		}
+		},
 	},
 }
 local miscitems = {