From 95ee5b19d37024cbaca561386d7cfccc656d01de Mon Sep 17 00:00:00 2001
From: Ian Haase <ian.haase2@gmail.com>
Date: Thu, 20 Feb 2014 16:01:50 +0100
Subject: [PATCH] Added "map_transition_5" displaying additional shadow
 transitions

---
 AndorsTrail/res/drawable/map_transition_5.png | Bin 0 -> 5515 bytes
 AndorsTrail/res/xml/template.tmx              |  26 ++++++++++--------
 .../AndorsTrail/resource/ResourceLoader.java  |   1 +
 3 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 AndorsTrail/res/drawable/map_transition_5.png

diff --git a/AndorsTrail/res/drawable/map_transition_5.png b/AndorsTrail/res/drawable/map_transition_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a8c5c8aa21dcd24fdf7fc3d3595e39d1c690522
GIT binary patch
literal 5515
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

literal 0
HcmV?d00001

diff --git a/AndorsTrail/res/xml/template.tmx b/AndorsTrail/res/xml/template.tmx
index f0a63522d..2112d6719 100644
--- a/AndorsTrail/res/xml/template.tmx
+++ b/AndorsTrail/res/xml/template.tmx
@@ -153,28 +153,31 @@
  <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="6953" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7073" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7193" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
@@ -197,8 +200,7 @@
    eJztwQEBAAAAgiD/r25IQAEAAPBoDhAAAQ==
   </data>
  </layer>
- <objectgroup name="Mapevents"/>
- <objectgroup name="Spawn"/>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace"/>
+ <objectgroup name="Mapevents" width="30" height="30"/>
+ <objectgroup name="Spawn" width="30" height="30"/>
+ <objectgroup name="Keys" width="30" height="30"/>
 </map>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
index f437f11e2..31acd7630 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
@@ -360,6 +360,7 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.map_transition_2, "map_transition_2", src_mapTileSize, defaultTileSize);
 		loader.prepareTileset(R.drawable.map_transition_3, "map_transition_3", src_mapTileSize, defaultTileSize);
 		loader.prepareTileset(R.drawable.map_transition_4, "map_transition_4", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_transition_5, "map_transition_5", src_mapTileSize, defaultTileSize);
 		loader.prepareTileset(R.drawable.map_tree_1, "map_tree_1", src_mapTileSize, defaultTileSize);
 		loader.prepareTileset(R.drawable.map_tree_2, "map_tree_2", src_mapTileSize, defaultTileSize);
 		loader.prepareTileset(R.drawable.map_wall_1, "map_wall_1", src_mapTileSize, defaultTileSize);