Fix patterns, add pronouns and rough conversation

Author: mftrhu

data/commands.js

@@ -13,7 +13,7 @@ Commands.push({
 
 //Examine/look at command
 Commands.push({
-  pattern: "^(x|look\\s+at|examine)\\s+(\\w+)$",
+  pattern: "^(x|look\\s+at|examine)\\s+(.+)$",
   execute: function (game, captures) {
     var examined = captures[2];
     var position = Mobs[game.player].position;
@@ -29,12 +29,44 @@ Commands.push({
         return;
       }
     }
+    out("You don't see that here.");
+  }
+});
+
+//Say command
+Commands.push({
+  pattern: "^(say|tell|ask)\\s+(.+)\\s+to\\s+(.+)$",
+  execute: function (game, captures) {
+    var topic = captures[2];
+    var target = captures[3];
+    for (var mob in Mobs) {
+      if (Mobs[mob].position === Mobs[game.player].position && Mobs[mob].keywords.includes(target) && Mobs[mob].conversation) {
+        for (var i = 0; i < Mobs[mob].conversation.length; i++) {
+          var subject = Mobs[mob].conversation[i];
+          if (subject.keywords.includes(topic) && subject.check(game)) {
+            if (!Mobs[mob].topics.includes(subject.name)) {
+              subject.first_time(game);
+            } else {
+              subject.following(game);
+            }
+            return 1;
+          }
+        }
+        out(Pronouns[Mobs[mob].pronoun].subject.capitalizeFirstLetter() + " doesn't seem to know anything about that. You could ask " + Pronouns[Mobs[mob].pronoun].object + " about " + Mobs[mob].conversation.filter(function (item) {
+          return item.check(game);
+        }).map(function (item) {
+          return item.description;
+        }).betterJoin(", ", ", or ") + ".");
+        return 1;
+      }
+    }
+    out("You don't see them here.");
   }
 });
 
 //Get command
 Commands.push({
-  pattern: "^(g|get|take|pick\\s+up)\\s+(\\w+)$",
+  pattern: "^(g|get|take|pick\\s+up)\\s+(.+)$",
   execute: function (game, captures) {
     var taken = captures[2];
     for (var item in Items) {
@@ -55,7 +87,7 @@ Commands.push({
 
 //Drop command
 Commands.push({
-  pattern: "^(drop|leave|throw\\s+away)\\s+(\\w+)$",
+  pattern: "^(drop|leave|throw\\s+away)\\s+(.+)$",
   execute: function (game, captures) {
     var dropped = captures[2];
     for (var item in Items) {
@@ -102,7 +134,7 @@ Commands.push({
 
 //Goto command
 Commands.push({
-  pattern: "^(go\\s+)?((north|n|south|s|east|e|west|w|up|u|down|d)(?!\\w+)|to\\s+(\\w+))$",
+  pattern: "^(go\\s+)?((north|n|south|s|east|e|west|w|up|u|down|d)(?!.+)|to\\s+(.+))$",
   execute: function (game, captures) {
     //Is it a cardinal direction, or are we looking for an adjacent room?
     var cardinal = !captures[4];

data/misc.js

@@ -5,4 +5,25 @@ var DirectionAliases = {
   w: "west",
   u: "up",
   d: "down"
+}
+
+var Pronouns = {
+  you: {
+  	subject: "you",
+  	object: "you",
+  	possessive: "your",
+  	reflexive: "yourself"
+  },
+  it: {
+  	subject: "it",
+  	object: "it",
+  	possessive: "its",
+  	reflexive: "itself"
+  },
+  they: {
+  	subject: "they",
+  	object: "them",
+  	possessive: "theirs",
+  	reflexive: "themselves"
+  }
 }

data/mobs.js

@@ -4,22 +4,51 @@ Mobs.Player = {
   position: "TowerMageQuarters",
   name: "yourself",
   keywords: ["me", "self", "myself"],
+  pronoun: "you",
   short_description: "You are standing here.",
   description: "You are a bit drab in your brown shirt and pants, but not unpleasant to the eye.",
 };
 
 Mobs.WizardFamiliar = {
   position: null,
   name: "wizard's imp",
-  keywords: ["imp", "familiar", "wizard's imp", "wizard's familiar"],
+  keywords: ["imp", "familiar", "master's imp", "master's familiar", "wizard's imp", "wizard's familiar"],
+  pronoun: "it",
   short_description: "The wizard's familiar is here, idly flapping its wings, looking expectantly at you.",
   description: "It's a short, stocky creature, with dark red skin and stubby wings, dressed only in a loincloth.",
   each_turn: function (game) {
     if (game.turns === 5) {
       Mobs.WizardFamiliar.position = Mobs[game.player].position;
       out("The room is filled with the smell of sulphur, and your master's familiar appears in a puff of black smoke.\n\n\"The master wants to speak with you.\", it says in a low, gravelly voice.");
     }
-  }
+  },
+  topics: [],
+  conversation: [
+    {
+      name: "where",
+      description: "where the master is",
+      keywords: ["where", "where is he", "where is the master"],
+      check: always_true,
+      first_time: function (game) {
+        out("\"He's waiting for you in the laboratory, down in the basement.\", it says.");
+      },
+      following: function (game) {
+        out("\"He's in the laboratory, down in the basement.\"");
+      }
+    },
+    {
+      name: "what",
+      description: "what does the master want",
+      keywords: ["what", "what does he want"],
+      check: always_true,
+      first_time: function (game) {
+        out("\"You'll have to ask him yourself.\", it says.");
+      },
+      following: function (game) {
+        out("\"I don't know.\"");
+      }
+    }
+  ]
 }
 
 Mobs.DummyMob = {

index.html

@@ -20,13 +20,13 @@
     </footer>
     <script type="text/javascript" src="dist/zepto.min.js"></script>
     <script type="text/javascript" src="dist/marked.min.js"></script>
+    <script type="text/javascript" src="js/common.js"></script>
     <script type="text/javascript" src="data/commands.js"></script>
     <script type="text/javascript" src="data/items.js"></script>
     <script type="text/javascript" src="data/rooms.js"></script>
     <script type="text/javascript" src="data/mobs.js"></script>
     <script type="text/javascript" src="data/misc.js"></script>
     <script type="text/javascript" src="data/main.js"></script>
-    <script type="text/javascript" src="js/common.js"></script>
     <script type="text/javascript" src="js/main.js"></script>
   </body>
 </html>

index.tmpl

@@ -22,8 +22,9 @@
 </footer>
 <script type="text/javascript">
 @all dist/*
+@all js/common.js
 @all data/*
-@all js/*
+@all js/main.js
 </script>
 </body>
 </html>

js/common.js

@@ -1,3 +1,19 @@
+String.prototype.capitalizeFirstLetter = function() {
+  return this.charAt(0).toUpperCase() + this.slice(1);
+}
+
+Array.prototype.betterJoin = function (middle, last) {
+  var string = "";
+  for (var i = 0; i < this.length - 1; i++) {
+    string += this[i];
+    if (i < this.length - 2) {
+      string += middle;
+    }
+  }
+  string += last + this[this.length-1];
+  return string;
+}
+
 //Appends `text` to the `#story` element, after parsing it with marked, 
 // wrapping it with a tag `box` (defaulting to `<div>` if nothing is 
 // specified).
@@ -64,6 +80,9 @@ function goto (game, room) {
 //No-op function
 function no_op () {}
 
+//Always returns true
+function always_true () { return true; }
+
 //Makes the world tick
 function turn_passes (game) {
   game.turns += 1;

todo.md

@@ -24,4 +24,6 @@
   - [ ] 2016-11-07T22:10 Ground floor
   - [ ] 2016-11-07T22:11 Third floor - Library
 - Items
-- Mobs
+- Mobs
+- [ ] 2016-11-07T23:01 Add scenes
+- [ ] 2016-11-07T23:01 Add hints