${clickableName}: ${BattleLog.sanitizeHTML(target)} `,
diff --git a/play.pokemonshowdown.com/src/battle-tooltips.ts b/play.pokemonshowdown.com/src/battle-tooltips.ts
index 620288d3e..feb1035c4 100644
--- a/play.pokemonshowdown.com/src/battle-tooltips.ts
+++ b/play.pokemonshowdown.com/src/battle-tooltips.ts
@@ -25,11 +25,11 @@ class ModifiableValue {
this.pokemon = pokemon;
this.serverPokemon = serverPokemon;
- this.itemName = Dex.items.get(serverPokemon.item).name;
+ this.itemName = this.battle.dex.items.get(serverPokemon.item).name;
const ability = serverPokemon.ability || pokemon?.ability || serverPokemon.baseAbility;
- this.abilityName = Dex.abilities.get(ability).name;
- this.weatherName = battle.weather === 'snow' ? 'Snow' : Dex.moves.get(battle.weather).exists ?
- Dex.moves.get(battle.weather).name : Dex.abilities.get(battle.weather).name;
+ this.abilityName = this.battle.dex.abilities.get(ability).name;
+ this.weatherName = battle.weather === 'snow' ? 'Snow' : this.battle.dex.moves.get(battle.weather).exists ?
+ this.battle.dex.moves.get(battle.weather).name : this.battle.dex.abilities.get(battle.weather).name;
}
reset(value = 0, isAccuracy?: boolean) {
this.value = value;
@@ -106,6 +106,8 @@ class ModifiableValue {
if (name) this.comment.push(` (${this.round(factor)}× from ${name})`);
this.value *= factor;
if (!(name === 'Technician' && this.maxValue > 60)) this.maxValue *= factor;
+ if (this.battle.tier.includes('Super Staff Bros') &&
+ !(name === 'Confirmed Town' && this.maxValue > 60)) this.maxValue *= factor;
return true;
}
set(value: number, reason?: string) {
@@ -521,10 +523,10 @@ class BattleTooltips {
getMaxMoveFromType(type: TypeName, gmaxMove?: string | Move) {
if (gmaxMove) {
- gmaxMove = Dex.moves.get(gmaxMove);
+ if (typeof gmaxMove === 'string') gmaxMove = this.battle.dex.moves.get(gmaxMove);
if (type === gmaxMove.type) return gmaxMove;
}
- return Dex.moves.get(BattleTooltips.maxMoveTable[type]);
+ return this.battle.dex.moves.get(BattleTooltips.maxMoveTable[type]);
}
showMoveTooltip(move: Move, isZOrMax: string, pokemon: Pokemon, serverPokemon: ServerPokemon, gmaxMove?: Move) {
@@ -869,10 +871,10 @@ class BattleTooltips {
let itemEffect = '';
if (clientPokemon?.prevItem) {
item = 'None';
- let prevItem = Dex.items.get(clientPokemon.prevItem).name;
+ let prevItem = this.battle.dex.items.get(clientPokemon.prevItem).name;
itemEffect += clientPokemon.prevItemEffect ? prevItem + ' was ' + clientPokemon.prevItemEffect : 'was ' + prevItem;
}
- if (serverPokemon.item) item = Dex.items.get(serverPokemon.item).name;
+ if (serverPokemon.item) item = this.battle.dex.items.get(serverPokemon.item).name;
if (itemEffect) itemEffect = ' (' + itemEffect + ')';
if (item) itemText = 'Item: ' + item + itemEffect;
} else if (clientPokemon) {
@@ -881,10 +883,10 @@ class BattleTooltips {
if (clientPokemon.prevItem) {
item = 'None';
if (itemEffect) itemEffect += '; ';
- let prevItem = Dex.items.get(clientPokemon.prevItem).name;
+ let prevItem = this.battle.dex.items.get(clientPokemon.prevItem).name;
itemEffect += clientPokemon.prevItemEffect ? prevItem + ' was ' + clientPokemon.prevItemEffect : 'was ' + prevItem;
}
- if (pokemon.item) item = Dex.items.get(pokemon.item).name;
+ if (pokemon.item) item = this.battle.dex.items.get(pokemon.item).name;
if (itemEffect) itemEffect = ' (' + itemEffect + ')';
if (item) itemText = 'Item: ' + item + itemEffect;
}
@@ -907,7 +909,7 @@ class BattleTooltips {
text += ``;
const battlePokemon = clientPokemon || this.battle.findCorrespondingPokemon(pokemon);
for (const moveid of serverPokemon.moves) {
- const move = Dex.moves.get(moveid);
+ const move = this.battle.dex.moves.get(moveid);
let moveName = `• ${move.name}`;
if (battlePokemon?.moveTrack) {
for (const row of battlePokemon.moveTrack) {
@@ -1021,14 +1023,9 @@ class BattleTooltips {
stats.atk = Math.floor(stats.atk * 0.5);
}
- if (this.battle.gen > 2 && ability === 'quickfeet') {
- stats.spe = Math.floor(stats.spe * 1.5);
- } else if (pokemon.status === 'par') {
- if (this.battle.gen > 6) {
- stats.spe = Math.floor(stats.spe * 0.5);
- } else {
- stats.spe = Math.floor(stats.spe * 0.25);
- }
+ // Paralysis is calculated later in newer generations, so we need to apply it early here
+ if (this.battle.gen <= 2 && pokemon.status === 'par') {
+ stats.spe = Math.floor(stats.spe * 0.25);
}
}
@@ -1050,7 +1047,7 @@ class BattleTooltips {
item = '' as ID;
}
- const species = Dex.species.get(serverPokemon.speciesForme).baseSpecies;
+ const species = this.battle.dex.species.get(serverPokemon.speciesForme).baseSpecies;
const isTransform = clientPokemon?.volatiles.transform;
const speciesName = isTransform && clientPokemon?.volatiles.formechange?.[1] && this.battle.gen <= 4 ?
this.battle.dex.species.get(clientPokemon.volatiles.formechange[1]).baseSpecies : species;
@@ -1179,43 +1176,16 @@ class BattleTooltips {
} else {
stats[statName] = Math.floor(stats[statName] * 1.3);
}
- }
- if (this.battle.tier.includes("VaporeMons")) {//Vaporemons
- if (clientPokemon.volatiles['protomosis' + statName] || clientPokemon.volatiles['photondrive' + statName] ||
- clientPokemon.volatiles['protocrysalis' + statName] || clientPokemon.volatiles['neurondrive' + statName] ||
- clientPokemon.volatiles['protostasis' + statName] || clientPokemon.volatiles['runedrive' + statName]) {
- if (statName === 'spe') {
- speedModifiers.push(1.5);
- } else {
- stats[statName] = Math.floor(stats[statName] * 1.3);
- }
- }
}
}
}
- if (this.battle.tier.includes("VaporeMons")) {//Vaporemons
- if (item === 'tuffytuff' && (this.battle.dex.species.get(serverPokemon.speciesForme).id === 'igglybuff' ||
- this.battle.dex.species.get(serverPokemon.speciesForme).id === 'jigglypuff' ||
- this.battle.dex.species.get(serverPokemon.speciesForme).id === 'wigglytuff')) {
- stats.def *= 2;
- stats.spd *= 2;
- }
- if (item === 'mithrilarmor') {
- stats.def = Math.floor(stats.def * 1.2);
- }
- if (item === 'snowglobe' && this.pokemonHasType(pokemon, 'Ice')) {
+ if (pokemon.status) {
+ if (ability === 'marvelscale') {
stats.def = Math.floor(stats.def * 1.5);
- }
- if (item === 'sandclock' && this.pokemonHasType(pokemon, 'Rock')) {
- stats.spd = Math.floor(stats.spd * 1.5);
- }
- if (item === 'desertrose' && species === 'Florges' && this.battle.weather === 'sandstorm') {
- stats.spd = Math.floor(stats.spd * 1.5);
}
- }
-
- if (ability === 'marvelscale' && pokemon.status) {
- stats.def = Math.floor(stats.def * 1.5);
+ if (ability === 'quickfeet') {
+ speedModifiers.push(1.5);
+ }
}
const isNFE = this.battle.dex.species.get(serverPokemon.speciesForme).evos?.some(evo => {
const evoSpecies = this.battle.dex.species.get(evo);
@@ -1302,6 +1272,89 @@ class BattleTooltips {
stats.spd = Math.floor(stats.spd * 0.75);
}
}
+
+ // SSB
+ if (this.battle.tier.includes('Super Staff Bros')) {
+ if (pokemon.name === 'Felucia') {
+ speedModifiers.push(1.5);
+ }
+ if (ability === 'misspelled') {
+ stats.spa = Math.floor(stats.spa * 1.5);
+ }
+ if (ability === 'fortifyingfrost' && weather === 'snow') {
+ stats.spa = Math.floor(stats.spa * 1.5);
+ stats.spd = Math.floor(stats.spd * 1.5);
+ }
+ if (weather === 'deserteddunes' && this.pokemonHasType(pokemon, 'Rock')) {
+ stats.spd = Math.floor(stats.spd * 1.5);
+ }
+ if (pokemon.status && ability === 'fortifiedmetal') {
+ stats.atk = Math.floor(stats.atk * 1.5);
+ }
+ if (ability === 'grassyemperor' && this.battle.hasPseudoWeather('Grassy Terrain')) {
+ stats.atk = Math.floor(stats.atk * 1.3333);
+ }
+ if (ability === 'magicalmysterycharge' && this.battle.hasPseudoWeather('Electric Terrain')) {
+ stats.spd = Math.floor(stats.spd * 1.5);
+ }
+ if (ability === 'youkaiofthedusk' || ability === 'galeguard') {
+ stats.def *= 2;
+ }
+ if (ability === 'climatechange') {
+ if (weather === 'snow') {
+ stats.def = Math.floor(stats.def * 1.5);
+ stats.spd = Math.floor(stats.spd * 1.5);
+ }
+ if (weather === 'sunnyday' || weather === 'desolateland') stats.spa = Math.floor(stats.spa * 1.5);
+ }
+ if (item !== 'utilityumbrella' && ability === 'ridethesun' &&
+ (weather === 'sunnyday' || weather === 'desolateland')) {
+ speedModifiers.push(2);
+ }
+ if (ability === 'soulsurfer' && this.battle.hasPseudoWeather('Electric Terrain')) {
+ speedModifiers.push(2);
+ }
+ if (item === 'eviolite' && this.battle.dex.species.get(serverPokemon.speciesForme).id === 'pichuspikyeared') {
+ stats.def = Math.floor(stats.def * 1.5);
+ stats.spd = Math.floor(stats.spd * 1.5);
+ }
+ if (this.battle.abilityActive('quagofruin')) {
+ if (ability !== 'quagofruin') {
+ stats.def = Math.floor(stats.def * 0.85);
+ }
+ }
+ if (this.battle.abilityActive('clodofruin')) {
+ if (ability !== 'clodofruin') {
+ stats.atk = Math.floor(stats.atk * 0.85);
+ }
+ }
+ if (this.battle.abilityActive('blitzofruin')) {
+ if (ability !== 'blitzofruin') {
+ speedModifiers.push(0.75);
+ }
+ }
+ if (this.battle.hasPseudoWeather('Anfield Atmosphere') && ability === 'youllneverwalkalone') {
+ stats.atk = Math.floor(stats.atk * 1.25);
+ stats.def = Math.floor(stats.def * 1.25);
+ stats.spd = Math.floor(stats.spd * 1.25);
+ speedModifiers.push(1.25);
+ }
+ if (clientPokemon) {
+ if (clientPokemon.volatiles['boiled']) {
+ stats.spa = Math.floor(stats.spa * 1.5);
+ }
+ for (const statName of Dex.statNamesExceptHP) {
+ if (clientPokemon.volatiles['ultramystik']) {
+ if (statName === 'spe') {
+ speedModifiers.push(1.3);
+ } else {
+ stats[statName] = Math.floor(stats[statName] * 1.3);
+ }
+ }
+ }
+ }
+ }
+
const sideConditions = this.battle.mySide.sideConditions;
if (sideConditions['tailwind']) {
speedModifiers.push(2);
@@ -1413,14 +1466,33 @@ class BattleTooltips {
getSpeedRange(pokemon: Pokemon): [number, number] {
const tr = Math.trunc || Math.floor;
const species = pokemon.getSpecies();
+ let rules = this.battle.rules;
let baseSpe = species.baseStats.spe;
- if (this.battle.rules['Scalemons Mod']) {
+ if (rules['Scalemons Mod']) {
const bstWithoutHp = species.bst - species.baseStats.hp;
const scale = 600 - species.baseStats.hp;
baseSpe = tr(baseSpe * scale / bstWithoutHp);
if (baseSpe < 1) baseSpe = 1;
if (baseSpe > 255) baseSpe = 255;
}
+ if (rules['Frantic Fusions Mod']) {
+ const fusionSpecies = this.battle.dex.species.get(pokemon.name);
+ if (fusionSpecies.exists && fusionSpecies.name !== species.name) {
+ baseSpe = baseSpe + tr(fusionSpecies.baseStats.spe / 4);
+ if (baseSpe < 1) baseSpe = 1;
+ if (baseSpe > 255) baseSpe = 255;
+ }
+ }
+ if (rules['Flipped Mod']) {
+ baseSpe = species.baseStats.hp;
+ if (baseSpe < 1) baseSpe = 1;
+ if (baseSpe > 255) baseSpe = 255;
+ }
+ if (rules['350 Cup Mod'] && species.bst <= 350) {
+ baseSpe *= 2;
+ if (baseSpe < 1) baseSpe = 1;
+ if (baseSpe > 255) baseSpe = 255;
+ }
let level = pokemon.volatiles.transform?.[4] || pokemon.level;
let tier = this.battle.tier;
let gen = this.battle.gen;
@@ -1466,7 +1538,7 @@ class BattleTooltips {
moveType = pokemonTypes[0];
}
// Moves that require an item to change their type.
- let item = Dex.items.get(value.itemName);
+ let item = this.battle.dex.items.get(value.itemName);
if (move.id === 'multiattack' && item.onMemory) {
if (value.itemModify(0)) moveType = item.onMemory;
}
@@ -1588,14 +1660,59 @@ class BattleTooltips {
}
if (move.id === 'photongeyser' || move.id === 'lightthatburnsthesky' ||
- move.id === 'terablast' && pokemon.terastallized) {
+ (move.id === 'terablast' && pokemon.terastallized) ||
+ (move.id === 'terastarstorm' && pokemon.getSpeciesForme() === 'Terapagos-Stellar')) {
const stats = this.calculateModifiedStats(pokemon, serverPokemon, true);
if (stats.atk > stats.spa) category = 'Physical';
}
- /*if (this.battle.tier.includes("VaporeMons") && move.id === 'terablast' && itemName === 'Tera Shard') {
- const stats = this.calculateModifiedStats(pokemon, serverPokemon, true);
- if (stats.atk > stats.spa) category = 'Physical';
- }*/
+
+ // SSB
+ if (this.battle.tier.includes('Super Staff Bros')) {
+ if (allowTypeOverride && category !== "Status" && !move.isZ && !move.id.startsWith('hiddenpower')) {
+ if (value.abilityModify(0, 'Acetosa')) moveType = 'Grass';
+ if (value.abilityModify(0, 'I Can Hear The Heart Beating As One') && moveType === 'Normal') moveType = 'Fairy';
+ }
+ if (move.id === 'tsignore' || move.id === 'o') {
+ const stats = this.calculateModifiedStats(pokemon, serverPokemon, true);
+ if (stats.atk > stats.spa) category = 'Physical';
+ }
+ if (move.id === 'tsignore' && pokemon.getSpeciesForme().startsWith('Meloetta') &&
+ pokemon.terastallized) {
+ moveType = 'Stellar';
+ }
+ if (move.id === 'weatherball' && value.weatherModify(0)) {
+ if (this.battle.weather === 'stormsurge') moveType = 'Water';
+ if (this.battle.weather === 'deserteddunes') moveType = 'Rock';
+ }
+ if (move.id === 'o' || move.id === 'worriednoises') {
+ moveType = pokemonTypes[0];
+ }
+ if (move.id === 'dillydally') {
+ moveType = pokemonTypes[pokemonTypes.length - 1];
+ }
+ if (move.id === 'magicalfocus') {
+ if (this.battle.turn % 3 === 1) {
+ moveType = 'Fire';
+ } else if (this.battle.turn % 3 === 2) {
+ moveType = 'Electric';
+ } else {
+ moveType = 'Ice';
+ }
+ }
+ if (move.id === 'hydrostatics' && pokemon.terastallized) {
+ moveType = 'Water';
+ }
+ if (move.id === 'asongoficeandfire' && pokemon.getSpeciesForme() === 'Volcarona') moveType = 'Ice';
+ if (this.battle.abilityActive('dynamictyping')) {
+ moveType = '???';
+ }
+ if (move.id === 'alting') {
+ moveType = '???';
+ if (pokemon.shiny) {
+ category = 'Special';
+ }
+ }
+ }
return [moveType, category];
}
@@ -1673,6 +1790,38 @@ class BattleTooltips {
value.itemModify(1.1, "Wide Lens");
}
+ // SSB
+ if (this.battle.tier.includes('Super Staff Bros')) {
+ if (move.id === 'alting' && pokemon.shiny) {
+ value.set(100);
+ }
+ if (move.flags['wind'] && this.battle.weather === 'stormsurge') {
+ value.weatherModify(0, 'Storm Surge');
+ }
+ if (value.tryAbility('Misspelled') && move.category === 'Special') {
+ accuracyModifiers.push(3277);
+ value.abilityModify(0.8, "Misspelled");
+ }
+ if (value.tryAbility('Hydrostatic Positivity') && ['Electric', 'Water'].includes(move.type)) {
+ accuracyModifiers.push(5325);
+ value.abilityModify(1.3, "Hydrostatic Positivity");
+ }
+ if (value.tryAbility('Hardcore Hustle')) {
+ for (let i = 1; i <= 5 && i <= pokemon.side.faintCounter; i++) {
+ if (pokemon.volatiles[`fallen${i}`]) {
+ value.abilityModify([1, 0.95, 0.90, 0.85, 0.80, 0.75][i], "Hardcore Hustle");
+ }
+ }
+ }
+ if (value.tryAbility('See No Evil, Hear No Evil, Speak No Evil') &&
+ pokemon.getSpeciesForme().includes('Wellspring')) {
+ value.abilityModify(0, 'See No Evil, Hear No Evil, Speak No Evil');
+ }
+ value.abilityModify(0, 'Sure Hit Sorcery');
+ value.abilityModify(0, 'Eyes of Eternity');
+ if (!value.value) return value;
+ }
+
// Chaining modifiers
let chain = 4096;
for (const mod of accuracyModifiers) {
@@ -1876,7 +2025,7 @@ class BattleTooltips {
}
// Moves which have base power changed due to items
if (serverPokemon.item) {
- let item = Dex.items.get(serverPokemon.item);
+ let item = this.battle.dex.items.get(serverPokemon.item);
if (move.id === 'fling' && item.fling) {
value.itemModify(item.fling.basePower);
}
@@ -2105,6 +2254,76 @@ class BattleTooltips {
value.set(0, 'no Terrain');
}
+ // SSB
+ if (this.battle.tier.includes('Super Staff Bros')) {
+ if (move.id === 'bodycount') {
+ value.set(50 + 50 * pokemon.side.faintCounter,
+ pokemon.side.faintCounter > 0
+ ? `${pokemon.side.faintCounter} teammate${pokemon.side.faintCounter > 1 ? 's' : ''} KOed`
+ : undefined);
+ }
+ // Base power based on times hit
+ if (move.id === 'vengefulmood') {
+ value.set(Math.min(140, 60 + 20 * pokemon.timesAttacked),
+ pokemon.timesAttacked > 0
+ ? `Hit ${pokemon.timesAttacked} time${pokemon.timesAttacked > 1 ? 's' : ''}`
+ : undefined);
+ }
+ if (move.id === 'alting' && pokemon.shiny) {
+ value.set(69, 'Shiny');
+ }
+ if (move.id === 'darkmooncackle') {
+ let boostCount = 0;
+ for (const boost of Object.values(pokemon.boosts)) {
+ if (boost > 0) boostCount += boost;
+ }
+ value.set(30 + 20 * boostCount);
+ }
+ if (move.id === 'buildingcharacter' && target?.terastallized) {
+ value.modify(2, 'Terastallized target');
+ }
+ if (move.id === 'mysticalbonfire' && target?.status) {
+ value.modify(1.5, 'Mystical Bonfire + status');
+ }
+ if (move.id === 'adaptivebeam' && target && Object.values(target.boosts).some(x => x > 0)) {
+ value.set(0, "Target has more boosts");
+ }
+ if (value.value <= 60) {
+ value.abilityModify(1.5, "Confirmed Town");
+ }
+ if (move.category !== 'Status' && allowTypeOverride && !move.isZ &&
+ !move.isMax && !move.id.startsWith('hiddenpower')) {
+ if (moveType === 'Normal') value.abilityModify(this.battle.gen > 6 ? 1.2 : 1.3, "I Can Hear The Heart Beating As One");
+ value.abilityModify(this.battle.gen > 6 ? 1.2 : 1.3, "Acetosa");
+ }
+ if (move.flags['punch']) {
+ value.abilityModify(1.5, "Harambe Hit");
+ }
+ if (move.flags['slicing']) {
+ value.abilityModify(1.5, "I Can Hear The Heart Beating As One");
+ }
+ if (move.priority > 0) {
+ value.abilityModify(2, "Full Bloom");
+ }
+ if (move.recoil || move.hasCrashDamage) {
+ value.abilityModify(1.2, 'Hogwash');
+ if (pokemon.name === "Billo") {
+ value.modify(1.2);
+ }
+ }
+ if (target?.gender === "M" && pokemon.getSpeciesForme().includes("Hearthflame")) {
+ value.abilityModify(1.3, 'See No Evil, Hear No Evil, Speak No Evil');
+ }
+ for (let i = 1; i <= 5 && i <= pokemon.side.faintCounter; i++) {
+ if (pokemon.volatiles[`fallen${i}`]) {
+ value.abilityModify([1, 1.15, 1.3, 1.45, 1.6, 1.75][i], "Hardcore Hustle");
+ }
+ }
+ let timeDilationBPMod = 1 + (0.1 * Math.floor(this.battle.turn / 10));
+ if (timeDilationBPMod > 2) timeDilationBPMod = 2;
+ value.abilityModify(timeDilationBPMod, "Time Dilation");
+ }
+
return value;
}
@@ -2200,11 +2419,14 @@ class BattleTooltips {
value.itemModify(1.2);
return value;
}
- if ((speciesName.startsWith('Ogerpon-Wellspring') && itemName === 'Wellspring Mask') ||
- (speciesName.startsWith('Ogerpon-Hearthflame') && itemName === 'Hearthflame Mask') ||
- (speciesName.startsWith('Ogerpon-Cornerstone') && itemName === 'Cornerstone Mask')) {
- value.itemModify(1.2);
- return value;
+ if (speciesName === 'Ogerpon') {
+ const speciesForme = value.pokemon.getSpeciesForme();
+ if ((speciesForme.startsWith('Ogerpon-Wellspring') && itemName === 'Wellspring Mask') ||
+ (speciesForme.startsWith('Ogerpon-Hearthflame') && itemName === 'Hearthflame Mask') ||
+ (speciesForme.startsWith('Ogerpon-Cornerstone') && itemName === 'Cornerstone Mask')) {
+ value.itemModify(1.2);
+ return value;
+ }
}
// Gems
@@ -2263,17 +2485,13 @@ class BattleTooltips {
return false;
}
getAllyAbility(ally: Pokemon) {
- // this will only be available if the ability announced itself in some way
- let allyAbility = Dex.abilities.get(ally.ability).name;
- // otherwise fall back on the original set data sent from the server
- if (!allyAbility) {
- if (this.battle.myAllyPokemon) { // multi battle ally
- allyAbility = Dex.abilities.get(this.battle.myAllyPokemon[ally.slot].ability).name;
- } else if (this.battle.myPokemon) {
- allyAbility = Dex.abilities.get(this.battle.myPokemon[ally.slot].ability).name;
- }
+ let serverPokemon;
+ if (this.battle.myAllyPokemon) {
+ serverPokemon = this.battle.myAllyPokemon[ally.slot];
+ } else if (this.battle.myPokemon) {
+ serverPokemon = this.battle.myPokemon[ally.slot];
}
- return allyAbility;
+ return ally.effectiveAbility(serverPokemon);
}
getPokemonAbilityData(clientPokemon: Pokemon | null, serverPokemon: ServerPokemon | null | undefined) {
const abilityData: {ability: string, baseAbility: string, possibilities: string[]} = {
@@ -2293,6 +2511,14 @@ class BattleTooltips {
if (species.abilities['1']) abilityData.possibilities.push(species.abilities['1']);
if (species.abilities['H']) abilityData.possibilities.push(species.abilities['H']);
if (species.abilities['S']) abilityData.possibilities.push(species.abilities['S']);
+ if (this.battle.rules['Frantic Fusions Mod']) {
+ const fusionSpecies = this.battle.dex.species.get(clientPokemon.name);
+ if (fusionSpecies.exists && fusionSpecies.name !== species.name) {
+ abilityData.possibilities = Array.from(
+ new Set(abilityData.possibilities.concat(Object.values(fusionSpecies.abilities)))
+ );
+ }
+ }
}
}
}
@@ -2315,16 +2541,19 @@ class BattleTooltips {
if (!isActive) {
// for switch tooltips, only show the original ability
const ability = abilityData.baseAbility || abilityData.ability;
- if (ability) text = 'Ability: ' + Dex.abilities.get(ability).name;
+ if (ability) text = 'Ability: ' + this.battle.dex.abilities.get(ability).name;
} else {
if (abilityData.ability) {
- const abilityName = Dex.abilities.get(abilityData.ability).name;
+ const abilityName = this.battle.dex.abilities.get(abilityData.ability).name;
text = 'Ability: ' + abilityName;
- const baseAbilityName = Dex.abilities.get(abilityData.baseAbility).name;
+ const baseAbilityName = this.battle.dex.abilities.get(abilityData.baseAbility).name;
if (baseAbilityName && baseAbilityName !== abilityName) text += ' (base: ' + baseAbilityName + ')';
}
}
- if (!text && abilityData.possibilities.length && !hidePossible) {
+ const tier = this.battle.tier;
+ if (!text && abilityData.possibilities.length && !hidePossible &&
+ !(tier.includes('Almost Any Ability') || tier.includes('Hackmons') ||
+ tier.includes('Inheritance') || tier.includes('Metronome'))) {
text = 'Possible abilities: ' + abilityData.possibilities.join(', ');
}
return text;
@@ -2352,7 +2581,7 @@ interface PokemonSet {
/** Defaults to random legal gender, NOT subject to gender ratios */
gender?: string;
/** Defaults to flat 252's (200's/0's in Let's Go) (error in gen 3+) */
- evs?: StatsTable;
+ evs?: Partial;
/** Defaults to whatever makes sense - flat 31's unless you have Gyro Ball etc */
ivs?: StatsTable;
/** Defaults as you'd expect (100 normally, 50 in VGC-likes, 5 in LC) */
@@ -2442,9 +2671,10 @@ class BattleStatGuesser {
if (set.moves.length < 1) return '?';
let needsFourMoves = !['unown', 'ditto'].includes(species.id);
+ let hasFourValidMoves = set.moves.length >= 4 && !set.moves.includes('');
let moveids = set.moves.map(toID);
if (moveids.includes('lastresort' as ID)) needsFourMoves = false;
- if (set.moves.length < 4 && needsFourMoves && !this.formatid.includes('metronomebattle')) {
+ if (!hasFourValidMoves && needsFourMoves && !this.formatid.includes('metronomebattle')) {
return '?';
}
@@ -2975,7 +3205,153 @@ class BattleStatGuesser {
}
}
+function BattleStatOptimizer(set: PokemonSet, formatid: ID) {
+ if (!set.evs) return null;
+
+ const dex = Dex.mod(formatid.slice(0, 4) as ID);
+ const ignoreEVLimits = (
+ dex.gen < 3 ||
+ ((formatid.endsWith('hackmons') || formatid.endsWith('bh')) && dex.gen !== 6) ||
+ formatid.includes('metronomebattle') || formatid.endsWith('norestrictions')
+ );
+ const supportsEVs = !formatid.includes('letsgo');
+ if (!supportsEVs || ignoreEVLimits) return false;
+
+ const species = dex.species.get(set.species);
+ const level = set.level || 100;
+ const getStat = (stat: StatNameExceptHP, ev: number, nature: Nature) => {
+ const baseStat = species.baseStats[stat];
+ const iv = set.ivs?.[stat] || 31;
+ let val = ~~(~~(2 * baseStat + iv + ~~(ev / 4)) * level / 100 + 5);
+ if (nature.plus === stat) {
+ val *= 1.1;
+ } else if (nature.minus === stat) {
+ val *= 0.9;
+ }
+ return ~~(val);
+ };
+
+ const origNature = BattleNatures[set.nature || 'Serious'];
+ const origStats = {
+ // no need to calculate hp
+ atk: getStat('atk', set.evs.atk || 0, origNature),
+ def: getStat('def', set.evs.def || 0, origNature),
+ spa: getStat('spa', set.evs.spa || 0, origNature),
+ spd: getStat('spd', set.evs.spd || 0, origNature),
+ spe: getStat('spe', set.evs.spe || 0, origNature),
+ };
+ const getMinEVs = (stat: StatNameExceptHP, nature: Nature) => {
+ let ev = 0;
+ while (getStat(stat, ev, nature) < origStats[stat]) {
+ ev += 4;
+ }
+ return ev;
+ };
+
+ const origSpread = {evs: set.evs, ...origNature};
+ let origLeftoverEVs = 508;
+ for (const stat of Dex.statNames) {
+ origLeftoverEVs -= origSpread.evs?.[stat] || 0;
+ }
+ // Only check for optimizations if EVs are completed
+ if (origLeftoverEVs > 4) return null;
+
+ // Can't move the plus if it boosts its stat past normal EV limit
+ const plusTooHigh = origNature.plus && getStat(origNature.plus, 252, {}) < origStats[origNature.plus];
+ // Can't move the minus if there's no investment in its stat to redistribute
+ const minusTooLow = origNature.minus && !origSpread.evs?.[origNature.minus];
+ // If we can't move either of them, do nothing
+ if (plusTooHigh && minusTooLow) return null;
+
+ let bestPlus = origNature.plus;
+ let bestPlusMinEVs = bestPlus && origSpread.evs[bestPlus];
+ let bestMinus = origNature.minus || 'atk';
+ let bestMinusMinEVs = origSpread.evs[bestMinus];
+ let savedEVs = 0;
+
+ // Try and move the minus first, as figuring out where the plus should go is harder if the minus hasn't been placed
+ if (!minusTooLow) {
+ for (const stat of Dex.statNamesExceptHP) {
+ if (origStats[stat] < origStats[bestMinus]) {
+ const minEVs = getMinEVs(stat, {minus: stat});
+ if (minEVs > 252) continue;
+ // This number can go negative at this point, but we'll make up for it later (and check to make sure)
+ savedEVs = (origSpread.evs[stat] || 0) - minEVs;
+ if (origNature.minus) {
+ savedEVs += (origSpread.evs[origNature.minus] || 0) - getMinEVs(origNature.minus, {minus: stat});
+ }
+ bestMinus = stat;
+ bestMinusMinEVs = minEVs;
+ }
+ }
+ }
+ if (!plusTooHigh) {
+ for (const stat of Dex.statNamesExceptHP) {
+ // Don't move the plus to an uninvested stat
+ if (stat !== origNature.plus && origSpread.evs[stat] && stat !== bestMinus) {
+ const minEVs = getMinEVs(stat, {plus: stat});
+ let plusEVsSaved = (origNature.minus === stat ? getMinEVs(stat, {}) : origSpread.evs[stat] || 0) - minEVs;
+ if (bestPlus && bestPlus !== bestMinus) {
+ plusEVsSaved += bestPlusMinEVs! - getMinEVs(bestPlus, {plus: stat, minus: bestMinus});
+ }
+ if (plusEVsSaved > 0 && savedEVs + plusEVsSaved > 0) {
+ savedEVs += plusEVsSaved;
+ bestPlus = stat;
+ bestPlusMinEVs = minEVs;
+ } else if (plusEVsSaved === 0 && (bestPlus || savedEVs > 0) || plusEVsSaved > 0 && savedEVs + plusEVsSaved === 0) {
+ if (!bestPlus || getStat(stat, getMinEVs(stat, {plus: stat}), {plus: stat}) > origStats[stat]) {
+ savedEVs += plusEVsSaved;
+ bestPlus = stat;
+ bestPlusMinEVs = minEVs;
+ }
+ }
+ }
+ }
+ }
+
+ if (bestPlus && savedEVs >= 0) {
+ const newSpread: {
+ evs: Partial,
+ plus?: StatNameExceptHP,
+ minus?: StatNameExceptHP,
+ } = {evs: {...origSpread.evs}, plus: bestPlus, minus: bestMinus};
+ if (bestPlus !== origNature.plus || bestMinus !== origNature.minus) {
+ newSpread.evs[bestPlus] = bestPlusMinEVs!;
+ newSpread.evs[bestMinus] = bestMinusMinEVs!;
+ if (origNature.plus && origNature.plus !== bestPlus && origNature.plus !== bestMinus) {
+ newSpread.evs[origNature.plus] = getMinEVs(origNature.plus, newSpread);
+ }
+ if (origNature.minus && origNature.minus !== bestPlus && origNature.minus !== bestMinus) {
+ newSpread.evs[origNature.minus] = getMinEVs(origNature.minus, newSpread);
+ }
+ for (const stat of Dex.statNames) {
+ if (!newSpread.evs[stat]) delete newSpread.evs[stat];
+ }
+ return {...newSpread, savedEVs};
+ } else if (!plusTooHigh && !minusTooLow) {
+ if (Math.floor(getStat(bestPlus, bestMinusMinEVs!, newSpread) / 11) <= Math.ceil(origStats[bestMinus] / 9)) {
+ // We're not gaining more points from our plus than we're losing to our minus
+ // So a neutral nature would be better
+ delete newSpread.plus;
+ delete newSpread.minus;
+ newSpread.evs[origNature.plus] = getMinEVs(origNature.plus, newSpread);
+ newSpread.evs[origNature.minus] = getMinEVs(origNature.minus, newSpread);
+ savedEVs += (origSpread.evs[origNature.plus] || 0) - newSpread.evs[origNature.plus]!;
+ savedEVs += (origSpread.evs[origNature.minus] || 0) - newSpread.evs[origNature.minus]!;
+ if (savedEVs < 0) return null;
+ for (const stat of Dex.statNames) {
+ if (!newSpread.evs[stat]) delete newSpread.evs[stat];
+ }
+ return {...newSpread, savedEVs};
+ }
+ }
+ }
+
+ return null;
+}
+
if (typeof require === 'function') {
// in Node
(global as any).BattleStatGuesser = BattleStatGuesser;
+ (global as any).BattleStatOptimizer = BattleStatOptimizer;
}
\ No newline at end of file
diff --git a/play.pokemonshowdown.com/src/battle.ts b/play.pokemonshowdown.com/src/battle.ts
index 70836f784..44867ed2e 100644
--- a/play.pokemonshowdown.com/src/battle.ts
+++ b/play.pokemonshowdown.com/src/battle.ts
@@ -607,6 +607,7 @@ export class Side {
foe: Side = null!;
ally: Side | null = null;
avatar: string = 'unknown';
+ badges: string[] = [];
rating: string = '';
totalPokemon = 6;
x = 0;
@@ -3380,6 +3381,10 @@ export class Battle {
case 'upkeep': {
this.usesUpkeep = true;
this.updateTurnCounters();
+ // Prevents getSwitchedPokemon from skipping over a Pokemon that switched out mid turn (e.g. U-turn)
+ for (const side of this.sides) {
+ side.lastPokemon = null;
+ }
break;
}
case 'turn': {
@@ -3399,6 +3404,9 @@ export class Battle {
if (this.tier.includes(`Let's Go`)) {
this.dex = Dex.mod('gen7letsgo' as ID);
}
+ if (this.tier.includes('Super Staff Bros')) {
+ this.dex = Dex.mod('gen9ssb' as ID);
+ }
this.log(args);
break;
}
@@ -3554,6 +3562,15 @@ export class Battle {
this.log(args);
break;
}
+ case 'badge': {
+ let side = this.getSide(args[1]);
+ // handle all the rendering further down
+ const badge = args.slice(2).join('|');
+ // (don't allow duping)
+ if (!side.badges.includes(badge)) side.badges.push(badge);
+ this.scene.updateSidebar(side);
+ break;
+ }
case 'teamsize': {
let side = this.getSide(args[1]);
side.totalPokemon = parseInt(args[2], 10);
@@ -3704,6 +3721,21 @@ export class Battle {
this.scene.setControlsHTML(BattleLog.sanitizeHTML(args[1]));
break;
}
+ case 'custom': {
+ // Style is always |custom|-subprotocol|pokemon|additional info
+ if (args[1] === '-endterastallize') {
+ let poke = this.getPokemon(args[2])!;
+ poke.removeVolatile('terastallize' as ID);
+ poke.teraType = '';
+ poke.terastallized = '';
+ poke.details = poke.details.replace(/, tera:[a-z]+/i, '');
+ poke.searchid = poke.searchid.replace(/, tera:[a-z]+/i, '');
+ this.scene.animTransform(poke);
+ this.scene.resetStatbar(poke);
+ this.log(args, kwArgs);
+ }
+ break;
+ }
default: {
this.log(args, kwArgs, preempt);
break;
diff --git a/play.pokemonshowdown.com/src/panel-battle.tsx b/play.pokemonshowdown.com/src/panel-battle.tsx
index 3c9c0d878..6e6d40a1c 100644
--- a/play.pokemonshowdown.com/src/panel-battle.tsx
+++ b/play.pokemonshowdown.com/src/panel-battle.tsx
@@ -245,6 +245,14 @@ class BattlePanel extends PSRoomPanel {
case 'mega':
choices.current.mega = checkbox.checked;
break;
+ case 'megax':
+ choices.current.megax = checkbox.checked;
+ choices.current.megay = false;
+ break;
+ case 'megay':
+ choices.current.megay = checkbox.checked;
+ choices.current.megax = false;
+ break;
case 'ultra':
choices.current.ultra = checkbox.checked;
break;
@@ -549,6 +557,8 @@ class BattlePanel extends PSRoomPanel {
const canDynamax = moveRequest.canDynamax && !choices.alreadyMax;
const canMegaEvo = moveRequest.canMegaEvo && !choices.alreadyMega;
+ const canMegaEvoX = moveRequest.canMegaEvoX && !choices.alreadyMega;
+ const canMegaEvoY = moveRequest.canMegaEvoY && !choices.alreadyMega;
const canZMove = moveRequest.zMoves && !choices.alreadyZ;
if (choices.current.move) {
@@ -588,6 +598,14 @@ class BattlePanel extends PSRoomPanel {
+ }
+ {canMegaEvoY &&
+ }
{moveRequest.canUltraBurst &&
Andrew Werner [HoeenHero] – Development
Annika L. [Annika] – Development
Chris Monsanto [chaos]– Sysadmin
Kris Johnson [Kris] – Development
Chris Monsanto [chaos]– Development, Sysadmin
Kris Johnson [dhelmise] – Development, Art (battle animations)
Leonard Craft III [DaWoblefet] – Research (game mechanics)
Mathieu Dias-Martins [Marty] – Research (game mechanics), Development
Mia A. [Mia] – Development
Mia A. [Hecate] – Development
Retired Staff
Bill Meltsner [bmelts]– Development, Sysadmin
[bumbadadabum ] – Development
Cathy J. Fitzpatrick [cathyjf]– Development, Sysadmin
Hugh Gordon [V4, DanUgore] – Research (game mechanics), Development
Juanma Serrano [Joim] – Development, Sysadmin
Leonardo Julca [Slayer95] – Development
Catherine D. [SailorCosmos, Matryoshkat]– Art (battle animations)
Cody Thompson [Rising_Dusk] – Development
[Enigami ] – Development
[Hisuian Zoroark ] – Development (Staff Bros format)
[Hisuian Zoroark, HiZo ] – Development
[Honko ] – Development (damage calculator)
Ian Clail [Layell] – Art (battle graphics, sprites)
Jacob McLemore – Development
Erik Bruce [Kalalokki] – Art (minisprite resizing)
Erik Bruce [Kalalokki]– Art (minisprite resizing), Research (game mechanics)
Jeremy Piemonte [panpawn]– Development
Karthik Bandagonda – Development
[leparagon ] – Art (sprites, minisprite resizing)
- * @contributor kota
- * @dependencies flot, jQuery
- * @licence public domain
- */
-$(function() {
- 'use strict';
-
- var timezoneOffset = new Date().getTimezoneOffset();
- var timezoneAdjust = function(stats) {
- for (var i = 0; i < stats.length; ++i) {
- var data = stats[i].data;
- for (var j = 0; j < data.length; ++j) {
- if (j === 0) {
- data[j][0] = (data[j][0] - timezoneOffset * 60) * 1000;
- } else {
- data[j][0] = data[j - 1][0] + data[j][0] * 1000;
- }
- }
- }
- };
- timezoneAdjust(Config.stats);
- timezoneAdjust(Config.subset);
- var getUserstats = function(startDate, endDate, callback) {
- var query = "?format=json&startDate=" +
- encodeURIComponent(startDate) +
- "&endDate=" +
- encodeURIComponent(endDate);
- $.getJSON(query, function(stats) {
- timezoneAdjust(stats);
- callback(stats);
- });
- };
- $('#maxusersdate').text(new Date(Config.maxUsersDate).toLocaleString());
- $('#timezone').text(((timezoneOffset > 0) ? '-' : '+') + (Math.abs(timezoneOffset) / 60));
-
- var xaxis = {mode: 'time', timeformat: '%y-%0m-%0d %H:%M'};
-
- var graph = (function() {
- var options = {
- xaxis: xaxis,
- yaxis: {
- min: 0,
- ticks: 9
- },
- selection: {mode: 'x'},
- grid: {
- hoverable: true,
- borderWidth: 0
- },
- legend: {
- show: true,
- container: $('#legend')
- }
- };
- var self = $.plot($("#userstats"), Config.stats, options);
- var showUserCount = function(plot, x, y) {
- var p = plot.pointOffset({x: x, y: y});
- $("#usercount-overlay").remove();
- $("#userstats").append('' + y + ' users
');
- };
- var highlightPoint = (function() {
- var lastHighlight = -1;
- var lastSeries = -1;
- return function(plot, series, index) {
- if (lastHighlight !== -1) {
- plot.unhighlight(lastSeries, lastHighlight);
- }
- plot.highlight(lastSeries = series, lastHighlight = index);
- };
- })();
- var highlightMaximum = function(plot) {
- var max = 0;
- var maxIdx = 0;
- var maxSeriesIdx = 0;
- var data = plot.getData();
- for (var i = 0; i < data.length; ++i) {
- var series = data[i].data;
- for (var j = 0; j < series.length; ++j) {
- if (series[j][0] < plot.getAxes().xaxis.min) continue;
- if (series[j][0] > plot.getAxes().xaxis.max) break;
- if (series[j][1] > max) {
- max = series[j][1];
- maxIdx = j;
- maxSeriesIdx = i;
- }
- }
- }
- highlightPoint(plot, maxSeriesIdx, maxIdx);
- showUserCount(plot, data[maxSeriesIdx].data[maxIdx][0], max);
- };
- highlightMaximum(self);
- $('#userstats').bind('plothover', function(event, pos, item) {
- if (item) {
- highlightPoint(self, item.series, item.dataIndex);
- showUserCount(self, item.datapoint[0], item.datapoint[1]);
- }
- });
- $('#userstats').bind('plotselected', function(event, ranges) {
- var handleStats = function(stats) {
- graph = self = $.plot($('#userstats'), stats,
- $.extend(true, {}, options, {
- xaxis: {min: ranges.xaxis.from, max: ranges.xaxis.to}
- }
- ));
- overview.setSelection(ranges, true);
- highlightMaximum(self);
- };
- if (Config.subset) {
- handleStats(Config.subset);
- Config.subset = null;
- } else {
- var from = ranges.xaxis.from + timezoneOffset * 60 * 1000;
- var to = ranges.xaxis.to + timezoneOffset * 60 * 1000;
- getUserstats(from, to, handleStats);
- }
- });
- return self;
- })();
-
- var overview = (function() {
- var ret = $.plot($('#overview'), Config.stats, {
- series: {
- lines: {show: true, lineWidth: 1},
- shadowSize: 0
- },
- xaxis: xaxis,
- yaxis: {ticks: [], min: 0, autoscaleMargin: 0.1},
- selection: {mode: 'x'},
- legend: {show: false},
- grid: {
- borderWidth: 0
- }
- });
- $('#overview').bind('plotselected', function(event, ranges) {
- graph.setSelection(ranges);
- });
- return ret;
- })();
-
- (function() {
- if (!Config.subset) return;
- var axes = graph.getAxes();
- var yaxis = axes.yaxis;
- graph.setSelection({
- xaxis: {
- from: Math.min(
- Config.subset[0].data[0][0],
- Config.subset[1].data[0][0]
- ),
- to: Math.max(
- Config.subset[0].data[Config.subset[0].data.length - 1][0],
- Config.subset[1].data[Config.subset[1].data.length - 1][0],
- axes.xaxis.max
- )
- },
- yaxis: {
- from: yaxis.min,
- to: yaxis.max
- }
- });
- })();
-
- $('#loading').hide();
- $('.hidden-content').show();
-});
diff --git a/pokemonshowdown.com/ladder.php b/pokemonshowdown.com/ladder.php
index a743f718d..83ac6ec34 100644
--- a/pokemonshowdown.com/ladder.php
+++ b/pokemonshowdown.com/ladder.php
@@ -192,10 +192,14 @@
GXE Glicko-1 COIL (more games needed)
+
+
+
+
- */
-
-class POBuffer {
- private $buffer;
- private $pointer = 0;
-
- public function __construct($buffer) {
- $this->buffer = $buffer;
- }
-
- private function read($bytes) {
- $d = substr($this->buffer, $this->pointer, $bytes);
- $this->pointer += $bytes;
- return $d;
- }
-
- private function unpack($bytes, $pattern) {
- $d = $this->read($bytes);
- $arr = unpack($pattern . 'x', $d);
- return $arr['x'];
- }
-
- public function readquint8() {
- return $this->unpack(1, 'C');
- }
-
- public function readquint16() {
- return $this->unpack(2, 'n');
- }
-
- public function readquint32() {
- return $this->unpack(4, 'N');
- }
-
- public function readQString() {
- $length = $this->readquint32();
- $data = $this->read($length);
- return utf8_decode($data);
- }
-}
-
-class POClient {
- private $socket;
-
- public function __construct($host, $port) {
- $this->socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
- if (!$this->socket) throw new Exception('Could not create socket');
-
- $ip = gethostbyname($host);
- if (!$ip) throw new Exception('Could not resolve hostname');
-
- $res = socket_connect($this->socket, $ip, $port);
- if (!$res) throw new Exception('Could not establish connection');
- }
-
- public function recvfully($bytes) {
- $received = 0;
- $ret = '';
- while ($received < $bytes) {
- $buf = '';
- $b = socket_recv($this->socket, $buf, $bytes - $received, MSG_WAITALL);
- if ($b === FALSE) return FALSE;
- $received += $b;
- $ret .= $buf;
- }
- return new POBuffer($ret);
- }
-
- public function recvmessage() {
- $header = $this->recvfully(4);
- if ($header === FALSE) return FALSE;
- $length = $header->readquint32();
- return $this->recvfully($length);
- }
-
- public function disconnect() {
- socket_close($this->socket);
- }
-}
-
-class PORegistry {
-
- public static function getServerList() {
- $client = new POClient('registry.pokemon-online.eu', 5090);
- $active = true;
- $servers = array();
- while ($active && ($msg = $client->recvmessage())) {
- // message type constants are defined in `src/Shared/networkcommands.h`
- $type = $msg->readquint8();
- switch ($type) {
- case 38: // Announcement
- // ignore this
- break;
-
- case 5: // PlayersList (server entry)
- // these array index names are copied from the PO source code
- $entry = array();
- $entry['name'] = $msg->readQString();
- $entry['desc'] = $msg->readQString();
- $entry['numplayers'] = $msg->readquint16();
- $entry['ip'] = $msg->readQString();
- $entry['max'] = $msg->readquint16();
- $entry['port'] = $msg->readquint16();
- $entry['passwordProtected'] = !!$msg->readquint8();
- $servers[] = $entry;
- break;
-
- case 57: // ServerListEnd
- $active = false;
- break;
- }
- }
- $client->disconnect();
-
- usort($servers, function(&$a, &$b) {
- return $b['numplayers'] - $a['numplayers'];
- });
- return $servers;
- }
-
- public static function updateUserStats() {
- global $psdb;
-
- $servers = array();
- try {
- $servers = PORegistry::getServerList();
- } catch (Exception $e) {}
- if (count($servers) === 0) return;
-
- $maxusers = $servers[0]['numplayers'];
- $time = time() * 1000;
-
- $psdb->query("INSERT INTO `ntbb_userstatshistory` (`date`, `usercount`, `programid`) VALUES ('" . $psdb->escape($time) . "', '" . $psdb->escape($maxusers) . "', 'po')");
- }
-
-}
diff --git a/pokemonshowdown.com/lib/updatepouserstats.php b/pokemonshowdown.com/lib/updatepouserstats.php
deleted file mode 100755
index df70e64a1..000000000
--- a/pokemonshowdown.com/lib/updatepouserstats.php
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/php
-csrfCheck() && @$_POST['resetLadder']) {
$formatLadder = new NTBBLadder(@$_POST['resetLadder']);
if (substr($formatLadder->formatid, -7) !== 'current' && substr($formatLadder->formatid, -11) !== 'suspecttest') {
@@ -492,7 +493,7 @@
} else {
$bufs[$buftype] .= '(more games needed) ';
}
- if ($user['userid'] === $curuser['userid']) {
+ if ($user['userid'] === $curuser['userid'] && !$ladderTourID) {
$bufs[$buftype] .= '' . $row['w'] . ' ' . $row['l'] . ' Reset
diff --git a/pokemonshowdown.com/userstats.php b/pokemonshowdown.com/userstats.php
deleted file mode 100644
index 7246ac475..000000000
--- a/pokemonshowdown.com/userstats.php
+++ /dev/null
@@ -1,151 +0,0 @@
- $startDate) {
- $endDate = (int)$_REQUEST['endDate'];
-}
-
-function printResultSet($res) {
- global $psdb;
-
- echo '[{"label": "Pokémon Showdown", "data": [';
- $row = $psdb->fetch_assoc($res);
- $po = false;
- $last = 0;
- while (true) {
- $value = (int)($row['date'] / 1000);
- $delta = $value - $last;
- $last = $value;
- echo '[' . $delta . ',' . $row['usercount'] . ']';
- if ($row = $psdb->fetch_assoc($res)) {
- if (!$po && ($row['programid'] !== 'showdown')) {
- echo ']}, {"label": "Pokémon Online (src )", "data": [';
- $last = 0;
- $po = true;
- } else {
- echo ',';
- }
- } else {
- break;
- }
- }
- echo ']}]';
-}
-
-function printRecentResults() {
- global $psdb;
- $res = $psdb->query(
- "SELECT `date`, `usercount`, `programid` " .
- "FROM `ntbb_userstatshistory` " .
- "WHERE (`date` > (UNIX_TIMESTAMP() - 60*60*24*3) * 1000) " .
- "ORDER BY `programid` ASC, `date` ASC");
- printResultSet($res);
-}
-
-function printJsonResults($startDate, $endDate) {
- global $psdb;
-
- $maxResults = 1000;
- // This should be approximately
- // ((date of last stat) - (date of first stat)) / $maxResults
- $intervalLimit = 1000 * 60 * 60;
- $interval = (int)(($endDate - $startDate) / $maxResults);
- if ($interval > $intervalLimit) {
- $interval = $intervalLimit;
- }
- $res = $psdb->query(
- "SELECT `date`, `usercount`, `programid` " .
- "FROM `ntbb_userstatshistory` " .
- "WHERE `date` BETWEEN " . (int)$startDate . " AND " . (int)$endDate . " " .
- "GROUP BY FLOOR(`date`/" . $interval . "), `programid` " .
- "ORDER BY `programid` ASC, `date` ASC"
- );
- printResultSet($res);
-}
-
-if (isset($_REQUEST['format']) && ($_REQUEST['format'] === 'json')) {
- header('Content-Type: application/json');
- printJsonResults($startDate, $endDate);
- exit();
-}
-
-$res = $psdb->query(
- 'SELECT `date`, `usercount` ' .
- 'FROM `ntbb_userstatshistory` ' .
- 'WHERE `programid`=\'showdown\' ' .
- 'ORDER BY `usercount` DESC ' .
- 'LIMIT 1');
-
-$maxUsers = null;
-if ($res) {
- $maxUsers = $psdb->fetch_assoc($res);
-}
-
-$page = 'userstats';
-$pageTitle = "User stats";
-
-includeHeaderTop();
-?>
-
-
-
- Loading...
This requires JavaScript!
-
-
-
-
-
- This graph shows the number of users on the official server. By default, the last 3 days are shown.
- The most users ever recorded online at once was users on
-
-
-
-
-
-
-
Click and drag a section of the overview below to view an arbitrary time period:
-
-
-
-
-
-
-
-