Merge branch 'master' of https://github.com/RanvierMUD/core

src/Account.js

@@ -86,7 +86,7 @@ class Account {
    * @param {function} callback after-save callback
    */
   save(callback) {
-    Data.save('account', this.username, this, callback);
+    Data.save('account', this.username, this.serialize(), callback);
   }
 
   /**

src/AreaManager.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const BehaviorManager = require('./BehaviorManager');
+const Area = require('./Area');
+const Room = require('./Room');
 
 /**
  * Stores references to, and handles distribution of, active areas

src/Character.js

@@ -45,7 +45,11 @@ class Character extends Metadatable(EventEmitter) {
 
     // Arbitrary data bundles are free to shove whatever they want in
     // WARNING: values must be JSON.stringify-able
-    this.metadata = data.metadata || {};
+    if (data.metadata) {
+      this.metadata = JSON.parse(JSON.stringify(data.metadata));
+    } else {
+      this.metadata = {};
+    }
   }
 
   /**

src/Logger.js

@@ -59,7 +59,7 @@ class Logger {
       path += logExt;
     }
     console.log("Adding file logging at " + path);
-    winston.add(winston.transports.File, { path, timestamp: true });
+    winston.add(winston.transports.File, { filename: path, timestamp: true });
   }
 
   static deactivateFileLogging() {

src/Metadatable.js

@@ -33,7 +33,7 @@ class extends parentClass {
     let base = this.metadata;
 
     while (parts.length) {
-      let part = parts.pop();
+      let part = parts.shift();
       if (!(part in base)) {
         throw new RangeError(`Metadata path invalid: ${key}`);
       }

src/Npc.js

@@ -6,6 +6,7 @@ const Character = require('./Character');
 const Config = require('./Config');
 const Logger = require('./Logger');
 const Scriptable = require('./Scriptable');
+const CommandQueue = require('./CommandQueue');
 
 /**
  * @property {number} id   Area-relative id (vnum)
@@ -37,6 +38,7 @@ class Npc extends Scriptable(Character) {
     this.keywords = data.keywords;
     this.quests = data.quests || [];
     this.uuid = data.uuid || uuid();
+    this.commandQueue = new CommandQueue();
   }
 
   /**

src/PlayerManager.js

@@ -159,10 +159,6 @@ class PlayerManager extends EventEmitter {
   async saveAll() {
     for (const [ name, player ] of this.players.entries()) {
       await this.save(player);
-      /**
-       * @event Player#save
-       */
-      player.emit('saved', playerCallback);
     }
   }
 
@@ -183,7 +179,7 @@ class PlayerManager extends EventEmitter {
    * @return {Array<Character>}
    */
   getBroadcastTargets() {
-    return this.players;
+    return this.getPlayersAsArray();
   }
 }
 

src/QuestFactory.js

@@ -97,6 +97,11 @@ class QuestFactory {
       player.emit('questComplete', instance);
       player.questTracker.complete(instance.entityReference);
 
+      if (!quest.config.rewards) {
+        player.save();
+        return;
+      }
+
       for (const reward of quest.config.rewards) {
         try {
           const rewardClass = GameState.QuestRewardManager.get(reward.type);

src/QuestTracker.js

@@ -68,7 +68,7 @@ class QuestTracker {
   }
 
   /**
-   * @param {Quest} queset
+   * @param {Quest} quest
    */
   start(quest) {
     const qid = quest.entityReference;