X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=worlds%2Fgoblin-hq.scm;fp=worlds%2Fgoblin-hq.scm;h=e0d9d8297a8ffcbce3fb469166e4123d68a38a99;hp=7f417da43255ddfa5f3f9fccd964223b23bcf38a;hb=4738c5ae39e26b65cdba3bec005bfe034c4ea2c2;hpb=8c357c87019a70aabdfadb4c71e3b063251cff87

diff --git a/worlds/goblin-hq.scm b/worlds/goblin-hq.scm
index 7f417da..e0d9d82 100644
--- a/worlds/goblin-hq.scm
+++ b/worlds/goblin-hq.scm
@@ -1,4 +1,5 @@
-(use-modules (mudsync))
+(use-modules (mudsync)
+             (oop goops))
 
 ;;                    MEDIAGOBLIN HQ
 ;; .-------------.--.--------.-----------.-----------.
@@ -32,10 +33,12 @@ din.  Who'd choose to work in such a place?
 
 Still, you have to admit that all the machines look pretty nice."
      ;; TODO: Allow walking around further in the dootacenter.
-     ;; 
-     (("east" north-hallway
-       ,wooden-unlocked-door)))      ; eventually make this locked so you have
-                                     ; to kick it down, joeyh style!
+     #:exits
+     ,(list (make <exit>
+              #:name "east"
+              #:to-symbol 'north-hallway
+              #:desc wooden-unlocked-door)))  ; eventually make this locked so you have
+                                             ; to kick it down, joeyh style!
     (north-hallway
      ,<room>
      #:name "North hallway"
@@ -45,9 +48,19 @@ and the curtains dance merrily in the wind.  Outside appears to be a pleasant
 looking lawn.
 
 The hallway continues to the south."
-     (("west" server-room ,wooden-unlocked-door)
-      ("east" code-a-plex ,metal-stiff-door)
-      ("south" center-hallway #f)))
+     #:exits
+     ,(list (make <exit>
+              #:name "west"
+              #:to-symbol 'server-room
+              #:desc wooden-unlocked-door)
+            (make <exit>
+              #:name "east"
+              #:to-symbol 'code-a-plex
+              #:desc metal-stiff-door)
+            ;; (make <exit>
+            ;;   #:name "south"
+            ;;   #:to-symbol 'center-hallway)
+            ))
 
     (code-a-plex
      ,<room>
@@ -59,8 +72,11 @@ now.
 
 There's a row of computer desks.  Most of them have computers already on them,
 But one looks invitingly empty."
-     ((north-hallway
-       "west" ,metal-stiff-door)))))
+     #:exits
+     ,(list (make <exit>
+              #:name "west"
+              #:to-symbol 'north-hallway
+              #:desc metal-stiff-door)))))
 
 (define (goblin-demo . args)
   (run-demo "/tmp/goblin-game.db" goblin-rooms 'north-hallway))