flagship works for rnd

Author: NBKelly

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)))
 

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