Merge pull request #8565 from NBKelly/vp-release-fixes

NBKelly · web-flow · commit c7b20ff1e5e6 · 2026-03-05T18:28:52.000+13:00
Vp release fixes
diff --git a/src/clj/game/cards/events.clj b/src/clj/game/cards/events.clj
@@ -453,6 +453,7 @@
             {:prompt (str "Choose a card (" n " remaining)")
              :choices chosen-cards
              :async true
+             :waiting-prompt true
              :effect (req (let [target-card target]
                             (continue-ability
                               state side
diff --git a/src/clj/game/cards/operations.clj b/src/clj/game/cards/operations.clj
@@ -678,7 +678,7 @@
                :effect (req (continue-ability state side (interact cards (remove-card remaining target) to-trash to-add (conj to-top target)) card nil))}))]
   {:on-play {:msg (msg (if (= 1 (count (:deck corp)))
                          "trash the top card of R&D"
-                         (str "look at the top " (count (:deck corp)) " cards of R&D")))
+                         (str "look at the top " (min 5 (count (:deck corp))) " cards of R&D")))
              :change-in-game-state {:req (req (seq (:deck corp)))}
              :async true
              :effect (req (if (= 1 (count (:deck corp)))
@@ -2408,7 +2408,9 @@
   {:on-play {:change-in-game-state {:req (req (seq (filter (every-pred rezzed? ice?)
                                                            (all-installed state :corp))))}
              :waiting-prompt true
-             :prompt "Choose any number of ice to derez"
+             :prompt (msg "choose " (quantify (min (count (filter (every-pred rezzed? ice?)
+                                                                  (all-installed state :corp)))
+                                                   2) "piece") " of ice to derez")
              :choices {:req (req (and (rezzed? target)
                                       (ice? target)
                                       (installed? target)))
diff --git a/src/clj/game/core/access.clj b/src/clj/game/core/access.clj
@@ -627,15 +627,14 @@
 
 (defn access-helper-rd
   [state {:keys [chosen random-access-limit] :as access-amount} already-accessed {:keys [no-root] :as args}]
-  (let [current-available (set (concat (if-not (any-effects state :runner :disable-random-accesses true? {:server :rd}) (map :cid (get-in @state [:corp :deck])) [])
-                                       (map :cid (root-content state :rd))))
-        already-accessed-fn (fn [card] (contains? already-accessed (:cid card)))
+  (let [already-accessed-fn (fn [card] (contains? already-accessed (:cid card)))
 
         deck (access-cards-from-rd state)
         card-to-access (first (drop-while already-accessed-fn deck))
 
         card-from "Card from deck"
         card-from-button (when (and (pos? random-access-limit)
+                                    (not (any-effects state :runner :disable-random-accesses true?))
                                     card-to-access)
                            [card-from])
         root (root-content state :rd already-accessed-fn)
@@ -815,10 +814,8 @@
   [state {:keys [chosen random-access-limit] :as access-amount}
    already-accessed {:keys [no-root access-first] :as args}]
   (let [hand (when (not (or (:prevent-hand-access (:run @state))
-                            (any-effects state :runner :disable-random-accesses true? {:server :hq})))
+                            (any-effects state :runner :disable-random-accesses true?)))
                (get-in @state [:corp :hand]))
-        current-available (set (concat (map :cid hand)
-                                       (map :cid (root-content state :hq))))
 
         already-accessed-fn (fn [card] (contains? already-accessed (:cid card)))
 
diff --git a/src/clj/game/core/actions.clj b/src/clj/game/core/actions.clj
@@ -241,13 +241,14 @@
     (effect-completed state side eid)))
 
 (defn resolve-bad-pub-choice
-  [state side {:keys [eid] :as args}]
+  [state side {:keys [eid shift-key-held] :as args}]
   (if (pos? (bad-publicity-available state side))
     (let [prompt (or (first-prompt-by-eid state side eid)
                      (first (get-in @state [side :prompt])))
           card (:card prompt)
           prompt-eid eid
           effect (:effect prompt)]
+      (swap! state assoc-in [side :shift-key-select] shift-key-held)
       (if (:offer-bad-pub? prompt)
         (do (remove-from-prompt-queue state side prompt)
             (when effect (effect :bad-publicity))
diff --git a/src/clj/game/core/diffs.clj b/src/clj/game/core/diffs.clj
@@ -258,7 +258,7 @@
                                   (mapv
                                    (fn [choice]
                                      (if (-> choice :value :cid)
-                                       (update choice :value #(not-empty (card-summary % state side)))
+                                       (update choice :value #(not-empty (select-keys % [:cid :title :printed-title])))
                                        choice)))
                                   (not-empty))
                              choices)))
diff --git a/src/clj/game/core/pick_counters.clj b/src/clj/game/core/pick_counters.clj
@@ -202,25 +202,36 @@
                   (not can-use-bad-pub?)))
        {:async true
         :effect pay-rest}
-       (if (and pre-chosen (in-coll? (map :cid provider-cards) (:cid pre-chosen)))
+       (if (and pre-chosen (or (in-coll? (map :cid provider-cards) (:cid pre-chosen))
+                               (= pre-chosen :bad-publicity)))
          {:async true
-          :effect (req (let [target pre-chosen
-                             pay-credits-type (-> target card-def :interactions :pay-credits :type)
-                             pay-function (if (= :custom pay-credits-type)
-                                            (-> target card-def :interactions :pay-credits :custom)
-                                            (take-counters-of-type pay-credits-type))
-                             custom-ability ^:ignore-async-check {:async true
-                                                                  :effect pay-function}
-                             neweid (make-eid state outereid)
-                             providing-card target]
-                         (wait-for (resolve-ability state side neweid custom-ability providing-card [card])
-                                   (continue-ability state side
-                                                     (pick-credit-providing-cards
-                                                       provider-func eid target-count stealth-target
-                                                       (update selected-cards (:cid providing-card)
-                                                               #(assoc % :card providing-card :number (+ (:number % 0) async-result)))
-                                                       target)
-                                                     card targets))))}
+          :effect (req
+                    (if (= target :bad-publicity)
+                      (continue-ability
+                        state side
+                        (pick-credit-providing-cards
+                          provider-func eid target-count stealth-target selected-cards (when (and (should-auto-repeat? state side)
+                                                                                                  (> bad-pub-available 1))
+                                                                                         target)
+                          uses (dec bad-pub-available) (inc bad-pub-spent))
+                        card targets)
+                      (let [target pre-chosen
+                            pay-credits-type (-> target card-def :interactions :pay-credits :type)
+                            pay-function (if (= :custom pay-credits-type)
+                                           (-> target card-def :interactions :pay-credits :custom)
+                                           (take-counters-of-type pay-credits-type))
+                            custom-ability ^:ignore-async-check {:async true
+                                                                 :effect pay-function}
+                            neweid (make-eid state outereid)
+                            providing-card target]
+                        (wait-for (resolve-ability state side neweid custom-ability providing-card [card])
+                                  (continue-ability state side
+                                                    (pick-credit-providing-cards
+                                                      provider-func eid target-count stealth-target
+                                                      (update selected-cards (:cid providing-card)
+                                                              #(assoc % :card providing-card :number (+ (:number % 0) async-result)))
+                                                       target uses bad-pub-available bad-pub-spent)
+                                                     card targets)))))}
          {:async true
           :prompt (str "Choose a credit providing card ("
                        counter-count (when (and target-count (pos? target-count))
diff --git a/src/cljs/nr/gameboard/board.cljs b/src/cljs/nr/gameboard/board.cljs
@@ -1871,7 +1871,8 @@
        (concat [(when offer-bad-pub?
                   ;; TODO - translate this
                   [:button {:key "Bad Pub"
-                            :on-click #(send-command "bad-pub-choice" {:eid (prompt-eid (:side @game-state))})}
+                            :on-click #(send-command "bad-pub-choice" {:eid (prompt-eid (:side @game-state))
+                                                                       :shift-key-held (.-shiftKey %)})}
                    (str "Bad Publicity (" offer-bad-pub? " available)")])]
                (doall (for [{:keys [idx uuid value]} choices
                             :when (not= value "Hide")]
diff --git a/test/clj/game/cards/events_test.clj b/test/clj/game/cards/events_test.clj
@@ -50,7 +50,7 @@
       (is (changed? [(:credit (get-runner)) -1]
             (click-prompt state :runner "New Angeles City Hall")
             (click-prompt state :runner "Yes")
-            (select-bad-pub state 1))
+            (select-bad-pub state nil))
           "Spent 1 + 1 from bad pub")
       (is (= 2 (:credit (get-runner))) "Runner has 2 credits left")
       (click-prompt state :runner "Yes")
@@ -6653,11 +6653,11 @@
       ;; Trashable execs
       (run-empty-server state :remote2)
       (click-prompt state :runner "Pay 6 [Credits] to trash")
-      (select-bad-pub state 1)
+      (select-bad-pub state nil)
       (is (empty? (:scored (get-runner))) "Chairman Hiro not added to runner's score area")
       (run-empty-server state "R&D")
       (click-prompt state :runner "Pay 5 [Credits] to trash")
-      (select-bad-pub state 1)
+      (select-bad-pub state nil)
       (is (empty? (:scored (get-runner))) "Director Haas not added to runner's score area")
       (take-credits state :runner)
       ;; Trash RM, make sure everything works again
diff --git a/test/clj/game/cards/hardware_test.clj b/test/clj/game/cards/hardware_test.clj
@@ -1326,7 +1326,7 @@
       (click-card state :corp "Hostile Takeover")
       (run-continue state)
       (card-ability state :runner (get-program state 0) 2)
-      (select-bad-pub state 1)
+      (select-bad-pub state nil)
       (card-ability state :runner (get-program state 0) 2)
       (card-ability state :runner (get-program state 0) 0)
       (click-prompt state :runner "Gain 2 [Credits]")
diff --git a/test/clj/game/cards/ice_test.clj b/test/clj/game/cards/ice_test.clj
@@ -8160,7 +8160,7 @@
     (run-continue state)
     (card-ability state :runner (get-program state 0) 0)
     (click-prompt state :runner "End the run")
-    (select-bad-pub state 1)
+    (select-bad-pub state nil)
     (run-continue state)
     (click-prompt state :corp "Yes")
     (click-card state :corp "Ice Wall")
diff --git a/test/clj/game/cards/upgrades_test.clj b/test/clj/game/cards/upgrades_test.clj
@@ -1640,6 +1640,26 @@
       (do-trash-prompt state 4)
       (is (no-prompt? state :runner)))))
 
+(deftest flagship-vs-twinning
+  (doseq [act [:trash :no-action]]
+    (do-game
+      (new-game {:corp {:hand ["Flagship"]
+                        :deck ["Beanstalk Royalties" "Project Atlas"]
+                        :stack-deck true}
+                 :runner {:hand ["The Twinning" "Overclock" "Prepaid VoicePAD"]}})
+      (play-cards state :corp ["Flagship" "R&D" :rezzed])
+      (stack-deck state :corp ["Beanstalk Royalties" "Project Atlas"])
+      (take-credits state :corp)
+      (play-cards state :runner
+                  "The Twinning"
+                  "Prepaid VoicePAD"
+                  ["Overclock" "Prepaid VoicePAD" "R&D"])
+      (run-continue-until state :success)
+      (click-prompt state :runner "1")
+      (click-prompts state :runner "Card from deck" "No action")
+      (click-prompt state :runner "No action")
+      (is (no-prompt? state :runner) "Denied extra access"))))
+
 (deftest forced-connection
   ;; Forced Connection - ambush, trace(3) give the runner 2 tags
   (do-game
@@ -2103,7 +2123,7 @@
     (click-prompt state :runner "Take 1 tag")
     (is (= 1 (count-tags state)) "Runner takes 1 tag to prevent Corp from removing 1 BP")
     (click-prompt state :runner "Pay 2 [Credits] to trash") ; trash
-    (select-bad-pub state 1)
+    (select-bad-pub state nil)
     (run-empty-server state "Archives")
     (is (= 1 (count-bad-pub state)))
     (click-prompt state :runner "The Corp removes 1 bad publicity")
@@ -4119,7 +4139,7 @@
     (run-on state :remote1)
     (is (changed? [(count (:hand (get-runner))) -4]
           (card-ability state :runner (get-program state 0) 0)
-          (select-bad-pub state 0)
+          (select-bad-pub state nil)
           (click-prompt state :corp "Yes"))
         "Got slammed for 4 damage")))
 
diff --git a/test/clj/game/core/rules_test.clj b/test/clj/game/core/rules_test.clj
@@ -378,17 +378,17 @@
     (run-empty-server state :remote1)
     (click-prompt state :corp "No")
     (click-prompt state :runner "Pay 1 [Credits] to trash")
-    (select-bad-pub state 1)
+    (select-bad-pub state nil)
     (is (= 5 (:credit (get-runner))) "1 BP credit spent to trash CVS")
     (run-empty-server state :hq)
     (click-prompt state :corp "No")
     (click-prompt state :runner "Pay 1 [Credits] to trash")
-    (select-bad-pub state 1)
+    (select-bad-pub state nil)
     (is (= 5 (:credit (get-runner))) "1 BP credit spent to trash CVS")
     (run-empty-server state :rd)
     (click-prompt state :corp "No")
     (click-prompt state :runner "Pay 1 [Credits] to trash")
-    (select-bad-pub state 1)
+    (select-bad-pub state nil)
     (is (= 5 (:credit (get-runner))) "1 BP credit spent to trash CVS")))
 
 (deftest run-psi-bad-publicity-credits
diff --git a/test/clj/game/core/scenarios_test.clj b/test/clj/game/core/scenarios_test.clj
@@ -5,6 +5,20 @@
    [game.core.card :refer :all]
    [game.test-framework :refer :all]))
 
+(deftest bad-publicity-works-with-shift-key
+  (do-game
+    (new-game {:corp {:hand ["Scatter Field"] :bad-pub 3}
+               :runner {:hand ["Unity"] :credits 10}})
+    (play-cards state :corp ["Scatter Field" "HQ" :rezzed])
+    (take-credits state :corp)
+    (play-from-hand state :runner "Unity")
+    (run-on state :hq)
+    (run-continue-until state :encounter-ice)
+    (auto-pump-and-break state (get-program state 0))
+    (is (changed? [(:credit (get-runner)) -2]
+          (select-bad-pub state true))
+        "3 pub + 2cr")))
+
 (deftest tread-lightly-vovo-combine-well
   (do-game
     (new-game {:corp {:hand ["Tithe" "Vovô Ozetti"]}
diff --git a/test/clj/game/test_framework.clj b/test/clj/game/test_framework.clj
@@ -231,8 +231,9 @@
   (click-prompt state :runner (str "Pay " cost " [Credits] to trash")))
 
 (defn select-bad-pub
-  [state expected]
-  (core/process-action "bad-pub-choice" state :runner {:eid (:eid (get-prompt state :runner))}))
+  [state shift-held?]
+  (core/process-action "bad-pub-choice" state :runner {:eid (:eid (get-prompt state :runner))
+                                                       :shift-key-held shift-held?}))
 
 ;; General utilities necessary for starting a new game
 (defn find-card
