Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-03-21 17:50:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct Snowscape weather name
Some checks failed
Node.js CI / build (14.x) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Guangcong Luo 2025-02-19 16:36:54 -08:00
parent 3f23c5a738
commit 3d4de88706
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
play.pokemonshowdown.com/src/battle-animations.ts
View File

@ -958,7 +958,7 @@ export class BattleScene implements BattleSceneStub {
primordialsea: 'Heavy Rain', primordialsea: 'Heavy Rain',
sandstorm: 'Sandstorm', sandstorm: 'Sandstorm',
hail: 'Hail', hail: 'Hail',
snow: 'Snow', snowscape: 'Snow',
deltastream: 'Strong Winds', deltastream: 'Strong Winds',
}; };
weatherhtml = `${weatherNameTable[this.battle.weather] || this.battle.weather}`; weatherhtml = `${weatherNameTable[this.battle.weather] || this.battle.weather}`;

5
play.pokemonshowdown.com/src/battle-text-parser.ts
View File

@ -203,6 +203,11 @@ export class BattleTextParser {
break; break;
} }
case '-weather': {
if (args[1] === 'Snow') args[1] = 'Snowscape';
break;
}
case '-nothing': case '-nothing':
// OLD: |-nothing // OLD: |-nothing
// NEW: |-activate||move:Splash // NEW: |-activate||move:Splash

14
play.pokemonshowdown.com/src/battle-tooltips.ts
View File

@ -35,7 +35,7 @@ class ModifiableValue {
this.itemName = this.battle.dex.items.get(serverPokemon.item).name; this.itemName = this.battle.dex.items.get(serverPokemon.item).name;
const ability = serverPokemon.ability || pokemon?.ability || serverPokemon.baseAbility; const ability = serverPokemon.ability || pokemon?.ability || serverPokemon.baseAbility;
this.abilityName = this.battle.dex.abilities.get(ability).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.weatherName = this.battle.dex.moves.get(battle.weather).exists ?
this.battle.dex.moves.get(battle.weather).name : this.battle.dex.abilities.get(battle.weather).name; this.battle.dex.moves.get(battle.weather).name : this.battle.dex.abilities.get(battle.weather).name;
} }
reset(value = 0, isAccuracy?: boolean) { reset(value = 0, isAccuracy?: boolean) {
@ -588,7 +588,7 @@ export class BattleTooltips {
zMove = this.battle.dex.moves.get(BattleTooltips.zMoveTable['Rock']); zMove = this.battle.dex.moves.get(BattleTooltips.zMoveTable['Rock']);
break; break;
case 'hail': case 'hail':
case 'snow': case 'snowscape':
zMove = this.battle.dex.moves.get(BattleTooltips.zMoveTable['Ice']); zMove = this.battle.dex.moves.get(BattleTooltips.zMoveTable['Ice']);
break; break;
} }
@ -1116,13 +1116,13 @@ export class BattleTooltips {
if (this.battle.gen >= 4 && this.pokemonHasType(pokemon, 'Rock') && weather === 'sandstorm') { if (this.battle.gen >= 4 && this.pokemonHasType(pokemon, 'Rock') && weather === 'sandstorm') {
stats.spd = Math.floor(stats.spd * 1.5); stats.spd = Math.floor(stats.spd * 1.5);
} }
if (this.pokemonHasType(pokemon, 'Ice') && weather === 'snow') { if (this.pokemonHasType(pokemon, 'Ice') && weather === 'snowscape') {
stats.def = Math.floor(stats.def * 1.5); stats.def = Math.floor(stats.def * 1.5);
} }
if (ability === 'sandrush' && weather === 'sandstorm') { if (ability === 'sandrush' && weather === 'sandstorm') {
speedModifiers.push(2); speedModifiers.push(2);
} }
if (ability === 'slushrush' && (weather === 'hail' || weather === 'snow')) { if (ability === 'slushrush' && (weather === 'hail' || weather === 'snowscape')) {
speedModifiers.push(2); speedModifiers.push(2);
} }
if (item !== 'utilityumbrella') { if (item !== 'utilityumbrella') {
@ -1275,7 +1275,7 @@ export class BattleTooltips {
if (ability === 'misspelled') { if (ability === 'misspelled') {
stats.spa = Math.floor(stats.spa * 1.5); stats.spa = Math.floor(stats.spa * 1.5);
} }
if (ability === 'fortifyingfrost' && weather === 'snow') { if (ability === 'fortifyingfrost' && weather === 'snowscape') {
stats.spa = Math.floor(stats.spa * 1.5); stats.spa = Math.floor(stats.spa * 1.5);
stats.spd = Math.floor(stats.spd * 1.5); stats.spd = Math.floor(stats.spd * 1.5);
} }
@ -1295,7 +1295,7 @@ export class BattleTooltips {
stats.def *= 2; stats.def *= 2;
} }
if (ability === 'climatechange') { if (ability === 'climatechange') {
if (weather === 'snow') { if (weather === 'snowscape') {
stats.def = Math.floor(stats.def * 1.5); stats.def = Math.floor(stats.def * 1.5);
stats.spd = Math.floor(stats.spd * 1.5); stats.spd = Math.floor(stats.spd * 1.5);
} }
@ -1564,7 +1564,7 @@ export class BattleTooltips {
moveType = 'Rock'; moveType = 'Rock';
break; break;
case 'hail': case 'hail':
case 'snow': case 'snowscape':
moveType = 'Ice'; moveType = 'Ice';
break; break;
} }