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

Skip past gen backgrounds with modern sprites

Browse Source 
Gen 4 patch before this pull: http://i.imgur.com/lKK4542.png
After: http://i.imgur.com/7mJa8om.png

The past gen backgrounds were never intended to be used with gen 5/6 animated sprites due to formatting with the popup textboxes. Plus it looks weird.

I have also removed bg.jpg as the only background that would appear for gen 5 matches and restored it to the variety of backgrounds that gen 5 matches used prior to gen 6 and custom past gen backgrounds.

Background loading and placement changes

Update battle.js

Update battle.js

Skip past gen backgrounds with modern sprites

Skip past gen backgrounds with modern sprites

Skip past gen backgrounds with modern sprites
This commit is contained in:
Layell
2015-09-14 06:31:17 -04:00
parent e8e3d817e3
commit be571ebb01
1 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
js/battle.js
View File

@@ -955,11 +955,19 @@ var Sprite = (function () {
}
};
Sprite.prototype.animSummon = function (slot, instant) {
this.x = slot * (this.isBackSprite ? -1 : 1) * -50;
this.y = slot * (this.isBackSprite ? -1 : 1) * 10;
this.statbarOffset = 0;
if (!this.isBackSprite) this.statbarOffset = 17 * slot;
if (this.isBackSprite) this.statbarOffset = -7 * slot;
if (!Tools.prefs('nopastgens') && this.battle.gen <= 4 && this.battle.gameType === 'doubles') {
this.x = (slot - 0.52) * (this.isBackSprite ? -1 : 1) * -55;
this.y = (this.isBackSprite ? -1 : 1) + 1;
this.statbarOffset = 0;
if (!this.isBackSprite) this.statbarOffset = 30 * slot;
if (this.isBackSprite) this.statbarOffset = -28 * slot;
} else {
this.x = slot * (this.isBackSprite ? -1 : 1) * -50;
this.y = slot * (this.isBackSprite ? -1 : 1) * 10;
this.statbarOffset = 0;
if (!this.isBackSprite) this.statbarOffset = 17 * slot;
if (this.isBackSprite) this.statbarOffset = -7 * slot;
}
// make sure element is in the right z-order
if (!slot && this.isBackSprite || slot && !this.isBackSprite) {
@@ -1030,11 +1038,19 @@ var Sprite = (function () {
Sprite.prototype.animDragIn = function (slot) {
if (this.battle.fastForward) return this.animSummon(slot, true);
this.x = slot * (this.isBackSprite ? -1 : 1) * -50;
this.y = slot * (this.isBackSprite ? -1 : 1) * 10;
this.statbarOffset = 0;
if (!this.isBackSprite) this.statbarOffset = 17 * slot;
if (this.isBackSprite) this.statbarOffset = -7 * slot;
if (!Tools.prefs('nopastgens') && this.battle.gen <= 4 && this.battle.gameType === 'doubles') {
this.x = (slot - 0.52) * (this.isBackSprite ? -1 : 1) * -55;
this.y = (this.isBackSprite ? -1 : 1) + 1;
this.statbarOffset = 0;
if (!this.isBackSprite) this.statbarOffset = 30 * slot;
if (this.isBackSprite) this.statbarOffset = -28 * slot;
} else {
this.x = slot * (this.isBackSprite ? -1 : 1) * -50;
this.y = slot * (this.isBackSprite ? -1 : 1) * 10;
this.statbarOffset = 0;
if (!this.isBackSprite) this.statbarOffset = 17 * slot;
if (this.isBackSprite) this.statbarOffset = -7 * slot;
}
// make sure element is in the right z-order
if (!slot && this.isBackSprite || slot && !this.isBackSprite) {
@@ -2221,10 +2237,11 @@ var Battle = (function () {
this.gen = 6;
};
Battle.prototype.updateGen = function () {
if (this.gen <= 2) this.backdropImage = 'bg-gen1.png';
else if (this.gen <= 3) this.backdropImage = 'bg-gen3.png';
else if (this.gen <= 4) this.backdropImage = 'bg-gen4.png';
else if (this.gen <= 5) this.backdropImage = 'bg.jpg';
if (!Tools.prefs('nopastgens')) {
if (this.gen <= 2) this.backdropImage = 'bg-gen1.png';
else if (this.gen <= 3) this.backdropImage = 'bg-gen3.png';
else if (this.gen <= 4) this.backdropImage = 'bg-gen4.png';
}
if (this.bgElem) this.bgElem.css('background-image', 'url(' + Tools.resourcePrefix + 'fx/' + this.backdropImage + ')');
};
Battle.prototype.reset = function (dontResetSound) {