diff --git a/Crawler/Crawler.tiled-project b/Crawler/Crawler.tiled-project index 3968320a..ad3085de 100644 --- a/Crawler/Crawler.tiled-project +++ b/Crawler/Crawler.tiled-project @@ -117,7 +117,8 @@ "Green Slime", "Blue Slime", "Red Slime", - "Yellow Slime" + "Yellow Slime", + "Flower Turret" ], "valuesAsFlags": false }, @@ -264,19 +265,6 @@ "object" ] }, - { - "color": "#ffa40aa4", - "drawFill": true, - "id": 10, - "members": [ - ], - "name": "UpperZone", - "type": "class", - "useAs": [ - "property", - "object" - ] - }, { "color": "#ff35e500", "drawFill": true, @@ -289,6 +277,19 @@ "property", "tile" ] + }, + { + "color": "#ffa40aa4", + "drawFill": true, + "id": 10, + "members": [ + ], + "name": "UpperZone", + "type": "class", + "useAs": [ + "property", + "object" + ] } ] } diff --git a/Crawler/assets/Campaigns/1_1.tmx b/Crawler/assets/Campaigns/1_1.tmx index 6c83b46a..b17606e9 100644 --- a/Crawler/assets/Campaigns/1_1.tmx +++ b/Crawler/assets/Campaigns/1_1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="24" tileheight="24" infinite="1" nextlayerid="4" nextobjectid="1"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="24" tileheight="24" infinite="1" nextlayerid="5" nextobjectid="33"> <tileset firstgid="1" source="../maps/grass_tiles_24x24.tsx"/> <tileset firstgid="784" source="../maps/grass_tiles_modded.tsx"/> <layer id="1" name="Layer 1" width="64" height="64"> @@ -914,8 +914,8 @@ 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, -352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, -352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, +352,31,33,352,352,352,352,352,352,352,352,352,352,352,352,352, +352,89,91,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, @@ -934,8 +934,8 @@ 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, -352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, -352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, +352,352,352,352,352,352,352,352,352,352,31,33,352,352,352,352, +352,352,352,352,352,352,352,352,352,352,89,91,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352 @@ -989,8 +989,8 @@ 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, -352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, -352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, +352,352,352,352,352,31,33,352,352,352,352,352,352,352,352,352, +352,352,352,352,352,89,91,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352 </chunk> @@ -1106,8 +1106,8 @@ 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, -352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, -352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, +352,31,33,352,352,352,352,352,352,352,352,352,352,352,352,352, +352,89,91,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, @@ -1125,8 +1125,8 @@ 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, -352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, -352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, +352,352,352,352,352,352,352,352,352,352,352,31,33,352,352,352, +352,352,352,352,352,352,352,352,352,352,352,89,91,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, 352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, @@ -1178,8 +1178,8 @@ 352,352,352,352,352,352,352,352,352,352,352,524,525,525,525,525, 352,352,352,352,352,352,352,352,352,352,352,524,525,525,525,525, 352,352,352,352,352,352,352,352,352,352,352,524,525,525,525,525, -352,352,352,352,352,352,352,352,352,352,352,524,525,525,525,525, -352,352,352,352,352,352,352,352,352,352,352,524,525,525,503,525, +31,33,352,352,352,352,352,352,352,352,352,524,525,525,525,525, +89,91,352,352,352,352,352,352,352,352,352,524,525,525,503,525, 352,352,352,352,352,352,352,352,352,352,352,524,525,525,525,525, 352,352,352,352,352,352,352,352,352,352,352,524,525,525,525,525, 352,352,352,352,352,352,352,352,352,352,352,524,525,525,525,525, @@ -2214,8 +2214,8 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,181,182,0,0,0,0,0,0,0,0,0,0,0,100,0, -0,210,211,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,130,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -2234,8 +2234,8 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,181,182,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,210,211,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -2289,8 +2289,8 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,130,0,0,0, -0,0,0,0,0,181,182,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,210,211,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </chunk> @@ -2406,8 +2406,8 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,70,0,0,0,0,0,0,0,0, -0,181,182,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,210,211,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -2425,8 +2425,8 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,181,182,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,210,211,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -2478,8 +2478,8 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,130,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -181,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -210,211,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,70,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -3902,4 +3902,59 @@ </chunk> </data> </layer> + <objectgroup id="4" name="Spawn Groups"> + <object id="2" x="245.333" y="56" width="1.33333"/> + <object id="5" name="Spawn Group 1" type="SpawnGroup" x="362.667" y="-264" width="558.667" height="576"> + <ellipse/> + </object> + <object id="8" name="Spawn Group 2" type="SpawnGroup" x="1077.33" y="-245.333" width="521.333" height="534.667"> + <ellipse/> + </object> + <object id="10" name="Spawn Group 3" type="SpawnGroup" x="1877.33" y="-296" width="242.667" height="592"/> + <object id="12" name="Spawn Group 4" type="SpawnGroup" x="2645.33" y="-389.333" width="513.333" height="509.333"> + <ellipse/> + </object> + <object id="13" name="Spawn Group 5" type="SpawnGroup" x="2806.67" y="-854.667" width="413.333" height="228"> + <ellipse/> + </object> + <object id="14" name="Spawn Group 6" type="SpawnGroup" x="2798.67" y="-1450.67" width="625.333" height="249.333"> + <ellipse/> + </object> + <object id="15" x="2968" y="-1008"> + <ellipse/> + </object> + <object id="16" name="Spawn Group 7" type="SpawnGroup" x="2725.33" y="-2288" width="729.333" height="225.333"> + <ellipse/> + </object> + <object id="18" name="Spawn Group 8" type="SpawnGroup" x="2797.33" y="-2865.33" width="317.333" height="349.333"> + <ellipse/> + </object> + <object id="20" name="Spawn Group 9" type="SpawnGroup" x="2369.33" y="-3012" width="218.667" height="246.667"> + <ellipse/> + </object> + <object id="22" name="Spawn Group 10" type="SpawnGroup" x="2177.33" y="-3032" width="217.333" height="272"> + <ellipse/> + </object> + <object id="23" name="Spawn Group 11" type="SpawnGroup" x="1941.33" y="-3070.67" width="246.667" height="292"> + <ellipse/> + </object> + <object id="24" name="Spawn Group 12" type="SpawnGroup" x="1704" y="-3040" width="230.667" height="270.667"> + <ellipse/> + </object> + <object id="25" name="Spawn Group 13" type="SpawnGroup" x="1412" y="-3030.67" width="290.667" height="272"> + <ellipse/> + </object> + <object id="26" name="Spawn Group 14" type="SpawnGroup" x="1121.33" y="-3040" width="296" height="293.333"> + <ellipse/> + </object> + <object id="27" name="Spawn Group 15" type="SpawnGroup" x="904" y="-2606.67" width="400" height="388"> + <ellipse/> + </object> + <object id="28" name="Spawn Group 16" type="SpawnGroup" x="910.667" y="-2125.33" width="465.333" height="226.667"/> + <object id="30" name="Spawn Group 17" type="SpawnGroup" x="1825.33" y="-2038.67" width="173.333" height="304"/> + <object id="31" name="Spawn Group 18" type="SpawnGroup" x="2476" y="-2006.67" width="213.333" height="298.667"> + <ellipse/> + </object> + <object id="32" name="Spawn Group 19" type="SpawnGroup" x="3473.33" y="-2041.33" width="320" height="376"/> + </objectgroup> </map>