feygard_1 with hash bug

Revert "worldmap bug check"
This reverts commit 718886ba3a.
2025-12-30 16:23:38 +01:00 · 2023-07-29 02:12:35 +02:00 · 2023-06-25 18:43:12 +02:00 · 2023-06-25 13:27:09 +02:00 · 2023-05-21 20:12:38 +02:00 · 2023-05-21 19:50:13 +02:00
1543 changed files with 3919613 additions and 67019 deletions
--- a/AndorsTrail/app/src/main/AndroidManifest.xml
+++ b/AndorsTrail/app/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="72"
-	android:versionName="0.8.6.1"
+	android:versionCode="73"
+	android:versionName="0.8.7"
 	android:installLocation="auto"
 	>

--- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -24,15 +24,15 @@ 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 = false;
+	public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
-	public static final String CURRENT_VERSION_DISPLAY = "0.8.6.1";
+	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
+	public static final String CURRENT_VERSION_DISPLAY = "0.8.7";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
 	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
-	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 72;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 73;

 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();
--- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
+++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
@@ -274,88 +274,170 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.ui_icon_immunity, "ui_icon_immunity", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_dynamic_placeholders, "map_dynamic_placeholders", new Size(10, 2), sz1x1, mTileSize);

+		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);
+		loader.prepareTileset(R.drawable.actorconditions_omi2, "actorconditions_omi2", sz5x1, sz1x1, mTileSize);
+		/*INSERT_ACTORCONDITIONS_TILESETS_HERE*/
+
+		loader.prepareTileset(R.drawable.items_armours, "items_armours", new Size(14, 3), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_weapons, "items_weapons", new Size(14, 6), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_jewelry, "items_jewelry", new Size(14, 1), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_consumables, "items_consumables", new Size(14, 5), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_books, "items_books", new Size(11, 1), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_misc, "items_misc", new Size(14, 4), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_misc_2, "items_misc_2", sz20x12, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_misc_3, "items_misc_3", sz20x12, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_misc_4, "items_misc_4", new Size(20, 4), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_misc_5, "items_misc_5", new Size(9, 5), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_misc_6, "items_misc_6", new Size(9, 4), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_reterski_1, "items_reterski_1", new Size(3, 10), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_tometik1, "items_tometik1", new Size(6, 10), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_tometik2, "items_tometik2", new Size(10, 10), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_tometik3, "items_tometik3", new Size(8, 6), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_necklaces_1, "items_necklaces_1", new Size(10, 3), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_weapons_2, "items_weapons_2", new Size(7, 1), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_weapons_3, "items_weapons_3", new Size(13, 5), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_armours_2, "items_armours_2", sz7x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_armours_3, "items_armours_3", new Size(10, 4), sz1x1, mTileSize);
+		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);
+		loader.prepareTileset(R.drawable.items_feygard1, "items_feygard1", new Size(6, 2), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_omi2, "items_omi2", new Size(6, 5), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_omgeeky, "items_omgeeky", new Size(10, 3), sz1x1, mTileSize);
+		/*INSERT_ITEMS_TILESETS_HERE*/
+		
+		loader.prepareTileset(R.drawable.monsters_armor1, "monsters_armor1", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_cyclops, "monsters_cyclops", sz1x1, sz2x3, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_demon1, "monsters_demon1", sz1x1, sz2x2, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_demon2, "monsters_demon2", sz1x1, sz2x2, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_dogs, "monsters_dogs", sz7x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_eye1, "monsters_eye1", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_eye2, "monsters_eye2", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_eye3, "monsters_eye3", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_eye4, "monsters_eye4", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_ghost1, "monsters_ghost1", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_hydra1, "monsters_hydra1", sz1x1, sz2x2, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_insects, "monsters_insects", sz6x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_karvis1, "monsters_karvis1", sz2x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_karvis2, "monsters_karvis2", new Size(9, 1), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_ld1, "monsters_ld1", new Size(20, 12), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_ld2, "monsters_ld2", new Size(20, 12), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_liches, "monsters_liches", new Size(4, 1), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_mage, "monsters_mage", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_mage2, "monsters_mage2", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_man1, "monsters_man1", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_men, "monsters_men", new Size(9, 1), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_men2, "monsters_men2", new Size(10, 1), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_misc, "monsters_misc", new Size(13, 1), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_rats, "monsters_rats", new Size(5, 1), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_redshrike1, "monsters_redshrike1", sz7x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_rltiles1, "monsters_rltiles1", new Size(20, 8), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_rltiles2, "monsters_rltiles2", new Size(20, 9), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_rltiles3, "monsters_rltiles3", new Size(10, 3), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_rltiles4, "monsters_rltiles4", new Size(12, 4), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_rogue1, "monsters_rogue1", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_skeleton1, "monsters_skeleton1", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_skeleton2, "monsters_skeleton2", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_snakes, "monsters_snakes", sz6x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik1, "monsters_tometik1", new Size(10, 9), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik2, "monsters_tometik2", new Size(8, 10), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik3, "monsters_tometik3", new Size(6, 13), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik4, "monsters_tometik4", new Size(6, 13), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik5, "monsters_tometik5", new Size(6, 16), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik6, "monsters_tometik6", new Size(7, 6), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik7, "monsters_tometik7", new Size(8, 11), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik8, "monsters_tometik8", new Size(7, 9), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik9, "monsters_tometik9", new Size(8, 8), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik10, "monsters_tometik10", new Size(6, 13), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_wraiths, "monsters_wraiths", sz3x1, sz1x1, mTileSize);
+		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_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);
+		loader.prepareTileset(R.drawable.monsters_arulirs, "monsters_arulirs", new Size(8, 2), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_fatboy73, "monsters_fatboy73", new Size(20, 12), sz1x1, mTileSize);
        loader.prepareTileset(R.drawable.monsters_giantbasilisk, "monsters_giantbasilisk", sz1x1, sz2x2, mTileSize);
+        loader.prepareTileset(R.drawable.monsters_gisons, "monsters_gisons", new Size(8, 2), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_bosses_2x2, "monsters_bosses_2x2", sz1x1, sz2x2, mTileSize);
-
-		loader.prepareTileset(R.drawable.map_0, "map_0", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_1, "map_1", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_10, "map_10", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_11, "map_11", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_12, "map_12", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_13, "map_13", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_14, "map_14", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_15, "map_15", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_16, "map_16", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_17, "map_17", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_18, "map_18", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_19, "map_19", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_2, "map_2", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_20, "map_20", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_21, "map_21", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_22, "map_22", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_23, "map_23", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_24, "map_24", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_25, "map_25", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_26, "map_26", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_27, "map_27", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_28, "map_28", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_29, "map_29", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_3, "map_3", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_30, "map_30", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_31, "map_31", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_32, "map_32", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_33, "map_33", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_34, "map_34", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_35, "map_35", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_36, "map_36", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_37, "map_37", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_38, "map_38", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_39, "map_39", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_4, "map_4", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_40, "map_40", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_41, "map_41", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_42, "map_42", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_43, "map_43", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_44, "map_44", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_45, "map_45", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_46, "map_46", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_47, "map_47", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_48, "map_48", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_49, "map_49", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_5, "map_5", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_50, "map_50", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_51, "map_51", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_52, "map_52", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_53, "map_53", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_54, "map_54", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_55, "map_55", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_56, "map_56", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_57, "map_57", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_6, "map_6", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_7, "map_7", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_8, "map_8", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_9, "map_9", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_0, "obj_0", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_1, "obj_1", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_10, "obj_10", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_11, "obj_11", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_12, "obj_12", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_13, "obj_13", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_14, "obj_14", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_15, "obj_15", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_16, "obj_16", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_2, "obj_2", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_3, "obj_3", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_4, "obj_4", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_5, "obj_5", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_6, "obj_6", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_7, "obj_7", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_8, "obj_8", sz8x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.obj_9, "obj_9", sz8x8, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_omi2, "monsters_omi2", sz8x3, sz1x1, mTileSize);
+		/*INSERT_NPCS_TILESETS_HERE*/
+		
+		loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_border_1, "map_border_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_bridge_1, "map_bridge_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_bridge_2, "map_bridge_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_broken_1, "map_broken_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_cavewall_1, "map_cavewall_1", new Size(18, 6), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_cavewall_2, "map_cavewall_2", new Size(18, 6), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_cavewall_3, "map_cavewall_3", new Size(18, 6), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_cavewall_4, "map_cavewall_4", new Size(18, 6), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_chair_table_1, "map_chair_table_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_chair_table_2, "map_chair_table_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_crate_1, "map_crate_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_cupboard_1, "map_cupboard_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_curtain_1, "map_curtain_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_entrance_1, "map_entrance_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_entrance_2, "map_entrance_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_fence_1, "map_fence_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_fence_2, "map_fence_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_fence_3, "map_fence_3", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_fence_4, "map_fence_4", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_ground_1, "map_ground_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_ground_2, "map_ground_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_ground_3, "map_ground_3", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_ground_4, "map_ground_4", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_ground_5, "map_ground_5", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_ground_6, "map_ground_6", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_ground_7, "map_ground_7", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_ground_8, "map_ground_8", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_house_1, "map_house_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_house_2, "map_house_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_indoor_1, "map_indoor_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_indoor_2, "map_indoor_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_kitchen_1, "map_kitchen_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_outdoor_1, "map_outdoor_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_pillar_1, "map_pillar_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_pillar_2, "map_pillar_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_plant_1, "map_plant_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_plant_2, "map_plant_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_rock_1, "map_rock_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_rock_2, "map_rock_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_roof_1, "map_roof_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_roof_2, "map_roof_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_roof_3, "map_roof_3", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_shop_1, "map_shop_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_sign_ladder_1, "map_sign_ladder_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_table_1, "map_table_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_table_2, "map_table_2", new Size(14, 8), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_trail_1, "map_trail_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_transition_1, "map_transition_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_transition_2, "map_transition_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_transition_3, "map_transition_3", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_transition_4, "map_transition_4", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_transition_5, "map_transition_5", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_tree_1, "map_tree_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_tree_2, "map_tree_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_wall_1, "map_wall_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_wall_2, "map_wall_2", new Size(15, 8), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_wall_3, "map_wall_3", new Size(15, 8), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_wall_4, "map_wall_4", new Size(15, 8), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_window_1, "map_window_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_window_2, "map_window_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_guynmart, "map_guynmart", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_cavewall_5, "map_cavewall_5", new Size(6, 6), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_rock_3, "map_rock_3", new Size(6, 5), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_sign_ladder_omi2, "map_sign_ladder_omi2", new Size(8, 4), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_transition_6, "map_transition_6", new Size(18, 8), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_ratdom, "map_ratdom", new Size(18, 6), sz1x1, mTileSize);
+		/*INSERT_MAP_TILESETS_HERE*/

 		loader.prepareTileset(R.drawable.effect_blood4, "effect_blood4", new Size(7, 2), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.effect_heal2, "effect_heal2", new Size(8, 2), sz1x1, mTileSize);
--- a/AndorsTrail/assets/translation/ar.po
+++ b/AndorsTrail/assets/translation/ar.po
--- a/AndorsTrail/assets/translation/az.po
+++ b/AndorsTrail/assets/translation/az.po
--- a/AndorsTrail/assets/translation/be.po
+++ b/AndorsTrail/assets/translation/be.po
--- a/AndorsTrail/assets/translation/bg.po
+++ b/AndorsTrail/assets/translation/bg.po
--- a/AndorsTrail/assets/translation/ca.po
+++ b/AndorsTrail/assets/translation/ca.po
--- a/AndorsTrail/assets/translation/ckb.po
+++ b/AndorsTrail/assets/translation/ckb.po
--- a/AndorsTrail/assets/translation/cs.po
+++ b/AndorsTrail/assets/translation/cs.po
--- a/AndorsTrail/assets/translation/da.po
+++ b/AndorsTrail/assets/translation/da.po
--- a/AndorsTrail/assets/translation/de.po
+++ b/AndorsTrail/assets/translation/de.po
--- a/AndorsTrail/assets/translation/de_AT.po
+++ b/AndorsTrail/assets/translation/de_AT.po
--- a/AndorsTrail/assets/translation/el.po
+++ b/AndorsTrail/assets/translation/el.po
--- a/AndorsTrail/assets/translation/en_devel.po
+++ b/AndorsTrail/assets/translation/en_devel.po
--- a/AndorsTrail/assets/translation/english.pot
+++ b/AndorsTrail/assets/translation/english.pot
--- a/AndorsTrail/assets/translation/eo.po
+++ b/AndorsTrail/assets/translation/eo.po
--- a/AndorsTrail/assets/translation/es.po
+++ b/AndorsTrail/assets/translation/es.po
--- a/AndorsTrail/assets/translation/es_AR.po
+++ b/AndorsTrail/assets/translation/es_AR.po
--- a/AndorsTrail/assets/translation/eu.po
+++ b/AndorsTrail/assets/translation/eu.po
--- a/AndorsTrail/assets/translation/fi.po
+++ b/AndorsTrail/assets/translation/fi.po
--- a/AndorsTrail/assets/translation/fil.po
+++ b/AndorsTrail/assets/translation/fil.po
--- a/AndorsTrail/assets/translation/fr.po
+++ b/AndorsTrail/assets/translation/fr.po
--- a/AndorsTrail/assets/translation/fr_AG.po
+++ b/AndorsTrail/assets/translation/fr_AG.po
--- a/AndorsTrail/assets/translation/gl.po
+++ b/AndorsTrail/assets/translation/gl.po
--- a/AndorsTrail/assets/translation/he.po
+++ b/AndorsTrail/assets/translation/he.po
--- a/AndorsTrail/assets/translation/hi.po
+++ b/AndorsTrail/assets/translation/hi.po
--- a/AndorsTrail/assets/translation/hu.po
+++ b/AndorsTrail/assets/translation/hu.po
--- a/AndorsTrail/assets/translation/id.po
+++ b/AndorsTrail/assets/translation/id.po
--- a/AndorsTrail/assets/translation/it.po
+++ b/AndorsTrail/assets/translation/it.po
--- a/AndorsTrail/assets/translation/ja.po
+++ b/AndorsTrail/assets/translation/ja.po
--- a/AndorsTrail/assets/translation/ko.po
+++ b/AndorsTrail/assets/translation/ko.po
--- a/AndorsTrail/assets/translation/lzh.po
+++ b/AndorsTrail/assets/translation/lzh.po
--- a/AndorsTrail/assets/translation/ms.po
+++ b/AndorsTrail/assets/translation/ms.po
--- a/AndorsTrail/assets/translation/nb.po
+++ b/AndorsTrail/assets/translation/nb.po
--- a/AndorsTrail/assets/translation/nl.po
+++ b/AndorsTrail/assets/translation/nl.po
--- a/AndorsTrail/assets/translation/pa.po
+++ b/AndorsTrail/assets/translation/pa.po
--- a/AndorsTrail/assets/translation/pl.po
+++ b/AndorsTrail/assets/translation/pl.po
--- a/AndorsTrail/assets/translation/ps.po
+++ b/AndorsTrail/assets/translation/ps.po
--- a/AndorsTrail/assets/translation/pt.po
+++ b/AndorsTrail/assets/translation/pt.po
--- a/AndorsTrail/assets/translation/pt_BR.po
+++ b/AndorsTrail/assets/translation/pt_BR.po
--- a/AndorsTrail/assets/translation/ro.po
+++ b/AndorsTrail/assets/translation/ro.po
--- a/AndorsTrail/assets/translation/ru.po
+++ b/AndorsTrail/assets/translation/ru.po
--- a/AndorsTrail/assets/translation/sl.po
+++ b/AndorsTrail/assets/translation/sl.po
--- a/AndorsTrail/assets/translation/sq.po
+++ b/AndorsTrail/assets/translation/sq.po
--- a/AndorsTrail/assets/translation/sr.po
+++ b/AndorsTrail/assets/translation/sr.po
--- a/AndorsTrail/assets/translation/sv.po
+++ b/AndorsTrail/assets/translation/sv.po
--- a/AndorsTrail/assets/translation/ta.po
+++ b/AndorsTrail/assets/translation/ta.po
--- a/AndorsTrail/assets/translation/th.po
+++ b/AndorsTrail/assets/translation/th.po
--- a/AndorsTrail/assets/translation/tr.po
+++ b/AndorsTrail/assets/translation/tr.po
--- a/AndorsTrail/assets/translation/uk.po
+++ b/AndorsTrail/assets/translation/uk.po
--- a/AndorsTrail/assets/translation/vi.po
+++ b/AndorsTrail/assets/translation/vi.po
--- a/AndorsTrail/assets/translation/zh_CN.po
+++ b/AndorsTrail/assets/translation/zh_CN.po
--- a/AndorsTrail/assets/translation/zh_TW.po
+++ b/AndorsTrail/assets/translation/zh_TW.po
--- a/AndorsTrail/res/drawable/actorconditions_1.png
+++ b/AndorsTrail/res/drawable/actorconditions_1.png
--- a/AndorsTrail/res/drawable/actorconditions_2.png
+++ b/AndorsTrail/res/drawable/actorconditions_2.png
--- a/AndorsTrail/res/drawable/actorconditions_japozero.png
+++ b/AndorsTrail/res/drawable/actorconditions_japozero.png
--- a/AndorsTrail/res/drawable/actorconditions_omi1.png
+++ b/AndorsTrail/res/drawable/actorconditions_omi1.png
--- a/AndorsTrail/res/drawable/actorconditions_omi2.png
+++ b/AndorsTrail/res/drawable/actorconditions_omi2.png
--- a/AndorsTrail/res/drawable/items_armours.png
+++ b/AndorsTrail/res/drawable/items_armours.png
--- a/AndorsTrail/res/drawable/items_armours_2.png
+++ b/AndorsTrail/res/drawable/items_armours_2.png
--- a/AndorsTrail/res/drawable/items_armours_3.png
+++ b/AndorsTrail/res/drawable/items_armours_3.png
--- a/AndorsTrail/res/drawable/items_books.png
+++ b/AndorsTrail/res/drawable/items_books.png
--- a/AndorsTrail/res/drawable/items_consumables.png
+++ b/AndorsTrail/res/drawable/items_consumables.png
--- a/AndorsTrail/res/drawable/items_consumables_omi1.png
+++ b/AndorsTrail/res/drawable/items_consumables_omi1.png
--- a/AndorsTrail/res/drawable/items_feygard1.png
+++ b/AndorsTrail/res/drawable/items_feygard1.png
--- a/AndorsTrail/res/drawable/items_g03_package_omi1.png
+++ b/AndorsTrail/res/drawable/items_g03_package_omi1.png
--- a/AndorsTrail/res/drawable/items_japozero.png
+++ b/AndorsTrail/res/drawable/items_japozero.png
--- a/AndorsTrail/res/drawable/items_jewelry.png
+++ b/AndorsTrail/res/drawable/items_jewelry.png
--- a/AndorsTrail/res/drawable/items_misc.png
+++ b/AndorsTrail/res/drawable/items_misc.png
--- a/AndorsTrail/res/drawable/items_misc_2.png
+++ b/AndorsTrail/res/drawable/items_misc_2.png
--- a/AndorsTrail/res/drawable/items_misc_3.png
+++ b/AndorsTrail/res/drawable/items_misc_3.png
--- a/AndorsTrail/res/drawable/items_misc_4.png
+++ b/AndorsTrail/res/drawable/items_misc_4.png
--- a/AndorsTrail/res/drawable/items_misc_5.png
+++ b/AndorsTrail/res/drawable/items_misc_5.png
--- a/AndorsTrail/res/drawable/items_misc_6.png
+++ b/AndorsTrail/res/drawable/items_misc_6.png
--- a/AndorsTrail/res/drawable/items_necklaces_1.png
+++ b/AndorsTrail/res/drawable/items_necklaces_1.png
--- a/AndorsTrail/res/drawable/items_omgeeky.png
+++ b/AndorsTrail/res/drawable/items_omgeeky.png
--- a/AndorsTrail/res/drawable/items_omi2.png
+++ b/AndorsTrail/res/drawable/items_omi2.png
--- a/AndorsTrail/res/drawable/items_reterski_1.png
+++ b/AndorsTrail/res/drawable/items_reterski_1.png
--- a/AndorsTrail/res/drawable/items_rijackson_1.png
+++ b/AndorsTrail/res/drawable/items_rijackson_1.png
--- a/AndorsTrail/res/drawable/items_rings_1.png
+++ b/AndorsTrail/res/drawable/items_rings_1.png
--- a/AndorsTrail/res/drawable/items_tometik1.png
+++ b/AndorsTrail/res/drawable/items_tometik1.png
--- a/AndorsTrail/res/drawable/items_tometik2.png
+++ b/AndorsTrail/res/drawable/items_tometik2.png
--- a/AndorsTrail/res/drawable/items_tometik3.png
+++ b/AndorsTrail/res/drawable/items_tometik3.png
--- a/AndorsTrail/res/drawable/items_weapons.png
+++ b/AndorsTrail/res/drawable/items_weapons.png
--- a/AndorsTrail/res/drawable/items_weapons_2.png
+++ b/AndorsTrail/res/drawable/items_weapons_2.png
--- a/AndorsTrail/res/drawable/items_weapons_3.png
+++ b/AndorsTrail/res/drawable/items_weapons_3.png
--- a/AndorsTrail/res/drawable/map_0.png
+++ b/AndorsTrail/res/drawable/map_0.png
--- a/AndorsTrail/res/drawable/map_1.png
+++ b/AndorsTrail/res/drawable/map_1.png
--- a/AndorsTrail/res/drawable/map_10.png
+++ b/AndorsTrail/res/drawable/map_10.png
--- a/AndorsTrail/res/drawable/map_11.png
+++ b/AndorsTrail/res/drawable/map_11.png
--- a/AndorsTrail/res/drawable/map_12.png
+++ b/AndorsTrail/res/drawable/map_12.png
--- a/AndorsTrail/res/drawable/map_13.png
+++ b/AndorsTrail/res/drawable/map_13.png
--- a/AndorsTrail/res/drawable/map_14.png
+++ b/AndorsTrail/res/drawable/map_14.png
--- a/AndorsTrail/res/drawable/map_15.png
+++ b/AndorsTrail/res/drawable/map_15.png
--- a/AndorsTrail/res/drawable/map_16.png
+++ b/AndorsTrail/res/drawable/map_16.png
--- a/AndorsTrail/res/drawable/map_17.png
+++ b/AndorsTrail/res/drawable/map_17.png
--- a/AndorsTrail/res/drawable/map_18.png
+++ b/AndorsTrail/res/drawable/map_18.png
--- a/AndorsTrail/res/drawable/map_19.png
+++ b/AndorsTrail/res/drawable/map_19.png
--- a/AndorsTrail/res/drawable/map_2.png
+++ b/AndorsTrail/res/drawable/map_2.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nut.andor	f9d1dbdbae	feygard_1 with hash bug	2023-07-29 02:12:35 +02:00
Nut.andor	de59d8de8d	Revert "worldmap bug check" This reverts commit `718886ba3a`.	2023-06-25 18:43:12 +02:00
Nut.andor	718886ba3a	worldmap bug check	2023-06-25 13:27:09 +02:00
Nut.andor	cc123f76d6	whatsnew	2023-05-21 20:12:38 +02:00
Nut.andor	a6ad03c534	next version 8.7 (the former 8.7 version was renamed to 8.6.1)	2023-05-21 19:50:13 +02:00
Nut.andor	45491871e6	version	2023-05-21 18:17:44 +02:00