Last active
November 20, 2025 14:55
-
-
Save Pobega/9a276203bf8b17993f4efea7cba1d455 to your computer and use it in GitHub Desktop.
Balatro diff for TrimUI Brick / NextUI
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
| diff --git a/cardarea.lua b/cardarea.lua | |
| index 6507fe0..61d6ddc 100644 | |
| --- a/cardarea.lua | |
| +++ b/cardarea.lua | |
| @@ -229,7 +229,7 @@ end | |
| function CardArea:move(dt) | |
| --Set sliding up/down for the hand area | |
| if self == G.hand then | |
| - local desired_y = G.TILE_H - G.hand.T.h - 1.9*((not G.deck_preview and (G.STATE == G.STATES.SELECTING_HAND or G.STATE == G.STATES.DRAW_TO_HAND)) and 1 or 0) | |
| + local desired_y = G.TILE_H - G.hand.T.h - 1.9*((not G.deck_preview and (G.STATE == G.STATES.SELECTING_HAND or G.STATE == G.STATES.DRAW_TO_HAND)) and 1 or 0) + 2 -- Bring hand area down to the bottom of the screen | |
| G.hand.T.y = 15*G.real_dt*desired_y + (1-15*G.real_dt)*G.hand.T.y | |
| if math.abs(desired_y - G.hand.T.y) < 0.01 then G.hand.T.y = desired_y end | |
| if G.STATE == G.STATES.TUTORIAL then | |
| diff --git a/functions/common_events.lua b/functions/common_events.lua | |
| index daf4539..f4960d9 100644 | |
| --- a/functions/common_events.lua | |
| +++ b/functions/common_events.lua | |
| @@ -1,19 +1,20 @@ | |
| function set_screen_positions() | |
| if G.STAGE == G.STAGES.RUN then | |
| G.hand.T.x = G.TILE_W - G.hand.T.w - 2.85 | |
| + -- Should pull hand down, but doesn't? | |
| G.hand.T.y = G.TILE_H - G.hand.T.h | |
| G.play.T.x = G.hand.T.x + (G.hand.T.w - G.play.T.w)/2 | |
| - G.play.T.y = G.hand.T.y - 3.6 | |
| + G.play.T.y = G.hand.T.y - 4.6 -- Pushes play area up from hand | |
| G.jokers.T.x = G.hand.T.x - 0.1 | |
| - G.jokers.T.y = 0 | |
| + G.jokers.T.y = -2 -- Pushes jokers up | |
| - G.consumeables.T.x = G.jokers.T.x + G.jokers.T.w + 0.2 | |
| - G.consumeables.T.y = 0 | |
| + G.consumeables.T.x = G.jokers.T.x + G.jokers.T.w + 0.3 -- Pushes consumables right | |
| + G.consumeables.T.y = -2 -- Pushes consumables up | |
| - G.deck.T.x = G.TILE_W - G.deck.T.w - 0.5 | |
| - G.deck.T.y = G.TILE_H - G.deck.T.h | |
| + G.deck.T.x = G.TILE_W - G.deck.T.w - 0.6 -- Pushes deck right | |
| + G.deck.T.y = G.TILE_H - G.deck.T.h + 2 -- Pulls deck down | |
| G.discard.T.x = G.jokers.T.x + G.jokers.T.w/2 + 0.3 + 15 | |
| G.discard.T.y = 4.2 | |
| diff --git a/game.lua b/game.lua | |
| index 3d40695..07cf595 100644 | |
| --- a/game.lua | |
| +++ b/game.lua | |
| @@ -966,15 +966,15 @@ function Game:set_language() | |
| --load the font and set filter | |
| self.FONTS = { | |
| - {file = "resources/fonts/m6x11plus.ttf", render_scale = self.TILESIZE*10, TEXT_HEIGHT_SCALE = 0.83, TEXT_OFFSET = {x=10,y=-20}, FONTSCALE = 0.1, squish = 1, DESCSCALE = 1}, | |
| - {file = "resources/fonts/NotoSansSC-Bold.ttf", render_scale = self.TILESIZE*7, TEXT_HEIGHT_SCALE = 0.7, TEXT_OFFSET = {x=0,y=-35}, FONTSCALE = 0.12, squish = 1, DESCSCALE = 1.1}, | |
| - {file = "resources/fonts/NotoSansTC-Bold.ttf", render_scale = self.TILESIZE*7, TEXT_HEIGHT_SCALE = 0.7, TEXT_OFFSET = {x=0,y=-35}, FONTSCALE = 0.12, squish = 1, DESCSCALE = 1.1}, | |
| - {file = "resources/fonts/NotoSansKR-Bold.ttf", render_scale = self.TILESIZE*7, TEXT_HEIGHT_SCALE = 0.8, TEXT_OFFSET = {x=0,y=-20}, FONTSCALE = 0.12, squish = 1, DESCSCALE = 1}, | |
| - {file = "resources/fonts/NotoSansJP-Bold.ttf", render_scale = self.TILESIZE*7, TEXT_HEIGHT_SCALE = 0.8, TEXT_OFFSET = {x=0,y=-20}, FONTSCALE = 0.12, squish = 1, DESCSCALE = 1}, | |
| - {file = "resources/fonts/NotoSans-Bold.ttf", render_scale = self.TILESIZE*7, TEXT_HEIGHT_SCALE = 0.65, TEXT_OFFSET = {x=0,y=-40}, FONTSCALE = 0.12, squish = 1, DESCSCALE = 1}, | |
| - {file = "resources/fonts/m6x11plus.ttf", render_scale = self.TILESIZE*10, TEXT_HEIGHT_SCALE = 0.9, TEXT_OFFSET = {x=10,y=15}, FONTSCALE = 0.1, squish = 1, DESCSCALE = 1}, | |
| - {file = "resources/fonts/GoNotoCurrent-Bold.ttf", render_scale = self.TILESIZE*10, TEXT_HEIGHT_SCALE = 0.8, TEXT_OFFSET = {x=10,y=-20}, FONTSCALE = 0.1, squish = 1, DESCSCALE = 1}, | |
| - {file = "resources/fonts/GoNotoCJKCore.ttf", render_scale = self.TILESIZE*10, TEXT_HEIGHT_SCALE = 0.8, TEXT_OFFSET = {x=10,y=-20}, FONTSCALE = 0.1, squish = 1, DESCSCALE = 1}, | |
| + {file = "resources/fonts/m6x11plus.ttf", render_scale = self.TILESIZE*10, TEXT_HEIGHT_SCALE = 0.83, TEXT_OFFSET = {x=10,y=-20}, FONTSCALE = 0.15, squish = 1, DESCSCALE = 1}, | |
| + {file = "resources/fonts/NotoSansSC-Bold.ttf", render_scale = self.TILESIZE*7, TEXT_HEIGHT_SCALE = 0.7, TEXT_OFFSET = {x=0,y=-35}, FONTSCALE = 0.16, squish = 1, DESCSCALE = 1.1}, | |
| + {file = "resources/fonts/NotoSansTC-Bold.ttf", render_scale = self.TILESIZE*7, TEXT_HEIGHT_SCALE = 0.7, TEXT_OFFSET = {x=0,y=-35}, FONTSCALE = 0.16, squish = 1, DESCSCALE = 1.1}, | |
| + {file = "resources/fonts/NotoSansKR-Bold.ttf", render_scale = self.TILESIZE*7, TEXT_HEIGHT_SCALE = 0.8, TEXT_OFFSET = {x=0,y=-20}, FONTSCALE = 0.16, squish = 1, DESCSCALE = 1}, | |
| + {file = "resources/fonts/NotoSansJP-Bold.ttf", render_scale = self.TILESIZE*7, TEXT_HEIGHT_SCALE = 0.8, TEXT_OFFSET = {x=0,y=-20}, FONTSCALE = 0.16, squish = 1, DESCSCALE = 1}, | |
| + {file = "resources/fonts/NotoSans-Bold.ttf", render_scale = self.TILESIZE*7, TEXT_HEIGHT_SCALE = 0.65, TEXT_OFFSET = {x=0,y=-40}, FONTSCALE = 0.16, squish = 1, DESCSCALE = 1}, | |
| + {file = "resources/fonts/m6x11plus.ttf", render_scale = self.TILESIZE*10, TEXT_HEIGHT_SCALE = 0.9, TEXT_OFFSET = {x=10,y=15}, FONTSCALE = 0.15, squish = 1, DESCSCALE = 1}, | |
| + {file = "resources/fonts/GoNotoCurrent-Bold.ttf", render_scale = self.TILESIZE*10, TEXT_HEIGHT_SCALE = 0.8, TEXT_OFFSET = {x=10,y=-20}, FONTSCALE = 0.15, squish = 1, DESCSCALE = 1}, | |
| + {file = "resources/fonts/GoNotoCJKCore.ttf", render_scale = self.TILESIZE*10, TEXT_HEIGHT_SCALE = 0.8, TEXT_OFFSET = {x=10,y=-20}, FONTSCALE = 0.15, squish = 1, DESCSCALE = 1}, | |
| } | |
| for _, v in ipairs(self.FONTS) do | |
| if love.filesystem.getInfo(v.file) then | |
| diff --git a/globals.lua b/globals.lua | |
| index 47cf6ae..a301323 100644 | |
| --- a/globals.lua | |
| +++ b/globals.lua | |
| @@ -26,14 +26,14 @@ function Game:set_globals() | |
| self.F_CRASH_REPORTS = false --Send Crash reports over the internet | |
| self.F_NO_ERROR_HAND = false --Hard crash without error message screen | |
| self.F_SWAP_AB_PIPS = false --Swapping button pips for A and B buttons (mainly for switch) | |
| - self.F_SWAP_AB_BUTTONS = false --Swapping button function for A and B buttons (mainly for switch) | |
| - self.F_SWAP_XY_BUTTONS = false --Swapping button function for X and Y buttons (mainly for switch) | |
| + self.F_SWAP_AB_BUTTONS = true --Swapping button function for A and B buttons (mainly for switch) | |
| + self.F_SWAP_XY_BUTTONS = true --Swapping button function for X and Y buttons (mainly for switch) | |
| self.F_NO_ACHIEVEMENTS = false --Disable achievements | |
| self.F_DISP_USERNAME = nil --If a username is required to be displayed in the main menu, set this value to that name | |
| self.F_ENGLISH_ONLY = nil --Disable language selection - only in english | |
| self.F_GUIDE = false --Replace back/select button with 'guide' button | |
| self.F_JAN_CTA = false --Call to action for Jan demo | |
| - self.F_HIDE_BG = false --Hiding the game objects when paused | |
| + self.F_HIDE_BG = true --Hiding the game objects when paused | |
| self.F_TROPHIES = false --use 'trophy' terminology instead of 'achievemnt' | |
| self.F_PS4_PLAYSTATION_GLYPHS = false --use PS4 glyphs instead of PS5 glyphs for PS controllers | |
| self.F_LOCAL_CLIPBOARD = false | |
| @@ -188,9 +188,9 @@ function Game:set_globals() | |
| }, | |
| GRAPHICS = { | |
| texture_scaling = 2, | |
| - shadows = 'On', | |
| - crt = 70, | |
| - bloom = 1 | |
| + shadows = 'Off', | |
| + crt = 0, | |
| + bloom = 0 | |
| }, | |
| } | |
| @@ -266,15 +266,15 @@ function Game:set_globals() | |
| --|||||||||||||||||||||||||||||| | |
| -- RENDER SCALE | |
| --|||||||||||||||||||||||||||||| | |
| - self.TILESIZE = 20 | |
| - self.TILESCALE = 3.65 | |
| - self.TILE_W = 20 | |
| + self.TILESIZE = 40 | |
| + self.TILESCALE = 4.65 | |
| + self.TILE_W = 21 | |
| self.TILE_H = 11.5 | |
| self.DRAW_HASH_BUFF = 2 | |
| - self.CARD_W = 2.4*35/41 | |
| - self.CARD_H = 2.4*47/41 | |
| + self.CARD_W = 2.5*35/41 | |
| + self.CARD_H = 2.5*47/41 | |
| self.HIGHLIGHT_H = 0.2*self.CARD_H | |
| - self.COLLISION_BUFFER = 0.05 | |
| + self.COLLISION_BUFFER = 0.03 | |
| self.PITCH_MOD = 1 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment