refactoring commands slots

[mudsync.git] / mudsync.scm

diff --git a/mudsync.scm b/mudsync.scm
index 8cc07b1389bb5fff85619774ace295b6b8aca8a3..35cc0befcf641f3da7b286e831656d6e98d7ed71 100644 (file)
--- a/mudsync.scm
+++ b/mudsync.scm
@@ -384,13 +384,32 @@ with an anonymous persona"
   ;; game master id
   (gm #:init-keyword #:gm
       #:getter gameobj-gm)
+  ;; a name to be known by
+  (name #:init-keyword #:name
+        #:accessor gameobj-name)
+
+  ;; how to print our name
+  (name-f #:init-keyword #:name-f
+          #:getter gameobj-name-f
+          #:init-value gameobj-simple-name-f)
+
+  ;; Name aliases
+  (aliases #:init-keyword #:aliases
+           #:init-value '())
 
   ;; Commands we can handle
-  (commands #:init-value #f)
+  (dirobj-commands #:init-value '())
+  (indirobj-commands #:init-value '())
+
   ;; Commands we can handle by being something's container
   (contain-commands #:init-value #f))
 
 
+(define (gameobj-simple-name-f gameobj)
+  "Simplest version: return ourselves for our name."
+  (gameobj-name gameobj))
+
+
 \f
 ;;; Rooms
 ;;; =====
@@ -435,10 +454,11 @@ with an anonymous persona"
                    #:val (slot-ref actor slot))))
 
 
+;; TODO: Subclass from container?
 (define-class <room> (<gameobj>)
-  (name #:init-keyword #:name)
   (desc #:init-value ""
                #:init-keyword #:desc)
+  ;; TODO: Switch this to be loc based
   ;; Uses a hash table like a set (values ignored)
   (occupants #:init-thunk make-hash-table)
   ;; A list of <exit>
@@ -447,6 +467,9 @@ with an anonymous persona"
   ;; @@: Maybe eventually <room> will inherit from some more general
   ;;  game object class
 
+  (contain-commands
+   #:init-value %room-contain-commands)
+
   (message-handler
    #:allocation #:each-subclass
    #:init-value
@@ -464,6 +487,16 @@ with an anonymous persona"
      (hash-remove! (slot-ref actor 'occupants) who))
     (wire-exits! (wrap-apply room-wire-exits!)))))
 
+(define always (const #t))
+
+(define %room-contain-commands
+  (list
+   (full-command "look" cmatch-just-verb always 'look-room)
+   (full-command "look" cmatch-direct-obj always 'look-member)
+   (full-command "go" cmathc-just-verb always 'go-where)
+   (full-command "go" cmatch-direct-obj always 'go-exit)))
+
+
 (define (room-wire-exits! room message)
   "Actually hook up the rooms' exit addresses to the rooms they
 claim to point to."
@@ -488,6 +521,10 @@ claim to point to."
   ;; Connection id
   (client #:accessor player-client)
 
+  (self-commands
+   #:init-value '()
+   #:accessor player-self-commands)
+
   (message-handler
    #:init-value
    (make-action-dispatch