Merge branch 'master' of http://sig.projectdivar.com/sigonasr2/Crawler

2023-09-13 16:28:52 -05:00 · 2023-09-13 16:28:52 -05:00 · d8a1e99d74
commit d8a1e99d74
parent d6ef557a1c 11742b61f9
9 changed files with 630 additions and 46 deletions
--- a/Crawler/Crawler
+++ b/Crawler/Crawler
--- a/Crawler/Crawler.cpp
+++ b/Crawler/Crawler.cpp
@ -22,7 +22,6 @@ INCLUDE_EMITTER_LIST
 //360x240
 vi2d WINDOW_SIZE={24*15,24*10};
 safemap<std::string,Animate2D::FrameSequence>ANIMATION_DATA;
-std::map<int,std::vector<std::pair<int,float>>>TILE_ANIMATION_DATA;
 std::vector<Monster>MONSTER_LIST;
 std::vector<MonsterSpawner>SPAWNER_LIST;
 std::vector<std::shared_ptr<DamageNumber>>DAMAGENUMBER_LIST;
@ -73,7 +72,6 @@ Crawler::Crawler()
 }

 bool Crawler::OnUserCreate(){
-
 	InitializeLevels();

 	player=std::make_unique<Warrior>();
@ -133,12 +131,12 @@ bool Crawler::OnUserCreate(){
 	InitializeClasses();
 	ChangePlayerClass(WARRIOR);
 	Warrior::ability4=Ranger::ability1; //Class ability swapping demonstration.
-
 	return true;
 }

 bool Crawler::OnUserUpdate(float fElapsedTime){
-	fElapsedTime=std::clamp(fElapsedTime,0.f,1/60.f); //HACK fix. We can't have a negative time. Although using a more precise system clock should make this never occur. Also make sure if the game is too slow we advance by only 1/60th of a second.
+	fElapsedTime=std::clamp(fElapsedTime,0.f,1/30.f); //HACK fix. We can't have a negative time. Although using a more precise system clock should make this never occur. Also make sure if the game is too slow we advance by only 1/30th of a second.
+	levelTime+=fElapsedTime;
 	HandleUserInput(fElapsedTime);
 	UpdateEffects(fElapsedTime);
 	player->Update(fElapsedTime);
@ -872,6 +870,8 @@ void Crawler::InitializeLevel(std::string mapFile,MapName map){
 			MAP_TILESETS["assets/maps/"+baseSourceDir].upperForegroundTiles=tileset.GetData().UpperForegroundTileData;
 			MAP_TILESETS["assets/maps/"+baseSourceDir].collision=tileset.GetData().CollisionData;
 			MAP_TILESETS["assets/maps/"+baseSourceDir].staircaseTiles=tileset.GetData().StaircaseData;
+			MAP_TILESETS["assets/maps/"+baseSourceDir].animationData=tileset.GetData().AnimationData;
+			std::cout<<"assets/maps/"+baseSourceDir<<" Animation Data Size: "<<MAP_TILESETS["assets/maps/"+baseSourceDir].animationData.size()<<std::endl;
 			r->Load("assets/maps/"+tileset.GetData().ImageData.data["source"]);
 		}
 	}
@ -882,6 +882,7 @@ void Crawler::LoadLevel(MapName map){
 	foregroundTileGroups.clear();
 	currentLevel=map;
 	WORLD_SIZE={MAP_DATA[map].MapData.width,MAP_DATA[map].MapData.height};
+	levelTime=0;
 	
 	#pragma region Monster Spawn Data Setup
 		for(auto key:MAP_DATA[map].SpawnerData){
--- a/Crawler/Crawler.h
+++ b/Crawler/Crawler.h
@ -38,6 +38,7 @@ public:
 	static Key KEY_ABILITY3;
 	static Key KEY_ABILITY4;
 	static float SIZE_CHANGE_SPEED;
+	float levelTime;
 private:
 	std::vector<std::unique_ptr<Effect>>foregroundEffects,backgroundEffects,foregroundEffectsToBeInserted,backgroundEffectsToBeInserted;
 	std::map<MapName,Map>MAP_DATA;
--- a/Crawler/Map.h
+++ b/Crawler/Map.h
@ -20,6 +20,7 @@ struct TilesetData{
 	std::map<int,XMLTag>upperForegroundTiles;
 	std::map<int,TileCollisionData>collision;
 	std::map<int,XMLTag>staircaseTiles;
+    std::map<int,std::vector<std::pair<int,int>>> animationData;
 };

 struct TileRenderData{
--- a/Crawler/TMXParser.h
+++ b/Crawler/TMXParser.h
@ -1,7 +1,7 @@
 #pragma once
 #include "olcPixelGameEngine.h"
 #include "olcUTIL_Geometry2D.h"
-#include <strstream>
+#include <sstream>

 using namespace olc;

--- a/Crawler/TSXParser.h
+++ b/Crawler/TSXParser.h
@ -1,6 +1,6 @@
 #pragma once
 #include "olcPixelGameEngine.h"
-#include <strstream>
+#include <sstream>
 #include "TMXParser.h"
 #include "Map.h"
 #include "olcUTIL_Geometry2D.h"
@ -13,6 +13,7 @@ struct Tileset{
    std::map<int,XMLTag> UpperForegroundTileData;
    std::map<int,TileCollisionData> CollisionData;
    std::map<int,XMLTag> StaircaseData;
+    std::map<int,std::vector<std::pair<int,int>>> AnimationData;
    friend std::ostream& operator << (std::ostream& os, Tileset& rhs);
 };

@ -102,6 +103,9 @@ class TSXParser{
            previousTag=newTag.tag;
            previousTagID=newTag.GetInteger("id");
        } else
+        if (newTag.tag=="frame"){
+            parsedTilesetInfo.AnimationData[previousTagID].push_back({newTag.GetInteger("tileid"),newTag.GetInteger("duration")});
+        } else
        if (newTag.tag=="property"&&staircaseTag=="tile"){
            parsedTilesetInfo.StaircaseData[previousTagID]=newTag;
            staircaseTag="";
--- a/Crawler/assets/maps/Tile_Presets.tmx
+++ b/Crawler/assets/maps/Tile_Presets.tmx
@ -435,6 +435,294 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,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>
+   <chunk x="-48" y="16" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046
+</chunk>
+   <chunk x="-32" y="16" width="16" height="16">
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0
+</chunk>
+   <chunk x="-16" y="16" width="16" height="16">
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046
+</chunk>
+   <chunk x="0" y="16" width="16" height="16">
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046
+</chunk>
+   <chunk x="16" y="16" width="16" height="16">
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0
+</chunk>
+   <chunk x="32" y="16" width="16" height="16">
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046
+</chunk>
+   <chunk x="48" y="16" width="16" height="16">
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0
+</chunk>
+   <chunk x="64" y="16" width="16" height="16">
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046
+</chunk>
+   <chunk x="-48" y="32" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="-32" y="32" width="16" height="16">
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="-16" y="32" width="16" height="16">
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="0" y="32" width="16" height="16">
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,0,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="16" y="32" width="16" height="16">
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="32" y="32" width="16" height="16">
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="48" y="32" width="16" height="16">
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+1046,1046,1046,1046,1046,1046,1046,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="64" y="32" width="16" height="16">
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
  </data>
 </layer>
@ -448,33 +736,33 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,3488,3489,3455,
 0,0,0,0,0,0,0,0,0,0,0,0,0,3533,3534,3500,
 0,0,0,0,0,0,0,0,0,0,0,0,0,3577,3578,3545,
-0,0,0,0,0,0,0,0,0,0,0,0,0,678,3292,678,
-0,0,0,0,0,0,0,0,0,0,0,0,0,678,678,678,
-0,0,0,0,0,0,0,0,0,0,0,0,0,678,678,678,
-0,0,0,0,0,0,0,0,0,0,0,0,0,3493,678,678,
-0,0,0,0,0,0,0,0,0,0,0,0,0,678,678,678,
-0,0,0,0,0,0,0,0,0,0,0,0,0,678,678,678,
-0,0,0,0,0,0,0,0,0,0,0,0,0,3494,678,678,
-0,0,0,0,0,0,0,0,0,0,0,0,0,678,678,678,
-0,0,0,0,0,0,0,0,0,0,0,0,0,678,3342,3343
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,3292,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3493,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3494,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,3342,3343
 </chunk>
   <chunk x="-32" y="-32" width="16" height="16">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 3366,3367,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 3411,3412,3413,3536,3537,0,0,0,0,3342,3343,3344,3345,3346,0,0,
-3456,3457,3458,3581,3582,3579,0,0,678,3387,3388,3389,3390,3391,678,678,
-3501,3502,3503,3626,3627,678,3276,3277,3579,3432,3433,3434,3435,3436,0,0,
-3546,3547,3548,678,678,678,678,678,3577,3578,3478,3479,3480,3481,3276,3277,
-678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,
-678,678,3796,678,678,678,678,678,678,678,678,678,678,678,678,678,
-678,678,678,678,678,678,678,678,678,678,678,678,678,3492,678,678,
-678,678,678,678,678,678,678,678,678,3706,678,678,678,678,678,678,
-678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,
-678,678,678,3447,678,678,678,678,678,678,678,678,678,3447,678,678,
-678,678,678,678,678,678,678,678,678,678,3706,678,678,678,678,678,
-678,678,678,678,678,678,3493,678,678,678,678,678,678,678,678,3402,
-3344,3345,3346,678,678,678,678,678,678,678,678,678,678,678,678,678
+3456,3457,3458,3581,3582,3579,0,0,0,3387,3388,3389,3390,3391,0,0,
+3501,3502,3503,3626,3627,0,3276,3277,3579,3432,3433,3434,3435,3436,0,0,
+3546,3547,3548,0,0,0,0,0,3577,3578,3478,3479,3480,3481,3276,3277,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3796,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3492,0,0,
+0,0,0,0,0,0,0,0,0,3706,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,3447,0,0,0,0,0,0,0,0,0,3447,0,0,
+0,0,0,0,0,0,0,0,0,0,3706,0,0,0,0,0,
+0,0,0,0,0,0,3493,0,0,0,0,0,0,0,0,3402,
+3344,3345,3346,0,0,0,0,0,0,0,0,0,0,0,0,0
 </chunk>
   <chunk x="-16" y="-32" width="16" height="16">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -484,15 +772,15 @@
 3465,3466,3628,3629,0,0,0,0,0,0,0,0,0,0,3437,3438,
 3510,3511,3488,3489,0,0,0,0,0,0,0,0,0,3579,3482,3483,
 3555,3556,3533,3534,0,0,0,0,0,0,0,0,0,0,0,0,
-678,678,678,678,0,0,0,0,0,0,0,0,0,0,0,0,
-678,678,678,3796,0,0,0,0,0,0,0,0,0,0,0,0,
-678,678,678,678,0,0,0,0,0,0,0,0,0,0,0,0,
-678,3471,678,678,0,0,0,0,0,0,0,0,0,3620,0,0,
-678,678,678,678,0,0,0,0,0,0,0,0,0,0,0,0,
-678,678,678,678,0,0,0,0,0,0,0,0,0,0,0,0,
-678,678,678,678,0,0,0,0,0,0,0,0,0,0,0,3706,
-678,678,678,3493,0,0,0,0,0,0,0,0,0,0,0,0,
-678,678,678,678,0,0,0,0,0,0,0,0,0,0,0,0
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,3796,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3471,0,0,0,0,0,0,0,0,0,0,0,3620,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3706,
+0,0,0,3493,0,0,0,0,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>
   <chunk x="0" y="-32" width="16" height="16">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -603,9 +891,9 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </chunk>
   <chunk x="-32" y="-16" width="16" height="16">
-3389,3390,3391,678,678,678,3538,3539,678,678,678,678,678,678,678,678,
-3434,3435,3436,3579,0,0,3583,3584,3577,3578,678,3347,3348,3349,3372,3373,
-3479,3480,3481,678,3276,3277,3628,3629,678,3287,3288,3392,3393,3394,3417,3418,
+3389,3390,3391,0,0,0,3538,3539,0,0,0,0,0,0,0,0,
+3434,3435,3436,3579,0,0,3583,3584,3577,3578,0,3347,3348,3349,3372,3373,
+3479,3480,3481,0,3276,3277,3628,3629,0,3287,3288,3392,3393,3394,3417,3418,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -621,8 +909,8 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </chunk>
   <chunk x="-16" y="-16" width="16" height="16">
-678,678,678,678,0,0,0,0,0,0,0,0,0,3377,3378,3379,
-678,3374,3375,3579,0,0,0,0,0,0,0,0,0,3422,3423,3424,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3377,3378,3379,
+0,3374,3375,3579,0,0,0,0,0,0,0,0,0,3422,3423,3424,
 3292,3419,3420,0,0,0,0,0,0,0,0,0,0,3467,3468,3469,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -744,7 +1032,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+0,0,0,0,0,0,0,0,0,0,0,0,0,3536,3537,0
 </chunk>
   <chunk x="-32" y="0" width="16" height="16">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -761,7 +1049,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3015,0,0,0,0,0,0,0,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>
   <chunk x="-16" y="0" width="16" height="16">
@ -870,6 +1158,186 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3365,3366,3367,3368,0,0,0,0,0,0,0,0,0,0,0
+</chunk>
+   <chunk x="-48" y="16" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,3581,3582,3579,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3626,3627,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3353,3354,3355,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3398,3399,3400,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3443,3444,3445,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3282,3283,3579,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3512,3513,3514,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3557,3558,3559,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3488,3489,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3533,3534,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,3287,3288,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3488,3489,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3533,3534,3343,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,3387,3388,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,3432,3433,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,3477,3478
+</chunk>
+   <chunk x="-32" y="16" width="16" height="16">
+0,0,0,0,0,0,3402,0,0,3376,3465,3466,0,0,0,0,
+3448,0,0,0,0,0,0,0,0,3421,3510,3511,0,0,0,0,
+3356,0,3494,0,0,0,0,0,3448,0,3555,3556,0,0,0,0,
+3401,0,0,0,0,0,0,0,0,0,3292,3402,0,0,0,0,
+3446,0,0,0,0,0,0,0,0,0,3579,0,0,0,0,0,
+3621,0,0,0,0,0,3402,0,0,0,3577,3578,0,0,0,0,
+0,0,0,0,0,0,0,0,3488,3489,3465,3466,0,0,0,0,
+0,0,0,3706,0,0,0,0,3533,3534,3510,3511,0,0,0,0,
+3620,0,0,0,0,0,0,0,0,0,3555,3556,0,0,0,0,
+0,0,0,0,0,0,0,0,0,3448,3276,3277,0,0,0,0,
+3372,3373,0,0,0,0,0,0,0,3488,3489,0,0,0,0,0,
+3417,3418,0,3796,0,0,0,0,0,3533,3534,0,0,0,0,0,
+3344,3577,3578,0,0,0,0,0,0,3512,3513,3514,0,0,0,0,
+3389,3390,3391,3751,0,0,0,0,3751,3557,3558,3559,0,0,0,0,
+3434,3435,3436,0,0,0,0,0,0,3403,0,3292,0,0,0,0,
+3479,3480,3481,0,0,0,0,0,3292,3347,3348,3349,0,0,0,0
+</chunk>
+   <chunk x="32" y="16" width="16" height="16">
+0,0,0,0,0,0,0,0,3347,3348,3349,0,0,0,0,0,
+0,0,0,0,0,0,0,0,3392,3393,3394,0,3492,0,0,0,
+0,0,0,0,0,0,0,0,3796,3488,3489,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,3533,3534,0,0,0,0,0,
+0,0,0,0,0,0,0,0,3488,3489,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,3533,3534,3579,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,3353,3354,3355,3356,3491,0,0,
+0,0,0,0,0,0,0,0,0,3398,3399,3400,3401,0,0,0,
+0,0,0,0,0,0,0,0,3538,3539,3444,3445,3446,0,0,0,
+0,0,0,0,0,0,0,0,3583,3584,3579,3751,0,0,0,0,
+0,0,0,0,0,0,0,0,3628,3629,3796,3748,3749,0,0,0,
+0,0,0,0,0,0,0,0,3488,3489,0,3793,3794,3751,0,0,
+0,0,0,0,0,0,0,0,3533,3534,0,3751,0,0,0,0,
+0,0,0,0,0,0,0,0,0,3577,3578,0,0,0,0,0,
+0,0,0,0,0,0,0,0,3353,3354,3355,3356,0,0,0,0,
+0,0,0,0,0,0,0,0,3398,3399,3400,3401,0,0,0,3493
+</chunk>
+   <chunk x="48" y="16" width="16" height="16">
+0,0,0,0,3577,3578,3796,0,0,0,0,0,0,0,0,0,
+0,0,3493,0,0,3488,3489,0,0,0,0,0,0,0,0,0,
+0,0,3342,3343,3344,3533,3534,0,0,0,0,0,0,0,0,0,
+0,0,3387,3388,3389,3390,3391,0,0,0,0,0,0,0,0,0,
+0,0,3432,3433,3434,3435,3436,0,0,0,0,0,0,0,0,0,
+3493,0,3477,3478,3479,3480,3481,0,0,0,0,0,0,0,0,0,
+0,0,0,3353,3354,3355,3356,0,0,0,0,0,0,0,0,0,
+0,0,0,3398,3399,3400,3401,0,0,0,0,0,0,0,0,0,
+0,0,0,3376,3444,3445,3446,0,0,0,0,0,0,0,0,0,
+0,0,0,3421,3488,3489,3796,0,0,0,0,0,0,0,0,0,
+0,3494,0,0,3533,3534,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,3577,3578,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,3488,3489,0,0,0,0,0,0,0,0,0,
+0,0,3447,0,0,3533,3534,0,0,0,0,0,0,0,0,0,
+0,0,0,0,3512,3513,3514,0,0,0,0,0,0,0,0,0,
+0,0,0,3402,3557,3558,3559,0,0,0,0,0,0,0,0,0
+</chunk>
+   <chunk x="64" y="16" width="16" height="16">
+0,3410,3411,3412,3413,3376,3661,0,0,0,0,0,0,0,3488,3489,
+0,3455,3456,3457,3458,3421,0,0,0,0,0,3447,0,0,3533,3534,
+0,3500,3501,3502,3503,3706,0,0,0,0,0,0,0,0,3579,3376,
+0,3545,3546,3547,3376,0,0,0,0,0,0,0,0,0,3706,3421,
+0,3462,3463,3464,3421,0,0,0,3492,0,0,0,0,0,3372,3373,
+0,3507,3508,3509,3579,0,0,0,0,0,0,0,0,0,3417,3418,
+0,3552,3553,3554,0,0,0,0,0,0,0,0,3512,3513,3514,3660,
+0,996,3579,0,0,0,0,0,0,0,0,3661,3557,3558,3559,3705,
+0,1048,0,0,0,0,3661,0,0,0,0,3488,3489,3414,3415,3416,
+0,1048,0,3437,3438,3439,0,0,0,0,0,3533,3534,3459,3460,3461,
+0,1048,0,3482,3483,3484,0,0,0,0,0,0,3579,3504,3505,3506,
+0,1100,0,0,0,0,0,0,0,0,0,0,0,3549,3550,3551,
+0,1256,0,0,0,0,3492,0,0,0,0,0,3661,0,3579,3376,
+0,3465,3466,3661,0,0,0,0,0,0,0,0,3377,3378,3379,3421,
+0,3510,3511,0,0,0,0,0,0,0,3661,0,3422,3423,3424,3660,
+0,3555,3556,3577,3578,0,0,0,0,0,0,0,3467,3468,3469,3705
+</chunk>
+   <chunk x="-48" y="32" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,3276,3277,3579,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3465,3466,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3510,3511,3492,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3555,3556,3376,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3374,3375,3421,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3419,3420,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3282,3283,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="-32" y="32" width="16" height="16">
+0,0,3358,0,0,0,0,0,0,3392,3393,3394,0,0,0,0,
+0,0,0,0,0,0,3448,0,0,0,3488,3489,0,0,0,0,
+0,0,0,0,0,0,0,0,0,3661,3533,3534,0,0,0,0,
+0,3620,0,0,0,0,0,0,0,0,3287,3288,0,0,0,0,
+0,0,0,0,0,0,0,3661,3353,3354,3355,3356,0,0,0,0,
+0,0,0,0,0,0,0,0,3398,3399,3400,3401,0,0,0,0,
+0,3494,0,0,0,0,3491,0,3579,3444,3445,3446,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="32" y="32" width="16" height="16">
+0,0,0,0,0,0,0,0,3376,3444,3445,3446,3447,0,0,0,
+0,0,0,0,0,0,0,0,3421,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,3488,3489,0,0,0,0,0,
+0,0,0,0,0,0,0,0,3796,3533,3534,0,0,0,0,3493,
+0,0,0,0,0,0,0,0,3577,3578,0,3358,0,0,0,0,
+0,0,0,0,0,0,0,0,3488,3489,0,0,0,0,3494,0,
+0,0,0,0,0,0,0,0,3533,3534,3447,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="48" y="32" width="16" height="16">
+0,0,0,0,3347,3348,3349,0,0,0,0,0,0,0,0,0,
+0,0,3403,0,3392,3393,3394,0,0,0,0,0,0,0,0,0,
+0,0,0,3353,3354,3355,3356,0,0,0,0,0,0,0,0,0,
+0,0,0,3398,3399,3400,3401,0,0,0,0,0,0,0,0,0,
+0,0,0,3443,3444,3445,3446,0,0,0,0,0,0,0,0,0,
+0,0,0,0,3292,3488,3489,0,0,0,0,0,0,0,0,0,
+0,0,0,3448,0,3533,3534,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="64" y="32" width="16" height="16">
+0,3706,3465,3466,3658,3659,0,0,0,0,0,0,0,0,3372,3373,
+0,0,3510,3511,3703,3704,0,0,0,0,0,0,0,0,3417,3418,
+0,3579,3555,3556,3579,0,0,0,0,0,3493,0,0,3512,3513,3514,
+0,3414,3415,3416,3376,0,0,0,0,0,0,0,3706,3557,3558,3559,
+0,3459,3460,3461,3421,0,0,0,0,0,0,0,0,0,3465,3466,
+0,3504,3505,3506,0,3492,0,0,0,0,0,0,0,0,3510,3511,
+0,3549,3550,3551,0,0,0,0,0,0,0,0,0,0,3555,3556,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
  </data>
@ -1198,7 +1666,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+0,0,0,0,0,0,0,0,0,0,0,0,3011,3012,3013,3014
 </chunk>
   <chunk x="-32" y="0" width="16" height="16">
 3244,3245,0,0,0,0,0,0,3246,3247,3248,3005,3006,3007,3008,3230,
@ -1216,7 +1684,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3015,0,0,0,0,0,0,0,0,3111,3112,3113,0,0,0,0
 </chunk>
   <chunk x="-16" y="0" width="16" height="16">
 3231,3232,3233,3234,0,0,0,0,0,0,0,0,0,3056,3057,3058,
@ -1325,6 +1793,114 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,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>
+   <chunk x="-48" y="16" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,3056,3057,3058,3059,
+0,0,0,0,0,0,0,0,0,0,0,0,3101,3102,3103,3104,
+0,0,0,0,0,0,0,0,0,0,0,0,3146,3147,3148,3149,
+0,0,0,0,0,0,0,0,0,0,0,0,3191,3192,3193,3194,
+0,0,0,0,0,0,0,0,0,0,0,0,3236,3237,3238,3239,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3061,3062,3063,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3106,3107,3108,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3151,3152,3153,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3196,3197,3198,
+0,0,0,0,0,0,0,0,0,0,0,0,0,3241,3242,3243,
+0,0,0,0,0,0,0,0,0,0,0,3004,3005,3006,3007,3008,
+0,0,0,0,0,0,0,0,0,0,0,3049,3050,3051,3052,3053,
+0,0,0,0,0,0,0,0,0,0,0,3094,3095,3096,3097,3098,
+0,0,0,0,0,0,0,0,0,0,0,3139,3140,3141,3142,3143,
+0,0,0,0,0,0,0,0,0,0,0,3184,3185,3186,3187,3188,
+0,0,0,0,0,0,0,0,0,0,0,3229,3230,3231,3232,3233
+</chunk>
+   <chunk x="-32" y="16" width="16" height="16">
+3060,0,0,0,0,0,0,0,0,3156,3157,3158,0,0,0,0,
+3105,0,0,0,0,0,0,0,0,3201,3202,3203,0,0,0,0,
+3150,0,0,0,0,0,0,0,0,3246,3247,3248,0,0,0,0,
+3195,0,0,0,0,0,0,0,3004,3005,3006,3007,3008,3009,0,0,
+3240,0,0,0,0,0,0,0,3049,3050,3051,3052,3053,3054,0,0,
+3064,3065,0,0,0,0,0,0,3094,3095,3096,3097,3098,3099,0,0,
+3109,3110,0,0,0,0,0,0,3139,3140,3141,3142,3143,3144,0,0,
+3154,3155,0,0,0,0,0,0,3184,3185,3186,3187,3188,3189,0,0,
+3199,3200,0,0,0,0,0,0,3229,3230,3231,3232,3233,3234,0,0,
+3244,3245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3009,0,0,0,0,0,0,0,0,0,3111,3112,3113,0,0,0,
+3054,0,0,0,0,0,0,3111,3112,3113,3156,3157,3158,0,0,0,
+3099,0,0,0,0,0,0,3156,3157,3158,3201,3202,3203,0,0,0,
+3144,0,0,0,0,0,0,3201,3202,3203,3246,3247,3248,0,0,0,
+3189,0,0,0,0,0,0,3246,3247,3248,3062,3063,3064,3065,0,0,
+3234,0,0,0,0,0,0,0,0,3106,3107,3108,3109,3110,0,0
+</chunk>
+   <chunk x="64" y="16" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1153,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1153,0,3666,3667,0,0,0,0,0,0,0,0,0,0,
+0,0,1153,0,3711,3712,0,0,0,0,0,0,0,0,0,0,
+0,3665,1153,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3710,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="-48" y="32" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,3011,3012,3013,3014,
+0,0,0,0,0,0,0,0,0,0,0,0,3056,3057,3058,3059,
+0,0,0,0,0,0,0,0,0,0,0,0,3101,3102,3103,3104,
+0,0,0,0,0,0,0,0,0,0,0,0,3146,3147,3148,3149,
+0,0,0,0,0,0,0,0,0,0,0,0,3191,3192,3193,3194,
+0,0,0,0,0,0,0,0,0,0,0,0,3236,3237,3238,3239,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="-32" y="32" width="16" height="16">
+3015,0,0,0,0,0,0,0,0,3151,3152,3153,3154,3155,0,0,
+3060,0,0,0,0,0,0,0,0,3196,3197,3198,3199,3200,0,0,
+3105,0,0,0,0,0,0,0,0,0,3242,3243,3244,3245,0,0,
+3150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
+   <chunk x="48" y="32" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,3111,3112,3113,0,0,0,0,0,0,0,0,0,0,
+0,0,0,3156,3157,3158,0,0,0,0,0,0,0,0,0,0,
+0,0,0,3201,3202,3203,0,0,0,0,0,0,0,0,0,0,
+0,0,0,3246,3247,3248,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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>
  </data>
 </layer>
--- a/Crawler/pixelGameEngine.cpp
+++ b/Crawler/pixelGameEngine.cpp
@ -1,3 +1,4 @@
+//#define OLC_PGE_HEADLESS
 #define OLC_PGE_APPLICATION
 #include "olcPixelGameEngine.h"
 #define OLC_PGEX_TRANSFORMEDVIEW
--- a/Crawler/sig
+++ b/Crawler/sig
@ -3,7 +3,7 @@ export AUTO_UPDATE=true
 source utils/define.sh

 define PROJECT_NAME "Crawler"
-define CUSTOM_PARAMS "-std=c++20 -lX11 -lGL -lpthread -lpng -lstdc++fs -I/usr/include/lua5.3"
+define CUSTOM_PARAMS "-std=c++20 -lX11 -lpthread -lpng -lstdc++fs -I/usr/include/lua5.3"
 define EMSCRIPTEN_CUSTOM_PARAMS "-s MAXIMUM_MEMORY=4GB"
 define LANGUAGE "C++"