Merge pull request #7259 from tblackwe/main

mtgred · Jan 3, 2024 · cf3b077 · cf3b077
2 parents b144127 + 6d5e74d
commit cf3b077
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 1 deletion.
diff --git a/src/cljc/jinteki/validator.cljc b/src/cljc/jinteki/validator.cljc
@@ -326,6 +326,7 @@
      :casual valid
      :standard (build-format-legality valid :standard deck)
      :startup (build-format-legality valid :startup deck)
+     :sunset (build-format-legality valid :sunset deck)
      :system-gateway (build-system-gateway-legality valid deck)
      :eternal (build-format-legality valid :eternal deck)
      :neo (build-format-legality valid :neo deck)

diff --git a/src/cljs/nr/appstate.cljs b/src/cljs/nr/appstate.cljs
@@ -14,6 +14,7 @@
   (let [default-visible-formats #{"standard"
                                   "system-gateway"
                                   "startup"
+                                  "sunset"
                                   "eternal"
                                   "snapshot"
                                   "snapshot-plus"

diff --git a/src/cljs/nr/cardbrowser.cljs b/src/cljs/nr/cardbrowser.cljs
@@ -87,6 +87,7 @@
       (assoc :influencelimit "∞")
       (assoc-in [:format :standard] {:banned true})
       (assoc-in [:format :startup] {:banned true})
+      (assoc-in [:format :sunset] {:banned true})
       (assoc-in [:format :eternal] {:banned true})
       (assoc-in [:format :snapshot] {:banned true})
       (assoc-in [:format :snapshot-plus] {:banned true})

diff --git a/src/cljs/nr/help.cljs b/src/cljs/nr/help.cljs
@@ -322,6 +322,11 @@
                          "taking their first steps into Organized Play as well as experienced "
                          "players who want a slimmed-down deckbuilding challenge. "
                          "Refer to " [:a {:href "https://nullsignal.games/players/supported-formats/"} "Supported Formats"] "."]]}
+            {:id "sunset"
+             :title "What is the Sunset format?"
+             :content [:ul
+                        [:p "Sunset is essentially Standard with an extended, experimental banlist added to it."
+                         "Refer to the " [:a {:href "https://nullsignal.games/blog/introducing-sunset/"} "Sunset Announcement"] "."]]}
             {:id "system-gateway"
              :title "What is the System Gateway format?"
              :content [:ul

diff --git a/src/cljs/nr/translations.cljs b/src/cljs/nr/translations.cljs
@@ -36,6 +36,7 @@
      :snapshot "Snapshot"
      :snapshot-plus "Snapshot Plus"
      :socr "SOCR"
+     :sunset "Sunset"
      :neo "Neo"
      :classic "Classic"
      :casual "Casual"
@@ -902,6 +903,7 @@
      :snapshot "快照"
      :snapshot-plus "快照+"
      :socr "SOCR"
+     :sunset "Sunset"
      :neo "Neo"
      :classic "经典"
      :casual "休闲"}
@@ -1296,6 +1298,7 @@
      :snapshot "Apshotsnay"
      :snapshot-plus "Apshotsnay Usplay"
      :socr "SOCRYAY"
+     :sunset "Sunset"
      :neo "Neoyay"
      :classic "Assicclay"
      :casual "Asualcay"
@@ -1704,6 +1707,7 @@
      :snapshot "Snapshot"
      :snapshot-plus "Snapshot Plus"
      :socr "SOCR"
+     :sunset "Sunset"
      :neo "Neo"
      :classic "Classic"
      :casual "Casual"
@@ -2136,6 +2140,7 @@
     :snapshot "스냅샷"
     :snapshot-plus "스냅샷 플러스"
     :socr "SOCR"
+    :sunset "Sunset"
     :neo "Neo"
     :classic "클래식"
     :casual "캐주얼"}
@@ -2538,6 +2543,7 @@
      :snapshot "Snapshot"
      :snapshot-plus "Snapshot Plus"
      :socr "SOCR"
+     :sunset "Sunset"
      :neo "Neo"
      :classic "Classic"
      :casual "Niekompetytywny"
@@ -2969,6 +2975,7 @@
      :snapshot "スナップショット"
      :snapshot-plus "Snapshot Plus"
      :socr "SOCR"
+     :sunset "Sunset"
      :neo "Neo"
      :classic "Classic"
      :casual "Casual"

diff --git a/src/cljs/nr/utils.cljs b/src/cljs/nr/utils.cljs
@@ -123,6 +123,7 @@
   {"standard" "Standard"
    "system-gateway" "System Gateway"
    "startup" "Startup"
+   "sunset" "Sunset"
    "eternal" "Eternal"
    "snapshot" "Snapshot"
    "snapshot-plus" "Snapshot Plus"
@@ -133,6 +134,7 @@
   {"Standard" "standard"
    "System Gateway" "system-gateway"
    "Startup" "startup"
+   "Sunset" "sunset"
    "Eternal" "eternal"
    "Snapshot" "snapshot"
    "Snapshot Plus" "snapshot-plus"

diff --git a/src/css/base.styl b/src/css/base.styl
@@ -292,7 +292,7 @@ button.off
 button .fake-link
     color: white-solid
 
-.standard, .eternal, .system-gateway, .startup, .snapshot, .snapshot-plus, .neo, .legal
+.standard, .eternal, .system-gateway, .startup, .snapshot, .snapshot-plus, .sunset, .neo, .legal
     color: green-bright
     border-color: green-bright