From 84ff156aac158027b88c0b3acd3b08d23591453a Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sun, 29 Oct 2023 08:55:58 -0400
Subject: Add varied popcorn behavior. Fill out more enemy spawn points.

---
 game.scm       |  54 ++++++++-
 images/map.ase | Bin 1238 -> 1769 bytes
 images/map.png | Bin 659 -> 1124 bytes
 level.tmx      | 372 ++++++++++++++++++++++++++++++---------------------------
 tiles.tsx      |   4 +-
 5 files changed, 248 insertions(+), 182 deletions(-)

diff --git a/game.scm b/game.scm
index 1c857b0..6820fc8 100644
--- a/game.scm
+++ b/game.scm
@@ -728,6 +728,9 @@
        (match type
          ('turret (spawn-turret x y))
          ('popcorn (spawn-popcorn x y))
+         ('popcorn-swarm (spawn-popcorn-swarm x y))
+         ('popcorn-sweep-left (spawn-popcorn-sweep-left x y))
+         ('popcorn-sweep-right (spawn-popcorn-sweep-right x y))
          ('flyer0 (spawn-flyer0 x y))
          ('flyer1 (spawn-flyer1 x y))
          ('boss (spawn-boss x y))
@@ -987,6 +990,47 @@
      (define (spawn-popcorn x y)
        (spawn-popcorn* x y #f))
 
+     (define (spawn-popcorn-swarm x y)
+       (define (script popcorn)
+         (forever
+          (tween (lambda (dx)
+                   (set-enemy-dx! popcorn dx))
+                 60 -0.5 0.5
+                 smoothstep lerp)
+          (tween (lambda (dx)
+                   (set-enemy-dx! popcorn dx))
+                 60 0.5 -0.5
+                 smoothstep lerp)))
+       (spawn-popcorn* x y script))
+
+     (define (spawn-popcorn-sweep-left x y)
+       (define (script popcorn)
+         (set-enemy-dy! popcorn 1.0)
+         (tween (lambda (dx)
+                  (set-enemy-dx! popcorn dx))
+                60 0.0 -3.0
+                smoothstep lerp))
+       (run-script
+        (lambda ()
+          (do ((i 0 (+ i 1)))
+              ((= i 9))
+              (spawn-popcorn* x y script)
+              (wait 15)))))
+
+     (define (spawn-popcorn-sweep-right x y)
+       (define (script popcorn)
+         (set-enemy-dy! popcorn 1.0)
+         (tween (lambda (dx)
+                  (set-enemy-dx! popcorn dx))
+                60 0.0 3.0
+                smoothstep lerp))
+       (run-script
+        (lambda ()
+          (do ((i 0 (+ i 1)))
+              ((= i 9))
+              (spawn-popcorn* x y script)
+              (wait 15)))))
+
      (define (spawn-flyer0 x y)
        (define (script flyer)
          (run-script
@@ -1462,11 +1506,11 @@
        (set! *game-state* 'play)
        (scheduler-reset! *scheduler*)
        (set! *scroll* 0.0)
-       ;; (set! *scroll* (* 345.0 tile-height))
+       ;; (set! *scroll* (* 335.0 tile-height))
        (set! *last-scroll* 0.0)
        (set! *last-row-scanned* (level-height level))
        ;; (set! *last-row-scanned* (- (level-height level)
-       ;;                             345))
+       ;;                             335))
        (bullet-pool-reset! player-bullets)
        (bullet-pool-reset! enemy-bullets)
        (enemy-pool-reset! enemies)
@@ -1566,7 +1610,8 @@
      (define (out-of-bounds? x y w h)
        (let ((padding 32.0))
          (not (rect-within? x y w h (- padding) (- padding)
-                            (+ game-width padding) (+ game-height padding)))))
+                            (+ game-width (* padding 2.0))
+                            (+ game-height (* padding 2.0))))))
 
      (define (player-bullet-collide type x y w h)
        (let ((x* (- x (/ w 2.0)))
@@ -1603,9 +1648,9 @@
 
      (define dt (/ 1000.0 60.0))
      (define (update)
-       (scheduler-tick! *scheduler*)
        (match *game-state*
          ('play
+          (scheduler-tick! *scheduler*)
           (level-update! level)
           (player-update!)
           (bullet-pool-update! player-bullets player-bullet-collide)
@@ -1622,6 +1667,7 @@
           (particle-pool-update! particles)
           (enemy-pool-update! enemies))
          ('game-clear
+          (scheduler-tick! *scheduler*)
           (bullet-pool-update! player-bullets player-bullet-collide)
           (bullet-pool-update! enemy-bullets enemy-bullet-collide)
           (particle-pool-update! particles))
diff --git a/images/map.ase b/images/map.ase
index 9f7deb3..7f9b5c6 100644
Binary files a/images/map.ase and b/images/map.ase differ
diff --git a/images/map.png b/images/map.png
index cdaa5ac..513a0fe 100644
Binary files a/images/map.png and b/images/map.png differ
diff --git a/level.tmx b/level.tmx
index d925b2b..be526de 100644
--- a/level.tmx
+++ b/level.tmx
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="15" height="500" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="287">
+<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="15" height="500" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="449">
  <tileset firstgid="1" source="tiles.tsx"/>
- <tileset firstgid="7" source="background.tsx"/>
+ <tileset firstgid="11" source="background.tsx"/>
  <objectgroup id="7" name="background" visible="0" parallaxy="0.75">
-  <object id="14" gid="7" x="0" y="6720" width="240" height="320"/>
-  <object id="15" gid="7" x="0" y="6400" width="240" height="320"/>
-  <object id="16" gid="7" x="0" y="6080" width="240" height="320"/>
+  <object id="14" gid="11" x="0" y="6720" width="240" height="320"/>
+  <object id="15" gid="11" x="0" y="6400" width="240" height="320"/>
+  <object id="16" gid="11" x="0" y="6080" width="240" height="320"/>
  </objectgroup>
  <layer id="1" name="foreground" width="15" height="500">
   <data encoding="csv">
@@ -39,34 +39,34 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,0,0,1,0,0,0,
-0,1,1,0,0,0,0,0,0,0,1,1,0,0,0,
+0,8,1,0,0,0,0,0,0,0,0,1,0,0,0,
+0,1,1,0,0,0,0,0,0,0,1,9,0,0,0,
 0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-0,1,1,2,0,0,0,0,0,0,0,3,1,1,0,
-1,1,1,1,2,0,0,0,0,3,1,1,1,1,1,
-1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+0,9,1,2,0,0,0,0,0,0,0,3,1,7,0,
+1,1,1,1,2,0,0,0,0,3,1,9,1,1,1,
+1,1,8,1,1,1,0,0,0,1,1,1,1,1,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,9,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,8,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
@@ -74,15 +74,15 @@
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,3,1,
 1,0,0,0,0,0,0,0,0,0,0,0,3,1,1,
-1,0,0,0,0,0,0,0,0,0,0,0,1,1,1,
+1,0,0,0,0,0,0,0,0,0,0,0,1,1,7,
 1,2,0,0,0,0,0,0,0,0,0,0,1,1,1,
-1,1,2,0,0,0,0,0,0,0,0,0,1,1,1,
+1,8,2,0,0,0,0,0,0,0,0,0,1,1,1,
 1,1,1,0,0,0,0,0,0,0,0,3,1,1,1,
-1,1,1,2,0,0,0,3,1,1,0,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,
+1,1,1,2,0,0,0,3,9,1,0,1,1,1,7,
 1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,
+1,1,1,1,7,1,1,1,1,1,0,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,
+1,1,1,1,1,1,1,1,1,9,0,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,
 1,1,1,1,1,1,1,1,1,5,0,4,1,1,1,
@@ -91,15 +91,15 @@
 1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,
 1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,
 1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,
+1,1,1,1,9,1,1,1,1,0,0,0,1,1,1,
 1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,
-1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,
-1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,
+1,1,1,1,1,1,1,8,1,0,0,0,1,7,1,
 1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,
 1,1,1,1,5,0,0,0,0,0,0,0,1,1,1,
 1,1,1,1,0,0,0,0,0,0,0,0,1,1,1,
 1,1,1,1,0,0,0,0,0,0,0,3,1,1,1,
 1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,
-1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,
+1,1,7,1,0,0,0,1,9,1,1,1,1,1,1,
 1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,
 1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,
 1,1,1,1,0,0,0,0,0,0,4,1,1,1,1,
@@ -107,79 +107,79 @@
 1,1,1,1,2,0,0,0,0,0,0,1,1,1,1,
 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,
 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,
+1,1,1,1,1,1,1,7,0,0,0,1,1,1,1,
 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,
-1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,
-1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,
+1,1,1,1,1,1,1,1,0,0,0,1,1,8,1,
 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,
 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,
 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,
 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,
 1,1,1,1,1,1,1,1,0,0,0,0,0,4,1,
 1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,
-1,1,1,1,1,1,1,1,2,0,0,0,0,0,1,
-1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,
-1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,
+1,1,1,1,7,1,1,1,2,0,0,0,0,0,1,
 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,
 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,
 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,
 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,
 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,
+1,1,1,1,1,8,1,1,1,1,1,0,0,0,1,
 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,
+1,1,1,1,1,1,1,1,1,7,1,0,0,0,1,
 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,
 1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,
 1,1,1,1,1,1,5,0,0,0,0,0,0,0,1,
-1,1,1,1,1,1,0,0,0,0,0,0,0,0,1,
+1,1,1,9,1,1,0,0,0,0,0,0,0,0,1,
 1,1,1,1,1,1,0,0,0,0,0,0,0,3,1,
 1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,
 1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,
+1,1,1,1,1,1,0,0,0,1,1,1,7,1,1,
+1,1,1,1,1,7,0,0,0,1,1,1,1,1,1,
 1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,
-1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,
-1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,
-1,1,5,0,0,0,0,0,0,1,1,1,1,1,1,
+1,7,5,0,0,0,0,0,0,1,1,1,1,1,1,
 1,1,0,0,0,0,0,0,0,1,1,1,1,1,1,
 1,1,0,0,0,0,0,0,3,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
+1,9,0,0,0,7,1,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
+1,1,0,0,0,1,9,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
+1,8,0,0,0,1,1,1,9,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
-1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
-1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
-1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
-1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
-1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,
+1,1,0,0,0,1,9,1,1,1,1,1,1,1,1,
+1,1,0,0,0,1,1,1,1,1,1,9,1,1,1,
 1,5,0,0,0,0,0,0,0,0,0,0,0,4,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+9,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,7,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,9,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,9,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+8,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,9,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+8,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
@@ -187,12 +187,15 @@
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,2,0,0,0,0,0,0,0,0,0,0,0,3,1,
 1,1,2,0,0,0,0,0,0,0,0,0,3,1,1,
-1,1,1,2,0,0,0,0,0,0,0,3,1,1,1,
+8,1,1,2,0,0,0,0,0,0,0,3,1,9,1,
 1,1,1,1,2,0,0,0,0,0,3,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
+1,8,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
+1,1,1,8,1,0,0,0,0,0,1,1,1,1,1,
+1,1,1,7,1,0,0,0,0,0,1,1,9,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
@@ -203,13 +206,17 @@
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
+1,1,1,1,1,0,0,0,0,0,1,1,9,1,1,
+1,1,1,7,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
+1,8,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
+1,1,1,1,1,0,0,0,0,0,1,1,1,8,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
@@ -219,32 +226,25 @@
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
+1,1,1,1,1,0,0,0,0,0,1,9,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
+1,1,9,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
+1,1,1,1,1,0,0,0,0,0,1,1,1,8,1,
+1,1,1,1,8,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
+1,1,1,1,1,0,0,0,0,0,1,1,1,8,1,
+1,1,8,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
+1,1,1,1,1,0,0,0,0,0,1,1,1,8,1,
+1,1,1,1,7,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
-1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
+1,7,1,1,1,0,0,0,0,0,1,1,8,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,
@@ -256,9 +256,9 @@
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+8,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,9,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
@@ -266,10 +266,10 @@
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,2,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,1,2,0,0,0,0,0,0,0,0,0,0,0,1,
-1,1,1,1,2,0,0,0,0,0,0,0,0,0,1,
-1,1,1,1,1,1,2,0,0,0,0,0,0,0,1,
+1,1,1,1,2,0,0,0,0,0,0,0,0,0,9,
+1,7,1,1,1,1,2,0,0,0,0,0,0,0,1,
 1,1,1,1,1,1,1,1,2,0,0,0,0,0,1,
-1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,
+1,1,1,1,1,7,1,1,1,1,0,0,0,0,1,
 1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,
 1,1,5,0,0,0,0,0,0,0,0,0,0,0,1,
 1,5,0,0,0,0,0,0,0,0,0,0,0,0,1,
@@ -277,7 +277,7 @@
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,3,1,
-1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,
+9,0,0,0,0,1,8,1,1,1,1,1,1,1,9,
 1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,4,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
@@ -285,32 +285,32 @@
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,2,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,
-1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,
+9,1,1,1,1,1,1,1,1,1,0,0,0,0,8,
+1,1,1,7,1,1,1,1,1,1,0,0,0,0,1,
 1,1,5,0,0,0,0,0,0,0,0,0,0,0,1,
 1,5,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,3,1,
 1,0,0,0,0,0,0,0,0,0,0,0,3,1,1,
-1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,
+8,0,0,0,0,1,1,7,1,1,1,1,1,1,7,
 1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,
 1,0,0,0,0,0,0,0,0,0,0,0,4,1,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,4,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,2,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,2,0,0,0,0,0,0,0,0,0,0,0,0,7,
 1,1,2,0,0,0,0,0,0,0,0,0,0,0,1,
-1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,
-1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,
+1,1,1,1,9,1,1,1,1,1,0,0,0,0,1,
+7,1,1,1,1,1,9,1,1,1,0,0,0,0,1,
 1,1,5,0,0,0,0,0,0,0,0,0,0,0,1,
 1,5,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,3,1,
 1,0,0,0,0,0,0,0,0,0,0,0,3,1,1,
-1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,
-1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,
+7,0,0,0,0,1,1,1,1,1,1,1,1,1,1,
+1,0,0,0,0,1,1,8,1,1,1,1,1,1,7,
 1,0,0,0,0,0,0,0,0,0,0,0,4,1,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,4,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
@@ -318,48 +318,48 @@
 1,2,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,1,2,0,0,0,0,0,0,0,0,0,0,0,1,
 1,1,1,1,1,1,1,1,1,0,0,0,0,0,1,
-1,1,1,1,1,1,1,1,1,0,0,0,0,0,1,
-1,1,1,1,1,1,1,1,1,0,0,0,0,0,1,
+1,8,1,1,1,1,1,8,1,0,0,0,0,0,9,
+1,1,1,1,9,1,1,1,1,0,0,0,0,0,1,
 1,1,1,1,1,1,1,1,1,0,0,0,0,0,1,
 1,5,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,3,1,
 1,0,0,0,0,0,0,0,0,0,0,0,3,1,1,
-1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,
+9,0,0,0,1,1,1,1,1,1,1,1,1,8,1,
 1,0,0,0,0,4,1,1,1,1,1,1,1,1,1,
-1,0,0,0,0,0,0,4,1,1,1,1,1,1,1,
+1,0,0,0,0,0,0,4,1,1,8,1,1,1,1,
 1,0,0,0,0,0,0,0,4,1,1,1,1,1,1,
 1,0,0,0,0,0,0,0,0,4,1,1,1,1,1,
-1,0,0,0,0,0,0,0,0,0,1,1,1,1,1,
+1,0,0,0,0,0,0,0,0,0,1,1,1,7,1,
 1,0,0,0,0,0,0,0,0,0,4,1,1,1,1,
 1,0,0,0,0,0,0,0,0,0,0,1,1,1,1,
 1,0,0,0,0,0,0,0,0,0,0,4,1,1,1,
 1,0,0,0,0,0,0,0,0,0,0,0,1,1,1,
-1,0,0,0,0,0,0,0,0,0,0,0,4,1,1,
+9,0,0,0,0,0,0,0,0,0,0,0,4,1,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,4,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,1,0,0,0,1,
 1,0,0,0,0,0,0,0,0,1,1,1,0,0,1,
-1,0,0,0,0,0,0,0,0,1,1,1,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,0,0,0,0,0,0,1,8,1,0,0,1,
+1,0,0,0,0,0,0,0,0,1,1,0,0,0,1,
+9,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,1,1,0,0,0,0,0,0,0,1,
-1,0,0,1,1,1,1,1,0,0,0,0,0,0,1,
-1,0,0,1,1,1,1,1,0,0,0,0,0,0,1,
+1,0,0,0,0,1,9,0,0,0,0,0,0,0,1,
+1,0,0,1,7,1,1,1,0,0,0,0,0,0,7,
+1,0,0,1,1,1,7,1,0,0,0,0,0,0,1,
 1,0,0,0,1,1,1,1,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,1,1,0,0,0,1,
-1,0,0,0,0,0,0,0,1,1,1,0,0,0,1,
+1,0,0,0,0,0,0,0,0,8,1,0,0,0,1,
 1,0,0,0,0,0,0,0,1,1,1,0,0,0,1,
+1,0,0,0,0,0,0,0,1,1,7,0,0,0,1,
 1,0,0,0,0,0,0,0,0,1,1,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
@@ -370,15 +370,10 @@
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,1,1,0,0,0,0,0,0,0,0,0,1,
+1,0,0,1,1,1,9,0,0,0,0,0,0,0,1,
+1,0,0,1,7,1,1,0,0,0,0,0,0,0,1,
 1,0,0,1,1,1,1,0,0,0,0,0,0,0,1,
-1,0,0,1,1,1,1,0,0,0,0,0,0,0,1,
-1,0,0,1,1,1,1,0,0,0,0,0,0,0,1,
-1,0,0,0,1,1,1,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,1,1,1,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
@@ -394,10 +389,12 @@
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+9,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,7,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
@@ -407,13 +404,16 @@
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,9,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+8,0,0,0,0,0,0,0,0,0,0,0,0,0,8,
 5,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -847,7 +847,7 @@
 6,0,0,0,0,0,0,0,0,0,6,0,0,0,6,
 6,0,0,0,0,0,0,0,0,6,6,6,0,0,6,
 6,0,0,0,0,0,0,0,0,6,6,6,0,0,6,
-6,0,0,0,0,0,0,0,0,0,0,0,0,0,6,
+6,0,0,0,0,0,0,0,0,6,6,0,0,0,6,
 6,0,0,0,0,0,0,0,0,0,0,0,0,0,6,
 6,0,0,0,0,0,0,0,0,0,0,0,0,0,6,
 6,0,0,0,0,0,0,0,0,0,0,0,0,0,6,
@@ -877,7 +877,7 @@
 6,0,0,6,6,6,6,0,0,0,0,0,0,0,6,
 6,0,0,6,6,6,6,0,0,0,0,0,0,0,6,
 6,0,0,6,6,6,6,0,0,0,0,0,0,0,6,
-6,0,0,0,6,6,6,0,0,0,0,0,0,0,6,
+6,0,0,6,6,6,0,0,0,0,0,0,0,0,6,
 6,0,0,0,0,0,0,0,0,0,0,0,0,0,6,
 6,0,0,0,0,0,0,0,0,0,0,0,0,0,6,
 6,0,0,0,0,0,0,0,0,0,0,0,0,0,6,
@@ -1016,7 +1016,7 @@
 </data>
  </layer>
  <objectgroup id="3" name="objects">
-  <object id="10" type="turret" x="96" y="7376" width="16" height="16"/>
+  <object id="10" type="turret" x="96" y="7424" width="16" height="16"/>
   <object id="11" type="turret" x="224" y="6480" width="16" height="16"/>
   <object id="19" type="popcorn" x="128" y="6320" width="16" height="16"/>
   <object id="20" type="popcorn" x="48" y="6272" width="16" height="16"/>
@@ -1033,21 +1033,6 @@
   <object id="31" type="popcorn" x="144" y="6400" width="16" height="16"/>
   <object id="39" type="flyer0" x="64" y="6736" width="16" height="16"/>
   <object id="42" type="flyer0" x="160" y="6736" width="16" height="16"/>
-  <object id="53" type="popcorn" x="0" y="6800" width="16" height="16"/>
-  <object id="54" type="popcorn" x="32" y="6800" width="16" height="16"/>
-  <object id="55" type="popcorn" x="64" y="6800" width="16" height="16"/>
-  <object id="56" type="popcorn" x="96" y="6800" width="16" height="16"/>
-  <object id="57" type="popcorn" x="16" y="6768" width="16" height="16"/>
-  <object id="58" type="popcorn" x="48" y="6768" width="16" height="16"/>
-  <object id="59" type="popcorn" x="80" y="6768" width="16" height="16"/>
-  <object id="60" type="popcorn" x="128" y="6800" width="16" height="16"/>
-  <object id="61" type="popcorn" x="160" y="6800" width="16" height="16"/>
-  <object id="62" type="popcorn" x="192" y="6800" width="16" height="16"/>
-  <object id="63" type="popcorn" x="224" y="6800" width="16" height="16"/>
-  <object id="64" type="popcorn" x="144" y="6768" width="16" height="16"/>
-  <object id="65" type="popcorn" x="176" y="6768" width="16" height="16"/>
-  <object id="66" type="popcorn" x="208" y="6768" width="16" height="16"/>
-  <object id="67" type="popcorn" x="112" y="6768" width="16" height="16"/>
   <object id="71" type="scroll-speed" x="0" y="4992" width="16" height="16">
    <properties>
     <property name="duration" type="int" value="30"/>
@@ -1060,71 +1045,11 @@
     <property name="speed" type="float" value="0.5"/>
    </properties>
   </object>
-  <object id="73" type="popcorn" x="0" y="7664" width="16" height="16"/>
-  <object id="74" type="popcorn" x="32" y="7664" width="16" height="16"/>
-  <object id="75" type="popcorn" x="64" y="7664" width="16" height="16"/>
-  <object id="76" type="popcorn" x="96" y="7664" width="16" height="16"/>
-  <object id="77" type="popcorn" x="16" y="7632" width="16" height="16"/>
-  <object id="78" type="popcorn" x="48" y="7632" width="16" height="16"/>
-  <object id="79" type="popcorn" x="80" y="7632" width="16" height="16"/>
-  <object id="80" type="popcorn" x="128" y="7664" width="16" height="16"/>
-  <object id="81" type="popcorn" x="160" y="7664" width="16" height="16"/>
-  <object id="82" type="popcorn" x="192" y="7664" width="16" height="16"/>
-  <object id="83" type="popcorn" x="224" y="7664" width="16" height="16"/>
-  <object id="84" type="popcorn" x="144" y="7632" width="16" height="16"/>
-  <object id="85" type="popcorn" x="176" y="7632" width="16" height="16"/>
-  <object id="86" type="popcorn" x="208" y="7632" width="16" height="16"/>
-  <object id="87" type="popcorn" x="112" y="7632" width="16" height="16"/>
-  <object id="88" type="popcorn" x="0" y="7600" width="16" height="16"/>
-  <object id="89" type="popcorn" x="32" y="7600" width="16" height="16"/>
-  <object id="90" type="popcorn" x="64" y="7600" width="16" height="16"/>
-  <object id="91" type="popcorn" x="96" y="7600" width="16" height="16"/>
-  <object id="92" type="popcorn" x="16" y="7568" width="16" height="16"/>
-  <object id="93" type="popcorn" x="48" y="7568" width="16" height="16"/>
-  <object id="94" type="popcorn" x="80" y="7568" width="16" height="16"/>
-  <object id="95" type="popcorn" x="128" y="7600" width="16" height="16"/>
-  <object id="96" type="popcorn" x="160" y="7600" width="16" height="16"/>
-  <object id="97" type="popcorn" x="192" y="7600" width="16" height="16"/>
-  <object id="98" type="popcorn" x="224" y="7600" width="16" height="16"/>
-  <object id="99" type="popcorn" x="144" y="7568" width="16" height="16"/>
-  <object id="100" type="popcorn" x="176" y="7568" width="16" height="16"/>
-  <object id="101" type="popcorn" x="208" y="7568" width="16" height="16"/>
-  <object id="102" type="popcorn" x="112" y="7568" width="16" height="16"/>
   <object id="103" type="turret" x="32" y="7232" width="16" height="16"/>
   <object id="104" type="turret" x="192" y="7232" width="16" height="16"/>
   <object id="105" type="turret" x="32" y="7056" width="16" height="16"/>
   <object id="106" type="turret" x="192" y="7056" width="16" height="16"/>
   <object id="107" type="turret" x="112" y="6992" width="16" height="16"/>
-  <object id="108" type="popcorn" x="0" y="7152" width="16" height="16"/>
-  <object id="109" type="popcorn" x="32" y="7152" width="16" height="16"/>
-  <object id="110" type="popcorn" x="64" y="7152" width="16" height="16"/>
-  <object id="111" type="popcorn" x="96" y="7152" width="16" height="16"/>
-  <object id="112" type="popcorn" x="16" y="7120" width="16" height="16"/>
-  <object id="113" type="popcorn" x="48" y="7120" width="16" height="16"/>
-  <object id="114" type="popcorn" x="80" y="7120" width="16" height="16"/>
-  <object id="115" type="popcorn" x="128" y="7152" width="16" height="16"/>
-  <object id="116" type="popcorn" x="160" y="7152" width="16" height="16"/>
-  <object id="117" type="popcorn" x="192" y="7152" width="16" height="16"/>
-  <object id="118" type="popcorn" x="224" y="7152" width="16" height="16"/>
-  <object id="119" type="popcorn" x="144" y="7120" width="16" height="16"/>
-  <object id="120" type="popcorn" x="176" y="7120" width="16" height="16"/>
-  <object id="121" type="popcorn" x="208" y="7120" width="16" height="16"/>
-  <object id="122" type="popcorn" x="112" y="7120" width="16" height="16"/>
-  <object id="123" type="popcorn" x="0" y="7328" width="16" height="16"/>
-  <object id="124" type="popcorn" x="32" y="7328" width="16" height="16"/>
-  <object id="125" type="popcorn" x="64" y="7328" width="16" height="16"/>
-  <object id="126" type="popcorn" x="96" y="7328" width="16" height="16"/>
-  <object id="127" type="popcorn" x="16" y="7296" width="16" height="16"/>
-  <object id="128" type="popcorn" x="48" y="7296" width="16" height="16"/>
-  <object id="129" type="popcorn" x="80" y="7296" width="16" height="16"/>
-  <object id="130" type="popcorn" x="128" y="7328" width="16" height="16"/>
-  <object id="131" type="popcorn" x="160" y="7328" width="16" height="16"/>
-  <object id="132" type="popcorn" x="192" y="7328" width="16" height="16"/>
-  <object id="133" type="popcorn" x="224" y="7328" width="16" height="16"/>
-  <object id="134" type="popcorn" x="144" y="7296" width="16" height="16"/>
-  <object id="135" type="popcorn" x="176" y="7296" width="16" height="16"/>
-  <object id="136" type="popcorn" x="208" y="7296" width="16" height="16"/>
-  <object id="137" type="popcorn" x="112" y="7296" width="16" height="16"/>
   <object id="138" type="flyer0" x="112" y="6672" width="16" height="16"/>
   <object id="139" type="flyer0" x="64" y="6608" width="16" height="16"/>
   <object id="140" type="flyer0" x="160" y="6608" width="16" height="16"/>
@@ -1226,7 +1151,6 @@
   <object id="224" type="popcorn" x="48" y="2128" width="16" height="16"/>
   <object id="225" type="popcorn" x="48" y="2160" width="16" height="16"/>
   <object id="226" type="popcorn" x="48" y="2064" width="16" height="16"/>
-  <object id="256" type="turret" x="96" y="7712" width="16" height="16"/>
   <object id="257" type="warning" x="0" y="224" width="16" height="16"/>
   <object id="258" type="chaser" x="112" y="3520" width="16" height="16"/>
   <object id="262" type="chaser" x="96" y="3488" width="16" height="16"/>
@@ -1251,5 +1175,101 @@
   <object id="284" type="popcorn" x="128" y="2944" width="16" height="16"/>
   <object id="285" type="popcorn" x="96" y="2912" width="16" height="16"/>
   <object id="286" type="popcorn" x="128" y="2880" width="16" height="16"/>
+  <object id="287" type="popcorn" x="96" y="2848" width="16" height="16"/>
+  <object id="288" type="turret" x="208" y="2368" width="16" height="16"/>
+  <object id="290" type="turret" x="208" y="4320" width="16" height="16"/>
+  <object id="291" type="turret" x="16" y="4208" width="16" height="16"/>
+  <object id="292" type="turret" x="16" y="4464" width="16" height="16"/>
+  <object id="293" type="turret" x="208" y="4592" width="16" height="16"/>
+  <object id="294" type="turret" x="16" y="4720" width="16" height="16"/>
+  <object id="295" type="turret" x="208" y="4848" width="16" height="16"/>
+  <object id="296" type="turret" x="16" y="4992" width="16" height="16"/>
+  <object id="297" type="turret" x="176" y="5344" width="16" height="16"/>
+  <object id="298" type="turret" x="48" y="5472" width="16" height="16"/>
+  <object id="299" type="turret" x="96" y="5824" width="16" height="16"/>
+  <object id="300" type="turret" x="128" y="5616" width="16" height="16"/>
+  <object id="301" type="turret" x="96" y="5104" width="16" height="16"/>
+  <object id="308" type="popcorn" x="160" y="4336" width="16" height="16"/>
+  <object id="309" type="popcorn" x="128" y="4336" width="16" height="16"/>
+  <object id="311" type="popcorn" x="96" y="4336" width="16" height="16"/>
+  <object id="312" type="popcorn" x="128" y="4464" width="16" height="16"/>
+  <object id="313" type="popcorn" x="96" y="4464" width="16" height="16"/>
+  <object id="314" type="popcorn" x="64" y="4464" width="16" height="16"/>
+  <object id="315" type="popcorn" x="128" y="4208" width="16" height="16"/>
+  <object id="316" type="popcorn" x="96" y="4208" width="16" height="16"/>
+  <object id="317" type="popcorn" x="64" y="4208" width="16" height="16"/>
+  <object id="318" type="popcorn" x="160" y="4592" width="16" height="16"/>
+  <object id="319" type="popcorn" x="128" y="4592" width="16" height="16"/>
+  <object id="320" type="popcorn" x="96" y="4592" width="16" height="16"/>
+  <object id="321" type="popcorn" x="128" y="4720" width="16" height="16"/>
+  <object id="322" type="popcorn" x="96" y="4720" width="16" height="16"/>
+  <object id="323" type="popcorn" x="64" y="4720" width="16" height="16"/>
+  <object id="324" type="popcorn" x="160" y="4848" width="16" height="16"/>
+  <object id="325" type="popcorn" x="128" y="4848" width="16" height="16"/>
+  <object id="326" type="popcorn" x="96" y="4848" width="16" height="16"/>
+  <object id="327" type="popcorn" x="128" y="5008" width="16" height="16"/>
+  <object id="328" type="popcorn" x="96" y="5008" width="16" height="16"/>
+  <object id="329" type="popcorn" x="64" y="5008" width="16" height="16"/>
+  <object id="360" type="popcorn-sweep-right" x="16" y="7520" width="16" height="16"/>
+  <object id="361" type="popcorn-sweep-left" x="208" y="7440" width="16" height="16"/>
+  <object id="363" type="popcorn-sweep-right" x="16" y="7344" width="16" height="16"/>
+  <object id="364" type="popcorn-sweep-left" x="208" y="7344" width="16" height="16"/>
+  <object id="365" type="popcorn-swarm" x="0" y="7184" width="16" height="16"/>
+  <object id="366" type="popcorn-swarm" x="32" y="7184" width="16" height="16"/>
+  <object id="367" type="popcorn-swarm" x="64" y="7184" width="16" height="16"/>
+  <object id="368" type="popcorn-swarm" x="96" y="7184" width="16" height="16"/>
+  <object id="369" type="popcorn-swarm" x="128" y="7184" width="16" height="16"/>
+  <object id="370" type="popcorn-swarm" x="160" y="7184" width="16" height="16"/>
+  <object id="371" type="popcorn-swarm" x="192" y="7184" width="16" height="16"/>
+  <object id="372" type="popcorn-swarm" x="224" y="7184" width="16" height="16"/>
+  <object id="373" type="popcorn-swarm" x="0" y="7152" width="16" height="16"/>
+  <object id="374" type="popcorn-swarm" x="32" y="7152" width="16" height="16"/>
+  <object id="375" type="popcorn-swarm" x="64" y="7152" width="16" height="16"/>
+  <object id="376" type="popcorn-swarm" x="96" y="7152" width="16" height="16"/>
+  <object id="377" type="popcorn-swarm" x="128" y="7152" width="16" height="16"/>
+  <object id="378" type="popcorn-swarm" x="160" y="7152" width="16" height="16"/>
+  <object id="379" type="popcorn-swarm" x="192" y="7152" width="16" height="16"/>
+  <object id="380" type="popcorn-swarm" x="224" y="7152" width="16" height="16"/>
+  <object id="389" type="popcorn-swarm" x="0" y="7120" width="16" height="16"/>
+  <object id="390" type="popcorn-swarm" x="32" y="7120" width="16" height="16"/>
+  <object id="391" type="popcorn-swarm" x="64" y="7120" width="16" height="16"/>
+  <object id="392" type="popcorn-swarm" x="96" y="7120" width="16" height="16"/>
+  <object id="393" type="popcorn-swarm" x="128" y="7120" width="16" height="16"/>
+  <object id="394" type="popcorn-swarm" x="160" y="7120" width="16" height="16"/>
+  <object id="395" type="popcorn-swarm" x="192" y="7120" width="16" height="16"/>
+  <object id="396" type="popcorn-swarm" x="224" y="7120" width="16" height="16"/>
+  <object id="397" type="popcorn-swarm" x="0" y="6864" width="16" height="16"/>
+  <object id="398" type="popcorn-swarm" x="32" y="6864" width="16" height="16"/>
+  <object id="399" type="popcorn-swarm" x="64" y="6864" width="16" height="16"/>
+  <object id="400" type="popcorn-swarm" x="96" y="6864" width="16" height="16"/>
+  <object id="401" type="popcorn-swarm" x="128" y="6864" width="16" height="16"/>
+  <object id="402" type="popcorn-swarm" x="160" y="6864" width="16" height="16"/>
+  <object id="403" type="popcorn-swarm" x="192" y="6864" width="16" height="16"/>
+  <object id="404" type="popcorn-swarm" x="224" y="6864" width="16" height="16"/>
+  <object id="405" type="popcorn-swarm" x="0" y="6832" width="16" height="16"/>
+  <object id="406" type="popcorn-swarm" x="32" y="6832" width="16" height="16"/>
+  <object id="407" type="popcorn-swarm" x="64" y="6832" width="16" height="16"/>
+  <object id="408" type="popcorn-swarm" x="96" y="6832" width="16" height="16"/>
+  <object id="409" type="popcorn-swarm" x="128" y="6832" width="16" height="16"/>
+  <object id="410" type="popcorn-swarm" x="160" y="6832" width="16" height="16"/>
+  <object id="411" type="popcorn-swarm" x="192" y="6832" width="16" height="16"/>
+  <object id="412" type="popcorn-swarm" x="224" y="6832" width="16" height="16"/>
+  <object id="413" type="popcorn-swarm" x="0" y="6800" width="16" height="16"/>
+  <object id="414" type="popcorn-swarm" x="32" y="6800" width="16" height="16"/>
+  <object id="415" type="popcorn-swarm" x="64" y="6800" width="16" height="16"/>
+  <object id="416" type="popcorn-swarm" x="96" y="6800" width="16" height="16"/>
+  <object id="417" type="popcorn-swarm" x="128" y="6800" width="16" height="16"/>
+  <object id="418" type="popcorn-swarm" x="160" y="6800" width="16" height="16"/>
+  <object id="419" type="popcorn-swarm" x="192" y="6800" width="16" height="16"/>
+  <object id="420" type="popcorn-swarm" x="224" y="6800" width="16" height="16"/>
+  <object id="421" type="turret" x="16" y="2368" width="16" height="16"/>
+  <object id="422" type="popcorn-sweep-right" x="16" y="224" width="16" height="16"/>
+  <object id="423" type="popcorn-sweep-left" x="208" y="224" width="16" height="16"/>
+  <object id="443" type="popcorn-swarm" x="80" y="576" width="16" height="16"/>
+  <object id="444" type="popcorn-swarm" x="112" y="576" width="16" height="16"/>
+  <object id="445" type="popcorn-swarm" x="144" y="576" width="16" height="16"/>
+  <object id="446" type="popcorn-swarm" x="80" y="544" width="16" height="16"/>
+  <object id="447" type="popcorn-swarm" x="112" y="544" width="16" height="16"/>
+  <object id="448" type="popcorn-swarm" x="144" y="544" width="16" height="16"/>
  </objectgroup>
 </map>
diff --git a/tiles.tsx b/tiles.tsx
index 9adb30c..924a5d7 100644
--- a/tiles.tsx
+++ b/tiles.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.8" tiledversion="1.8.6" name="tiles" tilewidth="16" tileheight="16" tilecount="7" columns="7">
- <image source="images/map.png" width="112" height="16"/>
+<tileset version="1.8" tiledversion="1.8.6" name="tiles" tilewidth="16" tileheight="16" tilecount="10" columns="10">
+ <image source="images/map.png" width="160" height="16"/>
 </tileset>
-- 
cgit v1.2.3