diff --git a/AndorsTrail/res/drawable/map_bed_1.png b/AndorsTrail/res/drawable/map_bed_1.png
index b637ce5a2..62dee4319 100644
Binary files a/AndorsTrail/res/drawable/map_bed_1.png and b/AndorsTrail/res/drawable/map_bed_1.png differ
diff --git a/AndorsTrail/res/drawable/map_bridge_1.png b/AndorsTrail/res/drawable/map_bridge_1.png
index 94e7e7eed..bf3067a09 100644
Binary files a/AndorsTrail/res/drawable/map_bridge_1.png and b/AndorsTrail/res/drawable/map_bridge_1.png differ
diff --git a/AndorsTrail/res/drawable/map_bridge_2.png b/AndorsTrail/res/drawable/map_bridge_2.png
new file mode 100644
index 000000000..fcf709ea4
Binary files /dev/null and b/AndorsTrail/res/drawable/map_bridge_2.png differ
diff --git a/AndorsTrail/res/drawable/map_broken_1.png b/AndorsTrail/res/drawable/map_broken_1.png
index 5da8901a5..ec964ea95 100644
Binary files a/AndorsTrail/res/drawable/map_broken_1.png and b/AndorsTrail/res/drawable/map_broken_1.png differ
diff --git a/AndorsTrail/res/drawable/map_cavewall_3.png b/AndorsTrail/res/drawable/map_cavewall_3.png
index d312a4e77..4e1739f5e 100644
Binary files a/AndorsTrail/res/drawable/map_cavewall_3.png and b/AndorsTrail/res/drawable/map_cavewall_3.png differ
diff --git a/AndorsTrail/res/drawable/map_cavewall_4.png b/AndorsTrail/res/drawable/map_cavewall_4.png
new file mode 100644
index 000000000..0bc18cf92
Binary files /dev/null and b/AndorsTrail/res/drawable/map_cavewall_4.png differ
diff --git a/AndorsTrail/res/drawable/map_chair_table_1.png b/AndorsTrail/res/drawable/map_chair_table_1.png
index 06415acb2..89ff7466d 100644
Binary files a/AndorsTrail/res/drawable/map_chair_table_1.png and b/AndorsTrail/res/drawable/map_chair_table_1.png differ
diff --git a/AndorsTrail/res/drawable/map_chair_table_2.png b/AndorsTrail/res/drawable/map_chair_table_2.png
new file mode 100644
index 000000000..f03ba1140
Binary files /dev/null and b/AndorsTrail/res/drawable/map_chair_table_2.png differ
diff --git a/AndorsTrail/res/drawable/map_crate_1.png b/AndorsTrail/res/drawable/map_crate_1.png
index 8ce7ff60b..ccda7205a 100644
Binary files a/AndorsTrail/res/drawable/map_crate_1.png and b/AndorsTrail/res/drawable/map_crate_1.png differ
diff --git a/AndorsTrail/res/drawable/map_cupboard_1.png b/AndorsTrail/res/drawable/map_cupboard_1.png
index 4aed48cc0..976dec453 100644
Binary files a/AndorsTrail/res/drawable/map_cupboard_1.png and b/AndorsTrail/res/drawable/map_cupboard_1.png differ
diff --git a/AndorsTrail/res/drawable/map_curtain_1.png b/AndorsTrail/res/drawable/map_curtain_1.png
index 54855894c..67bbf457a 100644
Binary files a/AndorsTrail/res/drawable/map_curtain_1.png and b/AndorsTrail/res/drawable/map_curtain_1.png differ
diff --git a/AndorsTrail/res/drawable/map_entrance_1.png b/AndorsTrail/res/drawable/map_entrance_1.png
index 5be9e54cf..22a2aa575 100644
Binary files a/AndorsTrail/res/drawable/map_entrance_1.png and b/AndorsTrail/res/drawable/map_entrance_1.png differ
diff --git a/AndorsTrail/res/drawable/map_entrance_2.png b/AndorsTrail/res/drawable/map_entrance_2.png
new file mode 100644
index 000000000..2032a3e1f
Binary files /dev/null and b/AndorsTrail/res/drawable/map_entrance_2.png differ
diff --git a/AndorsTrail/res/drawable/map_fence_1.png b/AndorsTrail/res/drawable/map_fence_1.png
index 2c8ef4285..f650a8c29 100644
Binary files a/AndorsTrail/res/drawable/map_fence_1.png and b/AndorsTrail/res/drawable/map_fence_1.png differ
diff --git a/AndorsTrail/res/drawable/map_fence_2.png b/AndorsTrail/res/drawable/map_fence_2.png
index adf7b222c..00f3d221e 100644
Binary files a/AndorsTrail/res/drawable/map_fence_2.png and b/AndorsTrail/res/drawable/map_fence_2.png differ
diff --git a/AndorsTrail/res/drawable/map_fence_3.png b/AndorsTrail/res/drawable/map_fence_3.png
new file mode 100644
index 000000000..9765bd295
Binary files /dev/null and b/AndorsTrail/res/drawable/map_fence_3.png differ
diff --git a/AndorsTrail/res/drawable/map_fence_4.png b/AndorsTrail/res/drawable/map_fence_4.png
new file mode 100644
index 000000000..215fe884b
Binary files /dev/null and b/AndorsTrail/res/drawable/map_fence_4.png differ
diff --git a/AndorsTrail/res/drawable/map_ground_2.png b/AndorsTrail/res/drawable/map_ground_2.png
index e5c08da46..aefd99ea6 100644
Binary files a/AndorsTrail/res/drawable/map_ground_2.png and b/AndorsTrail/res/drawable/map_ground_2.png differ
diff --git a/AndorsTrail/res/drawable/map_house_1.png b/AndorsTrail/res/drawable/map_house_1.png
new file mode 100644
index 000000000..826cf232b
Binary files /dev/null and b/AndorsTrail/res/drawable/map_house_1.png differ
diff --git a/AndorsTrail/res/drawable/map_house_2.png b/AndorsTrail/res/drawable/map_house_2.png
new file mode 100644
index 000000000..d9135c967
Binary files /dev/null and b/AndorsTrail/res/drawable/map_house_2.png differ
diff --git a/AndorsTrail/res/drawable/map_indoor_1.png b/AndorsTrail/res/drawable/map_indoor_1.png
index c59cf1b84..f453d44a8 100644
Binary files a/AndorsTrail/res/drawable/map_indoor_1.png and b/AndorsTrail/res/drawable/map_indoor_1.png differ
diff --git a/AndorsTrail/res/drawable/map_indoor_2.png b/AndorsTrail/res/drawable/map_indoor_2.png
new file mode 100644
index 000000000..15cf4dbe8
Binary files /dev/null and b/AndorsTrail/res/drawable/map_indoor_2.png differ
diff --git a/AndorsTrail/res/drawable/map_kitchen_1.png b/AndorsTrail/res/drawable/map_kitchen_1.png
index 8bd126b48..d1d8ae629 100644
Binary files a/AndorsTrail/res/drawable/map_kitchen_1.png and b/AndorsTrail/res/drawable/map_kitchen_1.png differ
diff --git a/AndorsTrail/res/drawable/map_outdoor_1.png b/AndorsTrail/res/drawable/map_outdoor_1.png
index 1542f184b..1b8468912 100644
Binary files a/AndorsTrail/res/drawable/map_outdoor_1.png and b/AndorsTrail/res/drawable/map_outdoor_1.png differ
diff --git a/AndorsTrail/res/drawable/map_pillar_2.png b/AndorsTrail/res/drawable/map_pillar_2.png
new file mode 100644
index 000000000..976867f00
Binary files /dev/null and b/AndorsTrail/res/drawable/map_pillar_2.png differ
diff --git a/AndorsTrail/res/drawable/map_plant_1.png b/AndorsTrail/res/drawable/map_plant_1.png
index 4a8792154..975e442f4 100644
Binary files a/AndorsTrail/res/drawable/map_plant_1.png and b/AndorsTrail/res/drawable/map_plant_1.png differ
diff --git a/AndorsTrail/res/drawable/map_plant_2.png b/AndorsTrail/res/drawable/map_plant_2.png
new file mode 100644
index 000000000..a958fc3ce
Binary files /dev/null and b/AndorsTrail/res/drawable/map_plant_2.png differ
diff --git a/AndorsTrail/res/drawable/map_rock_1.png b/AndorsTrail/res/drawable/map_rock_1.png
index f320a01b7..ac8912177 100644
Binary files a/AndorsTrail/res/drawable/map_rock_1.png and b/AndorsTrail/res/drawable/map_rock_1.png differ
diff --git a/AndorsTrail/res/drawable/map_rock_2.png b/AndorsTrail/res/drawable/map_rock_2.png
new file mode 100644
index 000000000..e04194e85
Binary files /dev/null and b/AndorsTrail/res/drawable/map_rock_2.png differ
diff --git a/AndorsTrail/res/drawable/map_roof_1.png b/AndorsTrail/res/drawable/map_roof_1.png
index db6e5dcdb..16c573c23 100644
Binary files a/AndorsTrail/res/drawable/map_roof_1.png and b/AndorsTrail/res/drawable/map_roof_1.png differ
diff --git a/AndorsTrail/res/drawable/map_roof_3.png b/AndorsTrail/res/drawable/map_roof_3.png
new file mode 100644
index 000000000..26cae7a59
Binary files /dev/null and b/AndorsTrail/res/drawable/map_roof_3.png differ
diff --git a/AndorsTrail/res/drawable/map_sign_ladder_1.png b/AndorsTrail/res/drawable/map_sign_ladder_1.png
index 44e4d0d4d..2132f635b 100644
Binary files a/AndorsTrail/res/drawable/map_sign_ladder_1.png and b/AndorsTrail/res/drawable/map_sign_ladder_1.png differ
diff --git a/AndorsTrail/res/drawable/map_tree_1.png b/AndorsTrail/res/drawable/map_tree_1.png
index aec4b661e..1e76ed618 100644
Binary files a/AndorsTrail/res/drawable/map_tree_1.png and b/AndorsTrail/res/drawable/map_tree_1.png differ
diff --git a/AndorsTrail/res/drawable/map_tree_2.png b/AndorsTrail/res/drawable/map_tree_2.png
new file mode 100644
index 000000000..aa4689855
Binary files /dev/null and b/AndorsTrail/res/drawable/map_tree_2.png differ
diff --git a/AndorsTrail/res/drawable/map_wall_1.png b/AndorsTrail/res/drawable/map_wall_1.png
index 69c8bf639..47139f2a1 100644
Binary files a/AndorsTrail/res/drawable/map_wall_1.png and b/AndorsTrail/res/drawable/map_wall_1.png differ
diff --git a/AndorsTrail/res/drawable/map_wall_4.png b/AndorsTrail/res/drawable/map_wall_4.png
new file mode 100644
index 000000000..0ff1c9deb
Binary files /dev/null and b/AndorsTrail/res/drawable/map_wall_4.png differ
diff --git a/AndorsTrail/res/drawable/map_window_2.png b/AndorsTrail/res/drawable/map_window_2.png
index 62c084489..7f0d0987e 100644
Binary files a/AndorsTrail/res/drawable/map_window_2.png and b/AndorsTrail/res/drawable/map_window_2.png differ
diff --git a/AndorsTrail/res/values/authors.xml b/AndorsTrail/res/values/authors.xml
index 3f0154a0c..1fb79db41 100644
--- a/AndorsTrail/res/values/authors.xml
+++ b/AndorsTrail/res/values/authors.xml
@@ -53,6 +53,13 @@
<a href="http://opengameart.org/content/farming-tilesets-magic-animations-and-ui-elements">Additional graphics by Daniel Eddeland</a><br />
<a href="http://opengameart.org/content/liberated-pixel-cup-base-assets-sprites-map-tiles">Additional graphics by Lanea Zimmerman (AKA Sharm)</a><br />
<a href="http://art.gnome.org/themes/icon">Additional graphics by Gnome icon artists</a><br />
+ <a href="http://forums.rpgmakerweb.com/index.php?/topic/5434-its-a-mad-mad-mad-mad-world-maddies-edits-and-clumping/">Additional graphics by Paladin-Cleric of Awesome</a><br />
+ <a href="http://ayene-chan.deviantart.com/gallery/32324562">Additional graphics by Ayene-chan</a><br />
+ <a href="http://vxresource.wordpress.com/2010/03/17/the-real-macks-tileset/">Additional graphics by Mack</a><br />
+ <a href="http://forums.rpgmakerweb.com/index.php?/topic/9178-amazing-avys-awesome-arrrpg-maker-stuff/ ">Additional graphics by Avery, Gits</a><br />
+ <a href="http://vxresource.wordpress.com/category/resources/tilesets/">Additional graphics by vxresource.wordpress.com</a><br />
+ This website shares tiles with the general public for free with the agreement of their original creators.<br />
+ <br />
Additional graphics by DeBray Bailey<br />
<a href="http://rltiles.sourceforge.net">Monster tileset graphics by rltiles.sourceforge.net</a><br />
Part of (or All) the graphic tiles used in this program is the public domain roguelike tileset "RLTiles".
diff --git a/AndorsTrail/res/xml/template.tmx b/AndorsTrail/res/xml/template.tmx
index e381d4a82..3f9f8dbc9 100644
--- a/AndorsTrail/res/xml/template.tmx
+++ b/AndorsTrail/res/xml/template.tmx
@@ -9,127 +9,172 @@
-
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
-
+
+
+
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
-
+
+
+
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
+
+
+
-
+
-
+
-
+
+
+
+
-
+
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
index 6b331c96c..e3e343e4f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
@@ -313,17 +313,23 @@ public final class ResourceLoader {
loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_border_1, "map_border_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_bridge_1, "map_bridge_1.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_bridge_2, "map_bridge_2.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_broken_1, "map_broken_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_cavewall_1, "map_cavewall_1.png", new Size(18, 6), defaultTileSize);
loader.prepareTileset(R.drawable.map_cavewall_2, "map_cavewall_2.png", new Size(18, 6), defaultTileSize);
loader.prepareTileset(R.drawable.map_cavewall_3, "map_cavewall_3.png", new Size(18, 6), defaultTileSize);
+ loader.prepareTileset(R.drawable.map_cavewall_4, "map_cavewall_4.png", new Size(18, 6), defaultTileSize);
loader.prepareTileset(R.drawable.map_chair_table_1, "map_chair_table_1.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_chair_table_2, "map_chair_table_2.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_crate_1, "map_crate_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_cupboard_1, "map_cupboard_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_curtain_1, "map_curtain_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_entrance_1, "map_entrance_1.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_entrance_2, "map_entrance_2.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_fence_1, "map_fence_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_fence_2, "map_fence_2.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_fence_3, "map_fence_3.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_fence_4, "map_fence_4.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_ground_1, "map_ground_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_ground_2, "map_ground_2.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_ground_3, "map_ground_3.png", src_mapTileSize, defaultTileSize);
@@ -332,22 +338,35 @@ public final class ResourceLoader {
loader.prepareTileset(R.drawable.map_ground_6, "map_ground_6.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_ground_7, "map_ground_7.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_ground_8, "map_ground_8.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_house_1, "map_house_1.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_house_2, "map_house_2.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_indoor_1, "map_indoor_1.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_indoor_2, "map_indoor_2.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_kitchen_1, "map_kitchen_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_outdoor_1, "map_outdoor_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_pillar_1, "map_pillar_1.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_pillar_2, "map_pillar_2.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_plant_1, "map_plant_1.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_plant_2, "map_plant_2.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_rock_1, "map_rock_1.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_rock_2, "map_rock_2.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_roof_1, "map_roof_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_roof_2, "map_roof_2.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_roof_3, "map_roof_3.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_shop_1, "map_shop_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_sign_ladder_1, "map_sign_ladder_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_table_1, "map_table_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_trail_1, "map_trail_1.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_transition_1, "map_transition_1.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_transition_2, "map_transition_2.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_transition_3, "map_transition_3.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_transition_4, "map_transition_4.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_tree_1, "map_tree_1.png", src_mapTileSize, defaultTileSize);
+ loader.prepareTileset(R.drawable.map_tree_2, "map_tree_2.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_wall_1, "map_wall_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_wall_2, "map_wall_2.png", new Size(15, 8), defaultTileSize);
loader.prepareTileset(R.drawable.map_wall_3, "map_wall_3.png", new Size(15, 8), defaultTileSize);
+ loader.prepareTileset(R.drawable.map_wall_4, "map_wall_4.png", new Size(15, 8), defaultTileSize);
loader.prepareTileset(R.drawable.map_window_1, "map_window_1.png", src_mapTileSize, defaultTileSize);
loader.prepareTileset(R.drawable.map_window_2, "map_window_2.png", src_mapTileSize, defaultTileSize);