From 842e2707a18354d82dd559d8e2fe37c0fff2ac9f Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Mon, 24 Apr 2023 19:46:02 -0400 Subject: [PATCH] Minor battle animation changes --- public/battle-anims/thief.json | 208 +++++++++--------- .../battle_anims/PRAS- Elemental Punch.png | Bin 9030 -> 5982 bytes src/data/battle-anims.ts | 59 +++-- 3 files changed, 140 insertions(+), 127 deletions(-) diff --git a/public/battle-anims/thief.json b/public/battle-anims/thief.json index acb3c102e..6e6501988 100644 --- a/public/battle-anims/thief.json +++ b/public/battle-anims/thief.json @@ -10,7 +10,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -44,7 +44,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -67,7 +67,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -80,7 +80,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -114,7 +114,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -137,7 +137,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -150,7 +150,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -184,7 +184,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -207,7 +207,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -220,7 +220,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -254,7 +254,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -277,7 +277,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -290,7 +290,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -324,7 +324,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -347,7 +347,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -360,7 +360,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -394,7 +394,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -417,7 +417,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -430,7 +430,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -464,7 +464,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -487,7 +487,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -500,7 +500,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -534,7 +534,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -557,7 +557,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -570,7 +570,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -604,7 +604,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -627,7 +627,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -640,7 +640,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -674,7 +674,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -697,7 +697,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -710,7 +710,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -744,7 +744,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -767,7 +767,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -780,7 +780,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -814,7 +814,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -837,7 +837,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -850,7 +850,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -884,7 +884,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -907,7 +907,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -920,7 +920,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -954,7 +954,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -977,7 +977,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -990,7 +990,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1024,7 +1024,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1047,7 +1047,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -1060,7 +1060,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1094,7 +1094,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1117,7 +1117,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -1130,7 +1130,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1164,7 +1164,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1187,7 +1187,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -1200,7 +1200,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1234,7 +1234,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1257,7 +1257,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -1270,7 +1270,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1293,7 +1293,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 2 }, @@ -1304,7 +1304,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1327,7 +1327,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -1340,7 +1340,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1363,7 +1363,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 2 }, @@ -1374,7 +1374,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1397,7 +1397,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -1410,7 +1410,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1433,7 +1433,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 2 }, @@ -1444,7 +1444,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1467,7 +1467,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -1480,7 +1480,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1503,7 +1503,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 2 }, @@ -1514,7 +1514,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1537,7 +1537,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -1550,7 +1550,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1573,7 +1573,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 2 }, @@ -1584,7 +1584,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1607,7 +1607,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 } @@ -1620,7 +1620,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1643,7 +1643,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 2 }, @@ -1654,7 +1654,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1677,7 +1677,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 }, @@ -1688,7 +1688,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 2, "target": 2, "graphicFrame": 0, @@ -1724,7 +1724,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1747,7 +1747,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 2 }, @@ -1758,7 +1758,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1781,7 +1781,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 }, @@ -1792,7 +1792,7 @@ "zoomY": 150, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 2, "target": 2, "graphicFrame": 0, @@ -1828,7 +1828,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1851,7 +1851,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 2 }, @@ -1862,7 +1862,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1885,7 +1885,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 }, @@ -1896,7 +1896,7 @@ "zoomY": 200, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 2, "target": 2, "graphicFrame": 0, @@ -1932,7 +1932,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -1955,7 +1955,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 2 }, @@ -1966,7 +1966,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -1989,7 +1989,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 }, @@ -2000,7 +2000,7 @@ "zoomY": 200, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 2, "target": 2, "graphicFrame": 0, @@ -2036,7 +2036,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -2059,7 +2059,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 2 }, @@ -2070,7 +2070,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -2093,7 +2093,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 }, @@ -2104,7 +2104,7 @@ "zoomY": 150, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 2, "target": 2, "graphicFrame": 0, @@ -2140,7 +2140,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 0, "graphicFrame": 0, @@ -2163,7 +2163,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 2 }, @@ -2174,7 +2174,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 0, "target": 1, "graphicFrame": 0, @@ -2197,7 +2197,7 @@ 0, 0 ], - "locked": false, + "locked": true, "priority": 1, "focus": 1 }, @@ -2208,7 +2208,7 @@ "zoomY": 100, "angle": 0, "mirror": false, - "visible": false, + "visible": true, "blendType": 2, "target": 2, "graphicFrame": 0, diff --git a/public/images/battle_anims/PRAS- Elemental Punch.png b/public/images/battle_anims/PRAS- Elemental Punch.png index f2b56f301f743276d9935a42eacebe52b2505794..8e811954ffd800858f3c9f347fede3b0bac8fad2 100644 GIT binary patch literal 5982 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 NH?LV3S6y{|@;~8B2F(Bf literal 9030 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 K+Bp|)`u`Uz2Y!|S diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts index a5b83f0c0..446c86ef1 100644 --- a/src/data/battle-anims.ts +++ b/src/data/battle-anims.ts @@ -502,6 +502,8 @@ function loadAnimAssets(scene: BattleScene, anims: AnimConfig[], startLoad?: boo interface GraphicFrameData { x: number, y: number, + scaleX: number, + scaleY: number, angle: number } @@ -534,7 +536,6 @@ export abstract class BattleAnim { const user = !isOppAnim ? this.user : this.target; const target = !isOppAnim ? this.target : this.user; const isReverseCoords = this.isReverseCoords(); - const graphicScale = this.getGraphicScale(); const userInitialX = user.x; const userInitialY = user.y; @@ -549,21 +550,27 @@ export abstract class BattleAnim { if (frame.target !== AnimFrameTarget.GRAPHIC) continue; + const isGlobal = isGlobalGraphic(this.getAnim().graphic, frame.graphicFrame); const xProgress = frame.focus !== AnimFocus.SCREEN ? Math.min(Math.max(frame.x, 0) / 128, 1) : 0; const initialX = targetInitialX; const initialY = targetInitialY; let xOffset = (!isReverseCoords ? (userInitialX - targetInitialX) : (targetInitialX - userInitialX)); let yOffset = (!isReverseCoords ? (userInitialY - targetInitialY) : (targetInitialY - userInitialY)); const ySpriteOffset = ((userHalfHeight * (1 - xProgress)) + (targetHalfHeight * xProgress)) * -1; - if (graphicScale > 1) { - xOffset -= ((scene.game.canvas.width / 6) * (graphicScale - 1)) / 2; - yOffset -= ((scene.game.canvas.height / 6) * (graphicScale - 1)) / 2; + const globalXOffset = !isGlobal ? 0 : -114; + const globalYOffset = 0; + if (isGlobal) { + xOffset -= ((scene.game.canvas.width / 6) * 0.25) / 2; + yOffset -= ((scene.game.canvas.height / 6) * 0.25) / 2; } - const x = initialX + xOffset * (!isReverseCoords ? 1 : -1) + (frame.x * graphicScale) * (!isReverseCoords ? 1 : -1); + const globalScale = !isGlobal ? 1 : 1.25; + const scaleX = globalScale * (frame.zoomX / 100) *(isReverseCoords === frame.mirror ? 1 : -1); + const scaleY = globalScale * (frame.zoomY / 100); + const x = (initialX + xOffset * (!isReverseCoords ? 1 : -1) + (frame.x * globalScale) * (!isReverseCoords ? 1 : -1)); const y = ((initialY + yOffset * (!isReverseCoords || frame.focus === AnimFocus.USER || frame.focus === AnimFocus.SCREEN ? 1 : -1) - + (frame.y * graphicScale) * (!isReverseCoords || (frame.focus !== AnimFocus.USER_TARGET) ? 1 : -1) + ySpriteOffset)); + + (frame.y * globalScale) * (!isReverseCoords || (frame.focus !== AnimFocus.USER_TARGET) ? 1 : -1) + ySpriteOffset)); const angle = -frame.angle * (!isReverseCoords ? 1 : -1); - ret.set(g++, { x: x, y: y, angle: angle }); + ret.set(g++, { x: x + globalXOffset, y: y + globalYOffset, scaleX: scaleX, scaleY: scaleY, angle: angle }); } return ret; @@ -662,13 +669,11 @@ export abstract class BattleAnim { } moveSprite.setFrame(frame.graphicFrame); //console.log(AnimFocus[frame.focus]); - const graphicScale = this.getGraphicScale(); - moveSprite.setPosition(frameData.get(graphicIndex).x, frameData.get(graphicIndex).y); - moveSprite.setAngle(frameData.get(graphicIndex).angle); - const scaleX = graphicScale * (isReverseCoords === frame.mirror ? 1 : -1); - const scaleY = graphicScale; - moveSprite.setScale(scaleX, scaleY); + const graphicFrameData = frameData.get(graphicIndex); + moveSprite.setPosition(graphicFrameData.x, graphicFrameData.y); + moveSprite.setAngle(graphicFrameData.angle); + moveSprite.setScale(graphicFrameData.scaleX, graphicFrameData.scaleY); moveSprite.setAlpha(frame.opacity / 255); moveSprite.setVisible(frame.visible); @@ -783,16 +788,6 @@ export class MoveAnim extends BattleAnim { isReverseCoords(): boolean { return !this.user.isPlayer() === !this.isOppAnim(); } - - getGraphicScale(): number { - switch (this.move) { - case Moves.SEISMIC_TOSS: - case Moves.FISSURE: - return 1.25; - } - - return 1; - } } export class MoveChargeAnim extends MoveAnim { @@ -811,6 +806,24 @@ export class MoveChargeAnim extends MoveAnim { } } +function isGlobalGraphic(graphic: string, graphicFrame: integer): boolean { + switch (graphic) { + case 'PRAS- Fissure': + return true; + case 'PRAS- Seismic Toss': + switch (graphicFrame) { + case 1: + case 2: + case 3: + case 4: + return false; + } + return true; + } + + return false; +} + export function populateAnims() { return; const commonAnimNames = Utils.getEnumKeys(CommonAnim).map(k => k.toLowerCase());