Skip to content

Commit e2d2b41

Browse files
committed
uPDAte
- 3 New Blinds! Kingdom Hearts: Played cards are reshuffled into the deck The Crown: Played hand must contain a face card The Keyhole: -1 hand size every hand played - Joker Rework: Meeska Mooska: Played face cards become Kings when played - New Challenges: Balatro: Final Mix - Only Final Mix Jokers can appear Bunch of Bugfixes and code refactoring
1 parent 96612a8 commit e2d2b41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1178
-1372
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/.tmp.driveupload
2+
/.vscode

FinalMix.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"priority": 0,
99
"display_name": "Final Mix",
1010
"badge_text_colour": "ffffff",
11-
"version": "1.1.3",
11+
"version": "1.1.4",
1212
"dependencies": [
13-
"Steamodded (>=1.0.0~BETA-1016c)"
13+
"Steamodded (>=1.0.0~BETA-1221a)"
1414
]
1515
}

FinalMix.lua

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
KH = SMODS.current_mod
2+
XIII = XIII or {}
23

34
SMODS.Gradient {
45
key = "badge",
@@ -19,6 +20,10 @@ KH.description_loc_vars = function()
1920
return { background_colour = G.C.CLEAR, text_colour = G.C.WHITE, scale = 1.2, shadow = true }
2021
end
2122

23+
KH.save_config = function(self)
24+
SMODS.save_mod_config(self)
25+
end
26+
2227
SMODS.DynaTextEffect {
2328
key = "pulse",
2429
func = function(dynatext, index, letter)
@@ -34,6 +39,7 @@ to_number = to_number or function(x) return x end
3439

3540
SMODS.current_mod.optional_features = {
3641
post_trigger = true,
42+
retrigger_joker = true
3743
}
3844

3945
-- Utility Functions
@@ -47,40 +53,25 @@ if Blockbuster then
4753
SMODS.load_file("content/crossmod/value_manipulation.lua")()
4854
end
4955

50-
--#region mod config options
51-
KH.save_config = function(self)
52-
SMODS.save_mod_config(self)
53-
end
54-
55-
if KH.config.enable_jokers then
56-
local subdir = "content/cards"
57-
local cards = NFS.getDirectoryItems(SMODS.current_mod.path .. subdir)
58-
for _, filename in pairs(cards) do
59-
assert(SMODS.load_file(subdir .. "/" .. filename))()
60-
end
61-
SMODS.load_file("content/misc/challenges.lua")() -- Only loads Challenges if Jokers are enabled
62-
end
63-
64-
if KH.config.enable_tarots then
65-
SMODS.load_file("content/consumables/tarots.lua")()
66-
end
67-
68-
if KH.config.enable_spectrals then
69-
SMODS.load_file("content/consumables/spectrals.lua")()
56+
-- Jokers
57+
local subdir = "content/cards"
58+
local cards = NFS.getDirectoryItems(SMODS.current_mod.path .. subdir)
59+
for _, filename in pairs(cards) do
60+
assert(SMODS.load_file(subdir .. "/" .. filename))()
7061
end
7162

72-
if KH.config.enable_seal then
73-
SMODS.load_file("content/misc/seal.lua")()
63+
-- Misc
64+
local cards = NFS.getDirectoryItems(SMODS.current_mod.path .. "content/misc")
65+
for _, filename in pairs(cards) do
66+
assert(SMODS.load_file("content/misc/" .. filename))()
7467
end
7568

76-
if KH.config.enable_blind then
77-
SMODS.load_file("content/misc/blinds.lua")()
78-
end
69+
-- Consumables
70+
SMODS.load_file("content/consumables/tarots.lua")()
71+
SMODS.load_file("content/consumables/spectrals.lua")()
7972

80-
if KH.config.enable_vouchers then
81-
SMODS.load_file("content/misc/vouchers.lua")()
82-
end
83-
--#endregion
73+
-- Friends of Jimbo
74+
SMODS.load_file("content/collabs/kingdomheartsxbalatro.lua")()
8475

8576
-- Joker Display Support!
8677
if JokerDisplay then
@@ -97,12 +88,9 @@ if CardSleeves then
9788
SMODS.load_file("content/crossmod/cardsleeves.lua")()
9889
end
9990

100-
101-
SMODS.load_file("content/collabs/kingdomheartsxbalatro.lua")()
102-
SMODS.load_file("content/misc/jimboquips.lua")()
103-
SMODS.load_file("content/misc/decks.lua")()
104-
105-
if KH.config.enable_drive then
106-
SMODS.load_file("content/consumables/drive_cards.lua")()
107-
SMODS.load_file("content/misc/boosters.lua")()
91+
--[[ WIP
92+
if BLINDSIDE then
93+
SMODS.load_file("content/crossmod/blindside_blinds.lua")()
94+
SMODS.load_file("content/crossmod/blindside_jokers.lua")()
10895
end
96+
--]]

assets/1x/COMRanks.png

-4.18 KB
Binary file not shown.

assets/1x/DriveCards.png

-19.4 KB
Binary file not shown.

assets/1x/KHBoosters.png

-4 KB
Binary file not shown.

assets/1x/KHJokers.png

-11 Bytes
Loading

assets/1x/Spells.png

-8.48 KB
Binary file not shown.

assets/1x/blinds.png

6.71 KB
Loading

assets/1x/blindside.png

2.73 KB
Loading

0 commit comments

Comments
 (0)