# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1450012599 0
# Node ID f5172370bbdba7d296287d95c5002e1eef3c13a1
# Parent  251301483006b9af1aba8dbb10d091a444b000e9
Collision detection

diff -r 251301483006 -r f5172370bbdb src/silt/core.clj
--- a/src/silt/core.clj	Sun Dec 13 13:12:09 2015 +0000
+++ b/src/silt/core.clj	Sun Dec 13 13:16:39 2015 +0000
@@ -103,6 +103,12 @@
   [(update-in animal [:energy] #(- % 40))
    (clone animal)])
 
+(defn try-move [[x y :as orig] [dx dy]]
+  (let [dest (normalize-world-coords [(+ x dx) (+ y dy)])]
+    (if (contains? @terrain dest)
+      orig
+      dest)))
+
 
 (defn affect-temp [animal] animal)
 (defn fix-temp [animal] animal)
@@ -111,8 +117,7 @@
 
 (defn wander [animal]
   (update-in animal [:loc]
-             (fn [[x y] [dx dy]]
-               (normalize-world-coords [(+ x dx) (+ y dy)]))
+             try-move
              (rr/rand-nth directions)))
 
 (defn age [animal]