Refactor server game objects

vzhou842 · May 2, 2019 · ab9c86f · ab9c86f
1 parent c12ca7f
commit ab9c86f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/src/server/bullet.js b/src/server/bullet.js
@@ -4,23 +4,14 @@ const Constants = require('../shared/constants');
 
 class Bullet extends ObjectClass {
   constructor(parentID, x, y, dir) {
-    super(x, y, dir, Constants.BULLET_SPEED);
-    this.id = shortid();
+    super(shortid(), x, y, dir, Constants.BULLET_SPEED);
     this.parentID = parentID;
   }
 
   // Returns true if the bullet should be destroyed
   update(dt) {
     super.update(dt);
-    return (this.x < 0 || this.x > Constants.MAP_SIZE || this.y < 0 || this.y > Constants.MAP_SIZE);
-  }
-
-  serializeForUpdate() {
-    return {
-      id: this.id,
-      x: this.x,
-      y: this.y,
-    };
+    return this.x < 0 || this.x > Constants.MAP_SIZE || this.y < 0 || this.y > Constants.MAP_SIZE;
   }
 }
 

diff --git a/src/server/object.js b/src/server/object.js
@@ -1,5 +1,6 @@
 class Object {
-  constructor(x, y, dir, speed) {
+  constructor(id, x, y, dir, speed) {
+    this.id = id;
     this.x = x;
     this.y = y;
     this.direction = dir;
@@ -23,9 +24,9 @@ class Object {
 
   serializeForUpdate() {
     return {
+      id: this.id,
       x: this.x,
       y: this.y,
-      direction: this.direction,
     };
   }
 }

diff --git a/src/server/player.js b/src/server/player.js
@@ -4,8 +4,7 @@ const Constants = require('../shared/constants');
 
 class Player extends ObjectClass {
   constructor(id, username, x, y) {
-    super(x, y, Math.random() * 2 * Math.PI, Constants.PLAYER_SPEED);
-    this.id = id;
+    super(id, x, y, Math.random() * 2 * Math.PI, Constants.PLAYER_SPEED);
     this.username = username;
     this.hp = Constants.PLAYER_MAX_HP;
     this.fireCooldown = 0;
@@ -44,7 +43,7 @@ class Player extends ObjectClass {
   serializeForUpdate() {
     return {
       ...(super.serializeForUpdate()),
-      id: this.id,
+      direction: this.direction,
       hp: this.hp,
     };
   }