Skip to content

Commit

Permalink
Fixing these errors
Browse files Browse the repository at this point in the history
Of course there's probably bugs still lurking around but this should be most of the changes
  • Loading branch information
KirbyRider1337 committed Oct 30, 2024
1 parent ace2b1c commit 2666fcb
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 7 deletions.
1 change: 1 addition & 0 deletions build-tools/build-indexes
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,7 @@ function buildTeambuilderTables() {
const specificItems = [['header', "Pokémon-specific items"]];
const poorItems = [['header', "Usually useless items"]];
const badItems = [['header', "Useless items"]];
const unreleasedItems = genNum === 6 ? ['header', "Unreleased"] : [];
for (const id of itemList) {
const item = Dex.mod(gen).items.get(id);
if (item.gen > genNum) {
Expand Down
2 changes: 1 addition & 1 deletion build-tools/server-repo
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const server_repo = "https://github.com/scoopapa/DH2.git";
const server_repo = "https://github.com/KirbyRider1337/DH2.git";
module.exports = server_repo;
3 changes: 0 additions & 3 deletions build-tools/update
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@ replayEmbedContents = replayEmbedContents.replace(/play\.pokemonshowdown\.com/g,
// Nobody cares about the news. Cheers.

fs.writeFileSync('play.pokemonshowdown.com/index.html', indexContents);
if (indexContents2) {
fs.writeFileSync('play.pokemonshowdown.com/index-test.html', indexContents2);
}
fs.writeFileSync('play.pokemonshowdown.com/preactalpha.html', preactIndexContents);
fs.writeFileSync('play.pokemonshowdown.com/crossprotocol.html', crossprotocolContents);
fs.writeFileSync('play.pokemonshowdown.com/js/replay-embed.js', replayEmbedContents);
Expand Down
95 changes: 95 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions play.pokemonshowdown.com/src/battle-dex-search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ abstract class BattleTypedSearch<T extends SearchType> {
if (learnset && (moveid in learnset) && (!(this.format.startsWith('tradebacks') || tradebacksMod.includes(this.mod)) ? learnset[moveid].includes(genChar) :
(learnset[moveid].includes(genChar) || (learnset[moveid].includes(`${gen + 1}`) && move.gen === gen)) &&
(!eggMovesOnly || (learnset[moveid].includes('e') && this.dex.gen === 9))
) {=
)) {
return true;
}
learnsetid = this.nextLearnsetid(learnsetid, speciesid, true);
Expand Down Expand Up @@ -1247,7 +1247,7 @@ class BattlePokemonSearch extends BattleTypedSearch<'pokemon'> {
tierSet = tierSet.filter(([type, id]) => {
if (id in table.gen5zuBans) return false;
return true;
}
});
}

// Filter out Gmax Pokemon from standard tier selection
Expand Down
2 changes: 1 addition & 1 deletion play.pokemonshowdown.com/src/battle-dex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ class ModdedDex {
Object.assign(data, genTable.overrideItemData[id]);
}
}
if (this.modid !== `gen${this.gen}`) && id in table.overrideItemData) {
if ((this.modid !== `gen${this.gen}`) && id in table.overrideItemData) {
Object.assign(data, table.overrideItemData[id]);
}

Expand Down

0 comments on commit 2666fcb

Please sign in to comment.