Skip to content

Commit ea43625

Browse files
MathIsFun0MathIsFun0
committed
2 parents ba6c209 + 6dfb63f commit ea43625

File tree

11 files changed

+114
-45
lines changed

11 files changed

+114
-45
lines changed

‎Cryptid.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,4 +352,4 @@ local cryptidTabs = function()
352352
}
353353
end
354354
SMODS.current_mod.extra_tabs = cryptidTabs
355-
SMODS.current_mod.config_tab = cryptidConfigTab
355+
SMODS.current_mod.config_tab = cryptidConfigTab

‎assets/1x/atlasone.png‎

4.82 KB
Loading

‎assets/2x/atlasone.png‎

6.58 KB
Loading

‎items/blind.lua‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,11 @@ local shackle = {
549549
return #Cryptid.advanced_find_joker(nil, nil, "e_negative", nil, true) ~= 0
550550
end,
551551
recalc_debuff = function(self, card, from_blind)
552-
if (card.area == G.jokers) and not G.GAME.blind.disabled and Cryptid.safe_get(card, "edition", "negative") == true then
552+
if
553+
(card.area == G.jokers)
554+
and not G.GAME.blind.disabled
555+
and Cryptid.safe_get(card, "edition", "negative") == true
556+
then
553557
return true
554558
end
555559
return false

‎items/challenge.lua‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ local sticker_sheet = {
1717
},
1818
restrictions = {
1919
banned_cards = {
20-
{ id = "c_cry_lock" }
20+
{ id = "c_cry_lock" },
2121
},
2222
banned_other = {},
2323
},
@@ -38,7 +38,7 @@ local sticker_sheet_plus = {
3838
},
3939
restrictions = {
4040
banned_cards = {
41-
{ id = "c_cry_lock" }
41+
{ id = "c_cry_lock" },
4242
},
4343
banned_other = {},
4444
},
@@ -406,7 +406,7 @@ local onlycard = {
406406
{
407407
id = "p_cry_code_normal_1",
408408
ids = { "p_cry_code_normal_1", "p_cry_code_normal_2", "p_cry_code_jumbo_1", "p_cry_code_mega_1" },
409-
}
409+
},
410410
},
411411
banned_other = {
412412
{ id = "bl_house", type = "blind" },
@@ -482,7 +482,7 @@ local joker_poker = {
482482
{ id = "j_cry_CodeJoker" },
483483
{ id = "j_cry_copypaste" },
484484
{ id = "j_cry_blender" },
485-
{ id = "j_cry_python" }
485+
{ id = "j_cry_python" },
486486
},
487487
banned_other = {
488488
{ id = "bl_hook", type = "blind" },
@@ -562,7 +562,19 @@ if (SMODS.Mods["jen"] or {}).can_load then
562562
onlycard.restrictions.banned_cards[#onlycard.restrictions.banned_cards + 1] = { id = "c_jen_cryptid_ex" }
563563
end
564564
--end of banned cards
565-
local challenges = { sticker_sheet, sticker_sheet_plus, onlycard, ballin, boss_rush, rng, dagger_war, rush_hour, rush_hour_ii, rush_hour_iii, joker_poker }
565+
local challenges = {
566+
sticker_sheet,
567+
sticker_sheet_plus,
568+
onlycard,
569+
ballin,
570+
boss_rush,
571+
rng,
572+
dagger_war,
573+
rush_hour,
574+
rush_hour_ii,
575+
rush_hour_iii,
576+
joker_poker,
577+
}
566578

567579
for k, v in pairs(G.P_CENTERS) do
568580
if v.set == "Joker" then

‎items/deck.lua‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -507,23 +507,32 @@ local antimatter = {
507507
function Cryptid.antimatter_apply()
508508
local bluecheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_blue", "wins", 8)
509509
local yellowcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_yellow", "wins", 8)
510-
local abandonedcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_abandoned", "wins", 8)
510+
local abandonedcheck =
511+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_abandoned", "wins", 8)
511512
local ghostcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_ghost", "wins", 8)
512513
local redcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_red", "wins", 8)
513-
local checkeredcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_checkered", "wins", 8)
514+
local checkeredcheck =
515+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_checkered", "wins", 8)
514516
local erraticcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_erratic", "wins", 8)
515517
local blackcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_black", "wins", 8)
516518
local paintedcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_painted", "wins", 8)
517519
local greencheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_green", "wins", 8)
518-
local spookycheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_spooky", "wins", 8)
520+
local spookycheck =
521+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_spooky", "wins", 8)
519522
local equilibriumcheck =
520523
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_equilibrium", "wins", 8)
521-
local misprintcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_misprint", "wins", 8)
522-
local infinitecheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_infinite", "wins", 8)
523-
local wormholecheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_wormhole", "wins", 8)
524-
local redeemedcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_redeemed", "wins", 8)
525-
local legendarycheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_legendary", "wins", 8)
526-
local encodedcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_encoded", "wins", 8)
524+
local misprintcheck =
525+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_misprint", "wins", 8)
526+
local infinitecheck =
527+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_infinite", "wins", 8)
528+
local wormholecheck =
529+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_wormhole", "wins", 8)
530+
local redeemedcheck =
531+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_redeemed", "wins", 8)
532+
local legendarycheck =
533+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_legendary", "wins", 8)
534+
local encodedcheck =
535+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_encoded", "wins", 8)
527536
local world = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_world_deck", "wins", 8)
528537
local sun = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_sun_deck", "wins", 8)
529538
local star = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_star_deck", "wins", 8)
@@ -754,7 +763,8 @@ local antimatter = {
754763
end
755764

756765
function Cryptid.antimatter_trigger_final_scoring(self, context)
757-
local critcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_critical", "wins", 8)
766+
local critcheck =
767+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_critical", "wins", 8)
758768
local plasmacheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_plasma", "wins", 8)
759769

760770
if Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness" then
@@ -846,9 +856,12 @@ local antimatter = {
846856
end
847857

848858
function Cryptid.antimatter_trigger(self, context)
849-
local glowingcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_glowing", "wins", 8)
850-
local legendarycheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_legendary", "wins", 8)
851-
local anaglyphcheck = Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_anaglyph", "wins", 8)
859+
local glowingcheck =
860+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_glowing", "wins", 8)
861+
local legendarycheck =
862+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_legendary", "wins", 8)
863+
local anaglyphcheck =
864+
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_anaglyph", "wins", 8)
852865

853866
if Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness" then
854867
glowingcheck = 1

‎items/epic.lua‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -596,18 +596,19 @@ local error_joker = {
596596
local polled_rate = pseudorandom(Cryptid.predict_pseudoseed("cdt" .. G.GAME.round_resets.ante)) * total_rate
597597
local check_rate = 0
598598
-- need to preserve order to leave RNG unchanged
599-
local rates = {
600-
{ type = "Joker", val = G.GAME.joker_rate },
601-
{ type = "Tarot", val = G.GAME.tarot_rate },
602-
{ type = "Planet", val = G.GAME.planet_rate },
599+
local rates =
603600
{
604-
type = (G.GAME.used_vouchers["v_illusion"] and pseudorandom(Cryptid.predict_pseudoseed("illusion")) > 0.6)
605-
and "Enhanced"
606-
or "Base",
607-
val = G.GAME.playing_card_rate,
608-
},
609-
{ type = "Spectral", val = G.GAME.spectral_rate },
610-
}
601+
{ type = "Joker", val = G.GAME.joker_rate },
602+
{ type = "Tarot", val = G.GAME.tarot_rate },
603+
{ type = "Planet", val = G.GAME.planet_rate },
604+
{
605+
type = (G.GAME.used_vouchers["v_illusion"] and pseudorandom(
606+
Cryptid.predict_pseudoseed("illusion")
607+
) > 0.6) and "Enhanced" or "Base",
608+
val = G.GAME.playing_card_rate,
609+
},
610+
{ type = "Spectral", val = G.GAME.spectral_rate },
611+
}
611612
for _, v in ipairs(SMODS.ConsumableType.obj_buffer) do
612613
if not (v == "Tarot" or v == "Planet" or v == "Spectral") then
613614
table.insert(rates, { type = v, val = G.GAME[v:lower() .. "_rate"] })
@@ -1571,7 +1572,11 @@ local altgoogol = {
15711572
nil,
15721573
nil,
15731574
nil,
1574-
(gameset == "modest" and (Cryptid.safe_get(chosen_joker, "edition", "negative")) or nil)
1575+
(
1576+
gameset == "modest"
1577+
and (Cryptid.safe_get(chosen_joker, "edition", "negative"))
1578+
or nil
1579+
)
15751580
)
15761581
card:add_to_deck()
15771582
G.jokers:emplace(card)

‎items/m.lua‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,9 @@ local mprime = {
12191219
elseif context.other_joker then
12201220
if
12211221
context.other_joker
1222-
and (context.other_joker:is_jolly() or Cryptid.safe_get(context.other_joker.config.center, "pools", "M"))
1222+
and (
1223+
context.other_joker:is_jolly() or Cryptid.safe_get(context.other_joker.config.center, "pools", "M")
1224+
)
12231225
then
12241226
if not Talisman.config_file.disable_anims then
12251227
G.E_MANAGER:add_event(Event({
@@ -1285,7 +1287,11 @@ local macabre = {
12851287
v ~= card
12861288
and not v:is_jolly()
12871289
and v.config.center.key ~= "j_cry_mprime"
1288-
and not (v.ability.eternal or v.getting_sliced or Cryptid.safe_get(v.config.center, "pools", "M"))
1290+
and not (
1291+
v.ability.eternal
1292+
or v.getting_sliced
1293+
or Cryptid.safe_get(v.config.center, "pools", "M")
1294+
)
12891295
then
12901296
destroyed_jokers[#destroyed_jokers + 1] = v
12911297
end

‎items/misc_joker.lua‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ local queensgambit = {
302302
if context.destroying_card and not context.blueprint then
303303
if
304304
G.GAME.current_round.current_hand.handname == "Royal Flush"
305-
and SMODS.Ranks[context.destroying_card.base.value].key == "Queen"
305+
and context.destroying_card:get_id() == 12
306+
and not context.destroying_card.ability.eternal
306307
then
307308
card_eval_status_text(
308309
card,
@@ -2045,7 +2046,7 @@ local redbloon = {
20452046
"Roguefort Cookie",
20462047
},
20472048
art = {
2048-
"Jevonn",
2049+
"Darren_The_Frog",
20492050
},
20502051
code = {
20512052
"Jevonn",
@@ -2681,7 +2682,7 @@ local spaceglobe = {
26812682
"Jevonn",
26822683
},
26832684
art = {
2684-
"Jevonn",
2685+
"Selicre",
26852686
},
26862687
code = {
26872688
"Jevonn",
@@ -6841,7 +6842,12 @@ local tropical_smoothie = {
68416842
if v ~= card then
68426843
if not Card.no(v, "immutable", true) then
68436844
Cryptid.with_deck_effects(v, function(cards)
6844-
Cryptid.misprintize(cards, { min = card.ability.extra, max = card.ability.extra }, nil, true)
6845+
Cryptid.misprintize(
6846+
cards,
6847+
{ min = card.ability.extra, max = card.ability.extra },
6848+
nil,
6849+
true
6850+
)
68456851
end)
68466852
check = true
68476853
end
@@ -7538,7 +7544,7 @@ local arsonist = {
75387544
if context.destroying_card then
75397545
local eval = evaluate_poker_hand(context.full_hand)
75407546
if next(eval["Full House"]) then
7541-
return true
7547+
return not context.destroying_card.ability.eternal
75427548
end
75437549
end
75447550
end,
@@ -7695,13 +7701,13 @@ local huntingseason = { -- If played hand contains three cards, destroy the midd
76957701
},
76967702
name = "cry-huntingseason",
76977703
key = "huntingseason",
7698-
pos = { x = 4, y = 0 },
7704+
pos = { x = 4, y = 5 },
76997705
order = 134,
77007706
immutable = true,
77017707
rarity = 2,
77027708
cost = 7,
77037709
blueprint_compat = false,
7704-
atlas = "placeholders",
7710+
atlas = "atlasone",
77057711
calculate = function(self, card, context)
77067712
if
77077713
(context.cardarea == G.play or context.cardarea == "unscored")
@@ -7710,10 +7716,13 @@ local huntingseason = { -- If played hand contains three cards, destroy the midd
77107716
and not context.blueprint
77117717
and not context.retrigger_joker
77127718
then
7713-
return { remove = true }
7719+
return { remove = not context.destroy_card.ability.eternal }
77147720
end
77157721
end,
77167722
cry_credits = {
7723+
art = {
7724+
"Unexian",
7725+
},
77177726
idea = {
77187727
"Nova",
77197728
},

‎lib/misprintize.lua‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,25 @@ function Cryptid.misprintize(card, override, force_reset, stack)
146146
override.max = override.max * G.GAME.modifiers.cry_jkr_misprint_mod
147147
end
148148
if G.GAME.modifiers.cry_misprint_min or override and override.min then
149-
Cryptid.misprintize_tbl(card.config.center_key, card, "ability", nil, override, stack, Cryptid.is_card_big(card))
149+
Cryptid.misprintize_tbl(
150+
card.config.center_key,
151+
card,
152+
"ability",
153+
nil,
154+
override,
155+
stack,
156+
Cryptid.is_card_big(card)
157+
)
150158
if card.base then
151-
Cryptid.misprintize_tbl(card.config.card_key, card, "base", nil, override, stack, Cryptid.is_card_big(card))
159+
Cryptid.misprintize_tbl(
160+
card.config.card_key,
161+
card,
162+
"base",
163+
nil,
164+
override,
165+
stack,
166+
Cryptid.is_card_big(card)
167+
)
152168
end
153169
end
154170
if G.GAME.modifiers.cry_misprint_min then

0 commit comments

Comments
 (0)