Skip to content

Commit

Permalink
Merge pull request #7863 from NBKelly/grip-has-article
Browse files Browse the repository at this point in the history
  • Loading branch information
NoahTheDuke authored Nov 4, 2024
2 parents ef2933a + 1d85bb5 commit 3dde482
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions src/clj/game/core/actions.clj
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@
from-str (card-str state c)
s (if (#{"HQ" "R&D" "Archives"} server) :corp :runner)]
;; allow moving from play-area always, otherwise only when same side, and to valid zone
;; here!
(when (and (not= src server)
(same-side? s (:side card))
(not= :select (get-in @state [side :prompt-state :prompt-type]))
Expand All @@ -168,7 +167,7 @@
(log-move "discards"))
(do (trash state s (make-eid state) c {:unpreventable true})
(log-move "trashes"))))
("Grip" "HQ")
("the Grip" "HQ")
(do (move-card-to :hand {:force true})
(log-move "moves" "to " server))
("Stack" "R&D")
Expand Down
2 changes: 1 addition & 1 deletion src/cljs/nr/gameboard/board.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@
[:div.hand-container
[:div.hand-controls
[:div.panel.blue-shade.hand
(drop-area (if (= :corp side) "HQ" "Grip") {:class (when (> size 6) "squeeze")})
(drop-area (if (= :corp side) "HQ" "the Grip") {:class (when (> size 6) "squeeze")})
[build-hand-card-view filled-hand size "card-wrapper"]
[label filled-hand {:opts {:name (if (= :corp side)
(tr [:game.hq "HQ"])
Expand Down

0 comments on commit 3dde482

Please sign in to comment.