X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=worlds%2Fgoblin-hq.scm;h=6bfd15420f39d05968ac3fe55ea32dc1c81e5cbe;hp=34b430d372def445e64fb70543ad959934c71398;hb=0974cafbe7e10dd08fe3fef371d002c3606feb9e;hpb=7525c62ccdf9e3480214831fb14d9a2d30ab139d

diff --git a/worlds/goblin-hq.scm b/worlds/goblin-hq.scm
index 34b430d..6bfd154 100644
--- a/worlds/goblin-hq.scm
+++ b/worlds/goblin-hq.scm
@@ -1,5 +1,23 @@
+;;; Mudsync --- Live hackable MUD
+;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
+;;;
+;;; This file is part of Mudsync.
+;;;
+;;; Mudsync is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; Mudsync is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
+
 (use-modules (mudsync)
-             (8sync systems actors)
+             (8sync actors)
              (8sync agenda)
              (oop goops)
              (ice-9 format))
@@ -28,9 +46,9 @@
 ;;; ----------
 
 (define-class <fridge> (<gameobj>)
-  #:name "fridge"
-  #:desc "The refrigerator is humming.  To you?  To itself?
-Only the universe knows.")
+  (name #:init-value "fridge")
+  (desc #:init-value "The refrigerator is humming.  To you?  To itself?
+Only the universe knows."))
 
 
 ;;; The typewriter
@@ -61,23 +79,23 @@ Only the universe knows.")
    #:init-value
    (wrap-apply typewriter-dispatch)))
 
-(define-mhandler (typewriter-cmd-type-gibberish actor message)
-  (<- actor (message-from message) 'tell
+(define (typewriter-cmd-type-gibberish actor message)
+  (<- (message-from message) 'tell
       #:text "*tikka takka!*  *tikka takka!*
 You type some gibberish on the typewriter.\n"))
 
 (define (type-thing actor message type-text)
-  (<- actor (message-from message) 'tell
+  (<- (message-from message) 'tell
       #:text
-      (format #f "You type out a note.\nThe note says: ~s"
+      (format #f "You type out a note.\nThe note says: ~s\n"
               type-text)))
 
-(define-mhandler (typewriter-cmd-type-something
-                  actor message direct-obj indir-obj)
+(define (typewriter-cmd-type-something
+         actor message direct-obj indir-obj)
   (type-thing actor message direct-obj))
 
-(define-mhandler (typewriter-cmd-type-anything
-                  actor message direct-obj rest)
+(define (typewriter-cmd-type-anything
+         actor message direct-obj rest)
   (type-thing actor message rest))
 
 
@@ -109,7 +127,7 @@ Still, you have to admit that all the machines look pretty nice."
     #:exits
     (list (make <exit>
             #:name "east"
-            #:to-symbol 'room:north-hallway
+            #:to 'room:north-hallway
             #:desc wooden-unlocked-door)))  ; eventually make this locked so you have
                                         ; to kick it down, joeyh style!
    ('room:north-hallway
@@ -124,15 +142,15 @@ and the west."
     #:exits
     (list (make <exit>
             #:name "west"
-            #:to-symbol 'room:server-room
+            #:to 'room:server-room
             #:desc wooden-unlocked-door)
           (make <exit>
             #:name "east"
-            #:to-symbol 'room:code-a-plex
+            #:to 'room:code-a-plex
             #:desc metal-stiff-door)
           ;; (make <exit>
           ;;   #:name "south"
-          ;;   #:to-symbol 'center-hallway)
+          ;;   #:to 'center-hallway)
           ))
 
    ('room:code-a-plex
@@ -147,7 +165,7 @@ But one looks invitingly empty."
     #:exits
     (list (make <exit>
             #:name "west"
-            #:to-symbol 'room:north-hallway
+            #:to 'room:north-hallway
             #:desc metal-stiff-door)))
 
    ('thing:typewriter
@@ -165,8 +183,8 @@ But one looks invitingly empty."
 ;;      #:exits
 ;;      ,(list (make <exit>
 ;;               #:name "east"
-;;               #:to-symbol 'room:))
+;;               #:to 'room:))
 ;;      )
 
 (define (goblin-demo . args)
-  (run-demo "/tmp/goblin-game.db" goblin-rooms 'room:north-hallway))
+  (run-demo goblin-rooms 'room:north-hallway))