Well, +=, -= on dictionaries/lists works now.

1 files changed, 93 insertions, 23 deletions

diff --git a/demo.stage b/demo.stage
index 67c6063..00e7d94 100644
--- a/demo.stage
+++ b/demo.stage
@@ -7,65 +7,135 @@ game.start = <<start>>;
 
 global
 {
-        command: "take" item
+        command: "go" dir
         {
-                if item in situation.items then
+                if exists(situation.exits) then
                 {
-                        player.inventory += item;
-                        situation.items -= item;
-                        display('''You pickup the ''' + item +
-                                ''' and put it in your pocket.''');
-                }
-                else
-                {
-                        display('''You don't see anything like that here.''');
+                        if dir in situation.exits then
+                        {
+                                goto( situation.exits[dir] );
+                        }
                 }
+                display('''You're not really sure how to do that...''');
         }
 
-        command: "use" item
+        command: "exits"
         {
-                if not item in player.inventory then
+                if exists(situation.exits) then
                 {
-                        display('''You don't have anything like that in your pocket.''');
+                        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"
+        {
+                exit();
+        }
+}
+
+function square( x )
+{
+        return( x*x );
 }
 
-situation <<main>>
+function sillyDisplay( txt, extra )
 {
-        command: "there" hi
+        display("!~! " + txt + " !~!");
+        if extra then
         {
+                display("And then some extra!");
         }
+        else
+        {
+                display("...no extra for you");
+        }
+}
+
+function myGoto( txt )
+{
+        display( txt );
+        goto( txt );
+}
+
+function getThing()
+{
+        display( situation.thing );
+}
+
+situation <<start>>
+{
         setup
         {
-                player.inventory = [];
+                goto( <<diningRoom>> );
         }
+
         enter
         {
         }
 }
 
-function hello()
+situation <<diningRoom>>
 {
-        bob = 55 * 2 + 1;
+        setup
+        {
+                situation.exits = {
+                        'south': <<livingRoom>>,
+                        'east': <<kitchen>>
+                };
+        }
+        enter
+        {
+                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 <<start>>
+situation <<livingRoom>>
 {
+        setup
+        {
+                situation.exits = {
+                        'north': <<diningRoom>>
+                };
+        }
         enter
         {
-                display('''You are here, there is a wrench sitting on the table.''');
-                test("use", bob );
+                display('''Living room!''');
         }
 }
 
-situation <<end>>
+situation <<kitchen>>
 {
+        setup
+        {
+                situation.exits = {
+                        'west': <<diningRoom>>
+                };
+        }
+
         enter
         {
-                goto( <<start>> );
+                display('''Kitchen!''');
         }
 }