More varied flyer behavior; map tweaks.

1 files changed, 76 insertions, 49 deletions

diff --git a/level.tmx b/level.tmx
index be526de..288bf3f 100644
--- a/level.tmx
+++ b/level.tmx
@@ -1,5 +1,5 @@
 <?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="449">
+<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="576">
  <tileset firstgid="1" source="tiles.tsx"/>
  <tileset firstgid="11" source="background.tsx"/>
  <objectgroup id="7" name="background" visible="0" parallaxy="0.75">
@@ -317,15 +317,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,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,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,1,1,1,1,1,1,1,1,1,0,0,0,0,1,
+1,8,1,1,1,1,1,8,1,1,0,0,0,0,9,
 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,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,8,1,1,1,1,
@@ -821,15 +821,15 @@
 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,6,0,0,0,0,0,0,0,0,0,0,0,0,6,
-6,6,6,6,6,6,6,6,6,0,0,0,0,0,6,
-6,6,6,6,6,6,6,6,6,0,0,0,0,0,6,
-6,6,6,6,6,6,6,6,6,0,0,0,0,0,6,
-6,6,6,6,6,6,6,6,6,0,0,0,0,0,6,
+6,6,6,6,6,6,6,6,6,6,0,0,0,0,6,
+6,6,6,6,6,6,6,6,6,6,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,
 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,6,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,6,6,6,6,6,6,6,6,6,6,6,
 6,0,0,0,6,6,6,6,6,6,6,6,6,6,6,
 6,0,0,0,0,0,6,6,6,6,6,6,6,6,6,
 6,0,0,0,0,0,0,0,6,6,6,6,6,6,6,
@@ -1018,21 +1018,6 @@
  <objectgroup id="3" name="objects">
   <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"/>
-  <object id="21" type="popcorn" x="64" y="6288" width="16" height="16"/>
-  <object id="22" type="popcorn" x="80" y="6304" width="16" height="16"/>
-  <object id="23" type="popcorn" x="96" y="6320" width="16" height="16"/>
-  <object id="24" type="popcorn" x="112" y="6336" width="16" height="16"/>
-  <object id="25" type="popcorn" x="64" y="6432" width="16" height="16"/>
-  <object id="26" type="popcorn" x="96" y="6432" width="16" height="16"/>
-  <object id="27" type="popcorn" x="128" y="6432" width="16" height="16"/>
-  <object id="28" type="popcorn" x="160" y="6432" width="16" height="16"/>
-  <object id="29" type="popcorn" x="80" y="6400" width="16" height="16"/>
-  <object id="30" type="popcorn" x="112" y="6400" width="16" height="16"/>
-  <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="71" type="scroll-speed" x="0" y="4992" width="16" height="16">
    <properties>
     <property name="duration" type="int" value="30"/>
@@ -1049,24 +1034,10 @@
   <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="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"/>
-  <object id="141" type="flyer0" x="112" y="6544" width="16" height="16"/>
   <object id="142" type="turret" x="0" y="6480" width="16" height="16"/>
-  <object id="143" type="popcorn" x="144" y="6304" width="16" height="16"/>
-  <object id="144" type="popcorn" x="160" y="6288" width="16" height="16"/>
-  <object id="145" type="popcorn" x="176" y="6272" width="16" height="16"/>
-  <object id="146" type="turret" x="96" y="6144" width="16" height="16"/>
-  <object id="147" type="turret" x="112" y="6144" width="16" height="16"/>
-  <object id="148" type="turret" x="96" y="6160" width="16" height="16"/>
-  <object id="149" type="turret" x="112" y="6160" width="16" height="16"/>
-  <object id="150" type="flyer0" x="96" y="6000" width="16" height="16"/>
-  <object id="151" type="flyer0" x="128" y="6000" width="16" height="16"/>
-  <object id="152" type="flyer0" x="112" y="5952" width="16" height="16"/>
-  <object id="153" type="flyer0" x="96" y="5904" width="16" height="16"/>
-  <object id="154" type="flyer0" x="128" y="5904" width="16" height="16"/>
+  <object id="150" type="flyer0" x="64" y="6048" width="16" height="16"/>
+  <object id="153" type="flyer0" x="64" y="5904" width="16" height="16"/>
+  <object id="154" type="flyer0" x="160" y="5904" width="16" height="16"/>
   <object id="161" type="scroll-speed" x="0" y="4096" width="16" height="16">
    <properties>
     <property name="duration" type="int" value="30"/>
@@ -1183,7 +1154,6 @@
   <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"/>
@@ -1207,11 +1177,8 @@
   <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="360" type="popcorn-sweep-right" x="16" y="7568" width="16" height="16"/>
+  <object id="361" type="popcorn-sweep-left" x="208" y="7456" 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"/>
@@ -1271,5 +1238,65 @@
   <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"/>
+  <object id="461" type="flyer1-tunnel" x="176" y="4928" width="16" height="16"/>
+  <object id="463" type="flyer1-tunnel" x="176" y="4672" width="16" height="16"/>
+  <object id="464" type="flyer1-tunnel" x="176" y="4416" width="16" height="16"/>
+  <object id="465" type="turret" x="16" y="4960" width="16" height="16"/>
+  <object id="466" type="popcorn" x="128" y="4976" width="16" height="16"/>
+  <object id="467" type="popcorn" x="96" y="4976" width="16" height="16"/>
+  <object id="468" type="popcorn" x="64" y="4976" width="16" height="16"/>
+  <object id="469" type="flyer1-tunnel" x="176" y="4160" width="16" height="16"/>
+  <object id="470" type="flyer0" x="32" y="4752" width="16" height="16"/>
+  <object id="471" type="flyer0" x="32" y="4496" width="16" height="16"/>
+  <object id="472" type="flyer0" x="32" y="4240" width="16" height="16"/>
+  <object id="474" type="flyer0" x="112" y="3904" width="16" height="16"/>
+  <object id="482" type="flyer1-down-right" x="128" y="640" width="16" height="16"/>
+  <object id="483" type="flyer1-down-left" x="96" y="640" width="16" height="16"/>
+  <object id="487" type="flyer0" x="64" y="400" width="16" height="16"/>
+  <object id="488" type="flyer0" x="160" y="400" width="16" height="16"/>
+  <object id="489" type="flyer0" x="112" y="336" width="16" height="16"/>
+  <object id="490" type="flyer1-down" x="32" y="5040" width="16" height="16"/>
+  <object id="491" type="flyer0" x="112" y="6992" width="16" height="16"/>
+  <object id="492" type="turret" x="32" y="6656" width="16" height="16"/>
+  <object id="493" type="turret" x="192" y="6656" width="16" height="16"/>
+  <object id="494" type="turret" x="112" y="6592" width="16" height="16"/>
+  <object id="495" type="flyer0" x="112" y="6656" width="16" height="16"/>
+  <object id="496" type="flyer0" x="112" y="6512" width="16" height="16"/>
+  <object id="498" type="flyer0" x="112" y="6784" width="16" height="16"/>
+  <object id="500" type="flyer0" x="64" y="5584" width="16" height="16"/>
+  <object id="501" type="flyer0" x="160" y="5424" width="16" height="16"/>
+  <object id="502" type="flyer0" x="64" y="5232" width="16" height="16"/>
+  <object id="513" type="turret" x="96" y="6144" width="16" height="16"/>
+  <object id="514" type="turret" x="128" y="6144" width="16" height="16"/>
+  <object id="515" type="turret" x="96" y="6176" width="16" height="16"/>
+  <object id="517" type="turret" x="128" y="6176" width="16" height="16"/>
+  <object id="533" type="popcorn-down" x="176" y="5776" width="16" height="16"/>
+  <object id="534" type="popcorn-down" x="128" y="5760" width="16" height="16"/>
+  <object id="535" type="popcorn-down" x="144" y="5776" width="16" height="16"/>
+  <object id="536" type="popcorn-down" x="160" y="5792" width="16" height="16"/>
+  <object id="537" type="popcorn-down" x="192" y="5760" width="16" height="16"/>
+  <object id="548" type="popcorn-down" x="128" y="6400" width="16" height="16"/>
+  <object id="549" type="popcorn-down" x="48" y="6352" width="16" height="16"/>
+  <object id="550" type="popcorn-down" x="64" y="6368" width="16" height="16"/>
+  <object id="551" type="popcorn-down" x="80" y="6384" width="16" height="16"/>
+  <object id="552" type="popcorn-down" x="96" y="6400" width="16" height="16"/>
+  <object id="553" type="popcorn-down" x="112" y="6416" width="16" height="16"/>
+  <object id="554" type="popcorn-down" x="144" y="6384" width="16" height="16"/>
+  <object id="555" type="popcorn-down" x="160" y="6368" width="16" height="16"/>
+  <object id="556" type="popcorn-down" x="176" y="6352" width="16" height="16"/>
+  <object id="557" type="flyer0" x="112" y="6352" width="16" height="16"/>
+  <object id="563" type="popcorn-down" x="128" y="5968" width="16" height="16"/>
+  <object id="564" type="popcorn-down" x="80" y="5952" width="16" height="16"/>
+  <object id="565" type="popcorn-down" x="96" y="5968" width="16" height="16"/>
+  <object id="566" type="popcorn-down" x="112" y="5984" width="16" height="16"/>
+  <object id="567" type="popcorn-down" x="144" y="5952" width="16" height="16"/>
+  <object id="568" type="popcorn-down" x="48" y="5056" width="16" height="16"/>
+  <object id="569" type="popcorn-down" x="16" y="5056" width="16" height="16"/>
+  <object id="570" type="popcorn-down" x="32" y="5072" width="16" height="16"/>
+  <object id="571" type="flyer0" x="64" y="6224" width="16" height="16"/>
+  <object id="572" type="flyer0" x="160" y="6224" width="16" height="16"/>
+  <object id="573" type="flyer0" x="160" y="6048" width="16" height="16"/>
+  <object id="574" type="flyer0" x="64" y="5344" width="16" height="16"/>
+  <object id="575" type="flyer0" x="64" y="5664" width="16" height="16"/>
  </objectgroup>
 </map>