From 934eb7be2c10a9bfc32343b9e1859dd367ec869c Mon Sep 17 00:00:00 2001 From: Guangcong Luo Date: Fri, 22 Jan 2021 12:38:34 -0500 Subject: [PATCH] Update ladders and docs --- website/ladder.php | 23 ++++++++++++----------- website/pages/formatsuggestions.md | 8 +++++++- website/pages/proxyhelp.md | 15 +++++++++++++++ website/users.php | 2 +- 4 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 website/pages/proxyhelp.md diff --git a/website/ladder.php b/website/ladder.php index 1da968ab74..b78a59a706 100644 --- a/website/ladder.php +++ b/website/ladder.php @@ -34,7 +34,7 @@ 'gen8battlestadiumsingles' => 'Battle Stadium Singles', 'gen8randomdoublesbattle' => 'Random Doubles Battle', 'gen8doublesou' => 'Doubles OU', - 'gen8vgc2020' => 'VGC 2020', + 'gen8vgc2021' => 'VGC 2021', 'gen8balancedhackmons' => 'Balanced Hackmons', 'gen8mixandmega' => 'Mix and Mega', 'gen8almostanyability' => 'Almost Any Ability', @@ -106,28 +106,29 @@
  • UnderUsed
  • RarelyUsed
  • NeverUsed
    • -
  • PU
    • +
  • PU
    • +
  • Little Cup
    • +
  • Monotype

    • Find user diff --git a/website/pages/formatsuggestions.md b/website/pages/formatsuggestions.md index 31aa3f2184..faf356318b 100644 --- a/website/pages/formatsuggestions.md +++ b/website/pages/formatsuggestions.md @@ -22,10 +22,16 @@ Smogon's official formats are based primarily on [their tier system][1], where l [2]: https://www.smogon.com/forums/forums/policy-review.63/ -Smogon's Other Metagames formats, on the other hand, is the home for creative user-suggested formats. Rules changes for them can be freely discussed in Smogon's [Other Metagames forum][2]. +Smogon's Other Metagames formats, on the other hand, is the home for creative user-suggested formats. Rules changes for them can be freely discussed in Smogon's [Other Metagames forum][3]. [3]: https://www.smogon.com/forums/forums/other-metagames.531/ +For Random Battles, the [Gen 8 Random Battles sets thread][4] and [past gen Random Battles sets thread][5] are good places to suggest changes. + + [4]: https://www.smogon.com/forums/threads/pokemon-sword-shield-random-battle-sets.3656537/ + + [5]: https://www.smogon.com/forums/threads/past-gens-random-battle-sets.3674281/ + If you have an idea for a new Other Metagames format, the guide to submit is here: https://www.smogon.com/forums/threads/other-metagames-rules-general-information.3656519/#post-8296313 diff --git a/website/pages/proxyhelp.md b/website/pages/proxyhelp.md new file mode 100644 index 0000000000..aa98b05f06 --- /dev/null +++ b/website/pages/proxyhelp.md @@ -0,0 +1,15 @@ +# Proxy Lock Help + +>Your IP (123.456.78.910) is currently locked due to being a proxy. We automatically lock these connections since they are used to spam, hack, or otherwise attack our server. Disable any proxies you are using to connect to PS. + +If you received the above message and are unable to chat, you are using a [proxy](https://simple.wikipedia.org/wiki/Proxy_server) or [VPN](https://simple.wikipedia.org/wiki/Virtual_private_network) connection. Here are some troubleshooting steps you can take to resolve this issue - after each step make sure to type `/logout` in any chatroom (such as Lobby) and log back in. +- Turn your proxy or VPN off. +- Make sure you are logged out on all other devices. +- If you are using the desktop client, try using the [web client](https://play.pokemonshowdown.com/) instead. +- If you are using TOR, close it and open Showdown in a standard browser. +- If you are using the Opera browser, you may have a VPN enabled by default. Try using a different browser such as Chrome, Firefox, or Safari. +- If you are using a shared or commercial network, it may have a proxy or VPN enabled. Either wait until you can connect on your usual network or contact your system administrator. +- If you are using a school or work-issued device, it may have proxy or VPN software enabled. Use a different device or contact your system administrator. +- Type `/ip` in any chatroom. You will see your IP (it will be 4 numbers separated by periods such as `123.456.78.910`). Check your IP with a website such as [WhatIsMyIPAddress](https://whatismyipaddress.com/) or [IPLocationTools](https://www.iplocationtools.com/). If the geolocation or Internet service provider indicated is not familiar, you are using a proxy or VPN connection. If this is your home connection, you can edit your network configuration if you have the knowledge to do so. Otherwise contact your Internet service provider for assistance. + +Still locked and you're completely certain that you are not on a proxy or VPN connection? File a Help Ticket on Showdown by typing `/ht` in any chatroom or directly at https://play.pokemonshowdown.com/view-help-request and global staff will assist you. \ No newline at end of file diff --git a/website/users.php b/website/users.php index e5785de9cd..c5cc66abb6 100644 --- a/website/users.php +++ b/website/users.php @@ -446,7 +446,7 @@

    ;_;7

    '; }