Started on player health sync

Author: 2767mr

src/@types/crosscode/index.d.ts

@@ -64,6 +64,9 @@ declare namespace ig {
         RhombusParticle: ig.EntityType;
         HiddenSkyBlock: ig.EntityType;
         Enemy: ig.EntityType;
+        Effect: ig.EntityType;
+        Particle: ig.EntityType;
+        CopyParticle: ig.EntityType;
     }
     interface TargetableEntity extends Entity {
 

src/connection.ts

@@ -21,7 +21,7 @@ export interface IConnection {
 
     updateEntityPosition(id: number, pos: ig.Vector3): void;
     updateEntityAnimation(id: number, face: ig.Vector2, anim: string): void;
-    updateEntityHealth(id: number, health: number): void;
+    updateEntityHealth(id: number | null, health: number): void;
     updateEntityState(id: number, state: string): void;
     updateEntityTarget(id: number, target: string | number | null): void;
 
@@ -53,5 +53,5 @@ export interface IConnection {
     onUpdateEntityTarget(callback:
         (id: number, target: string | number | null) => void): void;
     onUpdateEntityHealth(callback:
-        (id: number, health: number) => void): void;
+        (id: number | string, health: number) => void): void;
 }

src/connectors/SocketIOConnector.ts

@@ -132,7 +132,7 @@ export class SocketIoConnector implements IConnection {
     public updateEntityAnimation(id: number, face: ig.Vector2, anim: string): void {
         this.socket.emit('updateEntityAnimation', {id, face, anim});
     }
-    public updateEntityHealth(id: number, health: number): void {
+    public updateEntityHealth(id: number | null, health: number): void {
         this.socket.emit('updateEntityHealth', {id, hp: health});
     }
     public updateEntityState(id: number, state: string): void {
@@ -205,7 +205,7 @@ export class SocketIoConnector implements IConnection {
             callback(data.id, data.target);
         });
     }
-    public onUpdateEntityHealth(callback: (id: number, health: number) => void): void {
+    public onUpdateEntityHealth(callback: (id: number | string, health: number) => void): void {
         this.socket.on('updateEntityHealth', (data: any) => {
             callback(data.id, data.hp);
         });

src/listeners/connection/onUpdateEntityHealth.ts

@@ -1,3 +1,4 @@
+import { IMultiplayerEntity } from '../../mpEntity';
 import { Multiplayer } from '../../multiplayer';
 
 export class OnUpdateEntityHealthListener {
@@ -9,13 +10,28 @@ export class OnUpdateEntityHealthListener {
         this.main.connection.onUpdateEntityHealth(this.onUpdateEntityHealth.bind(this));
     }
 
-    public onUpdateEntityHealth(id: number, health: number): void {
-        if (!this.main.entities[id]) {
+    public onUpdateEntityHealth(id: number | string, health: number): void {
+        const entity = this.getEntity(id);
+
+        if (!entity) {
             return;
         }
 
         console.log('[multiplayer] Set ' + id + '\'s health to ' + health);
 
-        simplify.setCurrentHp(this.main.entities[id], health);
+        simplify.setCurrentHp(entity, health);
+    }
+
+    private getEntity(id: number | string): IMultiplayerEntity | null {
+        if (typeof id === 'number') {
+            return this.main.entities[id];
+        }
+
+        const player = this.main.players[id];
+        if (player) {
+            return player.entity;
+        }
+
+        return null;
     }
 }

src/listeners/game/onPlayerHealthChange.ts

@@ -0,0 +1,32 @@
+import { IMultiplayerEntity } from '../../mpEntity';
+import { Multiplayer } from '../../multiplayer';
+import { EntityListener } from './entityListener';
+import { PlayerListener } from './playerListener';
+
+export class OnPlayerHealthChangeListener {
+    private last = 0;
+
+    constructor(
+        private main: Multiplayer,
+    ) { }
+
+    public register(playerListener: PlayerListener): void {
+        const instance = this;
+        playerListener.addChild((player: ig.Player) => {
+            instance.onUpdate(player);
+        });
+    }
+
+    public onPlayerHealthChanged(health: number): void {
+        this.main.connection.updateEntityHealth(null, health);
+    }
+
+    private onUpdate(player: ig.Player): void {
+        const health = simplify.getCurrentHp(player);
+
+        if (health !== this.last) {
+            this.onPlayerHealthChanged(health);
+            this.last = health;
+        }
+    }
+}

src/multiplayer.ts

@@ -30,6 +30,7 @@ import { PlayerListener } from './listeners/game/playerListener';
 import { LoadScreenHook } from './loadScreenHook';
 import { IMultiplayerEntity } from './mpEntity';
 import { IPlayer } from './player';
+import { OnPlayerHealthChangeListener } from './listeners/game/onPlayerHealthChange';
 
 export class Multiplayer {
     public futureEntities: IEntityDefinition[] = [];
@@ -43,7 +44,6 @@ export class Multiplayer {
     public entities: IMultiplayerEntity[] = [];
 
     private loadScreen!: () => void;
-    private startGame!: () => void;
     private nextEID = 1;
     private entitySpawnListener!: OnEntitySpawnListener;
     private loadScreenHook = new LoadScreenHook();
@@ -178,8 +178,7 @@ export class Multiplayer {
         // buttons.splice(buttonNumber, 2);
         // buttons[2].a.g.y = 80;
         buttons[buttonNumber][cc.ig.GUI.renameTextButton]('Connect', true);
-        this.startGame = buttons[0][cc.ig.GUI.callbackFunction];
-        this.loadScreen = buttons[2][cc.ig.GUI.callbackFunction];
+        this.loadScreen = buttons[buttonNumber][cc.ig.GUI.callbackFunction];
         buttons[buttonNumber][cc.ig.GUI.callbackFunction] = this.startConnect.bind(this);
     }
 
@@ -192,13 +191,15 @@ export class Multiplayer {
 
         const playerMove = new OnPlayerMoveListener(this);
         const playerAnimation = new OnPlayerAnimationListener(this);
+        const playerHealth = new OnPlayerHealthChangeListener(this);
         const entityMove = new OnEntityMoveListener(this);
         const entityAnimation = new OnEntityAnimationListener(this);
         const entityHealthChange = new OnEntityHealthChangeListener(this);
         const entityTargetChange = new OnEntityTargetChangeListener(this);
 
         playerMove.register(playerListener);
         playerAnimation.register(playerListener);
+        playerHealth.register(playerListener);
         entityMove.register(entityListener);
         entityAnimation.register(entityListener);
         entityHealthChange.register(entityListener);