projects
/
lifp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better load file interface
[lifp.git]
/
verbs.lisp
diff --git
a/verbs.lisp
b/verbs.lisp
index a6e4dd4d69cb8d78e7094faf781d87f45fada3ac..7704ce39d994d9c8d6b0484e83927e91a35eb0da 100644
(file)
--- a/
verbs.lisp
+++ b/
verbs.lisp
@@
-18,7
+18,7
@@
:wear :strip :enter :climb :drink :eat
\r
:rub :turn :switch-on :switch-off
\r
:fill :empty :extract :let-go :open :close
\r
:wear :strip :enter :climb :drink :eat
\r
:rub :turn :switch-on :switch-off
\r
:fill :empty :extract :let-go :open :close
\r
- :lock :unlock :
open-unlock
)
\r
+ :lock :unlock :
unlock-open
)
\r
(:shadow :listen :fill :open :close)
\r
(:shadowing-import-from :if-lib :room))
\r
\r
(:shadow :listen :fill :open :close)
\r
(:shadowing-import-from :if-lib :room))
\r
\r
@@
-501,12
+501,12
@@
(format nil "You cannot unlock ~a with ~a."
\r
(the-name obj) (the-name key))))))
\r
\r
(format nil "You cannot unlock ~a with ~a."
\r
(the-name obj) (the-name key))))))
\r
\r
-(defaction
open-unlock
(obj key)
\r
+(defaction
unlock-open
(obj key)
\r
"You cannot open this.")
\r
\r
"You cannot open this.")
\r
\r
-(defmethod
open-unlock
((obj container) (key item))
\r
+(defmethod
unlock-open
((obj container) (key item))
\r
(unless (and (has obj :container)
\r
(has obj :openable))
\r
(unless (and (has obj :container)
\r
(has obj :openable))
\r
- (return-from
open-unlock
(call-next-method)))
\r
+ (return-from
unlock-open
(call-next-method)))
\r
(and (run-action 'unlock *args*)
\r
(run-action 'open obj)))
\r
(and (run-action 'unlock *args*)
\r
(run-action 'open obj)))
\r