Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-04-24 23:30:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove weather ability-start messages

Browse Source 
These _are_ real messages from Gen 3, but since it's not like we
otherwise accurately simulate Gen 3 messages, it's a bit weird to
keep these around.
This commit is contained in:
Guangcong Luo 2018-11-14 18:51:44 -06:00
parent aa2eecb7cc
commit 7d619fb8ea
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/text.js
View File

@ -205,7 +205,6 @@ var BattleText = exports.BattleText = {
sandstorm: {
weatherName: "Sandstorm",
start: " A sandstorm kicked up!",
startFromAbility: " [POKEMON]'s Sand Stream whipped up a sandstorm!",
end: " The sandstorm subsided.",
activate: " The sandstorm is raging.",
damage: " [POKEMON] is buffeted by the sandstorm!",
@ -213,21 +212,18 @@ var BattleText = exports.BattleText = {
sunnyday: {
weatherName: "Sun",
start: " The sunlight turned harsh!",
startFromAbility: " [POKEMON]'s Drought intensified the sun's rays!",
end: " The sunlight faded.",
activate: " (The sunlight is strong!)",
},
raindance: {
weatherName: "Rain",
start: " It started to rain!",
startFromAbility: " [POKEMON]'s Drizzle made it rain!",
end: " The rain stopped.",
activate: " (Rain continues to fall!)",
},
hail: {
weatherName: "Hail",
start: " It started to hail!",
startFromAbility: " [POKEMON]'s Snow Warning whipped up a hailstorm!",
end: " The hail stopped.",
activate: " The hail is crashing down.",
damage: " [POKEMON] is buffeted by the hail!",

9
src/battle-text-parser.ts
View File

@ -536,18 +536,15 @@ class BattleTextParser {
case '-weather': {
const [, weather] = args;
const line1 = this.maybeAbility(kwArgs.from, kwArgs.of);
if (!weather || weather === 'none') {
return this.template('end', kwArgs.from);
}
if (kwArgs.upkeep) {
return this.template('activate', weather);
}
if (!kwArgs.of) {
return this.template('start', weather);
}
const template = this.template('startFromAbility', weather);
return line1 + template.replace('[POKEMON]', this.pokemon(kwArgs.of));
const line1 = this.maybeAbility(kwArgs.from, kwArgs.of);
const template = this.template('start', weather, 'NODEFAULT');
return line1 + template;
}
case '-fieldstart': case '-fieldactivate': {