feat: add 11 new jokers with upstream j_cerber merged#7
Open
VX1D wants to merge 13 commits into1srscx4:mainfrom
Open
feat: add 11 new jokers with upstream j_cerber merged#7VX1D wants to merge 13 commits into1srscx4:mainfrom
VX1D wants to merge 13 commits into1srscx4:mainfrom
Conversation
Bug fixes: 1. Frog Hat (content/objects/jokers.lua line 358-360): - Fixed seal propagation not rendering visually - Changed: set_seal(seal) -> set_seal(seal, nil, true) - The nil, true params trigger immediate visual update 2. Glorp deck (content/objects/decks.lua lines 77-90): - Added Cerber joker integration - When Glorp deck creates cards, checks if j_cerber exists - If Cerber is present and card is rank 2, applies Negative edition - Uses inline check (no dependency on utility modules) Testing: - Verify Frog Hat seal propagation shows visually - Verify 2s from Glorp deck become Negative with Cerber active
VX1D
force-pushed
the
feat/new-jokers
branch
2 times, most recently
from
7e3e1d4 to
82b4471
Compare
Add nil-safe context and pool checks across jokers, enhancements, suit, blind, and editions to reduce runtime crashes from missing game state tables. Keep probability and scoring-hand operations bounded and defensive without changing intended gameplay flow. (cherry picked from commit 69496b56b9881daaa3d1cf4aca3ffb13b8f4770c)
Replace strict assert with soft warning for Lovely patch detection to prevent crash when Lovely isn't properly loaded. (cherry picked from commit 4b8c04f3add1479a5102963a9ebb7e79fdaacd93)
Add safety guards to: - hooks.lua: jokers.cards iteration in open_booster - tags.lua: G.CONTROLLER.locks access in both tag apply functions - modules/hooks/general.lua: jokers.cards check in draw_card hook Prevents crashes when game areas are not yet initialized. (cherry picked from commit 9128a9defb8faa6ce8c49854c539f3c1f3d5defb)
Fix j_vedalsdrink2 description typo (remove extra 'equal' word) Remove 9 commented-out sendDebugMessage calls from handtype.lua (cherry picked from commit 176638e0decd79f4744858c64404a9585f0ee89e)
… palette system; add neuro_popup_def; comment out angel_neuro
# Conflicts: # content/load/atlas.lua # content/objects/jokers.lua
VX1D
force-pushed
the
feat/new-jokers
branch
3 times, most recently
from
82b4471 to
b87968c
Compare
Paulamarina moves from rarity 3 to the dev rarity so it shows the correct badge. Tomaniacs desc now mentions that it upgrades Toma.
The neuroCustomJokers2 sheet has 6 driving frames on row 1. Registering it as an ANIMATION_ATLAS lets Balatro cycle through them instead of showing a static slice.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
New jokers added:
Merged j_cerber from upstream (Adesi):
Also includes: