Skip to content

Commit

Permalink
Add Nisei card backs (#5267)
Browse files Browse the repository at this point in the history
* Add Nisei card backs

* Rename ffg card backs

* Switch card backs to nisei

* Add card back option, display in gameboard
  • Loading branch information
NoahTheDuke authored Aug 22, 2020
1 parent add12af commit a50aa52
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 4 deletions.
File renamed without changes
File renamed without changes
Binary file added resources/public/img/nisei-corp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/public/img/nisei-runner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions src/cljs/nr/account.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
(swap! app-state assoc-in [:options :lobby-sounds] (:lobby-sounds @s))
(swap! app-state assoc-in [:options :sounds-volume] (:volume @s))
(swap! app-state assoc-in [:options :background] (:background @s))
(swap! app-state assoc-in [:options :card-back] (:card-back @s))
(swap! app-state assoc-in [:options :show-alt-art] (:show-alt-art @s))
(swap! app-state assoc-in [:options :stacked-servers] (:stacked-servers @s))
(swap! app-state assoc-in [:options :runner-board-order] (:runner-board-order @s))
Expand All @@ -76,6 +77,7 @@
(.setItem js/localStorage "log-top" (:log-top @s))
(.setItem js/localStorage "stacked-servers" (:stacked-servers @s))
(.setItem js/localStorage "runner-board-order" (:runner-board-order @s))
(.setItem js/localStorage "card-back" (:card-back @s))
(post-options url (partial post-response s)))

(defn add-user-to-block-list
Expand Down Expand Up @@ -197,6 +199,7 @@
(defn account-view [user]
(let [s (r/atom {:flash-message ""
:background (get-in @app-state [:options :background])
:card-back (get-in @app-state [:options :card-back])
:pronouns (get-in @app-state [:options :pronouns])
:sounds (get-in @app-state [:options :sounds])
:lobby-sounds (get-in @app-state [:options :lobby-sounds])
Expand Down Expand Up @@ -319,6 +322,18 @@
:checked (= (:background @s) (:ref option))}]
(:name option)]]))]

[:section
[:h3 "Card backs"]
(doall (for [option [{:name "NISEI" :ref "nisei"}
{:name "FFG" :ref "ffg"}]]
[:div.radio {:key (:name option)}
[:label [:input {:type "radio"
:name "card-back"
:value (:ref option)
:on-change #(swap! s assoc :card-back (.. % -target -value))
:checked (= (:card-back @s) (:ref option))}]
(:name option)]]))]

[:section
[:h3 " Game Win/Lose statistics "]
(doall (for [option [{:name "Always" :ref "always"}
Expand Down
1 change: 1 addition & 0 deletions src/cljs/nr/appstate.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
(r/atom {:active-page "/"
:user (js->clj js/user :keywordize-keys true)
:options (merge {:background "lobby-bg"
:card-back (get-local-value "card-back" "nisei")
:pronouns "none"
:show-alt-art true
:stacked-servers (= (get-local-value "stacked-servers" "true") "true")
Expand Down
10 changes: 6 additions & 4 deletions src/cljs/nr/gameboard.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,8 @@
"Image element of a facedown card"
([side] (facedown-card side [] nil))
([side class-list alt-alt-text]
(let [s (lower-case side)
(let [card-back (get-in @app-state [:options :card-back])
s (lower-case side)
alt (if (nil? alt-alt-text)
(str "Facedown " s " card")
alt-alt-text)
Expand All @@ -560,7 +561,7 @@
(concat ["img" "card"])
(join ".")
keyword)]
[tag {:src (str "/img/" s ".png")
[tag {:src (str "/img/" card-back "-" s ".png")
:alt alt}])))

(defn card-img
Expand Down Expand Up @@ -1396,7 +1397,8 @@
[my-ident my-user my-hand my-prompt my-keep op-ident op-user op-keep me-quote op-quote my-side]
(let [visible-quote (r/atom true)
mulliganed (r/atom false)
start-shown (r/cursor app-state [:start-shown])]
start-shown (r/cursor app-state [:start-shown])
card-back (get-in @app-state [:options :card-back])]
(fn [my-ident my-user my-hand my-prompt my-keep op-ident op-user op-keep me-quote op-quote my-side]
(when (and (not @start-shown)
(:username @op-user)
Expand Down Expand Up @@ -1440,7 +1442,7 @@
:key (str (:cid card) "-" i "-" @mulliganed)}
[:div.flipper
[:div.card-back
[:img.start-card {:src (str "/img/" (.toLowerCase (:side @my-ident)) ".png")}]]
[:img.start-card {:src (str "/img/" card-back "-" (lower-case (:side @my-ident)) ".png")}]]
[:div.card-front
(when-let [url (image-url card)]
[:div {:on-mouse-enter #(put! zoom-channel card)
Expand Down

0 comments on commit a50aa52

Please sign in to comment.