Replaced burst's parameter exclude-center with include-center

Author: Kodiologist

simalq/geometry.hy

@@ -210,7 +210,7 @@
       (break)))
   (tuple (cut out 1 None)))
 
-(defn burst [center size [exclude-center False]]
+(defn burst [center size [include-center T]]
   "Return a generator of all distinct points within distance `size` of
   `center`. Thus the points form a square that's `2 * size + 1`
   squares wide. The order in which they're generated spirals outwards
@@ -227,7 +227,7 @@
   allows monsters closer to the player to move first, so a line of
   monsters can march toward the player without creating gaps.
 
-  If `exclude-center` is true, the center position isn't returned."
+  If `include-center` is false, the center position isn't returned."
 
   (unique (gfor
     c (thru 0 (min size (max center.map.width center.map.height)))
@@ -239,7 +239,7 @@
     :setv p (try
       (Pos center.map (+ center.x x) (+ center.y y))
       (except [GeometryError]))
-    :if (and p (not (and exclude-center (= p center))))
+    :if (and p (or (!= p center) include-center))
     p)))
 
 (defn burst-size [size [article? True]]

simalq/tile/item.hy

@@ -419,7 +419,7 @@
   :targeted F
   :use (meth []
     "Creates a magical energy shield in each square adjacent to you. These shield tiles block monsters and their shots, but not you or your shots."
-    (for [p (burst G.player.pos 1 :exclude-center T)]
+    (for [p (burst G.player.pos 1 :include-center F)]
       (Tile.make p "magical energy shield")))
 
   :flavor "Cowardice is the better part of valor.")

simalq/tile/monster.hy

@@ -1120,7 +1120,7 @@
       'bats
         (@summon "bat" @summon-frequency @summon-hp)
       'vampirize
-        (block (for [p (burst @pos 1 :exclude-center T)  tile (at p)]
+        (block (for [p (burst @pos 1 :include-center F)  tile (at p)]
           (when (and
               (isinstance tile Monster)
               tile.vampirizable

simalq/tile/scenery.hy

@@ -774,7 +774,7 @@
     ; positions.
     (setv candidate-dist Inf)
     (setv candidates [])
-    (for [p (burst G.player.pos G.rules.reality-bubble-size :exclude-center T)]
+    (for [p (burst G.player.pos G.rules.reality-bubble-size :include-center F)]
       (when (> (dist p @pos) candidate-dist)
         ; When multiple teleporters are in range, we consider only
         ; the subset that's as close as possible.
@@ -784,7 +784,7 @@
           ; This position can be a candidate if it has at least one
           ; free adjacent position.
           (when (setx neighbors (tuple (gfor
-              n-p (burst p 1 :exclude-center T)
+              n-p (burst p 1 :include-center F)
               :if (all (gfor
                 n-tile (at n-p)
                 (isinstance n-tile Monster)))

tests/test_geometry.hy

@@ -254,18 +254,18 @@
 
 
 (defn test-burst []
-  (for [size [2 6]  exclude-center [F T]  wrap-x [F T]  wrap-y [F T]]
+  (for [size [2 6]  include-center [F T]  wrap-x [F T]  wrap-y [F T]]
     (setv m (Map.make :!wrap-x :!wrap-y :width 5 :height 7))
     (setv p0 (Pos m 1 1))
-    (setv b (tuple (burst p0 size exclude-center)))
+    (setv b (tuple (burst p0 size include-center)))
     ; A burst shouldn't duplicate positions.
     (assert (= (len b) (len (set b))))
     ; A point should be in a burst if and only if it's close enough to
     ; the center.
     (for [x (range m.width)  y (range m.height)]
       (setv p (Pos m x y))
       (assert (=
-        (if (= p p0) (not exclude-center) (<= (dist p p0) size))
+        (if (= p p0) include-center (<= (dist p p0) size))
         (in p b))))))
 
 

tests/test_monster.hy

@@ -536,7 +536,7 @@
     f"a thorn-tree generator (HP 3, pw 0, freq 1, sHP {shp})")
   ; Check that the generator produces a ring of trees.
   (wait 9)
-  (for [p (burst (Pos G.map 3 2) 1 :exclude-center T)]
+  (for [p (burst (Pos G.map 3 2) 1 :include-center F)]
     (assert-at p "thorn tree")
     (assert-hp p shp)))