diff --git a/AndorsTrail/res/drawable/actorconditions_omi1.png b/AndorsTrail/res/drawable/actorconditions_omi1.png new file mode 100644 index 000000000..cbcb302a4 Binary files /dev/null and b/AndorsTrail/res/drawable/actorconditions_omi1.png differ diff --git a/AndorsTrail/res/drawable/items_consumables_omi1.png b/AndorsTrail/res/drawable/items_consumables_omi1.png new file mode 100644 index 000000000..a28f9d10c Binary files /dev/null and b/AndorsTrail/res/drawable/items_consumables_omi1.png differ diff --git a/AndorsTrail/res/drawable/items_g03_package_omi1.png b/AndorsTrail/res/drawable/items_g03_package_omi1.png new file mode 100644 index 000000000..0c74c6a88 Binary files /dev/null and b/AndorsTrail/res/drawable/items_g03_package_omi1.png differ diff --git a/AndorsTrail/res/drawable/monsters_omi1.png b/AndorsTrail/res/drawable/monsters_omi1.png new file mode 100644 index 000000000..27036ed97 Binary files /dev/null and b/AndorsTrail/res/drawable/monsters_omi1.png differ diff --git a/AndorsTrail/res/drawable/monsters_omi1_b.png b/AndorsTrail/res/drawable/monsters_omi1_b.png new file mode 100644 index 000000000..33f5e1137 Binary files /dev/null and b/AndorsTrail/res/drawable/monsters_omi1_b.png differ diff --git a/AndorsTrail/res/drawable/monsters_unknown.png b/AndorsTrail/res/drawable/monsters_unknown.png new file mode 100644 index 000000000..1400d2142 Binary files /dev/null and b/AndorsTrail/res/drawable/monsters_unknown.png differ diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java index 9e6a2641e..610e80746 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java @@ -23,7 +23,7 @@ public final class AndorsTrailApplication extends Application { public static final boolean DEVELOPMENT_DEBUGRESOURCES = false; public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false; public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false; - public static final boolean DEVELOPMENT_DEBUGBUTTONS = true; + public static final boolean DEVELOPMENT_DEBUGBUTTONS = true; public static final boolean DEVELOPMENT_FASTSPEED = false; public static final boolean DEVELOPMENT_VALIDATEDATA = true; public static final boolean DEVELOPMENT_DEBUGMESSAGES = true; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java index 3b287e690..e51769692 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java @@ -273,6 +273,7 @@ public final class ResourceLoader { loader.prepareTileset(R.drawable.actorconditions_1, "actorconditions_1", new Size(14, 8), sz1x1, mTileSize); loader.prepareTileset(R.drawable.actorconditions_2, "actorconditions_2", sz3x1, sz1x1, mTileSize); loader.prepareTileset(R.drawable.actorconditions_japozero, "actorconditions_japozero", new Size(16, 4), sz1x1, mTileSize); + loader.prepareTileset(R.drawable.actorconditions_omi1, "actorconditions_omi1", sz2x1, sz1x1, mTileSize); /*INSERT_ACTORCONDITIONS_TILESETS_HERE*/ loader.prepareTileset(R.drawable.items_armours, "items_armours", new Size(14, 3), sz1x1, mTileSize); @@ -298,6 +299,8 @@ public final class ResourceLoader { loader.prepareTileset(R.drawable.items_rings_1, "items_rings_1", new Size(10, 3), sz1x1, mTileSize); loader.prepareTileset(R.drawable.items_japozero, "items_japozero", new Size(16, 37), sz1x1, mTileSize); loader.prepareTileset(R.drawable.items_rijackson_1, "items_rijackson_1", new Size(5, 4), sz1x1, mTileSize); + loader.prepareTileset(R.drawable.items_g03_package_omi1, "items_g03_package_omi1", sz1x1, sz1x1, mTileSize); + loader.prepareTileset(R.drawable.items_consumables_omi1, "items_consumables_omi1", sz1x1, sz1x1, mTileSize); /*INSERT_ITEMS_TILESETS_HERE*/ loader.prepareTileset(R.drawable.monsters_armor1, "monsters_armor1", sz1x1, sz1x1, mTileSize); @@ -347,7 +350,10 @@ public final class ResourceLoader { loader.prepareTileset(R.drawable.monsters_zombie1, "monsters_zombie1", sz1x1, sz1x1, mTileSize); loader.prepareTileset(R.drawable.monsters_zombie2, "monsters_zombie2", sz1x1, sz1x1, mTileSize); loader.prepareTileset(R.drawable.monsters_guynmart, "monsters_guynmart", new Size(8, 2), sz1x1, mTileSize); - loader.prepareTileset(R.drawable.monsters_maksiu1, "monsters_maksiu1", new Size(4, 4), sz1x1, mTileSize); + loader.prepareTileset(R.drawable.monsters_maksiu1, "monsters_maksiu1", new Size(4, 4), sz1x1, mTileSize); + loader.prepareTileset(R.drawable.monsters_omi1, "monsters_omi1", sz2x1, sz1x1, mTileSize); + loader.prepareTileset(R.drawable.monsters_omi1_b, "monsters_omi1_b", sz1x1, sz1x1, mTileSize); + loader.prepareTileset(R.drawable.monsters_unknown, "monsters_unknown", sz1x1, sz1x1, mTileSize); /*INSERT_NPCS_TILESETS_HERE*/ loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1", mapTileSize, sz1x1, mTileSize);