Release build 1238. Fixed bug with collisions not being enabled on tiles with a class. Fixed a bug with upper level tiles not being rendered proper. Made entire object part of the fade group instead of leaving the bases solid.

1 year ago · 4cdb73333d
parent d88b747900
commit 4cdb73333d
9 changed files with 293 additions and 264 deletions
--- a/Crawler/Crawler.cpp
+++ b/Crawler/Crawler.cpp
@ -536,9 +536,9 @@ void Crawler::RenderTile(vi2d pos,TilesheetData tileSheet,int tileSheetIndex,vi2
 }

 void Crawler::RenderTile(TileRenderData&tileSheet,Pixel col){
-	if(tileSheet.tileSheet.tileset->animationData.count(tileSheet.tileID)){
-		int animationDuration_ms=tileSheet.tileSheet.tileset->animationData[tileSheet.tileID].size()*"animation_tile_precision"_I;
-		int animatedIndex=tileSheet.tileSheet.tileset->animationData[tileSheet.tileID][int(fmod(levelTime*1000,animationDuration_ms)/"animation_tile_precision"_I)];
+	if(tileSheet.tileSheet.tileset->animationData.count(tileSheet.tileID%1000000)){
+		int animationDuration_ms=tileSheet.tileSheet.tileset->animationData[tileSheet.tileID%1000000].size()*"animation_tile_precision"_I;
+		int animatedIndex=tileSheet.tileSheet.tileset->animationData[tileSheet.tileID%1000000][int(fmod(levelTime*1000,animationDuration_ms)/"animation_tile_precision"_I)];
 		int tileSheetWidth=tileSheet.tileSheet.tileset->tileset->Sprite()->width/24;
 		int tileSheetX=animatedIndex%tileSheetWidth;
 		int tileSheetY=animatedIndex/tileSheetWidth;
@ -1022,7 +1022,7 @@ void Crawler::LoadLevel(MapName map){
 									groups.push_back(group);
 								}
 							};
-							TileRenderData tile={tileSheet,vi2d{x,y}*24,vi2d{tileSheetX,tileSheetY}*24,realTileSheetIndex,layerID};
+							TileRenderData tile={tileSheet,vi2d{x,y}*24,vi2d{tileSheetX,tileSheetY}*24,tileID,layerID};
 							SetupTileGroups([&](TilesheetData sheet,int tileID){return IsForegroundTile(sheet,tileID);},tile,foregroundTilesAdded,foregroundTileGroups);
 							SetupTileGroups([&](TilesheetData sheet,int tileID){return IsUpperForegroundTile(tileID);},tile,upperForegroundTilesAdded,upperForegroundTileGroups);
 						#pragma endregion
@ -1084,7 +1084,7 @@ TilesheetData Crawler::GetTileSheet(MapName map,int tileID){
 		return {&MAP_TILESETS["assets/maps/"+baseSourceDir],1};
 	} else {
 		for (int i=1;i<tileData.size();i++){
-			if(tileID<stoi(tileData[i].data["firstgid"])-1){
+			if(tileID%1000000<stoi(tileData[i].data["firstgid"])-1){
 				size_t slashMarkerSourceDir = tileData[i-1].data["source"].find_last_of('/');
 				std::string baseSourceDir=tileData[i-1].data["source"].substr(slashMarkerSourceDir+1);
 				return {&MAP_TILESETS["assets/maps/"+baseSourceDir],stoi(tileData[i-1].data["firstgid"])};
@ -1131,8 +1131,8 @@ geom2d::rect<int>Crawler::GetTileCollision(MapName map,vf2d pos,bool upperLevel)
 	int counter=0;
 	geom2d::rect<int>foundRect=NO_COLLISION;
 	for(LayerTag&layer:MAP_DATA[map].LayerData){
-		auto HasNoClass=[&](){return layer.tag.data.find("class")==layer.tag.data.end();};
-		if(HasNoClass()&&counter!=bridgeLayerIndex){
+		//auto HasNoClass=[&](){return layer.tag.data.find("class")==layer.tag.data.end();};
+		if(counter!=bridgeLayerIndex){
 			int tileID=layer.tiles[int(pos.y)/24][int(pos.x)/24]-1;
 			if(tileID!=-1&&GetTileSheet(map,tileID%1000000).tileset->collision.find(tileID%1000000-GetTileSheet(map,tileID%1000000).firstgid+1)!=GetTileSheet(map,tileID%1000000).tileset->collision.end()){
 				geom2d::rect<int>collisionRect=GetTileSheet(map,tileID%1000000).tileset->collision[tileID%1000000-GetTileSheet(map,tileID%1000000).firstgid+1].collision;
--- a/Crawler/TSXParser.h
+++ b/Crawler/TSXParser.h
@ -91,12 +91,17 @@ class TSXParser{
            parsedTilesetInfo.ImageData=newTag;
        } else
        if (newTag.tag=="tile"&&newTag.data["type"]=="ForegroundTile"){
+            previousTag=newTag.tag;
+            previousTagID=newTag.GetInteger("id");
            parsedTilesetInfo.ForegroundTileData[newTag.GetInteger("id")]=newTag;
        } else
        if (newTag.tag=="tile"&&newTag.data["type"]=="UpperForegroundTile"){
+            previousTag=newTag.tag;
+            previousTagID=newTag.GetInteger("id");
            parsedTilesetInfo.UpperForegroundTileData[newTag.GetInteger("id")]=newTag;
        } else
        if (newTag.tag=="tile"&&newTag.data["type"]=="Staircase"){
+            previousTag=newTag.tag;
            staircaseTag=newTag.tag;
            previousTagID=newTag.GetInteger("id");
        } else
--- a/Crawler/Version.h
+++ b/Crawler/Version.h
@ -2,7 +2,7 @@
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 2
 #define VERSION_PATCH 0
-#define VERSION_BUILD 1226
+#define VERSION_BUILD 1238

 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
--- a/Crawler/assets/Campaigns/1_1_v2.tmx
+++ b/Crawler/assets/Campaigns/1_1_v2.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="205" height="205" tilewidth="24" tileheight="24" infinite="0" nextlayerid="9" nextobjectid="127">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="205" height="205" tilewidth="24" tileheight="24" infinite="0" nextlayerid="9" nextobjectid="128">
 <tileset firstgid="1" source="../maps/Tilesheet_No_Shadow24x24.tsx"/>
 <tileset firstgid="2913" source="../maps/Decorations_c1_No_Shadow24x24.tsx"/>
 <tileset firstgid="4533" source="../maps/24x24_Waterfall.tsx"/>
@ -1267,7 +1267,7 @@
  <object id="123" name="Upper Zone" type="UpperZone" x="4056" y="1938" width="816" height="780"/>
  <object id="124" name="Upper Zone" type="UpperZone" x="4176" y="1848" width="534" height="90"/>
 </objectgroup>
- <objectgroup id="5" name="Spawn Groups" visible="0">
+ <objectgroup id="5" name="Spawn Groups">
  <object id="2" name="Spawn Group 1" type="SpawnGroup" x="870" y="4008" width="558.667" height="576">
   <ellipse/>
  </object>
--- a/Crawler/assets/maps/Decorations_c1_No_Shadow24x24.tsx
+++ b/Crawler/assets/maps/Decorations_c1_No_Shadow24x24.tsx
@ -201,97 +201,97 @@
 <tile id="356" type="ForegroundTile"/>
 <tile id="357" type="ForegroundTile"/>
 <tile id="358" type="ForegroundTile"/>
- <tile id="363">
+ <tile id="363" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="5" y="0" width="19" height="21"/>
  </objectgroup>
 </tile>
- <tile id="364">
+ <tile id="364" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="5" x="0" y="0" width="21" height="22"/>
  </objectgroup>
 </tile>
- <tile id="369">
+ <tile id="369" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="12" y="0" width="12" height="18"/>
  </objectgroup>
 </tile>
- <tile id="370">
+ <tile id="370" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="374">
+ <tile id="374" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="2" x="15" y="0" width="9" height="20"/>
  </objectgroup>
 </tile>
- <tile id="375">
+ <tile id="375" type="ForegroundTile">
  <objectgroup draworder="index" id="3">
   <object id="4" x="0" y="0" width="19" height="24"/>
  </objectgroup>
 </tile>
- <tile id="379">
+ <tile id="379" type="ForegroundTile">
  <objectgroup draworder="index" id="4">
   <object id="3" x="3" y="0" width="19" height="16"/>
  </objectgroup>
 </tile>
- <tile id="382">
+ <tile id="382" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="12" y="0" width="12" height="19"/>
  </objectgroup>
 </tile>
- <tile id="383">
+ <tile id="383" type="ForegroundTile">
  <objectgroup draworder="index" id="3">
   <object id="2" x="0" y="0" width="15" height="18"/>
  </objectgroup>
 </tile>
- <tile id="386">
+ <tile id="386" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="21"/>
  </objectgroup>
 </tile>
- <tile id="388">
+ <tile id="388" type="ForegroundTile">
  <objectgroup draworder="index" id="3">
   <object id="2" x="21" y="0" width="3" height="10"/>
  </objectgroup>
 </tile>
- <tile id="389">
+ <tile id="389" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="19"/>
  </objectgroup>
 </tile>
- <tile id="392">
+ <tile id="392" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="11" y="0" width="12" height="18"/>
  </objectgroup>
 </tile>
- <tile id="395">
+ <tile id="395" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="7" y="0" width="17" height="19"/>
  </objectgroup>
 </tile>
- <tile id="396">
+ <tile id="396" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="16" height="19"/>
  </objectgroup>
 </tile>
- <tile id="399">
+ <tile id="399" type="ForegroundTile">
  <objectgroup draworder="index" id="3">
   <object id="4" x="22" y="0" width="2" height="10"/>
  </objectgroup>
 </tile>
- <tile id="400">
+ <tile id="400" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="19"/>
  </objectgroup>
 </tile>
- <tile id="402">
+ <tile id="402" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="10" y="0" width="14" height="21"/>
  </objectgroup>
 </tile>
- <tile id="403">
+ <tile id="403" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="12" height="21"/>
  </objectgroup>
@ -371,12 +371,12 @@
   <object id="1" x="0" y="0" width="10" height="8"/>
  </objectgroup>
 </tile>
- <tile id="483">
+ <tile id="483" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="5" y="0" width="19" height="15"/>
  </objectgroup>
 </tile>
- <tile id="484">
+ <tile id="484" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="16" height="18"/>
  </objectgroup>
@ -387,6 +387,7 @@
 <tile id="500" type="ForegroundTile"/>
 <tile id="501" type="ForegroundTile"/>
 <tile id="502" type="ForegroundTile"/>
+ <tile id="503" type="ForegroundTile"/>
 <tile id="504">
  <objectgroup draworder="index" id="2">
   <object id="1" x="7" y="0" width="17" height="15"/>
@ -407,7 +408,7 @@
   <object id="1" x="0" y="0" width="15" height="15"/>
  </objectgroup>
 </tile>
- <tile id="508">
+ <tile id="508" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="18"/>
  </objectgroup>
@ -427,53 +428,53 @@
   <object id="1" x="0" y="10" width="21" height="14"/>
  </objectgroup>
 </tile>
- <tile id="514">
+ <tile id="514" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="3" y="0" width="21" height="24"/>
  </objectgroup>
 </tile>
- <tile id="515">
+ <tile id="515" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="516">
+ <tile id="516" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="517">
+ <tile id="517" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="21"/>
   <object id="2" x="0" y="0" width="24" height="21"/>
  </objectgroup>
 </tile>
- <tile id="518">
+ <tile id="518" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="519">
+ <tile id="519" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="3" y="0" width="21" height="24"/>
  </objectgroup>
 </tile>
- <tile id="520">
+ <tile id="520" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="521">
+ <tile id="521" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="522">
+ <tile id="522" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="21"/>
  </objectgroup>
 </tile>
- <tile id="523">
+ <tile id="523" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
@ -502,57 +503,57 @@
 <tile id="551" type="ForegroundTile"/>
 <tile id="552" type="ForegroundTile"/>
 <tile id="553" type="ForegroundTile"/>
- <tile id="554">
+ <tile id="554" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="3" y="0" width="21" height="12"/>
  </objectgroup>
 </tile>
- <tile id="555">
+ <tile id="555" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="12"/>
  </objectgroup>
 </tile>
- <tile id="556">
+ <tile id="556" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="21" height="9"/>
  </objectgroup>
 </tile>
- <tile id="560">
+ <tile id="560" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="7" y="0" width="17" height="12"/>
  </objectgroup>
 </tile>
- <tile id="561">
+ <tile id="561" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="21"/>
  </objectgroup>
 </tile>
- <tile id="562">
+ <tile id="562" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="3" height="15"/>
  </objectgroup>
 </tile>
- <tile id="563">
+ <tile id="563" type="ForegroundTile">
  <objectgroup draworder="index" id="3">
   <object id="2" x="0" y="0" width="18" height="6"/>
  </objectgroup>
 </tile>
- <tile id="565">
+ <tile id="565" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="7" y="0" width="17" height="12"/>
  </objectgroup>
 </tile>
- <tile id="566">
+ <tile id="566" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="21"/>
  </objectgroup>
 </tile>
- <tile id="567">
+ <tile id="567" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="3" height="15"/>
  </objectgroup>
 </tile>
- <tile id="568">
+ <tile id="568" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="18" height="6"/>
  </objectgroup>
@ -574,22 +575,22 @@
 </tile>
 <tile id="573" type="ForegroundTile"/>
 <tile id="574" type="ForegroundTile"/>
- <tile id="587">
+ <tile id="587" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="1" y="0" width="23" height="24"/>
  </objectgroup>
 </tile>
- <tile id="588">
+ <tile id="588" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="589">
+ <tile id="589" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="590">
+ <tile id="590" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="16" height="18"/>
  </objectgroup>
@ -637,12 +638,12 @@
 <tile id="599" type="ForegroundTile"/>
 <tile id="600" type="ForegroundTile"/>
 <tile id="601" type="ForegroundTile"/>
- <tile id="618">
+ <tile id="618" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="5" y="0" width="19" height="15"/>
  </objectgroup>
 </tile>
- <tile id="619">
+ <tile id="619" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="15" height="18"/>
  </objectgroup>
@ -651,72 +652,73 @@
 <tile id="624" type="ForegroundTile"/>
 <tile id="625" type="ForegroundTile"/>
 <tile id="626" type="ForegroundTile"/>
- <tile id="632">
+ <tile id="632" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="15" y="0" width="9" height="4"/>
  </objectgroup>
 </tile>
- <tile id="633">
+ <tile id="633" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="12"/>
  </objectgroup>
 </tile>
- <tile id="634">
+ <tile id="634" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="16" height="10"/>
  </objectgroup>
 </tile>
- <tile id="636">
+ <tile id="635" type="ForegroundTile"/>
+ <tile id="636" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="12" y="0" width="12" height="7"/>
  </objectgroup>
 </tile>
- <tile id="637">
+ <tile id="637" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="10"/>
  </objectgroup>
 </tile>
- <tile id="638">
+ <tile id="638" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="12" height="6"/>
  </objectgroup>
 </tile>
- <tile id="639">
+ <tile id="639" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="16" y="0" width="8" height="12"/>
  </objectgroup>
 </tile>
- <tile id="640">
+ <tile id="640" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="13"/>
  </objectgroup>
 </tile>
- <tile id="641">
+ <tile id="641" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="12" height="12"/>
  </objectgroup>
 </tile>
- <tile id="642">
+ <tile id="642" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="6" y="0" width="18" height="13"/>
  </objectgroup>
 </tile>
- <tile id="643">
+ <tile id="643" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="18" height="15"/>
  </objectgroup>
 </tile>
- <tile id="644">
+ <tile id="644" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="4" y="0" width="20" height="15"/>
  </objectgroup>
 </tile>
- <tile id="645">
+ <tile id="645" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="16"/>
  </objectgroup>
 </tile>
- <tile id="646">
+ <tile id="646" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="18" height="15"/>
  </objectgroup>
@ -729,22 +731,22 @@
 <tile id="678" type="ForegroundTile"/>
 <tile id="679" type="ForegroundTile"/>
 <tile id="680" type="ForegroundTile"/>
- <tile id="713">
+ <tile id="713" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="19" y="0" width="5" height="16"/>
  </objectgroup>
 </tile>
- <tile id="714">
+ <tile id="714" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="3" height="16"/>
  </objectgroup>
 </tile>
- <tile id="715">
+ <tile id="715" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="19" y="0" width="5" height="15"/>
  </objectgroup>
 </tile>
- <tile id="716">
+ <tile id="716" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="3" height="13"/>
  </objectgroup>
@ -768,17 +770,18 @@
 <tile id="776" type="ForegroundTile"/>
 <tile id="777" type="ForegroundTile"/>
 <tile id="778" type="ForegroundTile"/>
- <tile id="812">
+ <tile id="812" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="1" y="0" width="23" height="24"/>
  </objectgroup>
 </tile>
- <tile id="814">
+ <tile id="813" type="ForegroundTile"/>
+ <tile id="814" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="815">
+ <tile id="815" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="16" height="18"/>
  </objectgroup>
@ -838,57 +841,58 @@
   <object id="1" x="0" y="3" width="19" height="21"/>
  </objectgroup>
 </tile>
- <tile id="857">
+ <tile id="857" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="15" y="0" width="9" height="4"/>
  </objectgroup>
 </tile>
- <tile id="858">
+ <tile id="858" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="12"/>
  </objectgroup>
 </tile>
- <tile id="859">
+ <tile id="859" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="16" height="10"/>
  </objectgroup>
 </tile>
- <tile id="861">
+ <tile id="860" type="ForegroundTile"/>
+ <tile id="861" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="12" y="0" width="12" height="7"/>
  </objectgroup>
 </tile>
- <tile id="862">
+ <tile id="862" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="10"/>
  </objectgroup>
 </tile>
- <tile id="863">
+ <tile id="863" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="12" height="6"/>
  </objectgroup>
 </tile>
- <tile id="864">
+ <tile id="864" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="16" y="0" width="8" height="12"/>
  </objectgroup>
 </tile>
- <tile id="865">
+ <tile id="865" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="13"/>
  </objectgroup>
 </tile>
- <tile id="866">
+ <tile id="866" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="12" height="12"/>
  </objectgroup>
 </tile>
- <tile id="867">
+ <tile id="867" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="2" x="6" y="0" width="18" height="13"/>
  </objectgroup>
 </tile>
- <tile id="868">
+ <tile id="868" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="18" height="15"/>
  </objectgroup>
@ -1129,6 +1133,9 @@
 <tile id="1310" type="ForegroundTile"/>
 <tile id="1311" type="ForegroundTile"/>
 <tile id="1312" type="ForegroundTile"/>
+ <tile id="1325" type="ForegroundTile"/>
+ <tile id="1326" type="ForegroundTile"/>
+ <tile id="1327" type="ForegroundTile"/>
 <tile id="1332" type="ForegroundTile"/>
 <tile id="1333" type="ForegroundTile"/>
 <tile id="1334" type="ForegroundTile"/>
@ -1141,6 +1148,11 @@
 <tile id="1355" type="ForegroundTile"/>
 <tile id="1356" type="ForegroundTile"/>
 <tile id="1357" type="ForegroundTile"/>
+ <tile id="1369" type="ForegroundTile"/>
+ <tile id="1370" type="ForegroundTile"/>
+ <tile id="1371" type="ForegroundTile"/>
+ <tile id="1372" type="ForegroundTile"/>
+ <tile id="1373" type="ForegroundTile"/>
 <tile id="1376" type="ForegroundTile"/>
 <tile id="1377" type="ForegroundTile"/>
 <tile id="1378" type="ForegroundTile"/>
@ -1157,27 +1169,27 @@
 <tile id="1400" type="ForegroundTile"/>
 <tile id="1401" type="ForegroundTile"/>
 <tile id="1402" type="ForegroundTile"/>
- <tile id="1414">
+ <tile id="1414" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="4" y="0" width="20" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1415">
+ <tile id="1415" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1416">
+ <tile id="1416" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1417">
+ <tile id="1417" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1418">
+ <tile id="1418" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="21" height="24"/>
  </objectgroup>
@ -1232,197 +1244,197 @@
   <object id="1" x="0" y="16" width="21" height="8"/>
  </objectgroup>
 </tile>
- <tile id="1459">
+ <tile id="1459" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="3" y="0" width="21" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1460">
+ <tile id="1460" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1461">
+ <tile id="1461" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1462">
+ <tile id="1462" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1463">
+ <tile id="1463" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="21" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1466">
+ <tile id="1466" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="3" y="0" width="21" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1467">
+ <tile id="1467" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1468">
+ <tile id="1468" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1469">
+ <tile id="1469" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1470">
+ <tile id="1470" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="21" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1477">
+ <tile id="1477" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="3" y="0" width="21" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1478">
+ <tile id="1478" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1479">
+ <tile id="1479" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1480">
+ <tile id="1480" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1481">
+ <tile id="1481" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="21" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1504">
+ <tile id="1504" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="4" y="0" width="20" height="13"/>
  </objectgroup>
 </tile>
- <tile id="1505">
+ <tile id="1505" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1506">
+ <tile id="1506" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1507">
+ <tile id="1507" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1508">
+ <tile id="1508" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="18" height="10"/>
  </objectgroup>
 </tile>
- <tile id="1511">
+ <tile id="1511" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="4" y="0" width="20" height="13"/>
  </objectgroup>
 </tile>
- <tile id="1512">
+ <tile id="1512" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1513">
+ <tile id="1513" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1514">
+ <tile id="1514" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1515">
+ <tile id="1515" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="18" height="10"/>
  </objectgroup>
 </tile>
- <tile id="1522">
+ <tile id="1522" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="4" y="0" width="20" height="13"/>
  </objectgroup>
 </tile>
- <tile id="1523">
+ <tile id="1523" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1524">
+ <tile id="1524" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1525">
+ <tile id="1525" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="24"/>
  </objectgroup>
 </tile>
- <tile id="1526">
+ <tile id="1526" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="18" height="10"/>
  </objectgroup>
 </tile>
- <tile id="1550">
+ <tile id="1550" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="10" y="0" width="14" height="7"/>
  </objectgroup>
 </tile>
- <tile id="1551">
+ <tile id="1551" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="7"/>
  </objectgroup>
 </tile>
- <tile id="1552">
+ <tile id="1552" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="9" height="7"/>
  </objectgroup>
 </tile>
- <tile id="1557">
+ <tile id="1557" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="10" y="0" width="14" height="7"/>
  </objectgroup>
 </tile>
- <tile id="1558">
+ <tile id="1558" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="7"/>
  </objectgroup>
 </tile>
- <tile id="1559">
+ <tile id="1559" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="9" height="7"/>
  </objectgroup>
 </tile>
- <tile id="1568">
+ <tile id="1568" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="10" y="0" width="14" height="7"/>
  </objectgroup>
 </tile>
- <tile id="1569">
+ <tile id="1569" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="24" height="7"/>
  </objectgroup>
 </tile>
- <tile id="1570">
+ <tile id="1570" type="ForegroundTile">
  <objectgroup draworder="index" id="2">
   <object id="1" x="0" y="0" width="9" height="7"/>
  </objectgroup>
--- a/Crawler/pge.data
+++ b/Crawler/pge.data
--- a/Crawler/pge.js
+++ b/Crawler/pge.js
--- a/Crawler/pge.wasm
+++ b/Crawler/pge.wasm
--- a/x64/Release/Crawler.exe
+++ b/x64/Release/Crawler.exe