Merge pull request #8502 from NBKelly/trashing-logs

Trashing logs

Author: NoahTheDuke

src/clj/game/core/actions.clj

@@ -217,6 +217,11 @@
           ;; default
           nil)))))
 
+(defn trash-button
+  [state side eid card]
+  (system-msg state side (str "trashes " (card-str state card)))
+  (trash state side eid card {:unpreventable true}))
+
 (defn- finish-prompt [state side prompt card]
   (when-let [end-effect (:end-effect prompt)]
     (end-effect state side (make-eid state) card nil))

src/clj/game/core/process_actions.clj

@@ -6,7 +6,7 @@
                               generate-runnable-zones move-card expend-ability
                               play play-ability play-corp-ability
                               play-dynamic-ability play-runner-ability play-subroutine play-unbroken-subroutines remove-tag
-                              resolve-prompt score select trash-resource view-deck]]
+                              resolve-prompt score select trash-button trash-resource view-deck]]
    [game.core.card :refer [get-card]]
    [game.core.change-vals :refer [change]]
    [game.core.checkpoint :refer [fake-checkpoint]]
@@ -107,7 +107,7 @@
    "system-msg" #(system-msg %1 %2 (:msg %3))
    "toast" #'ack-toast
    "toggle-auto-no-action" #'toggle-auto-no-action
-   "trash" #(trash %1 %2 (make-eid %1) (get-card %1 (:card %3)) (dissoc %3 :card))
+   "trash" #(trash-button %1 %2 (make-eid %1) (get-card %1 (:card %3)))
    "trash-resource" #'trash-resource
    "unbroken-subroutines" #'play-unbroken-subroutines
    "view-deck" #'view-deck})

test/clj/game/cards/resources_test.clj

@@ -2243,7 +2243,7 @@
       (play-from-hand state :runner "Dummy Box")
       (play-from-hand state :runner "Cache")
       (take-credits state :runner)
-      (trash state :corp (get-program state 0))
+      (core/trash state :corp (core/make-eid state) (get-program state 0))
       (is (not (no-prompt? state :runner)) "Dummy Box prompting to prevent program trash")
       (click-prompt state :runner "Dummy Box (Program)")
       (click-card state :runner (find-card "Clot" (:hand (get-runner))))
@@ -5769,13 +5769,13 @@
     (play-from-hand state :runner "Motivation")
     (play-from-hand state :runner "Astrolabe")
     (take-credits state :runner)
-    (trash state :runner (get-resource state 2))
+    (core/trash state :runner (core/make-eid state) (get-resource state 2))
     (is (no-prompt? state :runner) "Sac Con not prompting to prevent resource trash")
-    (trash state :runner (get-program state 0))
+    (core/trash state :runner (core/make-eid state) (get-program state 0))
     (click-prompt state :runner "Sacrificial Construct")
     (is (= 2 (count (:discard (get-runner)))) "Sac Con trashed")
     (is (= 1 (count (get-program state))) "Cache still installed")
-    (trash state :runner (get-hardware state 0))
+    (core/trash state :runner (core/make-eid state) (get-hardware state 0))
     (click-prompt state :runner "Sacrificial Construct")
     (is (= 3 (count (:discard (get-runner)))) "Sac Con trashed")
     (is (= 1 (count (get-hardware state))) "Astrolabe still installed")))

test/clj/game/core/say_test.clj

@@ -9,6 +9,14 @@
    [game.test-framework :refer :all]
    [jinteki.utils :refer [command-info]]))
 
+(deftest trash-button-logs-in-chat
+  (do-game
+    (new-game {:corp {:hand ["Ice Wall"]}})
+    (play-from-hand state :corp "Ice Wall" "HQ")
+    (core/process-action "trash" state :corp {:card (get-ice state :hq 0)})
+    (is (= 1 (count (:discard (get-corp)))) "trashed")
+    (is (last-log-contains? state "trashes "))))
+
 (deftest commands-are-documented-test
   (let [cmd-source (with-out-str (repl/source game.core.commands/parse-command))
         implemented-cmds (map str (re-seq #"(?<=\")\/[^ \"]*(?=\")" cmd-source))