Skip to content

Commit

Permalink
Merge pull request #7713 from NBKelly/precon-cleanup
Browse files Browse the repository at this point in the history 
Precon tr cleanup
  • Loading branch information
@NBKelly
NBKelly authored Sep 5, 2024
2 parents b0efc86 + 9bcdaee commit c0baf67
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 9 deletions.
26 changes: 26 additions & 0 deletions src/cljc/i18n/en.cljc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,63 +36,87 @@
:startup "Startup"}
:preconstructed {:worlds-2012-a "Worlds 2012: Ben Marsh (C) vs. Jeremy Zwirn (R)"
:worlds-2012-a-tag "Ben Marsh (C) vs. Jeremy Zwirn (R)"
:worlds-2012-a-ul "Worlds 2012: Weyland vs. Criminal"
:worlds-2012-b "Worlds 2012: Jeremy Zwirn (C) vs. Ben Marsh (R)"
:worlds-2012-b-tag "Jeremy Zwirn (C) vs. Ben Marsh (R)"
:worlds-2012-b-ul "Worlds 2012: Haas-Bioroid vs. Criminal"
:worlds-2012-info "Worlds 2012 was played with (up to 3 copies of) the Core Set as the only legal product. Jeremy Zwirn (Building a Better World, Gabriel Santiago) took first place against Ben Marsh (Engineering the Future, Gabriel Santiago) in the first ever Netrunner World Championship."
:worlds-2013-a "Worlds 2013: Jens Erickson (C) vs. Andrew Veen (R)"
:worlds-2013-a-tag "Jens Erickson (C) vs. Andrew Veen (R)"
:worlds-2013-a-ul "Worlds 2013: HB FastAdv vs. Shaper Katman"
:worlds-2013-b "Worlds 2013: Andrew Veen (C) vs. Jens Erickson (R)"
:worlds-2013-b-tag "Andrew Veen (C) vs. Jens Erickson (R)"
:worlds-2013-b-ul "Worlds 2013: NBN Fast Adv vs. Andy Sucker"
:worlds-2013-info "166 players attended worlds in 2013. The tournament was held in Minneapolis, MN, USA, and consisted of 6 swiss rounds into a top 32 cut. The legal cardpool consisted of cards up to Opening Moves."
:worlds-2014-a "Worlds 2014: Dan D'Argenio (C) vs. Minh Tran (R)"
:worlds-2014-a-tag "Dan D'Argenio (C) vs. Minh Tran (R)"
:worlds-2014-a-ul "Worlds 2014: Honor and Perfection vs. Andromedium"
:worlds-2014-b "Worlds 2014: Minh Tran (C) vs. Dan D'Argenio (R)"
:worlds-2014-b-tag "Minh Tran (C) vs. Dan D'Argenio (R)"
:worlds-2014-b-ul "Worlds 2014: Personal Evolution vs. Daily QT Andy"
:worlds-2014-info "238 players attended worlds in 2014. The tournament was held in Minneapolis, MN, USA, and consisted of 7 swiss rounds into a top 16 cut. The legal cardpool consisted of cards up to Up and Over."
:worlds-2015-a "Worlds 2015: Dan D'Argenio (C) vs. Timmy Wong (R)"
:worlds-2015-a-tag "Dan D'Argenio (C) vs. Timmy Wong (R)"
:worlds-2015-a-ul "Worlds 2015: Foodcoatshop vs. The Morning After"
:worlds-2015-b "Worlds 2015: Timmy Wong (C) vs. Dan D'Argenio (R)"
:worlds-2015-b-tag "Dan D'Argenio (C) vs. Timmy Wong (R)"
:worlds-2015-b-ul "Worlds 2015: Yellow Shell vs. Radisson Cheese Plate"
:worlds-2015-info "269 players attended worlds in 2015. The tournament was held in Minneapolis, MN, USA, and consisted of 8 swiss rounds into a top 16 cut. The legal cardpool consisted of cards up to Data and Destiny."
:worlds-2016-a "Worlds 2016: Chris Dyer (C) vs. Benjamin Ni (R)"
:worlds-2016-a-tag "Chris Dyer (C) vs. Benjamin Ni (R)"
:worlds-2016-a-ul "Worlds 2016: Snekbite vs. Minh MaxX++"
:worlds-2016-b "Worlds 2016: Benjamin Ni (R) vs. Chris Dyer (C)"
:worlds-2016-b-tag "Benjamin Ni (R) vs. Chris Dyer (C)"
:worlds-2016-b-ul "Worlds 2016: Fiery Info vs. Papa Smurf"
:worlds-2016-info "278 players attended worlds in 2016. The tournament was held in Minneapolis, MN, USA, and consisted of 9 swiss rounds into a top 16 cut. The legal cardpool consisted of cards up to Escalation."
:worlds-2017-a "Worlds 2017: Wilfy Horig (C) vs. Gregory Tongue (R)"
:worlds-2017-a-tag "Wilfy Horig (C) vs. Gregory Tongue (R)"
:worlds-2017-a-ul "Worlds 2017: Stinson Reversed CI vs. Aesops Hayley"
:worlds-2017-b "Worlds 2017: Gregory Tongue (C) vs. Wilfy Horig (R)"
:worlds-2017-b-tag "Gregory Tongue (C) vs. Wilfy Horig (R)"
:worlds-2017-b-ul "Worlds 2017: No-Show Rewiring CI vs. Laguna Lock Hayley"
:worlds-2017-info "233 players attended worlds in 2017. The tournament was held in Minneapolis, MN, USA, and consisted of 8(?) swiss rounds into a top 16 cut. The legal cardpool consisted of cards up to the Revised Core set."
:worlds-2018-a "Worlds 2018: Joe Schupp (C) vs. Chris Dyer (R)"
:worlds-2018-a-tag "Joe Schupp (C) vs. Chris Dyer (R)"
:worlds-2018-a-ul "Worlds 2018: AMERICA CtM vs. Gooseberry MaxX"
:worlds-2018-b "Worlds 2018: Chris Dyer (C) vs. Joe Schupp (R)"
:worlds-2018-b-tag "Chris Dyer (C) vs. Joe Schupp (R)"
:worlds-2018-b-ul "Worlds 2018: Trust the Process vs. Dan D'Argenio KoS Val"
:worlds-2018-info "403(!) players attended worlds in 2018. This is the final worlds championship to be run by FFG. The tournament was held in Minneapolis, MN, USA, and consisted of 9(?) swiss rounds into a top 16 cut. The legal cardpool consisted of cards up to Reign and Reverie"
:worlds-2019-a "Worlds 2019: Pinsel (C) vs. Testrunning (R)"
:worlds-2019-a-tag "Pinsel (C) vs. Testrunning (R)"
:worlds-2019-a-ul "Worlds 2019: Fully dedicated to efficiency vs. Trash Panda"
:worlds-2019-b "Worlds 2019: Testrunning (C) vs. Pinsel (R)"
:worlds-2019-b-tag "Testrunning (C) vs. Pinsel (R)"
:worlds-2019-b-ul "Worlds 2019: 2 Grid for 2 Place vs. Trash Panda"
:worlds-2019-info "256 players played in the first even Project NISEI Netrunner World Championship in 2019. This tournament was held in Rotterdam, NL, and consisted of 8(?) swiss rounds into a top 16 cut. The legal cardpool consisted of cards up to the Uprising Booster Pack"
:worlds-2020-a "Worlds 2020: Limes (C) vs. tf34 (R)"
:worlds-2020-a-tag "Limes (C) vs. tf34 (R)"
:worlds-2020-a-ul "Worlds 2020: I don't like this deck vs. Engolo Freedom"
:worlds-2020-b "Worlds 2020: tf34 (R) vs. Limes (C)"
:worlds-2020-b-tag "tf34 (R) vs. Limes (C)"
:worlds-2020-b-ul "Worlds 2020: Malia CTM vs. Imp-pressive Hoshiko"
:worlds-2020-info "294 players played in the first ever online world championship for Netrunner, run by Project NISEI 2020. Due to travel restrictions at the start of the COVID-19 pandemic, this tournament was held online via Jinteki.net, and consisted of 8 swiss rounds on two distinct day-ones, into a top 16 cut. The legal cardpool consisted of cards up to Uprising."
:worlds-2021-a "Worlds 2021: Patrick Gower (C) vs. Jonas (R)"
:worlds-2021-a-tag "Patrick Gower (C) vs. Jonas (R)"
:worlds-2021-a-ul "Worlds 2021: 44 Card PD vs. Watch Me Drip, Watch Me Maemi"
:worlds-2021-b "Worlds 2021: Jonas (C) vs. Patrick Gower (R)"
:worlds-2021-b-tag "Jonas (C) vs. Patrick Gower (R)"
:worlds-2021-b-ul "Worlds 2021: Is Gagarin Good? vs. Medium to Large Maxx"
:worlds-2021-info "201 players played in the second online world championship for Netrunner, run by Project NISEI in 2021. Due to the ongoing disruption caused by the COVID-19 pandemic, this tournament was held online via Jinteki.net, and consisted of 8 swiss rounds on two distinct day-ones, into a top 16 cut. The legal cardpool consisted of cards up to System Gateway."
:worlds-2022-a "Worlds 2022: William Huang (C) vs. skry (R)"
:worlds-2022-a-tag "William Huang (C) vs. skry (R)"
:worlds-2022-a-ul "Worlds 2022: SNACS vs. Liberté, Égalité, Humidité"
:worlds-2022-b "Worlds 2022: skry (C) vs. William Huang (R)"
:worlds-2022-b-tag "skry (C) vs. William Huang (R)"
:worlds-2022-b-ul "Worlds 2022: Dies to Doom Blade vs. ApocoLat"
:worlds-2022-info "158 players played in the first world championship run by Null Signal Games (formerly Project NISEI), which was the first Netrunner world championship to be run in-person since the start of the COVID-19 pandemic. The tournament was held in Toronto, Canada, and consisted of 8(?) rounds into a top 16 cut. The legal cardpool consisted of cards up to Midnight Sun."
:worlds-2023-a "Worlds 2023: William Huang (C) vs. cableCarnage (R)"
:worlds-2023-a-tag "William Huang (C) vs. cableCarnage (R)"
:worlds-2023-a-ul "Worlds 2023: The Worlds Grid vs. sableCarnage"
:worlds-2023-b "Worlds 2023: cableCarnage (C) vs. William Huang (R)"
:worlds-2023-b-tag "cableCarnage (C) vs. William Huang (R)"
:worlds-2023-b-ul "Worlds 2023: tableCarnage vs. You *do* always come back!"
:worlds-2023-info "254 players played in the second Netrunner world championship run by Null Signal Games. The tournament was held in Barcelona, Spain, and consisted of 8 rounds into a top 16 cut. The legal cardpool consisted of cards up to The Automata Initiative."}
:set {:all "All"
:draft "Draft"
Expand Down Expand Up @@ -362,8 +386,10 @@
:default-game-format "Default game format"
:gateway-format {:beginner "Beginner"
:beginner-info "This lobby is using the System Gateway beginner decks for the Corporation and Runner. These decks are recommended for your first games. Games are played to 6 agenda points."
:beginner-ul "System Gateway - Beginner Teaching Decks"
:intermediate "Intermediate"
:intermediate-info "This lobby is using the System Gateway intermediate decks for the Corporation and Runner. These decks have slightly more range than the beginner decks. Games are played to 7 agenda points."
:intermediate-ul "System Gateway - Intermediate Teaching Decks"
:constructed "Constructed"}
:singleton "Singleton"
:singleton-b "(singleton)"
Expand Down
9 changes: 3 additions & 6 deletions src/cljc/jinteki/preconstructed.cljc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
[:lobby.gateway-format.beginner "Beginner"]
[:lobby.gateway-format.beginner-info
"This lobby is using the System Gateway beginner decks for the Corporation and Runner. These decks are recommended for your first games. Games are played to 6 agenda points."]
[:lobby.gateway-format-beginner-ul "System Gateway - Beginner Teaching Decks"]
[:lobby.gateway-format.beginner-ul "System Gateway - Beginner Teaching Decks"]
gateway-beginner-corp
gateway-beginner-runner))

Expand All @@ -130,12 +130,11 @@
[:lobby.gateway-format.intermediate "Intermediate"]
[:lobby.gateway-format.intermediate-info
"This lobby is using the System Gateway intermediate decks for the Corporation and Runner. These decks have slightly more range than the beginner decks. Games are played to 7 agenda points."]
[:lobby.gateway-format-intermediate-ul "System Gateway - Intermediate Teaching Decks"]
[:lobby.gateway-format.intermediate-ul "System Gateway - Intermediate Teaching Decks"]
gateway-intermediate-corp
gateway-intermediate-runner))

;; Worlds 2012: Ben Marsh vs. Jeremy Z

(def worlds-2012-ben-corps
(matchup
[:preconstructed.worlds-2012-a "Worlds 2012: Ben Marsh (C) vs. Jeremy Zwirn (R)"]
Expand Down Expand Up @@ -459,7 +458,6 @@
{:qty 3 :card "Security Testing"}])))

;; Worlds 2015: Dan D'Argenio vs. Timmy Wong

(def worlds-2015-dan-d-corps
(matchup
[:preconstructed.worlds-2015-a "Worlds 2015: Dan D'Argenio (C) vs. Timmy Wong (R)"]
Expand Down Expand Up @@ -570,7 +568,6 @@
{:qty 3 :card "Wireless Net Pavilion"}])))

;; Worlds 2016: Chris Dyer vs. Ben Ni

(def worlds-2016-chris-dyer-corps
(matchup
[:preconstructed.worlds-2016-a "Worlds 2016: Chris Dyer (C) vs. Benjamin Ni (R)"]
Expand Down Expand Up @@ -1304,7 +1301,7 @@
[:preconstructed.worlds-2022-b "Worlds 2022: skry (C) vs. William Huang (R)"]
[:preconstructed.worlds-2022-b-tag "skry (C) vs. William Huang (R)"]
[:preconstructed.worlds-2022-info "158 players played in the first world championship run by Null Signal Games (formerly Project NISEI), which was the first Netrunner world championship to be run in-person since the start of the COVID-19 pandemic. The tournament was held in Toronto, Canada, and consisted of 8(?) rounds into a top 16 cut. The legal cardpool consisted of cards up to Midnight Sun."]
[:preconstructed.worlds-2022-a-ul "Worlds 2022: Dies to Doom Blade vs. ApocoLat"]
[:preconstructed.worlds-2022-b-ul "Worlds 2022: Dies to Doom Blade vs. ApocoLat"]
(precon "skry - 2022: Dies to Doomblade"
{:title "AgInfusion: New Miracles for a New World" :side "Corp" :code 12052}
[{:qty 1 :card "Longevity Serum"}
Expand Down
4 changes: 2 additions & 2 deletions src/cljs/nr/game_row.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@
[:span.format-label (tr [:lobby.format "Format"]) ": "]
[:span.format-type (tr-format (slug->format fmt "Unknown"))]
[precon-span precon]
[:span.format-singleton (str (when singleton? (str " " (tr [:lobby.singleton-b "(singleton)"]))))]])
[:span.format-singleton (str (when singleton? (str " " (tr [:lobby.singleton-b "(singleton)"]))))]
[precon-under-span precon]])

(defn- time-since
"Helper method for game-time. Computes how many minutes since game start"
Expand Down Expand Up @@ -229,6 +230,5 @@
[game-title state user game]
[mod-menu-popup state user game]
[game-format game]
[precon-under-span (:precon game)]
[game-time game]
[players-row game]]))
3 changes: 2 additions & 1 deletion src/css/lobby.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@
font-family: "noto-emoji"

.format-precon-deck-names
font-style: italic
font-weight: bold
display: block

.game-format
margin-bottom: 10px
Expand Down

0 comments on commit c0baf67

Please sign in to comment.