diff options
| author | tom barrett <spalf0@gmail.com> | 2019-06-27 10:00:42 -0500 |
|---|---|---|
| committer | tom barrett <spalf0@gmail.com> | 2019-06-27 10:00:42 -0500 |
| commit | a76efb8444af9d4a0ee558e72903c67bc2cff5d3 (patch) | |
| tree | b93849385e23e51466658502fe0a8a3064405ba5 /resources/map.tmx | |
| parent | 93d0a0eb6a5c35ad8b82f368c5251d9690c508f9 (diff) | |
| parent | ee8d055be8326eb1561900bcca6acd9e38071f4a (diff) | |
Merge branch 'master' into feature/dude
Diffstat (limited to 'resources/map.tmx')
| -rw-r--r-- | resources/map.tmx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/resources/map.tmx b/resources/map.tmx index 4716fae..766cd89 100644 --- a/resources/map.tmx +++ b/resources/map.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="1"> +<map version="1.2" tiledversion="1.2.1" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="1"> <tileset firstgid="1" name="tileset" tilewidth="16" tileheight="16" tilecount="50" columns="10"> <image source="tileset.png" width="160" height="80"/> </tileset> @@ -14,7 +14,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, -1,1,1,1,1,1,2,2,2,2,2,2,2,2,1,1,2,2,2,2, +1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 1,1,1,1,1,1,1,1,2,2,2,2,1,1,1,1,1,1,2,2, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -51,7 +51,7 @@ 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="Ground-Angled" width="20" height="20"> + <layer id="3" name="Ground-Alpha" 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, @@ -62,7 +62,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 2684354564,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,2684354564,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,2684354564,0,0,0,0,0,0,0,3221225476,2,2,2,0,0,0, +0,0,0,0,0,2684354564,0,0,0,0,0,0,0,3221225476,0,0,0,0,0,0, 0,0,0,0,0,0,0,2684354564,0,0,0,0,4,0,0,0,0,2684354564,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354564,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -80,13 +80,13 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,2147483683,0,0,35,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,2147483693,0,0,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,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,36,0,45,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,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, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -105,12 +105,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,15,25,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, |