From 0302b32f3633dc58d75cda0a00b2d39a2ed7269c Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Sun, 28 Jun 2026 16:00:11 +0100 Subject: [PATCH] fix: spacing on sabotage Fix https://github.com/mtgred/netrunner/issues/8763 --- src/clj/game/core/sabotage.clj | 10 +++++----- test/clj/game/core/sabotage_test.clj | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/clj/game/core/sabotage.clj b/src/clj/game/core/sabotage.clj index 1f0450028a..46d7e7b97a 100644 --- a/src/clj/game/core/sabotage.clj +++ b/src/clj/game/core/sabotage.clj @@ -25,9 +25,9 @@ (let [unknown-str (str (quantify (count unknown) (if (seq known) "unknown card" "card")) (when public (str " (" (enumerate-cards unknown)")")))] (if (seq known) - (str " " (enumerate-str (concat (map :title known) - (when (seq unknown) - [unknown-str]))) + (str (enumerate-str (concat (map :title known) + (when (seq unknown) + [unknown-str]))) " from " from) (str unknown-str " from " from)))) @@ -44,11 +44,11 @@ known-rd-cards (filter #(contains? (set (get-in @state [:breach :known-cids :deck] [])) (:cid %)) to-trash) unknown-hq-cards (filter #(not (contains? (set (get-in @state [:breach :known-cids :hand] [])) (:cid %))) targets) unknown-rd-cards (filter #(not (contains? (set (get-in @state [:breach :known-cids :deck] [])) (:cid %))) rnd-to-trash) - public-msg (str "trashes" + public-msg (str "trashes " (when (pos? selected-hq) (cards-str known-hq-cards unknown-hq-cards "HQ" nil)) (when (and (pos? selected-hq) (pos? selected-rd)) " and ") (when (pos? selected-rd) (cards-str known-rd-cards unknown-rd-cards "the top of R&D" nil))) - private-msg (str "trashes" + private-msg (str "trashes " (when (pos? selected-hq) (cards-str known-hq-cards unknown-hq-cards "hq" true)) (when (and (pos? selected-hq) (pos? selected-rd)) " and ") (when (pos? selected-rd) (cards-str known-rd-cards unknown-rd-cards "the top of R&D" true)))] diff --git a/test/clj/game/core/sabotage_test.clj b/test/clj/game/core/sabotage_test.clj index 2a0d30363c..980fa3041d 100644 --- a/test/clj/game/core/sabotage_test.clj +++ b/test/clj/game/core/sabotage_test.clj @@ -28,7 +28,8 @@ "3 cards from HQ trashed")) (is (no-prompt? state :corp) "No Corp prompt open") (is (no-prompt? state :runner) "No Runner prompt open") - (is (= 3 (count (:discard (get-corp)))) "Archives has 3 cards"))) + (is (= 3 (count (:discard (get-corp)))) "Archives has 3 cards") + (is (last-log-contains? state "trashes 3 cards from HQ") "Has a space before the card count"))) (testing "Choosing only from R&D" (do-game (new-game {:corp {:deck [(qty "Hedge Fund" 15)]}}) @@ -68,7 +69,9 @@ "2 cards from HQ trashed")) (is (no-prompt? state :corp) "No Corp prompt open") (is (no-prompt? state :runner) "No Runner prompt open") - (is (= 3 (count (:discard (get-corp)))) "Archives has 3 cards"))) + (is (= 3 (count (:discard (get-corp)))) "Archives has 3 cards") + (is (last-log-contains? state "trashes 2 cards from HQ and 1 card from the top of R&D") + "Has spaces before the HQ and R&D segments"))) (testing "Forced to trash some cards from HQ" (do-game (new-game {:corp {:deck [(qty "Hedge Fund" 7)]}})