From 27fc010ac64c2e3265a8355b6e35fa57eb230440 Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Sat, 2 Apr 2022 13:01:49 -0400
Subject: [PATCH] Tilemap loading

---
 .../assets/env/env_beachTile/beachTile.tsx    |  7 --
 .../env/env_beachTile/beachTileSwirly.tsx     |  7 --
 game/dist/map_gameMap.tmx                     | 79 ++++---------------
 3 files changed, 16 insertions(+), 77 deletions(-)
 delete mode 100644 game/dist/assets/env/env_beachTile/beachTile.tsx
 delete mode 100644 game/dist/assets/env/env_beachTile/beachTileSwirly.tsx

diff --git a/game/dist/assets/env/env_beachTile/beachTile.tsx b/game/dist/assets/env/env_beachTile/beachTile.tsx
deleted file mode 100644
index 01ca4a6e..00000000
--- a/game/dist/assets/env/env_beachTile/beachTile.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.8" tiledversion="1.8.4" name="beach" tilewidth="128" tileheight="128" tilecount="1" columns="0">
- <grid orientation="orthogonal" width="1" height="1"/>
- <tile id="0">
-  <image width="128" height="128" source="env_beachTile.png"/>
- </tile>
-</tileset>
diff --git a/game/dist/assets/env/env_beachTile/beachTileSwirly.tsx b/game/dist/assets/env/env_beachTile/beachTileSwirly.tsx
deleted file mode 100644
index a2ed1733..00000000
--- a/game/dist/assets/env/env_beachTile/beachTileSwirly.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.8" tiledversion="1.8.4" name="beachTileSwirly" tilewidth="128" tileheight="128" tilecount="1" columns="0">
- <grid orientation="orthogonal" width="1" height="1"/>
- <tile id="0">
-  <image width="128" height="128" source="env_beachTileSwirly.png"/>
- </tile>
-</tileset>
diff --git a/game/dist/map_gameMap.tmx b/game/dist/map_gameMap.tmx
index aab04cf8..af2da828 100644
--- a/game/dist/map_gameMap.tmx
+++ b/game/dist/map_gameMap.tmx
@@ -1,74 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="128" tileheight="128" infinite="1" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="assets/env/env_beachTile/beachTile.tsx"/>
- <tileset firstgid="2" source="assets/env/env_beachTile/beachTileSwirly.tsx"/>
- <layer id="1" name="Floor" width="30" height="20">
+ <tileset firstgid="1" name="env_beachTile" tilewidth="128" tileheight="128" tilecount="2" columns="0">
+  <grid orientation="orthogonal" width="1" height="1"/>
+  <tile id="0">
+   <image width="128" height="128" source="assets/env/env_beachTile/env_beachTile.png"/>
+  </tile>
+  <tile id="1">
+   <image width="128" height="128" source="assets/env/env_beachTile/env_beachTileSwirly.png"/>
+  </tile>
+ </tileset>
+ <layer id="1" name="Tile Layer 1" width="30" height="20">
   <data encoding="csv">
-   <chunk x="-16" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
-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,0,0,1
-</chunk>
-   <chunk x="0" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,1,1,2,2,0,0,0,0,0,0,0,0,0,0,0,
-2,1,1,2,2,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,1,1,0,0,0,0,0,0,0,0,0,0,0,
-2,1,1,2,1,0,0,0,0,0,0,0,0,0,0,0
-</chunk>
    <chunk x="-16" y="0" width="16" height="16">
-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,0,0,2,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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="0" width="16" height="16">
-1,2,2,1,1,0,0,0,0,0,0,0,0,0,0,0,
-2,1,1,2,2,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,2,2,1,1,2,2,0,0,0,0,
+0,0,0,0,0,0,2,2,1,1,2,2,0,0,0,0,
+0,0,0,0,0,0,2,1,0,0,1,2,0,0,0,0,
+0,0,0,0,0,0,2,2,1,1,2,2,0,0,0,0,
+0,0,0,0,0,0,2,2,1,1,2,2,0,0,0,0,
+0,0,0,0,0,0,1,1,2,2,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,