Merge pull request #7776 from NBKelly/terminal-directive-campaign-cards

Terminal directive campaign cards

Author: NBKelly

resources/public/i18n/en.ftl

@@ -465,6 +465,8 @@ game_current = Current
 
 game_current-phase = Current phase
 
+game_destroyed = Destroyed
+
 game_draw = Draw
 
 game_encounter-ice = Encounter ice

src/clj/game/cards/agendas.clj

@@ -834,6 +834,24 @@
                  :async true
                  :effect (effect (gain-credits :corp eid 5))}}}})
 
+(defcard "Evidence Collection"
+  {:events [{:event :win
+             :req (req (= :corp (:winner context)))
+             :msg "reveal set 2"}]})
+
+(defcard "Evidence Collection 2"
+  {:events [{:event :win
+             :req (req (= :corp (:winner context)))
+             :msg "reveal set 5"}]})
+
+(defcard "Evidence Collection 3"
+  {:events [{:event :win
+             :req (req (= :corp (:winner context)))
+             :msg "reveal set 8"}]})
+
+(defcard "Evidence Collection 4"
+  {:agendapoints-runner (req 1)})
+
 (defcard "False Lead"
   {:abilities [{:req (req (<= 2 (:click runner)))
                 :label "runner loses [Click][Click]"

src/clj/game/cards/assets.clj

@@ -3,7 +3,7 @@
    [clojure.pprint :as pprint]
    [clojure.set :as set]
    [clojure.string :as str]
-   [game.core.access :refer [access-card installed-access-trigger]]
+   [game.core.access :refer [access-bonus access-card get-only-card-to-access installed-access-trigger num-cards-to-access]]
    [game.core.actions :refer [score]]
    [game.core.agendas :refer [update-all-advancement-requirements
                               update-all-agenda-points]]
@@ -26,9 +26,9 @@
    [game.core.eid :refer [complete-with-result effect-completed is-basic-advance-action? make-eid get-ability-targets]]
    [game.core.engine :refer [not-used-once? pay register-events resolve-ability trigger-event-sync]]
    [game.core.events :refer [first-event? no-event? turn-events event-count]]
-   [game.core.flags :refer [lock-zone prevent-current
+   [game.core.flags :refer [in-corp-scored? in-runner-scored? lock-zone prevent-current
                             prevent-draw
-                            register-turn-flag! release-zone]]
+                            register-turn-flag! release-zone when-scored?]]
    [game.core.gaining :refer [gain gain-clicks gain-credits lose lose-clicks
                               lose-credits]]
    [game.core.hand-size :refer [corp-hand-size+ runner-hand-size+]]
@@ -37,7 +37,7 @@
    [game.core.initializing :refer [card-init]]
    [game.core.installing :refer [corp-install corp-install-msg]]
    [game.core.moving :refer [as-agenda mill move remove-from-currently-drawing
-                             swap-cards swap-installed trash trash-cards]]
+                             swap-agendas swap-cards swap-installed trash trash-cards]]
    [game.core.optional :refer [get-autoresolve set-autoresolve]]
    [game.core.payment :refer [can-pay? cost-value ->c]]
    [game.core.play-instants :refer [play-instant]]
@@ -1430,6 +1430,61 @@
              :async true
              :effect (effect (gain-credits eid 1))}]})
 
+(defcard "Investigator Inez Delgado A"
+  {:events [{:event :agenda-scored
+             :interactive (req true)
+             :req (req (seq (:scored runner)))
+             :async true
+             :effect (req
+                       (let [scored (:card context)]
+                         (continue-ability
+                           state side
+                           {:optional
+                            {:prompt (msg "Swap " (:title scored) " for an agenda in the Runner's score area?")
+                             :waiting-prompt true
+                             :req (req (seq (get-in @state [:runner :scored])))
+                             :yes-ability
+                             {:prompt (str "Choose a scored Runner agenda to swap with " (:title scored))
+                              :choices {:req (req (and (in-runner-scored? state side target)
+                                                       (:agendapoints target)
+                                                       (pos? (:agendapoints target))))}
+                              :msg (msg "swap " (card-str state scored) " for " (card-str state target))
+                              :async true
+                              :effect (req (let [new-scored (second (swap-agendas state side scored target))]
+                                             (continue-ability
+                                               state side
+                                               (:on-score (card-def new-scored))
+                                               new-scored nil)))}}}
+                           card targets)))}]})
+
+(defcard "Investigator Inez Delgado A 2"
+  (letfn [(swap-abi [stolen]
+            {:prompt (str "Swap " (:title stolen) " with an agenda in your score area?")
+             :req (req (seq (:scored corp)))
+             :choices {:req (req (in-corp-scored? state side target))}
+             :msg (msg "swap " (card-str state stolen) " for " (card-str state target))
+             :effect (req (swap-agendas state side target stolen))})]
+    {:events [{:event :agenda-stolen
+               :interactive (req true)
+               :skippable true
+               :async true
+               :effect (req (let [stolen (:card context)]
+                              (if (:on-score (card-def stolen))
+                                (continue-ability
+                                  state side
+                                  {:optional {:prompt (str "Resolve the when-scored ability on " (:title stolen))
+                                              :waiting-prompt true
+                                              :yes-ability {:async true
+                                                            :msg (msg "resolve the when-scored ability on " (:title stolen))
+                                                            :effect (req (wait-for
+                                                                           (resolve-ability state side (:on-score (card-def stolen)) stolen nil)
+                                                                           (if (get-card state stolen)
+                                                                             (continue-ability state side (swap-abi stolen) card nil)
+                                                                             (effect-completed state side eid))))}
+                                              :no-ability (swap-abi stolen)}}
+                                  card nil)
+                                (continue-ability state side (swap-abi stolen) card nil))))}]}))
+
 (defcard "Isabel McGuire"
   {:abilities [{:action true
                 :label "Add an installed card to HQ"
@@ -1682,6 +1737,28 @@
              :msg "give the Runner 1 tag"
              :effect (req (gain-tags state :runner eid 1))}]})
 
+(defcard "Lt. Todachine 2"
+  {:events [{:event :rez
+             :req (req (ice? (:card context)))
+             :async true
+             :msg "give the Runner 1 tag"
+             :effect (req (gain-tags state :runner eid 1))}
+            {:event :breach-server
+             :interactive (req true)
+             :player :corp
+             :req (req tagged)
+             :async true
+             ;; the random-access check needs to be dereffed to work correctly
+             :effect (req (continue-ability
+                            state side
+                            {:req (req
+                                    (and tagged
+                                         (> (:random-access-limit (num-cards-to-access state :runner target nil)) 1)
+                                         (not (get-only-card-to-access state))))
+                             :msg (msg "make the runner access 1 card fewer")
+                             :effect (req (access-bonus state :runner target -1))}
+                            card targets))}]})
+
 (defcard "Malia Z0L0K4"
   (let [unmark
         (req (when-let [malia-target (get-in card [:special :malia-target])]
@@ -3045,6 +3122,20 @@
                                       (contains? break-ability :break-cost)))))
                        :value true}]})
 
+(defcard "Trojan"
+  {:flags {:rd-reveal (req true)}
+   :poison true
+   :on-access {:async true
+               :req (req (not (in-discard? card)))
+               :msg (msg "lose 2 [Credits], destroy itself, and trash 1 card from HQ at random")
+               :effect (req (wait-for
+                              (lose-credits state :corp 2)
+                              (move state side card :destroyed)
+                              (let [trash-target (first (shuffle (get-in @state [:corp :hand])))]
+                                (if trash-target
+                                  (trash state :corp eid trash-target {:cause-card card})
+                                  (effect-completed state side eid)))))}})
+
 (defcard "Turtlebacks"
   {:events [{:event :server-created
              :msg "gain 1 [Credits]"

src/clj/game/cards/ice.clj

@@ -2753,7 +2753,9 @@
                  trash-program-sub
                  trash-hardware-sub
                  {:label "Runner loses 3 [Credits], if able. End the run"
-                  :msg "make the Runner lose 3 [Credits] and end the run"
+                  :msg (msg (if (>= (:credit runner) 3)
+                              "make the Runner lose 3 [Credits] and end the run"
+                              "end the run"))
                   :async true
                   :effect (req (if (>= (:credit runner) 3)
                                  (wait-for (lose-credits state :runner (make-eid state eid) 3)
@@ -2765,9 +2767,12 @@
                  trash-resource-sub
                  (do-net-damage 1)
                  {:label "Runner loses [click], if able. End the run"
-                  :msg "make the Runner lose [click] and end the run"
+                  :msg (msg (if (pos? (:click runner))
+                              "make the Runner lose [click] and end the run"
+                              "end the run"))
                   :async true
-                  :effect (req (lose-clicks state :runner 1)
+                  :effect (req (when (pos? (:click runner))
+                                 (lose-clicks state :runner 1))
                                (end-run state :corp eid card))}]})
 
 (defcard "Macrophage"

src/clj/game/cards/operations.clj

@@ -1849,6 +1849,16 @@
      [{:type :steal-additional-cost
        :value (req (->c :credit (+ 4 (* 2 (get-counters target :advancement)))))}]}))
 
+(defcard "Net Watchlist"
+  {:implementation "Only modifies ability costs, does not adjust non-ability uses"
+   :static-abilities [{:type :card-ability-additional-cost
+                       :req (req (and (has-subtype? (:card context) "Icebreaker")
+                                      (not (get-in context [:ability :break]))))
+                       :value (->c :credit 2)}
+                      {:type :break-sub-additional-cost
+                       :req (req (has-subtype? (:card context) "Icebreaker"))
+                       :value (->c :credit 2)}]})
+
 (defcard "Neural EMP"
   {:on-play
    {:req (req (last-turn? state :runner :made-run))

src/clj/game/cards/programs.clj

@@ -3209,6 +3209,22 @@
    :events [{:event :corp-click-draw
              :msg (msg "reveal that they drew " (:title (:card context)))}]})
 
+(defcard "Surveillance Network Key 2"
+  (letfn [(ttw-ab [name server]
+            {:label (str "Access an additional card in " name)
+             :cost [(->c :credit 2)]
+             :req (req run)
+             :once :per-turn
+             :keep-menu-open :while-2-power-tokens-left
+             :msg (msg "access 1 additional card from " name " for the remainder of the run")
+             :effect (effect (register-events
+                               card [(breach-access-bonus server 1 {:duration :end-of-run})]))})]
+    {:implementation "Only implemented for click to draw"
+     :abilities [(ttw-ab "R&D" :rd)
+                 (ttw-ab "HQ" :hq)]
+     :events [{:event :corp-click-draw
+               :msg (msg "reveal that they drew " (:title (:card context)))}]}))
+
 (defcard "Switchblade"
   (auto-icebreaker {:abilities [(break-sub (->c :credit 1 {:stealth 1}) 0 "Sentry")
                                 (strength-pump (->c :credit 1 {:stealth 1}) 7 :end-of-encounter)]}))

src/clj/game/cards/resources.clj

@@ -12,7 +12,7 @@
    [game.core.card :refer [agenda? asset? assoc-host-zones card-index corp? condition-counter?
                            event? facedown? get-agenda-points get-card get-counters
                            get-title get-zone hardware? has-subtype? has-any-subtype? ice? identity?
-                           in-discard? in-hand? in-scored? installed? is-type? program? resource? rezzed?
+                           in-discard? in-hand? in-set-aside? in-scored? installed? is-type? program? resource? rezzed?
                            runner? upgrade? virus-program?]]
    [game.core.card-defs :refer [card-def]]
    [game.core.charge :refer [can-charge charge-ability]]
@@ -1812,14 +1812,58 @@
                 :prompt "Choose a server"
                 :choices (req remotes)
                 :req (req (:stole-agenda runner-reg))
-                :effect (req (as-agenda state :runner card 0)
-                             (let [zone (server->zone state target)
+                :effect (req (let [moved-card (as-agenda state :runner card 0)
+                                   zone (server->zone state target)
                                    path (conj (into [(->c :corp)] zone) :content)
-                                   cards (enumerate-str (map :title (get-in @state path)))]
-                               (wait-for
-                                 (reveal state :corp (make-eid state eid) targets)
-                                 (system-msg state side
-                                             (str "uses " (:title card) " to reveal " cards " from " target))
+                                   cards (get-in @state path)]
+                               (register-events
+                                 state side moved-card
+                                 [{:event :win
+                                   :req (req (= :runner (:winner context)))
+                                   :unregister-once-resolved true
+                                   :msg "reveal set 2"}])
+                               (expose state :runner eid (get-in @state [:corp :servers (unknown->kw target) :content]))))}]})
+
+(defcard "Investigator Inez Delgado 2"
+  {:abilities [{:msg (msg "add itself to [their] score area as an agenda worth 0 agenda points")
+                :label "Add to score area and reveal the top 3 cards of R&D"
+                :async true
+                :req (req (:stole-agenda runner-reg))
+                :effect (req (let [moved-card (as-agenda state :runner card 0)]
+                               (register-events
+                                 state side moved-card
+                                 [{:event :win
+                                   :req (req (= :runner (:winner context)))
+                                   :unregister-once-resolved true
+                                   :msg "reveal set 5"}])
+                               (if (seq (:deck corp))
+                                 (reveal-loud state side eid card nil (take 3 (:deck corp)))
+                                 (effect-completed state side eid))))}]})
+
+(defcard "Investigator Inez Delgado 3"
+  {:abilities [{:msg (msg "add itself to [their] score area as an agenda worth 0 agenda points")
+                :label "Add to score area and reveal the top 3 cards of R&D"
+                :async true
+                :req (req (:stole-agenda runner-reg))
+                :effect (req (let [moved-card (as-agenda state :runner card 0)]
+                               (register-events
+                                 state side moved-card
+                                 [{:event :win
+                                   :req (req (= :runner (:winner context)))
+                                   :unregister-once-resolved true
+                                   :msg "reveal set 8"}])
+                               (if (seq (:hand corp))
+                                 (reveal-loud state side eid card nil (:hand corp))
+                                 (effect-completed state side eid))))}]})
+
+(defcard "Investigator Inez Delgado 4"
+  {:abilities [{:msg (msg "add itself to [their] score area as an agenda worth 0 agenda points")
+                :label "Add to score area and reveal the top 3 cards of R&D"
+                :async true
+                :req (req (:stole-agenda runner-reg))
+                :effect (req (let [moved-card (as-agenda state :runner card 0)]
+                               (if (seq (concat (:hand corp) [(first (:deck corp))]))
+                                 (reveal-loud state side eid card nil (concat (:hand corp) [(first (:deck corp))]))
                                  (effect-completed state side eid))))}]})
 
 (defcard "Jackpot!"
@@ -3061,6 +3105,21 @@
                :effect (effect (update! (dissoc card :card-target)))}]
      :abilities [ability]}))
 
+(defcard "Shadow Team"
+  {:on-draw {:req (req (and (runner-can-pay-and-install? state side eid card)
+                            (in-set-aside? card)))
+             :msg (msg "install itself")
+             :async true
+             :effect (req (runner-install state side eid card))}
+   :events [{:event :run
+             :req (req (seq (:hand runner)))
+             :msg :cost
+             :cost [(->c :trash-from-hand 1)]}
+            {:event :successful-run
+             :req (req (#{:hq :rd :archives} (target-server context)))
+             :msg (msg "destroy itself")
+             :effect (req (move state side card :destroyed))}]})
+
 (defcard "Smartware Distributor"
   (let [start-of-turn-ability {:once :per-turn
                                :automatic :gain-credits

src/clj/game/core/damage.clj

@@ -81,6 +81,7 @@
                   (swap! state update-in [:stats :corp :damage dmg-type] (fnil + 0) n)
                   (if (< (count hand) n)
                     (do (flatline state)
+                        (trigger-event state side :win {:winner :corp})
                         (trash-cards state side eid cards-trashed {:unpreventable true}))
                     (wait-for (trash-cards state side cards-trashed {:unpreventable true
                                                                      :cause dmg-type

src/clj/game/core/diffs.clj

@@ -252,6 +252,7 @@
    :play-area
    :current
    :set-aside
+   :destroyed
    :click
    :credit
    :toast