Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cryptid Refactor - Gamesets, New Calc Support, Etc. #413

Merged
merged 370 commits into from
Feb 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
370 commits
Select commit Hold shift + click to select a range
aec2dd5
m
MathIsFun0 Jan 17, 2025
9721af7
deck migration (wip)
Jevonnissocoolman Jan 17, 2025
5948699
NGPC display fixes
MathIsFun0 Jan 17, 2025
075b647
Almanac compat
MathIsFun0 Jan 17, 2025
50f161e
prevent profile loading issues
MathIsFun0 Jan 17, 2025
920f7f5
make gameset UI sorted properly
MathIsFun0 Jan 17, 2025
fff507b
finish better calc editions
MathIsFun0 Jan 17, 2025
46eb45e
better calc seals
MathIsFun0 Jan 17, 2025
a81a2f5
m
MathIsFun0 Jan 17, 2025
e4ae346
white hole talisman compat
MathIsFun0 Jan 17, 2025
42180dd
h
MathIsFun0 Jan 18, 2025
86e280c
intro tweaks, make madness unlock all
MathIsFun0 Jan 18, 2025
e154cf2
fix universum, loss tag, one for all
MathIsFun0 Jan 18, 2025
8db38b2
wip 2 ig
Jevonnissocoolman Jan 18, 2025
258e0cc
fix optional features and wario
MathIsFun0 Jan 19, 2025
e2bb326
more wario fix
MathIsFun0 Jan 19, 2025
0748148
infoqueue fix
Jevonnissocoolman Jan 19, 2025
2ef8b36
add all thematic sets
MathIsFun0 Jan 20, 2025
eeeff28
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Jan 20, 2025
c01a958
Merge branch 'main' into refactor
MathIsFun0 Jan 20, 2025
143c15e
manual merging
MathIsFun0 Jan 20, 2025
b49c910
update t3 voucher sprites
Toneblock Jan 20, 2025
0eb3d2a
big num stuff
MathIsFun0 Jan 20, 2025
409560d
Merge branch 'main' into refactor
MathIsFun0 Jan 20, 2025
50298d6
new rarity colors
MathIsFun0 Jan 20, 2025
00a02a3
safe_get function
MathIsFun0 Jan 20, 2025
2d9b976
WIP utilize safe_get
MathIsFun0 Jan 20, 2025
b1fbe64
unscuff voucher stuff and rescuff some other voucher stuff
Toneblock Jan 21, 2025
fa26d2e
Merge pull request #360 from Toneblock/refactor
Jevonnissocoolman Jan 22, 2025
d821b12
less jank
Toneblock Jan 22, 2025
5e95bcd
my guy... i don't think anyone cares
Toneblock Jan 22, 2025
24b5ffe
don't do gold stake checks on madness
MathIsFun0 Jan 23, 2025
7838f6c
New function
Jevonnissocoolman Jan 23, 2025
20f279e
Fix Caseoh M
Jevonnissocoolman Jan 23, 2025
2734062
blind.lua wip
Jevonnissocoolman Jan 24, 2025
842197a
cat tag is now slightly more addicting
Toneblock Jan 24, 2025
ae70629
safety
Toneblock Jan 24, 2025
e306593
change edition tag textures (may be controversial)
Toneblock Jan 24, 2025
38f8d63
let edition tags be
Toneblock Jan 24, 2025
99ce44e
blind.lua cleanup
Jevonnissocoolman Jan 26, 2025
a04741e
animated sprites check for timer mechanics (funny)
Jevonnissocoolman Jan 26, 2025
083690c
Add Main Menu Music toggle(?)
Jevonnissocoolman Jan 26, 2025
d45e92e
Add toggle for poker hand stuff
Jevonnissocoolman Jan 27, 2025
d163084
Talisman compat (#365)
TheRealNova422-real Jan 27, 2025
2f98364
we don't need most of this test stuff anymore
Jevonnissocoolman Jan 27, 2025
0e22d5d
merge #362 because i want to make aure angry with voucher ui
Toneblock Jan 27, 2025
5bd5c16
more sticker stuff
Toneblock Jan 27, 2025
7439ebe
just in case
Toneblock Jan 28, 2025
44bf152
fix unredeem crash
Toneblock Jan 28, 2025
f3b1f26
Better calc crash fix
Jevonnissocoolman Jan 28, 2025
0afb45f
tf happened with the merge here
Toneblock Jan 29, 2025
72466a5
Major Edition Fixes + Nostalgic Serpent Hotfix (#368)
TheRealNova422-real Jan 29, 2025
1065fb8
fix seraph misprint
Toneblock Jan 29, 2025
c47e710
light cards no longer draw shadow... because they're light
Toneblock Jan 29, 2025
54b5332
Optimization
Jevonnissocoolman Jan 29, 2025
787fc90
Temp pool for get_food
Jevonnissocoolman Jan 29, 2025
288452a
Fixed One Crash
TheRealNova422-real Jan 30, 2025
7d54a00
a
Jevonnissocoolman Jan 30, 2025
55edf1b
Fix Golden Triggering
TheRealNova422-real Jan 30, 2025
e1491c2
Glitched/Noisy fix
TheRealNova422-real Jan 30, 2025
88652d5
Merge pull request #369 from TheRealNova422-real/patch-3
Jevonnissocoolman Jan 30, 2025
9846fc9
Bump version since it has been a while
Jevonnissocoolman Jan 31, 2025
f3e8fd5
Copypaste Nerf
Jevonnissocoolman Jan 31, 2025
e6e944a
refactor branch: hacky hack to stop modicon crash
larswijn Jan 31, 2025
64aa2a0
fix encoded deck hover?????????????????????
Toneblock Jan 31, 2025
28ed786
Merge pull request #374 from larswijn/refactor-modicon-patch
Jevonnissocoolman Jan 31, 2025
d8d1c4b
misprinters stay winning (fixes)
Toneblock Jan 31, 2025
6ef9d29
fix vacuum on enhanced decks
Toneblock Feb 1, 2025
6b73a3b
fix meme packs
Toneblock Feb 1, 2025
9fab643
fix program packs
Toneblock Feb 1, 2025
4f5ccfe
Finally Fixed Glitched/Aurinko
TheRealNova422-real Feb 1, 2025
bb9a86a
Merge pull request #371 from TheRealNova422-real/patch-5
jenwalter666 Feb 1, 2025
d19a846
Fixed a Redeo Crash
TheRealNova422-real Feb 2, 2025
273f4b6
proper redeo fix
MathIsFun0 Feb 2, 2025
ff8ed8f
Merge pull request #377 from TheRealNova422-real/patch-7
MathIsFun0 Feb 2, 2025
6c41e54
misc fixes
MathIsFun0 Feb 2, 2025
5b5a477
misc fixes (voucher edition)
Toneblock Feb 2, 2025
fc95af7
fix multiply and glitched/oversat
MathIsFun0 Feb 2, 2025
0ce627e
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 2, 2025
d518a25
"fix" fragile
MathIsFun0 Feb 2, 2025
9badb7a
tarot/planet acclimator rework
Toneblock Feb 2, 2025
ee4da39
Small fix for nice joker
TheRealNova422-real Feb 4, 2025
623a95d
Suit Planet Fixes
TheRealNova422-real Feb 4, 2025
82ef278
The Better Suit Planet Fix
TheRealNova422-real Feb 4, 2025
0ba1def
fix golden and candy cane
MathIsFun0 Feb 4, 2025
57fa8bd
Merge pull request #378 from TheRealNova422-real/patch-1
MathIsFun0 Feb 4, 2025
a4f5128
end
MathIsFun0 Feb 4, 2025
def1952
Merge pull request #379 from TheRealNova422-real/patch-2
MathIsFun0 Feb 4, 2025
8819624
simple plural loc
Toneblock Feb 4, 2025
53b6372
fix digihalu
Toneblock Feb 4, 2025
9876c63
Fix crash(???)
Jevonnissocoolman Feb 5, 2025
9343c34
fix eternal flame
Jevonnissocoolman Feb 5, 2025
c6d5c31
Modest White Hole
Jevonnissocoolman Feb 5, 2025
ec7a10a
edition deck UI in gameset view
MathIsFun0 Feb 6, 2025
64a3023
move Food, Tier 3 Vouchers, M Jokers to ObjectTypes
MathIsFun0 Feb 6, 2025
e95bec6
i forgot to remove this
Toneblock Feb 6, 2025
57e1abe
exploit + delete buff
Toneblock Feb 6, 2025
73b91db
remove sell value
Toneblock Feb 6, 2025
acf5e22
prevent crashes
MathIsFun0 Feb 6, 2025
7b7cafd
missed this stuff
MathIsFun0 Feb 7, 2025
0fd9c4d
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 7, 2025
2809c4b
m
Jevonnissocoolman Feb 7, 2025
bc08812
Reword
Jevonnissocoolman Feb 7, 2025
de34820
m
MathIsFun0 Feb 7, 2025
14b398e
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 7, 2025
03632a2
small things
MathIsFun0 Feb 7, 2025
6c6ce6a
proper tallies for gameset UI
MathIsFun0 Feb 7, 2025
bffe8de
Stop Infinite
Jevonnissocoolman Feb 8, 2025
78ade63
update sprites
Jevonnissocoolman Feb 9, 2025
8b36f1e
Add files via upload
Jevonnissocoolman Feb 9, 2025
cd06340
python context fix
MathIsFun0 Feb 9, 2025
619d3be
fix energia
Toneblock Feb 9, 2025
af62ba6
Consistency change
Jevonnissocoolman Feb 9, 2025
1e8d5d6
forgot brackets
Jevonnissocoolman Feb 9, 2025
9f8d08e
Crash fix
Jevonnissocoolman Feb 9, 2025
2426e94
WIP Edition deck, Enchancement deck, etc...
Jevonnissocoolman Feb 10, 2025
edf8147
wip less annoying gameset ui
Toneblock Feb 10, 2025
db73eb9
Use smods to resize jokers (#359)
DigitalDetective47 Feb 10, 2025
f84e70d
Fix Labyrinth crash
Jevonnissocoolman Feb 10, 2025
f457e13
Update m.lua
Jevonnissocoolman Feb 10, 2025
3b65c02
Move Object Types to Content.lua
Jevonnissocoolman Feb 10, 2025
a984d39
1 line efficiency (optimal)
Jevonnissocoolman Feb 10, 2025
f3eb03a
fix tag hover in cryptid collection
Toneblock Feb 10, 2025
c941da8
oops
Toneblock Feb 10, 2025
2577b00
revamp enhanced deck UI/selection
MathIsFun0 Feb 10, 2025
58014f9
reuse some logic across all enhanced decks
MathIsFun0 Feb 10, 2025
89e83d0
Oops
MathIsFun0 Feb 10, 2025
8de1a72
individual edition deck sprites (new ones by Gud Username)
MathIsFun0 Feb 10, 2025
7b62e6b
fixed a joker_display.lua crash
TheRealNova422-real Feb 10, 2025
2e817e7
Merge pull request #387 from TheRealNova422-real/patch-1
Jevonnissocoolman Feb 11, 2025
2cf1b34
fix misprint crashing when big
Toneblock Feb 11, 2025
f6a091e
t
Jevonnissocoolman Feb 12, 2025
5bacb94
yippee refactors
MathIsFun0 Feb 12, 2025
9588cdf
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 12, 2025
2bdeeb4
Fixing Misc Crash
TheRealNova422-real Feb 12, 2025
1de8df5
Merge pull request #389 from TheRealNova422-real/patch-2
Jevonnissocoolman Feb 12, 2025
cf1c3a1
fixed choco9 crash
TheRealNova422-real Feb 13, 2025
ab9dd81
Merge pull request #390 from TheRealNova422-real/patch-3
Jevonnissocoolman Feb 13, 2025
0014b0c
Combine Hooks (get_current_pool)
Jevonnissocoolman Feb 13, 2025
02a3031
this isn't needed
Jevonnissocoolman Feb 13, 2025
79a0acb
fix rework bug
Jevonnissocoolman Feb 14, 2025
dc972b0
fix suit in_pool not being respected
MathIsFun0 Feb 14, 2025
3071be2
increase sizeof Macabre Joker
Jevonnissocoolman Feb 15, 2025
f15360a
voucher gamesets
MathIsFun0 Feb 15, 2025
47e7ce0
minor change
Jevonnissocoolman Feb 15, 2025
9d4772b
view items by content set
MathIsFun0 Feb 15, 2025
a18e146
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 15, 2025
5adccf0
Update gameset.lua
MathIsFun0 Feb 15, 2025
57196f0
true…
MathIsFun0 Feb 15, 2025
9607dea
Energia Change
Jevonnissocoolman Feb 16, 2025
86560a4
shiny tags
Toneblock Feb 16, 2025
591a421
Revert "shiny tags"
Toneblock Feb 16, 2025
aecda9b
cut fix
Toneblock Feb 18, 2025
66ff5a9
yippee refactoring
MathIsFun0 Feb 18, 2025
631593e
more refactors
MathIsFun0 Feb 18, 2025
992d362
taxfraud art
Dragokillfist Feb 19, 2025
9c5fdf9
Merge pull request #397 from Dragokillfist/refactor
MathIsFun0 Feb 19, 2025
e1493a9
Bump version
Jevonnissocoolman Feb 19, 2025
23751a8
No More Seraph
TheRealNova422-real Feb 19, 2025
149b6f2
fix atlastwo
Toneblock Feb 19, 2025
db16f74
minor buff
Jevonnissocoolman Feb 19, 2025
6c56fa8
should fix the crash with gamba pack (#402)
Dragokillfist Feb 19, 2025
2b1c425
Merge pull request #399 from TheRealNova422-real/patch-5
MathIsFun0 Feb 19, 2025
85563c9
Possibly fixed a Spectrogram Crash
TheRealNova422-real Feb 19, 2025
1ba5503
Update code.lua
Dragokillfist Feb 19, 2025
f7ea971
Update code.lua
Dragokillfist Feb 19, 2025
bceea83
Merge pull request #405 from Dragokillfist/patch-1
Jevonnissocoolman Feb 20, 2025
3cd25cf
Update misc_joker.lua
MathIsFun0 Feb 20, 2025
a750545
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 20, 2025
5fb2c6c
proper fix + debuff checking
MathIsFun0 Feb 20, 2025
916ef62
Merge pull request #404 from TheRealNova422-real/patch-6
MathIsFun0 Feb 20, 2025
51e45b9
Added SDM_0's Stuff to cross mods
SDM0 Feb 20, 2025
683000e
make changing edition decks easier
MathIsFun0 Feb 20, 2025
1f4fff5
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 20, 2025
8529d8e
Merge pull request #406 from SDM0/refactor
MathIsFun0 Feb 20, 2025
aec62e8
pretty much finished refactoring
MathIsFun0 Feb 20, 2025
67d30e3
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 20, 2025
4135ae5
bugfixes and polish
MathIsFun0 Feb 20, 2025
ea2ef7c
Pity Prize nerf
Jevonnissocoolman Feb 20, 2025
becb7b4
Whitespace wipeout
SDM0 Feb 20, 2025
54df2f3
Merge pull request #407 from SDM0/refactor
MathIsFun0 Feb 20, 2025
4385a36
Reimplement Sapling func with disabled epics
Jevonnissocoolman Feb 20, 2025
789f197
stylua: the styluaing
MathIsFun0 Feb 20, 2025
bcc50eb
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 20, 2025
edc05b2
four fingers is canonically loss
MathIsFun0 Feb 20, 2025
26a9f3e
add MTJ cross mod
Dragokillfist Feb 20, 2025
0170b56
Merge pull request #408 from Dragokillfist/refactor
MathIsFun0 Feb 20, 2025
ab6ef64
make stylua workflow actually do something
MathIsFun0 Feb 20, 2025
6547f0c
test stylua workflow
MathIsFun0 Feb 20, 2025
f455df9
ok this should actually work now
MathIsFun0 Feb 20, 2025
c9285ce
m
MathIsFun0 Feb 20, 2025
adf9d34
JollyBot: auto-format Lua files using Stylua
github-actions[bot] Feb 20, 2025
75324ae
m
MathIsFun0 Feb 20, 2025
0961b3b
JollyBot: auto-format Lua files using Stylua
Jolly-Bot Feb 20, 2025
7112298
shoutout to the github user named jolly-bot
MathIsFun0 Feb 20, 2025
1ae0949
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 20, 2025
fd79d9a
jolly-bot: auto-format Lua files using Stylua
Feb 20, 2025
6a60981
missed a tiny thing
Dragokillfist Feb 20, 2025
e823346
Merge branch 'refactor' of https://github.com/Dragokillfist/Cryptid i…
Dragokillfist Feb 20, 2025
cd68059
Fixed Gourmand Tag
SDM0 Feb 20, 2025
e2d8898
Update pull_request.yml
MathIsFun0 Feb 20, 2025
73a8761
Merge pull request #409 from Dragokillfist/refactor
MathIsFun0 Feb 20, 2025
e6e87ca
Merge pull request #410 from SDM0/refactor
MathIsFun0 Feb 20, 2025
655cc8c
jolly-bot: auto-format Lua files using Stylua
Feb 20, 2025
0b7aeda
double sided fix
Dragokillfist Feb 20, 2025
5151b85
double side fix
Dragokillfist Feb 20, 2025
1154ceb
Fix Sprite bleeding due to Loopy
Jevonnissocoolman Feb 20, 2025
fb7dec1
Don't scale The Clock And Lavender Loop if paused
Jevonnissocoolman Feb 20, 2025
49cad87
tarot card fix
Dragokillfist Feb 21, 2025
d46ae37
Merge pull request #411 from Dragokillfist/refactor
MathIsFun0 Feb 21, 2025
f552032
jolly-bot: auto-format Lua files using Stylua
Feb 21, 2025
9cfa43c
Fixed Encoded Deck console log
SDM0 Feb 21, 2025
d210d81
Merge pull request #412 from SDM0/refactor
Jevonnissocoolman Feb 21, 2025
e2a2a66
Add Family friendly mode
Jevonnissocoolman Feb 21, 2025
d681ae0
a
Jevonnissocoolman Feb 21, 2025
4ae9ce9
jolly-bot: auto-format Lua files using Stylua
Feb 21, 2025
6f83c7c
Add back pot of jokes sprite (oops)
Jevonnissocoolman Feb 21, 2025
4405ca2
Summoning Misc
Jevonnissocoolman Feb 21, 2025
c882352
Crash Fix
Jevonnissocoolman Feb 21, 2025
6703e26
test
Jevonnissocoolman Feb 21, 2025
c5db2f9
Make Summoning Check for room
Jevonnissocoolman Feb 21, 2025
fdf15b7
who said we needed to restart?
MathIsFun0 Feb 22, 2025
b84f3b2
jolly-bot: auto-format Lua files using Stylua
Feb 22, 2025
aadf4c4
Galdur compat
MathIsFun0 Feb 22, 2025
3fcc6ab
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 22, 2025
aa4dfd1
jolly-bot: auto-format Lua files using Stylua
Feb 22, 2025
fdc97e6
yawetag
MathIsFun0 Feb 22, 2025
25406c8
Merge branch 'refactor' of https://github.com/MathIsFun0/Cryptid into…
MathIsFun0 Feb 22, 2025
1139ee3
fix unlocks
MathIsFun0 Feb 22, 2025
ab545be
jolly-bot: auto-format Lua files using Stylua
Feb 22, 2025
84aed37
ccd ui update, old bp fix, seraph+universum art
Toneblock Feb 22, 2025
e727bf3
Only allow the use option on ://exploit during hand selection
Retoxified Feb 22, 2025
44b0506
Merge pull request #415 from Retoxified/refactor
MathIsFun0 Feb 22, 2025
668e24a
better exploit fix
Toneblock Feb 22, 2025
3c0f953
m
Toneblock Feb 22, 2025
f297acf
Change edition extra cost
Jevonnissocoolman Feb 22, 2025
6b0f6b3
Fixed Gold Edition
TheRealNova422-real Feb 23, 2025
f6ad1d0
glitch fix
Dragokillfist Feb 23, 2025
375cdf3
proper golden fix
MathIsFun0 Feb 23, 2025
c806682
Merge pull request #416 from TheRealNova422-real/patch-9
MathIsFun0 Feb 23, 2025
2e5a093
jolly-bot: auto-format Lua files using Stylua
Feb 23, 2025
ffcfe34
Merge pull request #417 from Dragokillfist/refactor
MathIsFun0 Feb 23, 2025
5b9ab96
Misc changes
Jevonnissocoolman Feb 23, 2025
665de5e
reset gameset config, experimental mode
MathIsFun0 Feb 23, 2025
4c67dda
jolly-bot: auto-format Lua files using Stylua
Feb 23, 2025
930e540
SUS fix
MathIsFun0 Feb 23, 2025
39d98c0
this dependency should really be updated
MathIsFun0 Feb 23, 2025
9de612e
Merge branch 'main' into refactor
MathIsFun0 Feb 23, 2025
720dfda
fun fact: that merge did absolutely nothing
MathIsFun0 Feb 23, 2025
a9f1fb0
jolly-bot: auto-format Lua files using Stylua
Feb 23, 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
30 changes: 30 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Stylua

on:
push:
branches:
- '*'

jobs:
stylua:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Run stylua
uses: JohnnyMorganz/stylua-action@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
version: latest
args: .

- name: Commit changes
run: |
git config --global user.name "jolly[bot]"
git config --global user.email "jolly[bot]@users.noreply.github.com"
git add .
git diff --cached --quiet || git commit -m "jolly-bot: auto-format Lua files using Stylua"
git push
Loading