fix: preserve client loadout on lobby join

src/classes/handler.ts

@@ -136,7 +136,13 @@ export class Handler {
         console.error("Unknown discover type", request.body.bitsToDiscover);
       case DiscoverTypes.INITIAL_LOAD:
         try {
-          const [userSaveGame, serverInfo] = await Promise.all([Handler.getUserSaveGame(id), Handler.getGeneralServerInfo()]);
+          const [userSaveGame, serverInfo] = await Promise.all([Handler.getUserSaveGame(request.body.accountIdToDiscover ?? id), Handler.getGeneralServerInfo()]);
+          // TODO when we actually implement the bitsToDiscoverFlag PROPERLY we should remove this
+          if (request.body.accountIdToDiscover != null) {
+            delete userSaveGame.data.playerSettingsData;
+          }
+          userSaveGame.data.DDT_SpecificLoadoutsBit = userSaveGame.data.DDT_AllLoadoutsBit;
+          // End of the TODO remove in the future block
           return response.send(deepmerge(userSaveGame, serverInfo));
         } catch (e) {
           const str = String(e);
@@ -373,7 +379,7 @@ export class Handler {
 
   /**
    * Get info that's general for the whole server, not of an specific user
-   *  */ 
+   *  */
   static async getGeneralServerInfo(): Promise<Partial<SaveGameResponse>> {
     const collection = db.collection<ServerInfo>(Collections.SERVER_INFO);
     const event = (await collection.findOneAsync({})).currentEvent;

src/types/save-game.ts

@@ -11,6 +11,7 @@ interface SaveData {
   DDT_AllPlayerSlotsBit?: DDTAllPlayerSlotsBit;
   /**Character-related info */
   DDT_AllLoadoutsBit?: DDTAllLoadoutsBit;
+  DDT_SpecificLoadoutsBit?: Partial<DDTAllLoadoutsBit>;
   DDT_AllWeaponsBit?: DDTAllWeaponsBit;
   DDT_AllInventoryItemsBit?: DDTAllInventoryItemsBit[];
   DDT_AllUnclaimedChestsBit?: any[];

src/types/vhs-the-game-types.ts

@@ -76,8 +76,10 @@ export interface LoginData {
 }
 
 export interface DiscoverRequest {
+  /** Account ID we need to get info from. Empty if the logged user one */
+  accountIdToDiscover?: string;
   /** Some kind of ID to know what information we're requesting */
-  bitsToDiscover?: DiscoverTypes;
+  bitsToDiscover: DiscoverTypes;
   /** ID-like, not the same as the LoginRequest, not the same across requests (nonce?) */
   idpk?: string;
   journeyGuid?: string;