whatsNew

Currently translated at 85.6% (13934 of 16269 strings)

AndorsTrail/.gitignore

@@ -1,6 +1,3 @@
-# Android ignores
-app/src/main/res
-app/src/main/assets
 gen/
 bin/
 target/

AndorsTrail/app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.gpl.rpg.AndorsTrail"
         minSdkVersion 14
-        targetSdkVersion 30
+        targetSdkVersion 34
     }
 
     buildTypes {
@@ -19,34 +19,59 @@ android {
         debug {
             manifestPlaceholders icon_name: 'icon_beta', fileproviderPath: 'AndorsTrail.beta2'
             applicationIdSuffix 'beta2'
+			signingConfig signingConfigs.debug
+        }
+    }
+    namespace 'com.gpl.rpg.AndorsTrail'
+    
+    sourceSets {
+        main {
+            res.srcDirs = ['build/gen-res', 'src/main/res']
+            assets.srcDirs = ['build/gen-assets', 'src/main/assets']
         }
     }
 }
 
 dependencies {
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
 
 task copyRes(type: Copy) {
     description "Copies the res folder to the modules res folder (& renames .tmx to .xml)"
     from "${rootDir}/res"
-    into "${projectDir}/src/main/res"
+    into "${projectDir}/build/gen-res"
     rename "(.*)\\.tmx", "\$1.xml"
 }
 
+task copyResValuesIn(type: Copy) {
+    description "Exception Indonesian language code (Old IN was renamed to now ID)"
+    from "${rootDir}/res/values-id/"
+    into "${projectDir}/build/gen-res/values-in/"
+}
+
 task copyTranslation(type: Copy) {
     description("Copies the translation files to the modules translations folder")
     from "${rootDir}/assets/translation"
-    into "${projectDir}/src/main/assets/translation"
+    into "${projectDir}/build/gen-assets/translation"
 }
 
 task cleanup(type: Delete) {
     description("Deletes the assets/translation and the res folder from the modules folder")
-    delete "${projectDir}/src/main/res", "${projectDir}/src/main/assets/translation"
+    delete "${projectDir}/build/gen-res", "${projectDir}/build/gen-assets/translation"
 }
 
 afterEvaluate {
-    preBuild.dependsOn project.tasks.copyRes
-    preBuild.dependsOn project.tasks.copyTranslation
+    project.tasks.copyRes.dependsOn project.tasks.copyResValuesIn
+
+    mergeDebugResources.dependsOn project.tasks.copyRes
+    extractDeepLinksDebug.dependsOn project.tasks.copyRes
+    mergeReleaseResources.dependsOn project.tasks.copyRes
+    extractDeepLinksRelease.dependsOn project.tasks.copyRes
+
+    mergeDebugAssets.dependsOn project.tasks.copyTranslation
+    mergeReleaseAssets.dependsOn project.tasks.copyTranslation
+    extractDeepLinksDebug.dependsOn project.tasks.copyTranslation
+    extractDeepLinksRelease.dependsOn project.tasks.copyTranslation
+
     clean.dependsOn project.tasks.cleanup
 }

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -3,15 +3,11 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="67"
-	android:versionName="0.8.3"
+	android:versionCode="74"
+	android:versionName="0.8.8"
 	android:installLocation="auto"
 	>
-	<uses-sdk 
-		android:minSdkVersion="4"
-		android:targetSdkVersion="30"
-		/>
-	
+
 	<supports-screens
 		android:smallScreens="true" 
 		android:normalScreens="true"
@@ -35,7 +31,8 @@
 		android:hasFragileUserData="true"
 		android:preserveLegacyExternalStorage="true"
 		>
-		<activity 
+		<activity
+			android:exported="true"
 		    android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
 		    android:clearTaskOnLaunch="true"
 		    >
@@ -66,7 +63,7 @@
 		<activity android:name="com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity" />
 
         <provider
-        android:name="android.support.v4.content.FileProvider"
+        android:name="androidx.core.content.FileProvider"
         android:authorities="${applicationId}.fileprovider"
         android:grantUriPermissions="true"
         android:exported="false">

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java

@@ -28,11 +28,11 @@ public final class AndorsTrailApplication extends Application {
 	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.3";
+	public static final String CURRENT_VERSION_DISPLAY = "0.8.8";
 	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 : 67;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 74;
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java

@@ -78,7 +78,7 @@ public final class AndorsTrailPreferences {
 			dest.dpadTransparency = Integer.parseInt(prefs.getString("dpadtransparency", Integer.toString(DPAD_TRANSPARENCY_50_PERCENT)));
 			dest.dpadMinimizeable = prefs.getBoolean("dpadMinimizeable", true);
 			dest.optimizedDrawing = prefs.getBoolean("optimized_drawing", false);
-			dest.highQualityFilters = prefs.getBoolean("high_quality_filters", true);
+			dest.highQualityFilters = prefs.getBoolean("high_quality_filters", false);
 			dest.enableUiAnimations = prefs.getBoolean("enableUiAnimations", true);
 			dest.displayOverwriteSavegame = Integer.parseInt(prefs.getString("display_overwrite_savegame", Integer.toString(CONFIRM_OVERWRITE_SAVEGAME_ALWAYS)));
 			dest.quickslotsPosition = Integer.parseInt(prefs.getString("quickslots_placement", Integer.toString(QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM)));

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java

@@ -15,7 +15,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java

@@ -1,7 +1,7 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java

@@ -277,6 +277,27 @@ public final class DebugInterface {
 				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "sullengard2", "south", 0, 0);
 			}
 		})
+				,new DebugButton("gal", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_19", "south", 0, 0);
+			}
+		})
+
+				,new DebugButton("apl", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "sullengard_apple_farm_east", "house", 0, 0);
+			}
+		})
+
+				,new DebugButton("wch", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lake_shore_road_0", "west", 0, 0);
+			}
+		})
+
 		}));
 		buttonList.addAll(tpButtons2);
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java

@@ -2,7 +2,7 @@ package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.v4.app.FragmentTabHost;
+import androidx.fragment.app.FragmentTabHost;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java

@@ -11,9 +11,7 @@ import java.util.List;
 import java.util.Objects;
 
 import android.Manifest;
-import android.annotation.TargetApi;
 import android.app.Activity;
-import android.app.Dialog;
 import android.content.ClipData;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -22,8 +20,8 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.RequiresApi;
-import android.support.v4.provider.DocumentFile;
+import androidx.annotation.RequiresApi;
+import androidx.documentfile.provider.DocumentFile;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -122,8 +120,7 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
                 boolean hasSavegames = !Savegames.getUsedSavegameSlots(this).isEmpty();
                 exportSaves.setEnabled(hasSavegames);
-            }
-            else{
+            } else {
                 exportImportContainer.setVisibility(View.GONE);
             }
         }
@@ -133,12 +130,17 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
     private static final int WRITE_EXTERNAL_STORAGE_REQUEST = 2;
 
     private void checkAndRequestPermissions() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
-            if (getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                this.requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, READ_EXTERNAL_STORAGE_REQUEST);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+            && Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+            if (getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+                this.requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
+                                        READ_EXTERNAL_STORAGE_REQUEST);
             }
-            if (getApplicationContext().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                this.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, WRITE_EXTERNAL_STORAGE_REQUEST);
+            if (getApplicationContext().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+                this.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                                        WRITE_EXTERNAL_STORAGE_REQUEST);
             }
         }
     }
@@ -152,11 +154,15 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
     }
 
-    private void addSavegameSlotButtons(ViewGroup parent, LayoutParams params, List<Integer> usedSavegameSlots) {
+    private void addSavegameSlotButtons(ViewGroup parent,
+                                        LayoutParams params,
+                                        List<Integer> usedSavegameSlots) {
         int unused = 1;
         for (int slot : usedSavegameSlots) {
             final FileHeader header = Savegames.quickload(this, slot);
-            if (header == null) continue;
+            if (header == null) {
+                continue;
+            }
 
             while (unused < slot) {
                 Button b = new Button(this);
@@ -180,65 +186,76 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
     }
 
-    private void cancelLoadSaveActivity(int slot){
+    private void cancelLoadSaveActivity(int slot) {
         completeLoadSaveActivity(slot, false);
     }
 
     private void completeLoadSaveActivity(int slot) {
         completeLoadSaveActivity(slot, true);
     }
+
     private void completeLoadSaveActivity(int slot, boolean success) {
         Intent i = new Intent();
         if (slot == SLOT_NUMBER_CREATE_NEW_SLOT) {
             slot = getFirstFreeSlot();
         } else if (slot == SLOT_NUMBER_EXPORT_SAVEGAMES
-                || slot == SLOT_NUMBER_IMPORT_SAVEGAMES
-                || slot == SLOT_NUMBER_IMPORT_WORLDMAP) {
+                   || slot == SLOT_NUMBER_IMPORT_SAVEGAMES
+                   || slot == SLOT_NUMBER_IMPORT_WORLDMAP) {
             i.putExtra("import_export", true);
 
-            if(slot == SLOT_NUMBER_IMPORT_WORLDMAP){
+            if (slot == SLOT_NUMBER_IMPORT_WORLDMAP) {
                 i.putExtra("import_worldmap", true);
             }
-            if(slot == SLOT_NUMBER_IMPORT_SAVEGAMES){
+            if (slot == SLOT_NUMBER_IMPORT_SAVEGAMES) {
                 i.putExtra("import_savegames", true);
             }
-            if(slot == SLOT_NUMBER_EXPORT_SAVEGAMES){
+            if (slot == SLOT_NUMBER_EXPORT_SAVEGAMES) {
                 i.putExtra("export", true);
             }
 
-        } else if (slot < SLOT_NUMBER_FIRST_SLOT)
+        } else if (slot < SLOT_NUMBER_FIRST_SLOT) {
             slot = SLOT_NUMBER_FIRST_SLOT;
+        }
 
         i.putExtra("slot", slot);
-        if(success) setResult(Activity.RESULT_OK, i);
-        else setResult(Activity.RESULT_CANCELED, i);
+        if (success) {
+            setResult(Activity.RESULT_OK, i);
+        } else {
+            setResult(Activity.RESULT_CANCELED, i);
+        }
         LoadSaveActivity.this.finish();
     }
 
     private int getFirstFreeSlot() {
         int slot;
         List<Integer> usedSlots = Savegames.getUsedSavegameSlots(this);
-        if (usedSlots.isEmpty())
+        if (usedSlots.isEmpty()) {
             slot = SLOT_NUMBER_FIRST_SLOT;
-        else slot = Collections.max(usedSlots) + 1;
+        } else {
+            slot = Collections.max(usedSlots) + 1;
+        }
         return slot;
     }
 
     private String getConfirmOverwriteQuestion(int slot) {
-        if (isLoading)
+        if (isLoading) {
             return null;
+        }
 
         return getConfirmOverwriteQuestionIgnoringLoading(slot);
     }
 
     private String getConfirmOverwriteQuestionIgnoringLoading(int slot) {
-        if (slot == SLOT_NUMBER_CREATE_NEW_SLOT)
+        if (slot == SLOT_NUMBER_CREATE_NEW_SLOT) {
             return null;//creating a new savegame
+        }
 
-        if (!Savegames.getSlotFile(slot, this).exists())
+        if (!Savegames.getSlotFile(slot, this).exists()) {
             return null;//nothing in slot to overwrite
+        }
 
-        if (preferences.displayOverwriteSavegame == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_ALWAYS) {
+        if (preferences.displayOverwriteSavegame
+            == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_ALWAYS) {
             return getString(R.string.loadsave_save_overwrite_confirmation_all);
         }
         if (preferences.displayOverwriteSavegame == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_NEVER) {
@@ -247,10 +264,14 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
         final String currentPlayerName = model.player.getName();
         final FileHeader header = Savegames.quickload(this, slot);
-        if (header == null) return null;
+        if (header == null) {
+            return null;
+        }
 
         final String savedPlayerName = header.playerName;
-        if (currentPlayerName.equals(savedPlayerName)) return null; //if the names match
+        if (currentPlayerName.equals(savedPlayerName)) {
+            return null; //if the names match
+        }
 
         return getString(R.string.loadsave_save_overwrite_confirmation, savedPlayerName, currentPlayerName);
     }
@@ -259,7 +280,7 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
     public void onClick(View view) {
         final int slot = (Integer) view.getTag();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             switch (slot) {
                 case SLOT_NUMBER_IMPORT_WORLDMAP:
                     clickImportWorldmap();
@@ -273,8 +294,9 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
             }
         }
         if (!isLoading
-                && slot != SLOT_NUMBER_CREATE_NEW_SLOT
-                && AndorsTrailApplication.CURRENT_VERSION == AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION) {
+            && slot != SLOT_NUMBER_CREATE_NEW_SLOT
+            && AndorsTrailApplication.CURRENT_VERSION
+               == AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION) {
             if (!isOverwriteTargetInIncompatibleVersion(slot)) {
                 saveOrOverwriteSavegame(slot);
             }
@@ -288,7 +310,7 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
     private void saveOrOverwriteSavegame(int slot) {
         final String message = getConfirmOverwriteQuestion(slot);
         if (message != null) {
-            showConfirmoverwriteQuestion(slot, message);
+            showConfirmOverwriteQuestion(slot, message);
         } else {
             completeLoadSaveActivity(slot);
         }
@@ -296,8 +318,11 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
     private boolean isOverwriteTargetInIncompatibleVersion(int slot) {
         final FileHeader header = Savegames.quickload(this, slot);
-        if (header != null && header.fileversion != AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION) {
-            final CustomDialog d = CustomDialogFactory.createErrorDialog(this, "Overwriting not allowed", "You are currently using a development version of Andor's trail. Overwriting a regular savegame is not allowed in development mode.");
+        if (header != null
+            && header.fileversion != AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION) {
+            final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
+                                                                         "Overwriting not allowed",
+                                                                         "You are currently using a development version of Andor's trail. Overwriting a regular savegame is not allowed in development mode.");
             CustomDialogFactory.show(d);
             return true;
         }
@@ -306,28 +331,32 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
     //region Imports/Exports
 
+    //region Export
+
     @RequiresApi(api = Build.VERSION_CODES.P)
     private void exportSaveGames(Intent data) {
         Uri uri = data.getData();
 
         Context context = getApplicationContext();
-        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this).getContentResolver();
+        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this)
+                                                         .getContentResolver();
 
-        File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
-        DocumentFile source = DocumentFile.fromFile(storageDir);
+        File storageDir = AndroidStorage.getStorageDirectory(context,
+                                                             Constants.FILENAME_SAVEGAME_DIRECTORY);
         DocumentFile target = DocumentFile.fromTreeUri(context, uri);
         if (target == null) {
             return;
         }
 
-        DocumentFile[] files = source.listFiles();
+        File[] files = storageDir.listFiles();
+        if (files == null) {
+            showErrorExportingSaveGamesUnknown();
+            return;
+        }
 
         boolean hasExistingFiles = false;
-        for (DocumentFile file :
-                files) {
+        for (File file : files) {
             String fileName = file.getName();
-            if (fileName == null)
-                continue;
 
             DocumentFile existingFile = target.findFile(fileName);
             if (existingFile != null) {
@@ -339,45 +368,70 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         if (hasExistingFiles) {
             showConfirmOverwriteByExportQuestion(resolver, target, files);
         } else {
-            exportSaveGamesFolderContentToFolder(resolver, target, files);
+            exportSaveGamesFolderContentToFolder(target, files);
         }
     }
 
     @RequiresApi(api = Build.VERSION_CODES.P)
-    private void exportSaveGamesFolderContentToFolder(ContentResolver resolver, DocumentFile target, DocumentFile[] files) {
+    private void exportSaveGamesFolderContentToFolder(DocumentFile target, File[] files) {
         DocumentFile[] sourceFiles = new DocumentFile[files.length];
 
-        DocumentFile[] worldmapFiles = null;
+        File[] worldmapFiles = null;
 
         for (int i = 0; i < files.length; i++) {
-            DocumentFile file = files[i];
+            File file = files[i];
             if (file.isFile()) {
-                sourceFiles[i] = file;
-            } else if (file.isDirectory() && Objects.equals(file.getName(), Constants.FILENAME_WORLDMAP_DIRECTORY)) {
+                sourceFiles[i] = DocumentFile.fromFile(file);
+            } else if (file.isDirectory() && Objects.equals(file.getName(),
+                                                            Constants.FILENAME_WORLDMAP_DIRECTORY)) {
                 worldmapFiles = file.listFiles();
             }
         }
-        Context context =this;
-        DocumentFile[] finalWorldmapFiles = worldmapFiles;
-        AndroidStorage.copyDocumentFilesToDirAsync(sourceFiles,
-                context,
-                target,
-                (sucess) -> {
-                    if (sucess) {
-                        DocumentFile worldmapFolder = target.createDirectory(Constants.FILENAME_WORLDMAP_DIRECTORY);
-                        AndroidStorage.copyDocumentFilesToDirAsync(finalWorldmapFiles,
-                                context,
-                                worldmapFolder,
-                                (sucessWorldmap) -> completeLoadSaveActivity(SLOT_NUMBER_EXPORT_SAVEGAMES, sucessWorldmap));
-                    } else {
-                        completeLoadSaveActivity(SLOT_NUMBER_EXPORT_SAVEGAMES, false);
-                    }
-                });
+        Context context = this;
+        File[] finalWorldmapFiles = worldmapFiles;
+        CopyFilesToExternalFolder(target, sourceFiles, context, finalWorldmapFiles);
 
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    private void CopyFilesToExternalFolder(DocumentFile target,
+                                           DocumentFile[] sourceFiles,
+                                           Context context,
+                                           File[] finalWorldmapFiles) {
+        AndroidStorage.copyDocumentFilesToDirAsync(sourceFiles,
+                                                   context,
+                                                   target,
+                                                   getString(R.string.loadsave_exporting_savegames),
+                                                   (success) -> {
+                                                       if (success) {
+                                                           CopyWorldmapFilesAsZip(target,
+                                                                                  context,
+                                                                                  finalWorldmapFiles);
+                                                       } else {
+                                                           completeLoadSaveActivity(
+                                                                   SLOT_NUMBER_EXPORT_SAVEGAMES,
+                                                                   false);
+                                                       }
+                                                   });
+    }
 
-    @RequiresApi(api = Build.VERSION_CODES.N)
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    private void CopyWorldmapFilesAsZip(DocumentFile target,
+                                        Context context,
+                                        File[] finalWorldmapFiles) {
+        AndroidStorage.createZipDocumentFileFromFilesAsync(finalWorldmapFiles,
+                                                           context,
+                                                           target,
+                                                           Constants.FILENAME_WORLDMAP_DIRECTORY,
+                                                           getString(R.string.loadsave_exporting_worldmap),
+                                                           (successWorldmap) -> completeLoadSaveActivity(
+                                                                   SLOT_NUMBER_EXPORT_SAVEGAMES,
+                                                                   successWorldmap));
+    }
+
+    //endregion
+
+    @RequiresApi(api = Build.VERSION_CODES.P)
     private void importSaveGames(Intent data) {
         Uri uri = data.getData();
         ClipData uris = data.getClipData();
@@ -388,7 +442,8 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
 
         Context context = getApplicationContext();
-        ContentResolver resolver = context.getContentResolver();
+        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this)
+                .getContentResolver();
 
         File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
         DocumentFile appSavegameFolder = DocumentFile.fromFile(storageDir);
@@ -397,14 +452,18 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         if (uri != null) {
             uriList.add(uri);
         } else {
-            for (int i = 0; i < uris.getItemCount(); i++)
+            for (int i = 0; i < uris.getItemCount(); i++) {
                 uriList.add(uris.getItemAt(i).getUri());
+            }
         }
         importSaveGamesFromUris(context, resolver, appSavegameFolder, uriList);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    private void importSaveGamesFromUris(Context context, ContentResolver resolver, DocumentFile appSavegameFolder, List<Uri> uriList) {
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    private void importSaveGamesFromUris(Context context,
+                                         ContentResolver resolver,
+                                         DocumentFile appSavegameFolder,
+                                         List<Uri> uriList) {
         int count = uriList.size();
 
         ArrayList<DocumentFile> alreadyExistingFiles = new ArrayList<>();
@@ -414,10 +473,11 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
             Uri item = uriList.get(i);
             DocumentFile itemFile = DocumentFile.fromSingleUri(context, item);
             boolean fileAlreadyExists = getExistsSavegameInOwnFiles(itemFile, appSavegameFolder);
-            if (fileAlreadyExists)
+            if (fileAlreadyExists) {
                 alreadyExistingFiles.add(itemFile);
-            else
+            } else {
                 newFiles.add(itemFile);
+            }
         }
 
         if (alreadyExistingFiles.size() > 0) {
@@ -427,7 +487,10 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
     }
 
-    private void importSaveGames(ContentResolver resolver, DocumentFile appSavegameFolder, List<DocumentFile> saveFiles) {
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    private void importSaveGames(ContentResolver resolver,
+                                 DocumentFile appSavegameFolder,
+                                 List<DocumentFile> saveFiles) {
         int size = saveFiles.size();
         DocumentFile[] sources = new DocumentFile[size];
         DocumentFile[] targets = new DocumentFile[size];
@@ -457,21 +520,18 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
 
         AndroidStorage.copyDocumentFilesFromToAsync(sources,
-                this,
-                targets,
-                (sucess) -> completeLoadSaveActivity(SLOT_NUMBER_IMPORT_SAVEGAMES, sucess));
-    }
-
-    private void completeSavegameImportAndCheckIfDone(List<Integer> importsNeedingConfirmation, int slot) {
-        importsNeedingConfirmation.remove((Object) slot);
-        if (importsNeedingConfirmation.isEmpty()) {
-            completeLoadSaveActivity(SLOT_NUMBER_IMPORT_SAVEGAMES);
-        }
+                                                    this,
+                                                    targets,
+                                                    getString(R.string.loadsave_importing_savegames),
+                                                    (sucess) -> completeLoadSaveActivity(
+                                                            SLOT_NUMBER_IMPORT_SAVEGAMES,
+                                                            sucess));
     }
 
     private boolean getExistsSavegameInOwnFiles(DocumentFile savegameFile, DocumentFile appSavegameFolder) {
-        if (savegameFile == null)
+        if (savegameFile == null) {
             return false;
+        }
 
         DocumentFile foundFile = appSavegameFolder.findFile(Objects.requireNonNull(savegameFile.getName()));
         return foundFile != null && foundFile.exists();
@@ -479,7 +539,6 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
     private int getSlotFromSavegameFileName(String fileName) {
         if (fileName == null || !fileName.startsWith(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX)) {
-            //TODO: Maybe output a message that the file didn't have the right name?
             return -1;
         }
         String slotStr = fileName.substring(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX.length());
@@ -489,32 +548,16 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
             slot = Integer.parseInt(slotStr);
             return slot;
         } catch (NumberFormatException e) {
-            //TODO: Maybe output a message that the file didn't have the right name?
             return -1;
         }
     }
 
-    private void importSaveGameFile(ContentResolver resolver, DocumentFile appSavegameFolder, DocumentFile itemFile, int slot) {
-        String targetName = Savegames.getSlotFileName(slot);
-        DocumentFile targetFile = getOrCreateDocumentFile(appSavegameFolder, targetName);
-
-        if (targetFile == null || !targetName.equals(targetFile.getName())) {
-            showErrorImportingSaveGameUnknown();//TODO: maybe replace with a more specific error message
-            return;
-        }
-
-        try {
-            AndroidStorage.copyDocumentFile(itemFile, resolver, targetFile);
-        } catch (IOException e) {
-            showErrorImportingSaveGameUnknown();
-            e.printStackTrace();
-        }
-    }
-
     private DocumentFile getOrCreateDocumentFile(DocumentFile folder, String targetName) {
         DocumentFile targetFile = folder.findFile(targetName);//try finding the file
         if (targetFile == null)//no file found, creating new one
+        {
             targetFile = folder.createFile(Constants.NO_FILE_EXTENSION_MIME_TYPE, targetName);
+        }
         return targetFile;
     }
 
@@ -522,72 +565,87 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
     private void importWorldmap(Intent data) {
         Uri uri = data.getData();
 
-        Context context = getApplicationContext();
-        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this).getContentResolver();
+        Context context = AndorsTrailApplication.getApplicationFromActivity(this).getApplicationContext();
 
-        File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
-        DocumentFile storageFolder = DocumentFile.fromFile(storageDir);
-        DocumentFile ownWorldmapFolder = storageFolder.findFile(Constants.FILENAME_WORLDMAP_DIRECTORY);
-        if (ownWorldmapFolder == null) {
-            ownWorldmapFolder = storageFolder.createDirectory(Constants.FILENAME_WORLDMAP_DIRECTORY);
-        }
-
-        DocumentFile chosenFolder = DocumentFile.fromTreeUri(context, uri);
-        if (chosenFolder == null || !chosenFolder.isDirectory()) {
+        DocumentFile chosenZip = DocumentFile.fromSingleUri(context, uri);
+        if (chosenZip == null || !chosenZip.isFile()) {
             showErrorImportingWorldmapWrongDirectory();
             return;
         }
-        if (!Constants.FILENAME_WORLDMAP_DIRECTORY.equals(chosenFolder.getName())) {
-            //user did not select the worldmap folder directly
-            DocumentFile file = chosenFolder.findFile(Constants.FILENAME_WORLDMAP_DIRECTORY);
-            if (file == null || !file.isDirectory() || !Constants.FILENAME_WORLDMAP_DIRECTORY.equals(file.getName())) {
-                //could not find a worldmap folder in the users selection
-                showErrorImportingWorldmapWrongDirectory();
-                return;
-            }
-
-            chosenFolder = file;
+        String chosenZipName = chosenZip.getName();
+        if (!chosenZipName.startsWith(Constants.FILENAME_WORLDMAP_DIRECTORY)) {
+            showErrorImportingWorldmapWrongDirectory();
+            return;
         }
 
-        AndroidStorage.copyDocumentFilesToDirAsync(chosenFolder.listFiles(),
-                this,
-                ownWorldmapFolder,
-                (success) -> completeLoadSaveActivity(SLOT_NUMBER_IMPORT_WORLDMAP, success));
+        File ownWorldmapFolder = getOwnWorldmapFolder(context);
+
+
+        AndroidStorage.unzipDocumentFileToDirectoryAsync(chosenZip,
+                                                         this,
+                                                         ownWorldmapFolder,
+                                                         false,
+                                                         getString(R.string.loadsave_importing_worldmap),
+                                                         (success) -> completeLoadSaveActivity(
+                                                                 SLOT_NUMBER_IMPORT_WORLDMAP,
+                                                                 success));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    private File getOwnWorldmapFolder(Context context) {
+        File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
+        File ownWorldmapFolder = null;
+        for (File f : storageDir.listFiles()) {
+            if (f.getName().equals(Constants.FILENAME_WORLDMAP_DIRECTORY)) {
+                ownWorldmapFolder = f;
+                break;
+            }
+        }
+        if (ownWorldmapFolder == null) {
+            ownWorldmapFolder = new File(storageDir, Constants.FILENAME_WORLDMAP_DIRECTORY);
+            ownWorldmapFolder.mkdir();
+        }
+        return ownWorldmapFolder;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.P)
     private void clickExportSaveGames() {
-        startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(), -SLOT_NUMBER_EXPORT_SAVEGAMES);
+        showStartExportInfo(view -> startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(),
+                                                           -SLOT_NUMBER_EXPORT_SAVEGAMES));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    @RequiresApi(api = Build.VERSION_CODES.P)
     private void clickImportSaveGames() {
-        startActivityForResult(AndroidStorage.getNewSelectMultipleSavegameFilesIntent(), -SLOT_NUMBER_IMPORT_SAVEGAMES);
-
+        showStartImportSavesInfo(view -> startActivityForResult(AndroidStorage.getNewSelectMultipleSavegameFilesIntent(),
+                                                                -SLOT_NUMBER_IMPORT_SAVEGAMES));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    @RequiresApi(api = Build.VERSION_CODES.P)
     private void clickImportWorldmap() {
-        startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(), -SLOT_NUMBER_IMPORT_WORLDMAP);
+        showStartImportWorldmapInfo(view -> startActivityForResult(AndroidStorage.getNewSelectZipIntent(),
+                                                                   -SLOT_NUMBER_IMPORT_WORLDMAP));
 
     }
 
     @RequiresApi(api = Build.VERSION_CODES.P)
-    private void showConfirmOverwriteByExportQuestion(ContentResolver resolver, DocumentFile targetFolder, DocumentFile[] files) {
+    private void showConfirmOverwriteByExportQuestion(ContentResolver resolver,
+                                                      DocumentFile targetFolder,
+                                                      File[] files) {
         final CustomDialog d = CustomDialogFactory.createDialog(this,
-                getString(R.string.loadsave_export_overwrite_confirmation_title),
-                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                getString(R.string.loadsave_export_overwrite_confirmation),
-                null,
-                true);
+                                                                getString(R.string.loadsave_export_overwrite_confirmation_title),
+                                                                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                                                                getString(R.string.loadsave_export_overwrite_confirmation),
+                                                                null,
+                                                                true);
 
-        CustomDialogFactory.addButton(d, android.R.string.yes, v -> exportSaveGamesFolderContentToFolder(resolver, targetFolder, files));
+        CustomDialogFactory.addButton(d,
+                                      android.R.string.yes,
+                                      v -> exportSaveGamesFolderContentToFolder(targetFolder, files));
         CustomDialogFactory.addDismissButton(d, android.R.string.no);
 
         CustomDialogFactory.show(d);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.N)
+    @RequiresApi(api = Build.VERSION_CODES.P)
     private void showConfirmOverwriteByImportQuestion(ContentResolver resolver,
                                                       DocumentFile appSavegameFolder,
                                                       List<DocumentFile> alreadyExistingFiles,
@@ -601,9 +659,9 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
         Context context = AndorsTrailApplication.getApplicationFromActivity(this).getApplicationContext();
 
-        ArrayList<CustomDialog> dialogs = new ArrayList<CustomDialog>(amount) ;
+        ArrayList<CustomDialog> dialogs = new ArrayList<>(amount);
 
-        for (int i = 0; i < amount ; i++) {
+        for (int i = 0; i < amount; i++) {
             DocumentFile alreadyExistingFile = alreadyExistingFiles.get(i);
             int slot = getSlotFromSavegameFileName(alreadyExistingFile.getName());
             FileHeader existingFileHeader = Savegames.quickload(context, slot);
@@ -620,20 +678,26 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
             }
 
             StringBuilder messageSb = new StringBuilder();
-            String existingFileDescription = getString(R.string.loadsave_import_existing_description, slot, existingFileHeader.describe());
-            String importedFileDescription = getString(R.string.loadsave_import_imported_description, slot, importedFileHeader.describe());
-            messageSb.append(getString(R.string.loadsave_import_file_exists_question, existingFileDescription, importedFileDescription));
+            String existingFileDescription = getString(R.string.loadsave_import_existing_description,
+                                                       Integer.toString(slot),
+                                                       existingFileHeader.describe());
+            String importedFileDescription = getString(R.string.loadsave_import_imported_description,
+                                                       Integer.toString(slot),
+                                                       importedFileHeader.describe());
+            messageSb.append(getString(R.string.loadsave_import_file_exists_question,
+                                       existingFileDescription,
+                                       importedFileDescription));
 
 
             String m = messageSb.toString();
             CustomDialog dialog = CustomDialogFactory.createDialog(this,
-                    title,
-                    getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                    m,
-                    null,
-                    true,
-                    false,
-                    true);
+                                                                   title,
+                                                                   getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                                                                   m,
+                                                                   null,
+                                                                   true,
+                                                                   false,
+                                                                   true);
 
             CustomDialogFactory.addButton(dialog, R.string.loadsave_import_option_keep_existing, v -> {
                 //do nothing
@@ -646,7 +710,8 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
             });
 
             CustomDialogFactory.addButton(dialog, R.string.loadsave_import_option_add_as_new, v -> {
-                newFiles.add(null);//add a null element as marker to know later if the next file should be imported as new or overwrite the existing one
+                newFiles.add(null);//add a null element as marker to know later if the next file
+                // should be imported as new or overwrite the existing one
                 newFiles.add(alreadyExistingFile);
                 GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
             });
@@ -662,13 +727,15 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    private void GoToNextConflictOrFinish(ContentResolver resolver, DocumentFile appSavegameFolder, List<DocumentFile> newFiles, ArrayList<CustomDialog> dialogs) {
-        if(dialogs.stream().count() > 0){
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    private void GoToNextConflictOrFinish(ContentResolver resolver,
+                                          DocumentFile appSavegameFolder,
+                                          List<DocumentFile> newFiles,
+                                          ArrayList<CustomDialog> dialogs) {
+        if (dialogs.stream().count() > 0) {
             CustomDialog d = dialogs.remove(0);
             CustomDialogFactory.show(d);
-        }
-        else{
+        } else {
             importSaveGames(resolver, appSavegameFolder, newFiles);
         }
     }
@@ -677,8 +744,9 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (resultCode != Activity.RESULT_OK)
+        if (resultCode != Activity.RESULT_OK) {
             return;
+        }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             switch (-requestCode) {
@@ -713,48 +781,90 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
     //region show Dialogs
 
-    private void showErrorImportingWorldmapWrongDirectory() {
-        final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
-                getString(R.string.loadsave_import_worldmap_unsuccessfull),
-                getString(R.string.loadsave_import_worldmap_wrong_directory));
+    //region Import/Export
+
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    private void showStartExportInfo(OnClickListener onOk) {
+        final CustomDialog d = CustomDialogFactory.createDialog(this,
+                                                                getString(R.string.loadsave_export),
+                                                                getResources().getDrawable(android.R.drawable.ic_dialog_info),
+                                                                getString(R.string.loadsave_export_info),
+                                                                null,
+                                                                true);
+        CustomDialogFactory.addButton(d, android.R.string.yes, onOk);
+        CustomDialogFactory.addDismissButton(d, android.R.string.no);
         CustomDialogFactory.show(d);
     }
 
-    private void showErrorImportingSaveGameUnknown() {
-        final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
-                getString(R.string.loadsave_import_save_unsuccessfull),
-                getString(R.string.loadsave_import_save_error_unknown));
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    private void showStartImportSavesInfo(OnClickListener onOk) {
+        final CustomDialog d = CustomDialogFactory.createDialog(this,
+                                                                getString(R.string.loadsave_import_save),
+                                                                getResources().getDrawable(android.R.drawable.ic_dialog_info),
+                                                                getString(R.string.loadsave_import_save_info),
+                                                                null,
+                                                                true);
+        CustomDialogFactory.addButton(d, android.R.string.yes, onOk);
+        CustomDialogFactory.addDismissButton(d, android.R.string.no);
         CustomDialogFactory.show(d);
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    private void showStartImportWorldmapInfo(OnClickListener onOk) {
+        final CustomDialog d = CustomDialogFactory.createDialog(this,
+                                                                getString(R.string.loadsave_import_worldmap),
+                                                                getResources().getDrawable(android.R.drawable.ic_dialog_info),
+                                                                getString(R.string.loadsave_import_worldmap_info),
+                                                                null,
+                                                                true);
+        CustomDialogFactory.addButton(d, android.R.string.yes, onOk);
+        CustomDialogFactory.addDismissButton(d, android.R.string.no);
+        CustomDialogFactory.show(d);
+    }
+
+    private void showErrorImportingWorldmapWrongDirectory() {
+        final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
+                                                                     getString(R.string.loadsave_import_worldmap_unsuccessfull),
+                                                                     getString(R.string.loadsave_import_worldmap_wrong_file));
+        CustomDialogFactory.show(d);
+    }
+
+    private void showErrorExportingSaveGamesUnknown() {
+        final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
+                                                                     getString(R.string.loadsave_export_unsuccessfull),
+                                                                     getString(R.string.loadsave_export_error_unknown));
+        CustomDialogFactory.show(d);
+    }
+
+    //endregion
+
     private void showErrorLoadingEmptySlot() {
         final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
-                getString(R.string.startscreen_error_loading_game),
-                getString(R.string.startscreen_error_loading_empty_slot));
+                                                                     getString(R.string.startscreen_error_loading_game),
+                                                                     getString(R.string.startscreen_error_loading_empty_slot));
         CustomDialogFactory.show(d);
     }
 
     private void showSlotGetsDeletedOnLoadWarning(final int slot) {
         final CustomDialog d = CustomDialogFactory.createDialog(this,
-                getString(R.string.startscreen_attention_slot_gets_delete_on_load),
-                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                getString(R.string.startscreen_attention_message_slot_gets_delete_on_load),
-                null,
-                true);
+                                                                getString(R.string.startscreen_attention_slot_gets_delete_on_load),
+                                                                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                                                                getString(R.string.startscreen_attention_message_slot_gets_delete_on_load),
+                                                                null,
+                                                                true);
         CustomDialogFactory.addButton(d, android.R.string.ok, v -> completeLoadSaveActivity(slot));
         CustomDialogFactory.show(d);
     }
 
-    private void showConfirmoverwriteQuestion(final int slot, String message) {
-        final String title =
-                getString(R.string.loadsave_save_overwrite_confirmation_title) + ' '
-                        + getString(R.string.loadsave_save_overwrite_confirmation_slot, slot);
+    private void showConfirmOverwriteQuestion(final int slot, String message) {
+		final String title = getString(R.string.loadsave_save_overwrite_confirmation_title) + ' '
+							 + getString(R.string.loadsave_save_overwrite_confirmation_slot, slot);
         final CustomDialog d = CustomDialogFactory.createDialog(this,
-                title,
-                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                message,
-                null,
-                true);
+                                                                title,
+                                                                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                                                                message,
+                                                                null,
+                                                                true);
 
         CustomDialogFactory.addButton(d, android.R.string.yes, v -> completeLoadSaveActivity(slot));
         CustomDialogFactory.addDismissButton(d, android.R.string.no);

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java

@@ -2,7 +2,7 @@ package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.v4.app.FragmentTabHost;
+import androidx.fragment.app.FragmentTabHost;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java

@@ -21,8 +21,8 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager.OnBackStackChangedListener;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager.OnBackStackChangedListener;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewTreeObserver;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java

@@ -5,7 +5,7 @@ import java.util.Arrays;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java

@@ -8,7 +8,7 @@ import java.util.Map;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java

@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java

@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java

@@ -4,7 +4,7 @@ import java.util.HashSet;
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java

@@ -12,7 +12,7 @@ import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java

@@ -3,7 +3,7 @@ package com.gpl.rpg.AndorsTrail.activity.fragment;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/CombatController.java

@@ -579,6 +579,13 @@ public final class CombatController implements VisualEffectCompletedCallback {
 	private static final int n = 50;
 	private static final int F = 40;
 	private static final float two_divided_by_PI = (float) (2f / Math.PI);
+	/**
+	 * @implNote
+	 * formula: 50 * (1 + (2 / pi) * atan((attackChance - blockChance - n) / F))
+	 * <br/>
+	 * n = {@value n}; F = {@value F}
+	 * @return [0..100] . 100 == always hit.
+	 */
 	private static int getAttackHitChance(final Actor attacker, final Actor target) {
 		final int c = attacker.getAttackChance() - target.getBlockChance();
 		// (2/pi)*atan(..) will vary from -1 to +1 .

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/Constants.java

@@ -7,7 +7,7 @@ import com.gpl.rpg.AndorsTrail.util.ConstRange;
 import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class Constants {
-	public static final int PERCENT_EXP_LOST_WHEN_DIED = 30;
+	public static final int PERCENT_EXP_LOST_WHEN_DIED = 20;
 	public static final int LEVELUP_EFFECT_HEALTH = 5;
 	public static final int LEVELUP_EFFECT_ATK_CH = 5;
 	public static final int LEVELUP_EFFECT_ATK_DMG = 1;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ConversationController.java

@@ -22,6 +22,7 @@ import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
@@ -124,6 +125,9 @@ public final class ConversationController {
 			case changeMapFilter:
 				changeMapFilter(res, effect.mapName, effect.effectID);
 				break;
+			case mapchange:
+				mapchange(effect.mapName, effect.effectID);
+				break;
 		}
 	}
 
@@ -172,6 +176,13 @@ public final class ConversationController {
 		}
 	}
 
+	private void mapchange(String mapName, String place) {
+		PredefinedMap map = findMapForScriptEffect(mapName);
+//		controllers.mapController.activateMapObjectGroup(map, mapObjectGroupID);
+//		controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, effect.mapName, effect.effectID, 0, 0); //cbcbcb check
+		controllers.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, mapName, place, 0, 0);
+	}
+
 	private void addAlignmentReward(Player player, String faction, int delta) {
 		player.addAlignment(faction, delta);
 		MovementController.refreshMonsterAggressiveness(world.model.currentMaps.map, world.model.player);
@@ -311,6 +322,18 @@ public final class ConversationController {
 			case factionScoreEquals:
 				result = player.getAlignment(requirement.requireID) == requirement.value;
 				break;
+			case date:
+				result = world.model.worldData.getDate(requirement.requireID) >= requirement.value;
+				break;
+			case dateEquals:
+				result = world.model.worldData.getDate(requirement.requireID) == requirement.value;
+				break;
+			case time:
+				result = world.model.worldData.getTime(requirement.requireID) >= requirement.value;
+				break;
+			case timeEquals:
+				result = world.model.worldData.getTime(requirement.requireID) == requirement.value;
+				break;
 			default:
 				result =  true;
 		}

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/SkillController.java

@@ -1,5 +1,6 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListeners;
@@ -17,6 +18,7 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemCategory;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class SkillController {
 	private final ControllerContext controllers;
@@ -58,6 +60,9 @@ public final class SkillController {
 
 	public static int getDropChanceRollBias(DropItem item, Player player) {
 		if (player == null) return 0;
+		if(item.itemType == null && AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES){
+			L.log("Item type missing: " + item + " " + player.id);
+		}
 
 		if (ItemTypeCollection.isGoldItemType(item.itemType.id)) {
 			return getRollBias(item, player, SkillID.coinfinder, SkillCollection.PER_SKILLPOINT_INCREASE_COINFINDER_CHANCE_PERCENT);

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/WorldData.java

@@ -6,6 +6,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import java.util.Calendar;
+
 public final class WorldData {
 	private long worldTime = 0; // Measured in number of game rounds
 	private final HashMap<String, Long> timers = new HashMap<String, Long>();
@@ -36,6 +38,62 @@ public final class WorldData {
 		return v + duration <= worldTime;
 	}
 
+	public int getDate(String format) {
+		Calendar now = Calendar.getInstance();
+		int ret;
+		switch (format) {
+			case "YYYYMMDD":
+				ret = now.get(Calendar.YEAR)*10000 + (now.get(Calendar.MONTH) + 1)*100 + now.get(Calendar.DAY_OF_MONTH);
+				break;
+			case "YYYYMM":
+				ret = now.get(Calendar.YEAR)*100 + (now.get(Calendar.MONTH) + 1);
+				break;
+			case "YYYY":
+				ret = now.get(Calendar.YEAR);
+				break;
+			case "MMDD":
+				ret = (now.get(Calendar.MONTH) + 1)*100 + now.get(Calendar.DAY_OF_MONTH);
+				break;
+			case "MM":
+				ret = (now.get(Calendar.MONTH) + 1);
+				break;
+			case "DD":
+				ret = now.get(Calendar.DAY_OF_MONTH);
+				break;
+			default:
+				ret = 99999999;		//never true
+		}
+		return ret;
+	}
+
+	public int getTime(String format) {
+		Calendar now = Calendar.getInstance();
+		int ret;
+		switch (format) {
+			case "HHMMSS":
+				ret = now.get(Calendar.HOUR_OF_DAY)*10000 + now.get(Calendar.MINUTE)*100 + now.get(Calendar.SECOND);
+				break;
+			case "HHMM":
+				ret = now.get(Calendar.HOUR_OF_DAY)*100 + now.get(Calendar.MINUTE);
+				break;
+			case "HH":
+				ret = now.get(Calendar.HOUR_OF_DAY);
+				break;
+			case "MMSS":
+				ret = now.get(Calendar.MINUTE)*100 + now.get(Calendar.SECOND);
+				break;
+			case "MM":
+				ret = now.get(Calendar.MINUTE);
+				break;
+			case "SS":
+				ret = now.get(Calendar.SECOND);
+				break;
+			default:
+				ret = 99999999;		//never true
+		}
+		return ret;
+	}
+
 	// ====== PARCELABLE ===================================================================
 
 	public WorldData(DataInputStream src, int fileversion) throws IOException {

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java

@@ -83,7 +83,7 @@ public final class SkillCollection {
 	public static final int PER_SKILLPOINT_INCREASE_COINFINDER_CHANCE_PERCENT = 30;
 	public static final int PER_SKILLPOINT_INCREASE_MAGICFINDER_CHANCE_PERCENT = 50;
 	public static final int PER_SKILLPOINT_INCREASE_COINFINDER_QUANTITY_PERCENT = 50;
-	public static final int PER_SKILLPOINT_INCREASE_MORE_EXP_PERCENT = 5;
+	public static final int PER_SKILLPOINT_INCREASE_MORE_EXP_PERCENT = 10;
 	public static final int PER_SKILLPOINT_INCREASE_CLEAVE_AP = 3;
 	public static final int PER_SKILLPOINT_INCREASE_EATER_HEALTH = 1;
 	public static final int PER_SKILLPOINT_INCREASE_FORTITUDE_HEALTH = 1;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/actor/Player.java

@@ -111,7 +111,7 @@ public final class Player extends Actor {
 		baseTraits.criticalSkill = 0;
 		baseTraits.criticalMultiplier = 1;
 		baseTraits.damagePotential.set(1, 1);
-		baseTraits.blockChance = 0;
+		baseTraits.blockChance = 9;
 		baseTraits.damageResistance = 0;
 		baseTraits.useItemCost = 5;
 		baseTraits.reequipCost = 5;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java

@@ -17,7 +17,7 @@ import com.gpl.rpg.AndorsTrail.util.Range;
 public final class MonsterSpawnArea {
 	public final CoordRect area;
 	public final Range quantity;
-	private final Range spawnChance;
+	private final Range respawnspeed;
 	public final String areaID;
 	public final String[] monsterTypeIDs;
 	public final List<Monster> monsters = new CopyOnWriteArrayList<Monster>();
@@ -30,7 +30,7 @@ public final class MonsterSpawnArea {
 	public MonsterSpawnArea(
 			CoordRect area
 			, Range quantity
-			, Range spawnChance
+			, Range respawnspeed
 			, String areaID
 			, String[] monsterTypeIDs
 			, boolean isUnique
@@ -40,7 +40,7 @@ public final class MonsterSpawnArea {
 	) {
 		this.area = area;
 		this.quantity = quantity;
-		this.spawnChance = spawnChance;
+		this.respawnspeed = respawnspeed;
 		this.areaID = areaID;
 		this.monsterTypeIDs = monsterTypeIDs;
 		this.isUnique = isUnique;
@@ -101,7 +101,7 @@ public final class MonsterSpawnArea {
 	}
 
 	public boolean rollShouldSpawn() {
-		return Constants.rollResult(spawnChance);
+		return Constants.rollResult(respawnspeed);
 	}
 
 	public void removeAllMonsters() {

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java

@@ -115,7 +115,7 @@ public final class TMXMapTranslator {
 						boolean isActiveForNewGame = true;
 						boolean ignoreAreas = false;
 						int maxQuantity = 1;
-						int spawnChance = 10;
+						int respawnspeed = 10;
 						String spawnGroup = object.name;
 						for (TMXProperty p : object.properties) {
 							if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
@@ -126,8 +126,8 @@ public final class TMXMapTranslator {
 							}
 							if (p.name.equalsIgnoreCase("quantity")) {
 								maxQuantity = Integer.parseInt(p.value);
-							} else if (p.name.equalsIgnoreCase("spawnchance")) {
-								spawnChance = Integer.parseInt(p.value);
+							} else if (p.name.equalsIgnoreCase("respawnspeed")) {
+								respawnspeed = Integer.parseInt(p.value);
 							} else if (p.name.equalsIgnoreCase("active")) {
 								isActiveForNewGame = Boolean.parseBoolean(p.value);
 							} else if (p.name.equalsIgnoreCase("ignoreAreas")) {
@@ -155,7 +155,7 @@ public final class TMXMapTranslator {
 						MonsterSpawnArea area = new MonsterSpawnArea(
 								position
 								,new Range(maxQuantity, 0)
-								,new Range(1000, spawnChance)
+								,new Range(1000, respawnspeed)
 								,object.name
 								,monsterTypeIDs
 								,isUnique
@@ -405,6 +405,11 @@ public final class TMXMapTranslator {
 				int tileID = tileCache.getTileID(tile.tilesetName, tile.localId);
 				result.tiles[dx][dy] = tileID;
 				usedTileIDs.add(tileID);
+				if(AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA){
+					if(tileID == 0){
+						L.log("Tileid 0 in "+ tile.tilesetName);
+					}
+				}
 			}
 		}
 		return result;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/Requirement.java

@@ -21,6 +21,10 @@ public final class Requirement {
 		,random
 		,factionScoreEquals
 		,wearRemove
+		,date
+		,dateEquals
+		,time
+		,timeEquals
 	}
 
 	public final RequirementType requireType;
@@ -83,6 +87,10 @@ public final class Requirement {
 			case skillLevel:
 				return requireID != null && value >= 0;
 			case spentGold:
+			case date:
+			case dateEquals:
+			case time:
+			case timeEquals:
 				return value >= 0;
 			case random:
 				return chance != null;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java

@@ -18,6 +18,7 @@ public final class ScriptEffect {
 		, deactivateMapObjectGroup
 		, removeQuestProgress
 		, changeMapFilter
+		, mapchange
 	}
 
 	public final ScriptEffectType type;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java

@@ -137,7 +137,8 @@ public final class ResourceLoader {
 		final ItemTypeParser itemTypeParser = new ItemTypeParser(loader, world.actorConditionsTypes, world.itemCategories, translationLoader);
 		final TypedArray itemsToLoad = r.obtainTypedArray(itemsResourceId);
 		for (int i = 0; i < itemsToLoad.length(); ++i) {
-			world.itemTypes.initialize(itemTypeParser, readStringFromRaw(r, itemsToLoad, i));
+			String s = readStringFromRaw(r, itemsToLoad, i);
+			world.itemTypes.initialize(itemTypeParser, s);
 		}
 		itemsToLoad.recycle();
 		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ItemTypeParser");
@@ -250,6 +251,7 @@ public final class ResourceLoader {
 
 	private static void prepareTilesets(DynamicTileLoader loader, int mTileSize) {
 		final Size sz1x1 = new Size(1, 1);
+		final Size sz1x2 = new Size(1, 2);
 		final Size sz2x1 = new Size(2, 1);
 		final Size sz2x2 = new Size(2, 2);
 		final Size sz2x3 = new Size(2, 3);
@@ -258,6 +260,7 @@ public final class ResourceLoader {
 		final Size sz6x1 = new Size(6, 1);
 		final Size sz7x1 = new Size(7, 1);
 		final Size sz8x3 = new Size(8, 3);
+		final Size sz16x8 = new Size(16, 8);
 		final Size sz20x12 = new Size(20, 12);
 		final Size mapTileSize = new Size(16, 8);
 		final Size sz8x8 = new Size(8, 8);
@@ -274,170 +277,92 @@ 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.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.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_58, "map_58", sz8x8, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_59, "map_59", sz8x8, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_6, "map_6", sz8x8, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_60, "map_60", sz8x8, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_61, "map_61", 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.effect_blood4, "effect_blood4", new Size(7, 2), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.effect_heal2, "effect_heal2", new Size(8, 2), sz1x1, mTileSize);

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/DropListParser.java

@@ -39,6 +39,12 @@ public final class DropListParser extends JsonCollectionParserFor<DropList> {
 			if (items == null) {
 				L.log("OPTIMIZE: Droplist \"" + droplistID + "\" has no dropped items.");
 			}
+			for (int i = 0; i < items.length; i++) {
+				DropItem item = items[i];
+				if (item.itemType == null) {
+					L.log("Item at index " + i + " in droplist " + droplistID + " was null");
+				}
+			}
 		}
 
 		return new Pair<String, DropList>(droplistID, new DropList(items));

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java

@@ -12,6 +12,8 @@ import android.graphics.Bitmap;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.LruCache;
 
 public final class TileCache {
@@ -39,7 +41,12 @@ public final class TileCache {
 		tileIDsPerLocalID.put(localID, tileID);
 	}
 	public int getTileID(String tileSetName, int localID) {
-		return tileIDsPerTilesetAndLocalID.get(tileSetName).get(localID);
+
+		SparseIntArray sparseIntArray = tileIDsPerTilesetAndLocalID.get(tileSetName);
+		if(AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES && sparseIntArray == null){
+			L.log("Could not get tile " + tileSetName + " " + localID);
+		}
+		return sparseIntArray.get(localID);
 	}
 
 	private static final class ResourceFileTile {
@@ -67,6 +74,9 @@ public final class TileCache {
 		HashMap<ResourceFileTileset, SparseArray<ResourceFileTile>> tilesToLoadPerSourceFile = new HashMap<ResourceFileTileset, SparseArray<ResourceFileTile>>();
 		for(int tileID : iconIDs) {
 			ResourceFileTile tile = resourceTiles[tileID];
+			if(tile == null && AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES){
+				L.log("could not find resourceTiles for id: " + tileID);
+			}
 			SparseArray<ResourceFileTile> tiles = tilesToLoadPerSourceFile.get(tile.tileset);
 			if (tiles == null) {
 				tiles = new SparseArray<TileCache.ResourceFileTile>();

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java

@@ -18,6 +18,7 @@ import android.os.AsyncTask;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -33,6 +34,7 @@ import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
+import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class TileManager {
@@ -374,6 +376,10 @@ public final class TileManager {
 			cachedTileIDs = getTileIDsFor(adjacentMap, adjacentMapTiles, world);
 			tileIDsPerMap.put(mapName, cachedTileIDs);
 		}
+
+		if(AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES){
+			L.log("TileIDsFor " + mapName + "\n" + cachedTileIDs);
+		}
 		dest.addAll(cachedTileIDs);
 	}
 	public void cacheAdjacentMaps(final Resources res, final WorldContext world, final PredefinedMap nextMap) {
@@ -391,6 +397,9 @@ public final class TileManager {
 
 				HashSet<Integer> tileIDs = new HashSet<Integer>();
 				for (String mapName : adjacentMapNames) {
+					if(AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES){
+						L.log("addTileIDsFor " + mapName);
+					}
 					addTileIDsFor(tileIDs, mapName, res, world);
 				}
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java

@@ -6,14 +6,12 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.FileProvider;
-import android.support.v4.provider.DocumentFile;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.FileProvider;
+import androidx.documentfile.provider.DocumentFile;
 
 import android.os.Handler;
 import android.os.Looper;
-import android.webkit.MimeTypeMap;
 
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
@@ -22,19 +20,22 @@ import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.concurrent.CancellationException;
 import java.util.function.Consumer;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
 
 public final class AndroidStorage {
     public static File getStorageDirectory(Context context, String name) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             return context.getExternalFilesDir(name);
-        }
-        else {
+        } else {
             File root = Environment.getExternalStorageDirectory();
             return new File(root, name);
         }
@@ -42,16 +43,16 @@ public final class AndroidStorage {
 
     public static boolean shouldMigrateToInternalStorage(Context context) {
         boolean ret = false;
-        File externalSaveGameDirectory = new File(Environment.getExternalStorageDirectory(), Constants.FILENAME_SAVEGAME_DIRECTORY);
+        File externalSaveGameDirectory = new File(Environment.getExternalStorageDirectory(),
+                                                  Constants.FILENAME_SAVEGAME_DIRECTORY);
         File internalSaveGameDirectory = getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
 
         if (externalSaveGameDirectory.exists()
-                && externalSaveGameDirectory.isDirectory()
-                && externalSaveGameDirectory.listFiles().length > 0
-                && (
-                !internalSaveGameDirectory.exists()
-                        || internalSaveGameDirectory.isDirectory() && internalSaveGameDirectory.listFiles().length < 2)
-                ) {
+            && externalSaveGameDirectory.isDirectory()
+            && externalSaveGameDirectory.listFiles().length > 0
+            && (!internalSaveGameDirectory.exists()
+                || internalSaveGameDirectory.isDirectory()
+                   && internalSaveGameDirectory.listFiles().length < 2)) {
             ret = true;
         }
         return ret;
@@ -60,11 +61,11 @@ public final class AndroidStorage {
     public static boolean migrateToInternalStorage(Context context) {
         try {
             copy(new File(Environment.getExternalStorageDirectory(), Constants.CHEAT_DETECTION_FOLDER),
-                    getStorageDirectory(context, Constants.CHEAT_DETECTION_FOLDER));
+                 getStorageDirectory(context, Constants.CHEAT_DETECTION_FOLDER));
             copy(new File(Environment.getExternalStorageDirectory(), Constants.FILENAME_SAVEGAME_DIRECTORY),
-                    getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY));
+                 getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY));
         } catch (IOException e) {
-            L.log("Error migrating data: " + e.toString());
+            L.log("Error migrating data: " + e);
             return false;
         }
         return true;
@@ -105,54 +106,174 @@ public final class AndroidStorage {
         }
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    public static void createZipDocumentFileFromFilesAsync(File[] files,
+                                                           Context context,
+                                                           DocumentFile targetDirectory,
+                                                           String fileName,
+                                                           String loadingMessage,
+                                                           Consumer<Boolean> callback) {
 
-    public static void copyDocumentFileToNewOrExistingFile(DocumentFile sourceFile, ContentResolver resolver, DocumentFile targetFolder) throws IOException {
-        copyDocumentFileToNewOrExistingFile(sourceFile, resolver, targetFolder, Constants.NO_FILE_EXTENSION_MIME_TYPE);
+        BackgroundWorker<Boolean> worker = new BackgroundWorker<>();
+        CustomDialogFactory.CustomDialog progressDialog = getLoadingDialog(context, loadingMessage);
+        progressDialog.setOnCancelListener(dialog -> worker.cancel());
+        ContentResolver resolver = context.getContentResolver();
+        Handler handler = Handler.createAsync(Looper.getMainLooper());
+
+
+        worker.setTask(workerCallback -> {
+            try {
+                workerCallback.onInitialize();
+
+                //region create zip file
+                File zip = File.createTempFile("temp_worldmap", ".zip");
+                try (OutputStream out = new FileOutputStream(zip)) {
+                    ZipOutputStream zipOut = new ZipOutputStream(out);
+                    for (int i = 0; i < files.length; i++) {
+                        File file = files[i];
+                        try (FileInputStream fis = new FileInputStream(file)) {
+                            workerCallback.onProgress((float) i / files.length);
+                            zipOut.putNextEntry(new ZipEntry(file.getName()));
+                            copyStream(fis, zipOut);
+                            zipOut.closeEntry();
+                        }
+                    }
+                    zipOut.close();
+                }
+                //endregion
+
+                DocumentFile worldmapZip = DocumentFile.fromFile(zip);
+                DocumentFile worldmapTarget = targetDirectory.createFile("application/zip", fileName);
+                if (worldmapTarget != null && worldmapTarget.exists()) {
+                    AndroidStorage.copyDocumentFile(worldmapZip, resolver, worldmapTarget);
+                    workerCallback.onComplete(true);
+                } else {
+                    throw new FileNotFoundException("Could not create File");
+                }
+            } catch (NullPointerException e) {
+                if (worker.isCancelled()) {
+                    workerCallback.onFailure(new CancellationException("Cancelled"));
+                } else {
+                    workerCallback.onFailure(e);
+                }
+            } catch (Exception e) {
+                workerCallback.onFailure(e);
+            }
+        });
+
+        worker.setCallback(getDefaultBackgroundWorkerCallback(handler, progressDialog, callback));
+        worker.run();
+
+
+    }
+
+    public static void unzipToDirectory(File zipFile,
+                                        File targetDirectory,
+                                        boolean overwriteNotSkip) throws IOException {
+
+        try (ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile))) {
+            unzipStreamToDirectory(targetDirectory, overwriteNotSkip, zis);
+        }
+
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    public static void unzipDocumentFileToDirectoryAsync(DocumentFile zipFile,
+                                                         Context context,
+                                                         File targetDirectory,
+                                                         boolean overwriteNotSkip,
+                                                         String loadingMessage,
+                                                         Consumer<Boolean> callback) {
+
+        BackgroundWorker<Boolean> worker = new BackgroundWorker<>();
+        CustomDialogFactory.CustomDialog progressDialog = getLoadingDialog(context, loadingMessage);
+        progressDialog.setOnCancelListener(dialog -> worker.cancel());
+        ContentResolver resolver = context.getContentResolver();
+        Handler handler = Handler.createAsync(Looper.getMainLooper());
+
+        worker.setTask(workerCallback -> {
+            try {
+                workerCallback.onInitialize();
+                workerCallback.onProgress(-1);//set dummy progress since we don't know the
+                // progress of the unzip
+                unzipDocumentFileToDirectory(zipFile, resolver, targetDirectory, overwriteNotSkip);
+                workerCallback.onComplete(true);
+            } catch (IOException e) {
+                workerCallback.onFailure(e);
+            }
+        });
+
+        worker.setCallback(getDefaultBackgroundWorkerCallback(handler, progressDialog, callback));
+        worker.run();
+
+    }
+
+    public static void unzipDocumentFileToDirectory(DocumentFile zipFile,
+                                                    ContentResolver resolver,
+                                                    File targetDirectory,
+                                                    boolean overwriteNotSkip) throws IOException {
+        try (ZipInputStream zis = new ZipInputStream(resolver.openInputStream(zipFile.getUri()))) {
+            unzipStreamToDirectory(targetDirectory, overwriteNotSkip, zis);
+        }
+    }
+
+    private static void unzipStreamToDirectory(File targetDirectory,
+                                               boolean overwriteNotSkip,
+                                               ZipInputStream zis) throws IOException {
+        ZipEntry entry;
+        while ((entry = zis.getNextEntry()) != null) {
+            File file = new File(targetDirectory, entry.getName());
+
+            if (entry.isDirectory()) {
+                file.mkdirs();
+            } else {
+                file.getParentFile().mkdirs();
+                if (file.exists() && !overwriteNotSkip) {
+                    continue;
+                }
+
+                try (FileOutputStream fos = new FileOutputStream(file)) {
+                    copyStream(zis, fos);
+                }
+            }
+        }
+    }
+
+    public static void copyDocumentFileToNewOrExistingFile(DocumentFile sourceFile,
+                                                           ContentResolver resolver,
+                                                           DocumentFile targetFolder) throws IOException {
+        copyDocumentFileToNewOrExistingFile(sourceFile,
+                                            resolver,
+                                            targetFolder,
+                                            Constants.NO_FILE_EXTENSION_MIME_TYPE);
     }
 
 
-    public static void copyDocumentFileToNewOrExistingFile(DocumentFile sourceFile, ContentResolver resolver, DocumentFile targetFolder, String mimeType) throws IOException {
+    public static void copyDocumentFileToNewOrExistingFile(DocumentFile sourceFile,
+                                                           ContentResolver resolver,
+                                                           DocumentFile targetFolder,
+                                                           String mimeType) throws IOException {
         String fileName = sourceFile.getName();
         DocumentFile file = targetFolder.findFile(fileName);
-        if (file == null)
+        if (file == null) {
             file = targetFolder.createFile(mimeType, fileName);
-        if (file == null)
+        }
+        if (file == null) {
             return;
+        }
 
         AndroidStorage.copyDocumentFile(sourceFile, resolver, file);
     }
 
-    public static void copyDocumentFile(DocumentFile sourceFile, ContentResolver resolver, DocumentFile targetFile) throws IOException {
+    public static void copyDocumentFile(DocumentFile sourceFile,
+                                        ContentResolver resolver,
+                                        DocumentFile targetFile) throws IOException {
         try (OutputStream outputStream = resolver.openOutputStream(targetFile.getUri());
              InputStream inputStream = resolver.openInputStream(sourceFile.getUri())) {
             copyStream(inputStream, outputStream);
         }
     }
 
-
-    /**
-     * Gets the MIME-Type for a file.<p/>
-     * Fallback value is '* / *' (without spaces) <p/>
-     * Mostly copied together from: <a href="https://stackoverflow.com/q/8589645/17292289">StackOverflow</a>
-     */
-    @NonNull
-    public static String getMimeType(ContentResolver resolver, Uri uri) {
-        String type = null;
-        if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
-            type = resolver.getType(uri);
-            return type;
-        }
-
-        final String extension = MimeTypeMap.getFileExtensionFromUrl(uri.getPath());
-        if (extension != null) {
-            type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase());
-        }
-        if (type == null) {
-            type = "*/*"; // fallback type.
-        }
-        return type;
-    }
-
     public static String getUrlForFile(Context context, File worldmap) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             String applicationId = context.getPackageName();
@@ -163,11 +284,9 @@ public final class AndroidStorage {
         }
     }
 
-
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public static Intent getNewOpenDirectoryIntent() {
-        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-        return intent;
+        return new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@@ -179,50 +298,59 @@ public final class AndroidStorage {
         return intent;
     }
 
-    public static void copyDocumentFilesFromToAsync(DocumentFile[] sources, Context context, DocumentFile[] targets, Consumer<Boolean> callback) {
-        if(sources.length != targets.length)
-        {
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public static Intent getNewSelectZipIntent() {
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("application/zip");
+        return intent;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    public static void copyDocumentFilesFromToAsync(DocumentFile[] sources,
+                                                    Context context,
+                                                    DocumentFile[] targets,
+                                                    String loadingMessage,
+                                                    Consumer<Boolean> callback) {
+        if (sources.length != targets.length) {
             throw new IllegalArgumentException("Both arrays, target & source have to have the same size");
         }
 
-        BackgroundWorker worker = new BackgroundWorker();
-        CustomDialogFactory.CustomDialog progressDialog = getLoadingDialog(context);
+        BackgroundWorker<Boolean> worker = new BackgroundWorker<>();
+
+        CustomDialogFactory.CustomDialog progressDialog = getLoadingDialog(context, loadingMessage);
         progressDialog.setOnCancelListener(dialog -> worker.cancel());
+
         ContentResolver resolver = context.getContentResolver();
         Handler handler = Handler.createAsync(Looper.getMainLooper());
 
-        worker.setTask(new BackgroundWorker.worker() {
-            @Override
-            public void doWork(BackgroundWorkerCallback callback) {
-                try {
-                    callback.onInitialize();
-                    for (int i = 0; i < sources.length ; i++) {
-                        if (worker.isCancelled()) {
-                            callback.onFailure(new CancellationException("Cancelled"));
-                            return;
-                        }
-                        DocumentFile source = sources[i];
-                        DocumentFile target = targets[i];
-
-                        if(source == null || target == null)
-                        {
-                            continue;
-                        }
-
-
-                        copyDocumentFile(source, resolver,target);
-                        float progress = i /(float) sources.length;
-                        callback.onProgress(progress);
-                    }
-                    callback.onComplete(true);
-                } catch (NullPointerException e) {
+        worker.setTask(workerCallback -> {
+            try {
+                workerCallback.onInitialize();
+                for (int i = 0; i < sources.length; i++) {
                     if (worker.isCancelled()) {
-                        callback.onFailure(new CancellationException("Cancelled"));
+                        workerCallback.onFailure(new CancellationException("Cancelled"));
                         return;
                     }
-                } catch (Exception e) {
-                    callback.onFailure(e);
+                    DocumentFile source = sources[i];
+                    DocumentFile target = targets[i];
+
+                    if (source == null || target == null) {
+                        continue;
+                    }
+
+                    copyDocumentFile(source, resolver, target);
+                    float progress = i / (float) sources.length;
+                    workerCallback.onProgress(progress);
                 }
+                workerCallback.onComplete(true);
+            } catch (NullPointerException e) {
+                if (worker.isCancelled()) {
+                    workerCallback.onFailure(new CancellationException("Cancelled"));
+                    return;
+                }
+            } catch (Exception e) {
+                workerCallback.onFailure(e);
             }
         });
         worker.setCallback(getDefaultBackgroundWorkerCallback(handler, progressDialog, callback));
@@ -233,9 +361,10 @@ public final class AndroidStorage {
     public static void copyDocumentFilesToDirAsync(DocumentFile[] files,
                                                    Context context,
                                                    DocumentFile targetDirectory,
+                                                   String loadingMessage,
                                                    Consumer<Boolean> callback) {
         BackgroundWorker<Boolean> worker = new BackgroundWorker<>();
-        CustomDialogFactory.CustomDialog progressDialog = getLoadingDialog(context);
+        CustomDialogFactory.CustomDialog progressDialog = getLoadingDialog(context, loadingMessage);
         progressDialog.setOnCancelListener(dialog -> worker.cancel());
         ContentResolver resolver = context.getContentResolver();
         Handler handler = Handler.createAsync(Looper.getMainLooper());
@@ -249,11 +378,12 @@ public final class AndroidStorage {
                         return;
                     }
                     DocumentFile file = files[i];
-                    if(file == null)
+                    if (file == null) {
                         continue;
+                    }
 
                     copyDocumentFileToNewOrExistingFile(file, resolver, targetDirectory);
-                    float progress = i /(float) files.length;
+                    float progress = i / (float) files.length;
                     workerCallback.onProgress(progress);
                 }
                 workerCallback.onComplete(true);
@@ -270,10 +400,11 @@ public final class AndroidStorage {
     }
 
     private static BackgroundWorkerCallback<Boolean> getDefaultBackgroundWorkerCallback(Handler handler,
-                                                                               CustomDialogFactory.CustomDialog progressDialog,
-                                                                               Consumer<Boolean> callback) {
+                                                                                        CustomDialogFactory.CustomDialog progressDialog,
+                                                                                        Consumer<Boolean> callback) {
         return new BackgroundWorkerCallback<Boolean>() {
-            private  int progress = -1;
+            private int progress = -1;
+
             @Override
             public void onInitialize() {
                 handler.post(() -> {
@@ -285,10 +416,17 @@ public final class AndroidStorage {
             public void onProgress(float progress) {
                 handler.post(() -> {
                     int intProgress = (int) (progress * 100);
-                    if(this.progress == intProgress)
+                    if (this.progress == intProgress) {
                         return;
+                    }
 
                     this.progress = intProgress;
+
+                    if (progress == -1) {
+                        CustomDialogFactory.setDesc(progressDialog, null);
+                        return;
+                    }
+
                     CustomDialogFactory.setDesc(progressDialog, intProgress + "%");
                 });
             }
@@ -296,10 +434,7 @@ public final class AndroidStorage {
             @RequiresApi(api = Build.VERSION_CODES.N)
             @Override
             public void onFailure(Exception e) {
-                handler.post(() -> {
-                    progressDialog.dismiss();
-                    callback.accept(false);
-                });
+                this.onComplete(false);
             }
 
             @RequiresApi(api = Build.VERSION_CODES.N)
@@ -307,20 +442,31 @@ public final class AndroidStorage {
             public void onComplete(Boolean result) {
                 handler.post(() -> {
                     progressDialog.dismiss();
-                    callback.accept(true);
+                    callback.accept(result);
                 });
             }
         };
     }
 
     private static CustomDialogFactory.CustomDialog getLoadingDialog(Context context) {
-        return CustomDialogFactory.createDialog(context,
-                context.getResources().getString(R.string.dialog_loading_message),
-                context.getResources().getDrawable(R.drawable.loading_anim),
-                null,
-                null,
-                false,
-                false);
+        return getLoadingDialog(context, null);
+    }
+
+    private static CustomDialogFactory.CustomDialog getLoadingDialog(Context context, String message) {
+        if (message == null) {
+            message = context.getResources().getString(R.string.dialog_loading_message);
+        }
+
+        CustomDialogFactory.CustomDialog dialog = CustomDialogFactory.createDialog(context,
+                                                                                   message,
+                                                                                   context.getResources()
+                                                                                           .getDrawable(R.drawable.loading_anim),
+                                                                                   null,
+                                                                                   null,
+                                                                                   true,
+                                                                                   false);
+        CustomDialogFactory.addCancelButton(dialog, android.R.string.no);
+        return dialog;
     }
 
 }

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/BackgroundWorker.java

@@ -4,14 +4,14 @@ import java.util.concurrent.Executors;
 
 public final class BackgroundWorker<T> {
 	boolean cancelled = false;
-	worker task;
-	BackgroundWorkerCallback callback;
+	worker<T> task;
+	BackgroundWorkerCallback<T> callback;
 
-	public void setTask(worker task) {
+	public void setTask(worker<T> task) {
 		this.task = task;
 	}
 
-	public void setCallback(BackgroundWorkerCallback callback) {
+	public void setCallback(BackgroundWorkerCallback<T> callback) {
 		this.callback = callback;
 	}
 
@@ -20,7 +20,7 @@ public final class BackgroundWorker<T> {
 	}
 
 	interface worker<T> {
-		void doWork(BackgroundWorkerCallback callback);
+		void doWork(BackgroundWorkerCallback<T> callback);
 	}
 
 	interface BackgroundWorkerCallback<T> {

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java

@@ -61,13 +61,9 @@ public final class TraitsInfoView {
 		tv.setText(Integer.toString(attackCost));
 
 		row = (TableRow) group.findViewById(R.id.traitsinfo_attack_chance_row);
-		if (attackChance == 0) {
-			row.setVisibility(View.GONE);
-		} else {
-			row.setVisibility(View.VISIBLE);
-			tv = (TextView) group.findViewById(R.id.traitsinfo_attack_chance);
-			tv.setText(Integer.toString(attackChance));
-		}
+		tv = (TextView) group.findViewById(R.id.traitsinfo_attack_chance);
+		tv.setText(Integer.toString(attackChance));
+
 
 		row = (TableRow) group.findViewById(R.id.traitsinfo_attack_damage_row);
 		if (damagePotential != null && damagePotential.max != 0) {