From 2d487c6024e538434df5612cafbf0bff71e492f8 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Fri, 9 Mar 2018 23:10:00 -0500
Subject: [PATCH] Redid dialog so it shows text before calling hooks. Added a
 phone!

---
 dialog.js  | 35 ++++++++++++++++++++++++++++++-----
 feast.js   | 18 ++++++++++--------
 objects.js |  2 +-
 world.js   | 21 ++++++++++++++++++++-
 4 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/dialog.js b/dialog.js
index 8edb63f..6459da0 100644
--- a/dialog.js
+++ b/dialog.js
@@ -7,14 +7,13 @@ function DialogNode() {
   this.visit = function() {
     for (let i=0; i<this.hooks.length; i++)
       this.hooks[i]();
-    return this.text;
-  }
+  };
 
   this.choices = [];
 
-  this.addChoice = function(text,node) {
-    this.choices.push({"text": text, "node": node});
-  }
+  this.addChoice = function(text,node,tests=[]) {
+    this.choices.push({"text": text, "node": node, "tests": []});
+  };
 }
 
 function EatDude() {
@@ -35,3 +34,29 @@ function EatDude() {
   this.addChoice("Eat him lol",eatHim);
   this.addChoice("Actually don't",dontEatHim);
 }
+
+function PhoneCall() {
+  DialogNode.call(this);
+
+  this.text = "You pick up the phone. Who do you want to call?";
+
+  {
+    let nodeFen = new DialogNode();
+    this.addChoice("Fen",nodeFen);
+    nodeFen.text = "You dial Fen's number. Milliseconds later, he kicks open your front door and dabs on you, then runs away.";
+  }
+
+  {
+    let nodeNerd = new DialogNode();
+    this.addChoice("Some nerd",nodeNerd);
+    nodeNerd.text = "You dial some nerd. He shows up at your front door.";
+    nodeNerd.hooks.push(function() { startDialog(new EatDude()); });
+  }
+
+  {
+    let nodeCrash = new DialogNode();
+    this.addChoice("Crash the game",nodeCrash);
+    nodeCrash.text = "Oh no oops";
+    nodeCrash.hooks.push(function() { potato() });
+  }
+}
diff --git a/feast.js b/feast.js
index 538ff9c..718c7a0 100644
--- a/feast.js
+++ b/feast.js
@@ -11,13 +11,6 @@ let newline = "&nbsp;";
 
 let player = new Player();
 
-function startDialog(dialog) {
-  mode = "dialog";
-  currentDialog = dialog;
-  update([currentDialog.visit()]);
-  updateDisplay();
-}
-
 function updateExploreCompass() {
   for (let i = 0; i < dirButtons.length; i++) {
     let button = dirButtons[i];
@@ -168,9 +161,18 @@ function update(lines=[]) {
   updateDisplay();
 }
 
+function startDialog(dialog) {
+  mode = "dialog";
+  currentDialog = dialog;
+  update([currentDialog.text]);
+  currentDialog.visit();
+  updateDisplay();
+}
+
 function dialogClicked(index) {
   currentDialog = currentDialog.choices[index].node;
-  update([currentDialog.visit()]);
+  update([currentDialog.text]);
+  currentDialog.visit();
   if (currentDialog.choices.length == 0) {
     mode = "explore";
     updateDisplay();
diff --git a/objects.js b/objects.js
index 836d661..19fd2df 100644
--- a/objects.js
+++ b/objects.js
@@ -47,7 +47,7 @@ function TV() {
 function Phone() {
   Object.call(this, "Phone");
   this.actions.push({
-    "name": "Headbutt phone",
+    "name": "Use phone",
     "action": function() {
       startDialog(new PhoneCall());
     }
diff --git a/world.js b/world.js
index 15a86a7..0f68a22 100644
--- a/world.js
+++ b/world.js
@@ -97,13 +97,32 @@ let locationsSrc = [
         "name": "Street",
         "dir": EAST,
         "desc": "You hurry back into the open street."
+      },
+      {
+        "name": "Seedy Bar",
+        "dir": NORTH,
+        "desc": "You step into the bar."
+      }
+    ],
+    "objs": [
+
+    ]
+  },
+  {
+    "name": "Seedy Bar",
+    "desc": "God this place is seedy",
+    "conn": [
+      {
+        "name": "Alley",
+        "dir": SOUTH,
+        "desc": "You step out of the bar."
       }
     ],
     "objs": [
 
     ]
   }
-]
+];
 
 function Location(name="Nowhere",desc="Nada") {
   this.name = name;