Start updating assets to use Christine's sprites; add nested scripts.

1 files changed, 131 insertions, 9 deletions

diff --git a/level.tmx b/level.tmx
index 8c376b1..9bb5348 100644
--- a/level.tmx
+++ b/level.tmx
@@ -1,8 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="15" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="14">
+<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="15" height="80" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="68">
  <tileset firstgid="1" source="tiles.tsx"/>
- <layer id="1" name="foreground" width="15" height="40">
+ <tileset firstgid="7" source="background.tsx"/>
+ <objectgroup id="7" name="background" visible="0" parallaxy="0.75">
+  <object id="14" gid="7" x="0" y="960" width="240" height="320"/>
+  <object id="15" gid="7" x="0" y="640" width="240" height="320"/>
+  <object id="16" gid="7" x="0" y="320" width="240" height="320"/>
+ </objectgroup>
+ <layer id="1" name="foreground" width="15" height="80">
   <data encoding="csv">
+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,
+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,
+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,
+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,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,
@@ -42,11 +68,51 @@
 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,3,1,
-1,1,2,0,0,0,0,0,0,0,0,0,3,1,1
+1,1,2,0,0,0,0,0,0,0,0,0,3,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,
+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,
+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,
+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
 </data>
  </layer>
- <layer id="5" name="collision" width="15" height="40">
+ <layer id="5" name="collision" width="15" height="80">
   <data encoding="csv">
+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,
+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,
+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,
+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,
 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,
@@ -86,13 +152,69 @@
 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,6,0,0,0,0,0,0,0,0,0,0,0,6,6
+6,6,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,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,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,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,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
 </data>
  </layer>
  <objectgroup id="3" name="objects">
-  <object id="10" type="enemy-a" x="16" y="336" width="16" height="16"/>
-  <object id="11" type="enemy-a" x="192" y="336" width="16" height="16"/>
-  <object id="12" type="enemy-a" x="112" y="176" width="16" height="16"/>
-  <object id="13" type="enemy-a" x="112" y="0" width="16" height="16"/>
+  <object id="10" type="turret" x="16" y="656" width="16" height="16"/>
+  <object id="11" type="turret" x="192" y="656" width="16" height="16"/>
+  <object id="17" type="flyer0" x="96" y="320" width="16" height="16"/>
+  <object id="19" type="popcorn" x="144" y="416" width="16" height="16"/>
+  <object id="20" type="popcorn" x="144" y="448" width="16" height="16"/>
+  <object id="21" type="popcorn" x="144" y="480" width="16" height="16"/>
+  <object id="22" type="popcorn" x="128" y="512" width="16" height="16"/>
+  <object id="23" type="popcorn" x="112" y="544" width="16" height="16"/>
+  <object id="24" type="popcorn" x="112" y="576" width="16" height="16"/>
+  <object id="25" type="popcorn" x="64" y="672" width="16" height="16"/>
+  <object id="26" type="popcorn" x="96" y="672" width="16" height="16"/>
+  <object id="27" type="popcorn" x="128" y="672" width="16" height="16"/>
+  <object id="28" type="popcorn" x="160" y="672" width="16" height="16"/>
+  <object id="29" type="popcorn" x="80" y="640" width="16" height="16"/>
+  <object id="30" type="popcorn" x="112" y="640" width="16" height="16"/>
+  <object id="31" type="popcorn" x="144" y="640" width="16" height="16"/>
+  <object id="32" type="flyer0" x="128" y="320" width="16" height="16"/>
+  <object id="33" type="flyer0" x="112" y="272" width="16" height="16"/>
+  <object id="34" type="flyer0" x="96" y="224" width="16" height="16"/>
+  <object id="35" type="flyer0" x="128" y="224" width="16" height="16"/>
+  <object id="36" type="boss" x="112" y="48" width="16" height="16"/>
+  <object id="39" type="flyer0" x="48" y="976" width="16" height="16"/>
+  <object id="40" type="flyer0" x="96" y="976" width="16" height="16"/>
+  <object id="41" type="flyer0" x="144" y="976" width="16" height="16"/>
+  <object id="42" type="flyer0" x="192" y="976" width="16" height="16"/>
+  <object id="53" type="popcorn" x="0" y="1040" width="16" height="16"/>
+  <object id="54" type="popcorn" x="32" y="1040" width="16" height="16"/>
+  <object id="55" type="popcorn" x="64" y="1040" width="16" height="16"/>
+  <object id="56" type="popcorn" x="96" y="1040" width="16" height="16"/>
+  <object id="57" type="popcorn" x="16" y="1008" width="16" height="16"/>
+  <object id="58" type="popcorn" x="48" y="1008" width="16" height="16"/>
+  <object id="59" type="popcorn" x="80" y="1008" width="16" height="16"/>
+  <object id="60" type="popcorn" x="128" y="1040" width="16" height="16"/>
+  <object id="61" type="popcorn" x="160" y="1040" width="16" height="16"/>
+  <object id="62" type="popcorn" x="192" y="1040" width="16" height="16"/>
+  <object id="63" type="popcorn" x="224" y="1040" width="16" height="16"/>
+  <object id="64" type="popcorn" x="144" y="1008" width="16" height="16"/>
+  <object id="65" type="popcorn" x="176" y="1008" width="16" height="16"/>
+  <object id="66" type="popcorn" x="208" y="1008" width="16" height="16"/>
+  <object id="67" type="popcorn" x="112" y="1008" width="16" height="16"/>
  </objectgroup>
 </map>