Twemoji Svelte

front/src/Phaser/Entity/Character.ts

@@ -291,48 +291,48 @@ export abstract class Character extends Container {
 
     playEmote(emote: string) {
         this.cancelPreviousEmote();
-
-        const scalingFactor = waScaleManager.uiScalingFactor;
-        const emoteY = -60;
-
+        const emoteY = -45;
         this.playerName.setVisible(false);
-        this.emote = new Text(this.scene, -12, 0, emote, { fontFamily: '"twemoji"', fontSize: '24px' });
+        this.emote = new Text(this.scene, -10, 0, emote, { fontFamily: '"twemoji"', fontSize: '20px' });
         this.emote.setAlpha(0);
         this.add(this.emote);
-        this.createStartTransition(scalingFactor, emoteY);
+        this.createStartTransition(emoteY);
     }
 
-    private createStartTransition(scalingFactor: number, emoteY: number) {
-        this.emoteTween = this.scene?.tweens.add({
-            targets: this.emote,
-            props: {
-                scale: scalingFactor,
-                alpha: 1,
-                y: emoteY,
-            },
-            ease: "Power2",
-            duration: 500,
-            onComplete: () => {
-                this.startPulseTransition(emoteY, scalingFactor);
-            },
-        });
+    private createStartTransition(emoteY: number) {
+        if (this.emote) {
+            this.emoteTween = this.scene?.tweens.add({
+                targets: this.emote,
+                props: {
+                    alpha: 1,
+                    y: emoteY,
+                },
+                ease: "Power2",
+                duration: 500,
+                onComplete: () => {
+                    this.startPulseTransition(emoteY);
+                },
+            });
+        }
     }
 
-    private startPulseTransition(emoteY: number, scalingFactor: number) {
-        this.emoteTween = this.scene?.tweens.add({
-            targets: this.emote,
-            props: {
-                y: emoteY * 1.3,
-                scale: scalingFactor * 1.1,
-            },
-            duration: 250,
-            yoyo: true,
-            repeat: 1,
-            completeDelay: 200,
-            onComplete: () => {
-                this.startExitTransition(emoteY);
-            },
-        });
+    private startPulseTransition(emoteY: number) {
+        if (this.emote) {
+            this.emoteTween = this.scene?.tweens.add({
+                targets: this.emote,
+                props: {
+                    y: emoteY * 1.3,
+                    scale: this.emote.scale * 1.1,
+                },
+                duration: 250,
+                yoyo: true,
+                repeat: 1,
+                completeDelay: 200,
+                onComplete: () => {
+                    this.startExitTransition(emoteY);
+                },
+            });
+        }
     }
 
     private startExitTransition(emoteY: number) {