added some more features, and fixed some bugs (was to lazy to commit every change *hides)

9 files changed, 158 insertions, 0 deletions

diff --git a/client/assets/maps/002-1.tmx b/client/assets/maps/002-1.tmx
new file mode 100644
index 0000000..3c5e75b
--- /dev/null
+++ b/client/assets/maps/002-1.tmx
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="1">
+ <tileset firstgid="1" name="2006__desert1" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../tilesets/2006__desert1.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="257" name="collision" tilewidth="32" tileheight="32" tilecount="2" columns="2">
+  <image source="../tilesets/collision.png" width="64" height="32"/>
+ </tileset>
+ <tileset firstgid="259" source="../tilesets/2006__desert2.tsx"/>
+ <layer id="1" name="ground" width="20" height="20">
+  <data encoding="csv">
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+</data>
+ </layer>
+ <layer id="2" name="ground 2" width="20" 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,7,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,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,48,0,0,63,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,38,0,40,0,0,0,0,0,63,0,0,0,0,0,0,0,
+0,0,0,0,54,55,56,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,342,343,344,0,0,0,0,0,0,
+0,0,0,0,59,0,0,364,355,356,0,358,359,360,0,362,363,364,0,0,
+0,0,0,0,0,0,0,380,371,372,0,358,359,360,0,378,379,380,0,0,
+0,0,62,0,0,0,0,0,342,343,343,407,359,360,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,358,359,359,359,359,360,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,374,375,375,375,375,376,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="fringe" width="20" 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,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="over" width="20" 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,31,32,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,22,23,24,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,259,260,261,262,263,264,265,266,267,0,0,0,
+0,0,0,0,0,0,0,0,275,276,277,278,279,280,281,282,283,0,0,0,
+0,0,0,0,0,0,0,300,291,292,293,294,295,296,297,298,299,300,0,0,
+0,0,0,0,0,0,0,316,307,308,309,310,311,312,313,314,315,316,0,0,
+0,0,0,0,0,0,0,332,323,324,325,326,327,328,329,330,331,332,0,0,
+0,0,0,0,0,0,0,348,339,340,341,0,0,0,345,346,347,348,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="5" name="collision" width="20" 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,258,0,0,0,0,0,258,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,258,258,0,0,258,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,258,258,258,0,0,0,0,0,258,0,0,0,0,0,0,0,
+0,0,0,0,258,258,258,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,258,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,258,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,258,0,0,258,258,258,0,0,0,0,0,258,258,258,0,0,
+0,0,0,0,0,0,0,258,258,258,0,0,0,0,0,258,258,258,0,0,
+0,0,258,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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>
+</map>
diff --git a/client/assets/npcs.xml b/client/assets/npcs.xml
new file mode 100644
index 0000000..3238114
--- /dev/null
+++ b/client/assets/npcs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<npcs>
+    <images>
+        <img imgid='1' src='/client/assets/npcs/generic.png'
+            width='128' 
+            height='128'
+            tileWidth='32' 
+            tileHeight='32' />
+        <img imgid='2' src='/client/assets/npcs/humans.png'
+            width='128' 
+            height='128'
+            tileWidth='32' 
+            tileHeight='64' />
+    </images>
+
+    <npc id='0' >#hidden</npc>
+    <npc id='1' imgid='1' index='0'>Chest</npc>
+    <npc id='2' imgid='2' index='0'>Girl 1</npc>
+    <npc id='3' imgid='2' index='1'>Boy 1</npc>
+</npcs>
\ No newline at end of file
diff --git a/client/assets/tilesets/2006__desert1.png b/client/assets/tilesets/2006__desert1.png
new file mode 100644
index 0000000..5813119
--- /dev/null
+++ b/client/assets/tilesets/2006__desert1.png
diff --git a/client/assets/tilesets/2006__desert1.tsx b/client/assets/tilesets/2006__desert1.tsx
new file mode 100644
index 0000000..b062249
--- /dev/null
+++ b/client/assets/tilesets/2006__desert1.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.4" tiledversion="1.4.3" name="2006__desert1" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="2006__desert1.png" width="512" height="512"/>
+</tileset>
diff --git a/client/assets/tilesets/2006__desert2.png b/client/assets/tilesets/2006__desert2.png
new file mode 100644
index 0000000..98a8740
--- /dev/null
+++ b/client/assets/tilesets/2006__desert2.png
diff --git a/client/assets/tilesets/2006__desert2.tsx b/client/assets/tilesets/2006__desert2.tsx
new file mode 100644
index 0000000..7db0966
--- /dev/null
+++ b/client/assets/tilesets/2006__desert2.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.4" tiledversion="1.4.3" name="2006__desert2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="2006__desert2.png" width="512" height="512"/>
+</tileset>
diff --git a/client/assets/tilesets/2006__desert_x2.png b/client/assets/tilesets/2006__desert_x2.png
new file mode 100644
index 0000000..8b14d63
--- /dev/null
+++ b/client/assets/tilesets/2006__desert_x2.png
diff --git a/client/assets/tilesets/2006__desert_x3.png b/client/assets/tilesets/2006__desert_x3.png
new file mode 100644
index 0000000..5453761
--- /dev/null
+++ b/client/assets/tilesets/2006__desert_x3.png
diff --git a/client/assets/tilesets/collision.png b/client/assets/tilesets/collision.png
new file mode 100644
index 0000000..9486abf
--- /dev/null
+++ b/client/assets/tilesets/collision.png