Merge pull request #7276 from francescopellegrini/feature/show-chosen…

…-server-on-hyoubu-precog-manifold show player choice on Hyoubu Precog Manifold, Targeted Marketing, and Saisentan
mtgred · Feb 6, 2024 · 7273503 · 7273503
2 parents 3af679a + 66c85a3
commit 7273503
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/clj/game/cards/ice.clj b/src/clj/game/cards/ice.clj
@@ -3313,21 +3313,21 @@
              :async true
              :msg "do 1 net damage"
              :effect (req (wait-for (damage state side :net 1 {:card card})
-                                    (let [choice (get-in card [:special :saisentan])
+                                    (let [choice (:card-target card)
                                           cards async-result
                                           dmg (some #(when (= (:type %) choice) %) cards)]
                                       (if dmg
-                                        (do (system-msg state :corp (str "uses " (:title card) " to deal a second net damage"))
+                                        (do (system-msg state :corp (str "uses " (:title card) " to deal 1 additional net damage"))
                                             (damage state side eid :net 1 {:card card}))
                                         (effect-completed state side eid)))))}]
     {:on-encounter {:waiting-prompt true
                     :prompt "Choose a card type"
                     :choices ["Event" "Hardware" "Program" "Resource"]
                     :msg (msg "choose the card type " target)
-                    :effect (effect (update! (assoc-in card [:special :saisentan] target)))}
+                    :effect (effect (update! (assoc card :card-target target)))}
      :events [{:event :end-of-encounter
-               :req (req (get-in card [:special :saisentan]))
-               :effect (effect (update! (dissoc-in card [:special :saisentan])))}]
+               :req (req (:card-target card))
+               :effect (effect (update! (dissoc card :card-target)))}]
      :subroutines [sub
                    sub
                    sub]}))

diff --git a/src/clj/game/cards/operations.clj b/src/clj/game/cards/operations.clj
@@ -1283,10 +1283,10 @@
    {:on-play {:prompt "Choose a server"
               :choices (req servers)
               :msg (msg "choose " target)
-              :effect (effect (update! (assoc-in card [:special :hyoubu-precog-target] target)))}
+              :effect (effect (update! (assoc card :card-target target)))}
     :events [{:event :successful-run
               :psi {:req (req (= (zone->name (get-in @state [:run :server]))
-                                 (get-in card [:special :hyoubu-precog-target])))
+                                 (:card-target card)))
                     :not-equal {:msg "end the run"
                                 :async true
                                 :effect (effect (end-run eid card))}}}]}))
@@ -2807,14 +2807,14 @@
                              (gain-tags state :corp eid 1 nil)))}]}))
 
 (defcard "Targeted Marketing"
-  (let [gaincr {:req (req (= (:title (:card context)) (get-in card [:special :marketing-target])))
+  (let [gaincr {:req (req (= (:title (:card context)) (:card-target card)))
                 :async true
-                :msg (msg "gain 10 [Credits] from " (:marketing-target card))
+                :msg "gain 10 [Credits]"
                 :effect (effect (gain-credits :corp eid 10))}]
     {:on-play {:prompt "Name a Runner card"
                :choices {:card-title (req (and (runner? target)
                                                (not (identity? target))))}
-               :effect (effect (update! (assoc-in card [:special :marketing-target] target))
+               :effect (effect (update! (assoc card :card-target target))
                                (system-msg (str "uses " (:title card) " to name " target)))}
      :events [(assoc gaincr :event :runner-install)
               (assoc gaincr :event :play-event)]}))