X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync.scm;h=36781f4993df1ce1f6d8c97599355a4bad37eb58;hp=544dc3a426b993c9d1df9aeace96d9bebc441307;hb=306aa6a09fd37f7ee6b06d99e203f19ddf6e85b7;hpb=f96e5f3c95dd19e79dde36097379cb1c388cea83

diff --git a/mudsync.scm b/mudsync.scm
index 544dc3a..36781f4 100644
--- a/mudsync.scm
+++ b/mudsync.scm
@@ -21,6 +21,7 @@
              (8sync agenda)
              (ice-9 format)
              (ice-9 match)
+             (gdbm)
              (oop goops))
 
 
@@ -181,12 +182,31 @@
 ;; (define-method (nm-close-port (nm <network-manager>)))
 
 
+
 ;;; The game master!  Runs the world.
 ;;; =================================
 
 ;; @@: We could call this a "world builder" instead...
 ;;   I kinda like calling it a GM though.
 
+(define-class <game-master> (<actor>)
+  ;; The directory is a "namespaced" directory of all "special" content
+  ;; in the game, identifiable by some special key.
+  ;; (The namespace is simply a cons of (namespace . special-symbol))
+  (directory #:init-thunk make-hash-table)
+  ;; A mapping of client ids to in-game actors
+  (client-to-actor #:init-thunk make-hash-table)
+  ;; Network manager
+  (network-manager #:accessor gm-network-manager
+                   #:init-value #f)
+
+  (message-handler
+   #:init-value
+   (make-action-dispatch
+    (init-world (wrap-apply gm-init-world))
+    (client-input (wrap-apply gm-handle-client-input)))))
+
+
 (define (gm-init-world gm message)
   ;; Load database
   ;;  TODO
@@ -218,29 +238,100 @@
       #:client client-id
       #:data "Thanks, we got it!\n"))
 
-(define-class <game-master> (<actor>)
-  ;; The directory is a "namespaced" directory of all "special" content
-  ;; in the game, identifiable by some special key.
-  ;; (The namespace is simply a cons of (namespace . special-symbol))
-  (directory #:init-thunk make-hash-table)
-  ;; A mapping of client ids to in-game actors
-  (client-to-actor #:init-thunk make-hash-table)
-  ;; Network manager
-  (network-manager #:accessor gm-network-manager
-                   #:init-val #f)
+(define-method (gm-setup-database (gm <game-master>))
+  'TODO)
+
+(define-method (gm-setup-rooms-etc (gm <game-master>))
+  'TODO)
+
+
+;;; Rooms
+;;; =====
+
+;; @@: Maybe make this into a record type when this congeals a bit?
+;;   I dunno?
+
+(define-class <exit> ()
+  ;; Used for wiring
+  (to-symbol #:accessor exit-to-symbol
+             #:init-keyword #:to-symbol)
+  ;; The actual address we use
+  (to-address #:accessor exit-to-address
+              #:init-keyword #:address)
+  ;; Name of the room (@@: Should this be names?)
+  (name #:accessor exit-name
+        #:init-keyword #:name)
+  (description #:accessor exit-description
+               #:init-keyword #:address)
+
+  ;; *Note*: These two methods have an extra layer of indirection, but
+  ;;   it's for a good reason.
+  (visible-check #:init-keyword (const #t))
+  ;; By default all exits can be traversed
+  (traverse-check #:init-keyword (const #t)))
+
+(define* (exit-can-traverse? exit actor
+                             #:optional (target-actor (actor-id actor)))
+  ((slot-ref exit 'traverse-check) exit actor target-actor))
+
+(define* (exit-is-visible? exit actor
+                           #:optional (target-actor (actor-id actor)))
+  ((slot-ref exit 'traverse-check) exit actor target-actor))
+
+
+;; Kind of a useful utility, maybe?
+(define (simple-slot-getter slot)
+  (lambda (actor message)
+    (reply-message actor message
+                   #:val (slot-ref actor slot))))
+
+
+(define-class <room> (<actor>)
+  (name #:init-keyword #:name)
+  (description #:init-value ""
+               #:init-keyword #:description)
+  ;; Uses a hash table like a set (values ignored)
+  (occupants #:init-thunk make-hash-table)
+  ;; A list of <exit>
+  (exits #:init-value '()
+         #:getter room-exits)
+  ;; @@: Maybe eventually <room> will inherit from some more general
+  ;;  game object class
+  (gm #:init-keyword #:gm
+      #:getter room-gm)
 
   (message-handler
+   #:allocation #:each-subclass
    #:init-value
    (make-action-dispatch
-    (init-world gm-init-world)
-    (client-input gm-handle-client-input))))
+    (get-description
+     (simple-slot-getter 'description))
+    (get-name
+     (simple-slot-getter 'name))
+    ((register-occupant! actor message who)
+     "Register an actor as being a occupant of this room"
+     (hash-set! (slot-ref actor 'occupants) who #t))
+    ((evict-occupant! actor message who)
+     "De-register an occupant removed from the room"
+     (hash-remove! (slot-ref actor 'occupants) who))
+    ((wire-exits! actor message)
+     (wrap-apply room-wire-exits!)))))
+
+(define (room-wire-exits! room message)
+  (for-each
+   (lambda (exit)
+     (define new-exit
+       (<-wait room (room-gm room) 'lookup-room
+               #:symbol (exit-to-symbol exit)))
+
+     (set! (exit-to-address exit) new-exit))
+
+   (room-exits room)))
 
 
-(define-method (gm-setup-database (gm <game-master>))
-  'TODO)
-
-(define-method (gm-setup-rooms-etc (gm <game-master>))
-  'TODO)
+
+;;; Players
+;;; =======
 
 
 ;; Debugging stuff