Skip to content

feat: remove the mod's hard dependency on smods #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kasimeka wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: remove the mod's hard dependency on smods #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Please let me know of mods that add consumable cards that may need additional su

# Installation

0. This mod is made for [**Steammodded 1.x**](https://github.com/Steamodded/smods) and [lovely](https://github.com/ethangreen-dev/lovely-injector) so you will need to install them first [as explained here](https://github.com/Steamodded/smods/wiki). **Disclaimer:** You will want to use the newest [tagged release of Steammodded](https://github.com/Steamodded/smods/releases) as the version on `main` might be broken/unstable.
0. This mod is made for [lovely](https://github.com/ethangreen-dev/lovely-injector) so you will need to install it first [as explained here](https://github.com/Steamodded/smods/wiki). It has optional support for [**Steamodded 1.x**](https://github.com/Steamodded/smods) and you will want to use the newest [tagged release of Steamodded](https://github.com/Steamodded/smods/releases) as the version on `main` might be broken/unstable.
1. Download the newest version of the mod from the [Releases tab](https://github.com/eramdam/balatro-mods/releases)
2. Extract the .zip file and move the `sticky-fingers` folder into your Mods file
3. Launch Balatro and enable the mod in the `Mods` panel
Expand Down
6 changes: 3 additions & 3 deletions lovely/misc_functions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function create_drag_target_from_card(_card)
P_switch = Moveable { T = { x = G.deck.T.x + 0.2, y = G.deck.T.y - 5.1, w = G.deck.T.w - 0.1, h = 4.5 } },
}

if DTM.config.vanilla_joker_sell == false then
if DTM and DTM.config.vanilla_joker_sell == false then
G.DRAG_TARGETS.J_sell = Moveable { T = { x = G.deck.T.x + 0.2, y = G.deck.T.y - 5.1, w = G.deck.T.w - 0.1, h = 4.5 } }
else
G.DRAG_TARGETS.J_sell = G.DRAG_TARGETS.J_sell_vanilla
Expand Down Expand Up @@ -91,7 +91,7 @@ function create_drag_target_from_card(_card)

-- is the card in a pack?
if _card.area == G.pack_cards then
local is_consumeable_card_in_crazy_reverie_pack = Reverie and SMODS.OPENED_BOOSTER.label == 'Pack' and
local is_consumeable_card_in_crazy_reverie_pack = Reverie and SMODS and SMODS.OPENED_BOOSTER.label == 'Pack' and
_card.ability.consumeable and _card.area == G.pack_cards

-- is the card a consumeable?
Expand All @@ -116,7 +116,7 @@ function create_drag_target_from_card(_card)

local needs_areas = true
-- Pokermon has a "Super Rod" voucher that lets the player save any consumeable from packs and not just Energy/Item cards.
local pokermon_has_save_all = G.GAME.poke_save_all and not SMODS.OPENED_BOOSTER.label:find("Wish")
local pokermon_has_save_all = SMODS and G.GAME.poke_save_all and not SMODS.OPENED_BOOSTER.label:find("Wish")

-- Cryptid's "Code" cards inside packs.
if Cryptid and _card.ability.consumeable and _card.ability.set == 'Code' then
Expand Down
3 changes: 2 additions & 1 deletion main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
if not SMODS then return end

if SMODS.Atlas then
SMODS.Atlas({
key = "modicon",
Expand All @@ -7,7 +9,6 @@ if SMODS.Atlas then
})
end


DTM = SMODS.current_mod

DTM.save_config = function(self)
Expand Down