X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=verbs.lisp;fp=verbs.lisp;h=39c66af586b1db27c8ec5d8e37c6706183476cc9;hb=447a18ccfc600c416a481266ecac28cd2ecd720f;hp=7704ce39d994d9c8d6b0484e83927e91a35eb0da;hpb=3c7a7c60eee66182da5b409ddd78c5349992c334;p=lifp.git

diff --git a/verbs.lisp b/verbs.lisp
index 7704ce3..39c66af 100644
--- a/verbs.lisp
+++ b/verbs.lisp
@@ -13,7 +13,7 @@
 (defpackage :verb-lib
   (:use :common-lisp :if-lib :if-basic-lib)
   (:export :attack :take :teleport :examine 
-	   :go-to 
+	   :go-to :pass
 	   :take :put-in :put-on :drop :receive
 	   :wear :strip :enter :climb :drink :eat
            :rub :turn :switch-on :switch-off
@@ -205,23 +205,28 @@
 
 (defaction go-to (dir)
   (let ((destination (read-property *location* (property dir))))
-    (if destination (go-to-room destination)
+    (if destination (exec go-to-dispatch (destination))
 	(if (provides *location* 'cant-go) 
 	    (read-property *location* 'cant-go)
 	    "You can't go here."))))
 
-;; (defaction go-n () (run-action 'go-to dir-n))
-;; (defaction go-ne () (run-action 'go-to dir-ne))
-;; (defaction go-e () (run-action 'go-to dir-e))
-;; (defaction go-se () (run-action 'go-to dir-se))
-;; (defaction go-s () (run-action 'go-to dir-s))
-;; (defaction go-sw () (run-action 'go-to dir-sw))
-;; (defaction go-w () (run-action 'go-to dir-w))
-;; (defaction go-nw () (run-action 'go-to dir-nw))
-;; (defaction go-u () (run-action 'go-to dir-u))
-;; (defaction go-d () (run-action 'go-to dir-d))
-;; (defaction go-in () (run-action 'go-to dir-in))
-;; (defaction go-out () (run-action 'go-to dir-out))
+(defgeneric go-to-dispatch (dest)
+  (:documentation "Dispatches between different kinds of goable objects"))
+
+(defmethod go-to-dispatch ((dest room))
+  (go-to-room dest))
+
+(defmethod go-to-dispatch ((dest door))
+  (unless (has dest :door) (return-from go-to-dispatch (call-next-method)))
+  (if (has dest :closed) (format nil "~a is closed." (the-name dest))
+      (run-action 'pass *args*)))
+
+(defaction pass (obj)
+  "Something's wrong happened.")
+
+(defmethod pass ((obj door))
+  (go-to-dispatch (read-property obj 'destination))
+  (run-action-after obj))
 
 (defun inventory ()
   (sprint "You are carrying: ~a." (list-contents *player*))
@@ -436,8 +441,8 @@
 (defaction open (obj)
   "You cannot open this.")
 
-(defmethod open ((obj container))
-  (unless (and (has obj :container) (has obj :openable))
+(defmethod open ((obj predoor))
+  (unless (and (or (has obj :container) (has obj :door)) (has obj :openable))
     (return-from open (call-next-method)))  
   (if (has obj :closed)
       (if (hasnt obj :locked)
@@ -451,8 +456,8 @@
 (defaction close (obj)
   "You cannot close this.")
 
-(defmethod close ((obj container))
-  (unless (and (has obj :container) (has obj :openable))
+(defmethod close ((obj predoor))
+  (unless (and (or (has obj :container) (has obj :door)) (has obj :openable))
     (return-from close (call-next-method)))
   (if (hasnt obj :closed)
       (progn 
@@ -464,8 +469,8 @@
 (defaction lock (obj key)
   "Not lockable.")
 
-(defmethod lock ((obj container) (key item))
-  (unless (and (has obj :container) 
+(defmethod lock ((obj predoor) (key item))
+  (unless (and (or (has obj :container) (has obj :door)) 
                (has obj :openable)
                (has obj :lockable))
     (return-from lock (call-next-method)))
@@ -484,8 +489,8 @@
 (defaction unlock (obj key)
   "There is nothing to unlock.")
 
-(defmethod unlock ((obj container) (key item))
-  (unless (and (has obj :container) 
+(defmethod unlock ((obj predoor) (key item))
+  (unless (and (or (has obj :container) (has obj :door)) 
                (has obj :openable)
                (has obj :lockable))
     (return-from unlock (call-next-method)))
@@ -504,8 +509,8 @@
 (defaction unlock-open (obj key)
   "You cannot open this.")
 
-(defmethod unlock-open ((obj container) (key item))
-  (unless (and (has obj :container) 
+(defmethod unlock-open ((obj predoor) (key item))
+  (unless (and (or (has obj :container) (has obj :door)) 
                (has obj :openable))
     (return-from unlock-open (call-next-method)))
   (and (run-action 'unlock *args*)