Merge branch 'master' of /home/dbane/public_repos/lsp

1 files changed, 16 insertions, 15 deletions

diff --git a/crpg.lisp b/crpg.lisp
index 23e87e4..7674b6b 100755
--- a/crpg.lisp
+++ b/crpg.lisp
@@ -63,15 +63,15 @@
   (make-instance (find-class c) 'n n 'v v))
 (defconstant +items+
   (vector
-   (create-item "apple" '<food> 1)
-   (create-item "bread" '<food> 2)
-   (create-item "chicken" '<food> 3)
-   (create-item "dagger" '<weapon> 2)
-   (create-item "sword" '<weapon> 3)
-   (create-item "halberd" '<weapon> 4)
-   (create-item "smoke" '<trap> 1)
+   (create-item "apple     " '<food> 1)
+   (create-item "bread     " '<food> 2)
+   (create-item "chicken   " '<food> 3)
+   (create-item "dagger    " '<weapon> 2)
+   (create-item "sword     " '<weapon> 3)
+   (create-item "halberd   " '<weapon> 4)
+   (create-item "smoke     " '<trap> 1)
    (create-item "noose trap" '<trap> 2)
-   (create-item "pit trap" '<trap> 3)))
+   (create-item "pit trap  " '<trap> 3)))
 (defgeneric copy (obj))
 (defmethod copy ((obj <monster>))
   (create-monster (name obj) (attack obj) (health obj)))
@@ -143,7 +143,7 @@
 		     (setf (health *the-player*) (- (health *the-player*) 1))))
 		   (my-print +press-key+)
 		   (read-line)))
-	   (cursor 10 1)
+	   (cursor 10 1) (clrtoeol)
 	   (if (> (health *the-player*) 0)
 	       (progn (clrtoeol)
 		      (my-print "You won the fight!")
@@ -223,15 +223,16 @@
    (clrtoeol)
    (let ((monster-type (monster (aref *map* (row *curr-coord*) (col *curr-coord*)))))
      (if (null monster-type)
-	 (progn (setq *curr-monster* nil)
-		(setq *monster-gold* 0))
-       (progn (setq *curr-monster* (copy (elt +monsters+ monster-type)))
-	      (format *standard-output* "Monster: ~A~%" *curr-monster*)
-	      (setq *monster-gold* (* monster-type (random 6))))))
+         (progn (setq *curr-monster* nil)
+                (format *standard-output* "Monster: nothing~%")
+                (setq *monster-gold* 0))
+         (progn (setq *curr-monster* (copy (elt +monsters+ monster-type)))
+                (format *standard-output* "Monster: ~A~%" *curr-monster*)
+                (setq *monster-gold* (* monster-type (random 6))))))
    (let ((item-type (item (aref *map* (row *curr-coord*) (col *curr-coord*)))))
      (if (null item-type)
 	 (progn (cursor 15 41)
-		(my-print "nothing"))
+		(my-print "nothing   "))
        (progn (setq *curr-item* (elt +items+ item-type))
 	      (cursor 15 41)
 	      (my-print (name *curr-item*))