Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-02 15:53:11 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add -fail messages for harsh sun, heavy rain, strong winds

Browse Source 
All new messages are from the textdump.

Also, updated the weather table in updateWeather.
This commit is contained in:
ascriptmaster
2014-10-23 11:32:42 -07:00
parent 56fb034517
commit e73b293040
1 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
js/battle.js
View File

@@ -2606,9 +2606,12 @@ function Battle(frame, logFrame, noPreload) {
this.updateWeather = function (weather) {
var weatherNameTable = {
sunnyday: 'Sun',
desolateland: 'Intense Sun',
raindance: 'Rain',
primordialsea: 'Heavy Rain',
sandstorm: 'Sandstorm',
hail: 'Hail'
hail: 'Hail',
deltastream: 'Strong Winds'
};
if (typeof weather === 'undefined') {
@@ -3459,12 +3462,39 @@ function Battle(frame, logFrame, noPreload) {
actions += "But it failed!";
}
break;
case 'sunnyday':
case 'raindance':
case 'sandstorm':
case 'hail':
switch (fromeffect.id) {
case 'desolateland':
actions += "The extremely harsh sunlight was not lessened at all!";
break;
case 'primordialsea':
actions += "There's no relief from this heavy rain!";
break;
case 'deltastream':
actions += "The mysterious air current blows on regardless!";
break;
default:
actions += "But it failed!";
}
break;
case 'unboost':
self.resultAnim(poke, 'Stat drop blocked', 'neutral', animDelay);
actions += "" + poke.getName() + "'s " + (args[3] ? args[3] + " was" : "stats were") + " not lowered!";
break;
default:
actions += "But it failed!";
switch (fromeffect.id) {
case 'desolateland':
actions += "The Water-type attack evaporated in the harsh sunlight!";
break;
case 'primordialsea':
actions += "The Fire-type attack fizzled out in the heavy rain!";
break;
default:
actions += "But it failed!";
}
break;
}
break;
@@ -3776,6 +3806,21 @@ function Battle(frame, logFrame, noPreload) {
case 'mummy':
actions += "" + poke.getName() + "'s Ability became Mummy!";
break;
case 'desolateland':
if (kwargs.fail) {
actions += "[" + poke.getName() + "'s " + ability.name + "] The extremely harsh sunlight was not lessened at all!";
}
break;
case 'primordialsea':
if (kwargs.fail) {
actions += "[" + poke.getName() + "'s " + ability.name + "] There's no relief from this heavy rain!";
}
break;
case 'deltastream':
if (kwargs.fail) {
actions += "[" + poke.getName() + "'s " + ability.name + "] The mysterious air current blows on regardless!";
}
break;
default:
actions += "" + poke.getName() + " acquired " + ability.name + "!";
break;
@@ -4432,6 +4477,10 @@ function Battle(frame, logFrame, noPreload) {
actions += '' + ofpoke.getName() + ' shared its ' + Tools.getItem(args[3]).name + ' with ' + poke.getLowerName();
break;
case 'deltastream':
actions += "The mysterious air current weakened the attack!";
break;
// item activations
case 'custapberry':
case 'quickclaw':