add RestartRequest, RestartResponse, fix save character

Author: space2pacman

Database/index.js

@@ -60,10 +60,14 @@ class Database {
     return await this._db.collection('characters').findOne({ login });
   }
 
-  async getCharactersByLogin(login) {
+  async getCharactersByLogin(login) { // fix delete
     return await this._db.collection('characters').find({ login }).toArray();
   }
 
+  async getCharacterByObjectId(objectId) {
+    return await this._db.collection('characters').findOne({ objectId });
+  }
+
   async checkCharacterNameExists(characterName) {
     const character = await this._db.collection('characters').findOne({
       'characterName': {

GameServer/Client.js

@@ -93,9 +93,11 @@ class Client {
 
         break;
       case 9:
-          new clientPackets.Logout(packet, this);
+        new clientPackets.Logout(packet, this);
 
-          break;
+        break;
+      case 70:
+        new clientPackets.RequestRestart(packet, this);
       }
   }
 

GameServer/ClientPackets/Logout.js

@@ -7,14 +7,14 @@ class Logout {
   constructor(packet, client) {
     this._client = client;
     this._data = new ClientPacket(packet);
-    this._data.readC()
+    this._data.readC();
 
     this._init();
   }
 
   async _init() {
     const player = players.getPlayerByClient(this._client);
-    const character = await database.getCharacterByLogin(player.login);
+    const character = await database.getCharacterByObjectId(player.objectId);
 
     character.x = Math.floor(player.x); // fix, update all doc?
     character.y = Math.floor(player.y);

GameServer/ClientPackets/RequestAuthLogin.js

@@ -50,9 +50,9 @@ class RequestAuthLogin {
 
     player.update({
       login: this.login
-    });
+    }); // fix?
 
-    this._client.sendPacket(new serverPackets.CharacterSelectInfo(this.login, characters));
+    this._client.sendPacket(new serverPackets.CharacterSelectInfo(player.login, characters));
   }
 }
 

GameServer/ClientPackets/RequestRestart.js

@@ -0,0 +1,33 @@
+const serverPackets = require('./../ServerPackets/serverPackets');
+const ClientPacket = require("./ClientPacket");
+const database = require('./../../Database');
+const players = require('./../Models/Players');
+
+class RequestRestart {
+  constructor(packet, client) {
+    this._client = client;
+    this._data = new ClientPacket(packet);
+    this._data.readC();
+
+    this._init();
+  }
+
+  async _init() {
+    const player = players.getPlayerByClient(this._client);
+    const character = await database.getCharacterByObjectId(player.objectId);
+
+    character.x = Math.floor(player.x); // fix, update all doc?
+    character.y = Math.floor(player.y);
+    character.z = Math.floor(player.z);
+
+    await database.updateCharacterByObjectId(character.objectId, character);
+
+    const allowRestart = true; // fix
+    const characters = await database.getCharactersByLogin(player.login);
+
+    this._client.sendPacket(new serverPackets.RestartResponse(allowRestart));
+    this._client.sendPacket(new serverPackets.CharacterSelectInfo(player.login, characters));
+  }
+}
+
+module.exports = RequestRestart;

GameServer/ClientPackets/clientPackets.js

@@ -10,6 +10,7 @@ const MoveBackwardToLocation = require('./MoveBackwardToLocation');
 const Action = require('./Action');
 const RequestAttack = require('./RequestAttack');
 const Logout = require('./Logout');
+const RequestRestart = require('./RequestRestart');
 
 module.exports = {
   ProtocolVersion,
@@ -24,4 +25,5 @@ module.exports = {
   Action,
   RequestAttack,
   Logout,
+  RequestRestart,
 }

GameServer/Models/Player.js

@@ -7,6 +7,8 @@ class Player extends Character {
 
     this._client = client;
     this.target = null;
+    // this characterObjectId fix
+    // this getActiveChar ?
   }
 
   getClient() {

GameServer/ServerPackets/RestartResponse.js

@@ -0,0 +1,15 @@
+const ServerPacket = require('./ServerPacket.js'); 
+
+class RestartResponse {
+  constructor(allowRestart) {
+    this._packet = new ServerPacket(5);
+    this._packet.writeC(0x74)
+      .writeD(allowRestart ? 0x01 : 0x00);
+  }
+
+  getBuffer() {
+    return this._packet.getBuffer();
+  }
+}
+
+module.exports = RestartResponse;

GameServer/ServerPackets/serverPackets.js

@@ -20,6 +20,7 @@ const StopRotating = require('./StopRotating');
 const DeleteObject = require('./DeleteObject');
 const StopMove = require('./StopMove');
 const LeaveWorld = require('./LeaveWorld');
+const RestartResponse = require('./RestartResponse');
 
 module.exports = {
   CryptInit,
@@ -44,4 +45,5 @@ module.exports = {
   DeleteObject,
   StopMove,
   LeaveWorld,
+  RestartResponse,
 }