From 868ec3eb563b3fc9feb0bf7ee3c902885bd5cc49 Mon Sep 17 00:00:00 2001
From: Ethan Adams <ethan.adams36@gmail.com>
Date: Tue, 28 Jan 2025 16:07:58 -0500
Subject: [PATCH] optimization

---
 Resources/animations/shot_gun_anim.xml        |  14 +
 Resources/maps/debugmap.tmx                   |  61 +-
 Resources/maps/newmap.tmx                     | 100 +++
 Resources/maps/tilesets/shooterWorldOne.tsx   |   3 +-
 Resources/maps/tilesets/wOne.tsx              | 570 ++++++++++++++++++
 Resources/maps/tilesets/worldOne.png          | Bin 0 -> 12355 bytes
 Resources/maps/yupple.tiled-session           |  62 +-
 Resources/scenes/debugScene.xml               |   2 +-
 Resources/scripts/ai/grunt_behaviour.lua      |  52 +-
 Resources/shaders/GL_bubble.vert              |   6 +-
 Resources/shaders/GL_pistol.vert              |   6 +-
 Resources/shaders/GL_player.vert              |   6 +-
 Resources/shaders/GL_tile.frag                |   5 +-
 Resources/shaders/GL_tile.vert                |  23 +-
 Resources/sprites/shotGunFire128.png          | Bin 0 -> 6183 bytes
 Resources/sprites/shotGunIdle128.png          | Bin 0 -> 1882 bytes
 Resources/sprites/shotGunReload128.png        | Bin 0 -> 6518 bytes
 Resources/weapons/bubblegun.xml               |   4 +-
 YuppleMayham/CMakeLists.txt                   |   2 +-
 YuppleMayham/include/gameplay/ai.h            |   8 +
 YuppleMayham/include/gameplay/entity.h        |   1 +
 YuppleMayham/include/gameplay/map.h           |   4 +-
 YuppleMayham/include/graphics/animation.h     |   3 +
 YuppleMayham/include/graphics/instancedraw.h  |  12 +-
 YuppleMayham/include/graphics/shader.h        |   1 +
 YuppleMayham/include/graphics/texture.h       |  43 ++
 YuppleMayham/include/utility/events.h         |   8 +
 YuppleMayham/include/utility/logger.h         |  60 ++
 .../include/utility/resourcemanager.h         |   2 +
 YuppleMayham/include/utility/script.h         |   6 +
 YuppleMayham/include/utility/xmlloader.h      |   8 +-
 YuppleMayham/src/gameplay/ai.cpp              |  23 +-
 YuppleMayham/src/gameplay/camera.cpp          |   6 +-
 YuppleMayham/src/gameplay/entity.cpp          |   8 +-
 YuppleMayham/src/gameplay/game.cpp            |   7 +
 YuppleMayham/src/gameplay/map.cpp             |  62 +-
 YuppleMayham/src/gameplay/physics.cpp         |   4 +-
 YuppleMayham/src/gameplay/weapons/bullet.cpp  |   3 +-
 .../src/gameplay/weapons/bulletmanager.cpp    |   1 +
 YuppleMayham/src/gameplay/weapons/weapon.cpp  |  33 +-
 YuppleMayham/src/graphics/animation.cpp       |  26 +
 YuppleMayham/src/graphics/instancedraw.cpp    |  58 +-
 YuppleMayham/src/graphics/shader.cpp          |   5 +
 YuppleMayham/src/graphics/texture.cpp         | 122 +++-
 YuppleMayham/src/main.cpp                     |   2 +-
 YuppleMayham/src/utility/logger.cpp           |  14 +
 YuppleMayham/src/utility/resourcemanager.cpp  |   7 +
 YuppleMayham/src/utility/script.cpp           |   1 +
 YuppleMayham/src/utility/xmlloader.cpp        |  79 ++-
 49 files changed, 1385 insertions(+), 148 deletions(-)
 create mode 100644 Resources/animations/shot_gun_anim.xml
 create mode 100644 Resources/maps/newmap.tmx
 create mode 100644 Resources/maps/tilesets/wOne.tsx
 create mode 100644 Resources/maps/tilesets/worldOne.png
 create mode 100644 Resources/sprites/shotGunFire128.png
 create mode 100644 Resources/sprites/shotGunIdle128.png
 create mode 100644 Resources/sprites/shotGunReload128.png
 create mode 100644 YuppleMayham/include/utility/logger.h
 create mode 100644 YuppleMayham/src/utility/logger.cpp

diff --git a/Resources/animations/shot_gun_anim.xml b/Resources/animations/shot_gun_anim.xml
new file mode 100644
index 0000000..55c75c1
--- /dev/null
+++ b/Resources/animations/shot_gun_anim.xml
@@ -0,0 +1,14 @@
+<animations>
+  <animation name="shot_gun_idle_anim" type="idle">
+    <FPS>4</FPS>
+    <sprite path="sprites/shotGunIdle128.png" frameSize="128.0"/>
+  </animation>
+  <animation name="shot_gun_fire_anim" type="fire">
+    <FPS>8</FPS>
+    <sprite path="sprites/shotGunFire128.png" frameSize="128.0"/>
+  </animation>
+  <animation name="shot_gun_reload_anim" type="reload">
+    <FPS>8</FPS>
+    <sprite path="sprites/shotGunReload128.png" frameSize="128.0"/>
+  </animation>
+</animations>
\ No newline at end of file
diff --git a/Resources/maps/debugmap.tmx b/Resources/maps/debugmap.tmx
index ea7b84c..1478888 100644
--- a/Resources/maps/debugmap.tmx
+++ b/Resources/maps/debugmap.tmx
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="64" tileheight="64" infinite="0" nextlayerid="4" nextobjectid="20">
+<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="62" tileheight="62" infinite="0" nextlayerid="5" nextobjectid="20">
  <tileset firstgid="1" source="tilesets/shooterWorldOne.tsx"/>
+ <tileset firstgid="65" source="tilesets/wOne.tsx"/>
  <layer id="2" name="Tile Layer 2" width="30" height="20">
   <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,28,28,29,25,28,28,29,27,31,28,28,31,28,32,26,29,30,27,25,27,32,28,31,26,29,25,29,32,0,
 0,32,27,22,16,16,23,31,26,30,31,31,29,28,30,25,28,26,26,25,29,26,25,32,28,28,31,32,25,0,
 0,30,24,11,4,8,14,26,28,31,26,24,16,16,16,16,23,27,25,25,30,26,29,29,30,29,25,29,27,0,
-0,25,15,6,1,2,14,28,32,30,24,11,8,7,3,8,12,23,28,27,25,32,30,32,30,28,27,27,26,0,
-0,28,20,13,13,13,19,32,28,29,15,5,2,5,3,5,2,14,25,32,31,32,24,16,16,16,23,29,27,0,
-0,31,29,31,27,26,27,30,29,27,15,8,7,5,2,3,6,14,27,32,32,29,15,8,4,2,14,26,27,0,
-0,30,30,30,25,32,29,31,30,29,20,10,1,3,5,3,9,19,27,25,29,31,20,13,13,13,19,31,26,0,
-0,28,30,30,28,24,23,27,31,28,29,20,13,13,13,13,19,27,31,28,27,26,29,26,32,25,31,25,32,0,
-0,26,26,31,29,20,19,30,25,29,25,25,25,28,30,27,28,25,31,30,27,26,26,28,25,29,25,32,31,0,
-0,30,32,29,29,32,31,27,25,31,31,31,26,30,31,27,29,25,29,32,0,0,0,0,30,26,31,0,0,0,
-0,30,27,31,31,28,25,25,28,26,30,27,26,28,30,29,30,25,30,32,0,0,0,0,0,0,0,0,0,0,
+0,25,15,6,1,2,14,28,32,30,24,11,0,0,0,8,12,23,28,27,25,32,30,32,30,28,27,27,26,0,
+0,28,20,13,13,13,19,32,28,29,15,0,0,0,0,0,0,14,25,32,91,32,24,16,16,16,23,29,27,0,
+0,31,29,31,27,26,27,30,29,27,0,0,0,0,0,0,0,0,27,32,32,29,15,8,4,2,14,26,27,0,
+0,30,30,30,25,32,29,30,27,28,32,32,30,0,0,0,0,0,27,25,29,31,20,13,13,13,19,31,26,0,
+0,28,30,30,28,31,26,29,31,29,26,20,31,0,0,0,0,31,31,28,27,26,29,26,32,25,31,25,32,0,
+0,26,26,31,29,20,29,31,25,32,28,25,25,28,30,27,28,25,31,30,27,26,26,28,25,29,25,32,31,0,
+0,30,32,29,29,32,31,28,25,31,31,31,26,30,31,27,29,25,29,32,0,0,0,0,30,26,31,0,0,0,
+0,30,27,31,31,28,25,32,28,26,30,27,26,28,30,29,30,25,30,32,0,0,0,0,0,0,0,0,0,0,
 0,27,29,22,21,30,29,29,32,0,0,0,0,32,30,30,31,32,26,28,0,0,0,0,0,0,0,0,0,0,
 0,27,25,18,17,30,28,30,0,0,0,0,0,26,31,26,25,30,27,29,26,0,0,0,0,0,0,0,0,0,
 0,32,30,31,30,30,28,0,0,0,0,0,0,32,27,31,30,28,26,31,26,0,0,0,0,0,0,0,0,0,
@@ -43,20 +44,44 @@
   <object id="18" gid="57" x="126" y="894" width="64" height="64"/>
   <object id="19" gid="58" x="1536" y="260" width="64" height="64"/>
  </objectgroup>
+ <layer id="4" name="Tile Layer 3" width="30" height="20">
+  <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,176,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,56,156,155,156,157,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,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="1" name="Tile Layer 1" width="30" height="20">
   <data encoding="csv">
 35,36,34,35,33,38,38,34,35,34,34,39,38,39,35,39,38,37,39,39,33,33,38,34,34,34,33,37,34,40,
 37,41,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,42,34,
 38,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47,33,
-36,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47,39,
-37,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47,36,
-35,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47,34,
-37,46,0,28,28,30,25,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47,39,
-34,46,0,30,30,29,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47,34,
-40,46,0,29,26,31,29,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47,35,
-33,46,0,30,31,32,27,27,0,0,0,0,0,0,0,0,0,0,0,56,48,48,48,48,55,0,56,48,43,33,
-35,46,0,25,30,32,31,28,0,0,0,0,0,0,0,0,0,0,0,47,34,36,34,39,44,48,43,34,36,40,
-40,46,0,0,0,0,0,0,56,48,48,48,48,55,0,0,0,0,0,47,36,36,34,39,38,36,36,38,36,37,
+36,46,0,0,0,0,0,0,0,0,0,31,32,27,31,30,29,0,0,0,0,0,0,0,0,0,0,0,47,39,
+37,46,0,0,0,0,0,0,0,0,25,25,28,27,25,27,32,27,0,126,127,128,0,0,0,0,0,0,47,36,
+35,46,0,176,149,150,150,144,0,0,30,28,31,30,32,29,31,32,0,117,141,131,0,0,0,0,0,0,47,34,
+37,46,0,177,182,181,180,169,0,0,27,29,28,30,27,26,26,30,0,124,125,132,0,0,0,0,0,0,47,39,
+34,46,0,153,180,146,156,175,149,164,176,149,144,25,27,25,31,32,0,0,0,0,0,0,0,0,0,0,47,34,
+40,46,0,151,180,167,164,177,161,145,177,166,145,27,25,31,32,0,0,0,0,0,0,0,0,0,0,0,47,35,
+33,46,0,153,180,181,145,151,180,167,165,159,169,0,0,0,0,0,0,56,48,48,48,48,55,0,56,48,43,33,
+35,46,0,151,152,146,147,177,166,161,180,161,169,0,0,0,0,0,0,47,34,36,34,39,44,48,43,34,36,40,
+40,46,0,154,155,157,0,178,155,48,48,48,48,55,0,0,0,0,0,47,36,36,34,39,38,36,36,38,36,37,
 35,46,0,0,0,0,0,56,43,36,38,38,39,46,0,0,0,0,0,47,40,39,38,36,38,40,40,34,38,37,
 38,46,0,0,0,0,56,43,37,39,36,36,33,46,0,0,0,0,0,0,42,39,35,36,33,34,33,38,40,39,
 34,46,0,0,0,0,47,35,34,40,39,38,36,46,0,0,0,0,0,0,47,38,36,34,34,33,36,40,35,40,
diff --git a/Resources/maps/newmap.tmx b/Resources/maps/newmap.tmx
new file mode 100644
index 0000000..ccb3c95
--- /dev/null
+++ b/Resources/maps/newmap.tmx
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="62" tileheight="62" infinite="0" nextlayerid="5" nextobjectid="1">
+ <tileset firstgid="1" source="tilesets/wOne.tsx"/>
+ <layer id="2" name="Tile Layer 2" width="30" height="20">
+  <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,34,31,31,30,70,72,30,34,29,34,73,33,29,71,72,30,33,31,71,29,70,34,0,0,0,0,0,0,0,
+0,31,29,54,33,27,29,32,31,28,29,71,54,72,27,71,71,31,33,70,70,73,31,0,0,0,0,0,0,0,
+0,72,70,34,73,31,0,0,30,31,33,32,29,34,70,71,33,27,32,30,31,30,29,0,0,0,0,0,0,0,
+0,27,28,31,29,0,0,0,0,34,32,30,28,32,31,27,34,31,54,33,27,27,29,0,0,0,0,0,0,0,
+0,54,27,54,28,0,0,0,0,54,31,72,71,34,27,72,70,29,71,73,30,30,71,70,0,0,0,0,0,0,
+0,32,27,29,54,70,0,0,71,32,54,70,71,72,34,70,54,70,32,34,72,33,72,32,34,0,0,0,0,0,
+0,70,27,54,34,31,27,33,31,28,31,33,54,71,29,33,73,28,34,34,34,71,32,33,30,73,0,0,0,0,
+0,29,71,27,31,34,30,71,70,32,72,54,29,31,29,29,54,28,73,33,72,30,30,31,72,31,32,0,0,0,
+0,34,72,29,72,29,71,34,31,33,27,70,70,29,71,27,33,28,34,73,54,72,70,73,71,31,54,0,0,0,
+0,31,73,27,27,33,34,29,54,73,54,54,70,73,30,73,73,54,34,30,54,34,30,29,34,70,54,0,0,0,
+0,28,72,28,28,33,33,29,31,32,30,27,73,27,31,34,73,54,31,32,28,34,70,73,72,33,28,0,0,0,
+0,0,73,34,54,32,33,34,33,54,30,29,70,72,73,70,70,54,29,29,34,27,70,71,72,28,70,0,0,0,
+0,0,0,29,30,32,27,32,31,28,73,27,72,28,73,71,31,28,71,30,28,34,72,73,54,27,32,0,0,0,
+0,0,0,32,27,31,33,33,27,27,30,31,71,28,29,32,31,27,34,34,31,32,27,30,72,54,31,0,0,0,
+0,0,0,0,0,34,32,31,29,70,33,32,0,34,34,33,72,70,70,28,30,70,29,30,30,30,34,0,0,0,
+0,0,0,0,0,0,0,28,30,27,73,0,0,0,0,70,28,30,34,54,33,32,34,54,27,71,28,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,54,32,32,27,31,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,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="3" name="Tile Layer 3" width="30" height="20">
+  <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,14,16,16,49,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,50,51,22,20,43,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,21,20,38,38,19,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,21,1,3,19,22,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,40,37,6,2,39,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,36,41,41,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,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="4" name="Tile Layer 4" width="30" height="20">
+  <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,77,0,0,0,77,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,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="1" name="Tile Layer 1" width="30" height="20">
+  <data encoding="csv">
+88,94,102,97,116,102,96,102,117,88,116,116,118,118,117,95,117,96,115,116,115,116,115,115,97,116,115,116,96,102,
+88,106,91,92,92,91,91,92,92,92,91,92,92,91,91,92,92,92,92,91,91,92,108,116,115,97,117,94,94,115,
+95,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,88,118,95,117,116,116,95,
+118,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,88,116,94,96,95,102,102,
+88,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,115,95,115,94,115,88,118,
+94,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,108,96,96,88,116,97,102,
+117,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,108,117,115,117,94,95,
+116,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,108,118,95,118,118,
+88,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,108,102,115,94,
+118,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,97,118,117,
+115,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,115,88,95,
+97,103,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,116,96,88,
+97,116,103,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,95,96,96,
+88,96,97,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,97,102,88,
+118,94,115,103,86,100,0,0,0,0,0,112,86,100,0,0,0,0,0,0,0,0,0,0,0,0,89,88,117,118,
+95,97,96,97,118,103,85,100,0,0,112,101,88,103,86,100,0,0,0,0,0,0,0,0,0,0,87,102,94,88,
+115,94,97,115,115,96,96,103,86,86,101,94,96,116,96,103,85,86,100,0,0,0,0,84,85,86,101,97,116,97,
+95,88,116,96,115,116,97,97,96,115,97,117,115,102,102,97,115,118,103,85,86,85,86,101,94,115,97,118,117,115,
+102,116,118,88,102,97,102,102,88,97,117,116,88,102,95,94,117,97,117,116,88,96,116,94,115,96,94,97,115,117,
+88,95,96,115,94,97,117,116,96,94,94,94,116,96,88,102,97,115,94,94,117,97,116,88,88,88,96,118,118,116
+</data>
+ </layer>
+</map>
diff --git a/Resources/maps/tilesets/shooterWorldOne.tsx b/Resources/maps/tilesets/shooterWorldOne.tsx
index 6b26e74..07bbb89 100644
--- a/Resources/maps/tilesets/shooterWorldOne.tsx
+++ b/Resources/maps/tilesets/shooterWorldOne.tsx
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.10" tiledversion="1.11.0" name="worldOne" class="shooter" tilewidth="64" tileheight="64" tilecount="64" columns="8">
+<tileset version="1.10" tiledversion="1.11.0" name="worldOne" class="shooter" tilewidth="62" tileheight="62" spacing="2" tilecount="64" columns="8">
+ <grid orientation="orthogonal" width="64" height="64"/>
  <image source="shooterWorldOneAtlas64.png" width="512" height="512"/>
  <tile id="0" type="grass">
   <properties>
diff --git a/Resources/maps/tilesets/wOne.tsx b/Resources/maps/tilesets/wOne.tsx
new file mode 100644
index 0000000..3aabe30
--- /dev/null
+++ b/Resources/maps/tilesets/wOne.tsx
@@ -0,0 +1,570 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.11.0" name="wOne" class="shooter" tilewidth="62" tileheight="62" spacing="2" tilecount="484" columns="11">
+ <grid orientation="orthogonal" width="30" height="30"/>
+ <image source="worldOne.png" width="704" height="704"/>
+ <tile id="0" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="1" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="2" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="3" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="4" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="5" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="6" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="7" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="8" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="9" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="10" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="11" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="12" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="13" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="14" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="15" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="16" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="17" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="18" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="19" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="20" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="21" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="22" type="grass"/>
+ <tile id="23" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="24" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="25" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="26" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="27" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="28" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="29" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="30" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="31" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="32" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="33" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="34" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="35" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="36" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="37" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="38" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="39" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="40" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="41" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="42" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="43" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="44" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="45" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="46" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="47" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="48" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="49" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="50" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="51" type="grass">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="52" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="53" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="54" type="dirt"/>
+ <tile id="55" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="56" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="57" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="58" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="59" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="60" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="61" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="62" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="63" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="64" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="65" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="66" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="67" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="68" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="69" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="70" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="71" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="72" type="dirt">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="73" type="bush"/>
+ <tile id="74" type="bush"/>
+ <tile id="75" type="bush"/>
+ <tile id="76" type="bush"/>
+ <tile id="77" type="bush"/>
+ <tile id="78" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="79" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="80" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="81" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="82" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="83" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="84" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="85" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="86" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="87" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="88" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="89" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="90" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="91" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="92" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="93" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="94" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="95" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="96" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="97" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="98" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="99" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="100" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="101" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="102" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="103" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="104" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="105" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="106" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="107" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="108" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="109" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="110" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="111" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="112" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="113" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="true"/>
+  </properties>
+ </tile>
+ <tile id="114" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="115" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="116" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="117" type="water">
+  <properties>
+   <property name="walkable" type="bool" value="false"/>
+  </properties>
+ </tile>
+ <tile id="118" type="water"/>
+ <tile id="119" type="water"/>
+ <tile id="120" type="water"/>
+</tileset>
diff --git a/Resources/maps/tilesets/worldOne.png b/Resources/maps/tilesets/worldOne.png
new file mode 100644
index 0000000000000000000000000000000000000000..0db14983ff02da95f0d2105405617594ab937fe7
GIT binary patch
literal 12355
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
BpS%D7

literal 0
HcmV?d00001

diff --git a/Resources/maps/yupple.tiled-session b/Resources/maps/yupple.tiled-session
index c555e9b..85a7072 100644
--- a/Resources/maps/yupple.tiled-session
+++ b/Resources/maps/yupple.tiled-session
@@ -1,6 +1,13 @@
 {
-    "activeFile": "",
+    "Map/SizeTest": {
+        "height": 4300,
+        "width": 2
+    },
+    "activeFile": "debugmap.tmx",
     "expandedProjectPaths": [
+        "tilesets",
+        "C:/Users/Ethan/source/repos/YuppleMayham/Resources",
+        "."
     ],
     "fileStates": {
         "": {
@@ -22,33 +29,76 @@
             "scaleInEditor": 1
         },
         "debugmap.tmx": {
-            "scale": 0.45125,
-            "selectedLayer": 0,
+            "scale": 0.75,
+            "selectedLayer": 2,
             "viewCenter": {
-                "x": 959.5567867036011,
-                "y": 955.1246537396123
+                "x": 989.3333333333334,
+                "y": 665.3333333333334
+            }
+        },
+        "newmap.tmx": {
+            "scale": 0.5,
+            "selectedLayer": 1,
+            "viewCenter": {
+                "x": 930,
+                "y": 621
             }
         },
         "shooterWorldOneAtlas.tsx": {
             "scaleInDock": 0.5,
             "scaleInEditor": 1
         },
+        "tilesets/shooterWorldOne.tsx": {
+            "scaleInDock": 0.5,
+            "scaleInEditor": 1
+        },
         "tilesets/shooterWorldOneAtlas.tsx": {
             "scaleInDock": 0.5,
             "scaleInEditor": 1
+        },
+        "tilesets/wOne.tsx": {
+            "scaleInDock": 0.33,
+            "scaleInEditor": 1
+        },
+        "tilesets/was.tsx": {
+            "scaleInDock": 1,
+            "scaleInEditor": 1
+        },
+        "tilesets/wsa.tsx": {
+            "dynamicWrapping": false,
+            "scaleInDock": 0.5,
+            "scaleInEditor": 1
         }
     },
     "last.externalTilesetPath": "C:/Users/Ethan/source/repos/YuppleMayham/Resources/maps/tilesets",
     "last.imagePath": "C:/Users/Ethan/source/repos/YuppleMayham/Resources/maps/tilesets",
+    "map.lastUsedFormat": "tmx",
     "openFiles": [
+        "debugmap.tmx",
+        "tilesets/shooterWorldOne.tsx",
+        "newmap.tmx",
+        "tilesets/wOne.tsx"
     ],
     "project": "yupple.tiled-project",
     "property.type": "bool",
     "recentFiles": [
+        "tilesets/wOne.tsx",
+        "newmap.tmx",
+        "tilesets/shooterWorldOne.tsx",
+        "debugmap.tmx",
+        "tilesets/wsa.tsx",
+        "tilesets/was.tsx",
         "tilesets/shooterWorldOneAtlas.tsx",
         "shooterWorldOneAtlas.tsx",
         "C:/Users/Ethan/Documents/yupplemayham/shooterWorldOneAtlas.tsx",
         "C:/Users/Ethan/Documents/yupplemayham/debugmap.tmx"
     ],
-    "tileset.lastUsedFilter": "Tiled tileset files (*.tsx *.xml)"
+    "tileset.lastUsedFilter": "Tiled tileset files (*.tsx *.xml)",
+    "tileset.lastUsedFormat": "tsx",
+    "tileset.margin": 0,
+    "tileset.spacing": 2,
+    "tileset.tileSize": {
+        "height": 62,
+        "width": 62
+    }
 }
diff --git a/Resources/scenes/debugScene.xml b/Resources/scenes/debugScene.xml
index ec2d95f..737d164 100644
--- a/Resources/scenes/debugScene.xml
+++ b/Resources/scenes/debugScene.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <scene type="shooter" id="000">
-  <map name="debugmap"/>
+  <map name="newmap"/>
   <entities>
     <player x="7" y="5" weapon="shotGun">
       <animation name="player_anim"/>
diff --git a/Resources/scripts/ai/grunt_behaviour.lua b/Resources/scripts/ai/grunt_behaviour.lua
index dd76acc..a63f233 100644
--- a/Resources/scripts/ai/grunt_behaviour.lua
+++ b/Resources/scripts/ai/grunt_behaviour.lua
@@ -3,22 +3,26 @@ patrolDestination = { x=500.0, y=500.0, z=0.0 }
 moveLeft = true
 -- helper functions
 function watchPosition(actor, pos)
-	y = pos.y - actor.position.y
-	x = pos.x - actor.position.x
-	rotation = math.atan(y, x)
+	local y = pos.y - actor.position.y
+	local x = pos.x - actor.position.x
+	local rotation = math.atan(y, x)
 	actor.rotation = math.deg(rotation)
 end
 
 function distance(a, b)
-	return math.sqrt((math.abs(a.x - b.x)^2) + (math.abs(a.y - b.y)^2))
+	local dx = a.x - b.x
+	local dy = a.y - b.y
+	return math.sqrt(dx * dx + dy * dy)
 end
 
 function moveTo(actor, pos)
-	watchPosition(actor, pos)
-	if distance(actor.position, pos) < 50 then 
+	local a = actor
+	local p = pos
+	watchPosition(a, p)
+	if distance(a.position, p) < 50 then 
 		return true
 	end
-	actor:moveForward()
+	a:moveForward()
 	return false
 end
 
@@ -28,19 +32,23 @@ end
 -- The AI will be spawned in idle mode, so if you want to put the bot into patrol mode 
 -- It's on you to do that in this function.
 function idle(actor, target)
-	if target ~= nil then
+	local a = actor
+	local t = target
+	if t ~= nil then
 	--	print("target is at " .. target.position.x)
 	--	watchPosition(actor, target.position)
 		ai.state = AIState.Patrol
-		actor.rotation = 180
+		a.rotation = 180
 	end
-	actor:shoot()
+	a:shoot()
 	--print("actor is idling at " .. actor.position.x)
 end
 
 -- It is most appropriate to put any patrolling behaviour into this function of course
 function patrol(actor, target)
-	if target ~= nil then
+	local a = actor
+	local t = target
+	if t ~= nil then
 	--	print("target is at " .. target.position.x)
 	end
 	--if moveTo(actor, patrolDestination) == true then
@@ -52,7 +60,7 @@ function patrol(actor, target)
 	--if raycaster:performRaycast(actor.position, actor.rotation, target.position) == true then
 		--ai.state = AIState.Alert
 	--end
-	if raycaster:bresenhamRaycast(actor.position, actor.rotation, target.position) == true then
+	if raycaster:bresenhamRaycast(a.position, a.rotation, t.position) == true then
 		--target hit!
 		ai.state = AIState.Alert
 	end
@@ -60,32 +68,34 @@ function patrol(actor, target)
 		upOrDown = math.random(2)
 		if moveLeft == true then
 			if upOrDown == 1 then
-				actor.rotation = 180
+				a.rotation = 180
 			else
-				actor.rotation = 270
+				a.rotation = 270
 			end
 			moveLeft = false
 		else 
 			if upOrDown == 1 then
-				actor.rotation = 0
+				a.rotation = 0
 			else
-				actor.rotation = 90
+				a.rotation = 90
 			end
 			moveLeft = true
 		end
 	end
-	actor:moveForward()
+	a:moveForward()
 end
 
 -- the ai has found the player, this is what function is called
 function alert(actor, target)
+	local a = actor
+	local t = target
 	if target ~= nil then
 	--	print("target is at " .. target.position.x)
-		watchPosition(actor, target.position)
+		watchPosition(a, t.position)
 	end
 	--print("actor is alert at " .. actor.position.x)
-	if distance(actor.position, target.position) > 300 then
-		actor:moveForward()
+	if distance(a.position, t.position) > 300 then
+		a:moveForward()
 	end
-	actor:shoot()
+	a:shoot()
 end
diff --git a/Resources/shaders/GL_bubble.vert b/Resources/shaders/GL_bubble.vert
index 2c111c4..429aa86 100644
--- a/Resources/shaders/GL_bubble.vert
+++ b/Resources/shaders/GL_bubble.vert
@@ -6,8 +6,12 @@ out vec2 texCoord;
 
 uniform mat4 MVP;
 
+uniform mat4 model;
+uniform mat4 projection;
+uniform mat4 view;
+
 void main()
 {
 	texCoord = aTexCoord;
-	gl_Position = MVP * vec4(aPos, 1.0);
+	gl_Position = projection * view * model * vec4(aPos, 1.0);
 }
\ No newline at end of file
diff --git a/Resources/shaders/GL_pistol.vert b/Resources/shaders/GL_pistol.vert
index 92b7dc7..63e4dc2 100644
--- a/Resources/shaders/GL_pistol.vert
+++ b/Resources/shaders/GL_pistol.vert
@@ -5,12 +5,16 @@ layout (location = 1) in vec2 aTexCoord;
 out vec2 texCoord;
 
 uniform mat4 MVP;
+
+uniform mat4 projection;
+uniform mat4 view;
+uniform mat4 model;
 uniform bool flip;
 
 void main()
 {
 	texCoord = aTexCoord;
-	gl_Position = MVP * vec4(aPos, 1.0);
+	gl_Position = projection * view * model * vec4(aPos, 1.0);
 	if (flip)
 	{
 		texCoord = vec2(aTexCoord.x, 1.0 - aTexCoord.y);
diff --git a/Resources/shaders/GL_player.vert b/Resources/shaders/GL_player.vert
index 5d614e4..141aab7 100644
--- a/Resources/shaders/GL_player.vert
+++ b/Resources/shaders/GL_player.vert
@@ -7,9 +7,13 @@ out vec2 texPos;
 
 uniform mat4 MVP;
 
+uniform mat4 model;
+uniform mat4 projection;
+uniform mat4 view;
+
 void main()
 {
 	pos = aPos;
 	texPos = aTexPos;
-	gl_Position = MVP * vec4(aPos, 1.0);
+	gl_Position = projection * view * model * vec4(aPos, 1.0);
 }
\ No newline at end of file
diff --git a/Resources/shaders/GL_tile.frag b/Resources/shaders/GL_tile.frag
index f53e7bd..7fdc9da 100644
--- a/Resources/shaders/GL_tile.frag
+++ b/Resources/shaders/GL_tile.frag
@@ -1,8 +1,9 @@
 #version 330 core
 out vec4 FragColor;
 in vec2 texCoord;
+flat in int textureIndex;
 
-uniform sampler2D tileTexture;
+uniform sampler2DArray tileTexture;
 
 void main()
 {
@@ -12,7 +13,7 @@ void main()
 	}
 	else
 	{
-		FragColor = texture(tileTexture, texCoord);
+		FragColor = texture(tileTexture, vec3(texCoord.xy, textureIndex));
 	}
 	//FragColor = vec4(mod(tileindex / float(tilesperrow), 1.0), mod(tileindex / float(tilesperrow), 1.0), 0.0, 1.0);
 }
\ No newline at end of file
diff --git a/Resources/shaders/GL_tile.vert b/Resources/shaders/GL_tile.vert
index 7e1ddbd..039f99a 100644
--- a/Resources/shaders/GL_tile.vert
+++ b/Resources/shaders/GL_tile.vert
@@ -2,32 +2,37 @@
 layout (location = 0) in vec3 aPos;
 layout (location = 1) in vec2 aTexCoord;
 layout (location = 2) in int aTileIndex;
-layout (location = 3) in mat4 aModel;
+layout (location = 3) in int aTextureIndex;
+layout (location = 4) in int aTilesPerRow;
+layout (location = 5) in int aStartIndex;
+layout (location = 6) in vec2 aOriginalSize;
+layout (location = 7) in mat4 aModel;
 
-uniform int tilesPerRow;
+uniform vec2 uCanvasSize;
 uniform mat4 proj;
 uniform mat4 view;
 
 out vec2 texCoord;
-out int tileIndex;
+flat out int textureIndex;
 
 void main()
 {
-	tileIndex = aTileIndex;
+	int tilesPerRow = aTilesPerRow;
 	gl_Position = proj * view * aModel * vec4(aPos, 1.0);
-	if (tileIndex != 0) 
+	textureIndex = aTextureIndex;
+	if (aTileIndex != 0) 
 	{
-		int index = tileIndex - 1;
+		vec2 scale = vec2(aOriginalSize.x / uCanvasSize.x, aOriginalSize.y / uCanvasSize.y);
+
+		int index = aTileIndex - aStartIndex;
 		float tileSize = 1.0 / float(tilesPerRow);
 
 		int row = index / tilesPerRow;
 		int col = index % tilesPerRow;
 
-		float offsetX = float(col) * tileSize;
-		float offsetY = float(row) * tileSize;
-
 		texCoord.x = (aTexCoord.x + col) * tileSize;
 		texCoord.y = (aTexCoord.y + row) * tileSize;
+		texCoord = texCoord * scale;
 	}
 	else
 	{
diff --git a/Resources/sprites/shotGunFire128.png b/Resources/sprites/shotGunFire128.png
new file mode 100644
index 0000000000000000000000000000000000000000..9402104b79014980e16f9b605c9d4daf491908c9
GIT binary patch
literal 6183
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
NVP<o(#Kis9e*qTJ<HrC1

literal 0
HcmV?d00001

diff --git a/Resources/sprites/shotGunIdle128.png b/Resources/sprites/shotGunIdle128.png
new file mode 100644
index 0000000000000000000000000000000000000000..81227e853bda3b3a66aadbb67fc4b0816e40de43
GIT binary patch
literal 1882
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

literal 0
HcmV?d00001

diff --git a/Resources/sprites/shotGunReload128.png b/Resources/sprites/shotGunReload128.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ce815edb72aa1d91b1d11c873a32166b16d0506
GIT binary patch
literal 6518
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
Yr2m-}Ms?3U+4Gkiu(Y)(G<U!J7xWmAJ^%m!

literal 0
HcmV?d00001

diff --git a/Resources/weapons/bubblegun.xml b/Resources/weapons/bubblegun.xml
index dee8227..7ca7761 100644
--- a/Resources/weapons/bubblegun.xml
+++ b/Resources/weapons/bubblegun.xml
@@ -11,9 +11,9 @@
     </bullet>
   </weapon>
 
-  <weapon name="shotGun" fireSpeed="750.0" maxAmmo="64" clipSize="4">
+  <weapon name="shotGun" fireSpeed="1750.0" maxAmmo="64" clipSize="4">
     <script file="scripts/weapons/shotgun_script.lua"/>
-    <animation name="machine_gun_anim">
+    <animation name="shot_gun_anim">
       <size x="55.0" y="55.0"/>
       <offset x="-30.0" y="0.0"/>
     </animation>
diff --git a/YuppleMayham/CMakeLists.txt b/YuppleMayham/CMakeLists.txt
index cf36d30..1bddbde 100644
--- a/YuppleMayham/CMakeLists.txt
+++ b/YuppleMayham/CMakeLists.txt
@@ -67,7 +67,7 @@ add_executable (YuppleMayham
 	"include/utility/raycaster.h" 
 	"include/utility/ftfont.h" 
 	"include/utility/direction.h"
- "include/graphics/animation.h" "src/graphics/animation.cpp")
+ "include/graphics/animation.h" "src/graphics/animation.cpp" "include/utility/logger.h" "src/utility/logger.cpp")
 
 add_custom_command(TARGET YuppleMayham PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Resources/ $<TARGET_FILE_DIR:YuppleMayham>)
 
diff --git a/YuppleMayham/include/gameplay/ai.h b/YuppleMayham/include/gameplay/ai.h
index 89b08da..d25041b 100644
--- a/YuppleMayham/include/gameplay/ai.h
+++ b/YuppleMayham/include/gameplay/ai.h
@@ -2,7 +2,10 @@
 #define _H_AI_H
 
 #include <memory>
+#include <thread>
+#include <mutex>
 #include <string>
+#include <sol/sol.hpp>
 
 class GameActor;
 class Raycaster;
@@ -33,6 +36,11 @@ private:
 	std::shared_ptr<AIScript>	behaviour;
 	std::shared_ptr<GameActor>	actor;
 	std::shared_ptr<GameActor>	target;
+
+	// cache our lua function calls
+	sol::function				idleFunc;
+	sol::function				patrolFunc;
+	sol::function				alertFunc;
 };
 
 #endif
\ No newline at end of file
diff --git a/YuppleMayham/include/gameplay/entity.h b/YuppleMayham/include/gameplay/entity.h
index cbaa5ec..fb0b00c 100644
--- a/YuppleMayham/include/gameplay/entity.h
+++ b/YuppleMayham/include/gameplay/entity.h
@@ -44,6 +44,7 @@ public:
 	const bool getIsMoving() const { return isMoving; }
 	const int getEntityID() const { return entityid; }
 	const std::shared_ptr<PhysicsComponent> getPhysicsComponent() const { return physics; }
+	const std::shared_ptr<Shader> getShader() const { return shader; }
 
 	// TODO: right now there is no default behavior, but eventually the Entity class will be expanded to handle physics
 	virtual void update(float deltaTime) = 0;
diff --git a/YuppleMayham/include/gameplay/map.h b/YuppleMayham/include/gameplay/map.h
index f9f498e..7bcfc0a 100644
--- a/YuppleMayham/include/gameplay/map.h
+++ b/YuppleMayham/include/gameplay/map.h
@@ -25,8 +25,10 @@ private:
 	void loadMap();
 	void createCollisionMap();
 
+	int getTileSetIndex(int id) const;
+
 	std::shared_ptr<MapData> mapData;
-	std::shared_ptr<TileSetData> tileSetData;
+	std::vector<std::shared_ptr<TileSetData>> tileSetData;
 
 	std::vector<std::shared_ptr<TileTextureInstance>> instanceHandles;
 	std::shared_ptr<Shader> shader;
diff --git a/YuppleMayham/include/graphics/animation.h b/YuppleMayham/include/graphics/animation.h
index 8cbc61c..841df35 100644
--- a/YuppleMayham/include/graphics/animation.h
+++ b/YuppleMayham/include/graphics/animation.h
@@ -33,11 +33,14 @@ public:
 
 	void play() { isPlaying = true; }
 	void stop() { isPlaying = false; }
+	void reset() { currentFrame = 0; }
 
 	const bool getPlaying() const		{ return isPlaying; }
 	const bool getDirectional() const	{ return isDirectional; }
 	const int  getCycles()	const		{ return cycles; }
 
+	void setFPS(const float fps) { FPS = fps; }
+
 private:
 	std::string animName;
 	std::string animType;
diff --git a/YuppleMayham/include/graphics/instancedraw.h b/YuppleMayham/include/graphics/instancedraw.h
index 8002572..2b4b8d8 100644
--- a/YuppleMayham/include/graphics/instancedraw.h
+++ b/YuppleMayham/include/graphics/instancedraw.h
@@ -5,12 +5,18 @@
 #include <glm/glm.hpp>
 
 #define MAX_INSTANCES 1000
+#define MAX_TEXTURES 31
 
 class Texture;
+class TextureArray;
 
 struct InstanceData {
 	glm::mat4 modelMatrix;
+	glm::vec2 originalSize;
 	int tileIndex = 0;
+	int textureIndex = 0;
+	int tilesPerRow = 0;
+	int startID = 0;
 };
 
 class BaseInstanceDraw
@@ -26,7 +32,6 @@ protected:
 	Texture* texture = nullptr;
 	InstanceData instanceData[MAX_INSTANCES];
 	size_t numOfInstances = 0;
-	size_t numOfLayers = 0;
 	unsigned indices[6] = {
 		0, 1, 2,
 		3, 2, 0
@@ -37,12 +42,17 @@ class TileTextureInstance : public BaseInstanceDraw
 {
 public:
 	TileTextureInstance(const char* texturePath);
+	TileTextureInstance(const std::vector<const char*> texturePaths);
 
 	void updateInstanceData(const std::vector<InstanceData>&) override;
 	void draw() override;
 
+	const TextureArray* getTextureArray() { return textures; }
+	const Texture* getTexture() { return texture; }
+
 private:
 	void setup() override;
+	TextureArray* textures = nullptr;
 	float vertices[20] = {
 		// vertex		  
 		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // bottom left
diff --git a/YuppleMayham/include/graphics/shader.h b/YuppleMayham/include/graphics/shader.h
index 4523b75..35aa003 100644
--- a/YuppleMayham/include/graphics/shader.h
+++ b/YuppleMayham/include/graphics/shader.h
@@ -18,6 +18,7 @@ public:
 	void setFloat(const std::string& name, float value);
 	void setInt(const std::string& name, int value);
 	void setBool(const std::string& name, bool value);
+	void setVec2(const std::string& name, const float* value);
 	void setMatrix4f(const std::string& name, const float* value);
 
 	~Shader();
diff --git a/YuppleMayham/include/graphics/texture.h b/YuppleMayham/include/graphics/texture.h
index 46339de..13b9107 100644
--- a/YuppleMayham/include/graphics/texture.h
+++ b/YuppleMayham/include/graphics/texture.h
@@ -1,6 +1,10 @@
 #ifndef _H_TEXTURE_H
 #define _H_TEXTURE_H
 
+#include <vector>
+
+struct SDL_Surface;
+
 class Texture
 {
 public:
@@ -19,4 +23,43 @@ private:
 	int textureHeight = 0;
 };
 
+class TextureArray
+{
+private:
+	struct TextureData {
+		int width, height;
+	};
+public:
+	TextureArray() : numOfLayers(0) {}
+	/* We are going to assume each texture atlas is a square (512x512, 756x756 ... etc) */
+	bool loadTextures(std::vector<const char*> imagePaths);
+
+	void bind();
+
+	TextureData* operator[](const size_t index) {
+		try
+		{
+			return textures.at(index);
+		}
+		catch (std::exception&)
+		{
+			return nullptr;
+		}
+	}
+
+	const int getWidth()  const { return canvasWidth; }
+	const int getHeight() const { return canvasHeight; }
+
+	~TextureArray();
+
+private:
+	bool adjustCanvasSizes(std::vector<SDL_Surface*>& surfaces);
+
+	int numOfLayers;
+	unsigned ID = 0;
+	std::vector<TextureData*> textures;
+	int canvasWidth = 0;
+	int canvasHeight = 0;
+};
+
 #endif
\ No newline at end of file
diff --git a/YuppleMayham/include/utility/events.h b/YuppleMayham/include/utility/events.h
index 100f1af..334fda4 100644
--- a/YuppleMayham/include/utility/events.h
+++ b/YuppleMayham/include/utility/events.h
@@ -78,6 +78,14 @@ public:
 	int entityid;
 };
 
+class EntityFireEvent : public Event {
+public:
+	EntityFireEvent(const int entityid, const float fireDelay) : entityid(entityid), fireDelay(fireDelay) {}
+	std::string getType() const override { return "OnEntityFire"; }
+	int entityid;
+	float fireDelay;
+};
+
 class AnimationFinishedEvent : public Event {
 public:
 	AnimationFinishedEvent(const int entityid, const std::string animType) : entityid(entityid), animType(animType) {}
diff --git a/YuppleMayham/include/utility/logger.h b/YuppleMayham/include/utility/logger.h
new file mode 100644
index 0000000..58e0153
--- /dev/null
+++ b/YuppleMayham/include/utility/logger.h
@@ -0,0 +1,60 @@
+#ifndef _H_LOGGER_H
+#define _H_LOGGER_H
+
+#include <mutex>
+#include <chrono>
+#include <iostream>
+#include <sstream>
+
+#define LOG(lvl, msg, ...) Logger::getInstance()->log(lvl, msg, __VA_ARGS__)
+#define ERROR_LOG(msg, ...) {Logger::getInstance()->log(ERROR, msg, __VA_ARGS__); return false;}
+#define LOG_LEVEL(lvl) Logger::getInstance()->setLevel(lvl)
+
+enum LogLevel {DEBUG, INFO, WARN, ERROR};
+
+class Logger
+{
+public:
+	static Logger* getInstance();
+
+	template <typename... Args>
+	void log(LogLevel level, const std::string& message, Args... args) const
+	{
+		if (level >= currentLogLevel)
+		{
+			std::lock_guard<std::mutex> lock(mutex);
+			auto msg = formatString(message, args...);
+			std::cout
+				<< "["
+				<< std::format("{:%m-%d-%Y %X}", std::chrono::current_zone()->to_local(std::chrono::system_clock::now()))
+				<< "] "
+				<< msg
+				<< std::endl;
+		}
+	}
+
+	void setLevel(LogLevel level) { currentLogLevel = level; }
+
+	Logger(const Logger& l) = delete;
+	void operator=(const Logger& l) = delete;
+
+protected:
+	Logger()
+	{ 
+	};
+	~Logger() {  };
+
+	LogLevel currentLogLevel = INFO;
+
+	template <typename... Args>
+	std::string formatString(const std::string& str, Args... args) const
+	{
+		return std::vformat(str, std::make_format_args(args...));
+	}
+
+private:
+	static Logger* instance;
+	static std::mutex mutex;
+};
+
+#endif
\ No newline at end of file
diff --git a/YuppleMayham/include/utility/resourcemanager.h b/YuppleMayham/include/utility/resourcemanager.h
index ce20586..559e97c 100644
--- a/YuppleMayham/include/utility/resourcemanager.h
+++ b/YuppleMayham/include/utility/resourcemanager.h
@@ -45,6 +45,8 @@ public:
 
 	void clearResources();
 
+	~ResourceManager();
+
 private:
 	std::unordered_map<std::string, std::shared_ptr<Sprite>>	 sprites;
 	std::unordered_map<std::string, std::shared_ptr<Shader>>	 shaders;
diff --git a/YuppleMayham/include/utility/script.h b/YuppleMayham/include/utility/script.h
index 7dd1935..7a0c42a 100644
--- a/YuppleMayham/include/utility/script.h
+++ b/YuppleMayham/include/utility/script.h
@@ -4,6 +4,7 @@
 #define SOL_ALL_SAFETIES_ON 1
 
 #include <sol/sol.hpp>
+#include <chrono>
 #include <memory>
 
 class Script {
@@ -22,6 +23,11 @@ private:
 		return result.valid();
 	}
 	void registerGlobalUserTypes();
+
+	void performIncrementalGC();
+	std::chrono::high_resolution_clock::time_point lastGCTime = std::chrono::high_resolution_clock::now();
+	std::chrono::milliseconds gcInterval = std::chrono::milliseconds(16);
+	const int gcStepSize = 500;
 };
 
 class AIScript : public Script {
diff --git a/YuppleMayham/include/utility/xmlloader.h b/YuppleMayham/include/utility/xmlloader.h
index 4a7ff62..1270baa 100644
--- a/YuppleMayham/include/utility/xmlloader.h
+++ b/YuppleMayham/include/utility/xmlloader.h
@@ -25,11 +25,15 @@ struct EntityData {
 
 struct MapData {
 	std::string name;
-	std::string tileSet;
+	struct TileSet {
+		int startID = 1;
+		std::string path;
+	};
+	std::vector<TileSet> tileSets;
 	int width = 0, height = 0;
 	float tileSize = 32.f;
 	// 3D array, 0: layer, 1: y, 2: x
-	// Holding tile ids + 1, 0 is an empty tile
+	// Holding tile startID + ids, 0 is an empty tile
 	std::vector<std::vector<std::vector<int>>> tiles;
 };
 
diff --git a/YuppleMayham/src/gameplay/ai.cpp b/YuppleMayham/src/gameplay/ai.cpp
index f7f394c..67b3093 100644
--- a/YuppleMayham/src/gameplay/ai.cpp
+++ b/YuppleMayham/src/gameplay/ai.cpp
@@ -16,6 +16,15 @@ void AI::attachBehaviourScript(const std::shared_ptr<AIScript>& behaviour)
 	this->behaviour = behaviour;
 	this->behaviour->lua["raycaster"] = raycaster;
 	this->behaviour->lua["ai"] = shared_from_this();
+
+	if (this->behaviour->lua["idle"].valid())
+		idleFunc = this->behaviour->lua["idle"];
+	if (this->behaviour->lua["patrol"].valid())
+		patrolFunc = this->behaviour->lua["patrol"];
+	if (this->behaviour->lua["alert"].valid())
+		alertFunc = this->behaviour->lua["alert"];
+	this->behaviour->lua.set("actor", actor);
+	this->behaviour->lua.set("target", target);
 }
 
 void AI::update()
@@ -24,9 +33,9 @@ void AI::update()
 		switch (state)
 		{
 		case AIState::Idle:
-			if (behaviour && behaviour->lua["idle"].valid())
+			if (idleFunc.valid())
 			{
-				auto result = behaviour->lua["idle"](actor, target);
+				auto result = idleFunc(actor, target);
 				if (!result.valid())
 				{
 					sol::error err = result;
@@ -35,9 +44,9 @@ void AI::update()
 			}
 			break;
 		case AIState::Patrol:
-			if (behaviour && behaviour->lua["patrol"].valid())
+			if (patrolFunc.valid())
 			{
-				auto result = behaviour->lua["patrol"](actor, target);
+				auto result = patrolFunc(actor, target);
 				if (!result.valid())
 				{
 					sol::error err = result;
@@ -46,9 +55,9 @@ void AI::update()
 			}
 			break;
 		case AIState::Alert:
-			if (behaviour && behaviour->lua["alert"].valid())
+			if (alertFunc.valid())
 			{
-				auto result = behaviour->lua["alert"](actor, target);
+				auto result = alertFunc(actor, target);
 				if (!result.valid())
 				{
 					sol::error err = result;
@@ -57,7 +66,7 @@ void AI::update()
 			}
 			break;
 		}
-		behaviour->lua.collect_gc();
+		//behaviour->lua.collect_gc();
 	}
 	catch (const std::exception& e) {
 		std::cerr << "Error during AI update: " << e.what() << std::endl;
diff --git a/YuppleMayham/src/gameplay/camera.cpp b/YuppleMayham/src/gameplay/camera.cpp
index d4fd83c..a22f140 100644
--- a/YuppleMayham/src/gameplay/camera.cpp
+++ b/YuppleMayham/src/gameplay/camera.cpp
@@ -4,9 +4,9 @@ void Camera::update(float deltaTime)
 {
 	if (target == nullptr)
 		return;
-	float smoothingFactor = 0.01f;
-	if (glm::distance(target->getCenter(), getCenterPos()) > 20.f)
-		position += (target->getCenter() - getCenterPos()) * speed * smoothingFactor * deltaTime;
+	float smoothingFactor = 5.0f;
+	//if (glm::distance(target->getCenter(), getCenterPos()) > 20.f)
+	position += (target->getCenter() - getCenterPos()) * smoothingFactor * deltaTime;
 }
 
 glm::mat4 Camera::getViewMatrix() 
diff --git a/YuppleMayham/src/gameplay/entity.cpp b/YuppleMayham/src/gameplay/entity.cpp
index e7a88a9..7b50097 100644
--- a/YuppleMayham/src/gameplay/entity.cpp
+++ b/YuppleMayham/src/gameplay/entity.cpp
@@ -56,10 +56,11 @@ void Entity::update(float deltaTime)
 
 void Entity::render(const std::shared_ptr<Camera>& camera)
 {
-	glm::mat4 mvp = camera->getProjectionMatrix() * camera->getViewMatrix() * modelMatrix;
-
+	//glm::mat4 mvp = camera->getProjectionMatrix() * camera->getViewMatrix() * modelMatrix;
 	shader->use();
-	shader->setMatrix4f("MVP", glm::value_ptr(mvp));
+	shader->setMatrix4f("model", glm::value_ptr(modelMatrix));
+	shader->setMatrix4f("projection", glm::value_ptr(camera->getProjectionMatrix()));
+	shader->setMatrix4f("view", glm::value_ptr(camera->getViewMatrix()));
 	shader->setBool("flip", flipped);
 }
 
@@ -73,5 +74,4 @@ void Entity::updateModelMatrix()
 		rotationMat *
 		origin *
 		glm::scale(glm::mat4(1.0f), scale);
-	
 }
diff --git a/YuppleMayham/src/gameplay/game.cpp b/YuppleMayham/src/gameplay/game.cpp
index ce6b999..f13f328 100644
--- a/YuppleMayham/src/gameplay/game.cpp
+++ b/YuppleMayham/src/gameplay/game.cpp
@@ -9,6 +9,7 @@
 #include "utility/command.h"
 #include "utility/resourcemanager.h"
 #include "utility/ftfont.h"
+#include "utility/logger.h"
 
 #include "graphics/glwindow.h"
 
@@ -31,6 +32,12 @@ bool Game::init()
 		return false;
 	}
 
+#if _DEBUG 1
+	LOG_LEVEL(DEBUG);
+#elif
+	LOG_LEVEL(INFO);
+#endif
+
 	SDL_GL_SetSwapInterval(1);
 	glViewport(0, 0, window->width(), window->height());
 	glEnable(GL_BLEND);
diff --git a/YuppleMayham/src/gameplay/map.cpp b/YuppleMayham/src/gameplay/map.cpp
index 6dec0a3..e23bbd7 100644
--- a/YuppleMayham/src/gameplay/map.cpp
+++ b/YuppleMayham/src/gameplay/map.cpp
@@ -1,6 +1,7 @@
 #include "gameplay/map.h"
 #include "gameplay/camera.h"
 #include "graphics/shader.h"
+#include "graphics/texture.h"
 #include "utility/xmlloader.h"
 #include "utility/resourcemanager.h"
 
@@ -11,11 +12,21 @@ Map::Map(std::shared_ptr<MapData> mapData, const std::shared_ptr<Shader>& shader
 	mapData(mapData),
 	tileIds(mapData->tiles)
 {
-	tileSetData = resourceManager->loadTileSet(mapData->tileSet);
-	if (tileSetData)
+	for (auto& tileSet : mapData->tileSets)
+		tileSetData.push_back(resourceManager->loadTileSet(tileSet.path));
+
+	if (!tileSetData.empty())
 	{
+		std::vector<const char*> buffer;
 		for (int layer = 0; layer < tileIds.size(); layer++)
-			instanceHandles.push_back(std::make_shared<TileTextureInstance>(tileSetData->file.c_str()));
+		{
+			buffer.clear();
+			for (auto& set : tileSetData)
+				buffer.push_back(set->file.c_str());
+			if (!buffer.empty())
+				instanceHandles.push_back(std::make_shared<TileTextureInstance>(buffer));
+		}
+
 		loadMap();
 		createCollisionMap();
 	}
@@ -34,14 +45,24 @@ void Map::loadMap()
 				glm::mat4 modelMatrix =
 					glm::translate(glm::mat4(1.f), glm::vec3(x * mapData->tileSize, y * mapData->tileSize, 0.0f)) *
 					glm::scale(glm::mat4(1.f), glm::vec3(mapData->tileSize, mapData->tileSize, 1.0f));
-				int tileIndex = static_cast<int>(tileIds[layer][y][x]);
-				tileData[layer].push_back({modelMatrix, tileIndex});
+
+
+				int textureIndex = getTileSetIndex(tileIds[layer][y][x]);
+				glm::vec2 originalSize = (textureIndex != -1) ?
+					glm::vec2(tileSetData[textureIndex]->width, tileSetData[textureIndex]->height) :
+					glm::vec2(0.0f);
+				int tilesPerRow = (textureIndex != -1) ? tileSetData[textureIndex]->columns : 0;
+				int startID = (textureIndex != -1) ? mapData->tileSets[textureIndex].startID : 0;
+				int tileIndex = tileIds[layer][y][x];
+
+				tileData[layer].push_back({modelMatrix, originalSize, tileIndex, textureIndex, tilesPerRow, startID});
 			}
 		}
+		instanceHandles[layer]->updateInstanceData(tileData[layer]);
 	}
+	glm::vec2 canvasSize = glm::vec2(instanceHandles[0]->getTextureArray()->getWidth(), instanceHandles[0]->getTextureArray()->getHeight());
 	shader->use();
-	// TODO: Figure someway to put these in with my xml data
-	shader->setInt("tilesPerRow", tileSetData->columns);
+	shader->setVec2("uCanvasSize", glm::value_ptr(canvasSize));
 }
 
 void Map::createCollisionMap()
@@ -60,11 +81,13 @@ void Map::createCollisionMap()
 			for (int x = 0; x < tileIds[layer][y].size(); x++)
 			{
 				int id = tileIds[layer][y][x];
-				if (id == 0)
+				int tileSetIndex = getTileSetIndex(id);
+				if (tileSetIndex == -1)
 					collisionMap[y][x] = 0;
 				else
 				{
-					auto& tile = tileSetData->tiles[id - 1];
+					int startID = mapData->tileSets[tileSetIndex].startID;
+					auto& tile = tileSetData[tileSetIndex]->tiles[id - startID];
 					if (!tile->walkable)
 						collisionMap[y][x] = 1;
 				}
@@ -80,7 +103,26 @@ void Map::render(const std::shared_ptr<Camera>& camera)
 	shader->setMatrix4f("view", glm::value_ptr(camera->getViewMatrix()));
 	for (int layer = 0; layer < instanceHandles.size(); layer++)
 	{
-		instanceHandles[layer]->updateInstanceData(tileData[layer]);
 		instanceHandles[layer]->draw();
 	}
+}
+
+/* 
+Use this function to get the tileSetIndex from a tile ID. 
+the index of the tileSet is the same index as the texture index used in the instanceHandle
+
+returns tileSetIndex of the tile id passed. Unless the id is either 0 or 
+the returned tileSetIndex is out of bounds, returns -1
+*/
+int Map::getTileSetIndex(int id) const
+{
+	// work from the bottom, break if ID > startID
+	// If we get a textureIndex of -1 then we are on an empty tile
+	int tileSetIndex = mapData->tileSets.size() - 1;
+	for (; tileSetIndex != -1; --tileSetIndex)
+	{
+		if (id >= mapData->tileSets[tileSetIndex].startID)
+			break;
+	}
+	return (tileSetIndex >= mapData->tileSets.size()) ? -1 : tileSetIndex;
 }
\ No newline at end of file
diff --git a/YuppleMayham/src/gameplay/physics.cpp b/YuppleMayham/src/gameplay/physics.cpp
index 61c4898..5b13afa 100644
--- a/YuppleMayham/src/gameplay/physics.cpp
+++ b/YuppleMayham/src/gameplay/physics.cpp
@@ -2,6 +2,8 @@
 #include "gameplay/weapons/bullet.h"
 #include "utility/events.h"
 
+#include "utility/logger.h"
+
 #include <iostream>
 
 void PhysicsEngine::hookEventManager(const std::shared_ptr<EventManager>& eventManager)
@@ -21,7 +23,7 @@ std::shared_ptr<PhysicsComponent> PhysicsEngine::createObject(const unsigned int
 	const glm::vec3& pos, 
 	float mass, 
 	PhysicsComponent::Collider::Shape shape, 
-	glm::vec3 dimensions, 
+	glm::vec3 dimensions, const 
 	glm::vec3 offset)
 {
 	auto component = std::make_shared <PhysicsComponent>();
diff --git a/YuppleMayham/src/gameplay/weapons/bullet.cpp b/YuppleMayham/src/gameplay/weapons/bullet.cpp
index b4e0951..1454067 100644
--- a/YuppleMayham/src/gameplay/weapons/bullet.cpp
+++ b/YuppleMayham/src/gameplay/weapons/bullet.cpp
@@ -2,6 +2,8 @@
 #include "gameplay/physics.h"
 #include "utility/component.h"
 
+#include "gameplay/camera.h"
+
 void Bullet::addComponent(std::shared_ptr<Component> component)
 {
 	components.push_back(component);
@@ -23,7 +25,6 @@ void Bullet::render(const std::shared_ptr<Camera>& camera)
 {
 	Entity::render(camera);
 
-	shader->use();
 	for (auto& component : components)
 	{
 		component->play();
diff --git a/YuppleMayham/src/gameplay/weapons/bulletmanager.cpp b/YuppleMayham/src/gameplay/weapons/bulletmanager.cpp
index 71ab702..f3fc94b 100644
--- a/YuppleMayham/src/gameplay/weapons/bulletmanager.cpp
+++ b/YuppleMayham/src/gameplay/weapons/bulletmanager.cpp
@@ -1,6 +1,7 @@
 #include "gameplay/weapons/bulletmanager.h"
 #include "gameplay/weapons/bullet.h"
 #include "gameplay/physics.h"
+#include "gameplay/camera.h"
 #include "utility/events.h"
 #include "utility/component.h"
 
diff --git a/YuppleMayham/src/gameplay/weapons/weapon.cpp b/YuppleMayham/src/gameplay/weapons/weapon.cpp
index d518fd1..a9c2086 100644
--- a/YuppleMayham/src/gameplay/weapons/weapon.cpp
+++ b/YuppleMayham/src/gameplay/weapons/weapon.cpp
@@ -71,25 +71,30 @@ void Weapon::shoot()
 	if (wielder)
 	{
 		Uint32 currentTime = SDL_GetTicks();
-		if (weaponMag <= 0 && !reloading) reload();
-		if (currentTime - lastFireTime >= fireSpeed && !reloading && weaponMag > 0)
+		if (currentTime - lastFireTime >= fireSpeed && !reloading)
 		{
-			if (!weaponScript || !weaponScript->lua["onShoot"].valid())
+			if (weaponMag > 0)
 			{
-				// create bullet using this generated data
-				BulletData b = genBulletData();
-				createBullet(b);
-				weaponMag -= 1;
-			}
-			else {
-				auto result = weaponScript->lua["onShoot"]();
-				if (!result.valid())
+				if (eventManager)
+					eventManager->notify(std::make_shared<EntityFireEvent>(entityid, fireSpeed));
+				if (!weaponScript || !weaponScript->lua["onShoot"].valid())
 				{
-					sol::error err = result;
-					std::cerr << "lua error: " << err.what() << std::endl;
+					// create bullet using this generated data
+					BulletData b = genBulletData();
+					createBullet(b);
+					weaponMag -= 1;
+				}
+				else {
+					auto result = weaponScript->lua["onShoot"]();
+					if (!result.valid())
+					{
+						sol::error err = result;
+						std::cerr << "lua error: " << err.what() << std::endl;
+					}
+					weaponMag -= 1;
 				}
-				weaponMag -= 1;
 			}
+			else if (weaponMag <= 0) reload();
 			lastFireTime = currentTime;
 		}
 	}
diff --git a/YuppleMayham/src/graphics/animation.cpp b/YuppleMayham/src/graphics/animation.cpp
index ebfeac3..2153512 100644
--- a/YuppleMayham/src/graphics/animation.cpp
+++ b/YuppleMayham/src/graphics/animation.cpp
@@ -143,7 +143,10 @@ void AnimationSet::attachEventManager(const std::shared_ptr<EventManager>& e)
 		if (reloadEvent->entityid == entityid)
 		{
 			if (anims["reload"] != NULL)
+			{
 				curAnim = anims["reload"];
+				curAnim->reset();
+			}
 		}
 	});
 
@@ -155,6 +158,29 @@ void AnimationSet::attachEventManager(const std::shared_ptr<EventManager>& e)
 				curAnim = anims["idle"];
 		}
 	});
+
+	eventManager->subscribe("OnEntityFire", [this](std::shared_ptr<Event> e) {
+		auto fireEvent = std::static_pointer_cast<EntityFireEvent>(e);
+		if (fireEvent->entityid == entityid)
+		{
+			if (anims["fire"] != NULL)
+			{
+				curAnim = anims["fire"];
+				curAnim->reset();
+				float newFPS = (1000.f / fireEvent->fireDelay) * 15.f;
+				curAnim->setFPS(newFPS);
+			}
+		}
+	});
+
+	eventManager->subscribe("OnAnimationFinished", [this](std::shared_ptr<Event> e) {
+		auto animEvent = std::static_pointer_cast<AnimationFinishedEvent>(e);
+		if (animEvent->entityid == entityid && animEvent->animType == "fire")
+		{
+			if (anims["idle"] != NULL)
+				curAnim = anims["idle"];
+		}
+	});
 }
 
 void AnimationSet::bind()
diff --git a/YuppleMayham/src/graphics/instancedraw.cpp b/YuppleMayham/src/graphics/instancedraw.cpp
index 3a33544..eb72356 100644
--- a/YuppleMayham/src/graphics/instancedraw.cpp
+++ b/YuppleMayham/src/graphics/instancedraw.cpp
@@ -12,6 +12,13 @@ TileTextureInstance::TileTextureInstance(const char* texturePath)
 		setup();
 }
 
+TileTextureInstance::TileTextureInstance(const std::vector<const char*> texturePaths)
+{
+	textures = new TextureArray();
+	if (textures->loadTextures(texturePaths))
+		setup();
+}
+
 void TileTextureInstance::setup()
 {
 	glGenVertexArrays(1, &VAO);
@@ -37,15 +44,38 @@ void TileTextureInstance::setup()
 	
 	glBufferData(GL_ARRAY_BUFFER, sizeof(InstanceData) * MAX_INSTANCES, nullptr, GL_DYNAMIC_DRAW);
 
+	// tileIndex instanceData layout position 2
 	glVertexAttribIPointer(2, 1, GL_INT, sizeof(InstanceData), (void*)(offsetof(InstanceData, tileIndex)));
 	glEnableVertexAttribArray(2);
 	glVertexAttribDivisor(2, 1);
 
+	// textureIndex instanceData layout position 3 -> We are using multiple textures to hold each tileset
+	glVertexAttribIPointer(3, 1, GL_INT, sizeof(InstanceData), (void*)(offsetof(InstanceData, textureIndex)));
+	glEnableVertexAttribArray(3);
+	glVertexAttribDivisor(3, 1);
+
+	// tilesPerRow instanceData layout position 4, This is needed since we are supporting multiple tilesets
+	// of different sizes
+	glVertexAttribIPointer(4, 1, GL_INT, sizeof(InstanceData), (void*)(offsetof(InstanceData, tilesPerRow)));
+	glEnableVertexAttribArray(4);
+	glVertexAttribDivisor(4, 1);
+
+	// startID instanceData layout position 5
+	glVertexAttribIPointer(5, 1, GL_INT, sizeof(InstanceData), (void*)(offsetof(InstanceData, startID)));
+	glEnableVertexAttribArray(5);
+	glVertexAttribDivisor(5, 1);
+
+	// originalSize instanceData layout position 6
+	glVertexAttribPointer(6, 2, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (void*)(offsetof(InstanceData, originalSize)));
+	glEnableVertexAttribArray(6);
+	glVertexAttribDivisor(6, 1);
+
+	// modelMatrix instanceData as 4 vec 4s (a 4x4 matrix) layout head position 7
 	for (int i = 0; i < 4; i++)
 	{
-		glVertexAttribPointer(3 + i, 4, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (void*)(offsetof(InstanceData, modelMatrix) + (sizeof(glm::vec4) * i)));
-		glEnableVertexAttribArray(3 + i);
-		glVertexAttribDivisor(3 + i, 1);
+		glVertexAttribPointer(7 + i, 4, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (void*)(offsetof(InstanceData, modelMatrix) + (sizeof(glm::vec4) * i)));
+		glEnableVertexAttribArray(7 + i);
+		glVertexAttribDivisor(7 + i, 1);
 	}
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 	glBindVertexArray(0);
@@ -60,23 +90,39 @@ void TileTextureInstance::updateInstanceData(const std::vector<InstanceData>& in
 
 	InstanceData* instances = (InstanceData*)glMapBufferRange(GL_ARRAY_BUFFER, 0,
 		sizeof(InstanceData) * instanceData.size(),
-		GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+		GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
 	if (!instances)
 		return;
 
+	if (instances)
+	{
+		std::memcpy(instances, instanceData.data(), sizeof(InstanceData) * instanceData.size());
+		glUnmapBuffer(GL_ARRAY_BUFFER);
+	}
+
+	/*
 	for (int i = 0; i < instanceData.size(); i++)
 	{
 		instances[i].modelMatrix = instanceData[i].modelMatrix;
+		instances[i].originalSize = instanceData[i].originalSize;
 		instances[i].tileIndex = instanceData[i].tileIndex;
+		instances[i].textureIndex = instanceData[i].textureIndex;
+		instances[i].tilesPerRow = instanceData[i].tilesPerRow;
+		instances[i].startID = instanceData[i].startID;
 	}
+	*/
 
-	glUnmapBuffer(GL_ARRAY_BUFFER);
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 }
 
 void TileTextureInstance::draw()
 {
-	texture->bind();
+	// bind textures
+	if (texture)
+		texture->bind();
+	else if (textures)
+		textures->bind();
+
 	glBindVertexArray(VAO);
 	glDrawElementsInstanced(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr, numOfInstances);
 	glBindVertexArray(0);
diff --git a/YuppleMayham/src/graphics/shader.cpp b/YuppleMayham/src/graphics/shader.cpp
index fe63f57..4ee0a80 100644
--- a/YuppleMayham/src/graphics/shader.cpp
+++ b/YuppleMayham/src/graphics/shader.cpp
@@ -93,6 +93,11 @@ void Shader::setBool(const std::string& name, bool value)
 	glUniform1i(glGetUniformLocation(ID, name.c_str()), value);
 }
 
+void Shader::setVec2(const std::string& name, const float* value)
+{
+	glUniform2fv(glGetUniformLocation(ID, name.c_str()), 1, value);
+}
+
 void Shader::setMatrix4f(const std::string& name, const float* value)
 {
 	GLuint loc = glGetUniformLocation(ID, name.c_str());
diff --git a/YuppleMayham/src/graphics/texture.cpp b/YuppleMayham/src/graphics/texture.cpp
index 2bc8377..3250c8e 100644
--- a/YuppleMayham/src/graphics/texture.cpp
+++ b/YuppleMayham/src/graphics/texture.cpp
@@ -45,7 +45,127 @@ void Texture::bind()
 	glBindTexture(GL_TEXTURE_2D, ID);
 }
 
+
 Texture::~Texture()
 {
 	glDeleteTextures(1, &ID);
-}
\ No newline at end of file
+}
+
+bool TextureArray::loadTextures(std::vector<const char*> imagePaths)
+{
+	std::vector<SDL_Surface*> surfaces;
+	surfaces.resize(imagePaths.size());
+	// Fill surfaces vector
+	for (int i = 0; i < imagePaths.size(); ++i)
+	{
+		surfaces[i] = IMG_Load(imagePaths[i]);
+		if (!surfaces[i])
+		{
+			std::cout << "Failed to load image file: " << imagePaths[i] << std::endl;
+			return false;
+		}
+	}
+	if (!adjustCanvasSizes(surfaces))
+	{
+		std::cout << "ERROR: Failed to adjust canvas size of images!" << std::endl
+			<< "Make sure to check that every tileset has square dimensions! (512x512, 756x756 ... etc)" << std::endl;
+		return false;
+	}
+	if (surfaces.empty())
+	{
+		std::cout << "ERROR: No surfaces created" << std::endl;
+		return false;
+	}
+	numOfLayers = imagePaths.size();
+
+	glGenTextures(1, &ID);
+	glBindTexture(GL_TEXTURE_2D_ARRAY, ID);
+
+	// Creating the texture array all of our textures will live in.
+	// adjustCanvasSizes makes every image the same size, so we can just use the first 
+	// surface in the list of surfaces
+	glTexImage3D(GL_TEXTURE_2D_ARRAY,
+		0,
+		GL_RGBA,
+		surfaces[0]->w,
+		surfaces[0]->h,
+		numOfLayers,
+		0,
+		GL_RGBA,
+		GL_UNSIGNED_BYTE,
+		nullptr);
+
+	for (int layer = 0; layer < numOfLayers; ++layer)
+	{
+		glTexSubImage3D(GL_TEXTURE_2D_ARRAY,
+			0,
+			0, 0, layer,
+			surfaces[layer]->w,
+			surfaces[layer]->h,
+			1,
+			GL_RGBA,
+			GL_UNSIGNED_BYTE,
+			surfaces[layer]->pixels);
+	}
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+
+	glGenerateMipmap(GL_TEXTURE_2D_ARRAY);
+
+	for (auto& surface : surfaces)
+		SDL_FreeSurface(surface);
+	surfaces.clear();
+
+	return true;
+}
+
+void TextureArray::bind()
+{
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(GL_TEXTURE_2D_ARRAY, ID);
+}
+
+bool TextureArray::adjustCanvasSizes(std::vector<SDL_Surface*>& surfaces)
+{
+	int maxWidth = 0;
+	int maxHeight = 0;
+	for (auto& surface : surfaces)
+	{
+		if (surface->w != surface->h)
+		{
+			std::cout << "Image must be a square!" << std::endl;
+			return false;
+		}
+		if (surface->w > maxWidth) maxWidth = surface->w;
+		if (surface->h > maxHeight) maxHeight = surface->h;
+		textures.push_back(new TextureData({ surface->w, surface->h }));
+	}
+	for (int i = 0; i < surfaces.size(); ++i)
+	{
+		SDL_Surface* canvas = SDL_CreateRGBSurface(0, maxWidth, maxHeight, 
+			surfaces[i]->format->BitsPerPixel,
+			surfaces[i]->format->Rmask,
+			surfaces[i]->format->Gmask,
+			surfaces[i]->format->Bmask,
+			surfaces[i]->format->Amask);
+
+		SDL_FillRect(canvas, NULL, SDL_MapRGBA(canvas->format, 0, 0, 0, 0));
+
+		SDL_BlitSurface(surfaces[i], NULL, canvas, NULL);
+
+		SDL_FreeSurface(surfaces[i]);
+		surfaces[i] = canvas;
+	}
+
+	canvasWidth = maxWidth;
+	canvasHeight = maxHeight;
+
+	return true;
+}
+
+TextureArray::~TextureArray()
+{
+	glDeleteTextures(1, &ID);
+}
diff --git a/YuppleMayham/src/main.cpp b/YuppleMayham/src/main.cpp
index 7b32d95..5a6f558 100644
--- a/YuppleMayham/src/main.cpp
+++ b/YuppleMayham/src/main.cpp
@@ -44,7 +44,7 @@ int main(int argc, char* args[])
 	{
 		Uint64 curCounter = SDL_GetPerformanceCounter();
 		float deltaTime = ((curCounter - lastCounter) / freq);
-		deltaTime = (deltaTime < 10.f) ? deltaTime : 1.f;
+		deltaTime = (deltaTime < 1.f) ? deltaTime : 1.f;
 		SDL_PollEvent(&e);
 		if (e.type == SDL_QUIT)
 			game->quit();
diff --git a/YuppleMayham/src/utility/logger.cpp b/YuppleMayham/src/utility/logger.cpp
new file mode 100644
index 0000000..140a776
--- /dev/null
+++ b/YuppleMayham/src/utility/logger.cpp
@@ -0,0 +1,14 @@
+#include "utility/logger.h"
+
+Logger* Logger::instance{ nullptr };
+std::mutex Logger::mutex;
+
+Logger* Logger::getInstance()
+{
+	std::lock_guard<std::mutex> lock(mutex);
+	if (instance == nullptr)
+	{
+		instance = new Logger();
+	}
+	return instance;
+}
diff --git a/YuppleMayham/src/utility/resourcemanager.cpp b/YuppleMayham/src/utility/resourcemanager.cpp
index 779cbf0..79c6865 100644
--- a/YuppleMayham/src/utility/resourcemanager.cpp
+++ b/YuppleMayham/src/utility/resourcemanager.cpp
@@ -70,6 +70,7 @@ std::shared_ptr<SceneData> ResourceManager::loadScene(const std::string& id)
 std::shared_ptr<AnimationSet> ResourceManager::loadAnimationSet(const std::string& name, int entityid)
 {
 	auto animSetData = xmlLoader->getAnimationSet(name);
+
 	return std::make_shared<AnimationSet>(entityid, this, animSetData);
 }
 
@@ -94,3 +95,9 @@ void ResourceManager::clearResources()
 	weapons.clear();
 	tileSets.clear();
 }
+
+ResourceManager::~ResourceManager()
+{
+	clearResources();
+	xmlLoader.reset();
+}
diff --git a/YuppleMayham/src/utility/script.cpp b/YuppleMayham/src/utility/script.cpp
index a162a7f..4756ce8 100644
--- a/YuppleMayham/src/utility/script.cpp
+++ b/YuppleMayham/src/utility/script.cpp
@@ -106,4 +106,5 @@ Script::Script(const std::string& path)
 	lua.open_libraries(sol::lib::base, sol::lib::math);
 	registerGlobalUserTypes();
 	loadScript(path);
+
 }
diff --git a/YuppleMayham/src/utility/xmlloader.cpp b/YuppleMayham/src/utility/xmlloader.cpp
index 6005c0c..49949f5 100644
--- a/YuppleMayham/src/utility/xmlloader.cpp
+++ b/YuppleMayham/src/utility/xmlloader.cpp
@@ -1,5 +1,7 @@
 #include "utility/xmlloader.h"
 
+#include "utility/logger.h"
+
 /*
 	Loading every scene in the scene folder and storing in hashmap scenes
 	hashkey is the id of the scene
@@ -26,26 +28,28 @@ bool XMLLoader::loadXmlScene(const char* xmlFile, SceneData* out)
 {
 	tinyxml2::XMLDocument doc;
 	if (doc.LoadFile(xmlFile) != tinyxml2::XML_SUCCESS)
-		return false;
+		ERROR_LOG("Failed to load file: {}", xmlFile);
 	tinyxml2::XMLElement* scene = doc.FirstChildElement("scene");
 
 	const char* type, * id, * mapName;
 	if (scene->QueryStringAttribute("type", &type) != tinyxml2::XML_SUCCESS ||
 		scene->QueryStringAttribute("id", &id) != tinyxml2::XML_SUCCESS)
-		return false;
+		ERROR_LOG("Could not read type or id tag in file: {}", xmlFile);
 	out->type = type;
 	out->id = id;
 
+
 	tinyxml2::XMLElement* map = scene->FirstChildElement("map");
 	if (map == NULL)
-		return false;
+		ERROR_LOG("Could not find 'map' tag in file: {}", xmlFile);
 	if (map->QueryStringAttribute("name", &mapName) != tinyxml2::XML_SUCCESS)
-		return false;
+		ERROR_LOG("Could not find attribute 'name' in map tag. file: {}", xmlFile)
 
 	if (!(out->map = getMapData(mapName)))
 		return false;
 	if (!loadEntityData(xmlFile, out))
 		return false;
+	LOG(DEBUG, "Loading scene: {}", xmlFile);
 	return true;
 }
 
@@ -56,21 +60,21 @@ bool XMLLoader::loadEntityData(const char* xmlFile, SceneData* out)
 {
 	tinyxml2::XMLDocument doc;
 	if (doc.LoadFile(xmlFile) != tinyxml2::XML_SUCCESS)
-		return false;
+		ERROR_LOG("Failed to load file: {}", xmlFile);
 
 	tinyxml2::XMLElement* entities = doc.FirstChildElement()->FirstChildElement("entities");
 
 	// Adding the player. Player must be in the scene or the scene will not load!
 	tinyxml2::XMLElement* playerElement = entities->FirstChildElement("player");
 	if (playerElement == NULL)
-		return false;
+		ERROR_LOG("Player element not found in scene! File: {}", xmlFile);
 
 	EntityData playData;
 	const char *graphic, *weaponName = "pistolGun";
 
 	if (playerElement->QueryIntAttribute("x", &playData.x) != tinyxml2::XML_SUCCESS ||
 		playerElement->QueryIntAttribute("y", &playData.y) != tinyxml2::XML_SUCCESS)
-		return false;
+		ERROR_LOG("Failed to find x or y attribute in 'player' tag. File: {}", xmlFile);
 	playerElement->QueryStringAttribute("weapon", &weaponName);
 	tinyxml2::XMLElement* anim = playerElement->FirstChildElement("animation");
 	if (anim == NULL)
@@ -78,33 +82,33 @@ bool XMLLoader::loadEntityData(const char* xmlFile, SceneData* out)
 		playData.animated = false;
 		tinyxml2::XMLElement* sprite = playerElement->FirstChildElement("sprite");
 		if (sprite == NULL)
-			return false;
+			ERROR_LOG("Could not find tag 'sprite' in 'player' tag. File: {}", xmlFile);
 		if (sprite->QueryStringAttribute("file", &graphic) != tinyxml2::XML_SUCCESS)
-			return false;
+			ERROR_LOG("Could not find attribute 'file' in 'player' -> 'sprite' tag. File: {}", xmlFile);
 	}
 	else
 	{
 		playData.animated = true;
 		if (anim->QueryStringAttribute("name", &graphic) != tinyxml2::XML_SUCCESS)
-			return false;
+			ERROR_LOG("Could not find 'name' attribute in 'animation' tag. File: {}", xmlFile);
 	}
 	playData.isPlayer = true;
 	playData.graphic = graphic;
 	playData.weapon = weaponName;
 
 	out->entities.push_back(playData);
+	LOG(DEBUG, "Loaded player with sprite: {} in file: {}", graphic, xmlFile);
 
 	// Adding every other entity...
 	// TODO: Add npcs to game and enable their use with XMLLoader
 
 	for (tinyxml2::XMLElement* e = entities->FirstChildElement("entity"); e != NULL; e = e->NextSiblingElement("entity"))
 	{
-		
 		EntityData data;
 		const char *graphic, *weaponName = "pistolGun", *scriptPath;
 		if (e->QueryIntAttribute("x", &data.x) != tinyxml2::XML_SUCCESS ||
 			e->QueryIntAttribute("y", &data.y) != tinyxml2::XML_SUCCESS)
-			return false;
+			ERROR_LOG("Could not load position coordinates for entity. File: {}", xmlFile);
 		e->QueryStringAttribute("weapon", &weaponName);
 		tinyxml2::XMLElement* anim = e->FirstChildElement("animation");
 		if (anim == NULL)
@@ -154,7 +158,7 @@ bool XMLLoader::loadWeapons(const char* weaponFolder)
 	// We are gonna check every xml file within the weaponFolder, then check every weapon node within each file.
 	std::filesystem::path folder(weaponFolder);
 	if (!std::filesystem::exists(folder) || !std::filesystem::is_directory(folder))
-		return false;
+		ERROR_LOG("'{}' folder does not exist!", weaponFolder);
 	for (auto& file : std::filesystem::directory_iterator(folder))
 	{
 		if (!file.path().has_extension() || !file.path().has_filename() || !file.exists() || file.is_directory())
@@ -261,6 +265,7 @@ bool XMLLoader::loadWeapons(const char* weaponFolder)
 				modifier->QueryFloatAttribute("max", &data.modMax);
 			}
 
+			LOG(DEBUG, "Loaded {} from {}", data.name, file.path().filename().generic_string());
 			weapons.try_emplace(data.name, std::make_shared<WeaponData>(data));
 		}
 	}
@@ -274,19 +279,22 @@ bool XMLLoader::loadAnimations(const char* animationFolder)
 {
 	std::filesystem::path folder(animationFolder);
 	if (!std::filesystem::exists(folder) || !std::filesystem::is_directory(folder))
-		return false;
+		ERROR_LOG("'{}' folder does not exist!", animationFolder);
 	for (auto& file : std::filesystem::directory_iterator(folder))
 	{
 		if (!file.path().has_extension() || !file.path().has_filename() || !file.exists() || file.is_directory())
 			continue;
+
 		tinyxml2::XMLDocument doc;
 		if (doc.LoadFile(file.path().generic_string().c_str()) != tinyxml2::XML_SUCCESS)
 			continue;
+
 		tinyxml2::XMLElement* anims = doc.FirstChildElement("animations");
 		bool directional = false;
 		anims->QueryBoolAttribute("directional", &directional);
 		if (anims == NULL)
 			continue;
+
 		for (tinyxml2::XMLElement* e = anims->FirstChildElement("animation"); e != NULL; e = e->NextSiblingElement("animation"))
 		{
 			AnimationData animData;
@@ -295,6 +303,7 @@ bool XMLLoader::loadAnimations(const char* animationFolder)
 			if (e->QueryStringAttribute("name", &name) != tinyxml2::XML_SUCCESS ||
 				e->QueryStringAttribute("type", &type) != tinyxml2::XML_SUCCESS)
 				continue;
+
 			tinyxml2::XMLElement* fps = e->FirstChildElement("FPS");
 			fps->QueryFloatText(&animData.FPS);
 
@@ -333,7 +342,7 @@ bool XMLLoader::loadTileSets(const char* tileSetFolder)
 {
 	std::filesystem::path folder(tileSetFolder);
 	if (!std::filesystem::exists(folder) || !std::filesystem::is_directory(folder))
-		return false;
+		ERROR_LOG("'{}' folder failed to load!", tileSetFolder);
 
 	for (auto& file : std::filesystem::directory_iterator(folder))
 	{
@@ -347,11 +356,12 @@ bool XMLLoader::loadTileSets(const char* tileSetFolder)
 		if (tileSet == NULL)
 			continue;
 		TileSetData tileSetData;
-		const char* setName, * setType, * setFile;
+		const char* setName, * setType = "shooter", * setFile;
+
+		tileSet->QueryStringAttribute("class", &setType);
 
 		// Read attributes of tileset element
 		if (tileSet->QueryStringAttribute("name", &setName) != tinyxml2::XML_SUCCESS ||
-			tileSet->QueryStringAttribute("class", &setType) != tinyxml2::XML_SUCCESS ||
 			tileSet->QueryFloatAttribute("tilewidth", &tileSetData.tileSize) != tinyxml2::XML_SUCCESS ||
 			tileSet->QueryIntAttribute("tilecount", &tileSetData.tileCount) != tinyxml2::XML_SUCCESS ||
 			tileSet->QueryIntAttribute("columns", &tileSetData.columns) != tinyxml2::XML_SUCCESS)
@@ -390,10 +400,10 @@ bool XMLLoader::loadTile(tinyxml2::XMLElement* tileElement, TileSetData::TileDat
 	const char* tileType;
 
 	if (tileElement == NULL)
-		return false;
+		ERROR_LOG("Failed to find 'tile' tag.");
 	if (tileElement->QueryIntAttribute("id", &tileData.id) != tinyxml2::XML_SUCCESS ||
 		tileElement->QueryStringAttribute("type", &tileType) != tinyxml2::XML_SUCCESS)
-		return false;
+		ERROR_LOG("Failed to load tile id or type. {}", tileElement->Value());
 
 	if (std::string(tileType).compare("object") == 0)
 	{
@@ -405,7 +415,7 @@ bool XMLLoader::loadTile(tinyxml2::XMLElement* tileElement, TileSetData::TileDat
 		*/
 		tinyxml2::XMLElement* objectGroup = tileElement->FirstChildElement("objectgroup");
 		if (objectGroup == NULL)
-			return false;
+			ERROR_LOG("Failed to find tag 'objectgroup' in tile id: {}", tileData.id);
 		for (tinyxml2::XMLElement* obj = objectGroup->FirstChildElement("object"); obj != NULL; obj = obj->NextSiblingElement("object"))
 		{
 			TileSetData::TileData::ObjectData objData;
@@ -414,7 +424,7 @@ bool XMLLoader::loadTile(tinyxml2::XMLElement* tileElement, TileSetData::TileDat
 			tileData.objects.push_back(std::make_shared<TileSetData::TileData::ObjectData>(objData));
 		}
 		if (tileData.objects.empty())
-			return false;
+			ERROR_LOG("No objects found");
 	}
 	else
 	{
@@ -445,19 +455,19 @@ bool XMLLoader::loadObject(tinyxml2::XMLElement* objElement, TileSetData::TileDa
 
 	// avoid null pointer exception
 	if (objElement == NULL)
-		return false;
+		ERROR_LOG("Failed to find 'object' tag");
 	// load id and name
 	if (objElement->QueryIntAttribute("id", &objData.id) != tinyxml2::XML_SUCCESS ||
 		objElement->QueryStringAttribute("name", &objName) != tinyxml2::XML_SUCCESS)
-		return false;
+		ERROR_LOG("No id or name found for object. {}", objElement->Value());
 	// load position into vec2
 	if (objElement->QueryFloatAttribute("x", &objData.pos.x) != tinyxml2::XML_SUCCESS ||
 		objElement->QueryFloatAttribute("y", &objData.pos.y) != tinyxml2::XML_SUCCESS)
-		return false;
+		ERROR_LOG("Failed to load position coordinates for object: {}", objData.name);
 	// load size into seperate vec2
 	if (objElement->QueryFloatAttribute("width", &objData.size.x) != tinyxml2::XML_SUCCESS ||
 		objElement->QueryFloatAttribute("height", &objData.size.y) != tinyxml2::XML_SUCCESS)
-		return false;
+		ERROR_LOG("Failed to load size of object: {}", objData.name);
 
 	// refer to comment in XMLLoader::loadTile regarding the properties portion as to why we return true here
 	tinyxml2::XMLElement* properties = objElement->FirstChildElement("properties");
@@ -479,7 +489,7 @@ bool XMLLoader::loadMaps(const char* mapFolder)
 {
 	std::filesystem::path folder(mapFolder);
 	if (!std::filesystem::exists(folder) || !std::filesystem::is_directory(folder))
-		return false;
+		ERROR_LOG("'{}' folder not found!", mapFolder);
 
 	for (auto& file : std::filesystem::directory_iterator(folder))
 	{
@@ -493,17 +503,23 @@ bool XMLLoader::loadMaps(const char* mapFolder)
 		if (map == NULL)
 			continue;
 		MapData mapData;
-		const char* tileSetPath;
 
 		if (map->QueryIntAttribute("width", &mapData.width) != tinyxml2::XML_SUCCESS ||
 			map->QueryIntAttribute("height", &mapData.height) != tinyxml2::XML_SUCCESS ||
 			map->QueryFloatAttribute("tilewidth", &mapData.tileSize) != tinyxml2::XML_SUCCESS)
 			continue;
 
-		tinyxml2::XMLElement* tileSet = map->FirstChildElement("tileset");
-		if (tileSet == NULL)
-			continue;
-		if (tileSet->QueryStringAttribute("source", &tileSetPath) != tinyxml2::XML_SUCCESS)
+		for (tinyxml2::XMLElement* tileSet = map->FirstChildElement("tileset"); tileSet != NULL; tileSet = tileSet->NextSiblingElement("tileset"))
+		{
+			int firstGID = 0;
+			const char* tileSetPath;
+			if (tileSet->QueryStringAttribute("source", &tileSetPath) != tinyxml2::XML_SUCCESS ||
+				tileSet->QueryIntAttribute("firstgid", &firstGID) != tinyxml2::XML_SUCCESS)
+				continue;
+			mapData.tileSets.push_back({ firstGID, tileSetPath });
+		}
+
+		if (mapData.tileSets.empty())
 			continue;
 
 		mapData.tiles.reserve(10);
@@ -557,7 +573,6 @@ bool XMLLoader::loadMaps(const char* mapFolder)
 		/* TODO: Add object layer */
 
 		mapData.name = file.path().stem().string();
-		mapData.tileSet = tileSetPath;
 
 		maps.try_emplace(mapData.name, std::make_shared<MapData>(mapData));
 	}