# HG changeset patch # User Steve Losh # Date 1484700953 0 # Node ID d5c110b938cb4db3aed3c61c67b24440ec360a59 # Parent 1a365d4ae7bc8d4fe60c030db152c7b1e221dffd Unfuck things diff -r 1a365d4ae7bc -r d5c110b938cb src/robots/rpg-shopkeeper.lisp --- a/src/robots/rpg-shopkeeper.lisp Wed Jan 18 00:32:30 2017 +0000 +++ b/src/robots/rpg-shopkeeper.lisp Wed Jan 18 00:55:53 2017 +0000 @@ -199,7 +199,7 @@ (defun vanilla-armor-description (vanilla-armor) - (destructuring-bind (material piece) vanilla-weapon + (destructuring-bind (material piece) vanilla-armor (format nil "~A ~A" (material-name material) piece))) @@ -289,10 +289,13 @@ ;;;; Flavor ------------------------------------------------------------------- (defparameter *monster* nil) +(define-string scene + ("images of" [monster monster-plural])) + (define-string sales-pitch "Only used once!" "Brand new!" - ("I bought it from" [(eval (monster-adjective (monster))) a] role :. ".") + ("I bought it from" [monster monster-adjective a] role) "This is gonna go fast!") @@ -303,7 +306,7 @@ (define-string offer ("FOR SALE:" #\newline :. - [item cap] #\newline :. + [item cap] #\newline #\newline :. sales-pitch))