OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Added more monster icons from the TomeTik set.

Browse Source
This commit is contained in:
Oskar Wiksten
2013-03-17 14:28:16 +01:00
parent 993ec1d194
commit 5cb762113d
12 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
AndorsTrail/res/drawable/items_misc_5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
AndorsTrail/res/drawable/items_misc_6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
AndorsTrail/res/drawable/monsters_eye5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
AndorsTrail/res/drawable/monsters_tometik1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 KiB

After

Width:  |  Height:  |  Size: 197 KiB

BIN
AndorsTrail/res/drawable/monsters_tometik10.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 129 KiB

BIN
AndorsTrail/res/drawable/monsters_tometik2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 146 KiB

BIN
AndorsTrail/res/drawable/monsters_tometik3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 162 KiB

BIN
AndorsTrail/res/drawable/monsters_tometik4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 128 KiB

BIN
AndorsTrail/res/drawable/monsters_tometik8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

BIN
AndorsTrail/res/drawable/monsters_tometik9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 111 KiB

11
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
View File

@@ -239,6 +239,7 @@ public final class ResourceLoader {
loader.prepareTileset(R.drawable.items_misc_3, "items_misc_3", src_sz20x12, defaultTileSize);
loader.prepareTileset(R.drawable.items_misc_4, "items_misc_4", new Size(20, 4), defaultTileSize);
loader.prepareTileset(R.drawable.items_misc_5, "items_misc_5", new Size(9, 5), defaultTileSize);
loader.prepareTileset(R.drawable.items_misc_6, "items_misc_6", new Size(9, 4), defaultTileSize);
loader.prepareTileset(R.drawable.items_reterski_1, "items_reterski_1", new Size(3, 10), defaultTileSize);
loader.prepareTileset(R.drawable.items_tometik1, "items_tometik1", new Size(6, 10), defaultTileSize);
loader.prepareTileset(R.drawable.items_tometik2, "items_tometik2", new Size(10, 10), defaultTileSize);
@@ -257,7 +258,6 @@ public final class ResourceLoader {
loader.prepareTileset(R.drawable.monsters_eye2, "monsters_eye2", src_sz1x1, defaultTileSize);
loader.prepareTileset(R.drawable.monsters_eye3, "monsters_eye3", src_sz1x1, defaultTileSize);
loader.prepareTileset(R.drawable.monsters_eye4, "monsters_eye4", src_sz1x1, defaultTileSize);
loader.prepareTileset(R.drawable.monsters_eye5, "monsters_eye5", src_sz1x1, defaultTileSize);
loader.prepareTileset(R.drawable.monsters_ghost1, "monsters_ghost1", src_sz1x1, defaultTileSize);
loader.prepareTileset(R.drawable.monsters_hydra1, "monsters_hydra1", src_sz1x1, dst_sz2x2);
loader.prepareTileset(R.drawable.monsters_insects, "monsters_insects", src_sz6x1, defaultTileSize);
@@ -283,12 +283,15 @@ public final class ResourceLoader {
loader.prepareTileset(R.drawable.monsters_skeleton2, "monsters_skeleton2", src_sz1x1, defaultTileSize);
loader.prepareTileset(R.drawable.monsters_snakes, "monsters_snakes", src_sz6x1, defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik1, "monsters_tometik1", new Size(10, 9), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik2, "monsters_tometik2", new Size(6, 1), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik3, "monsters_tometik3", new Size(6, 4), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik4, "monsters_tometik4", new Size(6, 7), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik2, "monsters_tometik2", new Size(8, 10), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik3, "monsters_tometik3", new Size(6, 13), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik4, "monsters_tometik4", new Size(6, 13), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik5, "monsters_tometik5", new Size(6, 16), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik6, "monsters_tometik6", new Size(7, 6), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik7, "monsters_tometik7", new Size(8, 11), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik8, "monsters_tometik8", new Size(7, 9), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik9, "monsters_tometik9", new Size(8, 8), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_tometik10, "monsters_tometik10", new Size(6, 13), defaultTileSize);
loader.prepareTileset(R.drawable.monsters_wraiths, "monsters_wraiths", src_sz3x1, defaultTileSize);
loader.prepareTileset(R.drawable.monsters_zombie1, "monsters_zombie1", src_sz1x1, defaultTileSize);
loader.prepareTileset(R.drawable.monsters_zombie2, "monsters_zombie2", src_sz1x1, defaultTileSize);

11
AndorsTrailEdit/js/tilesets.js
View File

@@ -102,6 +102,7 @@ var ATEditor = (function(ATEditor, utils) {
add("items_misc_3", {x:20, y:12}, [ 'item' ] );
add("items_misc_4", {x:20, y:4}, [ 'item' ] );
add("items_misc_5", {x:9, y:5}, [ 'item' ] );
add("items_misc_6", {x:9, y:4}, [ 'item' ] );
add("items_reterski_1", {x:3, y:10}, [ 'item' ] );
add("items_tometik1", {x:6, y:10}, [ 'item' ] );
add("items_tometik2", {x:10, y:10}, [ 'item' ] );
@@ -112,7 +113,6 @@ var ATEditor = (function(ATEditor, utils) {
add("monsters_eye2", {x: 1, y:1}, [ 'monster' ] );
add("monsters_eye3", {x: 1, y:1}, [ 'monster' ] );
add("monsters_eye4", {x: 1, y:1}, [ 'monster' ] );
add("monsters_eye5", {x: 1, y:1}, [ 'monster' ] );
add("monsters_ghost1", {x: 1, y:1}, [ 'monster' ] );
add("monsters_hydra1", {x: 1, y:1}, [ 'monster' ], {x:64, y:64} );
add("monsters_insects", {x: 6, y:1}, [ 'monster' ] );
@@ -142,12 +142,15 @@ var ATEditor = (function(ATEditor, utils) {
add("monsters_ld1", {x:20, y:12}, [ 'monster' ] );
add("monsters_ld2", {x:20, y:12}, [ 'monster' ] );
add("monsters_tometik1", {x:10, y:9}, [ 'monster' ] );
add("monsters_tometik2", {x:6, y:1}, [ 'monster' ] );
add("monsters_tometik3", {x:6, y:4}, [ 'monster' ] );
add("monsters_tometik4", {x:6, y:7}, [ 'monster' ] );
add("monsters_tometik2", {x:8, y:10}, [ 'monster' ] );
add("monsters_tometik3", {x:6, y:13}, [ 'monster' ] );
add("monsters_tometik4", {x:6, y:13}, [ 'monster' ] );
add("monsters_tometik5", {x:6, y:16}, [ 'monster' ] );
add("monsters_tometik6", {x:7, y:6}, [ 'monster' ] );
add("monsters_tometik7", {x:8, y:11}, [ 'monster' ] );
add("monsters_tometik8", {x:7, y:9}, [ 'monster' ] );
add("monsters_tometik9", {x:8, y:8}, [ 'monster' ] );
add("monsters_tometik10", {x:6, y:13}, [ 'monster' ] );
add("monsters_demon1", {x:1, y:1}, [ 'monster' ], {x:64, y:64} );
add("monsters_demon2", {x:1, y:1}, [ 'monster' ], {x:64, y:64} );
add("monsters_cyclops", {x:1, y:1}, [ 'monster' ], {x:64, y:96} );