Merge pull request #7834 from heyshiloh/nr-7825-trash-jarogniew-mercs

Issue 7825: Trash Jarogniew Mercs using corp basic action
mtgred · Oct 29, 2024 · 0e62a29 · 0e62a29
2 parents 0cd8c29 + 93a88e0
commit 0e62a29
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/clj/game/cards/basic.clj b/src/clj/game/cards/basic.clj
@@ -104,12 +104,8 @@
                 :prompt "Choose a resource to trash"
                 :msg (msg "trash " (:title target))
                 ;; I hate that we need to modify the basic action card like this, but I don't think there's any way around it -nbkelly, '24
-                :choices {:req (req (and (if (and (->> (all-active-installed state :runner)
-                                                       (filter (fn [c] (untrashable-while-resources? c)))
-                                                       (seq))
-                                                  (< 1 (->> (all-active-installed state :runner)
-                                                            (filter resource?)
-                                                            count)))
+                :choices {:req (req (and (if (and (untrashable-while-resources? target)
+                                                  (< (count (filter resource? (all-active-installed state :runner))) 2))
                                            true
                                            (not (untrashable-while-resources? target)))
                                          (resource? target)