April Fool's 2013 ends

This commit is contained in:
Guangcong Luo
2013-04-01 19:08:33 -07:00
parent f1f465abd3
commit bcb357be56
2 changed files with 26 additions and 25 deletions

View File

@@ -2439,25 +2439,26 @@ function Battle(frame, logFrame, noPreload) {
break;
case 'sleeptalk':
default:
if (move.id === 'earthquake') {
self.message(pokemon.getName() + ' used <strong>Fissure</strong>!');
self.message('Just kidding! It was <strong>Earthquake</strong>!');
} else {
self.message(pokemon.getName() + ' used <strong>' + move.name + '</strong>!');
}
// April Fool's 2013
// if (move.id === 'earthquake') {
// self.message(pokemon.getName() + ' used <strong>Fissure</strong>!');
// self.message('Just kidding! It was <strong>Earthquake</strong>!');
// }
self.message(pokemon.getName() + ' used <strong>' + move.name + '</strong>!');
break;
}
if (move.id === 'taunt') {
var quotes = [
"Yo mama so fat, she 4x resists Ice- and Fire-type attacks!",
"Yo mama so ugly, Captivate raises her opponent's Special Attack!",
"Yo mama so dumb, she lowers her Special Attack when she uses Nasty Plot!",
"Yo mama so fat, Smogon switched to Pokemon Showdown because PO had an integer overflow bug when you used Grass Knot against her!",
"Yo mama so dumb, she thought Sylveon would be Light Type!"
];
var quote = quotes[(self.p1.name.charCodeAt(2) + self.p2.name.charCodeAt(2) + self.turn) % quotes.length];
self.message(pokemon.getName() + " said, \"" + quote + "\"");
}
// April Fool's 2013
// if (move.id === 'taunt') {
// var quotes = [
// "Yo mama so fat, she 4x resists Ice- and Fire-type attacks!",
// "Yo mama so ugly, Captivate raises her opponent's Special Attack!",
// "Yo mama so dumb, she lowers her Special Attack when she uses Nasty Plot!",
// "Yo mama so fat, Smogon switched to Pokemon Showdown because PO had an integer overflow bug when you used Grass Knot against her!",
// "Yo mama so dumb, she thought Sylveon would be Light Type!"
// ];
// var quote = quotes[(self.p1.name.charCodeAt(2) + self.p2.name.charCodeAt(2) + self.turn) % quotes.length];
// self.message(pokemon.getName() + " said, \"" + quote + "\"");
// }
}
pokemon.lastmove = move.id;
self.lastmove = move.id;

View File

@@ -669,14 +669,14 @@ var Tools = {
cryurl = Tools.resourcePrefix + 'audio/cries/' + num + '.wav';
}
// april fool's
return {
w: 96,
h: 96,
url: Tools.resourcePrefix + 'sprites/afd'+back+'/' + spriteid + '.png',
cryurl: cryurl,
isBackSprite: isBack
};
// April Fool's 2013
// return {
// w: 96,
// h: 96,
// url: Tools.resourcePrefix + 'sprites/afd'+back+'/' + spriteid + '.png',
// cryurl: cryurl,
// isBackSprite: isBack
// };
if (pokemon.shiny) back += '-shiny';
if (window.BattlePokemonSprites && BattlePokemonSprites[pokemon.speciesid] && BattlePokemonSprites[pokemon.speciesid][facing]) {