Merge pull request mtgred#7489 from NBKelly/use-pronouns

use pronouns in the game where appropriate

src/clj/game/cards/agendas.clj

@@ -1144,7 +1144,7 @@
  (in-hand? %)
  (>= 1 (:agendapoints %)))}
  :waiting-prompt true
- :msg (msg "add " (:title target) " from HQ to their score area")
+ :msg (msg "add " (:title target) " from HQ to [their] score area")
  :effect (req
  (let [c (move state :corp target :scored)]
  (card-init state :corp c {:resolve-effect false
@@ -1338,7 +1338,7 @@
 
 (defcard "Midnight-3 Arcology"
  {:on-score {:async true
- :msg "draw 3 cards and skip their discard step this turn"
+ :msg (msg "draw 3 cards and skip [their] discard step this turn")
  :effect (effect
  (register-lingering-effect
  card
@@ -1708,7 +1708,7 @@
  :interactive (req true)
  :prompt "Quantum Predictive Model will be added to the Corp's score area"
  :choices ["OK"]
- :msg "add itself to their score area and gain 1 agenda point"
+ :msg (msg "add itself to [their] score area and gain 1 agenda point")
  :effect (effect (move :corp card :scored {:force true})
  (update-all-agenda-points)
  (check-win-by-agenda))}})
@@ -1729,7 +1729,7 @@
  :msg (req (let [n (count chosen)]
  (str "add " (quantify n "card") " from HQ to the bottom of R&D and draw " (quantify n "card")
  ". The Runner randomly adds " (quantify (min n (count (:hand runner))) "card")
- " from their Grip to the bottom of the Stack")))
+ " from [runner-pronoun] Grip to the bottom of the Stack")))
  :effect (req (let [n (count chosen)]
  (if (= target "Done")
  (do (doseq [c (reverse chosen)] (move state :corp c :deck))
@@ -1774,7 +1774,7 @@
  (not (faceup? %)))}
  :show-discard true
  :async true
- :msg (msg "reveal " (:title (first targets)) " and add it to their score area")
+ :msg (msg "reveal " (:title (first targets)) " and add it to [their] score area")
  :effect (req (wait-for (reveal state side target)
  (let [c (move state :corp target :scored)]
  (card-init state :corp c {:resolve-effect false
@@ -1801,7 +1801,7 @@
 (defcard "Remote Data Farm"
  {:move-zone (req (when (and (in-scored? card)
  (= :corp (:scored-side card)))
- (system-msg state side (str "uses " (:title card) " to increase their maximum hand size by 2"))))
+ (system-msg state side (str "uses " (:title card) " to increase [their] maximum hand size by 2"))))
  :static-abilities [(corp-hand-size+ 2)]})
 
 (defcard "Remote Enforcement"

src/clj/game/cards/assets.clj

@@ -940,7 +940,7 @@
 (defcard "Echo Chamber"
  {:abilities [{:label "Add this asset to your score area as an agenda worth 1 agenda point"
  :cost [(->c :click 3)]
- :msg "add itself to their score area as an agenda worth 1 agenda point"
+ :msg (msg "add itself to [their] score area as an agenda worth 1 agenda point")
  :effect (req (as-agenda state :corp card 1))}]})
 
 (defcard "Edge of World"
@@ -1071,7 +1071,7 @@
  :effect (effect (gain-tags :corp eid (tag-count (get-card state card))))}
  :abilities [{:cost [(->c :click 1) (->c :advancement 7)]
  :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"
+ :msg (msg "add itself to [their] score area as an agenda worth 3 agenda points")
  :effect (req (as-agenda state :corp card 3))}]}))
 
 (defcard "Federal Fundraising"
@@ -1117,7 +1117,7 @@
 (defcard "Franchise City"
  {:events [{:event :access
  :req (req (agenda? target))
- :msg "add itself to their 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))}]})
 
 (defcard "Front Company"
@@ -1211,11 +1211,11 @@
  {:card card}))}
  :abilities [{:cost [(->c :click 1) (->c :advancement 3)]
  :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"
+ :msg "add itself to [their] score area as an agenda worth 1 agenda point"
  :effect (req (as-agenda state :corp card 1))}]})
 
 (defcard "Genetics Pavilion"
- {:on-rez {:msg "prevent the Runner from drawing more than 2 cards during their turn"
+ {:on-rez {:msg (msg "prevent the Runner from drawing more than 2 cards during [runner-pronoun] turn")
  :effect (req (max-draw state :runner 2)
  (when (zero? (remaining-draws state :runner))
  (prevent-draw state :runner)))}
@@ -2203,7 +2203,7 @@
  {:event :counter-added
  :req (req (same-card? card target)
  (not (pos? (get-counters card :power))))
- :msg "add itself to their score area as an agenda worth 1 agenda point"
+ :msg "add itself to [their] score area as an agenda worth 1 agenda point"
  :effect (effect (as-agenda card 1))}]})
 
 (defcard "Quarantine System"
@@ -2574,7 +2574,7 @@
  :async true
  :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 "
+ " to [their] score area as an agenda worth "
  (quantify -1 "agenda point")))
  (as-agenda state :runner card -1)
  (effect-completed state side eid))

src/clj/game/cards/events.clj

@@ -715,7 +715,7 @@
  {:async true
  :prompt "Choose where to install the program from"
  :choices (req (if (not (zone-locked? state :runner :discard)) ["Stack" "Heap"] ["Stack"]))
- :msg (msg "install a program from their " target)
+ :msg (msg "install a program from [their] " target)
  :effect (effect (continue-ability
  (compile-fn (if (= "Stack" target) :deck :discard))
  card nil))}}}
@@ -1011,13 +1011,13 @@
  (not (zone-locked? state :runner :discard))))
  :prompt "Choose a card to add to Grip"
  :choices (req (cancellable (:discard runner) :sorted))
- :msg (msg "add " (:title target) " to their Grip")
+ :msg (msg "add " (:title target) " to [their] Grip")
  :async true
  :effect (effect (move target :hand)
  (continue-ability
  (when (has-subtype? target "Virus")
  {:prompt "Choose a virus to add to Grip"
- :msg (msg "add " (:title target) " to their Grip")
+ :msg (msg "add " (:title target) " to [their] Grip")
  :choices (req (cancellable (filter #(has-subtype? % "Virus") (:discard runner)) :sorted))
  :effect (effect (move target :hand))})
  card nil))}})
@@ -1656,7 +1656,7 @@
 
 (defcard "\"Freedom Through Equality\""
  {:events [{:event :agenda-stolen
- :msg "add itself to their score area as an agenda worth 1 agenda point"
+ :msg (msg "add itself to [their] score area as an agenda worth 1 agenda point")
  :effect (req (as-agenda state :runner card 1))}]})
 
 (defcard "Freelance Coding Contract"
@@ -2415,7 +2415,7 @@
  :req (req this-card-run)
  :effect (req (if (:did-steal target)
  (do (system-msg state :runner
- (str "adds Mad Dash to their score area as an agenda worth 1 agenda point"))
+ (str "adds Mad Dash to [their] score area as an agenda worth 1 agenda point"))
  (as-agenda state :runner (get-card state card) 1)
  (effect-completed state side eid))
  (do (system-msg state :runner
@@ -2467,7 +2467,7 @@
  :value [blocked-server]
  :duration :end-of-turn}))
  (when (:successful target)
- (system-msg state :runner "gains [Click] and adds Marathon to their grip")
+ (system-msg state :runner (str "gains [Click] and adds Marathon to [their] grip"))
  (gain-clicks state :runner 1)
  (move state :runner card :hand)
  (unregister-events state side card)))}]})
@@ -2658,7 +2658,7 @@
  {:req (req (and (some #{:hq} (:successful-run runner-reg))
  (some #{:rd} (:successful-run runner-reg))
  (some #{:archives} (:successful-run runner-reg))))
- :msg "add itself to their score area as an agenda worth 1 agenda point"
+ :msg (msg "add itself to [their] score area as an agenda worth 1 agenda point")
  :effect (req (as-agenda state :runner card 1))}})
 
 (defcard "Office Supplies"
@@ -2849,7 +2849,7 @@
 
 (defcard "Populist Rally"
  {:on-play {:req (req (seq (filter #(has-subtype? % "Seedy") (all-active-installed state :runner))))
- :msg "give the Corp 1 fewer [Click] to spend on their next turn"
+ :msg (msg "give the Corp 1 fewer [Click] to spend on [corp-pronoun] next turn")
  :effect (effect (lose :corp :click-per-turn 1))}
  :events [{:event :corp-turn-ends
  :duration :until-corp-turn-ends
@@ -3895,7 +3895,7 @@
  {:async true
  :prompt "Choose a server"
  :choices (req runnable-servers)
- :msg (msg "trash their grip and make a run on " target
+ :msg (msg "trash [their] grip and make a run on " target
  ", preventing all damage")
  :effect (effect (make-run eid target card))}
  card nil)))}
@@ -3937,7 +3937,7 @@
 (defcard "The Price of Freedom"
  {:on-play {:additional-cost [(->c :connection 1)]
  :rfg-instead-of-trashing true
- :msg "prevent the Corp from advancing cards during their next turn"}
+ :msg (msg "prevent the Corp from advancing cards during [their] next turn")}
  :events [{:event :corp-turn-begins
  :duration :until-runner-turn-begins
  :effect (effect (register-turn-flag!
@@ -4064,7 +4064,7 @@
  (not (facedown? %))
  (or (hardware? %)
  (program? %)))}
- :msg (msg "move " (:title target) " to their Grip")
+ :msg (msg "move " (:title target) " to [their] Grip")
  :effect (effect (move target :hand))}})
 
 (defcard "Unscheduled Maintenance"

src/clj/game/cards/hardware.clj

@@ -1797,7 +1797,7 @@
  :once :per-turn
  :req (req (:runner-phase-12 @state))
  :effect (effect (update! (assoc card :qianju-active true)))
- :msg "lose [Click] and avoid the first tag received until their next turn"}]
+ :msg (msg "lose [Click] and avoid the first tag received until [their] next turn")}]
  :events [{:event :corp-turn-ends
  :effect (effect (update! (dissoc card :qianju-active)))}
  {:event :runner-turn-begins
@@ -2065,7 +2065,7 @@
  {:prompt "Lower your maximum hand size by 1 to reduce the strength of encountered ice to 0?"
  :once :per-turn
  :yes-ability
- {:msg (msg "lower their maximum hand size by 1 and reduce the strength of " (:title current-ice) " to 0")
+ {:msg (msg "lower [their] maximum hand size by 1 and reduce the strength of " (:title current-ice) " to 0")
  :effect (effect
  (register-lingering-effect
  card

src/clj/game/cards/ice.clj

@@ -2092,7 +2092,7 @@
 
 (defcard "Harvester"
  (let [sub {:label "Runner draws 3 cards and discards down to maximum hand size"
- :msg "make the Runner draw 3 cards and discard down to their maximum hand size"
+ :msg "make the Runner draw 3 cards and discard down to [runner-pronoun] maximum hand size"
  :async true
  :effect (req (wait-for (draw state :runner 3)
  (continue-ability
@@ -3267,7 +3267,7 @@
  (let [sub {:label (str "The Runner loses [Click], if able. "
  "You have an additional [Click] to spend during your next turn")
  :msg (str "force the runner to lose a [Click], if able. "
- "Corp gains an additional [Click] to spend during their next turn")
+ "Corp gains an additional [Click] to spend during [their] next turn")
  :effect (req (lose-clicks state :runner 1)
  (swap! state update-in [:corp :extra-click-temp] (fnil inc 0)))}]
  {:subroutines [sub

src/clj/game/cards/identities.clj

@@ -529,7 +529,7 @@
 
 (defcard "Earth Station: SEA Headquarters"
  (let [flip-effect (effect (update! (if (:flipped card)
- (do (system-msg state :corp "flipped their identity to Earth Station: SEA Headquarters")
+ (do (system-msg state :corp "flipped [pronoun] identity to Earth Station: SEA Headquarters")
  (assoc card
  :flipped false
  :face :front
@@ -567,7 +567,7 @@
  :abilities [{:label "Flip identity to Earth Station: Ascending to Orbit"
  :req (req (not (:flipped card)))
  :cost [(->c :click 1)]
- :msg "flip their identity to Earth Station: Ascending to Orbit"
+ :msg "flip [their] identity to Earth Station: Ascending to Orbit"
  :effect flip-effect}
  {:label "Manually flip identity to Earth Station: SEA Headquarters"
  :req (req (:flipped card))
@@ -819,14 +819,14 @@
  {:event :tags-changed
  :effect (req (if (is-tagged? state)
  (when-not (get-in @state [:runner :openhand])
- (system-msg state :corp (str "uses " (get-title card) " make the Runner play with their grip revealed"))
+ (system-msg state :corp (str "uses " (get-title card) " make the Runner play with [runner-pronoun] grip revealed"))
  (system-msg state :corp (str "uses " (get-title card) " to see that the Runner currently has "
- (format-grip runner) " in their grip"))
+ (format-grip runner) " in [runner-pronoun] grip"))
  (reveal-hand state :runner))
  (when (get-in @state [:runner :openhand])
- (system-msg state :corp (str "uses " (get-title card) " stop making the Runner play with their grip revealed"))
- (system-msg state :corp (str "uses " (get-title card) " to see that the Runner had "
- (format-grip runner) " in their grip before it was concealed"))
+ (system-msg state :corp (str "uses " (get-title card) " stop making the Runner play with [runner-pronoun] grip revealed"))
+ (system-msg state :corp (str "uses " (get-title card) " to note that the Runner had "
+ (format-grip runner) " in [runner-pronoun] grip before it was concealed"))
  (conceal-hand state :runner))))}]
  :effect (req (when (is-tagged? state)
  (reveal-hand state :runner)))
@@ -896,13 +896,13 @@
  :effect (req (cond
  (and (:flipped card)
  (not (:accessed-cards runner-reg)))
- (do (system-msg state :runner "flips their identity to Hoshiko Shiro: Untold Protagonist")
+ (do (system-msg state :runner "flips [their] identity to Hoshiko Shiro: Untold Protagonist")
  (continue-ability state :runner {:effect flip-effect} card nil))
 
  (and (not (:flipped card))
  (:accessed-cards runner-reg))
  (wait-for (gain-credits state :runner 2)
- (system-msg state :runner "gains 2 [Credits] and flips their identity to Hoshiko Shiro: Mahou Shoujo")
+ (system-msg state :runner "gains 2 [Credits] and flips [their] identity to Hoshiko Shiro: Mahou Shoujo")
  (continue-ability state :runner {:effect flip-effect} card nil))
 
  :else
@@ -915,7 +915,7 @@
  (system-msg state :runner (str "uses " (:title card) " to draw 1 card and lose 1 [Credits]"))
  (effect-completed state side eid))))}]
  :abilities [{:label "flip identity"
- :msg "flip their identity manually"
+ :msg "flip [their] identity manually"
  :effect flip-effect}]}))
 
 (defcard "Hyoubu Institute: Absolute Clarity"
@@ -2040,7 +2040,7 @@
  (update! state side (-> card (assoc :sync-flipped false :face :front :code "09001")))
  (update! state side (-> card (assoc :sync-flipped true :face :back :code "sync")))))
  :label "Flip this identity"
- :msg "flip their identity"}]})
+ :msg (msg "flip [their] identity")}]})
 
 (defcard "Synthetic Systems: The World Re-imagined"
  {:events [{:event :pre-start-game