Merge branch 'master' into expend-uses-cdef

data/quotes-corp.edn

@@ -153,6 +153,15 @@
   "Default" ["Intrusion Detected. Eyes Forward. Maintain peak efficiency."]
   "Shaper"
   ["Why would you choose to get in our way when we are shaping the world of tomorrow in ways beyond your limited understanding?"]}
+ "Haas-Bioroid: Precision Design"
+ {"Anarch"
+  ["Looks like we are about to get some live stress testing. Make sure to record the results."]
+  "Criminal"
+  ["They may call themselves a professional but in the end, their work is sloppy."]
+  "Default"
+  ["Authorizing emergency funding, unrestricted access to ICE, priority access to any relevant staff and facilities. Avoid any project slowdown."]
+  "Shaper"
+  ["People always want to seek out what is exciting today. We focus on what will be significant tomorrow."]}
  "Haas-Bioroid: Stronger Together"
  {"Anarch" ["Humanity does not end here. It merely begins its Golden Age."]
   "Criminal"
@@ -237,6 +246,15 @@
   ["From a house of knives// To a lotus field serene// Feel the thousand cuts"]
   "Shaper"
   ["An expert navigator of the network it seems. They will not so easily master ours."]}
+ "Jinteki: Restoring Humanity"
+ {"Anarch"
+  ["Disruptive, impulsive, full of noise and no thought. A caricature of the modern human."]
+  "Criminal"
+  ["There is a rat in the walls, looking for some cheese. Set some out for it."]
+  "Default"
+  ["Our network is our garden. You are welcome to enter, but beware the thorns."]
+  "Shaper"
+  ["You may appreciate what you find, but that will not let you master it."]}
  "MirrorMorph: Endless Iteration"
  {"Anarch"
   ["Our subroutines estimate an 92.2% chance of such a reckless runner flatlining themself before even catching a glimpse of our servers. Simulations upon simulations wind up the same."]
@@ -272,6 +290,13 @@
   ["They are targeting our ad revenue algorithms. Boost the signals, we'll zero in on their next pass."]
   "Default" ["Stay out of our business unless you want to become tomorrow's headline."]
   "Shaper" ["Seems they have not read our Terms & Conditions - which still apply."]}
+ "NBN: Reality Plus"
+ {"Anarch" ["You claim to fight for a better world but we created it."]
+  "Criminal"
+  ["You can only live in the shadows until we turn the spotlight on you."]
+  "Default" ["Even an illusion can be worth protecting."]
+  "Shaper"
+  ["We have created the wind indoors, put the sky in space and manufactured a slice of nature. What is your great work?"]}
  "NBN: The World is Yours*"
  {"Anarch" ["Full of sound and fury, signifying nothing."]
   "Criminal" ["The robbed that smiles steals something from the thief."]
@@ -420,6 +445,10 @@
   "Criminal" ["We keep everyone safe. You do not."]
   "Default" ["They cannot possibly comprehend the stability we bring to the worlds."]
   "Shaper" ["We know what is good for everyone. You do not."]}
+ "The Syndicate: Profit over Principle"
+ {"Default" ["There have been some issues, do what is best for the business."]
+  "The Catalyst: Convention Breaker"
+  ["We have noticed some disruptions. Soon they will discover that the world is not so kind to those who step out of line."]}
  "Titan Transnational: Investing In Your Future"
  {"Anarch"
   ["There is no future for those who fight it.//Biting the hand that feeds the market? They'll earn much more than a slap to the face."]
@@ -470,4 +499,13 @@
   "Shaper"
   ["It's a shame we can't cooperate and stand on opposing sides.. Together, we could have achieved so much more..."]
   "Sunny Lebeau: Security Specialist"
-  ["GlobalSec is poking around? Get the CIO to file for an injunction. Make sure we leave everything squeeky clean on our end.\n"]}}
+  ["GlobalSec is poking around? Get the CIO to file for an injunction. Make sure we leave everything squeeky clean on our end.\n"]}
+ "Weyland Consortium: Built to Last"
+ {"Anarch"
+  ["We have some trouble makers. I expect they will scratch the paint."]
+  "Criminal"
+  ["Someone has been casing the new project. Block them, hire them, shoot them, doesn't matter, but make sure they are not a problem."]
+  "Default"
+  ["You cannot leave Earth without the Beanstalk we built. You cannot reach the moon without the ships we built. You cannot survive on the moon without the habitats we built. And yet our presence on the moon is being challenged?"]
+  "Shaper"
+  ["Do you think this is fun? We take our work seriously and will not stand for interference."]}}

data/quotes-runner.edn

@@ -399,6 +399,12 @@
   "Weyland"
   ["If you think Weyland is working for your good without blood on their hands, think again."]
   "Weyland Consortium: Because We Built It" ["They cower behind their walls"]}
+ "René \"Loup\" Arcemont: Party Animal"
+ {"Default" ["Freedom isn't a place you can run to."]
+  "Haas-Bioroid" ["All work and no play makes Loup a very angry boy."]
+  "Jinteki" ["I really appreciate their work, but I still don't like them."]
+  "NBN" ["Shut-up, I'll get my news from my eyes."]
+  "Weyland Consortium" ["What was that saying about the bigger they are and falling?"]}
  "Rielle \"Kit\" Peddler: Transhuman"
  {"Default" ["They are trapped by their physical ideals. I must set them free."]
   "Haas-Bioroid"
@@ -452,6 +458,18 @@
   ["Their books are always kept clean. Thats why we need to dig deeper."]
   "Weyland"
   ["I did get quite a few contracts from Weyland's divisions over the years... The amount of dirt they're buried under must equal many ancient civilizations."]}
+ "Tāo Salonga: Telepresence Magician"
+ {"Default" ["Just don't ask me how I do it."]
+  "Haas-Bioroid" ["{Whirring Rotors} I feel a bit like a bioroid sometimes."]
+  "Jinteki"
+  ["What a narrow view of humanity. I will show you what a human can do."]
+  "NBN" ["Filter out the noise. Clear your mind. I am ready."]
+  "Weyland Consortium"
+  ["For all your grand designs, you are never worried about the cracks and who might be falling through them."]}
+ "The Catalyst: Convention Breaker"
+ {"Default" ["This is going to be big."]
+  "The Syndicate: Profit over Princible"
+  ["Things are changing. It is time to see where it will lead us."]}
  "The Masque: Cyber General" {"Default"
                               ["With winds of change at our back, victory is certain."]}
  "The Professor: Keeper of Knowledge"
@@ -503,4 +521,15 @@
   "NBN" ["You're looking for the wrong person in all the wrong places. Keep looking."]
   "Weyland"
   ["Now, these people don't know how to play fair. And they're bad losers, at that."]}
- "Wyvern: Chemically Enhanced" {"Default" ["Burning cortex? There's a pill for that."]}}
+ "Wyvern: Chemically Enhanced" {"Default" ["Burning cortex? There's a pill for that."]}
+ "Zahya Sadeghi: Versatile Smuggler"
+ {"Default"
+  ["You have something someone wants, and I think I can offer them a better price."]
+  "Haas-Bioroid"
+  ["The great thing about new product is there is always someone who wants the new designs."]
+  "Jinteki"
+  ["Get in, authorize these prescriptions, and get out. Then pay for Soha's bone treatment."]
+  "NBN"
+  ["I was surprised that someone asked for all the raw footage for a sensie, but if they will pay I'll find it for them."]
+  "Weyland Consortium"
+  ["Massive delivery from the beanstalk. Too bad some was damaged and had to be destroyed."]}}

src/clj/game/cards/agendas.clj

@@ -212,7 +212,7 @@
                                                         eid target nil
                                                         {:ignore-all-cost true
                                                          :msg-keys {:install-source card
-                                                                    :index target-position
+                                                                    :origin-index target-position
                                                                     :display-origin true}
                                                          :install-state :rezzed-no-cost})))
                                        :cancel-effect

src/clj/game/cards/assets.clj

@@ -25,7 +25,7 @@
                               remaining-draws]]
    [game.core.effects :refer [is-disabled-reg? register-lingering-effect update-disabled-cards]]
    [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]]
+   [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.expose :refer [expose-prevent]]
    [game.core.flags :refer [lock-zone prevent-current
@@ -1636,10 +1636,8 @@
         (req (when-let [malia-target (get-in card [:special :malia-target])]
                (update! state side (assoc-in (get-card state card) [:special :malia-target] nil))
                (remove-icon state :runner card (get-card state malia-target)))
-             ;; I'm not sure why the side is nil here
-             ;; but the old impl had it, so 🤷
-             ;; --nbk, Apr '24
-             (effect-completed state nil eid))]
+             (update-disabled-cards state)
+             (trigger-event-sync state nil eid :disabled-cards-updated))]
     {:on-rez {:msg (msg "blank the text box of " (card-str state target))
               :choices {:card #(and (runner? %)
                                     (installed? %)

src/clj/game/cards/basic.clj

@@ -33,7 +33,7 @@
                 :cost [(->c :click)]
                 :msg "gain 1 [Credits]"
                 :async true
-                :effect (req (wait-for (gain-credits state side 1 :corp-click-credit)
+                :effect (req (wait-for (gain-credits state side 1 {:action :corp-click-credit})
                                        (swap! state update-in [:stats side :click :credit] (fnil inc 0))
                                        (play-sfx state side "click-credit")
                                        (effect-completed state side eid)))}
@@ -103,7 +103,7 @@
                 :async true
                 :req (req tagged)
                 :prompt "Choose a resource to trash"
-                :msg (msg "trash " (:title (:card context)))
+                :msg (msg "trash " (:title target))
                 ;; I hate that we need to modify the basic action card like this, but I don't think there's any way around it -nbkelly, '24
                 :choices {:req (req (and (if (and (->> (all-active-installed state :runner)
                                                        (filter (fn [c] (untrashable-while-resources? c)))
@@ -143,7 +143,7 @@
                                                                          nil additional-costs)
                                                                     (system-msg state side (str (:msg async-result) " as an additional cost to trash " (:title target)))
                                                                     (complete-with-result state side eid target))))}
-                                          card nil)
+                                          card targets)
                                         (if async-result
                                           (trash state side eid target nil)
                                           (effect-completed state side eid))))))}
@@ -161,7 +161,7 @@
                 :cost [(->c :click)]
                 :msg "gain 1 [Credits]"
                 :async true
-                :effect (req (wait-for (gain-credits state side 1 :runner-click-credit)
+                :effect (req (wait-for (gain-credits state side 1 {:action :runner-click-credit})
                                        (swap! state update-in [:stats side :click :credit] (fnil inc 0))
                                        (play-sfx state side "click-credit")
                                        (effect-completed state side eid)))}

src/clj/game/cards/events.clj

@@ -1835,7 +1835,7 @@
              :msg "gain 9 [Credits] and take 1 tag"
              :req (req (and (= :hq (target-server context))
                             this-card-run))
-             :effect (req (wait-for (gain-tags state :runner 1)
+             :effect (req (wait-for (gain-tags state :runner 1 {:suppress-checkpoint true})
                                     (gain-credits state :runner eid 9)))}]})
 
 (defcard "I've Had Worse"
@@ -3558,6 +3558,13 @@
                             :value -2}))
                        (update-all-ice))}]})
 
+(defcard "Security Leak"
+  {:static-abilities [{:type :card-ability-additional-cost
+                       :req (req (and (same-card? (:card context) (:basic-action-card corp))
+                                      (= "Advance 1 installed card"
+                                         (:label (:ability context)))))
+                      :value (->c :credit 1)}]})
+
 (defcard "Showing Off"
   {:makes-run true
    :on-play {:async true