Additional graphics for new items and NPCs (thanks to DeBray Bailey).

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@220 08aca716-68be-ccc6-4d58-36f5abd142ac

diff --git a/AndorsTrail/res/drawable/items_misc_2.png b/AndorsTrail/res/drawable/items_misc_2.png
new file mode 100644 (file)
index 0000000..5b5105a
Binary files /dev/null and b/AndorsTrail/res/drawable/items_misc_2.png differ

diff --git a/AndorsTrail/res/drawable/items_misc_3.png b/AndorsTrail/res/drawable/items_misc_3.png
new file mode 100644 (file)
index 0000000..3612efe
Binary files /dev/null and b/AndorsTrail/res/drawable/items_misc_3.png differ

diff --git a/AndorsTrail/res/drawable/items_misc_4.png b/AndorsTrail/res/drawable/items_misc_4.png
new file mode 100644 (file)
index 0000000..df8d761
Binary files /dev/null and b/AndorsTrail/res/drawable/items_misc_4.png differ

diff --git a/AndorsTrail/res/drawable/monsters_ld1.png b/AndorsTrail/res/drawable/monsters_ld1.png
new file mode 100644 (file)
index 0000000..c4a4d1f
Binary files /dev/null and b/AndorsTrail/res/drawable/monsters_ld1.png differ

diff --git a/AndorsTrail/res/drawable/monsters_ld2.png b/AndorsTrail/res/drawable/monsters_ld2.png
new file mode 100644 (file)
index 0000000..875473b
Binary files /dev/null and b/AndorsTrail/res/drawable/monsters_ld2.png differ

diff --git a/AndorsTrail/res/values/authors.xml b/AndorsTrail/res/values/authors.xml
index 4fcf1f2c4d747b4cf36a05355449dac0a85594a7..f27c51f6e8b18c946316453dadc44c0f46ba3198 100644 (file)
--- a/AndorsTrail/res/values/authors.xml
+++ b/AndorsTrail/res/values/authors.xml
@@ -12,6 +12,7 @@
                <a href="http://opengameart.org/content/whispers-of-avalon-item-icons">Additional graphics by Meway, Len Pabin, Auran, Silviyius</a><br />
                <a href="http://opengameart.org/content/10-basic-rpg-enemies">Additional graphics by Stephen Challener (Redshrike)</a><br />
                <a href="http://opengameart.org/content/skull">Additional graphics by Jorge.Avila</a><br />
+               Additional graphics by DeBray Bailey<br />
                <a href="http://andorstrail.com/">Web site provided by Scott Devaney</a><br />
                Additional maps done by Michael Schmid<br />
                Additional maps done by Pete Wheeler<br />

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
index fae8bcf9b844884d1f451352ff99984844c2797c..db7a5bf10572bbea206300769e230341b7df7b87 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
@@ -196,6 +196,9 @@ public final class ResourceLoader {
         loader.prepareTileset(R.drawable.items_consumables, "items_consumables", new Size(14, 5), defaultTileSize);
         loader.prepareTileset(R.drawable.items_books, "items_books", new Size(11, 1), defaultTileSize);
         loader.prepareTileset(R.drawable.items_misc, "items_misc", new Size(14, 4), defaultTileSize);
+        loader.prepareTileset(R.drawable.items_misc_2, "items_misc_2", new Size(20, 12), defaultTileSize);
+        loader.prepareTileset(R.drawable.items_misc_3, "items_misc_3", new Size(20, 12), defaultTileSize);
+        loader.prepareTileset(R.drawable.items_misc_4, "items_misc_4", new Size(20, 4), defaultTileSize);
         loader.prepareTileset(R.drawable.items_necklaces_1, "items_necklaces_1", new Size(10, 3), defaultTileSize);
         loader.prepareTileset(R.drawable.items_weapons_3, "items_weapons_3", new Size(13, 5), defaultTileSize);
         loader.prepareTileset(R.drawable.items_armours_2, "items_armours_2", new Size(7, 1), defaultTileSize);
@@ -222,6 +225,8 @@ public final class ResourceLoader {
         loader.prepareTileset(R.drawable.monsters_rltiles2, "monsters_rltiles2", new Size(20, 9), defaultTileSize);
         loader.prepareTileset(R.drawable.monsters_rltiles3, "monsters_rltiles3", new Size(10, 3), defaultTileSize);
         loader.prepareTileset(R.drawable.monsters_karvis2, "monsters_karvis2", new Size(9, 1), defaultTileSize);
+        loader.prepareTileset(R.drawable.monsters_ld1, "monsters_ld1", new Size(20, 12), defaultTileSize);
+        loader.prepareTileset(R.drawable.monsters_ld2, "monsters_ld2", new Size(20, 12), defaultTileSize);
 
         loader.prepareTileset(R.drawable.map_tiles_1_1, "map_tiles_1_1.png", src_mapTileSize, defaultTileSize);
         loader.prepareTileset(R.drawable.map_tiles_1_2, "map_tiles_1_2.png", src_mapTileSize, defaultTileSize);

diff --git a/AndorsTrailEdit/AndorsTrailEditor.js b/AndorsTrailEdit/AndorsTrailEditor.js
index dd09d276b6123f440c0ea890beb2854cc9227d6a..931d73b85d9c7f69d3b8779230c5ae7d048434e8 100644 (file)
--- a/AndorsTrailEdit/AndorsTrailEditor.js
+++ b/AndorsTrailEdit/AndorsTrailEditor.js
@@ -250,6 +250,9 @@ function startEditor() {
        imageSelector.add(new TilesetImage("items_consumables", {x:14, y:5}, undefined, [ 'items' ] ));
        imageSelector.add(new TilesetImage("items_books", {x:11, y:1}, undefined, [ 'items' ] ));
        imageSelector.add(new TilesetImage("items_misc", {x:14, y:4}, undefined, [ 'items' ] ));
+       imageSelector.add(new TilesetImage("items_misc_2", {x:20, y:12}, undefined, [ 'items' ] ));
+       imageSelector.add(new TilesetImage("items_misc_3", {x:20, y:12}, undefined, [ 'items' ] ));
+       imageSelector.add(new TilesetImage("items_misc_4", {x:20, y:4}, undefined, [ 'items' ] ));
        imageSelector.add(new TilesetImage("monsters_armor1", {x: 1, y:1}, undefined, [ 'monsters' ] ));
        imageSelector.add(new TilesetImage("monsters_demon1", {x: 1, y:1}, {x:64, y:64}, [ 'monsters' ] ));
        imageSelector.add(new TilesetImage("monsters_dogs", {x: 7, y:1}, undefined, [ 'monsters' ] ));
@@ -283,6 +286,8 @@ function startEditor() {
        imageSelector.add(new TilesetImage("monsters_rltiles2", {x:20, y:9}, undefined, [ 'monsters' ] ));
        imageSelector.add(new TilesetImage("monsters_rltiles3", {x:10, y:3}, undefined, [ 'monsters' ] ));
        imageSelector.add(new TilesetImage("monsters_redshrike1", {x:6, y:1}, undefined, [ 'monsters' ] ));
+       imageSelector.add(new TilesetImage("monsters_ld1", {x:20, y:12}, undefined, [ 'monsters' ] ));
+       imageSelector.add(new TilesetImage("monsters_ld2", {x:20, y:12}, undefined, [ 'monsters' ] ));
        
 }