EditorConfig + eslint fixes

Author: raydog

.editorconfig

@@ -1,12 +1,16 @@
 root = true
 
-# Unix-style newlines with a newline ending every file
 [*]
 charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 
-[*.js,*.json]
+[*.js]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.json]
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true

.eslintrc.yml

@@ -7,6 +7,10 @@ rules:
     - error
     - 2
     - SwitchCase: 1
+  no-multiple-empty-lines:
+    - error
+    - max: 2
+      maxEOF: 1
   linebreak-style:
     - error
     - unix

lib/advent350/index.js

@@ -2,9 +2,9 @@
 
 /**
  * This file is a reimplementation of the game written at:
- * 
+ *
  * https://github.com/Quuxplusone/Advent/blob/master/POHL0350/
- * 
+ *
  * Basically, it's the 350-point version of the Colossal Cave Adventure as
  * written by Jerry Pohl in 1984. (And of course based on the game created by
  * Will Crowther, and then extended by Don Woods.) It's mostly faithful to the
@@ -31,11 +31,11 @@ const STRINGS = _.assign({},
 
 const MAXOBJ   = 100;  // max # of objects in cave
 // const MAXWC    = 301;  // max # of adventure words
-const MAXLOC   = 145;  // max # of cave locations 
+const MAXLOC   = 145;  // max # of cave locations
 // const WORDSIZE = 20;   // max # of chars in commands
 // const MAXMSG   = 201;  // max # of action messages
 
-// const MAXTRAV  = 16+1; // max # of travel directions from loc 
+// const MAXTRAV  = 16+1; // max # of travel directions from loc
 const DWARFMAX = 7;    // max # of nasty dwarves
 const MAXDIE   = 3;    // max # of deaths before close
 const MAXTRS   = 79;   // max # of treasures in cave
@@ -518,7 +518,7 @@ GameState.prototype._handleDwarves = function () {
 
 GameState.prototype._handleMovement = function () {
   if (this.loc === this.newloc) { return; }
-  
+
   this.turns ++;
   this.loc = this.newloc;
 
@@ -544,7 +544,7 @@ GameState.prototype._handleDescription = function () {
   var desc;
 
   if (gu.toting(this, DEF.obj.BEAR)) { this._rspeak(141); }
-  
+
   const is_dark = gu.dark(this);
   if (is_dark) {
     this._rspeak(16);
@@ -564,7 +564,7 @@ GameState.prototype._handleDescription = function () {
 
   // We can see:
   this.visited[this.loc] ++;
-  
+
   for (var i=1; i<MAXOBJ; i++) {
     if (gu.at(this, i)) {
       if (i === DEF.obj.STEPS && gu.toting(this, DEF.obj.NUGGET)) {
@@ -582,7 +582,7 @@ GameState.prototype._handleDescription = function () {
       var is_steps = i === DEF.obj.STEPS;
       var steps_here = this.loc === this.fixed[DEF.obj.STEPS];
       var state = (is_steps && steps_here) ? 1 : this.prop[i];
-      
+
       this._pspeak(i, state);
     }
   }
@@ -649,11 +649,11 @@ GameState.prototype._parseEnglish = function (msg) {
   if (w1.type === 3 && w2.type === 3 && w1.val === 51 && w2.val === 51) {
     console.log("-- outwords()");
     return 0;
-  
+
   } else if (w1.type === 3) {
     this._rspeak(w1.val);
     return 0;
-  
+
   } else if (w2.type === 3) {
     this._rspeak(w2.val);
     return 0;
@@ -688,7 +688,7 @@ GameState.prototype._parseEnglish = function (msg) {
       this._msg(fail_msg);
       return 0;
     }
-  
+
   } else {
     this._bug(36);
     return 0;

lib/advent350/methods/movement.js

@@ -3,6 +3,8 @@
 const DEF = require('../vars/defs.json');
 const gu = require('../gameUtils');
 
+const MAXOBJ   = 100;  // max # of objects in cave
+
 exports._doMove = function () {
   switch (this.motion) {
     case DEF.verb.NULLX:
@@ -77,7 +79,7 @@ exports._doTravel = function () {
   var travels = gu.travels(this.loc);
   for(var i=0; i<travels.length && !mvflag; i++) {
     cur = travels[i];
-    
+
     var div = Math.floor(cur.tcond / 100);
     var robj = cur.tcond % 100;
 
@@ -100,6 +102,7 @@ exports._doTravel = function () {
         if (gu.toting(this, robj) || gu.at(this, robj)) {
           mvflag ++;
         }
+        break;
       case 3:
       case 4:
       case 5:
@@ -139,7 +142,7 @@ exports._badMove = function () {
 exports._specialMove = function (rdest) {
   switch(rdest - 300) {
     case 1:
-      var hold = this.holding
+      var hold = this.holding;
       if (!hold || (hold === 1 && gu.toting(this, DEF.obj.EMERALD))) {
         this.newloc = 199 - this.loc;
       } else {

lib/advent350/methods/verbs.js

@@ -287,13 +287,13 @@ exports._verbTake = function () {
   }
 
   gu.carry(this, obj);
-  
+
   // Also liquids:
   var i = gu.liq(this);
   if (obj === DEF.obj.BOTTLE && i != 0) {
     this.place[i] = -1;
   }
-  
+
   this._rspeak(54);
 };
 
@@ -560,7 +560,7 @@ exports._intransitiveDrink = function () {
 exports._verbDrink = function () {
   if (this.object !== DEF.obj.WATER) {
     this._rspeak(110);
-  
+
   } else if (gu.liq(this) !== DEF.obj.WATER || !gu.here(this, DEF.obj.BOTTLE)) {
     this._actionSpeak();
 
@@ -605,7 +605,7 @@ exports._verbDrop = function () {
     this._pspeak(DEF.obj.BATTERIES, 0);
     return;
   }
-  
+
   // Bird / Dragon:
   const is_bird = this.object === DEF.obj.BIRD;
   const at_dragon = gu.at(this, DEF.obj.DRAGON);
@@ -744,10 +744,10 @@ exports._verbSay = function () {
 exports._verbOn = function () {
   if (!gu.here(this, DEF.obj.LAMP)) {
     this._actionSpeak();
-  
+
   } else if (this.limit < 0) {
     this._rspeak(184);
-  
+
   } else {
     this.prop[DEF.obj.LAMP] = 1;
     this._rspeak(39);

lib/advent350/vars/actionMessages.json

@@ -34,4 +34,4 @@
     13,
     13
   ]
-}
+}

lib/advent350/vars/defs.json

@@ -100,4 +100,4 @@
     "HINTM": 128,
     "HINT": 240
   }
-}
+}

lib/advent350/vars/travel.json

@@ -1033,4 +1033,4 @@
       "80001000"
     ]
   ]
-}
+}

lib/advent350/vars/vocab.json

@@ -1205,4 +1205,4 @@
       "code": 55
     }
   ]
-}
+}