From e7f54bad089346c2e895437bbbbc8bd17416dfc6 Mon Sep 17 00:00:00 2001 From: adrivrie Date: Wed, 19 Jul 2023 00:40:18 +0200 Subject: [PATCH 1/4] Ladder: Set current gen to 9 for decay purposes (#2130) --- lib/ntbb-ladder.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ntbb-ladder.lib.php b/lib/ntbb-ladder.lib.php index 839b671e18..7e4988b373 100644 --- a/lib/ntbb-ladder.lib.php +++ b/lib/ntbb-ladder.lib.php @@ -316,8 +316,8 @@ function update(&$user, $newM = false, $newMelo = 1000, $force = false) { $decay = 1 + intval(($elo-1400)/50); } switch ($this->formatid) { - case 'gen8randombattle': - case 'gen8ou': + case 'gen9randombattle': + case 'gen9ou': break; default: $decay -= 2; From 853f68e887ecc839c7912a4dbc694c58b17c7c4b Mon Sep 17 00:00:00 2001 From: Kennedy <103935710+KennedyLFC@users.noreply.github.com> Date: Tue, 18 Jul 2023 23:54:39 +0100 Subject: [PATCH 2/4] Add a link to the staff list (#2073) * Add a link to the staff list [very serious comment] The text in the first paragraph says "A full staff list can be found below." but there was no staff list below lmao. * Update website/pages/staff.md meow Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com> --------- Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com> --- website/pages/staff.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/pages/staff.md b/website/pages/staff.md index 63261fdf98..9a4ed03e62 100644 --- a/website/pages/staff.md +++ b/website/pages/staff.md @@ -6,7 +6,7 @@ Staff are represented by the symbols next to their names and appear at the top o ### What's the difference between room staff and global staff? -Room staff have permissions tied specifically to the room they were promoted in, whereas global staff have increased permissions across the server. Room staff can only perform moderation duties within their rooms, whereas global staff have the ability to globally lock or ban users and thus should be sought instead of room staff for PM or battle abuse. Global staff may also hold higher positions as room staff. Global staff can be identified by the "Global" indicator when clicking on their username. +Room staff have permissions tied specifically to the room they were promoted in, whereas global staff have increased permissions across the server. Room staff can only perform moderation duties within their rooms, whereas global staff have the ability to globally lock or ban users and thus should be sought instead of room staff for PM or battle abuse. Global staff may also hold higher positions as room staff. Global staff can be identified by the "Global" indicator when clicking on their username. You can also refer to the [staff list](https://www.smogon.com/sim/staff_list) to see all Global Staff members. ### What is the difference between the ranks? From 399aee9f74e2f4bebf3fc40cf5eb5b416942e764 Mon Sep 17 00:00:00 2001 From: Dylan <34275787+thisisdylandev@users.noreply.github.com> Date: Tue, 18 Jul 2023 17:04:41 -0600 Subject: [PATCH 3/4] Hide username on screens smaller than 500px (#1973) --- js/client-topbar.js | 2 +- src/panel-topbar.tsx | 2 +- style/client.css | 7 ++++++- style/client2.css | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/js/client-topbar.js b/js/client-topbar.js index c7ab31e16e..81d77a2078 100644 --- a/js/client-topbar.js +++ b/js/client-topbar.js @@ -36,7 +36,7 @@ if (!app.user.loaded) { buf = ''; } else if (app.user.get('named')) { - buf = ' ' + BattleLog.escapeHTML(name) + ''; + buf = ' ' + BattleLog.escapeHTML(name) + ''; } else { buf = ''; } diff --git a/src/panel-topbar.tsx b/src/panel-topbar.tsx index d26707f000..deb456452f 100644 --- a/src/panel-topbar.tsx +++ b/src/panel-topbar.tsx @@ -213,7 +213,7 @@ class PSHeader extends preact.Component<{style: {}}> { } const userColor = window.BattleLog && {color: BattleLog.usernameColor(PS.user.userid)}; return - {PS.user.name} + {PS.user.name} ; } render() { diff --git a/style/client.css b/style/client.css index b2d3be8be4..453ab1bf35 100644 --- a/style/client.css +++ b/style/client.css @@ -289,6 +289,11 @@ select { .username { cursor: pointer; } +@media (max-width: 500px) { + .usernametext { + display: none + } +} .userbar button.icon { height: 25px; width: 27px; @@ -2008,7 +2013,7 @@ a.ilink.yours { white-space: pre; overflow: hidden; } -.allyparty button .picon, +.allyparty button .picon, .switchmenu button .picon { float: left; margin: -6px -3px -6px -4px; diff --git a/style/client2.css b/style/client2.css index e66e17621f..8e46d6c08d 100644 --- a/style/client2.css +++ b/style/client2.css @@ -148,6 +148,11 @@ body { .username { cursor: pointer; } +@media (max-width: 500px) { + .usernametext { + display: none + } +} .userbar button.icon { height: 25px; width: 27px; From a47383b670077b652579cb36cf8e1b7362c04262 Mon Sep 17 00:00:00 2001 From: Kris Johnson <11083252+KrisXV@users.noreply.github.com> Date: Thu, 27 Jul 2023 19:52:28 -0600 Subject: [PATCH 4/4] Fix LC Draft teambuilder (#2132) --- src/battle-dex-search.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/battle-dex-search.ts b/src/battle-dex-search.ts index 8cdcde0cb7..05a84869a2 100644 --- a/src/battle-dex-search.ts +++ b/src/battle-dex-search.ts @@ -628,10 +628,11 @@ abstract class BattleTypedSearch { this.formatType = 'nfe'; if (!format) format = 'ou' as ID; } - if ((format.endsWith('lc') || format.startsWith('lc')) && format !== 'caplc') { + if ((format.endsWith('lc') || format.startsWith('lc')) && format !== 'caplc' && !this.formatType) { this.formatType = 'lc'; format = 'lc' as ID; } + if (format.endsWith('draft')) format = format.slice(0, -5) as ID; this.format = format; this.species = '' as ID;