diff --git a/src/overlay-widgets/emote-widget/emotes/emote-interfaces.ts b/src/overlay-widgets/emote-widget/emotes/emote-interfaces.ts index afd4cd6..07e6391 100644 --- a/src/overlay-widgets/emote-widget/emotes/emote-interfaces.ts +++ b/src/overlay-widgets/emote-widget/emotes/emote-interfaces.ts @@ -103,7 +103,6 @@ export abstract class RenderableObject { } } - // default behavior is to move linearly basedo n the velocity calculateNextMoveFrame(dt: number): Vector2 { return new Vector2(this.position.x + this.velocity.x, this.position.y + this.velocity.y); diff --git a/src/overlay-widgets/emote-widget/emotes/firework-emote.ts b/src/overlay-widgets/emote-widget/emotes/firework-emote.ts index 96f6173..102f388 100644 --- a/src/overlay-widgets/emote-widget/emotes/firework-emote.ts +++ b/src/overlay-widgets/emote-widget/emotes/firework-emote.ts @@ -38,7 +38,7 @@ export class FireworkEmote extends RenderableObject { calculateNextMoveFrame(dt: number): Vector2 { this.accelerate(dt); - return new Vector2(this.position.x + this.velocity.x, this.position.y + this.velocity.y); + return super.calculateNextMoveFrame(dt); } modifyOpacity(dt: number): void { diff --git a/src/overlay-widgets/emote-widget/emotes/parabolic-emote.ts b/src/overlay-widgets/emote-widget/emotes/parabolic-emote.ts index 0a2c9e7..9d2c89e 100644 --- a/src/overlay-widgets/emote-widget/emotes/parabolic-emote.ts +++ b/src/overlay-widgets/emote-widget/emotes/parabolic-emote.ts @@ -43,7 +43,7 @@ export class ParabolicEmote extends RenderableObject { calculateNextMoveFrame(dt: number): Vector2 { this.accelerate(dt); - return new Vector2(this.position.x + this.velocity.x, this.position.y + this.velocity.y); + return super.calculateNextMoveFrame(dt); } doUpdate(dt: number): void { diff --git a/src/overlay-widgets/emote-widget/emotes/raining-emote.ts b/src/overlay-widgets/emote-widget/emotes/raining-emote.ts index 8db5ae6..a13d1b9 100644 --- a/src/overlay-widgets/emote-widget/emotes/raining-emote.ts +++ b/src/overlay-widgets/emote-widget/emotes/raining-emote.ts @@ -1,14 +1,6 @@ import { RenderableObject, Vector2 } from './emote-interfaces'; export class RainingEmote extends RenderableObject { - opacity: number = 1; - angularVelocityDegrees: number = 0; - degreesRotation: number = 0; - imageSrc: string[] = []; - htmlElement: JQuery; - position: Vector2 = new Vector2(); - velocity: Vector2 = new Vector2(); - lifespan: number = 0; constructor(size: Vector2, imageSrcs: string[]) { super(); @@ -24,10 +16,6 @@ export class RainingEmote extends RenderableObject { this.translate(position.x, position.y); } - calculateNextMoveFrame(dt: number): Vector2 { - return new Vector2(this.position.x + this.velocity.x, this.position.y + this.velocity.y); - } - doUpdate(dt: number): void { this.lifespan -= dt; if (!this.isHidden()) {