Skip to content

Commit

Permalink
Update ladders and docs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zarel
Zarel committed Jan 22, 2021
1 parent abc5bff commit 934eb7b
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 13 deletions.
23 changes: 12 additions & 11 deletions website/ladder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -106,28 +106,29 @@
<li><a data-target="push" class="button" href="/ladder/gen8uu">UnderUsed</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8ru">RarelyUsed</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8nu">NeverUsed</a></li>
<li><a data-target="push" class="button nav-last" href="/ladder/gen8pu">PU</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8pu">PU</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8lc">Little Cup</a></li>
<li><a data-target="push" class="button nav-last" href="/ladder/gen8monotype">Monotype</a></li>
</ul>
<ul class="laddernav">
<li><a data-target="push" class="button nav-first" href="/ladder/gen8lc">Little Cup</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8monotype">Monotype</a></li>
<!--li><a data-target="push" class="button" href="/ladder/gen8anythinggoes">Anything Goes</a></li-->
<!--li><a data-target="push" class="button" href="/ladder/gen8zu">ZU</a></li-->
<li><a data-target="push" class="button" href="/ladder/gen81v1">1v1</a></li>
<li><a data-target="push" class="button nav-last" href="/ladder/gen8battlestadiumsingles">Battle Stadium Singles</a></li>
<li><a data-target="push" class="button nav-first" href="/ladder/gen81v1">1v1</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8anythinggoes">Anything Goes</a></li-->
<li><a data-target="push" class="button" href="/ladder/gen8zu">ZU</a></li-->
<li><a data-target="push" class="button" href="/ladder/gen8battlestadiumsingles">Battle Stadium Singles</a></li>
<li><a data-target="push" class="button nav-last" href="/ladder/gen8cap">CAP</a></li>
</ul>
<ul class="laddernav">
<li><a data-target="push" class="button nav-first" href="/ladder/gen8randomdoublesbattle">Random Doubles Battle</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8doublesou">Doubles OU</a></li>
<li><a data-target="push" class="button nav-last" href="/ladder/gen8vgc2020">VGC 2020</a></li>
<li><a data-target="push" class="button nav-last" href="/ladder/gen8vgc2021">VGC 2021</a></li>
</ul>
<ul class="laddernav">
<li><a data-target="push" class="button nav-first" href="/ladder/gen8balancedhackmons">Balanced Hackmons</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8mixandmega">Mix and Mega</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8almostanyability">Almost Any Ability</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8stabmons">STABmons</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8nfe">NFE</a></li>
<li><a data-target="push" class="button nav-last" href="/ladder/gen8cap">CAP</a></li>
<li><a data-target="push" class="button" href="/ladder/gen8stabmons">Camomons</a></li>
<li><a data-target="push" class="button nav-last" href="/ladder/gen8nfe">NFE</a></li>
</ul>
<h1>
Find user
Expand Down
8 changes: 7 additions & 1 deletion website/pages/formatsuggestions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 15 additions & 0 deletions website/pages/proxyhelp.md
View file
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion website/users.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@
</p>
<?php
}
if ($user['userid'] === 'slarty' || $user['userid'] === 'peterthegreeat' || $user['userid'] === 'chrisloud') {
if ($user['userid'] === 'slarty' || $user['userid'] === 'peterthegreeat' || $user['userid'] === 'chrisloud' || $user['userid'] === 'skitty') {
echo '<p>;_;7</p>';
}

Expand Down

0 comments on commit 934eb7b

Please sign in to comment.