diff --git a/public/images/EXPO/GameDev logos/Cyber_Doc_Rogue.png b/public/images/EXPO/GameDev logos/Cyber_Doc_Rogue.png new file mode 100644 index 0000000..46cecc0 Binary files /dev/null and b/public/images/EXPO/GameDev logos/Cyber_Doc_Rogue.png differ diff --git a/public/images/EXPO/GameDev logos/DELUSIONAL_logo.svg b/public/images/EXPO/GameDev logos/DELUSIONAL_logo.svg new file mode 100644 index 0000000..5a010cb --- /dev/null +++ b/public/images/EXPO/GameDev logos/DELUSIONAL_logo.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/images/EXPO/GameDev logos/Eleball.png b/public/images/EXPO/GameDev logos/Eleball.png new file mode 100644 index 0000000..34d9d08 Binary files /dev/null and b/public/images/EXPO/GameDev logos/Eleball.png differ diff --git a/public/images/EXPO/GameDev logos/Hardwired.png b/public/images/EXPO/GameDev logos/Hardwired.png new file mode 100644 index 0000000..19253d4 Binary files /dev/null and b/public/images/EXPO/GameDev logos/Hardwired.png differ diff --git a/public/images/EXPO/GameDev logos/Hexwave.png b/public/images/EXPO/GameDev logos/Hexwave.png new file mode 100644 index 0000000..1cb6a4c Binary files /dev/null and b/public/images/EXPO/GameDev logos/Hexwave.png differ diff --git a/public/images/EXPO/GameDev logos/Immortal.png b/public/images/EXPO/GameDev logos/Immortal.png new file mode 100644 index 0000000..02fbed5 Binary files /dev/null and b/public/images/EXPO/GameDev logos/Immortal.png differ diff --git a/public/images/EXPO/GameDev logos/Kalawindow.png b/public/images/EXPO/GameDev logos/Kalawindow.png new file mode 100644 index 0000000..bb84829 Binary files /dev/null and b/public/images/EXPO/GameDev logos/Kalawindow.png differ diff --git a/public/images/EXPO/GameDev logos/Korter1996.png b/public/images/EXPO/GameDev logos/Korter1996.png new file mode 100644 index 0000000..ecd25db Binary files /dev/null and b/public/images/EXPO/GameDev logos/Korter1996.png differ diff --git a/public/images/EXPO/GameDev logos/Midnight_Souveneirs.png b/public/images/EXPO/GameDev logos/Midnight_Souveneirs.png new file mode 100644 index 0000000..686054c Binary files /dev/null and b/public/images/EXPO/GameDev logos/Midnight_Souveneirs.png differ diff --git a/public/images/EXPO/GameDev logos/Nullis.png b/public/images/EXPO/GameDev logos/Nullis.png new file mode 100644 index 0000000..5376695 Binary files /dev/null and b/public/images/EXPO/GameDev logos/Nullis.png differ diff --git a/public/images/EXPO/GameDev logos/Planet_hoarders.png b/public/images/EXPO/GameDev logos/Planet_hoarders.png new file mode 100644 index 0000000..c2264df Binary files /dev/null and b/public/images/EXPO/GameDev logos/Planet_hoarders.png differ diff --git a/public/images/EXPO/GameDev logos/Seasons_of_Solitude.png b/public/images/EXPO/GameDev logos/Seasons_of_Solitude.png new file mode 100644 index 0000000..a47fbe1 Binary files /dev/null and b/public/images/EXPO/GameDev logos/Seasons_of_Solitude.png differ diff --git a/public/images/EXPO/GameDev logos/War_torn.png b/public/images/EXPO/GameDev logos/War_torn.png new file mode 100644 index 0000000..a85d9ef Binary files /dev/null and b/public/images/EXPO/GameDev logos/War_torn.png differ diff --git a/public/images/EXPO/GameDev logos/broken_alliance.png b/public/images/EXPO/GameDev logos/broken_alliance.png new file mode 100644 index 0000000..2153b2e Binary files /dev/null and b/public/images/EXPO/GameDev logos/broken_alliance.png differ diff --git a/public/images/EXPO/GameDev logos/craftcat_sim.png b/public/images/EXPO/GameDev logos/craftcat_sim.png new file mode 100644 index 0000000..a34df33 Binary files /dev/null and b/public/images/EXPO/GameDev logos/craftcat_sim.png differ diff --git a/public/images/EXPO/GameDev logos/death_and_taxes.png b/public/images/EXPO/GameDev logos/death_and_taxes.png new file mode 100644 index 0000000..5fa72ee Binary files /dev/null and b/public/images/EXPO/GameDev logos/death_and_taxes.png differ diff --git a/public/images/EXPO/GameDev logos/deep_pixel_melancholy.svg b/public/images/EXPO/GameDev logos/deep_pixel_melancholy.svg new file mode 100644 index 0000000..54a1cb3 --- /dev/null +++ b/public/images/EXPO/GameDev logos/deep_pixel_melancholy.svg @@ -0,0 +1,103 @@ + + + + diff --git a/public/images/EXPO/GameDev logos/realm_hearts.png b/public/images/EXPO/GameDev logos/realm_hearts.png new file mode 100644 index 0000000..a7cd34d Binary files /dev/null and b/public/images/EXPO/GameDev logos/realm_hearts.png differ diff --git a/public/images/EXPO/baar.jpg b/public/images/EXPO/baar.jpg new file mode 100644 index 0000000..c38511b Binary files /dev/null and b/public/images/EXPO/baar.jpg differ diff --git a/public/images/EXPO/chill_ala.jpg b/public/images/EXPO/chill_ala.jpg new file mode 100644 index 0000000..7352d14 Binary files /dev/null and b/public/images/EXPO/chill_ala.jpg differ diff --git a/public/images/EXPO/mklubi.jpg b/public/images/EXPO/mklubi.jpg new file mode 100644 index 0000000..72511f0 Binary files /dev/null and b/public/images/EXPO/mklubi.jpg differ diff --git a/public/images/EXPO/ylikoolid/a_bottles_journey.png b/public/images/EXPO/ylikoolid/a_bottles_journey.png new file mode 100644 index 0000000..e2c2559 Binary files /dev/null and b/public/images/EXPO/ylikoolid/a_bottles_journey.png differ diff --git a/public/images/EXPO/ylikoolid/blastronaut.png b/public/images/EXPO/ylikoolid/blastronaut.png new file mode 100644 index 0000000..6ce4f95 Binary files /dev/null and b/public/images/EXPO/ylikoolid/blastronaut.png differ diff --git a/public/images/EXPO/ylikoolid/deltavr.png b/public/images/EXPO/ylikoolid/deltavr.png new file mode 100644 index 0000000..2ab9d1a Binary files /dev/null and b/public/images/EXPO/ylikoolid/deltavr.png differ diff --git a/public/images/EXPO/ylikoolid/dwarf_escape.png b/public/images/EXPO/ylikoolid/dwarf_escape.png new file mode 100644 index 0000000..0c60f4e Binary files /dev/null and b/public/images/EXPO/ylikoolid/dwarf_escape.png differ diff --git a/public/images/EXPO/ylikoolid/magic_mineral.png b/public/images/EXPO/ylikoolid/magic_mineral.png new file mode 100644 index 0000000..0b1a5da Binary files /dev/null and b/public/images/EXPO/ylikoolid/magic_mineral.png differ diff --git a/public/images/EXPO/ylikoolid/oh_crap.png b/public/images/EXPO/ylikoolid/oh_crap.png new file mode 100644 index 0000000..9b07e9b Binary files /dev/null and b/public/images/EXPO/ylikoolid/oh_crap.png differ diff --git a/public/images/EXPO/ylikoolid/packet_tracers.png b/public/images/EXPO/ylikoolid/packet_tracers.png new file mode 100644 index 0000000..4395be2 Binary files /dev/null and b/public/images/EXPO/ylikoolid/packet_tracers.png differ diff --git a/public/images/EXPO/ylikoolid/psyrreal.png b/public/images/EXPO/ylikoolid/psyrreal.png new file mode 100644 index 0000000..a091743 Binary files /dev/null and b/public/images/EXPO/ylikoolid/psyrreal.png differ diff --git a/public/images/EXPO/ylikoolid/the_return.png b/public/images/EXPO/ylikoolid/the_return.png new file mode 100644 index 0000000..b5b0eab Binary files /dev/null and b/public/images/EXPO/ylikoolid/the_return.png differ diff --git a/public/images/EXPO/ylikoolid/tiksu-toksu.jpg b/public/images/EXPO/ylikoolid/tiksu-toksu.jpg new file mode 100644 index 0000000..8ffc61c Binary files /dev/null and b/public/images/EXPO/ylikoolid/tiksu-toksu.jpg differ diff --git a/public/images/EXPO/ylikoolid/type_n_magic.png b/public/images/EXPO/ylikoolid/type_n_magic.png new file mode 100644 index 0000000..e57eaf4 Binary files /dev/null and b/public/images/EXPO/ylikoolid/type_n_magic.png differ diff --git a/public/images/EXPO/ylikoolid/void_of_hermes.png b/public/images/EXPO/ylikoolid/void_of_hermes.png new file mode 100644 index 0000000..26ce709 Binary files /dev/null and b/public/images/EXPO/ylikoolid/void_of_hermes.png differ diff --git a/public/images/EXPO/ylikoolid/wildings.png b/public/images/EXPO/ylikoolid/wildings.png new file mode 100644 index 0000000..e4b7d05 Binary files /dev/null and b/public/images/EXPO/ylikoolid/wildings.png differ diff --git a/src/app/[locale]/messiala/page.tsx b/src/app/[locale]/messiala/page.tsx index 612bc43..a3e6ec3 100644 --- a/src/app/[locale]/messiala/page.tsx +++ b/src/app/[locale]/messiala/page.tsx @@ -13,6 +13,7 @@ import { roomMeta, RoomNameKey, } from "@/data/roomNames"; +import gamedevData from "@/data/gamedev.json"; // Define interface for the ref with toggle function interface MountRefCurrent extends HTMLDivElement { @@ -857,6 +858,212 @@ export default function Expo() { + + {/* MINITURNIIRID Section */} +
+
+

+ MINITURNIIRID +

+

+ TipiLANil toimub mitmeid erinevaid lõbusaid ja võistlushimu tekitavaid miniturniire. Osaleda saavad ka niisama külastajad! Auhinnafond on kõigi turniiride peale 1250€. +

+
+
+ Miniturniirid logo +
+
+ + + + {/* PUHKA JA MÄNGI Section */} +
+

+ PUHKA JA MÄNGI +

+ +
+ {/* Card 1 - Chill-ala */} +
+
+
+ Chill-ala +
+
+

+ Chill-ala koos turniiride otseülekandega +

+
+ + {/* Card 2 - Mänguklubi */} +
+
+
+ Mänguklubi +
+
+

+ Mänguklubi lauamängud ja konsoolid +

+
+ + {/* Card 3 - Baariala */} +
+
+
+ Baariala +
+
+

+ Baariala jookide ja snäkkidega +

+
+
+
+ + + + {/* EESTI MÄNGUARENDAJAD Section */} +
+

+ Eesti mänguarendajad +

+ +
+ {gamedevData.games.map((game) => ( +
+
+ {game.name} +
+

+ {game.name} +

+

+ {game.developer} +

+
+ ))} +
+
+ + + + {/* ÜLIKOOLID Section */} +
+

+ Ülikoolid +

+ + {/* First 12 games in 3x4 grid */} +
+ {gamedevData.universities?.slice(0, 12).map((university) => ( +
+
+ {university.name} +
+

+ {university.name} +

+

+ {university.university} +

+
+ ))} +
+ + {/* Remaining games in new grid */} + {gamedevData.universities && gamedevData.universities.length > 12 && ( +
+ {gamedevData.universities.slice(12).map((university) => ( +
+
+ {university.name} +
+

+ {university.name} +

+

+ {university.university} +

+
+ ))} +
+ )} +
+ + ); } diff --git a/src/data/gamedev.json b/src/data/gamedev.json new file mode 100644 index 0000000..c9c625e --- /dev/null +++ b/src/data/gamedev.json @@ -0,0 +1,231 @@ +{ + "games": [ + { + "id": "broken-alliance", + "name": "Broken Alliance", + "logo": "/images/EXPO/GameDev logos/broken_alliance.png", + "developer": "Placeholder Gameworks", + "description": "" + }, + { + "id": "buckshot-tournament", + "name": "Buckshot Tournament", + "logo": "/images/miniturniirid/buckshot_tournament.png", + "developer": "Mike Klubnika", + "description": "" + }, + { + "id": "eleball", + "name": "Eleball", + "logo": "/images/EXPO/GameDev logos/Eleball.png", + "developer": "Pulsar Twin", + "description": "" + }, + { + "id": "craftcraft-simulator", + "name": "CraftCraft Simulator", + "logo": "/images/EXPO/GameDev logos/craftcat_sim.png", + "developer": "Placeholder Gameworks", + "description": "" + }, + { + "id": "cyber-dog-rescue", + "name": "Cyber Dog Rescue", + "logo": "/images/EXPO/GameDev logos/Cyber_Doc_Rogue.png", + "developer": "HRA Interactive", + "description": "" + }, + { + "id": "death-and-taxes", + "name": "Death and Taxes", + "logo": "/images/EXPO/GameDev logos/death_and_taxes.png", + "developer": "Placeholder Gameworks", + "description": "" + }, + { + "id": "deep-pixel-melancholy", + "name": "Deep Pixel Melancholy", + "logo": "/images/EXPO/GameDev logos/deep_pixel_melancholy.svg", + "developer": "ok/no", + "description": "" + }, + { + "id": "delusional", + "name": "Delusional", + "logo": "/images/EXPO/GameDev logos/DELUSIONAL_logo.svg", + "developer": "AUTOPLAY", + "description": "" + }, + { + "id": "hardwired", + "name": "Hardwired", + "logo": "/images/EXPO/GameDev logos/Hardwired.png", + "developer": "Lostbyte", + "description": "" + }, + { + "id": "hexwave", + "name": "HexWave", + "logo": "/images/EXPO/GameDev logos/Hexwave.png", + "developer": "HardBoyled Games", + "description": "" + }, + { + "id": "immortal", + "name": "IMMORTAL: And the death that follows", + "logo": "/images/EXPO/GameDev logos/Immortal.png", + "developer": "Mishura Games", + "description": "" + }, + { + "id": "kalawindow", + "name": "Kalawindow", + "logo": "/images/EXPO/GameDev logos/Kalawindow.png", + "developer": "Lost Empire Entertainment", + "description": "" + }, + { + "id": "kortel-1996", + "name": "Kortel 1996", + "logo": "/images/EXPO/GameDev logos/Korter1996.png", + "developer": "Mari-Anna Lepasson", + "description": "" + }, + { + "id": "midnight-souveneirs", + "name": "Midnight Souveneirs", + "logo": "/images/EXPO/GameDev logos/Midnight_Souveneirs.png", + "developer": "Path of Pixels", + "description": "" + }, + + { + "id": "planet-hoarders", + "name": "Planet Hoarders", + "logo": "/images/EXPO/GameDev logos/Planet_hoarders.png", + "developer": "Imago Games", + "description": "" + }, + { + "id": "realm-hearts", + "name": "Realm Hearts", + "logo": "/images/EXPO/GameDev logos/realm_hearts.png", + "developer": "Dreamaster", + "description": "" + }, + { + "id": "season-of-solitude", + "name": "Season of Solitude", + "logo": "/images/EXPO/GameDev logos/Seasons_of_Solitude.png", + "developer": "Ninjarithm Studio", + "description": "" + }, + { + "id": "war-thorn", + "name": "War-thorn", + "logo": "/images/EXPO/GameDev logos/War_torn.png", + "developer": "KingOfTheEnd, ForgottenCup", + "description": "" + } + ], + "universities": [ + { + "id": "deltavr", + "name": "DeltaVR", + "logo": "/images/EXPO/ylikoolid/deltavr.png", + "university": "Tartu Ülikool", + "description": "" + }, + { + "id": "tiksu-toksu", + "name": "Tiksu-Toksu", + "logo": "/images/EXPO/ylikoolid/tiksu-toksu.jpg", + "university": "Tartu Ülikool", + "description": "" + }, + { + "id": "psyrreal", + "name": "Psyrreal", + "logo": "/images/EXPO/ylikoolid/psyrreal.png", + "university": "Tartu Ülikool", + "description": "" + }, + { + "id": "blastronaut", + "name": "Blastronaut", + "logo": "/images/EXPO/ylikoolid/blastronaut.png", + "university": "Tartu Ülikool", + "description": "" + }, + { + "id": "oh-crap", + "name": "Oh Crap!", + "logo": "/images/EXPO/ylikoolid/oh_crap.png", + "university": "Tallinna Tehnikaülikool", + "description": "" + }, + { + "id": "dwarf-escape", + "name": "Dwarf Escape", + "logo": "/images/EXPO/ylikoolid/dwarf_escape.png", + "university": "Tallinna Tehnikaülikool", + "description": "" + }, + { + "id": "void-of-hermes", + "name": "Void of Hermes", + "logo": "/images/EXPO/ylikoolid/void_of_hermes.png", + "university": "Tallinna Tehnikaülikool", + "description": "" + }, + { + "id": "nullis", + "name": "Nullis", + "logo": "/images/EXPO/GameDev logos/Nullis.png", + "university": "Tallinna Tehnikaülikool", + "description": "" + }, + { + "id": "packet-tracers", + "name": "Packet Tracers", + "logo": "/images/EXPO/ylikoolid/packet_tracers.png", + "university": "Tallinna Tehnikaülikool", + "description": "" + }, + { + "id": "a-bottles-journey", + "name": "A Bottle's Journey", + "logo": "/images/EXPO/ylikoolid/a_bottles_journey.png", + "university": "Tallinna Ülikool", + "description": "" + }, + { + "id": "wildings", + "name": "Wildings", + "logo": "/images/EXPO/ylikoolid/wildings.png", + "university": "Tallinna Ülikool", + "description": "" + }, + { + "id": "the-return", + "name": "The Return", + "logo": "/images/EXPO/ylikoolid/the_return.png", + "university": "Tallinna Ülikool", + "description": "" + }, + { + "id": "magic-mineral", + "name": "Magic Mineral", + "logo": "/images/EXPO/ylikoolid/magic_mineral.png", + "university": "Tallinna Ülikool", + "description": "" + }, + { + "id": "type-n-magic", + "name": "Type 'n Magic", + "logo": "/images/EXPO/ylikoolid/type_n_magic.png", + "university": "Tallinna Ülikool", + "description": "" + } + ] +} diff --git a/src/data/rules/en/cs2.md b/src/data/rules/en/cs2.md index a7773cc..961f9d7 100644 --- a/src/data/rules/en/cs2.md +++ b/src/data/rules/en/cs2.md @@ -93,8 +93,8 @@ ## 6. Map Selection 1. **6.1** The tournament takes place in two stages: - 1. **6.1.1** Swiss system: initial phase played in Bo1 format. All decisive matches (matches that secure advancement or elimination from the tournament) are in Bo3 format. The top 8 teams advance to the playoff stage. - 2. **6.1.2** Playoff stage: all matches are Bo3. Quarter-finals, semi-finals, finals, and 3rd place match take place. + 1. **6.1.1** Swiss system: initial phase played in Bo1 format. The top 16 teams advance to the playoffs. + 2. **6.1.2** Playoffs: played in double elimination format, where winners' bracket matches are Bo3 and losers' bracket matches are Bo1. 2. **6.2** Maps are selected from the currently active Valve Active Duty Map Group. 3. **6.3** Best of 1 (Bo1): coin flip winner decides whether they are Team A or Team B. Team A starts and the process is as follows: 1. **6.3.1** Team A removes two maps. diff --git a/src/data/rules/et/cs2.md b/src/data/rules/et/cs2.md index 4fb883b..e821755 100644 --- a/src/data/rules/et/cs2.md +++ b/src/data/rules/et/cs2.md @@ -1,13 +1,7 @@ ## 1. Üldist -1. **1.1** Counter-Strike 2 (edaspidi CS2) turniir toimub 24.-26.5. **5.5*Tehniline paus: igal tiimil on vajadusel õigus kasutada tehnilist pausi. Pausi alustamiseks tuleb mängusisesesse chatti sisestada käsklus ".tech". Tehnilist pausi tohib kasutada üksnes mõjuval põhjusel, tehniliste probleemide esinemisel, ning selle põhjusest tuleb korraldajaid viivitamatult teavitada Discordi kaudu pärast pausi alustamist. - -## 6. Kaardivalik -1. **6.1** Turniir toimub kahes etapis: - 1. **6.1.1** Swiss-süsteem: algfaasis mängitakse Bo1 formaadis. Kõik otsustavad mängud (mängud, mis tagavad edasipääsu või turniirilt väljalangemise) on Bo3 formaadis. 8 parimat meeskonda pääsevad finaaletappi. - 2. **6.1.2** Finaaletapp: kõik kohtumised on Bo3. Toimuvad veerandfinaalid, poolfinaalid, finaal ning 3. koha mäng. -2. **6.2** Mängitav kaart valitakse välja hetkel aktiivsete Valve'i kaardigrupi (Valve Active Duty Map Group) kaartidest.toober, 2025 Tallinna Tehnikaülikooli (TalTech) ruumides, Ehitajate tee 5, Tallinn. +1. **1.1** Counter-Strike 2 (edaspidi CS2) turniir toimub 24.-26. Oktoober, 2025 Tallinna Tehnikaülikooli (TalTech) ruumides, Ehitajate tee 5, Tallinn. 2. **1.2** Turniiri auhinnafondiks on 5750€, mis jaguneb järgnevalt: - 1. **1.2.1** TOP 3 auhinna fond on 5000€: + 1. **1.2.1** TOP 3 auhinna found on 5000€: - **1.2.1.1** Esimese koha saanud võistkond - 500€ võistleja kohta - **1.2.1.2** Teise koha saanud võistkond - 300€ võistleja kohta - **1.2.1.3** Kolmanda koha saanud võistkond - 200€ võistleja kohta @@ -36,7 +30,7 @@ 3. **2.3** Igal tiimil võib olla üks varumängija, kes ei kuulu tiimi põhikoosseisu: 1. **2.3.1** Varumängija peab soetama endale eraldi varumängija pileti; 2. **2.3.2** Varumängija võib asendada ükskõik millist tiimi põhikoosseisu liiget turniiri toimumisel ajal; - 3. **2.3.2** Varumängijale kehtivad samad õigused ja nõuded, mis tiimi põhikoosseisule. + 3. **2.3.3** Varumängijale kehtivad samad õigused ja nõuded, mis tiimi põhikoosseisule. 4. **2.4** Tiimi põhikoosseisus on lubatud välja vahetada mängijaid enne tiimide registreerimiskuupäeva lõppemist: 1. **2.4.1** Mängijate väljavahetamine toimub läbi Fienta; 2. **2.4.2** Liikme välja vahetamisel jääb tiimil jätkuvalt õigus varumängijale; @@ -47,7 +41,7 @@ 8. **2.8** Kõik tiimiliikmed (k.a. põhikoosseis, varumängija, asendusmängija(d)) võivad turniiril kuulda vaid ühte tiimi korraga ja esindada vaid iseennast (st keelatud on lasta kellelgi teisel enda eest mängida); 9. **2.9** Kõik tiimiliikmed (k.a. põhikoosseis, varumängija, asendusmängija(d)) peavad turniirile registreerimise päevaks olema vähemalt 16-aastased; 10. **2.10** Mitte ükski tiimiliige ei tohi olla Venemaa Föderatsiooni ega Valgevene Rahvavabariigi kodanik. -11. **2.11**Tiimidel (k.a. põhikoosseis, varumängija, asendusmängija(d)) pole lubatud: +11. **2.11** Tiimidel (k.a. põhikoosseis, varumängija, asendusmängija(d)) pole lubatud: 1. **2.11.1** Treenerite kasutamine; 2. **2.11.2** Tiimisponsorite kajastamine turniiril; 3. **2.11.3** Mängida teise tiimi või tiimiliikme huvides; @@ -86,7 +80,9 @@ 5. **5.5** Tehniline paus: igal tiimil on vajadusel õigus kasutada tehnilist pausi. Pausi alustamiseks tuleb mängusisesesse chatti sisestada käsklus “.tech”. Tehnilist pausi tohib kasutada üksnes mõjuval põhjusel, tehniliste probleemide esinemisel, ning selle põhjusest tuleb korraldajaid viivitamatult teavitada Discordi kaudu pärast pausi alustamist. ## 6. Kaardivalik -1. **6.1** Turniiri lõplik formaat avalikustatakse oktoobris. +1. **6.1** Turniir toimub kahes etapis: + 1. **6.1.1** Swiss-süsteem: algfaasis mängitakse Bo1 formaadis. 16 parimat meeskonda pääsevad playoffidele. + 2. **6.1.2** Playoffid: mängitakse double elimination formaadis, kus winners' bracket mängud on Bo3 ja losers' bracket mängud on Bo1. 2. **6.2** Mängitav kaart valitakse välja hetkel aktiivsete Valve’i kaardigrupi (Valve Active Duty Map Group) kaartidest. 3. **6.3** Parim ühest (Bo1): mündiviske võitja otsustab, kas nad on võistkond A või võistkond B. Võistkond A alustab ning protsess on järgmine: 1. **6.3.1** Võistkond A eemaldab kaks kaarti. @@ -134,7 +130,8 @@ 13. **8.13** Korraldustiimil on kohustus kõikidest väljalangemistest ja -arvamistest ning edasistest muudatustest avalikult teada anda. ## 9. Kontakt -Igasuguste üritust puudutavate küsimuste, probleemide, murede jne korral võtta ühendust TipiLAN korraldustiimiga. +Igasuguste üritust puudutavate küsimuste, probleemide, murede jne korral võtta ühendust TipiLAN korraldustiimiga: +(kontaktid) ## 10. Viited - https://pro.eslgaming.com/csgo/proleague/rules/ diff --git a/src/data/timetable.ts b/src/data/timetable.ts index 8255a1e..8b0628f 100644 --- a/src/data/timetable.ts +++ b/src/data/timetable.ts @@ -12,41 +12,22 @@ export const scheduleData: Record = { locationKey: "schedule.locations.registrationSetup", time: "17:00", }, + { titleKey: "schedule.events.miniTournaments", locationKey: "schedule.locations.studentHouse", time: "18:00", }, - { - titleKey: "schedule.events.tournamentRegistration", - locationKey: "schedule.locations.auditorium", - time: "18:00", - }, - { - titleKey: "schedule.events.streetFighter6", - locationKey: "schedule.locations.studentHouse", - time: "18:00", - }, { titleKey: "schedule.events.smashBrosUltimate", locationKey: "schedule.locations.studentHouse", time: "18:30", }, { - titleKey: "schedule.events.cs2Tournament", + titleKey: "schedule.events.cs2LolTournaments", locationKey: "schedule.locations.auditorium", time: "20:00", }, - { - titleKey: "schedule.events.lolTournament", - locationKey: "schedule.locations.auditorium", - time: "20:00", - }, - { - titleKey: "schedule.events.sf6SsbuFinale", - locationKey: "schedule.locations.studentHouse", - time: "22:00", - }, { titleKey: "schedule.events.doorsClose", locationKey: "schedule.locations.auditoriumAndStudentHouse", @@ -55,9 +36,9 @@ export const scheduleData: Record = { ], oct25: [ { - titleKey: "schedule.events.doorsOpen", - locationKey: "schedule.locations.auditoriumAndStudentHouse", - time: "10:00", + titleKey: "schedule.events.doorsOpenSimple", + locationKey: "schedule.locations.auditorium", + time: "09:30", }, { titleKey: "schedule.events.cs2Continue", @@ -70,35 +51,35 @@ export const scheduleData: Record = { time: "12:00", }, { - titleKey: "schedule.events.2xkoTournament", - locationKey: "schedule.locations.studentHouse", + titleKey: "schedule.events.expoOpens", + locationKey: "schedule.locations.entranceHall", time: "12:00", }, { - titleKey: "schedule.events.tekken8Tournament", + titleKey: "schedule.events.2xkoTournament", locationKey: "schedule.locations.studentHouse", - time: "12:30", + time: "13:30", }, { - titleKey: "schedule.events.2xkoTekken8Finale", - locationKey: "schedule.locations.studentHouse", - time: "18:00", + titleKey: "schedule.events.lolFinale", + locationKey: "schedule.locations.auditorium", + time: "19:30", }, { - titleKey: "schedule.events.lolFinale", + titleKey: "schedule.events.cs2lbsemifinals", locationKey: "schedule.locations.auditorium", - time: "18:30", + time: "19:30", + }, + { + titleKey: "schedule.events.cs2lbfinals", + locationKey: "schedule.locations.auditorium", + time: "21:30", }, { titleKey: "schedule.events.granTurismoFinale", locationKey: "schedule.locations.studentHouse", time: "20:00", }, - { - titleKey: "schedule.events.lolTournamentSemifinals", - locationKey: "schedule.locations.auditorium", - time: "*01:00", - }, { titleKey: "schedule.events.doorsClose", locationKey: "schedule.locations.auditoriumAndStudentHouse", @@ -107,24 +88,25 @@ export const scheduleData: Record = { ], oct26: [ { - titleKey: "schedule.events.cs2Finale", + titleKey: "schedule.events.cs2semifinals", locationKey: "schedule.locations.auditorium", - time: "10:00", + time: "11:00", }, { - titleKey: "schedule.events.cs2FinalMatch", + titleKey: "schedule.events.Cs2finals", locationKey: "schedule.locations.auditorium", time: "15:30", }, { - titleKey: "schedule.events.cs2TournamentFinale", + + titleKey: "schedule.events.AwardsCeremony", locationKey: "schedule.locations.auditorium", time: "18:00", }, { titleKey: "schedule.events.doorsClose", locationKey: "schedule.locations.auditorium", - time: "18:30", + time: "19:00", }, ], }; diff --git a/translations/en.json b/translations/en.json index bb54b73..d6a89b9 100644 --- a/translations/en.json +++ b/translations/en.json @@ -139,13 +139,16 @@ "oct25": "October 25th", "oct26": "October 26th", "events": { - "doorsOpen": "Doors open", - "miniTournaments": "Mini tournaments", + "doorsOpen": "Doors open, expo area available", + "doorsOpenSimple": "Doors open", + "expoOpens": "Expo area opens", + "miniTournaments": "Mini tournaments begin", "tournamentRegistration": "Tournament registration", "streetFighter6": "Street Fighter 6 tournament", "smashBrosUltimate": "Smash Bros. Ultimate tournament", "cs2Tournament": "CS2 tournament", "lolTournament": "LoL tournament", + "cs2LolTournaments": "CS2 & LoL tournaments", "sf6SsbuFinale": "SF6 & SSBU finale", "doorsClose": "Doors close", "cs2Continue": "CS2 tournament continues", @@ -153,7 +156,13 @@ "2xkoTournament": "2XKO tournament", "tekken8Tournament": "Tekken 8 tournament", "2xkoTekken8Finale": "2XKO & Tekken 8 finale", - "lolFinale": "LoL finale", + "lolFinale": "LoL finale and 3rd place match", + "cs2lbsemifinals": "CS2 lower bracket semifinals", + "cs2lbfinals": "CS2 lower bracket finals", + "cs2setup": "CS2 setup for finals", + "cs2semifinals": "CS2 upper bracket semifinals", + "Cs2finals": "CS2 finals", + "AwardsCeremony": "Awards ceremony", "granTurismoFinale": "Gran Turismo finale", "lolTournamentSemifinals": "LoL tournament semifinals", "cs2Finale": "CS2 finale", diff --git a/translations/et.json b/translations/et.json index 0f6574d..8c75e58 100644 --- a/translations/et.json +++ b/translations/et.json @@ -140,13 +140,16 @@ "oct25": "25. oktoober", "oct26": "26. oktoober", "events": { - "doorsOpen": "Uksed avatakse", + "doorsOpen": "Uksed avatakse, messiala avatud", + "doorsOpenSimple": "Uksed avatakse", + "expoOpens": "Messiala avatakse", "miniTournaments": "Miniturniirid", "tournamentRegistration": "Turniiride registreerimine", "streetFighter6": "Street Fighter 6 turniir", "smashBrosUltimate": "Smash Bros. Ultimate turniir", "cs2Tournament": "CS2 turniir", "lolTournament": "LoL turniir", + "cs2LolTournaments": "CS2 ja LoL turniirid", "sf6SsbuFinale": "SF6 ja SSBU finaal", "doorsClose": "Uksed suletakse", "cs2Continue": "CS2 turniir jätkub", @@ -154,7 +157,13 @@ "2xkoTournament": "2XKO turniir", "tekken8Tournament": "Tekken 8 turniir", "2xkoTekken8Finale": "2XKO ja Tekken 8 finaal", - "lolFinale": "LoL finaal", + "lolFinale": "LoL finaal ja 3. koha mäng", + "cs2lbsemifinals": "CS2 alamliiga poolfinaalid", + "cs2lbfinals": "CS2 alamliiga finaalid", + "cs2setup": "CS2 finaalide ettevalmistus", + "cs2semifinals": "CS2 ülemliiga poolfinaalid", + "Cs2finals": "CS2 finaalid", + "AwardsCeremony": "Autasustamine", "granTurismoFinale": "Gran Turismo finaal", "lolTournamentSemifinals": "LoL turniiri poolfinaalid", "cs2Finale": "CS2 finaal",