Skip to content

Commit 30a800b

Browse files
Regular-Pokemon-Trainers-LeagueKarthik99999DaWoblefetHisuianZoroarkmia-pi-git
authored
Feature/season 13 cleanup (#4)
* Support new ability flags * Update HiZo Credits (smogon#2223) * Teambuilder: Provide Smogon Dex resources when building teams * Teambuilder: Fix target on Smogon links * Teambuilder: Don't try to load resources when they're already cached * Teambuilder: Cache failures for formats without resources * Modify CSS for accessibility * Rules: Add Korean translation (smogon#2221) Credits to igeu , xerneas9050 and dhwna for the translation, aegii for the formatting. * Remove a certain someone from credits Been spending some time processing the last decade of my life, including reading some old logs from the period where this user was banned, and I've decided that I have to make this commit to be able to move on. * Add package-lock.json * Remove unnecessary jabs at PO, which doesn't even exist anymore * One more * Improve dark mode checkboxes * Let's Go: Support itemless megas (smogon#2233) * Teambuilder: Show Restricted Legendaries for VGC/BSS Reg G (smogon#2239) * Add client support for Random Meta of the Decade * AFD Mode: Fix the ability to turn it off * Add support for adding badges in battle (smogon#2235) * Add support for adding badges in battle * oops Forgot these needed to be below the avatar per latest spec, not above * Move |badge| message handling to battle.ts * Update play.pokemonshowdown.com/src/battle.ts Co-authored-by: Karthik <32044378+Karthik99999@users.noreply.github.com> * Style button on ladder page, also add custom badges for ou/rands * change some badge filename stuff * more css stuff, final version --------- Co-authored-by: Karthik <32044378+Karthik99999@users.noreply.github.com> * Support rematching with custom rules (smogon#2234) * Teambuilder: Add EV optimization checker (smogon#2240) --------- Co-authored-by: pyuk-bot <msaimrkon@gmail.com> * Fix optimizer output when new spread has a 0 (smogon#2241) * Teambuilder: Generate user samples from boxes (smogon#2226) * client: escape dots in URL regex (smogon#2243) * Changes for all of the s13 buffs. * Updates for S13 * lots of fixes including for replays which should be moved to the main RPTL branch. * Clarify 2D/3D Model Options (smogon#2244) * Main menu: Add a button to the partner selection input for partner formats * Add SSB client support (smogon#2245) * ssb support * SSB * teehee * poop * more tooltip things * Fix tooltips * ok support * More tooltip updates * last changes * Fix build * Updates fixing announcer and trusted external sites * Fix past gen tooltips (smogon#2247) * CAP: Add Chuggalong minisprite index * SSB: Client-side balance patch changes (smogon#2250) * SSB: Client-side balance patch changes * more changes * oops * Mark more evolution items as bad * Fix tooltips getting cleared when using switch moves (smogon#2251) * Override Fling and Natural Gift data for items in past gens (smogon#2252) * Teambuilder: Update Smogdex links * Add Psychic Noise animation (smogon#2254) * Add Psychic Noise animation * Satisfy linter * Replays: Fix More Replays button on mobile (smogon#2255) * Add Elo filter 1000 (smogon#2249) PR for https://www.smogon.com/forums/threads/give-an-option-for-1000-minimum-elo-in-the-battles-tab-to-filter-out-challenge-battles.3743305/ * Properly display legal egg moves in teambuilder (smogon#2256) * Include smogtours in "server down" message * Add teambuilder support for BW 1 (smogon#2257) * Fix crash in Replays * Fix teambuilder move display for formes (smogon#2258) * Fix teambuilder move display for formes https://www.smogon.com/forums/threads/bug-report-teambuilder.3746541/ This bug was caused by my assumption that the client gets changesFrom the same way the server does. * Update battle-dex-search.ts Linter got upset * Fix Ogerpon mask BP tooltip (smogon#2259) * Fix crash (client) (smogon#2260) * Point bug reports redirect to the subforum * Fix client sending the wrong team to the server in some cases (smogon#2206) * Convert noSketch to move flag (smogon#2261) * Chat: Support nameless /html messages (smogon#2263) * Teambuilder: Don't recommend 0 Atk IVs with Tera Blast * Fix ???-type icon loading on type change animations * Fix getAllyAbility for Gen < 7 (smogon#2264) * Fix paralysis tooltips in Gens I-II * Updates before cleanup. * Removing buffed pokemon --------- Co-authored-by: Karthik99999 <bandagondak0217@gmail.com> Co-authored-by: Leonard Craft III <leonardcraft64@gmail.com> Co-authored-by: Hisuian Zoroark <96159984+HisuianZoroark@users.noreply.github.com> Co-authored-by: Mia <49593536+mia-pi-git@users.noreply.github.com> Co-authored-by: Lionyx <choloux3@gmail.com> Co-authored-by: Christopher Monsanto <chris@monsan.to> Co-authored-by: Guangcong Luo <guangcongluo@gmail.com> Co-authored-by: Karthik <32044378+Karthik99999@users.noreply.github.com> Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com> Co-authored-by: Andrew Werner <HoeenCoder@users.noreply.github.com> Co-authored-by: pyuk-bot <msaimrkon@gmail.com> Co-authored-by: tofa <79044321+im-tofa@users.noreply.github.com> Co-authored-by: Auguste Charpentier <laggron42@gmail.com> Co-authored-by: Distrib <theodelhay@orange.fr> Co-authored-by: Marty-D <Marty-D@users.noreply.github.com> Co-authored-by: shrianshChari <30420527+shrianshChari@users.noreply.github.com> Co-authored-by: dot-Comfey <84290266+dot-Comfey@users.noreply.github.com> Co-authored-by: Earl Joves <278894+earljoves@users.noreply.github.com>
1 parent e6e7bd9 commit 30a800b

35 files changed

+1860
-344
lines changed

‎build-tools/build-indexes

+58-7
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
323323
const LC = GENS.map(num => num + 0.7);
324324
const STADIUM = [2.04, 1.04];
325325
const NATDEX = [9.1, 8.1];
326-
const OTHER = [9.9, 9.411, 9.41, 9.401, 9.4, 9.2, -9.4, -9.401, 8.6, 8.4, 8.2, 8.1, -8.4, -8.6, 7.1];
326+
const OTHER = [9.9, 9.6, 9.411, 9.41, 9.401, 9.4, 9.2, -9.4, -9.401, 8.6, 8.4, 8.2, 8.1, -8.4, -8.6, 7.1, 5.1];
327327

328328
// process.stdout.write("\n ");
329329
for (const genIdent of [...GENS, ...DOUBLES, ...VGC, ...NFE, ...STADIUM, ...OTHER, ...NATDEX, ...LC]) {
@@ -340,7 +340,9 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
340340
const isDoubles = (genIdent < 0);
341341
const isVGC = ('' + genIdent).endsWith('.5');
342342
const isGen9BH = genIdent === 9.9;
343+
const isSSB = genIdent === 9.6;
343344
const genNum = Math.floor(isDoubles ? -genIdent : genIdent);
345+
const isBW1 = genIdent === 5.1;
344346
const gen = (() => {
345347
let genStr = 'gen' + genNum;
346348
if (isSSDLC1) genStr += 'dlc1';
@@ -349,6 +351,8 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
349351
if (isPreDLC) genStr += 'predlc';
350352
if (isSVDLC1) genStr += 'dlc1';
351353
if (isStadium) genStr += 'stadium' + (genNum > 1 ? genNum : '');
354+
if (isSSB) genStr += 'ssb';
355+
if (isBW1) genStr += 'bw1';
352356
return genStr;
353357
})();
354358
// process.stdout.write("" + gen + (isDoubles ? " doubles" : "") + "... ");
@@ -544,13 +548,26 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
544548
BattleTeambuilderTable['bh'].tiers = tiers;
545549
BattleTeambuilderTable['bh'].overrideTier = overrideTier;
546550
BattleTeambuilderTable['bh'].formatSlices = formatSlices;
551+
} else if (isSSB) {
552+
BattleTeambuilderTable['gen9ssb'] = {};
553+
BattleTeambuilderTable['gen9ssb'].tiers = tiers;
554+
BattleTeambuilderTable['gen9ssb'].overrideTier = overrideTier;
555+
BattleTeambuilderTable['gen9ssb'].formatSlices = formatSlices;
547556
} else if (gen === 'gen9') {
548557
BattleTeambuilderTable.tiers = tiers;
549558
BattleTeambuilderTable.items = items;
550559
BattleTeambuilderTable.overrideTier = overrideTier;
551560
BattleTeambuilderTable.ubersUUBans = ubersUUBans;
552561
BattleTeambuilderTable.monotypeBans = monotypeBans;
553562
BattleTeambuilderTable.formatSlices = formatSlices;
563+
} else if (isBW1) {
564+
BattleTeambuilderTable[gen] = {};
565+
BattleTeambuilderTable[gen].overrideTier = overrideTier;
566+
BattleTeambuilderTable[gen].tiers = tiers;
567+
BattleTeambuilderTable[gen].items = items;
568+
BattleTeambuilderTable[gen].formatSlices = formatSlices;
569+
BattleTeambuilderTable[gen].nonstandardMoves = nonstandardMoves;
570+
BattleTeambuilderTable[gen].learnsets = {};
554571
} else {
555572
BattleTeambuilderTable[gen] = {};
556573
BattleTeambuilderTable[gen].overrideTier = overrideTier;
@@ -760,6 +777,12 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
760777
case 'chippedpot':
761778
case 'crackedpot':
762779
case 'galaricawreath':
780+
case 'auspiciousarmor':
781+
case 'maliciousarmor':
782+
case 'masterpieceteacup':
783+
case 'metalalloy':
784+
case 'unremarkableteacup':
785+
case 'bignugget':
763786
badItems.push(id);
764787
break;
765788
// outclassed items
@@ -886,6 +909,7 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
886909
if (gens.indexOf(9) >= 0 && learnset[moveid].some(x => x[0] === '9' && x !== '9V')) {
887910
learnsets[id][moveid] += 'a';
888911
}
912+
if (gens.indexOf(9) >= 0 && learnset[moveid].some(x => x === '9E')) learnsets[id][moveid] += 'e';
889913
}
890914
}
891915
const G2Learnsets = Dex.mod('gen2').data.Learnsets;
@@ -902,6 +926,16 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
902926
if (minGen === 1) learnsets[id][moveid] = '12' + learnsets[id][moveid];
903927
}
904928
}
929+
const G5BW1Learnsets = Dex.mod('gen5bw1').data.Learnsets;
930+
for (const id in G5BW1Learnsets) {
931+
const species = Dex.mod('gen5bw1').species.get(id);
932+
if (species.isNonstandard && !['Unobtainable', 'CAP'].includes(species.isNonstandard)) continue;
933+
const learnset = G5BW1Learnsets[id].learnset;
934+
BattleTeambuilderTable['gen5bw1'].learnsets[id] = {};
935+
for (const moveid in learnset) {
936+
BattleTeambuilderTable['gen5bw1'].learnsets[id][moveid] = '5';
937+
}
938+
}
905939
const LGLearnsets = Dex.mod('gen7letsgo').data.Learnsets;
906940
for (const id in LGLearnsets) {
907941
const species = Dex.mod('gen7letsgo').species.get(id);
@@ -1063,8 +1097,9 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
10631097

10641098
// Client relevant data that should be overriden by past gens and mods
10651099
const overrideSpeciesKeys = ['abilities', 'baseStats', 'cosmeticFormes', 'isNonstandard', 'requiredItems', 'types', 'unreleasedHidden'];
1066-
const overrideMoveKeys = ['accuracy', 'basePower', 'category', 'desc', 'flags', 'isNonstandard', 'noSketch', 'pp', 'priority', 'shortDesc', 'target', 'type'];
1100+
const overrideMoveKeys = ['accuracy', 'basePower', 'category', 'desc', 'flags', 'isNonstandard', 'pp', 'priority', 'shortDesc', 'target', 'type'];
10671101
const overrideAbilityKeys = ['desc', 'flags', 'isNonstandard', 'rating', 'shortDesc'];
1102+
const overrideItemKeys = ['desc', 'fling', 'isNonstandard', 'naturalGift', 'shortDesc'];
10681103

10691104
//
10701105
// Past gen table
@@ -1118,13 +1153,16 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
11181153
}
11191154
}
11201155

1121-
const overrideItemDesc = {};
1122-
BattleTeambuilderTable[gen].overrideItemDesc = overrideItemDesc;
1156+
const overrideItemData = {};
1157+
BattleTeambuilderTable[gen].overrideItemData = overrideItemData;
11231158
for (const id in genData.Items) {
11241159
const curEntry = genDex.items.get(id);
11251160
const nextEntry = nextGenDex.items.get(id);
1126-
if ((curEntry.shortDesc || curEntry.desc) !== (nextEntry.shortDesc || nextEntry.desc)) {
1127-
overrideItemDesc[id] = (curEntry.shortDesc || curEntry.desc);
1161+
for (const key of overrideItemKeys) {
1162+
if (JSON.stringify(curEntry[key]) !== JSON.stringify(nextEntry[key])) {
1163+
if (!overrideItemData[id]) overrideItemData[id] = {};
1164+
overrideItemData[id][key] = curEntry[key];
1165+
}
11281166
}
11291167
}
11301168

@@ -1149,7 +1187,7 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
11491187
// Mods
11501188
//
11511189

1152-
for (const mod of ['gen7letsgo', 'gen8bdsp']) {
1190+
for (const mod of ['gen5bw1', 'gen7letsgo', 'gen8bdsp', 'gen9ssb']) {
11531191
const modDex = Dex.mod(mod);
11541192
const modData = modDex.data;
11551193
const parentDex = Dex.forGen(modDex.gen);
@@ -1193,6 +1231,19 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
11931231
}
11941232
}
11951233
}
1234+
1235+
const overrideItemData = {};
1236+
BattleTeambuilderTable[mod].overrideItemData = overrideItemData;
1237+
for (const id in modData.Items) {
1238+
const modEntry = modDex.items.get(id);
1239+
const parentEntry = parentDex.items.get(id);
1240+
for (const key of overrideItemKeys) {
1241+
if (JSON.stringify(modEntry[key]) !== JSON.stringify(parentEntry[key])) {
1242+
if (!overrideItemData[id]) overrideItemData[id] = {};
1243+
overrideItemData[id][key] = modEntry[key];
1244+
}
1245+
}
1246+
}
11961247
}
11971248

11981249
buf += `exports.BattleTeambuilderTable = JSON.parse('${JSON.stringify(BattleTeambuilderTable).replace(/['\\]/g, "\\$&")}');\n\n`;

‎build-tools/update

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ compiledFiles += compiler.compileToFile(
111111
'caches/pokemon-showdown/server/chat-formatter.ts',
112112
'play.pokemonshowdown.com/data/text.js',
113113
'play.pokemonshowdown.com/src/battle-text-parser.ts',
114-
'play.pokemonshowdown.com/src/announce.js',
114+
'play.pokemonshowdown.com/data/announce.js',
115115
'play.pokemonshowdown.com/src/battle-revolution-announcer.ts',
116116
],
117117
'play.pokemonshowdown.com/js/battledata.js',

‎config/config-example.js

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Config.bannedHosts = ['cool.jit.su', 'pokeball-nixonserver.rhcloud.com'];
66

77
Config.whitelist = [
88
'wikipedia.org',
9+
'replay.rptl.us',
10+
'rptl.us',
911

1012
// The full list is maintained outside of this repository so changes to it
1113
// don't clutter the commit log. Feel free to copy our list for your own

‎config/routes.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"root": "rptl.us",
33
"client": "rptl.us",
44
"dex": "dex.pokemonshowdown.com",
5-
"replays": "replay.pokemonshowdown.com",
5+
"replays": "replay.rptl.us",
66
"users": "pokemonshowdown.com/users"
77
}

‎play.pokemonshowdown.com/.htaccess

+6-5
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,23 @@ RewriteRule ^sprites\/gen4dp-2-back(.*)?$ sprites/gen4-back$1 [L,QSA]
8888
RewriteCond %{REQUEST_FILENAME} !-f
8989
RewriteRule ^sprites\/gen3frlg(.*)?$ sprites/gen3$1 [L,QSA]
9090

91-
RewriteRule ^replays?\/?$ https://replay.pokemonshowdown.com/ [R=302,L]
91+
RewriteRule ^replays?\/?$ https://replay.rptl.us/ [R=302,L]
9292

9393
RewriteCond %{HTTP_HOST} ^www\.rptl\.us$ [NC]
9494
RewriteRule ^(.*) https://rptl.us/$1 [R=301,L]
9595

9696
RewriteRule ^style/fonts?/.*?\.(eot|svg|ttf|woff|woff2)$ - [E=SAFE_RESOURCE:1]
9797
RewriteRule ^data\/.*\.js(?:on)?$ - [E=SAFE_RESOURCE:1]
98+
RewriteRule ^interstice$ interstice.php [L,QSA]
9899
Header set Access-Control-Allow-Origin * env=SAFE_RESOURCE
99100

100101
# Redirect old battles to their corresponding replay
101102
# RewriteCond %{HTTP_HOST} ^rptl\.us$ [NC]
102-
# RewriteRule ^battle-([a-z0-9]+-[1-6][0-9]{8})$ https://replay.pokemonshowdown.com/$1 [R=302,L]
103+
# RewriteRule ^battle-([a-z0-9]+-[1-6][0-9]{8})$ https://replay.rptl.us/$1 [R=302,L]
103104
RewriteCond %{HTTP_HOST} ^rptl\.us$ [NC]
104-
RewriteRule ^battle-([a-z0-9]+-[0-9]{8})$ https://replay.pokemonshowdown.com/$1 [R=302,L]
105+
RewriteRule ^battle-([a-z0-9]+-[0-9]{8})$ https://replay.rptl.us/$1 [R=302,L]
105106
RewriteCond %{HTTP_HOST} ^rptl\.us$ [NC]
106-
RewriteRule ^battle-([a-z0-9]+)$ https://replay.pokemonshowdown.com/$1 [R=302,L]
107+
RewriteRule ^battle-([a-z0-9]+)$ https://replay.rptl.us/$1 [R=302,L]
107108

108109
# TODO: fix bug where you can't join lobby directly
109110
RewriteRule ^lobby/?$ / [R=301,L]
@@ -140,7 +141,7 @@ Header set Expires "0" env=INDEX_PAGE
140141

141142
AddType 'text/plain; charset=UTF-8' json5
142143

143-
RewriteRule ^replay/battle-([A-Za-z0-9-]+)$ https://replay.pokemonshowdown.com/$1 [R=302,L]
144+
RewriteRule ^replay/battle-([A-Za-z0-9-]+)$ https://replay.rptl.us/$1 [R=302,L]
144145
RewriteRule ^replay/turn_(.+)\.png$ replay/turn-image.php?data=$1 [L,QSA]
145146

146147
RewriteCond %{QUERY_STRING} !output=html

‎play.pokemonshowdown.com/fx/professorsilvestron.png

97.2 KB
Loading

‎play.pokemonshowdown.com/images/bg-starfield.jpg

117 KB
Loading

‎play.pokemonshowdown.com/index.template.html

+48-48
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@
2828
<meta id="viewport" name="viewport" content="width=device-width" />
2929
<title>Showdown!</title>
3030
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
31-
<link rel="shortcut icon" href="//play.pokemonshowdown.com/rptl_favicon_steve.png" id="dynamic-favicon" />
32-
<link rel="icon" sizes="256x256" href="//play.pokemonshowdown.com/rptl_favicon_steve.png" />
33-
<link rel="stylesheet" href="//play.pokemonshowdown.com/style/battle.css?" />
34-
<link rel="stylesheet" href="//play.pokemonshowdown.com/style/client.css?" />
35-
<link rel="stylesheet" href="//play.pokemonshowdown.com/style/sim-types.css?" />
36-
<link rel="stylesheet" href="//play.pokemonshowdown.com/style/utilichart.css?" />
37-
<link rel="stylesheet" href="//play.pokemonshowdown.com/style/font-awesome.css?" />
31+
<link rel="shortcut icon" href="//rptl.us/favicon.ico" id="dynamic-favicon" />
32+
<link rel="icon" sizes="256x256" href="//rptl.us/favicon-256.png" />
33+
<link rel="stylesheet" href="//rptl.us/style/battle.css?" />
34+
<link rel="stylesheet" href="//rptl.us/style/client.css?" />
35+
<link rel="stylesheet" href="//rptl.us/style/sim-types.css?" />
36+
<link rel="stylesheet" href="//rptl.us/style/utilichart.css?" />
37+
<link rel="stylesheet" href="//rptl.us/style/font-awesome.css?" />
3838
<meta name="apple-mobile-web-app-capable" content="yes" />
3939
<link rel="manifest" href="/manifest.json" />
4040
<!--[if lte IE 8]><script>document.location.replace('http://pokemonshowdown.com/autodownload/win');</script><![endif]-->
4141

4242
<!-- head custom -->
4343

4444
<div id="header" class="header">
45-
<img class="logo" src="//play.pokemonshowdown.com/rptl_home_logo_wide.svg" srcset="//play.pokemonshowdown.com/rptl_home_logo_wide@2x.svg 2x" alt="Regular Pok&eacute;mon Trainers League!" width="146" height="44" /><div class="maintabbarbottom"></div>
45+
<img class="logo" src="//rptl.us/pokemonshowdownbeta.png" srcset="//rptl.us/pokemonshowdownbeta@2x.png 2x" alt="Pok&eacute;mon Showdown! (beta)" width="146" height="44" /><div class="maintabbarbottom"></div>
4646
</div>
4747
<div class="ps-room scrollable" id="mainmenu"><div class="mainmenuwrapper">
4848
<div class="leftmenu">
@@ -64,51 +64,52 @@ <h3><button class="closebutton" tabindex="-1"><i class="fa fa-times-circle"></i>
6464
</div>
6565
<div class="mainmenufooter">
6666
<div class="bgcredit"></div>
67-
<small><a href="//dex.pokemonshowdown.com/" target="_blank">Pok&eacute;dex</a> | <a href="//replay.pokemonshowdown.com/" target="_blank">Replays</a> | <a href="//pokemonshowdown.com/rules" target="_blank">Rules</a> | <a href="//pokemonshowdown.com/credits" target="_blank">Credits</a> | <a href="http://smogon.com/forums/" target="_blank">Forum</a> | <a href="//pokemonshowdown.com/privacy" target="_blank">Privacy policy</a></small>
67+
<small><a href="//dex.pokemonshowdown.com/" target="_blank">Pok&eacute;dex</a> | <a href="http://replay.rptl.us/" target="_blank">Replays</a> | <a href="//pokemonshowdown.com/rules" target="_blank">Rules</a> | <a href="//pokemonshowdown.com/credits" target="_blank">Credits</a> | <a href="http://smogon.com/forums/" target="_blank">Forum</a> | <a href="//pokemonshowdown.com/privacy" target="_blank">Privacy policy</a></small>
6868
</div>
6969
</div></div>
7070
<script>
7171
var LM = document.getElementById('loading-message');
7272
LM.innerHTML += ' DONE<br />Loading libraries...';
7373
</script>
74-
<script nomodule src="//play.pokemonshowdown.com/js/lib/ps-polyfill.js"></script>
75-
<script src="//play.pokemonshowdown.com/config/config.js?"></script>
76-
<script src="//play.pokemonshowdown.com/js/lib/jquery-2.2.4.min.js"></script>
77-
<script src="//play.pokemonshowdown.com/js/lib/jquery-cookie.js"></script>
78-
<script src="//play.pokemonshowdown.com/js/lib/autoresize.jquery.min.js?"></script>
79-
<script src="//play.pokemonshowdown.com/js/battle-sound.js?"></script>
80-
<script src="//play.pokemonshowdown.com/js/lib/html-css-sanitizer-minified.js?"></script>
81-
<script src="//play.pokemonshowdown.com/js/lib/lodash.core.js?"></script>
82-
<script src="//play.pokemonshowdown.com/js/lib/backbone.js?"></script>
83-
<script src="//play.pokemonshowdown.com/js/lib/d3.v3.min.js"></script>
74+
<script nomodule src="//rptl.us/js/lib/ps-polyfill.js"></script>
75+
<script src="//rptl.us/config/config.js?"></script>
76+
<script src="//rptl.us/js/lib/jquery-2.2.4.min.js"></script>
77+
<script src="//rptl.us/js/lib/jquery-cookie.js"></script>
78+
<script src="//rptl.us/js/lib/autoresize.jquery.min.js?"></script>
79+
<script src="//rptl.us/js/battle-sound.js?"></script>
80+
<script src="//rptl.us/js/lib/html-css-sanitizer-minified.js?"></script>
81+
<script src="//rptl.us/js/lib/lodash.core.js?"></script>
82+
<script src="//rptl.us/js/lib/backbone.js?"></script>
83+
<script src="//rptl.us/js/lib/d3.v3.min.js"></script>
8484

8585
<script>
8686
LM.innerHTML += ' DONE<br />Loading data...';
8787
</script>
8888

89-
<script src="//play.pokemonshowdown.com/js/battledata.js?"></script>
90-
<script src="//play.pokemonshowdown.com/js/storage.js?"></script>
91-
<script src="//play.pokemonshowdown.com/data/pokedex-mini.js?"></script>
92-
<script src="//play.pokemonshowdown.com/data/typechart.js?"></script>
93-
<script src="//play.pokemonshowdown.com/js/battle.js?"></script>
94-
<script src="//play.pokemonshowdown.com/js/lib/sockjs-1.4.0-nwjsfix.min.js"></script>
95-
<script src="//play.pokemonshowdown.com/js/lib/color-thief.min.js"></script>
89+
<script src="//rptl.us/js/battledata.js?"></script>
90+
<script src="//rptl.us/js/storage.js?"></script>
91+
<script src="//rptl.us/data/pokedex-mini.js?"></script>
92+
<script src="//rptl.us/data/typechart.js?"></script>
93+
<script src="//rptl.us/js/battle.js?"></script>
94+
<script src="//rptl.us/js/lib/sockjs-1.4.0-nwjsfix.min.js"></script>
95+
<script src="//rptl.us/js/lib/color-thief.min.js"></script>
9696

9797
<script>
9898
LM.innerHTML += ' DONE<br />Loading client...';
9999
</script>
100100

101-
<script src="//play.pokemonshowdown.com/js/client.js?"></script>
102-
<script src="//play.pokemonshowdown.com/js/client-topbar.js?"></script>
103-
<script src="//play.pokemonshowdown.com/js/client-mainmenu.js?"></script>
104-
<script src="//play.pokemonshowdown.com/js/client-teambuilder.js?"></script>
105-
<script src="//play.pokemonshowdown.com/js/client-ladder.js?"></script>
106-
<script src="//play.pokemonshowdown.com/js/client-chat.js?"></script>
107-
<script src="//play.pokemonshowdown.com/js/client-chat-tournament.js?"></script>
108-
<script src="//play.pokemonshowdown.com/js/battle-tooltips.js?"></script>
109-
<script src="//play.pokemonshowdown.com/js/client-battle.js?"></script>
110-
<script src="//play.pokemonshowdown.com/js/client-rooms.js?"></script>
111-
<script src="//play.pokemonshowdown.com/data/graphics.js?"></script>
101+
<script src="//rptl.us/js/client.js?"></script>
102+
<script src="//rptl.us/js/client-topbar.js?"></script>
103+
<script src="//rptl.us/js/client-mainmenu.js?"></script>
104+
<script src="//rptl.us/js/client-teambuilder.js?"></script>
105+
<script src="//rptl.us/js/client-ladder.js?"></script>
106+
<script src="//rptl.us/js/client-chat.js?"></script>
107+
<script src="//rptl.us/js/client-chat-tournament.js?"></script>
108+
<script src="//rptl.us/js/battle-tooltips.js?"></script>
109+
<script src="//rptl.us/js/client-battle.js?"></script>
110+
<script src="//rptl.us/js/client-rooms.js?"></script>
111+
<script src="//rptl.us/data/graphics.js?"></script>
112+
<!-- <script src="//rptl.us/js/battle-revolution-annoucer.js?"></script> -->
112113

113114
<script>
114115
// framebust - see https://owasp.org/www-pdf-archive/OWASP_AppSec_Research_2010_Busting_Frame_Busting_by_Rydstedt.pdf
@@ -122,16 +123,15 @@ <h3><button class="closebutton" tabindex="-1"><i class="fa fa-times-circle"></i>
122123
}
123124
</script>
124125

125-
<script src="//play.pokemonshowdown.com/data/pokedex.js?"></script>
126-
<script src="//play.pokemonshowdown.com/data/moves.js?"></script>
127-
<script src="//play.pokemonshowdown.com/data/items.js?"></script>
128-
<script src="//play.pokemonshowdown.com/data/abilities.js?"></script>
129-
<script src="//rptl.us/data/announce.js"></script>
126+
<script src="//rptl.us/data/pokedex.js?"></script>
127+
<script src="//rptl.us/data/moves.js?"></script>
128+
<script src="//rptl.us/data/items.js?"></script>
129+
<script src="//rptl.us/data/abilities.js?"></script>
130130

131-
<script src="//play.pokemonshowdown.com/data/search-index.js?"></script>
132-
<script src="//play.pokemonshowdown.com/data/teambuilder-tables.js?"></script>
133-
<script src="//play.pokemonshowdown.com/js/battle-dex-search.js?"></script>
134-
<script src="//play.pokemonshowdown.com/js/search.js?"></script>
131+
<script src="//rptl.us/data/search-index.js?"></script>
132+
<script src="//rptl.us/data/teambuilder-tables.js?"></script>
133+
<script src="//rptl.us/js/battle-dex-search.js?"></script>
134+
<script src="//rptl.us/js/search.js?"></script>
135135

136-
<script src="//play.pokemonshowdown.com/data/aliases.js?" async></script>
137-
<script src="//play.pokemonshowdown.com/js/clean-cookies.php" async></script>
136+
<script src="//rptl.us/data/aliases.js?" async></script>
137+
<script src="//rptl.us/js/clean-cookies.php" async></script>

0 commit comments

Comments
 (0)