1 files changed, 65 insertions, 27 deletions

diff --git a/test.stage b/test.stage
index ff159ff..00e7d94 100644
--- a/test.stage
+++ b/test.stage
@@ -7,10 +7,44 @@ game.start = <<start>>;
 
 global
 {
-        command: "eat" object
+        command: "go" dir
         {
-                display(object);
+                if exists(situation.exits) then
+                {
+                        if dir in situation.exits then
+                        {
+                                goto( situation.exits[dir] );
+                        }
+                }
+                display('''You're not really sure how to do that...''');
+        }
+
+        command: "exits"
+        {
+                if exists(situation.exits) then
+                {
+                        out = "Obvious exits are: ";
+                        bFirst = true;
+                        for each dir : dest in situation.exits do
+                        {
+                                if bFirst then
+                                {
+                                        bFirst = false;
+                                }
+                                else
+                                {
+                                        out += ", ";
+                                }
+                                out += dir;
+                        }
+                        display( out );
+                }
+                else
+                {
+                        display("There are no obvious exits.");
+                }
         }
+
         // You should always have a global exit, quit, escape, something for
         // dev-testing at least.
         command: "exit"
@@ -50,54 +84,58 @@ function getThing()
 
 situation <<start>>
 {
-        command: "go" "home"
+        setup
         {
-                display("Home would be nice...");
+                goto( <<diningRoom>> );
         }
 
-        command: "go" elsewhere
+        enter
         {
-                display("You don't know how to go " + elsewhere );
         }
+}
+
+situation <<diningRoom>>
+{
         setup
         {
-                stuff = {"things": 55, 112: "Bob"};
-                display( stuff );
-                display( 113 - 1 in stuff );
-                exit();
+                situation.exits = {
+                        'south': <<livingRoom>>,
+                        'east': <<kitchen>>
+                };
         }
-
         enter
         {
-                display('''This is the enter part of the start situation''');
+                display('''You are in the dining room, it's very nice and warm.  There
+                is a big table and...stuff.  Looks like the living room is south, and
+                the kitchen is to the east.''');
         }
 }
 
-situation <<stuff>>
+situation <<livingRoom>>
 {
-        command: "eat" object
+        setup
         {
-                display("You can't eat " + object );
+                situation.exits = {
+                        'north': <<diningRoom>>
+                };
         }
-        
-        command: "eat" object "now"
+        enter
         {
-                display("Alright, fine, eat " + object + " now..." );
+                display('''Living room!''');
         }
+}
 
+situation <<kitchen>>
+{
         setup
         {
-                situation.thing = "Just a thing";
+                situation.exits = {
+                        'west': <<diningRoom>>
+                };
         }
+
         enter
         {
-                getThing();
-                display('''Entered stuff''' + player.name);
-                count = 0;
-                while count < 5 do
-                {
-                        display('thing to count!');
-                        count += 1;
-                }
+                display('''Kitchen!''');
         }
 }