Merge pull request #6688 from francescopellegrini/fix/self-references

Replace self references

Author: NoahTheDuke

src/clj/game/cards/agendas.clj

@@ -168,13 +168,13 @@
      :choices ["Draw 1 card" "Gain 1 [Credits]" "No action"]
      :effect (req (case target
                     "Gain 1 [Credits]"
-                    (do (system-msg state :corp (str "uses Advanced Concept Hopper to gain 1 [Credits]"))
+                    (do (system-msg state :corp (str "uses " (:title card) " to gain 1 [Credits]"))
                         (gain-credits state :corp eid 1))
                     "Draw 1 card"
-                    (do (system-msg state :corp (str "uses Advanced Concept Hopper to draw 1 card"))
+                    (do (system-msg state :corp (str "uses " (:title card) " to draw 1 card"))
                         (draw state :corp eid 1))
                     "No action"
-                    (do (system-msg state :corp "declines to use Advanced Concept Hopper")
+                    (do (system-msg state :corp (str "declines to use " (:title card)))
                         (effect-completed state side eid))))}]})
 
 (defcard "Ancestral Imager"
@@ -672,7 +672,7 @@
     :waiting-prompt true
     :prompt "Choose a card to derez"
     :choices {:card #(rezzed? %)}
-    :cancel-effect (effect (system-msg :runner "declines to use Élivágar Bifurcation to derez a card")
+    :cancel-effect (effect (system-msg :runner (str "declines to use " (:title card) " to derez a card"))
                            (effect-completed eid))
     :effect (effect (derez target))}})
 
@@ -975,7 +975,7 @@
                                              :effect (effect (gain-bad-publicity :corp 1))}}}
                              card nil)
                            (let [n (* 3 (count-bad-pub state))]
-                             (system-msg state side (str "uses Illicit Sales to gain " n " [Credits]"))
+                             (system-msg state side (str "uses " (:title card) " to gain " n " [Credits]"))
                              (gain-credits state side eid n))))}})
 
 (defcard "Improved Protein Source"
@@ -1041,7 +1041,7 @@
                           (in-hand? %))}
     :msg (msg "trash " (quantify (count targets) "card") " from HQ")
     :async true
-    :cancel-effect (req (system-msg state :corp "declines to use Longevity Serum to trash any cards from HQ")
+    :cancel-effect (req (system-msg state :corp (str "declines to use " (:title card) " to trash any cards from HQ"))
                         (shuffle-into-rd-effect state side eid card 3)
                         (effect-completed state side eid))
     :effect (req (wait-for (trash-cards state side targets {:unpreventable true :cause-card card})
@@ -1265,7 +1265,7 @@
 
 (defcard "Posted Bounty"
   {:on-score {:optional
-              {:prompt "Forfeit Posted Bounty to give the Runner 1 tag and take 1 bad publicity?"
+              {:prompt "Forfeit this agenda to give the Runner 1 tag and take 1 bad publicity?"
                :yes-ability
                {:msg "give the Runner 1 tag and take 1 bad publicity"
                 :async true
@@ -1332,7 +1332,7 @@
                 :req (req (pos? (get-counters card :agenda)))
                 :msg (msg "add " (:title target) " to HQ from R&D")
                 :choices (req (cancellable (:deck corp) :sorted))
-                :cancel-effect (effect (system-msg "cancels the effect of Project Atlas"))
+                :cancel-effect (effect (system-msg (str "declines to use " (:title card))))
                 :effect (effect (shuffle! :deck)
                                 (move target :hand))}]})
 
@@ -1547,7 +1547,7 @@
                            (update-all-advancement-requirements state)
                            (update-all-agenda-points state)
                            (check-win-by-agenda state side))
-              :cancel-effect (effect (system-msg "declines to use Regenesis to reveal an agenda in Archives"))}})
+              :cancel-effect (effect (system-msg (str "declines to use " (:title card) " to reveal an agenda in Archives")))}})
 
 (defcard "Remastered Edition"
   {:on-score {:effect (effect (add-counter card :agenda 1))
@@ -1597,14 +1597,14 @@
 
 (defcard "Research Grant"
   {:on-score {:interactive (req true)
-              :silent (req (empty? (filter #(= (:title %) "Research Grant") (all-installed state :corp))))
+              :silent (req (empty? (filter #(= (:title %) (:title card)) (all-installed state :corp))))
               :async true
               :effect (effect (continue-ability
-                                {:prompt "Choose another installed copy of Research Grant to score"
-                                 :choices {:card #(= (:title %) "Research Grant")}
+                                {:prompt (str "Choose another installed copy of " (:title card) " to score")
+                                 :choices {:card #(= (:title %) (:title card))}
                                  :interactive (req true)
                                  :async true
-                                 :req (req (seq (filter #(= (:title %) "Research Grant") (all-installed state :corp))))
+                                 :req (req (seq (filter #(= (:title %) (:title card)) (all-installed state :corp))))
                                  :effect (effect (score eid (get-card state target) {:no-req true}))
                                  :msg "score another installed copy of itself"}
                                 card nil))}})
@@ -1712,19 +1712,19 @@
              :cancel-effect (req (if (= side :runner)
                                    (wait-for (draw state :corp 1)
                                              (clear-wait-prompt state :corp)
-                                             (system-msg state :runner "declines to trash a card for Standoff")
-                                             (system-msg state :corp "uses Standoff to draw 1 card and gain 5 [Credits]")
+                                             (system-msg state :runner (str "declines to trash a card for " (:title card)))
+                                             (system-msg state :corp (str "uses " (:title card) " to draw 1 card and gain 5 [Credits]"))
                                              (gain-credits state :corp eid 5))
-                                   (do (system-msg state :corp "declines to trash a card for Standoff")
+                                   (do (system-msg state :corp (str "declines to trash a card for " (:title card)))
                                        (clear-wait-prompt state :runner)
                                        (effect-completed state :corp eid))))
              :effect (req (wait-for (trash state side target
                                            (if (= side :corp)
                                              {:unpreventable true :cause-card card}
                                              {:unpreventable true :cause-card card :cause :forced-to-trash}))
-                                    (system-msg state side (str "trashes " (card-str state target) " for Standoff"))
+                                    (system-msg state side (str "trashes " (card-str state target) " for " (:title card)))
                                     (clear-wait-prompt state (other-side side))
-                                    (show-wait-prompt state side (str (side-str (other-side side)) " to trash a card for Standoff"))
+                                    (show-wait-prompt state side (str (side-str (other-side side)) " to trash a card for " (:title card)))
                                     (continue-ability state (other-side side) (stand (other-side side)) card nil)))})]
     {:on-score
      {:interactive (req true)

src/clj/game/cards/assets.clj

@@ -455,7 +455,7 @@
                  (effect
                   (continue-ability
                    {:optional
-                    {:prompt (msg "Trash Clearinghouse to do " (get-counters card :advancement) " meat damage?")
+                    {:prompt (msg "Trash this asset to do " (get-counters card :advancement) " meat damage?")
                      :yes-ability
                      {:async true
                       :msg "do 1 meat damage for each hosted advancement counter"
@@ -744,7 +744,7 @@
                 :effect (effect (add-prop target :advance-counter 1 {:placed true}))}]})
 
 (defcard "Echo Chamber"
-  {:abilities [{:label "Add Echo Chamber to your score area as an agenda worth 1 agenda point"
+  {:abilities [{:label "Add this asset to your score area as an agenda worth 1 agenda point"
                 :cost [:click 3]
                 :msg "add itself to their score area as an agenda worth 1 agenda point"
                 :effect (req (as-agenda state :corp card 1))}]})
@@ -876,7 +876,7 @@
               :async true
               :effect (effect (gain-tags :corp eid (tag-count (get-card state card))))}
      :abilities [{:cost [:click 1 :advancement 7]
-                  :label "Add False Flag to your score area as an agenda worth 3 agenda points"
+                  :label "Add this asset to your score area as an agenda worth 3 agenda points"
                   :msg "add itself to their score area as an agenda worth 3 agenda points"
                   :effect (req (as-agenda state :corp card 3))}]}))
 
@@ -890,7 +890,7 @@
   {:can-host (req (and (or (asset? target) (agenda? target))
                        (> 2 (count (:hosted card)))))
    :trash-cost-bonus (req (* 3 (count (:hosted card))))
-   :abilities [{:label "Install an asset or agenda on Full Immersion RecStudio"
+   :abilities [{:label "Install an asset or agenda on this asset"
                 :req (req (< (count (:hosted card)) 2))
                 :cost [:click 1]
                 :prompt "Choose an asset or agenda to install"
@@ -901,7 +901,7 @@
                 :msg "install and host an asset or agenda"
                 :async true
                 :effect (effect (corp-install eid target card nil))}
-               {:label "Install a previously-installed asset or agenda on Full Immersion RecStudio (fixes only)"
+               {:label "Install a previously-installed asset or agenda on this asset (fixes only)"
                 :req (req (< (count (:hosted card)) 2))
                 :prompt "Choose an installed asset or agenda to host"
                 :choices {:card #(and (or (asset? %) (agenda? %))
@@ -927,7 +927,7 @@
             :effect (effect (damage eid :net (get-counters (get-card state card) :advancement)
                                     {:card card}))}
    :abilities [{:cost [:click 1 :advancement 3]
-                :label "Add Gene Splicing to your score area as an agenda worth 1 agenda point"
+                :label "Add this asset to your score area as an agenda worth 1 agenda point"
                 :msg "add itself to their score area as an agenda worth 1 agenda point"
                 :effect (req (as-agenda state :corp card 1))}]})
 
@@ -1126,8 +1126,8 @@
                          :effect (req (wait-for (damage state :runner :brain 1 {:card card})
                                                 (trash state side eid card {:cause-card card})))}
                         :unsuccessful
-                        {:effect (effect (add-counter card :power 1)
-                                         (system-msg "adds 1 power counter to Kuwinda K4H1U3"))}}}]})
+                        {:effect (effect (add-counter card :power 1))
+                         :msg "add 1 power counter to itself"}}}]})
 
 (defcard "Lady Liberty"
   {:abilities [{:cost [:click 3]
@@ -1272,11 +1272,11 @@
     {:derezzed-events [corp-rez-toast]
      :events [(assoc ability :event :corp-turn-begins)]
      :on-rez {:effect (req (add-counter state side card :credit 8))}
-     :abilities [(set-autoresolve :auto-reshuffle "Marilyn Campaign's shuffling itself back into R&D")]
+     :abilities [(set-autoresolve :auto-reshuffle "Marilyn Campaign shuffling itself back into R&D")]
      :on-trash {:interactive (req true)
                 :optional
                 {:waiting-prompt true
-                 :prompt "Shuffle Marilyn Campaign into R&D?"
+                 :prompt (msg "Shuffle " (:title card) " into R&D?")
                  :autoresolve (get-autoresolve :auto-reshuffle)
                  :player :corp
                  :yes-ability {:msg "shuffle itself back into R&D"
@@ -1358,7 +1358,7 @@
                                         (moon-pool-place-advancements (dec x))
                                         card nil)
                                       (effect-completed state side eid))))
-             :cancel-effect (effect (system-msg "declines to use Moon Pool to place advancement counters")
+             :cancel-effect (effect (system-msg (str "declines to use " (:title card) " to place advancement counters"))
                                    (effect-completed eid))})]
     (let [moon-pool-reveal-ability
           {:prompt "Reveal up to 2 facedown cards from Archives and shuffle them into R&D"
@@ -1379,7 +1379,7 @@
                                         (moon-pool-place-advancements agenda-count)
                                         card nil)
                                       (effect-completed state side eid)))))
-           :cancel-effect (effect (system-msg "declines to use Moon Pool to reveal any cards in Archives")
+           :cancel-effect (effect (system-msg (str "declines to use " (:title card) " to reveal any cards in Archives"))
                                   (effect-completed eid))}
           moon-pool-discard-ability
             {:prompt "Trash up to 2 cards from HQ"
@@ -1393,7 +1393,7 @@
                                       state side
                                       moon-pool-reveal-ability
                                       card nil)))
-             :cancel-effect (effect (system-msg "declines to use Moon Pool to trash any cards from HQ")
+             :cancel-effect (effect (system-msg (str "declines to use " (:title card) " to trash any cards from HQ"))
                                     (continue-ability moon-pool-reveal-ability card nil))}]
       {:abilities [{:label "Trash up to 2 cards from HQ. Shuffle up to 2 cards from Archives into R&D"
                     :cost [:remove-from-game]
@@ -1681,7 +1681,7 @@
                                     (let [cnt (count (get-in @state [:runner :hand]))
                                           credits (quot cnt 2)]
                                       (system-msg state :corp
-                                                  (str "uses Personalized Portal to force the runner to draw "
+                                                  (str "uses " (:title card) " to force the runner to draw "
                                                        "1 card and gain " credits " [Credits]"))
                                       (gain-credits state :corp eid credits))))}]})
 
@@ -1870,7 +1870,7 @@
                  (effect
                    (continue-ability
                      {:optional
-                      {:prompt "Trash Rashida Jaheem to gain 3 [Credits] and draw 3 cards?"
+                      {:prompt "Trash this asset to gain 3 [Credits] and draw 3 cards?"
                        :msg "gain 3 [Credits] and draw 3 cards"
                        :yes-ability
                        {:async true
@@ -1917,7 +1917,7 @@
                                   :prompt "Choose a card that can be advanced"
                                   :choices {:card can-be-advanced?}
                                   :effect (effect (add-counter target :advancement num-counters {:placed true})
-                                                  (system-msg (str "uses Reconstruction Contract to move " (quantify num-counters "hosted advancement token") " to " (card-str state target)))
+                                                  (system-msg (str "uses " (:title card) " to move " (quantify num-counters "hosted advancement token") " to " (card-str state target)))
                                                   (effect-completed eid))}
                                  card nil)))}]})
 
@@ -2131,7 +2131,7 @@
    {:optional
     {:req (req (not (in-deck? card)))
      :waiting-prompt true
-     :prompt "Pay credits to use Shi.Kyū ability?"
+     :prompt (msg "Pay credits to use " (:title card) " ability?")
      :yes-ability
      {:prompt "How many credits do you want to pay?"
       :choices :credit
@@ -2145,13 +2145,13 @@
                      :waiting-prompt true
                      :choices [(str "Take " dmg " net damage") "Add Shi.Kyū to score area"]
                      :async true
-                     :effect (req (if (= target "Add Shi.Kyū to score area")
+                     :effect (req (if (str/starts-with? target "Add")
                                     (do (system-msg state :runner (str "adds " (:title card)
                                                                        " to their score area as an agenda worth "
                                                                        (quantify -1 "agenda point")))
                                         (as-agenda state :runner card -1)
                                         (effect-completed state side eid))
-                                    (do (system-msg state :runner (str "takes " dmg " net damage from Shi.Kyū"))
+                                    (do (system-msg state :runner (str "takes " dmg " net damage from " (:title card)))
                                         (damage state :corp eid :net dmg {:card card}))))})
                   card targets))}}}})
 
@@ -2181,8 +2181,8 @@
    :access {:optional
             {:req (req (not (in-discard? card)))
              :waiting-prompt true
-             :prompt "Pay 4 [Credits] to use Snare! ability?"
-             :no-ability {:effect (effect (system-msg "declines to use Snare!"))}
+             :prompt (msg "Pay 4 [Credits] to use " (:title card) " ability?")
+             :no-ability {:effect (effect (system-msg (str "declines to use " (:title card))))}
              :yes-ability {:async true
                            :cost [:credit 4]
                            :msg "do 3 net damage and give the Runner 1 tag"
@@ -2263,7 +2263,7 @@
                            :req (req (and (corp? target)
                                           (installed? target)))}
                  :msg (msg "trash " (card-str state target) " and gain 3 [Credits]")
-                 :cancel-effect (req (system-msg state :corp "declines to use Svyatogor Excavator")
+                 :cancel-effect (req (system-msg state :corp (str "declines to use " (:title card)))
                                      (effect-completed state side eid))
                  :effect (req (wait-for (trash state side target {:unpreventable true :cause-card card})
                                         (gain-credits state side eid 3)))}]
@@ -2605,11 +2605,11 @@
                                   card nil))}]})
 
 (defcard "Worlds Plaza"
-  {:abilities [{:label "Install an asset on Worlds Plaza"
+  {:abilities [{:label "Install an asset on this asset"
                 :req (req (< (count (:hosted card)) 3))
                 :cost [:click 1]
                 :keep-menu-open :while-clicks-left
-                :prompt "Choose an asset to install on Worlds Plaza"
+                :prompt "Choose an asset to install"
                 :choices {:card #(and (asset? %)
                                       (in-hand? %)
                                       (corp? %))}