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

FFA: Move p3 and p4's side conditions (#1941)

Browse Source
This commit is contained in:
pyuk-bot
2022-02-16 16:45:12 -06:00
committed by GitHub
parent 0f57bf9ef0
commit dedfb9fa45
1 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/battle-animations.ts
View File

@@ -1085,12 +1085,22 @@ export class BattleScene implements BattleSceneStub {
if (!this.animating) return;
const side = this.battle.sides[siden];
const spriteIndex = +side.isFar;
let x = side.x;
let y = side.y;
if (this.battle.gameType === 'freeforall') {
x += side.isFar ? 20 : -20;
if (side.n > 1) {
x += (side.isFar ? -140 : 140);
y += side.isFar ? 14 : -20;
}
}
switch (id) {
case 'auroraveil':
const auroraveil = new Sprite(BattleEffects.auroraveil, {
display: 'block',
x: side.x,
y: side.y,
x,
y,
z: side.behind(-14),
xscale: 1,
yscale: 0,
@@ -1109,8 +1119,8 @@ export class BattleScene implements BattleSceneStub {
case 'reflect':
const reflect = new Sprite(BattleEffects.reflect, {
display: 'block',
x: side.x,
y: side.y,
x,
y,
z: side.behind(-17),
xscale: 1,
yscale: 0,
@@ -1129,8 +1139,8 @@ export class BattleScene implements BattleSceneStub {
case 'safeguard':
const safeguard = new Sprite(BattleEffects.safeguard, {
display: 'block',
x: side.x,
y: side.y,
x,
y,
z: side.behind(-20),
xscale: 1,
yscale: 0,
@@ -1149,8 +1159,8 @@ export class BattleScene implements BattleSceneStub {
case 'lightscreen':
const lightscreen = new Sprite(BattleEffects.lightscreen, {
display: 'block',
x: side.x,
y: side.y,
x,
y,
z: side.behind(-23),
xscale: 1,
yscale: 0,
@@ -1169,8 +1179,8 @@ export class BattleScene implements BattleSceneStub {
case 'mist':
const mist = new Sprite(BattleEffects.mist, {
display: 'block',
x: side.x,
y: side.y,
x,
y,
z: side.behind(-27),
xscale: 1,
yscale: 0,
@@ -1189,8 +1199,8 @@ export class BattleScene implements BattleSceneStub {
case 'stealthrock':
const rock1 = new Sprite(BattleEffects.rock1, {
display: 'block',
x: side.leftof(-40),
y: side.y - 10,
x: x + side.leftof(-40),
y: y - 10,
z: side.z,
opacity: 0.5,
scale: 0.2,
@@ -1198,8 +1208,8 @@ export class BattleScene implements BattleSceneStub {
const rock2 = new Sprite(BattleEffects.rock2, {
display: 'block',
x: side.leftof(-20),
y: side.y - 40,
x: x + side.leftof(-20),
y: y - 40,
z: side.z,
opacity: 0.5,
scale: 0.2,
@@ -1207,8 +1217,8 @@ export class BattleScene implements BattleSceneStub {
const rock3 = new Sprite(BattleEffects.rock1, {
display: 'block',
x: side.leftof(30),
y: side.y - 20,
x: x + side.leftof(30),
y: y - 20,
z: side.z,
opacity: 0.5,
scale: 0.2,
@@ -1216,8 +1226,8 @@ export class BattleScene implements BattleSceneStub {
const rock4 = new Sprite(BattleEffects.rock2, {
display: 'block',
x: side.leftof(10),
y: side.y - 30,
x: x + side.leftof(10),
y: y - 30,
z: side.z,
opacity: 0.5,
scale: 0.2,
@@ -1232,24 +1242,24 @@ export class BattleScene implements BattleSceneStub {
case 'gmaxsteelsurge':
const surge1 = new Sprite(BattleEffects.greenmetal1, {
display: 'block',
x: side.leftof(-30),
y: side.y - 20,
x: x + side.leftof(-30),
y: y - 20,
z: side.z,
opacity: 0.5,
scale: 0.8,
}, this);
const surge2 = new Sprite(BattleEffects.greenmetal2, {
display: 'block',
x: side.leftof(35),
y: side.y - 15,
x: x + side.leftof(35),
y: y - 15,
z: side.z,
opacity: 0.5,
scale: 0.8,
}, this);
const surge3 = new Sprite(BattleEffects.greenmetal1, {
display: 'block',
x: side.leftof(50),
y: side.y - 10,
x: x + side.leftof(50),
y: y - 10,
z: side.z,
opacity: 0.5,
scale: 0.8,
@@ -1270,8 +1280,8 @@ export class BattleScene implements BattleSceneStub {
if (spikeArray.length < 1 && levels >= 1) {
const spike1 = new Sprite(BattleEffects.caltrop, {
display: 'block',
x: side.x - 25,
y: side.y - 40,
x: x - 25,
y: y - 40,
z: side.z,
scale: 0.3,
}, this);
@@ -1281,8 +1291,8 @@ export class BattleScene implements BattleSceneStub {
if (spikeArray.length < 2 && levels >= 2) {
const spike2 = new Sprite(BattleEffects.caltrop, {
display: 'block',
x: side.x + 30,
y: side.y - 45,
x: x + 30,
y: y - 45,
z: side.z,
scale: .3,
}, this);
@@ -1292,8 +1302,8 @@ export class BattleScene implements BattleSceneStub {
if (spikeArray.length < 3 && levels >= 3) {
const spike3 = new Sprite(BattleEffects.caltrop, {
display: 'block',
x: side.x + 50,
y: side.y - 40,
x: x + 50,
y: y - 40,
z: side.z,
scale: .3,
}, this);
@@ -1311,8 +1321,8 @@ export class BattleScene implements BattleSceneStub {
if (tspikeArray.length < 1 && tspikeLevels >= 1) {
const tspike1 = new Sprite(BattleEffects.poisoncaltrop, {
display: 'block',
x: side.x + 5,
y: side.y - 40,
x: x + 5,
y: y - 40,
z: side.z,
scale: 0.3,
}, this);
@@ -1322,8 +1332,8 @@ export class BattleScene implements BattleSceneStub {
if (tspikeArray.length < 2 && tspikeLevels >= 2) {
const tspike2 = new Sprite(BattleEffects.poisoncaltrop, {
display: 'block',
x: side.x - 15,
y: side.y - 35,
x: x - 15,
y: y - 35,
z: side.z,
scale: .3,
}, this);
@@ -1334,8 +1344,8 @@ export class BattleScene implements BattleSceneStub {
case 'stickyweb':
const web = new Sprite(BattleEffects.web, {
display: 'block',
x: side.x + 15,
y: side.y - 35,
x: x + 15,
y: y - 35,
z: side.z,
opacity: 0.4,
scale: 0.7,