Merge pull request #8446 from NBKelly/next-big-thing-allows-big-shuffles

Next big thing allows big shuffles

Author: NoahTheDuke

src/clj/game/cards/agendas.clj

@@ -1525,19 +1525,18 @@
                           (play-sfx state side "click-card-2")
                           (wait-for
                                (draw state side 4)
-                               (let [c-hand (count (:hand corp))]
-                                 (continue-ability
-                                   state side
-                                   {:prompt "Shuffle any number of cards into R&D"
-                                    :waiting-prompt true
-                                    :choices {:max c-hand
-                                              :card (every-pred corp? in-hand?)}
-                                    :msg (msg "shuffle " (quantify (count targets) "card")
-                                              " from HQ into R&D")
-                                    :effect (req (doseq [t targets]
-                                                   (move state side t :deck))
-                                                 (shuffle! state side :deck))}
-                                   card nil))))}]})
+                               (continue-ability
+                                 state side
+                                 {:prompt "Shuffle any number of cards into R&D"
+                                  :waiting-prompt true
+                                  :choices {:max (req (count (:hand corp)))
+                                            :card (every-pred corp? in-hand?)}
+                                  :msg (msg "shuffle " (quantify (count targets) "card")
+                                            " from HQ into R&D")
+                                  :effect (req (doseq [t targets]
+                                                 (move state side t :deck))
+                                               (shuffle! state side :deck))}
+                                 card nil)))}]})
 
 (defcard "NEXT Wave 2"
   {:on-score

test/clj/game/cards/agendas_test.clj

@@ -2758,6 +2758,17 @@
     (click-prompt state :corp "Done")
     (is (= 2 (count (:hand (get-corp)))) "Next Big Thing shuffled 2 cards")))
 
+(deftest next-big-thing-shuffle-all-back-test
+  (do-game
+    (new-game {:corp {:hand ["Next Big Thing" "Subliminal Messaging" "Ice Wall" "Vanilla"]
+                      :deck ["Hedge Fund" "NGO Front" "Project Atlas" "IPO"]}})
+    (play-and-score state "Next Big Thing")
+    (card-ability state :corp (get-scored state :corp 0) 0)
+    (is (= 7 (count (:hand (get-corp)))) "Next Big Thing drew 2 cards")
+    (doseq [c (map :title (:hand (get-corp)))]
+      (click-card state :corp c))
+    (is (= 0 (count (:hand (get-corp)))) "Next Big Thing shuffled 7 cards")))
+
 (deftest next-wave-2
   ;; NEXT Wave 2
   (do-game