stuff and things

server/models/game.js

@@ -8,10 +8,10 @@
  */
 
 import WebSocket from "ws";
-import { Character } from "./character";
-import { ItemTemplate } from "./item";
+import { Character } from "./character.js";
+import { ItemTemplate } from "./item.js";
 
-class Game{
+export class Game{
 
     /** @type {Map<string,ItemTemplate>} List of all item templates in the game */
     _itemTemplates = new Map();
@@ -28,14 +28,10 @@ class Game{
     _characters = new Map();
 
     /**
+     * All players ever registered, mapped by name => player.
+     *
      * @protected
      * @type {Map<string,Player>} Map of users in the game username->Player
      */
-    _playersByName = new Map();
-
-    /**
-     * @protected
-     * @type {Map<WebSocket,Player>} Map of users in the game username->Player
-     */
-    _playersBySocket = new Map();
+    _players = new Map(); get players() { return this._players; }
 }

server/models/item.js

@@ -1,4 +1,4 @@
-import { cleanIdentifier } from "../utils/helpers";
+import { cleanName } from "../utils/id.js";
 
 /**
  * Item templates are the built-in basic items of the game.
@@ -56,7 +56,7 @@ export class ItemTemplate {
             throw new Error("itemSlots must be a finite number!");
         }
         if (typeof id === "undefined") {
-            id = cleanIdentifier(name);
+            id = cleanName(name);
         }
         if (typeof id !== "string") {
             throw new Error("id must be a string!");