Merge pull request SpectralPack#526 from TheRealNova422-real/patch-36

Hotfixed!

Author: Dragokillfist

Cryptid.json

@@ -9,7 +9,7 @@
 	"priority": 114,
 	"badge_colour": "708b91",
 	"badge_text_colour": "FFFFFF",
-	"version": "0.5.5a~dev2",
+	"version": "0.5.5b",
 	"dependencies": [
 		"Talisman (>=2.0.9)",
 		"Steamodded (>=1.0.0~BETA-0314c)"

items/code.lua

@@ -2925,19 +2925,56 @@ local exploit = {
 		end
 		G.FUNCS.exploit_apply = function()
 			local hand_table = {
-				["High Card"] = { "high card", "high", "1oak", "1 of a kind", "haha one" },
-				["Pair"] = { "pair", "2oak", "2 of a kind", "m" },
-				["Two Pair"] = { "two pair", "2 pair", "mm", "pairpair" },
-				["Three of a Kind"] = { "three of a kind", "3 of a kind", "3oak", "trips", "triangle" },
-				["Straight"] = { "straight", "lesbian", "gay", "bisexual", "asexual" },
-				["Flush"] = { "flush", "skibidi", "toilet", "floosh" },
+				["High Card"] = {
+					"high card",
+					"high",
+					"1oak",
+					"1 of a kind",
+					"haha one"
+				},
+				["Pair"] = { 
+					"pair",
+					"2oak",
+					"2 of a kind",
+					"m",
+					"window"
+				},
+				["Two Pair"] = { 
+					"two pair",
+					"2 pair",
+					"mm",
+					"pairpair",
+					"pair of a kind"
+				},
+				["Three of a Kind"] = { 
+					"three of a kind", 
+					"3 of a kind", 
+					"3oak", 
+					"trips", 
+					"triangle" 
+				},
+				["Straight"] = { 
+					"straight", 
+					"lesbian", 
+					"gay", 
+					"bisexual", 
+					"asexual",
+					"staircase"
+				},
+				["Flush"] = { 
+					"flush", 
+					"skibidi", 
+					"toilet", 
+					"floosh",
+					"monotone"
+				},
 				["Full House"] = {
 					"full house",
 					"full",
 					"that 70s show",
 					"modern family",
 					"family matters",
-					"the middle",
+					"the middle"
 				},
 				["Four of a Kind"] = {
 					"four of a kind",
@@ -2947,14 +2984,69 @@ local exploit = {
 					"quads",
 					"four to the floor",
 				},
-				["Straight Flush"] = { "straight flush", "strush", "slush", "slushie", "slushy" },
-				["Five of a Kind"] = { "five of a kind", "5 of a kind", "5oak", "quints" },
-				["Flush House"] = { "flush house", "flouse", "outhouse" },
-				["Flush Five"] = { "flush five", "fish", "you know what that means", "five of a flush" },
-				["cry_Bulwark"] = { "bulwark", "flush rock", "stoned", "stone flush", "flush stone" },
-				["cry_Clusterfuck"] = { "clusterfuck", "fuck", "wtf" },
-				["cry_UltPair"] = { "ultimate pair", "ultpair", "ult pair", "pairpairpair" },
-				["cry_WholeDeck"] = { "the entire fucking deck", "deck", "tefd", "fifty-two", "you are fuck deck" },
+				["Straight Flush"] = { 
+					"straight flush",
+					"strush",
+					"slush",
+					"slushie",
+					"slushy",
+					"monotone staircase"
+				},
+				["Five of a Kind"] = {
+					"five of a kind",
+					"5 of a kind",
+					"5oak",
+					"quints"
+				},
+				["Flush House"] = { 
+					"flush house",
+					"flouse",
+					"outhouse",
+					"monotone house",
+					"the grey house"
+				},
+				["Flush Five"] = { 
+					"flush five",
+					"fish",
+					"you know what that means",
+					"five of a flush",
+					"monotone fish"
+				},
+				["cry_Bulwark"] = { 
+					"bulwark",
+					"flush rock",
+					"stoned",
+					"stone flush",
+					"flush stone",
+					"rock and stone"
+				},
+				["cry_Clusterfuck"] = { 
+					"clusterfuck",
+					"fuck",
+					"wtf",
+					"cluster",
+					"what"
+				},
+				["cry_UltPair"] = { 
+					"ultimate pair",
+					"ultpair",
+					"ult pair",
+					"pairpairpair",
+					"flush pair of a kind of a kind",
+					"2f2oakoak",
+					"two flush two of a kind of a kind"
+				},
+				["cry_WholeDeck"] = { 
+					"the entire fucking deck",
+					"deck",
+					"tefd",
+					"fifty-two",
+					"you are fuck deck",
+					"deck of a kind",
+					"the entire deck",
+					"everything of a kind",
+					"everything"
+				},
 			}
 			local current_hand = nil
 			for k, v in pairs(SMODS.PokerHands) do
@@ -3091,13 +3183,27 @@ local rework = {
 		return { vars = {} }
 	end,
 	can_use = function(self, card)
-		return #G.jokers.highlighted == 1
+		if not G.GAME.modifiers.cry_beta then
+			return #G.jokers.highlighted == 1
+				and not G.jokers.highlighted[1].ability.eternal
+				and G.jokers.highlighted[1].ability.name ~= (
+					"cry-meteor"
+					or "cry-exoplanet"
+					or "cry-stardust"
+					or "cry_cursed"
+					or ("Diet Cola" or Card.get_gameset(card) == "madness")
+					)
+		else
+			return #G.jokers.highlighted == 2
 			and not G.jokers.highlighted[1].ability.eternal
-			and G.jokers.highlighted[1].ability.name ~= "cry-meteor"
-			and G.jokers.highlighted[1].ability.name ~= "cry-exoplanet"
-			and G.jokers.highlighted[1].ability.name ~= "cry-stardust"
-			and G.jokers.highlighted[1].config.center.rarity ~= "cry_cursed"
-			and (G.jokers.highlighted[1].ability.name ~= "Diet Cola" or Card.get_gameset(card) == "madness")
+			and G.jokers.highlighted[1].ability.name ~= (
+				"cry-meteor"
+				or "cry-exoplanet"
+				or "cry-stardust"
+				or "cry_cursed"
+				or ("Diet Cola" or Card.get_gameset(card) == "madness")
+				)
+		end
 	end,
 	use = function(self, card, area, copier)
 		local jkr = G.jokers.highlighted[1]

items/enhanced.lua

@@ -334,43 +334,45 @@ return {
 			-- D Invisible Joker
 
 			if
-				center.name == "Fortune Teller"
-				or center.name == "Shoot the Moon"
-				or center.name == "Riff-raff"
-				or center.name == "Chaos the Clown"
-				or center.name == "Dusk"
-				or center.name == "Mime"
-				or center.name == "Hack"
-				or center.name == "Sock and Buskin"
-				or center.name == "Invisible Joker"
-				or center.name == "Swashbuckler"
-				or center.name == "Smeared Joker"
-				or center.name == "Certificate"
-				or center.name == "Mr. Bones"
-				or center.name == "Diet Cola"
-				or center.name == "Luchador"
-				or center.name == "Midas Mask"
-				or center.name == "Shortcut"
-				or center.name == "Seance"
-				or center.name == "Superposition"
-				or center.name == "Sixth Sense"
-				or center.name == "DNA"
-				or center.name == "Splash"
-				or center.name == "Supernova"
-				or center.name == "Pareidolia"
-				or center.name == "Raised Fist"
-				or center.name == "Marble Joker"
-				or center.name == "Four Fingers"
-				or center.name == "Joker Stencil"
-				or center.name == "Showman"
-				or center.name == "Blueprint"
-				or center.name == "Oops! All 6s"
-				or center.name == "Brainstorm"
-				or center.name == "Cartomancer"
-				or center.name == "Astronomer"
-				or center.name == "Burnt Joker"
-				or center.name == "Chicot"
-				or center.name == "Perkeo"
+				center and center.name == (
+				"Fortune Teller"
+				or "Shoot the Moon"
+				or "Riff-raff"
+				or "Chaos the Clown"
+				or "Dusk"
+				or "Mime"
+				or "Hack"
+				or "Sock and Buskin"
+				or "Invisible Joker"
+				or "Swashbuckler"
+				or "Smeared Joker"
+				or "Certificate"
+				or "Mr. Bones"
+				or "Diet Cola"
+				or "Luchador"
+				or "Midas Mask"
+				or "Shortcut"
+				or "Seance"
+				or "Superposition"
+				or "Sixth Sense"
+				or "DNA"
+				or "Splash"
+				or "Supernova"
+				or "Pareidolia"
+				or "Raised Fist"
+				or "Marble Joker"
+				or "Four Fingers"
+				or "Joker Stencil"
+				or "Showman"
+				or "Blueprint"
+				or "Oops! All 6s"
+				or "Brainstorm"
+				or "Cartomancer"
+				or "Astronomer"
+				or "Burnt Joker"
+				or "Chicot"
+				or "Perkeo"
+				)
 			then
 				self.config.center.immutable = true
 			end

items/epic.lua

@@ -1860,8 +1860,8 @@ local spectrogram = {
 				end
 			end
 		end
-
-		if context.retrigger_joker_check and not context.retrigger_joker and context.other_card ~= self then
+		
+		if context.retrigger_joker_check and not context.retrigger_joker and context.other_card == G.jokers.cards[#G.jokers.cards] and context.other_card ~= self then
 			if card.ability.extra.echonum and card.ability.extra.echonum > 0 then
 				return {
 					message = localize("k_again_ex"),
@@ -2026,8 +2026,16 @@ local clockwork = { -- Steel Support: The Joker
 			and not context.end_of_round
 			and SMODS.has_enhancement(context.other_card, "m_steel")
 			and card.ability.extra.steelenhc ~= 1
-		then -- effect 4
-			return { xmult = card.ability.extra.steelenhc }
+		then
+			if context.other_card.debuff then
+				return {
+					message = localize("k_debuffed"),
+					colour = G.C.RED,
+					card = card,
+				}
+			else -- effect 4
+				return { xmult = card.ability.extra.steelenhc }
+			end
 		end
 		--imo this secret effect can be madness only -Math
 		if

items/misc_joker.lua

@@ -996,7 +996,7 @@ local big_cube = {
 	name = "cry-Big Cube",
 	key = "big_cube",
 	joker_gate = "cry-Cube",
-	config = { extra = { x_chips = 6 } },
+	config = { extra = { x_chips = 6 }, override_x_chips_check = true },
 	pos = { x = 4, y = 4 },
 	rarity = 1,
 	order = 105,
@@ -7161,6 +7161,8 @@ local necromancer = {
 			and context.card.config.center.set == "Joker"
 			and G.GAME.jokers_sold
 			and #G.GAME.jokers_sold > 0
+			and not context.blueprint
+			and not context.retrigger_joker
 		then
 			local card = create_card(
 				"Joker",

items/spooky.lua

@@ -651,7 +651,7 @@ local spy = {
 		G.jokers.config.card_limit = G.jokers.config.card_limit - 1
 	end,
 	calculate = function(self, card, context)
-		if context.cardarea == G.jokers and not context.before and not context.after then
+		if context.joker_main then
 			return {
 				message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.x_mult } }),
 				Xmult_mod = card.ability.x_mult,

lib/gameset.lua

@@ -599,6 +599,7 @@ function Card:get_gameset(center)
 end
 local csa = Card.set_ability
 function Card:set_ability(center, y, z)
+	if not center then return end
 	if not center.config then
 		center.config = {} --crashproofing
 	end

lib/misc.lua

@@ -578,7 +578,7 @@ end
 function Cryptid.safe_get(t, ...)
 	local current = t
 	for _, k in ipairs({ ... }) do
-		if current[k] == nil then
+		if not current or current[k] == nil then
 			return false
 		end
 		current = current[k]

lib/misprintize.lua

@@ -17,6 +17,8 @@ function Cryptid.misprintize_tbl(name, ref_tbl, ref_value, clear, override, stac
 					and not (k == "face_nominal")
 					and not (k == "qty")
 					and not (k == "x_mult" and v == 1 and not tbl.override_x_mult_check)
+					and not (k == "x_chips" and v == 1 and not tbl.override_x_chips_check)
+					and not (k == ("h_x_chips"))
 					and not (k == "selected_d6_face")
 				then --Temp fix, even if I did clamp the number to values that wouldn't crash the game, the fact that it did get randomized means that there's a higher chance for 1 or 6 than other values
 					if not Cryptid.base_values[name] then
@@ -50,6 +52,8 @@ function Cryptid.misprintize_tbl(name, ref_tbl, ref_value, clear, override, stac
 						and not (_k == "face_nominal")
 						and not (_k == "qty")
 						and not (k == "x_mult" and v == 1 and not tbl[k].override_x_mult_check)
+						and not (k == "x_chips" and v == 1 and not tbl[k].override_x_chips_check)
+						and not (k == ("h_x_chips"))
 						and not (_k == "selected_d6_face")
 					then --Refer to above
 						if not Cryptid.base_values[name] then