Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
818cbb7
kitty printer makes all previewed tags cat tags
DigitalDetective47 Mar 17, 2025
fdc8701
add custom uis for blinds and tags
DigitalDetective47 Mar 17, 2025
f6b3a8d
add hand sprites for Bulwark, Clusterfuck, and Ultimate Pair
DigitalDetective47 Mar 18, 2025
2484eaf
the Tag on the right of Memory Tag now also shows its preview UI
DigitalDetective47 Mar 19, 2025
17e101f
Add Wonka Bar (code)
kierkat10 Mar 24, 2025
213fbfa
Add Wonka Bar (localization)
kierkat10 Mar 24, 2025
ce7c7ec
add new spooky.lua
kierkat10 Mar 25, 2025
2112b19
add new atlasspooky
kierkat10 Mar 25, 2025
951c325
add atlasspooky but actually now
kierkat10 Mar 25, 2025
eea0a40
add atlasspooky but actually now
kierkat10 Mar 25, 2025
042a4e9
is it over yet
kierkat10 Mar 25, 2025
ce38607
please be the last commit
kierkat10 Mar 25, 2025
0e3115d
Add files via upload
kierkat10 Mar 26, 2025
42b2ee7
IT'S FINALLY DONE PELASE
kierkat10 Mar 26, 2025
d82c53d
i don't even want to make any more jokes
kierkat10 Mar 26, 2025
c5ed7cf
yeah i'm not, if there are any more... sigh
kierkat10 Mar 26, 2025
f47150f
High Five
astrapboy Mar 27, 2025
648396f
debug text removed
astrapboy Mar 27, 2025
0f2671b
Pre-existing fives no longer get whapooshed
astrapboy Mar 27, 2025
061f0b3
moved from uncommon to rare
astrapboy Mar 27, 2025
78ee7ce
Fix to hand size not being applied + special values
bobjoe400 Mar 27, 2025
c518d98
added the ability to skip over whole tables
bobjoe400 Mar 27, 2025
2bbca17
spacing
bobjoe400 Mar 27, 2025
678cdcf
UnStable hotfix
astrapboy Mar 27, 2025
ba5872d
UnStable fix
astrapboy Mar 27, 2025
69cf6f6
Fixed it also elsewhere
astrapboy Mar 27, 2025
deb7d4f
Merge pull request #508 from bobjoe400/pot-of-jokes-rework
MathIsFun0 Mar 27, 2025
3410941
jolly-bot: auto-format Lua files using Stylua
Mar 27, 2025
e509f28
Merge pull request #507 from bobjoe400/immutable-misprintize
MathIsFun0 Mar 27, 2025
19a00a2
jolly-bot: auto-format Lua files using Stylua
Mar 27, 2025
5826df3
just a minor change
Dragokillfist Mar 27, 2025
4481b38
re:just a minor change
Dragokillfist Mar 27, 2025
6d87c9a
bump version
Jevonnissocoolman Mar 28, 2025
285ab78
disabled eye of hagane
TheRealNova422-real Mar 28, 2025
a528415
Merge pull request #511 from TheRealNova422-real/patch-31
Dragokillfist Mar 28, 2025
d66429d
Added High Five art
astrapboy Mar 28, 2025
d885d40
gitkraken this is above my paygrade
astrapboy Mar 28, 2025
e6a8935
Merge pull request #506 from astrapboy/main
Dragokillfist Mar 28, 2025
ba46233
jolly-bot: auto-format Lua files using Stylua
Mar 28, 2025
21d143e
add "force tooltips" setting (1/3)
TheBearodactyl Mar 28, 2025
68af968
add "force tooltips" setting (2/3)
TheBearodactyl Mar 28, 2025
a1acb7b
add "force tooltips" setting (3/3)
TheBearodactyl Mar 28, 2025
2924c2f
add "force tooltips" setting (1/3)
TheBearodactyl Mar 28, 2025
f62d732
Merge pull request #513 from TheBearodactyl/main
Dragokillfist Mar 28, 2025
661ef02
Merge pull request #494 from kierkat10/patch-3
Dragokillfist Mar 28, 2025
3be098e
jolly-bot: auto-format Lua files using Stylua
Mar 28, 2025
241e013
Fix incorrect Maximized + High Five interaction
Jevonnissocoolman Mar 28, 2025
8fd7e98
oops
Jevonnissocoolman Mar 28, 2025
0b8a631
Add in unlock requirements for all decks
AlexZGreat Mar 30, 2025
1650373
jolly-bot: auto-format Lua files using Stylua
Mar 30, 2025
135230e
Add unlock localization
AlexZGreat Mar 30, 2025
517c8a7
jolly-bot: auto-format Lua files using Stylua
Mar 30, 2025
91400dd
idk who reversed this change but keep it this way please
jenwalter666 Mar 30, 2025
32fe1bc
let sol work with glitched
lord-ruby Mar 30, 2025
bac02ad
talisman moment
MathIsFun0 Mar 31, 2025
5d6b89e
jolly-bot: auto-format Lua files using Stylua
Mar 31, 2025
35e262b
make ascension factor use bignum/omeganum (#515)
lord-ruby Mar 31, 2025
eb1b731
jolly-bot: auto-format Lua files using Stylua
Mar 31, 2025
f9afc34
Merge pull request #516 from lord-ruby/sol-glitched
Jevonnissocoolman Mar 31, 2025
9347055
jolly-bot: auto-format Lua files using Stylua
Mar 31, 2025
1e2ee6a
Lavender Loop + The clock scale with in game speed
Jevonnissocoolman Mar 31, 2025
ca2b88b
Remove test code
Jevonnissocoolman Mar 31, 2025
f21dc01
fix Memory Tag for Next Ante Preview 3.0.0
DigitalDetective47 Apr 1, 2025
0868fb5
PT_br localization
Jevonnissocoolman Apr 1, 2025
ef966f0
jolly-bot: auto-format Lua files using Stylua
Apr 1, 2025
6357497
Crash fix
Jevonnissocoolman Apr 1, 2025
96996c4
can_highlight bug fixed
Mathguy23 Apr 2, 2025
85de2b1
fixed thing
TheRealNova422-real Apr 2, 2025
28ca2bf
Merge pull request #522 from TheRealNova422-real/patch-33
Jevonnissocoolman Apr 2, 2025
2aea081
Delete assets/1x/atlasthree.png
AutoWatto Apr 2, 2025
5ec7fa7
Adds @MarioFan597 Wario Sprite
AutoWatto Apr 2, 2025
342ac1a
Delete assets/2x/atlasthree.png
AutoWatto Apr 2, 2025
b4e6bdc
Adds @MarioFan597 Wario Sprite
AutoWatto Apr 2, 2025
bb80f6f
Adds @MarioFan597 to art credits for Wario
AutoWatto Apr 2, 2025
0b611db
fragile fix
TheRealNova422-real Apr 2, 2025
8c312f1
minor clockwork fix
TheRealNova422-real Apr 2, 2025
1782aaa
Crash fix
Jevonnissocoolman Apr 3, 2025
988092f
Merge pull request #525 from TheRealNova422-real/patch-35
Jevonnissocoolman Apr 3, 2025
a4d8fa0
Merge pull request #524 from TheRealNova422-real/patch-34
Jevonnissocoolman Apr 3, 2025
6b6e2d6
adds .lovelyignore to the .gitignore file
Dragokillfist Apr 3, 2025
fd9e2e1
Merge pull request #479 from DigitalDetective47/main
MathIsFun0 Apr 3, 2025
5221fad
jolly-bot: auto-format Lua files using Stylua
Apr 3, 2025
4fc72d5
Merge pull request #514 from AlexZGreat/main
MathIsFun0 Apr 3, 2025
47ebe1c
Merge pull request #523 from AutoWatto/main
MathIsFun0 Apr 3, 2025
36f353a
Hotfixed!
TheRealNova422-real Apr 3, 2025
e1aa186
fixed a bug
TheRealNova422-real Apr 3, 2025
63efb6f
more exploits
TheRealNova422-real Apr 4, 2025
9191732
Localization fix
Jevonnissocoolman Apr 4, 2025
8831a9b
m
Jevonnissocoolman Apr 4, 2025
a960a10
Merge branch 'MathIsFun0:main' into patch-36
TheRealNova422-real Apr 4, 2025
d68f4dc
crashproofering
TheRealNova422-real Apr 4, 2025
7a0e9b2
fix moment
TheRealNova422-real Apr 4, 2025
0cfed3d
optimization + crash fix
TheRealNova422-real Apr 4, 2025
f39820a
Add code for Scorch
gemstonezGH Apr 5, 2025
5015562
Add en-us localization for Scorch
gemstonezGH Apr 5, 2025
9584418
crashprooferering
TheRealNova422-real Apr 5, 2025
aea7b56
spy fix
TheRealNova422-real Apr 5, 2025
4cfdec9
Update misprintize.lua
TheRealNova422-real Apr 5, 2025
36b4c92
Update misc_joker.lua
TheRealNova422-real Apr 5, 2025
f99fe72
fixed the glitched/oversat giving hand xchips bug
TheRealNova422-real Apr 5, 2025
e874493
Spectrogram fix
TheRealNova422-real Apr 5, 2025
d767860
forgor
TheRealNova422-real Apr 5, 2025
2d7791e
version bump
TheRealNova422-real Apr 5, 2025
c8f0505
nostalgic rework
TheRealNova422-real Apr 5, 2025
e2fcf3b
Update blind.lua
TheRealNova422-real Apr 5, 2025
53a3b7d
Merge pull request #1 from TheRealNova422-real/patch-38
gemstonezGH Apr 5, 2025
4e4e40c
Merge pull request #526 from TheRealNova422-real/patch-36
Dragokillfist Apr 5, 2025
e4e8924
jolly-bot: auto-format Lua files using Stylua
Apr 5, 2025
4440d3e
Merge branch 'MathIsFun0:main' into main
gemstonezGH Apr 5, 2025
1e4bbb3
Add Scorch icon (by gemstonez and Nova)
gemstonezGH Apr 5, 2025
b66438c
actually add icon
gemstonezGH Apr 5, 2025
ada4dc5
hello? please add please github i am begging you
gemstonezGH Apr 5, 2025
e161b08
add 2x boss sheet
gemstonezGH Apr 5, 2025
6272d10
Update blind.lua
gemstonezGH Apr 5, 2025
686e0b3
Merge pull request #532 from gemstonezGH/main
Dragokillfist Apr 5, 2025
0ad2d1f
jolly-bot: auto-format Lua files using Stylua
Apr 5, 2025
fd0d199
Phantomless Double Scale
TheRealNova422-real Apr 6, 2025
0a63b13
jolly-bot: auto-format Lua files using Stylua
Apr 6, 2025
a072b80
Update README.md
TheRealNova422-real Apr 6, 2025
612e2d0
Update README.md
TheRealNova422-real Apr 6, 2025
98d383e
enabled cardarea discard
TheRealNova422-real Apr 6, 2025
3d27a70
jolly-bot: auto-format Lua files using Stylua
Apr 6, 2025
831d8a3
i'm not testing this but if it doesn't work i
Toneblock Apr 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# LSP setting files (add more if applicable)
.vscode/*
.luarc.json
.luarc.json
.lovelyignore
5 changes: 3 additions & 2 deletions Cryptid.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
"priority": 114,
"badge_colour": "708b91",
"badge_text_colour": "FFFFFF",
"version": "0.5.5a~dev",
"version": "0.5.5b",
"dependencies": [
"Talisman (>=2.0.9)",
"Steamodded (>=1.0.0~BETA-0314c)"
],
"conflicts": [
"Saturn"
"Saturn",
"AntePreview (>= 2.0.0~0c16a) (<<3.0.0)"
]
}
14 changes: 9 additions & 5 deletions Cryptid.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@ SMODS.current_mod.optional_features = {
quantum_enhancements = false,
-- Here are some other ones Steamodded has
-- Cryptid doesn't use them YET, but these should be uncommented if Cryptid uses them
--[[
-- These ones add new card areas that Steamodded will calculate through
-- Might already be useful for sticker calc
cardareas = {
deck = true,
discard = true,
}
--]]
--deck = true,
discard = true, -- used by scorch
},
}

--Load Library Files
Expand Down Expand Up @@ -234,6 +232,12 @@ local cryptidConfigTab = function()
ref_table = Cryptid_config,
ref_value = "experimental",
})
cry_nodes[#cry_nodes + 1] = create_toggle({
label = localize("cry_force_tooltips"),
active_colour = HEX("22c705"),
ref_table = Cryptid_config,
ref_value = "force_tooltips",
})
cry_nodes[#cry_nodes + 1] = create_toggle({
label = localize("cry_feat_https module"),
active_colour = HEX("b1c78d"),
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ An unbalanced Balatro mod.
Note: Cryptid requires [Steamodded **1.0.0~BETA-0314c**](https://github.com/Steamopollys/Steamodded/archive/refs/heads/main.zip) and [Talisman](https://github.com/MathIsFun0/Talisman/releases/latest).

Cryptid currently adds:
![image](https://github.com/user-attachments/assets/4a06c3ba-6df4-48af-a3b3-fdba4dd3125d)
![image](https://github.com/user-attachments/assets/2bf58a78-7af9-45c5-930f-f8ac988c2126)

![image](https://github.com/user-attachments/assets/fa426832-2910-4bff-86d3-97b973c79801)
![image](https://github.com/user-attachments/assets/a99b29fb-93c0-4f24-9dbd-f0ef82050aa5)
![image](https://github.com/user-attachments/assets/2441010d-1f0d-4b3f-80f7-de45e071ad06)


### [Official Discord](https://discord.gg/cryptid)
Expand Down
Binary file modified assets/1x/atlasspooky.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/1x/atlasthree.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/1x/atlastwo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/1x/bl_cry.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/1x/hands.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/2x/atlasspooky.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/2x/atlasthree.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/2x/atlastwo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/2x/bl_cry.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/2x/hands.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sounds/whapoosh.ogg
Binary file not shown.
1 change: 1 addition & 0 deletions config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ return {
},
["family_mode"] = false,
["experimental"] = false,
["force_tooltips"] = true,
["HTTPS"] = true,
["menu"] = true,
}
88 changes: 84 additions & 4 deletions items/blind.lua
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,28 @@ local tax = {
loc_vars = function(self, info_queue, card)
return { vars = { 0.4 * get_blind_amount(G.GAME.round_resets.ante) * 2 * G.GAME.starting_params.ante_scaling } } -- no bignum?
end,
preview_ui = function(self)
local value = self:loc_vars().vars[1]
return {
n = G.UIT.C,
nodes = {
{
n = G.UIT.R,
nodes = {
{ n = G.UIT.O, config = { object = get_stake_sprite(G.GAME.stake, 0.25) } },
{
n = G.UIT.T,
config = {
text = number_format(value),
colour = G.C.RED,
scale = score_number_scale(0.5, value),
},
},
},
},
},
}
end,
collection_loc_vars = function(self)
return { vars = { localize("cry_tax_placeholder") } }
end,
Expand Down Expand Up @@ -327,7 +349,7 @@ local clock = {
if G.SETTINGS.paused then
return 0
else
return 0.1 * dt / 3
return 0.1 * (dt * math.min(G.SETTINGS.GAMESPEED, 4) / 4) / 3
end
end,
}
Expand Down Expand Up @@ -394,6 +416,13 @@ local joke = {
},
}
end,
preview_ui = function(self)
local value = self:loc_vars().vars[2]
return {
n = G.UIT.T,
config = { text = number_format(value), colour = G.C.ORANGE, scale = score_number_scale(0.5, value) },
}
end,
collection_loc_vars = function(self)
return { vars = { "8", localize("cry_joke_placeholder") } }
end,
Expand Down Expand Up @@ -599,6 +628,53 @@ local pin = {
return false
end,
}
-- Must play 5 cards,
-- Destroy all played and discarded cards
-- (only appears in endless)
local scorch = {
dependencies = {
items = {
"set_cry_blind",
},
},
object_type = "Blind",
name = "cry-scorch",
key = "scorch",
pos = { x = 0, y = 18 }, -- use Trick as placeholder icon
boss = {
min = 1,
max = 10,
},
atlas = "blinds",
order = 21,
boss_colour = HEX("77261a"),
debuff = { -- must play 5 cards
h_size_ge = 5,
h_size_le = 5,
},
calculate = function(self, blind, context)
if
context.full_hand
and context.destroy_card
and (context.cardarea == G.play or context.cardarea == "unscored")
and not G.GAME.blind.disabled
then
return { remove = not context.destroy_card.ability.eternal }
end
if context.discard and not G.GAME.blind.disabled then
for i, card in ipairs(G.hand.highlighted) do
return { remove = not card.ability.eternal }
end
end
end,
in_pool = function(self) -- only appears in endless
if G.GAME.round_resets.blind_ante > G.GAME.win_ante then
return true
else
return false
end
end,
}
--It seems Showdown blind order is seperate from normal blind collection order? convenient for me at least
--Nvm they changed it
local lavender_loop = {
Expand Down Expand Up @@ -637,14 +713,17 @@ local lavender_loop = {
and G.GAME.cry_ach_conditions.patience_virtue_earnable ~= true
then
G.GAME.cry_ach_conditions.patience_virtue_timer = G.GAME.cry_ach_conditions.patience_virtue_timer
- dt * (G.GAME.modifiers.cry_rush_hour_iii and 0.5 or 1) * (G.SETTINGS.paused and 0 or 1)
- dt
* (G.GAME.modifiers.cry_rush_hour_iii and 0.5 or 1)
* (G.SETTINGS.paused and 0 or 1)
* G.SETTINGS.GAMESPEED
elseif G.GAME.current_round.hands_played == 0 then
G.GAME.cry_ach_conditions.patience_virtue_earnable = true
end
if G.SETTINGS.paused then
if G.SETTINGS.paused or G.STATE == G.STATES.HAND_PLAYED then
return 1
else
return 1.25 ^ (dt / 1.5)
return 1.25 ^ (dt / (1.5 / math.min(G.SETTINGS.GAMESPEED, 4) * 4))
end
end,
}
Expand Down Expand Up @@ -1347,6 +1426,7 @@ local items_togo = {
striker,
shackle,
pin,
scorch,
vermillion_virus,
tornado,
sapphire_stamp,
Expand Down
Loading