Merge pull request #6581 from NoahTheDuke/nb/overinstall-unique-and-consoles

Allow over installing uniques and consoles

Author: NoahTheDuke

src/clj/game/core.clj

@@ -223,6 +223,7 @@
    resource?
    rezzed?
    runner?
+   unique?
    upgrade?
    virus-program?])
 

src/clj/game/core/board.clj

@@ -127,7 +127,8 @@
   (->> (concat [(-> @state side :identity)]
                (all-active-installed state side)
                (-> @state side :current)
-               (filter (if (= :corp side) operation? event?) (-> @state side :play-area))
+               (filter (if (= :corp side) operation? event?)
+                       (-> @state side :play-area))
                (when (= side :corp)
                  (-> @state :corp :scored)))
        (filter identity)

src/clj/game/core/engine.clj

@@ -4,8 +4,8 @@
     [clojure.stacktrace :refer [print-stack-trace]]
     [clojure.string :as str]
     [cond-plus.core :refer [cond+]]
-    [game.core.board :refer [clear-empty-remotes all-installed-runner-type all-installed]]
-    [game.core.card :refer [active? facedown? faceup? get-card get-cid get-title in-discard? in-hand? installed? rezzed? program? console?]]
+    [game.core.board :refer [clear-empty-remotes all-installed-runner-type all-active-installed]]
+    [game.core.card :refer [active? facedown? faceup? get-card get-cid get-title in-discard? in-hand? installed? rezzed? program? console? unique?]]
     [game.core.card-defs :refer [card-def]]
     [game.core.effects :refer [get-effect-maps unregister-floating-effects]]
     [game.core.eid :refer [complete-with-result effect-completed make-eid]]
@@ -18,7 +18,8 @@
     [game.macros :refer [continue-ability req wait-for]]
     [game.utils :refer [dissoc-in distinct-by in-coll? remove-once same-card? server-cards side-str to-keyword]]
     [jinteki.utils :refer [other-side]]
-    [game.core.memory :refer [update-mu]]))
+    [game.core.memory :refer [update-mu]]
+    [game.core.to-string :refer [card-str]]))
 
 ;; resolve-ability docs
 
@@ -1017,21 +1018,46 @@
               (unregister-floating-events state nil duration))
             (effect-completed state nil eid)))
 
-(defn check-consoles
+(defn get-old-uniques
+  [state side]
+  (some->> (all-active-installed state side)
+           (filter unique?)
+           (group-by :title)
+           (reduce-kv
+             (fn [acc _title cards]
+               (if (< 1 (count cards))
+                 (conj! acc (butlast cards))
+                 acc))
+             (transient []))
+           persistent!
+           seq
+           (apply concat)))
+
+(defn check-unique-and-consoles
   "d. If 2 or more unique (◆) cards with the same name are active, for each such name,
   all of those cards except the one that became active most recently are trashed. If 2
   or more console cards are installed under the control of the same player, for each
   such player, all of those cards except the one that became active most recently are
   trashed."
   [state _ eid]
-  (let [consoles (->> (get-in @state [:runner :rig :hardware])
-                      (filter console?))]
-    (if (< 1 (count consoles))
-      (wait-for (move* state nil (make-eid state eid) :trash-cards (butlast consoles) {:game-trash true
-                                                                                       :unpreventable true})
-                (doseq [card (butlast consoles)]
-                  (system-say state :runner (str (:title card) " is trashed."))
-                (effect-completed state nil eid)))
+  (let [corp-uniques (get-old-uniques state :corp)
+        runner-uniques (get-old-uniques state :runner)
+        consoles (->> (get-in @state [:runner :rig :hardware])
+                      (filter console?))
+        consoles (when (< 1 (count consoles))
+                   (butlast consoles))
+        cards-to-trash (-> (concat corp-uniques runner-uniques consoles)
+                           distinct
+                           seq)]
+    (if cards-to-trash
+      (wait-for (move* state nil (make-eid state eid)
+                       :trash-cards cards-to-trash
+                       {:game-trash true
+                        :unpreventable true})
+                (doseq [card cards-to-trash]
+                  (system-say state (to-keyword (:side card))
+                              (str (card-str state card) " is trashed."))
+                  (effect-completed state nil eid)))
       (effect-completed state nil eid))))
 
 (defn check-restrictions
@@ -1072,7 +1098,7 @@
        (check-win-by-agenda state)
        ;; d: uniqueness/console check
        (wait-for
-         (check-consoles state nil)
+         (check-unique-and-consoles state nil)
          ;; e: restrictions on card abilities or game rules, MU
          (wait-for
            (check-restrictions state nil (make-eid state eid))

src/clj/game/core/installing.clj

@@ -2,7 +2,7 @@
   (:require
     [cond-plus.core :refer [cond+]]
     [game.core.agendas :refer [update-advancement-requirement]]
-    [game.core.board :refer [all-active-installed all-installed get-remotes in-play? installable-servers server->zone all-installed-runner-type]]
+    [game.core.board :refer [all-installed get-remotes installable-servers server->zone all-installed-runner-type]]
     [game.core.card :refer [agenda? asset? convert-to-condition-counter corp? event? get-card get-zone has-subtype? ice? operation? program? resource? rezzed? installed?]]
     [game.core.card-defs :refer [card-def]]
     [game.core.cost-fns :refer [ignore-install-cost? install-additional-cost-bonus install-cost]]
@@ -276,24 +276,15 @@
   "Checks if the specified card can be installed.
    Checks uniqueness of card and installed console.
    Returns true if there are no problems
-   Returns :console if Console check fails
-   Returns :unique if uniqueness check fails
    Returns :req if card-def :req check fails
    !! NB: This should only be used in a check with `true?` as all return values are truthy"
   [state side card facedown]
-  (let [card-req (:req (card-def card))
-        uniqueness (:uniqueness card)]
+  (let [card-req (:req (card-def card))]
     (cond
       ;; Can always install a card facedown
       facedown true
-      ;; Console check
-      (and (has-subtype? card "Console")
-           (some #(has-subtype? % "Console") (all-active-installed state :runner)))
-      :console
       ;; Installing not locked
       (install-locked? state :runner) :lock-install
-      ;; Uniqueness check
-      (and uniqueness (in-play? state card)) :unique
       ;; Req check
       (and card-req (not (card-req state side (make-eid state) card nil))) :req
       ;; The card's zone is locked
@@ -309,13 +300,8 @@
          reason-toast #(do (when-not no-toast (toast state side % "warning")) false)
          title (:title card)]
      (case reason
-       :unique
-       (reason-toast (str "Cannot install a second copy of " title " since it is unique."
-                          " Please trash currently installed copy first"))
        :lock-install
        (reason-toast (str "Unable to install " title " since installing is currently locked"))
-       :console
-       (reason-toast (str "Unable to install " title ": an installed console prevents the installation of a replacement"))
        :req
        (reason-toast (str "Installation requirements are not fulfilled for " title))
        :locked-zone

src/cljc/game/core/card.cljc

@@ -290,6 +290,10 @@
   (and (hardware? card)
        (has-subtype? card "Console")))
 
+(defn unique?
+  [card]
+  (:uniqueness card))
+
 (defn corp-installable-type?
   "Is the card of an acceptable type to be installed in a server"
   [card]

test/clj/game/cards/operations_test.clj

@@ -901,7 +901,7 @@
       (is (= 3 (count (:discard (get-runner)))) "2 cards lost to brain damage")
       (is (= 3 (:brain-damage (get-runner))) "Brainchips didn't do additional brain dmg"))))
 
-(deftest ^:kaocha/pending digital-rights-management
+(deftest ^:kaocha/pending digital-rights-management-cannot-score-agenda-installed-after-playing
   ;; Cannot score Agenda installed after playing DRM
   (do-game
     (new-game {:corp {:hand [(qty "Digital Rights Management" 2) "Project Vitruvius" (qty "Hedge Fund" 2)]

test/clj/game/core/engine_test.clj

@@ -228,3 +228,15 @@
     (click-card state :runner (get-runner-facedown state 0))
     (is (last-log-contains? state "Mirror is trashed."))
     (is (find-card "Mirror" (:discard (get-runner))))))
+
+(deftest install-second-console-trashes-first
+  (do-game
+    (new-game {:corp {:hand ["Hedge Fund"]
+                      :deck [(qty "Hedge Fund" 100)]}
+               :runner {:hand ["Mirror" "Box-E"]
+                        :credits 100}})
+    (take-credits state :corp)
+    (play-from-hand state :runner "Mirror")
+    (play-from-hand state :runner "Box-E")
+    (is (= "Box-E" (:title (get-hardware state 0))))
+    (is (last-log-contains? state "Mirror is trashed."))))

test/clj/game/core/rules_test.clj

@@ -27,36 +27,44 @@
       (is (= (- 5 (:cost gord)) (:credit (get-runner))) "Program cost was applied")
       (is (= (- 4 (:memoryunits gord)) (core/available-mu state)) "Program MU was applied"))))
 
-(deftest runner-installing-uniques
-  ;; Installing a copy of an active unique Runner card is prevented
+(deftest installing-second-unique-trashes-first-unique-test
   (do-game
-    (new-game {:runner {:deck [(qty "Kati Jones" 2) (qty "Scheherazade" 2)
-                               "Off-Campus Apartment" (qty "Hivemind" 2)]}})
+    (new-game {:runner {:hand [(qty "Kati Jones" 2)]
+                        :credits 100}})
+    (take-credits state :corp)
+    (play-from-hand state :runner "Kati Jones")
+    (play-from-hand state :runner "Kati Jones")
+    (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)
-    (core/gain state :runner :click 1 :memory 2)
-    (draw state :runner 2)
     (play-from-hand state :runner "Kati Jones")
     (play-from-hand state :runner "Off-Campus Apartment")
-    (play-from-hand state :runner "Scheherazade")
-    (let [oca (get-resource state 1)
-          scheh (get-program state 0)]
-      (card-ability state :runner scheh 0)
-      (click-card state :runner (find-card "Hivemind" (:hand (get-runner))))
-      (is (= "Hivemind" (:title (first (:hosted (refresh scheh))))) "Hivemind hosted on Scheherazade")
-      (play-from-hand state :runner "Kati Jones")
-      (is (= 1 (:click (get-runner))) "Not charged a click")
-      (is (= 2 (count (get-resource state))) "2nd copy of Kati couldn't install")
+    (let [oca (get-resource state 1)]
       (card-ability state :runner oca 0)
       (click-card state :runner (find-card "Kati Jones" (:hand (get-runner))))
-      (is (empty? (:hosted (refresh oca))) "2nd copy of Kati couldn't be hosted on OCA")
-      (is (= 1 (:click (get-runner))) "Not charged a click")
-      (click-prompt state :runner "Done")
-      (play-from-hand state :runner "Hivemind")
-      (is (= 1 (count (get-program state))) "2nd copy of Hivemind couldn't install")
+      (is (find-card "Kati Jones" (:hosted (refresh oca))))
+      (is (= "Kati Jones" (:title (get-discarded state :runner))))
+      (is (last-log-contains? state "Kati Jones is trashed.")))))
+
+(deftest installing-second-hivemind-trashes-hosted-hivemind-test
+  (do-game
+    (new-game {:runner {:hand ["Scheherazade" (qty "Hivemind" 2)]
+                        :credits 100}})
+    (take-credits state :corp)
+    (play-from-hand state :runner "Scheherazade")
+    (let [scheh (get-program state 0)]
       (card-ability state :runner scheh 0)
       (click-card state :runner (find-card "Hivemind" (:hand (get-runner))))
-      (is (= 1 (count (:hosted (refresh scheh)))) "2nd copy of Hivemind couldn't be hosted on Scheherazade")
-      (is (= 1 (:click (get-runner))) "Not charged a click"))))
+      (is (find-card "Hivemind" (:hosted (refresh scheh))) "Hivemind hosted on Scheherazade")
+      (play-from-hand state :runner "Hivemind")
+      (is (= "Hivemind" (:title (get-discarded state :runner))))
+      (is (last-log-contains? state "Hivemind hosted on Scheherazade is trashed."))
+      (is (empty? (:hosted (refresh scheh))) "Hivemind hosted on Scheherazade"))))
 
 (deftest deactivate-program
   ;; deactivate - Program; ensure MU are restored

test/clj/game/core/say_test.clj

@@ -273,20 +273,18 @@
 
   (testing "/unique"
     (let [user {:username "Runner"}]
-      (testing "Works with Wireless Net Pavillion"
-        (do-game
-          (new-game {:runner {:hand [(qty "Wireless Net Pavilion" 2)]}})
-          (take-credits state :corp)
-          (let [wnp1 (nth (:hand (get-runner)) 0)
-                wnp2 (nth (:hand (get-runner)) 1)]
-            (core/play state :runner {:card wnp1})
-            (core/play state :runner {:card wnp2})
-            (is (= 1 (count (:hand (get-runner)))) "Second WNP was not installed")
-            (is (:uniqueness wnp2) "WNP is unique")
-            (core/command-parser state :runner {:user user :text "/unique"})
-            (is (last-log-contains? state "\\[!\\]Runner uses a command: /unique") "Correct message")
-            (click-card state :runner wnp2)
-            (is (not (:uniqueness (refresh wnp2))) "WNP is not unique anymore")
-            (is (last-log-contains? state "Runner uses /unique command to make Wireless Net Pavilion not unique\\.") "Correct message")
-            (core/play state :runner {:card wnp2})
-            (is (zero? (count (:hand (get-runner)))) "Both cards have been installed")))))))
+      (do-game
+        (new-game {:runner {:hand [(qty "Wireless Net Pavilion" 2)]
+                            :credit 100}})
+        (take-credits state :corp)
+        (play-from-hand state :runner "Wireless Net Pavilion")
+        (let [wnp1 (get-resource state 0)]
+          (core/command-parser state :runner {:user user :text "/unique"})
+          (is (last-log-contains? state "\\[!\\]Runner uses a command: /unique") "Correct message")
+          (click-card state :runner wnp1)
+          (is (not (unique? (refresh wnp1))) "WNP is not unique anymore")
+          (is (last-log-contains? state "Runner uses /unique command to make Wireless Net Pavilion not unique\\.") "Correct message")
+          (play-from-hand state :runner "Wireless Net Pavilion")
+          (is (zero? (count (:hand (get-runner)))) "Both cards have been installed")
+          (is (= 2 (count (get-resource state))))
+          (is (every? #(= "Wireless Net Pavilion" (:title %)) (get-resource state))))))))