Merge pull request #8448 from NBKelly/unique-trashes-by-timestamp

rules test to ensure uniques trash correctly even when hosting is involved

Author: NoahTheDuke

src/clj/game/core/engine.clj

@@ -1160,7 +1160,7 @@
            (reduce-kv
              (fn [acc _title cards]
                (if (< 1 (count cards))
-                 (conj! acc (butlast cards))
+                 (conj! acc (butlast (sort-by :timestamp cards)))
                  acc))
              (transient []))
            persistent!

src/clj/game/core/hosting.clj

@@ -8,7 +8,7 @@
     [game.core.initializing :refer [card-init]]
     [game.core.memory :refer [init-mu-cost]]
     [game.core.update :refer [update! update-hosted!]]
-    [game.utils :refer [remove-once same-card?]]))
+    [game.utils :refer [make-timestamp remove-once same-card?]]))
 
 (defn remove-from-host
   "Removes a card from its host."
@@ -54,6 +54,7 @@
                          :host (dissoc card :hosted)
                          :facedown facedown
                          :zone [:onhost] ;; hosted cards should not be in :discard or :hand etc
+                         :timestamp (make-timestamp)
                          :previous-zone (:zone target))
            ;; Update any cards hosted by the target, so their :host has the updated zone.
            target (update target :hosted #(map (fn [h] (assoc h :host target)) %))

src/clj/game/core/initializing.clj

@@ -15,7 +15,7 @@
     [game.core.props :refer [add-counter]]
     [game.core.update :refer [update!]]
     [game.macros :refer [req]]
-    [game.utils :refer [make-cid server-card to-keyword]]
+    [game.utils :refer [make-cid make-timestamp server-card to-keyword]]
     [jinteki.utils :refer [make-label]]))
 
 (defn subroutines-init
@@ -199,6 +199,7 @@
                 :subroutines (subroutines-init (assoc card :cid cid) cdef)
                 :abilities (ability-init cdef)
                 :x-fn (:x-fn cdef)
+                :timestamp (make-timestamp)
                 :poison (:poison cdef)
                 :highlight-in-discard (:highlight-in-discard cdef)
                 :printed-title (:title card))

src/clj/game/core/moving.clj

@@ -21,7 +21,7 @@
     [game.core.update :refer [update!]]
     [game.core.winning :refer [check-win-by-agenda]]
     [game.macros :refer [wait-for when-let*]]
-    [game.utils :refer [dissoc-in make-cid remove-once same-card? same-side? to-keyword]]
+    [game.utils :refer [dissoc-in make-cid make-timestamp remove-once same-card? same-side? to-keyword]]
     [medley.core :refer [insert-nth]]))
 
 (defn- trim-cause-card
@@ -62,7 +62,6 @@
   "Get the moved cards with correct abilities and keys hooked up / removed etc."
   [state side {:keys [zone host installed] :as card} to]
   (let [zone (if host (map to-keyword (:zone host)) zone)
-
         src-zone (first zone)
         target-zone (if (vector? to) (first to) to)
         same-zone? (= src-zone target-zone)
@@ -141,10 +140,16 @@
                      (contains? #{:deck :hand :discard} target-zone))
               (make-cid)
               (:cid c))
+        timestamp (if (or (and (not (contains? #{:deck :hand :discard} src-zone))
+                               (contains? #{:deck :hand :discard} target-zone))
+                          (and (not installed) to-installed))
+                    (make-timestamp)
+                    (:timestamp c))
         moved-card (assoc c :zone dest
                             :host nil
                             :hosted hosted
                             :cid cid
+                            :timestamp timestamp
                             :previous-zone (:zone c))
         ;; Set up abilities for stolen agendas
         moved-card (if (and (= :scored (first dest))

src/clj/game/utils.clj

@@ -2,11 +2,15 @@
   (:require
     [jinteki.cards :refer [all-cards]]
     [clojure.string :as str]
-    [clj-uuid :as uuid]))
+    [clj-uuid :as uuid]
+    [cljc.java-time.instant :as inst]))
 
 (defn make-cid []
   (uuid/to-string (uuid/v4)))
 
+(defn make-timestamp []
+  (inst/now))
+
 (defn server-card
   ([title] (server-card title true))
   ([title strict?]

test/clj/game/core/rules_test.clj

@@ -50,23 +50,46 @@
                         :credits 100}})
     (take-credits state :corp)
     (play-from-hand state :runner "Kati Jones")
+    (card-ability state :runner (get-resource state 0) 0)
+    (is (= 3 (get-counters (get-resource state 0) :credit)) "Placed 3")
     (play-from-hand state :runner "Kati Jones")
+    (is (= 0 (get-counters (get-resource state 0) :credit)) "Correct kati was trashed")
     (is (find-card "Kati Jones" (get-resource state)))
     (is (last-log-contains? state "Kati Jones is trashed."))))
 
 (deftest installing-second-unique-on-off-campus-apartment-trashes-first-test
-  (do-game
-    (new-game {:runner {:hand [(qty "Kati Jones" 2) "Off-Campus Apartment"]
-                        :credits 100}})
-    (take-credits state :corp)
-    (play-from-hand state :runner "Kati Jones")
-    (play-from-hand state :runner "Off-Campus Apartment")
-    (let [oca (get-resource state 1)]
-      (play-from-hand state :runner "Kati Jones")
-      (click-prompt state :runner "Off-Campus Apartment")
-      (is (find-card "Kati Jones" (:hosted (refresh oca))))
+  (testing "Should trash the kati in the rig"
+    (do-game
+      (new-game {:runner {:hand [(qty "Kati Jones" 2) "Off-Campus Apartment"]
+                          :credits 100}})
+      (take-credits state :corp)
+      (play-cards state :runner "Off-Campus Apartment" ["Kati Jones" "The Rig"] ["Kati Jones" "Off-Campus Apartment"])
+      (is (find-card "Kati Jones" (:hosted (get-resource state 0))))
+      (is (= "Kati Jones" (:title (get-discarded state :runner))))
+      (is (last-log-contains? state "Kati Jones is trashed."))))
+  (testing "Should trash the kati on OCA"
+    (do-game
+      (new-game {:runner {:hand [(qty "Kati Jones" 2) "Off-Campus Apartment"]
+                          :credits 100}})
+      (take-credits state :corp)
+      (play-cards state :runner "Off-Campus Apartment" ["Kati Jones" "Off-Campus Apartment"] ["Kati Jones" "The Rig"])
+      (is (= "Kati Jones" (:title (get-resource state 1))))
+      (is (not (find-card "Kati Jones" (:hosted (get-resource state 0)))))
+      (is (= "Kati Jones" (:title (get-discarded state :runner))))
+      (is (last-log-contains? state "Kati Jones hosted on .* is trashed."))))
+  (testing "Should trash the loaded kati on OCA"
+    (do-game
+      (new-game {:runner {:hand [(qty "Kati Jones" 2) "Off-Campus Apartment"]
+                          :credits 100}})
+      (take-credits state :corp)
+      (play-cards state :runner "Off-Campus Apartment" ["Kati Jones" "Off-Campus Apartment"])
+      (card-ability state :runner (first (:hosted (get-resource state 0))) 0)
+      (is (= 3 (get-counters (first (:hosted (get-resource state 0))) :credit)) "Placed 3")
+      (play-cards state :runner ["Kati Jones" "Off-Campus Apartment"])
+      (is (= 0 (get-counters (first (:hosted (get-resource state 0))) :credit)) "Correct kati trash")
+      (is (find-card "Kati Jones" (:hosted (get-resource state 0))))
       (is (= "Kati Jones" (:title (get-discarded state :runner))))
-      (is (last-log-contains? state "Kati Jones is trashed.")))))
+      (is (last-log-contains? state "Kati Jones hosted on .* is trashed.")))))
 
 (deftest installing-second-hivemind-trashes-hosted-hivemind-test
   (do-game