Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-09-14 23:10:31 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Handle @pokemon-showdown/sets -> @smogon/sets change

Browse Source
This commit is contained in:
Kirk Scheibelhut
2020-05-25 22:57:57 -07:00
parent 1364d76408
commit bb8d4f268c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build-tools/build-sets
View File

@@ -5,12 +5,12 @@ const fs = require("fs");
const child_process = require('child_process');
const path = require("path");
process.stdout.write("Importing sets from @pokemon-showdown/sets... ");
process.stdout.write("Importing sets from @smogon/sets... ");
const shell = cmd => child_process.execSync(cmd, {stdio: 'inherit', cwd: path.resolve(__dirname, '..')});
shell(`npm install --no-audit --no-save @pokemon-showdown/sets`);
shell(`npm install --no-audit --no-save @smogon/sets`);
const src = path.resolve(__dirname, '../node_modules/@pokemon-showdown/sets');
const src = path.resolve(__dirname, '../node_modules/@smogon/sets');
const dest = path.resolve(__dirname, '../data/sets');
try {

4
js/client-teambuilder.js
View File

@@ -1557,7 +1557,7 @@
if (!formatSets) return;
var sets = $.extend({}, formatSets['smogon.com/dex'][species], formatSets['smogon.com/stats'][species]);
var sets = $.extend({}, formatSets['dex'][species], formatSets['stats'][species]);
$setDiv.text('Sample sets: ');
for (var set in sets) {
@@ -1570,7 +1570,7 @@
var species = this.curSet.species;
var setName = this.$(button).text();
var smogonSet = formatSets['smogon.com/dex'][species][setName] || formatSets['smogon.com/stats'][species][setName];
var smogonSet = formatSets['dex'][species][setName] || formatSets['stats'][species][setName];
var curSet = $.extend({}, this.curSet, smogonSet);
var text = Storage.exportTeam([curSet]);