Implement floors with dots

src/crypts-and-corpses.lisp

@@ -21,7 +21,8 @@
   (width  99 :type fixnum :read-only t)
   (height 39 :type fixnum :read-only t)
   (dungeon nil :read-only t)
-  (mobiles (make-hash-table) :type hash-table :read-only t))
+  (mobiles (make-hash-table) :type hash-table :read-only t)
+  (terrain (make-hash-table) :type hash-table :read-only t))
 
 (defmethod initialize-instance :after ((map game-map) &rest initargs)
   (declare (ignore initargs))
@@ -41,6 +42,10 @@
   ((codepoint :initarg :codepoint :initform #x23 :type fixnum)
    (color :initarg :color :initform (color-from-name "grey"))))
 
+(defclass floor-tile (tile-entity)
+  ((codepoint :initarg :codepoint :initform #xb7 :type fixnum)
+   (color :initarg :color :initform (color-from-name "grey"))))
+
 (defclass viewport (entity)
   ((width :initarg :width :type fixnum :initform 99)
    (height :initarg :height :type fixnum :initform 40)
@@ -123,7 +128,10 @@
    (* (1- (slot-value object 'height)) (game-map-width map))))
 
 (defun collision-p (new-location map)
-  (gethash new-location (game-map-mobiles map)))
+  (let ((thing (gethash new-location (game-map-mobiles map)))
+        (tile (gethash new-location (game-map-terrain map))))
+    (or thing
+        (and tile (not (typep tile 'floor-tile))))))
 
 (defun bad-move-p (object map old-location new-location)
   (let ((old-effective-location (calculate-effective-location object map old-location))
@@ -289,6 +297,7 @@
                               (<= y y2))
                      (terminal-color (slot-value tile 'color))
                      (terminal-put x y (slot-value tile 'codepoint)))))))
+      (maphash #'write-cell (game-map-terrain map))
       (maphash #'write-cell (game-map-mobiles map)))))
 
 (defun nearest-open-tile (location map)
@@ -367,21 +376,26 @@
               finally (return coords))))))
 
 (defun fill-map-from-crawler (map player)
-  (with-slots (width height dungeon mobiles) map
+  (with-slots (width height dungeon mobiles terrain) map
     (dotimes (x width)
       (dotimes (y height)
         (let ((tile (aref (crawler:tile-map dungeon) x y)))
-          (unless (crawler:walkablep tile)
-            (let ((wall (make-instance 'wall)))
-              (set-location wall x y map)
-              (setf (gethash (calc-location x y map) mobiles) wall)))
-          (when (eq (crawler:map-feature tile) :stairs-up)
-            (set-location player x y map)
-            (setf (gethash (calc-location x y map) mobiles) player)))))))
+          (cond
+            ((not (crawler:walkablep tile))
+             (let ((wall (make-instance 'wall)))
+               (set-location wall x y map)
+               (setf (gethash (calc-location x y map) terrain) wall)))
+            ((eq (crawler:map-feature tile) :stairs-up)
+             (set-location player x y map)
+             (setf (gethash (calc-location x y map) mobiles) player))
+            (:otherwise
+             (let ((floor (make-instance 'floor-tile)))
+               (set-location floor x y map)
+               (setf (gethash (calc-location x y map) terrain) floor)))))))))
 
 (defun initialize-map (map player)
-  (setf (gethash (slot-value player 'location) (game-map-mobiles map)) player)
   (fill-map-from-crawler map player)
+  (setf (gethash (slot-value player 'location) (game-map-mobiles map)) player)
   (let* ((location (nearest-open-tile (slot-value player 'location) map))
          (enemy (make-instance 'enemy :location location)))
     (setf (gethash location (game-map-mobiles map)) enemy))