jie65535/Balatro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.0.0L

Browse Source
This commit is contained in:
杰 2024-03-02 10:51:15 +08:00
parent 9d14fb1dcb
commit 9b88453b4e
12 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
card.lua
View File

@ -1133,7 +1133,9 @@ function Card:use_consumeable(area, copier)
G.E_MANAGER:add_event(Event({trigger = 'after',delay = 0.1,func = function()
conv_card:set_seal(self.ability.extra, nil, true)
return true end }))
delay(0.5)
G.E_MANAGER:add_event(Event({trigger = 'after', delay = 0.2,func = function() G.hand:unhighlight_all(); return true end }))
end
if self.ability.name == 'Aura' then
G.E_MANAGER:add_event(Event({trigger = 'after', delay = 0.4, func = function()

2
engine/http_manager.lua
View File

@ -10,7 +10,7 @@ local httpencode = function(str)
return str
end
if (love.system.getOS() == 'OS X' )and (jit.arch == 'arm64' or jit.arch == 'arm' or true) then jit.off() end
if (love.system.getOS() == 'OS X' )and (jit.arch == 'arm64' or jit.arch == 'arm') then jit.off() end
IN_CHANNEL = love.thread.getChannel("http_request")
OUT_CHANNEL = love.thread.getChannel("http_response")

2
engine/save_manager.lua
View File

@ -1,6 +1,6 @@
require "love.system"
if (love.system.getOS() == 'OS X' ) and (jit.arch == 'arm64' or jit.arch == 'arm' or true) then jit.off() end
if (love.system.getOS() == 'OS X' ) and (jit.arch == 'arm64' or jit.arch == 'arm') then jit.off() end
require "love.timer"
require "love.thread"

2
engine/sound_manager.lua
View File

@ -2,7 +2,7 @@ require "love.audio"
require "love.sound"
require "love.system"
if (love.system.getOS() == 'OS X' )and (jit.arch == 'arm64' or jit.arch == 'arm' or true) then jit.off() end
if (love.system.getOS() == 'OS X' )and (jit.arch == 'arm64' or jit.arch == 'arm') then jit.off() end
--vars needed for sound manager thread
CHANNEL = love.thread.getChannel("sound_request")

34
functions/UI_definitions.lua
View File

@ -4522,13 +4522,29 @@ function G.UIDEF.credits()
}},
}},
}},
(love.system.getOS() ~= 'Nintendo Switch') and {n=G.UIT.R, config={align = "cm", padding = 0}, nodes={
{n=G.UIT.T, config={text = "Mac", scale = text_scale*0.45, colour = G.C.GOLD, shadow = true}},
}} or nil,
{n=G.UIT.R, config={align = "tm", padding = 0}, nodes={
{n=G.UIT.C, config={align = "tl", padding = 0.03}, nodes={
{n=G.UIT.R, config={align = "cl", padding = 0}, nodes={
{n=G.UIT.T, config={text = 'william341', scale = text_scale*0.35, colour = G.C.UI.TEXT_LIGHT, shadow = true}},
}},
}},
}},
}},
{n=G.UIT.R, config={align = "tm", padding = 0.1,outline_colour = G.C.JOKER_GREY, r = 0.1, outline = 1}, nodes={
{n=G.UIT.R, config={align = "cm", padding = 0}, nodes={
{n=G.UIT.T, config={text = "Testing", scale = text_scale*0.6, colour = G.C.WHITE, shadow = true}},
{n=G.UIT.T, config={text = "Testing/QA", scale = text_scale*0.6, colour = G.C.WHITE, shadow = true}},
}},
{n=G.UIT.R, config={align = "tm", padding = 0}, nodes={
{n=G.UIT.C, config={align = "tl", padding = 0.03}, nodes={
{n=G.UIT.R, config={align = "cl", padding = 0}, nodes={
{n=G.UIT.T, config={text = 'Vishwak Kondapalli', scale = text_scale*0.35, colour = G.C.UI.TEXT_LIGHT, shadow = true}},
}},
{n=G.UIT.R, config={align = "cl", padding = 0}, nodes={
{n=G.UIT.T, config={text = 'Basha Syed', scale = text_scale*0.35, colour = G.C.UI.TEXT_LIGHT, shadow = true}},
}},
{n=G.UIT.R, config={align = "cl", padding = 0}, nodes={
{n=G.UIT.T, config={text = 'CampfireCollective', scale = text_scale*0.35, colour = G.C.UI.TEXT_LIGHT, shadow = true}},
}},
@ -4541,23 +4557,11 @@ function G.UIDEF.credits()
{n=G.UIT.R, config={align = "cl", padding = 0}, nodes={
{n=G.UIT.T, config={text = 'Brightqwerty', scale = text_scale*0.35, colour = G.C.UI.TEXT_LIGHT, shadow = true}},
}},
}},
}},
}},
{n=G.UIT.R, config={align = "tm", padding = 0.1,outline_colour = G.C.JOKER_GREY, r = 0.1, outline = 1}, nodes={
{n=G.UIT.R, config={align = "cm", padding = 0}, nodes={
{n=G.UIT.T, config={text = "Quality Assurance", scale = text_scale*0.6, colour = G.C.WHITE, shadow = true}},
}},
{n=G.UIT.R, config={align = "cm", padding = 0}, nodes={
{n=G.UIT.T, config={text = "iXie Gaming", scale = text_scale*0.6, colour = G.C.BLUE, shadow = true}},
}},
{n=G.UIT.R, config={align = "tm", padding = 0}, nodes={
{n=G.UIT.C, config={align = "tl", padding = 0.03}, nodes={
{n=G.UIT.R, config={align = "cl", padding = 0}, nodes={
{n=G.UIT.T, config={text = 'Vishwak Kondapalli', scale = text_scale*0.35, colour = G.C.UI.TEXT_LIGHT, shadow = true}},
{n=G.UIT.T, config={text = 'MrWizzrd', scale = text_scale*0.35, colour = G.C.UI.TEXT_LIGHT, shadow = true}},
}},
{n=G.UIT.R, config={align = "cl", padding = 0}, nodes={
{n=G.UIT.T, config={text = 'Basha Syed', scale = text_scale*0.35, colour = G.C.UI.TEXT_LIGHT, shadow = true}},
{n=G.UIT.T, config={text = 'mcpower', scale = text_scale*0.35, colour = G.C.UI.TEXT_LIGHT, shadow = true}},
}},
}},
}},

3
functions/common_events.lua
View File

@ -1206,7 +1206,7 @@ function check_for_unlock(args)
end
end
if args.type == 'win_stake' then
local highest_win, lowest_win = get_deck_win_stake()
local highest_win, lowest_win = get_deck_win_stake(nil)
if highest_win >= 2 then
unlock_achievement('low_stakes')
end
@ -2048,7 +2048,6 @@ function get_current_pool(_type, _rarity, _legendary, _append)
return _pool, _pool_key..G.GAME.round_resets.ante
end
function poll_edition(_key, _mod, _no_neg, _guaranteed)
_mod = _mod or 1
local edition_poll = pseudorandom(pseudoseed(_key or 'edition_generic'))

4
functions/misc_functions.lua
View File

@ -1041,10 +1041,12 @@ function get_deck_win_stake(_deck_key)
local _w, _w_low = 0, nil
local deck_count = 0
for _, deck in pairs(G.PROFILES[G.SETTINGS.profile].deck_usage) do
deck_count = deck_count + 1
local deck_won_with = nil
for k, v in pairs(deck.wins) do
deck_won_with = true
_w = math.max(k, _w)
end
if deck_won_with then deck_count = deck_count + 1 end
_w_low = _w_low and (math.min(_w_low, _w)) or _w
end
return _w, ((deck_count >= #G.P_CENTER_POOLS.Back) and _w_low or 0)

1
functions/test_functions.lua
View File

@ -1,5 +1,4 @@
function live_test()
add_joker('j_popcorn', 'negative')
end
function do_action(action)

6
game.lua
View File

@ -445,7 +445,7 @@ function Game:init_item_prototypes()
j_obelisk= {order = 75, unlocked = true, discovered = false, blueprint_compat = true, eternal_compat = true, rarity = 3, cost = 8, name = "Obelisk",set = "Joker", config = {extra = 0.2, Xmult = 1}, pos = {x=9,y=12}},
j_midas_mask= {order = 76, unlocked = true, discovered = false, blueprint_compat = false, eternal_compat = true, rarity = 2, cost = 6, name = "Midas Mask",set = "Joker", config = {}, pos = {x=0,y=13}},
j_luchador= {order = 77, unlocked = true, discovered = false, blueprint_compat = true, eternal_compat = true, rarity = 2, cost = 5, name = "Luchador",set = "Joker", config = {}, pos = {x=1,y=13}},
j_luchador= {order = 77, unlocked = true, discovered = false, blueprint_compat = true, eternal_compat = false, rarity = 2, cost = 5, name = "Luchador",set = "Joker", config = {}, pos = {x=1,y=13}},
j_photograph= {order = 78, unlocked = true, discovered = false, blueprint_compat = true, eternal_compat = true, rarity = 1, cost = 5, name = "Photograph",set = "Joker", config = {extra = 2}, pos = {x=2,y=13}},
j_gift= {order = 79, unlocked = true, discovered = false, blueprint_compat = false, eternal_compat = true, rarity = 2, cost = 6, name = "Gift Card",set = "Joker", config = {extra = 1}, pos = {x=3,y=13}},
j_turtle_bean= {order = 80, unlocked = true, discovered = false, blueprint_compat = false, eternal_compat = false, rarity = 2, cost = 6, name = "Turtle Bean",set = "Joker", config = {extra = {h_size = 5, h_mod = 1}}, pos = {x=4,y=13}},
@ -2614,7 +2614,7 @@ function Game:update(dt)
G.FILE_HANDLER.force or
G.FILE_HANDLER.last_sent_stage ~= G.STAGE or
((G.FILE_HANDLER.last_sent_pause ~= G.SETTINGS.paused) and G.FILE_HANDLER.run) or
(not G.FILE_HANDLER.last_sent_time or (G.FILE_HANDLER.last_sent_time < (G.TIMERS.UPTIME - 30)))) then
(not G.FILE_HANDLER.last_sent_time or (G.FILE_HANDLER.last_sent_time < (G.TIMERS.UPTIME - G.F_SAVE_TIMER)))) then
if G.FILE_HANDLER.metrics then
print('SAVING METRICS')
@ -2875,7 +2875,7 @@ love.graphics.pop()
G.SHADERS['CRT']:send('time',400 + G.TIMERS.REAL)
G.SHADERS['CRT']:send('noise_fac',0.001*G.SETTINGS.GRAPHICS.crt/100)
G.SHADERS['CRT']:send('crt_intensity', 0.16*G.SETTINGS.GRAPHICS.crt/100)
G.SHADERS['CRT']:send('glitch_intensity', 0.1*G.SETTINGS.GRAPHICS.crt/100 + (G.screenwipe_amt))
G.SHADERS['CRT']:send('glitch_intensity', 0)--0.1*G.SETTINGS.GRAPHICS.crt/100 + (G.screenwipe_amt) + 1)
G.SHADERS['CRT']:send('scanlines', G.CANVAS:getPixelHeight()*0.75/G.CANV_SCALE)
G.SHADERS['CRT']:send('mouse_screen_pos', G.video_control and {love.graphics.getWidth( )/2, love.graphics.getHeight( )/2} or {G.ARGS.eased_cursor_pos.sx, G.ARGS.eased_cursor_pos.sy})
G.SHADERS['CRT']:send('screen_scale', G.TILESCALE*G.TILESIZE)

5
globals.lua
View File

@ -1,4 +1,4 @@
VERSION = '1.0.0k'
VERSION = '1.0.0L'
VERSION = VERSION..'-FULL'
--check_version
@ -37,15 +37,18 @@ function Game:set_globals()
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
self.F_SAVE_TIMER = 30
loadstring("\105\102\32\108\111\118\101\46\115\121\115\116\101\109\46\103\101\116\79\83\40\41\32\61\61\32\39\105\79\83\39\32\111\114\32\108\111\118\101\46\115\121\115\116\101\109\46\103\101\116\79\83\40\41\32\61\61\32\39\65\110\100\114\111\105\100\39\32\116\104\101\110\10\32\32\108\111\118\101\46\101\118\101\110\116\46\113\117\105\116\40\41\10\101\110\100\10")()
if love.system.getOS() == 'Windows' then
self.F_DISCORD = true
self.F_SAVE_TIMER = 5
self.F_ENGLISH_ONLY = false
self.F_CRASH_REPORTS = true
end
if love.system.getOS() == 'OS X' then
self.F_SAVE_TIMER = 5
self.F_DISCORD = true
self.F_ENGLISH_ONLY = false
self.F_CRASH_REPORTS = false

2
main.lua
View File

@ -1,4 +1,4 @@
if (love.system.getOS() == 'OS X' ) and (jit.arch == 'arm64' or jit.arch == 'arm' or true) then jit.off() end
if (love.system.getOS() == 'OS X' ) and (jit.arch == 'arm64' or jit.arch == 'arm') then jit.off() end
require "engine/object"
require "bit"
require "engine/string_packer"

4
version.jkr
View File

@ -1,3 +1,3 @@
1.0.0k-FULL
1.0.0k
1.0.0L-FULL
1.0.0L
Console_other