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

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}},
}},
}},
}},

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'))

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)

View File

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