Merge pull request #6071 from cardboardtech/IdentityDiffFix

Playable Abilities Fixes

Author: NoahTheDuke

src/clj/game/cards/operations.clj

@@ -1305,7 +1305,6 @@
    :leave-play (req (system-msg state :corp "trashes MCA Informant"))
    :runner-abilities [{:label "Trash MCA Informant host"
                        :cost [:click 1 :credit 2]
-                       :req (req (= :runner side))
                        :async true
                        :effect (effect (system-msg :runner (str "spends [Click] and 2 [Credits] to trash "
                                                                 (card-str state (:host card))))

src/clj/game/core/diffs.clj

@@ -67,16 +67,14 @@
       (assoc :runner-abilities (abilities-playable? state side card :runner-abilities))))
 
 (defn card-summary [card state side]
-  (cond+
-    [(not (is-public? card side))
-     (prune-null-fields (private-card card))]
-    [(:hosted card)
-     (update card :hosted (partial mapv #(card-summary % state side)))]
-    [:else
-     (-> card
-         (playable? state side)
-         (card-abilities-playable? state side)
-         (prune-null-fields))]))
+  (if (not (is-public? card side))
+    (prune-null-fields (private-card card))
+    (-> (if (:hosted card)
+          (update card :hosted (partial mapv #(card-summary % state side)))
+          card)
+        (playable? state side)
+        (card-abilities-playable? state side)
+        (prune-null-fields))))
 
 (defn card-summary-vec [cards state side]
   (mapv #(card-summary % state side) cards))
@@ -137,7 +135,7 @@
 (defn player-summary
   [player state side same-side?]
   (-> (select-keys player (player-keys))
-      (update :identity prune-null-fields)
+      (update :identity card-summary state side)
       (update :basic-action-card card-abilities-playable? state side)
       (update :current card-summary-vec state side)
       (update :play-area card-summary-vec state side)
@@ -199,11 +197,11 @@
    :brain-damage])
 
 (defn rig-summary
-  [state]
+  [state side]
   (let [runner (:runner @state)]
     (into {} (for [row [:hardware :facedown :program :resource]
                    :let [cards (get-in runner [:rig row])]]
-               [row (card-summary-vec cards state :runner)]))))
+               [row (card-summary-vec cards state side)]))))
 
 (defn runner-summary
   [state side]
@@ -223,7 +221,7 @@
           :hand (if (or runner-player? open-hands?) (card-summary-vec hand state :runner) [])
           :hand-count (count hand)
           :discard (prune-vec discard)
-          :rig (rig-summary state))
+          :rig (rig-summary state side))
         (cond-> (and runner-player? runnable-list) (assoc :runnable-list runnable-list)))))
 
 (defn run-keys []

src/clj/game/core/initializing.clj

@@ -80,14 +80,16 @@
 (defn- corp-ability-init
   "Gets abilities associated with the card"
   [cdef]
-  (for [ab (:corp-abilities cdef)]
-    (assoc (select-keys ab [:cost]) :label (make-label ab))))
+  (into [] (for [ab (:corp-abilities cdef)
+                 :let [ab (assoc (select-keys ab [:cost]) :label (make-label ab))]]
+             (add-cost-label-to-ability ab))))
 
 (defn- runner-ability-init
   "Gets abilities associated with the card"
   [cdef]
-  (for [ab (:runner-abilities cdef)]
-    (assoc (select-keys ab [:cost :break-cost]) :label (make-label ab))))
+  (into [] (for [ab (:runner-abilities cdef)
+                 :let [ab (assoc (select-keys ab [:cost :break-cost]) :label (make-label ab))]]
+             (add-cost-label-to-ability ab (or (:break-cost ab) (:cost ab))))))
 
 (defn card-init
   "Initializes the abilities and events of the given card."

src/cljc/game/core/card.cljc

@@ -262,6 +262,7 @@
       (in-play-area? card)
       (in-current? card)
       (in-scored? card)
+      (condition-counter? card)
       (and (corp? card)
            (installed? card)
            (rezzed? card))