Skip to content

Subroutines have labels #7947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoahTheDuke merged 2 commits into from
Feb 5, 2025
Merged

Subroutines have labels #7947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e653770
assert that subroutines, corp-abilities and runner-abilities are labe…
NBKelly Feb 5, 2025
c5debc0
added missing labels for datapike and minelayer
NBKelly Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/clj/game/cards/ice.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,6 +1457,7 @@

(defcard "Datapike"
{:subroutines [{:async true
:label "Runner must pay 2 [Credits]. If they cannot, end the run"
:effect (req (wait-for (pay state :runner (make-eid state eid) card (->c :credit 2))
(if (:cost-paid async-result)
(do (system-msg state :runner (:msg async-result))
Expand Down Expand Up @@ -3056,6 +3057,7 @@
:choices {:card #(and (ice? %)
(in-hand? %))}
:prompt "Choose a piece of ice to install from HQ"
:label "install ice from HQ, ignoring all costs"
:effect (effect (corp-install eid target (zone->name (target-server run)) {:ignore-all-cost true
:msg-keys {:install-source card
:display-origin true}}))}]})
Expand Down
18 changes: 12 additions & 6 deletions test/clj/game/core/abilities_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,22 @@
:when (not-empty (card-def card))]
(is (core/has-trash-ability? card) (str (:title card) " needs either :cost [(->c :trash-can)] or :trash-icon true"))))

(deftest label
(doseq [[title abilities]
(defn- x-has-labels
[x-key x-name]
(doseq [[title cards-with-x]
(->> @all-cards
vals
(sort-by (juxt :type :title))
(map (juxt :title card-def))
(filter (comp :abilities second)))
[idx ability] (map-indexed (fn [idx itm] [idx itm]) (:abilities abilities))]
(is (string? (or (:label ability) (:msg ability)))
(str title ": Ability " (inc idx) " doesn't have an appropriate label"))))
(filter (comp x-key second)))
[idx x] (map-indexed (fn [idx itm] [idx itm]) (x-key cards-with-x))]
(is (string? (or (:label x) (:msg x))) (str title ": " x-name " " (inc idx) " doen't have an appropriate label"))))

(deftest abilities-have-labels
(x-has-labels :abilities "Ability")
(x-has-labels :corp-abilities "Runner Ability")
(x-has-labels :runner-abilities "Corp Ability")
(x-has-labels :subroutines "Subroutine"))

(defn generate-label
[card]
Expand Down