Items and inventory

Lobby/lobbyMessageData.ts

@@ -1,6 +0,0 @@
-export class lobbyMessageData{
-    Id: number;
-    User: string;
-    Timestamp: string;
-    Content: string;
-}

Lobby/lobbySocket.ts

@@ -1,16 +1,38 @@
-import { playerData } from "../Player/playerData"
+import { lobbyMessage } from "../Classes/lobbyMessage";
+import { playerData } from "../Classes/playerData"
+import { playerInventory } from "../Classes/playerInventory";
+import { userData } from "../Classes/userData";
 import { game } from "../game";
 
 export function registerLobbyCallbacks(socket){
-    socket.on('lobby/playerUpdate', (data) => {
-        if(!socket.hasOwnProperty("userId")) return;
+    socket.on('lobby/playerJoin', (data) => {
+        if(!socket.hasOwnProperty("user")) return;
 
         let buff = Buffer.from(data, 'base64');
         let data1 : playerData = JSON.parse(buff.toString('utf-8'));
-        data1.socketId = socket.id;
+
+        if(socket.user.playerData == null){
+            let pd = new playerData()
+            socket.user.playerData = pd
+        }
+
+        socket.user.playerData.characterId = data1.characterId;
+        socket.user.playerData.socketId = socket.id
+
+        game.lobbyState.players.push(socket.user.playerData)
+        game.socketIO.emit("lobby/playerJoin", JSON.stringify(socket.user.playerData))
+    });
+
+    socket.on('lobby/playerUpdate', (data) => {
+        if(!socket.hasOwnProperty("user")) return;
+
+        let buff = Buffer.from(data, 'base64');
+        let data1 : playerData = JSON.parse(buff.toString('utf-8'));
+        data1.socketId = socket.id
 
         let idx = game.lobbyState.players.findIndex((pl) => pl.socketId == socket.id)
         if(idx == -1){
+            socket.player = data1
             game.lobbyState.players.push(data1)
             socket.emit('lobby/messages', JSON.stringify(game.messages))
         }
@@ -20,7 +42,7 @@ export function registerLobbyCallbacks(socket){
     });
 
     socket.on('lobby/lobbyUpdate', (data) => {
-        if(!socket.hasOwnProperty("userId")) return;
+        if(!socket.hasOwnProperty("user")) return;
 
         let buff = Buffer.from(data, 'base64');
         let data1 = JSON.parse(buff.toString('utf-8'));
@@ -28,18 +50,25 @@ export function registerLobbyCallbacks(socket){
         game.lobbyState.objects = data1.objects
     });
 
-    socket.on('lobby/message', (data) => {
-        if(!socket.hasOwnProperty("userId")) return;
+    socket.on('lobby/loadoutChanged', (data) => {
+        if(!socket.hasOwnProperty("user")) return;
 
         let buff = Buffer.from(data, 'base64');
-        data = JSON.parse(buff.toString('utf-8'));
-        data.timestamp = new Date().toLocaleString();
+        let data1 : playerData = JSON.parse(buff.toString('utf-8'));
 
-        while(game.messages.length >= 20){
-            game.messages.pop();
-        }
+        socket.user.playerData.inventory = data1.inventory
+        playerInventory.validate(socket.user.playerData.inventory)
 
-        game.messages.unshift(data)
-        socket.io.emit('lobby/messages', JSON.stringify(game.messages))
+        game.socketIO.emit("lobby/loadoutChanged", JSON.stringify(socket.user.playerData))
+    });
+
+    socket.on('lobby/message', (data) => {
+        if(!socket.hasOwnProperty("user")) return;
+
+        let buff = Buffer.from(data, 'base64');
+        let data1 : lobbyMessage = JSON.parse(buff.toString('utf-8'));
+        data1.timestamp = new Date().toLocaleString();
+
+        game.addMessage(data1)
     });
 }

Lobby/lobbyState.ts

@@ -1,8 +0,0 @@
-import { physicsObject } from "../Classes/physicsObject";
-import { playerData } from "../Player/playerData";
-
-export class lobbyState{
-    hostSocket : string
-    players : playerData[] = [];
-    objects : physicsObject[] = [];
-}