diff --git a/lovely.toml b/lovely.toml index dfdf112..7e8b3d3 100644 --- a/lovely.toml +++ b/lovely.toml @@ -20,6 +20,42 @@ payload = """k_walledgarden = "Walled Garden", k_walledgarden_description = "Personal ruleset for modded Balatro.",""" match_indent = true +[[patches]] +[patches.pattern] +target = '=[SMODS Multiplayer "networking/action_handlers.lua"]' +pattern = "local parsedAction = json.decode(msg)" +position = "at" +payload = """local garden, parsedAction = pcall(function() + return json.decode(msg) +end) + +if not garden or type(parsedAction) ~= "table" then + return sendErrorMessage( + "# **DESYNC MAY HAVE OCCURED!!!** | We don't know how to parse this! " .. + tostring(garden) .. + ": " .. + tostring(parsedAction), "MULTIPLAYER" + ) +end +""" +match_indent = true + +[[patches]] +[patches.pattern] +target = '=[SMODS Multiplayer "networking/action_handlers.lua"]' +pattern = "MP.GAME.end_pvp = true" +position = "before" +payload = """(function() + return MP.LOBBY.config.ruleset == "ruleset_mp_walledgarden" and + ease_dollars( + MP.LOBBY.deck.back == "Green Deck" and + G.GAME.round_resets.hands * 2 + G.GAME.round_resets.discards or + G.GAME.round_resets.hands + ) +end)() +""" +match_indent = true + [[patches]] [patches.copy] target = '=[SMODS Multiplayer "rulesets/experimental/experimental.lua"]' @@ -39,6 +75,8 @@ payload = """sendInfoMessage("Attempting to register the Walled Garden ruleset.. "m_Bakery_TimeWalk", }, consumables = { + -- Banned in favor of `c_mp_ouija_standard`. + "c_ouija", -- Allows you to duplicate your strongest joker, -- potentially even multiple times, for one hand. -- Skipping on a Scribe almost guarantees a lost life. @@ -47,6 +85,8 @@ payload = """sendInfoMessage("Attempting to register the Walled Garden ruleset.. "c_bongcloud_the_knight", -- Immediately converges gameplay to Flush Five. "c_Roland_void", + -- Why add more variance on something that's already volatile? + "c_mp_ectoplasm_standard", -- Almost always better than any other planet card. "c_mp_asteroid", }, @@ -111,39 +151,3 @@ payload = """sendInfoMessage("Attempting to register the Walled Garden ruleset.. end)() """ match_indent = true - -[[patches]] -[patches.pattern] -target = '=[SMODS Multiplayer "networking/action_handlers.lua"]' -pattern = "local parsedAction = json.decode(msg)" -position = "at" -payload = """local garden, parsedAction = pcall(function() - return json.decode(msg) -end) - -if not garden or type(parsedAction) ~= "table" then - return sendErrorMessage( - "# **DESYNC MAY HAVE OCCURED!!!** | We don't know how to parse this! " .. - tostring(garden) .. - ": " .. - tostring(parsedAction), "MULTIPLAYER" - ) -end -""" -match_indent = true - -[[patches]] -[patches.pattern] -target = '=[SMODS Multiplayer "networking/action_handlers.lua"]' -pattern = "MP.GAME.end_pvp = true" -position = "before" -payload = """(function() - return MP.LOBBY.config.ruleset == "ruleset_mp_walledgarden" and - ease_dollars( - MP.LOBBY.deck.back == "Green Deck" and - G.GAME.round_resets.hands * 2 + G.GAME.round_resets.discards or - G.GAME.round_resets.hands - ) -end)() -""" -match_indent = true diff --git a/manifest.json b/manifest.json index 8bfe8cc..d9414ad 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "priority": 10000001, - "version": "1.0.11", + "version": "1.0.12", "id": "WalledGarden", "name": "WalledGarden", "icon_path": "icon.png",