projects
/
mudsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scrubl up a couple of room descriptions
[mudsync.git]
/
mudsync
/
room.scm
diff --git
a/mudsync/room.scm
b/mudsync/room.scm
index 0ad886ceece07226a1dd508154c91c619535e4a1..8dc1d847fa6637d654eb4e729a62486382e9c00e 100644
(file)
--- a/
mudsync/room.scm
+++ b/
mudsync/room.scm
@@
-66,7
+66,10
@@
(empty-command "go" 'cmd-go-where)
(loose-direct-command "go" 'cmd-go)
(greedy-command "say" 'cmd-say)
(empty-command "go" 'cmd-go-where)
(loose-direct-command "go" 'cmd-go)
(greedy-command "say" 'cmd-say)
- (greedy-command "emote" 'cmd-emote)))
+ (greedy-command "\"" 'cmd-say)
+ (greedy-command "'" 'cmd-say)
+ (greedy-command "emote" 'cmd-emote)
+ (greedy-command "/me" 'cmd-emote)))
;; TODO: Subclass from container?
(define-class <room> (<gameobj>)
;; TODO: Subclass from container?
(define-class <room> (<gameobj>)
@@
-105,7
+108,7
@@
(dyn-ref room (slot-ref exit 'to))
#f))
(define player-name
(dyn-ref room (slot-ref exit 'to))
#f))
(define player-name
- (m
sg
-val (<-wait (message-from message) 'get-name)))
+ (m
body
-val (<-wait (message-from message) 'get-name)))
(cond
(exit
;; Set the player's new location
(cond
(exit
;; Set the player's new location
@@
-152,9
+155,8
@@
"Handle looking around the room"
;; Get the room text
(define room-text
"Handle looking around the room"
;; Get the room text
(define room-text
- (format #f "**~a**\n~a\n"
- (slot-ref room 'name)
- (slot-ref room 'desc)))
+ `((strong "=> " ,(slot-ref room 'name) " <=")
+ (p ,(slot-ref room 'desc))))
;; Get a list of other things the player would see in the room
(define occupant-names-all
;; Get a list of other things the player would see in the room
(define occupant-names-all
@@
-182,7
+184,8
@@
(define final-text
(if occupant-names-string
(define final-text
(if occupant-names-string
- (string-append room-text occupant-names-string)
+ `(,@room-text
+ (p (em ,occupant-names-string)))
room-text))
(<- player-id 'tell
room-text))
(<- player-id 'tell
@@
-202,7
+205,7
@@
(lambda (return)
(for-each
(lambda (occupant)
(lambda (return)
(for-each
(lambda (occupant)
- (m
sg
-receive (_ #:key goes-by)
+ (m
body
-receive (_ #:key goes-by)
(<-wait occupant 'goes-by)
(if (member called-this goes-by)
(return occupant))))
(<-wait occupant 'goes-by)
(if (member called-this goes-by)
(return occupant))))
@@
-221,7
+224,7
@@
(cond
(matching-object
(let ((obj-desc
(cond
(matching-object
(let ((obj-desc
- (m
sg
-val (<-wait matching-object 'get-desc
+ (m
body
-val (<-wait matching-object 'get-desc
#:whos-looking (message-from message)))))
(if obj-desc
(<- (message-from message) 'tell
#:whos-looking (message-from message)))))
(if obj-desc
(<- (message-from message) 'tell
@@
-255,22
+258,22
@@
(define* (room-cmd-say room message #:key phrase)
"Command: Say something to room participants."
(define player-name
(define* (room-cmd-say room message #:key phrase)
"Command: Say something to room participants."
(define player-name
- (m
sg
-val (<-wait (message-from message) 'get-name)))
+ (m
body
-val (<-wait (message-from message) 'get-name)))
(define message-to-send
(define message-to-send
-
(format #f "~a says: ~a\n" player-name
phrase))
+
`((b "<" ,player-name ">") " " ,
phrase))
(room-tell-room room message-to-send))
(define* (room-cmd-emote room message #:key phrase)
"Command: Say something to room participants."
(define player-name
(room-tell-room room message-to-send))
(define* (room-cmd-emote room message #:key phrase)
"Command: Say something to room participants."
(define player-name
- (m
sg
-val (<-wait (message-from message) 'get-name)))
+ (m
body
-val (<-wait (message-from message) 'get-name)))
(define message-to-send
(define message-to-send
-
(format #f "* ~a ~a\n" player-name
phrase))
+
`((b "* " ,player-name) " " ,
phrase))
(room-tell-room room message-to-send))
(define* (room-announce-entrance room message #:key who-entered)
(define player-name
(room-tell-room room message-to-send))
(define* (room-announce-entrance room message #:key who-entered)
(define player-name
- (m
sg
-val (<-wait who-entered 'get-name)))
+ (m
body
-val (<-wait who-entered 'get-name)))
(define message-to-send
(format #f "~a enters the room.\n" player-name))
(room-tell-room room message-to-send
(define message-to-send
(format #f "~a enters the room.\n" player-name))
(room-tell-room room message-to-send