refactor

Lobby/_loadoutChanged.ts

@@ -0,0 +1,16 @@
+import { playerData } from "../Classes/playerData";
+import { game } from "../game";
+
+export function loadoutChanged(socket, data){
+    if(!socket.hasOwnProperty("user")) return;
+
+    let buff = Buffer.from(data, 'base64');
+    let data1 : playerData = JSON.parse(buff.toString('utf-8'));
+
+    let player : playerData = socket.player
+    player.inventory.weapon = data1.inventory.weapon
+    player.inventory.equipment = data1.inventory.equipment
+    player.validateEquipment()
+
+    game.socketIO.emit("lobby/loadoutChanged", JSON.stringify(player))
+}

Lobby/_message.ts

@@ -0,0 +1,12 @@
+import { lobbyMessage } from "../Classes/lobbyMessage";
+import { game } from "../game";
+
+export function message(socket, 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/_playerJoin.ts

@@ -0,0 +1,21 @@
+import { lobbyMessage } from "../Classes/lobbyMessage";
+import { lobbyState } from "../Classes/lobbyState";
+import { playerData } from "../Classes/playerData";
+import { userData } from "../Classes/userData";
+import { game } from "../game";
+
+export function playerJoin(socket, data){
+    if(!socket.hasOwnProperty("user")) return;
+
+    let buff = Buffer.from(data, 'base64');
+    let data1 : playerData = JSON.parse(buff.toString('utf-8'));
+
+    socket.player.characterId = data1.characterId
+    game.lobbyState.addUser(socket.user, socket.player)
+
+    let newLobbyState : lobbyState = Object.assign({}, game.lobbyState);
+    newLobbyState.users = newLobbyState.users.map(u=> userData.makeSafe(u))
+
+    game.socketIO.emit("lobby/playerJoin", JSON.stringify(newLobbyState))
+    game.addMessage(new lobbyMessage(socket.user.login + " joined"))
+}

Lobby/_playerUpdate.ts

@@ -0,0 +1,18 @@
+import { playerData } from "../Classes/playerData";
+
+export function playerUpdate(socket, data){
+    if(!socket.hasOwnProperty("user")) return;
+
+    let buff = Buffer.from(data, 'base64');
+    let data1 : playerData = JSON.parse(buff.toString('utf-8'));
+
+    let player : playerData = socket.player
+    if(player == null){
+        console.log("Error! Player not spawned!")
+    }
+    else{
+        player.room = data1.room
+        player.rigidbody = data1.rigidbody
+        player.damageInfo = player.damageInfo.concat(data1.damageInfo)
+    }
+}

Lobby/lobbySocket.ts

@@ -1,65 +1,22 @@
-import { lobbyMessage } from "../Classes/lobbyMessage";
-import { lobbyState } from "../Classes/lobbyState";
-import { playerData } from "../Classes/playerData"
-import { playerInventory } from "../Classes/playerInventory";
-import { userData } from "../Classes/userData";
-import { game } from "../game";
+import { loadoutChanged } from "./_loadoutChanged";
+import { message } from "./_message";
+import { playerJoin } from "./_playerJoin";
+import { playerUpdate } from "./_playerUpdate";
 
 export function registerLobbyCallbacks(socket){
     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'));
-
-        socket.player.characterId = data1.characterId
-        game.lobbyState.addUser(socket.user, socket.player)
-
-        let newLobbyState : lobbyState = Object.assign({}, game.lobbyState);
-        newLobbyState.users = newLobbyState.users.map(u=> userData.makeSafe(u))
-
-        game.socketIO.emit("lobby/playerJoin", JSON.stringify(newLobbyState))
-        game.addMessage(new lobbyMessage(socket.user.login + " joined"))
+        playerJoin(socket, data)
     });
 
     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'));
-
-        let player : playerData = socket.player
-        if(player == null){
-            console.log("Error! Player not spawned!")
-        }
-        else{
-            player.room = data1.room
-            player.rigidbody = data1.rigidbody
-            player.damageInfo = player.damageInfo.concat(data1.damageInfo)
-        }
+        playerUpdate(socket, data)
     });
 
     socket.on('lobby/loadoutChanged', (data) => {
-        if(!socket.hasOwnProperty("user")) return;
-
-        let buff = Buffer.from(data, 'base64');
-        let data1 : playerData = JSON.parse(buff.toString('utf-8'));
-
-        let player : playerData = socket.player
-        player.inventory.weapon = data1.inventory.weapon
-        player.inventory.equipment = data1.inventory.equipment
-        player.validateEquipment()
-
-        game.socketIO.emit("lobby/loadoutChanged", JSON.stringify(player))
+        loadoutChanged(socket, data)
     });
 
     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)
+        message(socket, data)
     });
 }