From 46107b7d723c4cd3050c20679fecf7e65ca4b5ba Mon Sep 17 00:00:00 2001
From: Emik <emik.cuber@gmail.com>
Date: Thu, 11 Jun 2026 13:24:23 +0200
Subject: [PATCH] Ban 2 jokers, rework how money is handed out

---
 lovely.toml   | 25 +++++++++++++++++--------
 manifest.json |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lovely.toml b/lovely.toml
index dafa40f..66ac618 100644
--- a/lovely.toml
+++ b/lovely.toml
@@ -24,8 +24,7 @@ match_indent = true
 [patches.copy]
 target = '=[SMODS Multiplayer "rulesets/experimental/experimental.lua"]'
 position = "prepend"
-payload = """
-sendInfoMessage("Attempting to register the Walled Garden ruleset...", "WalledGarden");
+payload = """sendInfoMessage("Attempting to register the Walled Garden ruleset...", "WalledGarden");
 
 (function()
     local banned = {
@@ -52,6 +51,8 @@ sendInfoMessage("Attempting to register the Walled Garden ruleset...", "WalledGa
             "c_mp_asteroid",
         },
         jokers = {
+            -- See `j_mr_bones`
+            "j_Bakery_Wearywolf",
             -- See below.
             "j_Roland_idle",
             -- Banned because of the existence of `j_Roland_idle` and `j_Bakery_Wherewolf`.
@@ -63,6 +64,10 @@ sendInfoMessage("Attempting to register the Walled Garden ruleset...", "WalledGa
             "j_chicot",
             -- See `j_chicot`.
             "j_luchador",
+            -- The first ante is the only time this would trigger.
+		    "j_matador",
+            -- Preventing Death doesn't do anything in PvP blinds.
+            "j_mr_bones",
             -- Trivializes Spacious deck because it gives a free Joker slot and is a Common.
             "j_ExtraCredit_forklift",
             -- Cards do not get debuffed in PvP blinds.
@@ -105,7 +110,7 @@ match_indent = true
 [[patches]]
 [patches.pattern]
 target = '=[SMODS Multiplayer "networking/action_handlers.lua"]'
-pattern = 'local parsedAction = json.decode(msg)'
+pattern = "local parsedAction = json.decode(msg)"
 position = "at"
 payload = """local garden, parsedAction = pcall(function()
     return json.decode(msg)
@@ -125,11 +130,15 @@ match_indent = true
 [[patches]]
 [patches.pattern]
 target = '=[SMODS Multiplayer "networking/action_handlers.lua"]'
-pattern = 'MP.GAME.end_pvp = true'
+pattern = "MP.GAME.end_pvp = true"
 position = "before"
-payload = """G.GAME.current_round.hands_left =
-    MP.LOBBY.config.ruleset == 'ruleset_mp_walledgarden' and
-    G.GAME.round_resets.hands - 1 or
-    G.GAME.current_round.hands_left
+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 d4975aa..038b315 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "priority": 10000001,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "id": "WalledGarden",
     "name": "WalledGarden",
     "icon_path": "icon.png",