Skip to content

Commit 6f3ecf3

Browse files
NoahTheDukeNoahTheDuke
authored
Merge pull request #6806 from alangfiles/rename-brain-damage-to-core
2 parents ec54582 + 8a31e01 commit 6f3ecf3

24 files changed

+142
-142
lines changed

‎src/clj/game/cards/agendas.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,8 +1233,8 @@
12331233
(has-subtype? % "NEXT"))
12341234
(all-installed state :corp))
12351235
{:optional
1236-
{:prompt "Do 1 brain damage?"
1237-
:yes-ability {:msg "do 1 brain damage"
1236+
{:prompt "Do 1 core damage?"
1237+
:yes-ability {:msg "do 1 core damage"
12381238
:async true
12391239
:effect (effect (damage eid :brain 1 {:card card}))}}})
12401240
card nil))}})

‎src/clj/game/cards/assets.clj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
(advance-ambush 3 {:async true
403403
:waiting-prompt true
404404
:req (req (pos? (get-counters (get-card state card) :advancement)))
405-
:msg (msg "do " (get-counters (get-card state card) :advancement) " brain damage")
405+
:msg (msg "do " (get-counters (get-card state card) :advancement) " core damage")
406406
:effect (effect (damage eid :brain (get-counters (get-card state card) :advancement) {:card card}))}))
407407

408408
(defcard "Chairman Hiro"
@@ -762,7 +762,7 @@
762762
(defcard "Edge of World"
763763
(letfn [(ice-count [state]
764764
(count (get-in (:corp @state) [:servers (last (:server (:run @state))) :ices])))]
765-
(installed-access-trigger 3 {:msg (msg "do " (ice-count state) " brain damage")
765+
(installed-access-trigger 3 {:msg (msg "do " (ice-count state) " core damage")
766766
:async true
767767
:effect (effect (damage eid :brain (ice-count state)
768768
{:card card}))})))
@@ -1177,11 +1177,11 @@
11771177
{:x-fn (req (get-counters card :power))
11781178
:derezzed-events [corp-rez-toast]
11791179
:flags {:corp-phase-12 (req true)}
1180-
:abilities [{:label "Trace X - do 1 brain damage (start of turn)"
1180+
:abilities [{:label "Trace X - do 1 core damage (start of turn)"
11811181
:trace {:base x-fn
11821182
:successful
11831183
{:async true
1184-
:msg "do 1 brain damage"
1184+
:msg "do 1 core damage"
11851185
:effect (req (wait-for (damage state :runner :brain 1 {:card card})
11861186
(trash state side eid card {:cause-card card})))}
11871187
:unsuccessful

‎src/clj/game/cards/events.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144

145145
(defcard "Amped Up"
146146
{:on-play
147-
{:msg "gain [Click][Click][Click] and suffer 1 brain damage"
147+
{:msg "gain [Click][Click][Click] and suffer 1 core damage"
148148
:async true
149149
:effect (effect (gain-clicks 3)
150150
(damage eid :brain 1 {:unpreventable true :card card}))}})
@@ -3278,7 +3278,7 @@
32783278
(make-run eid target card))}
32793279
:events [{:event :run-ends
32803280
:req (req this-card-run)
3281-
:msg "take 1 brain damage"
3281+
:msg "take 1 core damage"
32823282
:effect (effect (damage eid :brain 1 {:unpreventable true
32833283
:card card}))}]})
32843284

‎src/clj/game/cards/hardware.clj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,8 @@
688688
:abilities [{:cost [:credit 3]
689689
:msg "prevent 1 net damage"
690690
:effect (effect (damage-prevent :net 1))}
691-
{:label "Prevent up to 2 brain damage"
692-
:msg "prevent up to 2 brain damage"
691+
{:label "Prevent up to 2 core damage"
692+
:msg "prevent up to 2 core damage"
693693
:cost [:trash-can]
694694
:effect (effect (damage-prevent :brain 2))}]})
695695

@@ -1664,7 +1664,7 @@
16641664
{:interactions {:prevent [{:type #{:net :brain}
16651665
:req (req true)}]}
16661666
:abilities [{:async true
1667-
:label "prevent net or brain damage"
1667+
:label "prevent net or core damage"
16681668
:trash-icon true
16691669
:req (req (not-empty (:deck runner)))
16701670
:effect (req (let [n (count (filter #(= (:title %) (:title card)) (all-active-installed state :runner)))]
@@ -1965,7 +1965,7 @@
19651965
:recurring 2
19661966
:events [{:event :successful-trace
19671967
:req (req run)
1968-
:msg "suffer 1 brain damage"
1968+
:msg "suffer 1 core damage"
19691969
:effect (effect (damage eid :brain 1 {:card card}))}]
19701970
:interactions {:pay-credits {:req (req (and (= :ability (:source-type eid))
19711971
(has-subtype? target "Icebreaker")))

‎src/clj/game/cards/ice.clj

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1518,13 +1518,13 @@
15181518
(continue-ability state :runner runner-trash-installed-sub card nil)))}]
15191519
{:subroutines [sub
15201520
sub
1521-
{:label "Do 1 brain damage or end the run"
1521+
{:label "Do 1 core damage or end the run"
15221522
:prompt "Choose one"
15231523
:waiting-prompt true
1524-
:choices ["Do 1 brain damage" "End the run"]
1524+
:choices ["Do 1 core damage" "End the run"]
15251525
:msg (msg (decapitalize target))
15261526
:async true
1527-
:effect (req (if (= target "Do 1 brain damage")
1527+
:effect (req (if (= target "Do 1 core damage")
15281528
(damage state side eid :brain 1 {:card card})
15291529
(end-run state side eid card)))}]
15301530
:runner-abilities [(bioroid-break 3 3)]}))
@@ -1866,7 +1866,7 @@
18661866

18671867
(defcard "Heimdall 2.0"
18681868
{:subroutines [(do-brain-damage 1)
1869-
{:msg "do 1 brain damage and end the run"
1869+
{:msg "do 1 core damage and end the run"
18701870
:effect (req (wait-for (damage state side :brain 1 {:card card})
18711871
(end-run state side eid card)))}
18721872
end-the-run]
@@ -2039,17 +2039,17 @@
20392039

20402040
(defcard "Ichi 1.0"
20412041
{:subroutines [trash-program-sub trash-program-sub
2042-
(trace-ability 1 {:label "Give the Runner 1 tag and do 1 brain damage"
2043-
:msg "give the Runner 1 tag and do 1 brain damage"
2042+
(trace-ability 1 {:label "Give the Runner 1 tag and do 1 core damage"
2043+
:msg "give the Runner 1 tag and do 1 core damage"
20442044
:async true
20452045
:effect (req (wait-for (damage state :runner :brain 1 {:card card})
20462046
(gain-tags state :corp eid 1)))})]
20472047
:runner-abilities [(bioroid-break 1 1)]})
20482048

20492049
(defcard "Ichi 2.0"
20502050
{:subroutines [trash-program-sub trash-program-sub
2051-
(trace-ability 3 {:label "Give the Runner 1 tag and do 1 brain damage"
2052-
:msg "give the Runner 1 tag and do 1 brain damage"
2051+
(trace-ability 3 {:label "Give the Runner 1 tag and do 1 core damage"
2052+
:msg "give the Runner 1 tag and do 1 core damage"
20532053
:async true
20542054
:effect (req (wait-for (damage state :runner :brain 1 {:card card})
20552055
(gain-tags state :corp eid 1)))})]
@@ -2208,15 +2208,15 @@
22082208
:async true
22092209
:waiting-prompt true
22102210
:prompt "Choose one"
2211-
:choices ["Take 1 brain damage" (str "Trash an installed " (better-name kind))]
2212-
:msg (msg (if (= target "Take 1 brain damage")
2213-
"do 1 brain damage"
2211+
:choices ["Take 1 core damage" (str "Trash an installed " (better-name kind))]
2212+
:msg (msg (if (= target "Take 1 core damage")
2213+
"do 1 core damage"
22142214
(str "force the runner to " (decapitalize target))))
2215-
:effect (req (if (= target "Take 1 brain damage")
2215+
:effect (req (if (= target "Take 1 core damage")
22162216
(damage state :runner eid :brain 1 {:card card})
22172217
(continue-ability state :runner (runner-trash kind) card nil)))})
22182218
(brain-trash [kind]
2219-
{:label (str "Force the Runner to take 1 brain damage or trash an installed " (better-name kind))
2219+
{:label (str "Force the Runner to take 1 core damage or trash an installed " (better-name kind))
22202220
:async true
22212221
:effect (req (wait-for (resolve-ability state side (sub-map kind) card nil)
22222222
(clear-wait-prompt state :corp)))})]
@@ -2782,9 +2782,9 @@
27822782
:runner-abilities [(break-sub [:credit 2] 1 "All" {:req (req (currently-encountering-card card state))})]})
27832783

27842784
(defcard "Nerine 2.0"
2785-
(let [sub {:label "Do 1 brain damage and Corp may draw 1 card"
2785+
(let [sub {:label "Do 1 core damage and Corp may draw 1 card"
27862786
:async true
2787-
:msg "do 1 brain damage"
2787+
:msg "do 1 core damage"
27882788
:effect (req (wait-for (damage state :runner :brain 1 {:card card})
27892789
(continue-ability
27902790
state side
@@ -3978,27 +3978,27 @@
39783978
(do-net-damage 1)]})
39793979

39803980
(defcard "Zed 1.0"
3981-
{:subroutines [{:label "Do 1 brain damage"
3981+
{:subroutines [{:label "Do 1 core damage"
39823982
:async true
39833983
:effect (req (if (spent-click-to-break-sub state run)
39843984
(continue-ability state side (do-brain-damage 1) card nil)
3985-
(do (system-msg state side "does not do brain damage with Zed 1.0")
3985+
(do (system-msg state side "does not do core damage with Zed 1.0")
39863986
(effect-completed state side eid))))}
3987-
{:label "Do 1 brain damage"
3987+
{:label "Do 1 core damage"
39883988
:async true
39893989
:effect (req (if (spent-click-to-break-sub state run)
39903990
(continue-ability state side (do-brain-damage 1) card nil)
3991-
(do (system-msg state side "does not do brain damage with Zed 1.0")
3991+
(do (system-msg state side "does not do core damage with Zed 1.0")
39923992
(effect-completed state side eid))))}]
39933993
:runner-abilities [(bioroid-break 1 1)]})
39943994

39953995
(defcard "Zed 2.0"
39963996
{:subroutines [trash-hardware-sub
39973997
trash-hardware-sub
3998-
{:label "Do 1 brain damage"
3998+
{:label "Do 1 core damage"
39993999
:async true
40004000
:effect (req (if (spent-click-to-break-sub state run)
40014001
(continue-ability state side (do-brain-damage 2) card nil)
4002-
(do (system-msg state side "does not do brain damage with Zed 2.0")
4002+
(do (system-msg state side "does not do core damage with Zed 2.0")
40034003
(effect-completed state side eid))))}]
40044004
:runner-abilities [(bioroid-break 2 2)]})

‎src/clj/game/cards/operations.clj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@
451451
:not-equal {:player :runner
452452
:prompt "Choose one"
453453
:waiting-prompt true
454-
:choices ["Take 1 tag" "Suffer 1 brain damage"]
454+
:choices ["Take 1 tag" "Suffer 1 core damage"]
455455
:msg (msg "force the Runner to " (decapitalize target))
456456
:effect (req (if (= target "Take 1 tag")
457457
(gain-tags state :runner eid 1)
@@ -567,7 +567,7 @@
567567
(defcard "Defective Brainchips"
568568
{:events [{:event :pre-damage
569569
:req (req (= target :brain))
570-
:msg "do 1 additional brain damage"
570+
:msg "do 1 additional core damage"
571571
:once :per-turn
572572
:effect (effect (damage-bonus :brain 1))}]})
573573

@@ -1336,7 +1336,7 @@
13361336
:trace {:base 3
13371337
:req (req (or (agenda? (:card context))
13381338
(agenda? target)))
1339-
:successful {:msg "do 1 brain damage"
1339+
:successful {:msg "do 1 core damage"
13401340
:async true
13411341
:effect (effect (damage :runner eid :brain 1 {:card card}))}}}]
13421342
{:events [(assoc trace-for-brain-damage
@@ -2166,8 +2166,8 @@
21662166
:waiting-prompt true
21672167
:prompt "Choose one"
21682168
:msg (msg "force the Runner to " (decapitalize target))
2169-
:choices ["Suffer 1 brain damage" "Get 3 fewer [Click] on the next turn"]
2170-
:effect (req (if (= target "Suffer 1 brain damage")
2169+
:choices ["Suffer 1 core damage" "Get 3 fewer [Click] on the next turn"]
2170+
:effect (req (if (= target "Suffer 1 core damage")
21712171
(damage state :runner eid :brain 1 {:card card})
21722172
(do (swap! state update-in [:runner :extra-click-temp] (fnil #(- % 3) 0))
21732173
(effect-completed state side eid))))}})
@@ -2912,11 +2912,11 @@
29122912
card nil))}})
29132913

29142914
(defcard "Wetwork Refit"
2915-
(let [new-sub {:label "[Wetwork Refit] Do 1 brain damage"}]
2915+
(let [new-sub {:label "[Wetwork Refit] Do 1 core damage"}]
29162916
{:on-play {:choices {:card #(and (ice? %)
29172917
(has-subtype? % "Bioroid")
29182918
(rezzed? %))}
2919-
:msg (msg "give " (card-str state target) " \"[Subroutine] Do 1 brain damage\" before all its other subroutines")
2919+
:msg (msg "give " (card-str state target) " \"[Subroutine] Do 1 core damage\" before all its other subroutines")
29202920
:async true
29212921
:effect (req (add-extra-sub! state :corp target new-sub (:cid card) {:front true})
29222922
(install-as-condition-counter state side eid card (get-card state target)))}

‎src/clj/game/cards/resources.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@
564564
:msg "prevent 1 net damage"
565565
:effect (effect (damage-prevent :net 1))}
566566
{:cost [:credit 3]
567-
:msg "prevent 1 brain damage"
567+
:msg "prevent 1 core damage"
568568
:effect (effect (damage-prevent :brain 1))}]})
569569

570570
(defcard "Charlatan"
@@ -2796,7 +2796,7 @@
27962796
:effect (req (if (>= (get-counters card :power) 2)
27972797
(do (add-counter state side card :power (- (get-counters card :power)))
27982798
(damage state side eid :brain 1 {:unpreventable true :card card})
2799-
(system-msg state side "takes 1 brain damage from Stim Dealer"))
2799+
(system-msg state side "takes 1 core damage from Stim Dealer"))
28002800
(do (add-counter state side card :power 1)
28012801
(gain-clicks state side 1)
28022802
(system-msg state side "uses Stim Dealer to gain [Click]"))))}]})

‎src/clj/game/cards/upgrades.clj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@
256256
:msg (msg "force the Runner to " (decapitalize target))
257257
:prompt "Choose one"
258258
:waiting-prompt true
259-
:choices ["Take 1 brain damage" "Jack out"]
260-
:effect (req (if (= target "Take 1 brain damage")
259+
:choices ["Take 1 core damage" "Jack out"]
260+
:effect (req (if (= target "Take 1 core damage")
261261
(damage state :runner eid :brain 1 {:card card})
262262
(wait-for
263263
(jack-out state :runner (make-eid state))
@@ -1392,10 +1392,10 @@
13921392
:effect (effect (init-trace-bonus 2))}]})
13931393

13941394
(defcard "Ryon Knight"
1395-
{:abilities [{:label "Do 1 brain damage"
1395+
{:abilities [{:label "Do 1 core damage"
13961396
:req (req (and this-server (zero? (:click runner))))
13971397
:cost [:trash-can]
1398-
:msg "do 1 brain damage"
1398+
:msg "do 1 core damage"
13991399
:async true
14001400
:effect (effect (damage eid :brain 1 {:card card}))}]})
14011401

@@ -1516,7 +1516,7 @@
15161516
:player :runner
15171517
:choices (req [(when (<= 2 (:click runner))
15181518
"Lose [Click][Click]")
1519-
"Suffer 1 brain damage"])
1519+
"Suffer 1 core damage"])
15201520
:async true
15211521
:msg (msg "force the Runner to " (decapitalize target))
15221522
:effect (req (if (and (= target "Lose [Click][Click]")
@@ -1558,11 +1558,11 @@
15581558
(= :corp s))))
15591559
(can-pay? state :corp (assoc eid :source card :source-type :ability) card nil [:credit 2])))
15601560
:waiting-prompt true
1561-
:prompt "Pay 2 [Credits] to do 1 brain damage?"
1561+
:prompt "Pay 2 [Credits] to do 1 core damage?"
15621562
:player :corp
15631563
:yes-ability
15641564
{:async true
1565-
:msg "do 1 brain damage instead of net damage"
1565+
:msg "do 1 core damage instead of net damage"
15661566
:effect (req (swap! state update :damage dissoc :damage-replace :defer-damage)
15671567
(wait-for (pay state :corp (make-eid state eid) card :credit 2)
15681568
(system-msg state side (:msg async-result))

‎src/clj/game/core/costs.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@
810810
;; BrainDamage
811811
(defmethod cost-name :brain [_] :brain)
812812
(defmethod value :brain [[_ cost-value]] cost-value)
813-
(defmethod label :brain [cost] (str "suffer " (value cost) " brain damage"))
813+
(defmethod label :brain [cost] (str "suffer " (value cost) " core damage"))
814814
(defmethod payable? :brain
815815
[cost state side eid card]
816816
(<= (value cost) (count (get-in @state [:runner :hand]))))
@@ -819,7 +819,7 @@
819819
(wait-for (damage state side :brain (value cost) {:unpreventable true})
820820
(complete-with-result
821821
state side eid
822-
{:msg (str "suffers " (count async-result) " brain damage")
822+
{:msg (str "suffers " (count async-result) " core damage")
823823
:type :brain
824824
:value (count async-result)
825825
:targets async-result})))

‎src/clj/game/core/def_helpers.clj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@
135135
:effect (effect (damage eid :meat dmg {:card card}))})
136136

137137
(defn do-brain-damage
138-
"Do specified amount of brain damage."
138+
"Do specified amount of core damage."
139139
[dmg]
140-
{:label (str "Do " dmg " brain damage")
140+
{:label (str "Do " dmg " core damage")
141141
:async true
142-
:msg (str "do " dmg " brain damage")
142+
:msg (str "do " dmg " core damage")
143143
:effect (effect (damage eid :brain dmg {:card card}))})
144144

145145
(defn trash-on-empty

‎src/cljs/nr/gameboard/player_stats.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
(when show-tagged [:div.warning "!"])]))
9595
(ctrl
9696
:brain-damage
97-
[:div (str brain-damage " " (tr [:game.brain-damage "Brain Damage"]))])]))))
97+
[:div (str brain-damage " " (tr [:game.brain-damage "Core Damage"]))])]))))
9898

9999
(defmethod stats-area "Corp" [corp]
100100
(let [ctrl (stat-controls-for-side :corp)]

‎src/cljs/nr/help.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
{:name "/take-brain"
155155
:has-args :required
156156
:usage "/take-brain n"
157-
:help "Take n brain damage (Runner only)"}
157+
:help "Take n core damage (Runner only)"}
158158
{:name "/take-meat"
159159
:has-args :required
160160
:usage "/take-meat n"

‎src/cljs/nr/translations.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@
357357
:scored-area "Scored Area"
358358
:archives "Archives"
359359
:max-hand "Max hand size"
360-
:brain-damage "Brain Damage"
360+
:brain-damage "Core Damage"
361361
:tag-count (fn [[base additional total]]
362362
(str base (when (pos? additional) (str " + " additional)) " Tag" (if (not= total 1) "s" "")))
363363
:agenda-count (fn [[agenda-point]] (str agenda-point " Agenda Point" (when (not= agenda-point 1) "s")))

0 commit comments

Comments
 (0)