Skip to content

Commit bd96541

Browse files
NoahTheDukeNoahTheDuke
authored
Merge pull request #8137 from butzopower/drop-other-formats
2 parents a157c04 + 7f2cd35 commit bd96541

File tree

15 files changed

+4
-52
lines changed

15 files changed

+4
-52
lines changed

‎resources/public/i18n/en.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,10 +380,7 @@ format_name = {$format ->
380380
[classic] Classic
381381
[core-experience] Core Experience
382382
[eternal] Eternal
383-
[neo] Neo
384383
[preconstructed] Preconstructed
385-
[snapshot] Snapshot
386-
[snapshot-plus] Snapshot Plus
387384
[socr] SOCR
388385
[standard] Standard
389386
[startup] Startup

‎resources/public/i18n/fr.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,7 @@ format_name = {$format ->
220220
[classic] Classic
221221
[core-experience] Core Experience
222222
[eternal] Eternal
223-
[neo] Neo
224223
[preconstructed] Preconstructed
225-
[snapshot] Snapshot
226-
[snapshot-plus] Snapshot Plus
227224
[socr] SOCR
228225
[standard] Standard
229226
[startup] Startup

‎resources/public/i18n/ja.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,7 @@ format_name = {$format ->
163163
[classic] undefined
164164
[core-experience] undefined
165165
[eternal] エターナル
166-
[neo] undefined
167166
[preconstructed] undefined
168-
[snapshot] スナップショット
169-
[snapshot-plus] undefined
170167
[socr] undefined
171168
[standard] スタンダード
172169
[startup] スタートアップ

‎resources/public/i18n/ko.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,7 @@ format_name = {$format ->
207207
[classic] 클래식
208208
[core-experience] 코어 익스피리언스
209209
[eternal] 이터널
210-
[neo] Neo
211210
[preconstructed] undefined
212-
[snapshot] 스냅샷
213-
[snapshot-plus] 스냅샷 플러스
214211
[socr] SOCR
215212
[standard] 스탠다드
216213
[startup] undefined

‎resources/public/i18n/la-pig.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,7 @@ format_name = {$format ->
197197
[classic] Assicclay
198198
[core-experience] Orecay Experienceyay
199199
[eternal] Eternalyay
200-
[neo] Neoyay
201200
[preconstructed] undefined
202-
[snapshot] Apshotsnay
203-
[snapshot-plus] Apshotsnay Usplay
204201
[socr] SOCRYAY
205202
[standard] Andardstay
206203
[startup] Artupstay

‎resources/public/i18n/pl.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,7 @@ format_name = {$format ->
211211
[classic] Classic
212212
[core-experience] Core Experience
213213
[eternal] Eternal
214-
[neo] Neo
215214
[preconstructed] undefined
216-
[snapshot] Snapshot
217-
[snapshot-plus] Snapshot Plus
218215
[socr] SOCR
219216
[standard] Standard
220217
[startup] Startup

‎resources/public/i18n/pt.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,7 @@ format_name = {$format ->
215215
[classic] Classico
216216
[core-experience] Core Experience
217217
[eternal] Eternal
218-
[neo] undefined
219218
[preconstructed] undefined
220-
[snapshot] Snapshot
221-
[snapshot-plus] Snapshot Plus
222219
[socr] SOCR
223220
[standard] Standard
224221
[startup] Startup

‎resources/public/i18n/ru.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,7 @@ format_name = {$format ->
382382
[classic] Классический
383383
[core-experience] undefined
384384
[eternal] Вечный
385-
[neo] Нео
386385
[preconstructed] Чемпионский
387-
[snapshot] undefined
388-
[snapshot-plus] undefined
389386
[socr] undefined
390387
[standard] Стандарт
391388
[startup] Стартап

‎resources/public/i18n/zh-simp.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,7 @@ format_name = {$format ->
371371
[classic] 经典
372372
[core-experience] 核心体验
373373
[eternal] 永久
374-
[neo] Neo
375374
[preconstructed] 预构筑
376-
[snapshot] 快照
377-
[snapshot-plus] 快照+
378375
[socr] SOCR
379376
[standard] 标准
380377
[startup] 新启

‎src/cljc/jinteki/validator.cljc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,7 @@
342342
:startup (build-format-legality valid :startup deck)
343343
:throwback (build-format-legality valid :throwback deck)
344344
:system-gateway (build-system-gateway-legality valid deck)
345-
:eternal (build-format-legality valid :eternal deck)
346-
:neo (build-format-legality valid :neo deck)
347-
:snapshot (build-format-legality valid :snapshot deck)
348-
:snapshot-plus (build-format-legality valid :snapshot-plus deck)}))
345+
:eternal (build-format-legality valid :eternal deck)}))
349346
350347
(defn trusted-deck-status
351348
[{:keys [status] :as deck}]

‎src/cljs/nr/appstate.cljs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
"startup"
2222
"eternal"
2323
"preconstructed"
24-
"snapshot"
25-
"snapshot-plus"
26-
"neo"
2724
"casual"}
2825
serialized (get-local-value "visible-formats" "")]
2926
(if (empty? serialized) default-visible-formats (set (.parse js/JSON serialized)))))

‎src/cljs/nr/cardbrowser.cljs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@
8989
(assoc-in [:format :standard] {:banned true})
9090
(assoc-in [:format :startup] {:banned true})
9191
(assoc-in [:format :throwback] {:banned true})
92-
(assoc-in [:format :eternal] {:banned true})
93-
(assoc-in [:format :snapshot] {:banned true})
94-
(assoc-in [:format :snapshot-plus] {:banned true})
95-
(assoc-in [:format :neo] {:banned true})))
92+
(assoc-in [:format :eternal] {:banned true})))
9693

9794
(defn- insert-starter-ids
9895
"Add special case info for the Starter Deck IDs"

‎src/cljs/nr/help.cljs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,7 @@
163163
"included cards are Labor Rights, Embolus, Slot Machine, Border "
164164
"Control, Timely Public Release, Hired Help, and Watch The "
165165
"World Burn. "
166-
"Refer to " [:a {:href "https://nullsignal.games/players/supported-formats/"} "Supported Formats"] "."]]}
167-
{:id "neo"
168-
:title "What is the Neo format?"
169-
:content [:ul
170-
[:p "The Neo format is all the cards released by NSG with a small "
171-
"ban list. Refer to the #neo channel on "
172-
[:a {:href "https://discord.gg/glc"} "GLC Discord"] "."]]})}
166+
"Refer to " [:a {:href "https://nullsignal.games/players/supported-formats/"} "Supported Formats"] "."]]})}
173167
{:id "site"
174168
:title "Website"
175169
:sub (list

‎src/cljs/nr/utils.cljs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@
127127
"system-gateway" "System Gateway"
128128
"preconstructed" "Preconstructed"
129129
"eternal" "Eternal"
130-
"snapshot" "Snapshot"
131-
"snapshot-plus" "Snapshot Plus"
132-
"neo" "Neo"
133130
"casual" "Casual"))
134131

135132
(def format->slug
@@ -140,9 +137,6 @@
140137
"System Gateway" "system-gateway"
141138
"Preconstructed" "preconstructed"
142139
"Eternal" "eternal"
143-
"Snapshot" "snapshot"
144-
"Snapshot Plus" "snapshot-plus"
145-
"Neo" "neo"
146140
"Casual" "casual"))
147141

148142
(defn regex-escape

‎src/css/base.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ button.off
292292
button .fake-link
293293
color: white-solid
294294

295-
.standard, .eternal, .system-gateway, .startup, .snapshot, .snapshot-plus, .neo, .legal, .throwback
295+
.standard, .eternal, .system-gateway, .startup, .legal, .throwback
296296
color: green-bright
297297
border-color: green-bright
298298

0 commit comments

Comments
 (0)