ohne debug buttons, damit die saves produktiv sind

.gitignore

@@ -1 +0,0 @@
-/AndorsTrail/.idea/workspace.xml

AndorsTrail/.gitignore

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

AndorsTrail/.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>

AndorsTrail/.idea/gradle.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

AndorsTrail/.idea/jarRepositories.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>

AndorsTrail/.idea/misc.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

AndorsTrail/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

AndorsTrail/.idea/workspace.xml

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="fb7bf33b-30cf-40b9-a238-3e2f6f604a8f" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\chris\.android\avd\Nexus_5_API_30.avd]" />
+  <component name="ExternalProjectsData">
+    <projectState path="$PROJECT_DIR$">
+      <ProjectState />
+    </projectState>
+  </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <projects_view>
+          <tree_state>
+            <expand>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="AndorsTrail" type="f1a62948:ProjectNode" />
+              </path>
+            </expand>
+            <select />
+          </tree_state>
+        </projects_view>
+      </state>
+    </system>
+  </component>
+  <component name="GenerateSignedApkSettings">
+    <option name="KEY_STORE_PATH" value="C:\AT\sec\AndorsTrail.keystore" />
+    <option name="KEY_ALIAS" value="andorstrail" />
+    <option name="REMEMBER_PASSWORDS" value="true" />
+    <option name="BUILD_TARGET_KEY" value="apk" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="ProjectId" id="2FG0LqADbxm6Q1t3yQ9BlX5APzJ" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="ApkExportedModule" value="AndorsTrail.app" />
+    <property name="ExportApk.ApkPath" value="C:\AT\AndorsTrailRelease\andors-trail\AndorsTrail\app" />
+    <property name="ExportApk.BuildVariants" value="release" />
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="RunOnceActivity.cidr.known.project.marker" value="true" />
+    <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
+    <property name="cidr.known.project.marker" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../sec/AndorsTrail.keystore" />
+    <property name="settings.editor.selected.configurable" value="device.file.explorer" />
+    <property name="show.inlinked.gradle.project.popup" value="false" />
+  </component>
+  <component name="RunManager">
+    <configuration name="&lt;template&gt;" type="Applet" default="true" selected="false">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    </configuration>
+    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
+      <module name="AndorsTrail.app" />
+      <option name="DEPLOY" value="true" />
+      <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
+      <option name="DEPLOY_AS_INSTANT" value="false" />
+      <option name="ARTIFACT_NAME" value="" />
+      <option name="PM_INSTALL_OPTIONS" value="" />
+      <option name="ALL_USERS" value="false" />
+      <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+      <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
+      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+      <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
+      <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+      <option name="DEBUGGER_TYPE" value="Auto" />
+      <Auto>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      </Auto>
+      <Hybrid>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      </Hybrid>
+      <Java />
+      <Native>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      </Native>
+      <Profilers>
+        <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+        <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+        <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+      </Profilers>
+      <option name="DEEP_LINK" value="" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+      <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+      <method v="2" />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <option name="TEST_OBJECT" value="class" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="TestNG">
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <properties />
+      <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="fb7bf33b-30cf-40b9-a238-3e2f6f604a8f" name="Changes" comment="" />
+      <created>1664103080085</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1664103080085</updated>
+    </task>
+    <servers />
+  </component>
+</project>

AndorsTrail/app/build.gradle

@@ -1,84 +1,23 @@
 apply plugin: 'com.android.application'
 
 android {
-
-    compileSdkVersion 34
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.gpl.rpg.AndorsTrail"
         minSdkVersion 14
-        targetSdkVersion 34
+        targetSdkVersion 30
     }
 
     buildTypes {
         release {
-            manifestPlaceholders icon_name: 'icon', fileproviderPath: 'AndorsTrail'
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
-        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 '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}/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}/build/gen-assets/translation"
-}
-
-task cleanup(type: Delete) {
-    description("Deletes the assets/translation and the res folder from the modules folder")
-    delete "${projectDir}/build/gen-res", "${projectDir}/build/gen-assets/translation"
-}
-
-afterEvaluate {
-    project.tasks.copyRes.dependsOn project.tasks.copyResValuesIn
-
-    mapReleaseSourceSetPaths.dependsOn project.tasks.copyRes
-    generateReleaseResources.dependsOn project.tasks.copyRes
-
-    generateDebugResources.dependsOn project.tasks.copyRes
-    mapDebugSourceSetPaths.dependsOn project.tasks.copyRes
-    mergeDebugResources.dependsOn project.tasks.copyRes
-    extractDeepLinksDebug.dependsOn project.tasks.copyRes
-    mergeReleaseResources.dependsOn project.tasks.copyRes
-    extractDeepLinksRelease.dependsOn project.tasks.copyRes
-
-    generateDebugResources.dependsOn project.tasks.copyTranslation
-    mapDebugSourceSetPaths.dependsOn project.tasks.copyTranslation
-    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
+    implementation 'com.android.support:support-v4:28.0.0'
 }

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -3,11 +3,15 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="78"
-	android:versionName="0.8.12"
+	android:versionCode="66"
+	android:versionName="0.8.2"
 	android:installLocation="auto"
 	>
-
+	<uses-sdk 
+		android:minSdkVersion="4"
+		android:targetSdkVersion="30"
+		/>
+	
 	<supports-screens
 		android:smallScreens="true" 
 		android:normalScreens="true"
@@ -21,9 +25,9 @@
 
 
 	<application 
-		android:name="com.gpl.rpg.AndorsTrail.AndorsTrailApplication"
+		android:name=".AndorsTrailApplication"
 		android:label="@string/app_name" 
-		android:icon="@drawable/${icon_name}"
+		android:icon="@drawable/icon"
 		android:description="@string/app_description"
         android:allowBackup="true"
         android:theme="@style/AndorsTrailTheme_Blue"
@@ -31,40 +35,38 @@
 		android:hasFragileUserData="true"
 		android:preserveLegacyExternalStorage="true"
 		>
-		<activity
-			android:exported="true"
-		    android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
-		    android:clearTaskOnLaunch="true"
-		    >
+		<activity 
+		    android:name=".activity.StartScreenActivity"
+		    android:clearTaskOnLaunch="true">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>
    		<activity 
-			android:name="com.gpl.rpg.AndorsTrail.activity.MainActivity"
+			android:name=".activity.MainActivity"
 			android:label="@string/app_name" 
 			android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
 			/>
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ShopActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.AboutActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadingActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.Preferences" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity" />
+		<activity android:name=".activity.HeroinfoActivity" />
+		<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ShopActivity" />
+		<activity android:name=".activity.AboutActivity" />
+		<activity android:name=".activity.LoadingActivity" />
+		<activity android:name=".activity.Preferences" />
+		<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.DisplayWorldMapActivity" />
 
         <provider
-        android:name="androidx.core.content.FileProvider"
-        android:authorities="${applicationId}.fileprovider"
+        android:name="android.support.v4.content.FileProvider"
+        android:authorities="com.gpl.rpg.AndorsTrail.fileprovider"
         android:grantUriPermissions="true"
         android:exported="false">
         <meta-data

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.12";
+	public static final String CURRENT_VERSION_DISPLAY = "0.8.2";
 	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 : 78;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 66;
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();

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

@@ -2,6 +2,7 @@ package com.gpl.rpg.AndorsTrail;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.preference.PreferenceManager;
 
 public final class AndorsTrailPreferences {
@@ -61,6 +62,8 @@ public final class AndorsTrailPreferences {
 	public boolean showQuickslotsWhenToolboxIsVisible = false;
 	public String language = "default";
 
+	public Uri exportImportFolderPath;
+
 	public int selectedTheme = 0;
 
 	public void read(final Context androidContext) {
@@ -78,7 +81,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", false);
+			dest.highQualityFilters = prefs.getBoolean("high_quality_filters", true);
 			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 androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -46,15 +46,14 @@ import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
 
 public final class Dialogs {
 
-	private static void showDialogAndPause(CustomDialog d, final ControllerContext context) {
+	private static void showDialogAndPause(Dialog d, final ControllerContext context) {
 		showDialogAndPause(d, context, null);
 	}
-	private static void showDialogAndPause(CustomDialog d, final ControllerContext context, final OnDismissListener onDismiss) {
+	private static void showDialogAndPause(Dialog d, final ControllerContext context, final OnDismissListener onDismiss) {
 		context.gameRoundController.pause();
 		CustomDialogFactory.setDismissListener(d, new OnDismissListener() {
 			@Override
@@ -66,6 +65,14 @@ public final class Dialogs {
 		CustomDialogFactory.show(d);
 	}
 
+	public static void showKeyArea(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
+		showConversation(currentActivity, context, phraseID, null);
+	}
+
+	public static void showMapSign(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
+		showConversation(currentActivity, context, phraseID, null);
+	}
+
 	public static void showMapScriptMessage(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
 		showConversation(currentActivity, context, phraseID, null, false);
 	}
@@ -188,7 +195,7 @@ public final class Dialogs {
 		//		itemList.setPadding(20, 0, 20, 20);
 		itemList.setAdapter(new ItemContainerAdapter(mainActivity, world.tileManager, combinedLoot.items, world.model.player));
 
-		final CustomDialog d = CustomDialogFactory.createDialog(mainActivity,
+		final Dialog d = CustomDialogFactory.createDialog(mainActivity, 
 				mainActivity.getResources().getString(title), 
 				mainActivity.getResources().getDrawable(R.drawable.ui_icon_equipment), 
 				msg, 
@@ -242,7 +249,7 @@ public final class Dialogs {
 	}
 
 	public static void showHeroDied(final MainActivity mainActivity, final ControllerContext controllers) {
-		final CustomDialog d = CustomDialogFactory.createDialog(mainActivity,
+		final Dialog d = CustomDialogFactory.createDialog(mainActivity,
 				mainActivity.getResources().getString(R.string.dialog_game_over_title),
 				mainActivity.getResources().getDrawable(R.drawable.ui_icon_combat),
 				mainActivity.getResources().getString(R.string.dialog_game_over_text),
@@ -279,7 +286,7 @@ public final class Dialogs {
 	}
 
 	public static void showConfirmRest(final Activity currentActivity, final ControllerContext controllerContext, final MapObject area) {
-		final CustomDialog d = CustomDialogFactory.createDialog(currentActivity,
+		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
 				currentActivity.getResources().getString(R.string.dialog_rest_title), 
 				null, 
 				currentActivity.getResources().getString(R.string.dialog_rest_confirm_message), 
@@ -303,7 +310,7 @@ public final class Dialogs {
 		//		.setMessage(R.string.dialog_rest_message)
 		//		.setNeutralButton(android.R.string.ok, null)
 		//		.create();
-		final CustomDialog d = CustomDialogFactory.createDialog(currentActivity,
+		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
 				currentActivity.getResources().getString(R.string.dialog_rest_title), 
 				null, 
 				currentActivity.getResources().getString(R.string.dialog_rest_message), 
@@ -329,7 +336,7 @@ public final class Dialogs {
 			text += currentActivity.getResources().getString(R.string.dialog_newversion_permission_information);
 		}
 
-		final CustomDialog d = CustomDialogFactory.createDialog(currentActivity,
+		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
 				currentActivity.getResources().getString(R.string.dialog_newversion_title), 
 				null, 
 				text,
@@ -364,7 +371,7 @@ public final class Dialogs {
 		}
 
 		if (!world.model.statistics.hasUnlimitedSaves()) {
-			final CustomDialog d = CustomDialogFactory.createDialog(mainActivity,
+			final Dialog d = CustomDialogFactory.createDialog(mainActivity,
 					mainActivity.getResources().getString(R.string.menu_save_switch_character_title),
 					null,
 					mainActivity.getResources().getString(R.string.menu_save_switch_character),
@@ -453,7 +460,7 @@ public final class Dialogs {
 		itemList.setAdapter(new ArrayAdapter<String>(context, R.layout.combatlog_row, android.R.id.text1, combatLogMessages));
 		view = itemList;
 
-		final CustomDialog d = CustomDialogFactory.createDialog(context,
+		final Dialog d = CustomDialogFactory.createDialog(context, 
 				context.getResources().getString(R.string.combat_log_title), 
 				context.getResources().getDrawable(R.drawable.ui_icon_combat), 
 				null, 

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 androidx.fragment.app.FragmentActivity;
+import android.support.v4.app.FragmentActivity;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 

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

@@ -23,7 +23,6 @@ import com.gpl.rpg.AndorsTrail.controller.ItemController;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 /**
  * @author ejwessel
@@ -207,7 +206,7 @@ public final class BulkSelectionInterface extends AndorsTrailBaseActivity implem
 //									})
 //						.setNegativeButton(android.R.string.no, null)
 //						.show();
-					final CustomDialog d = CustomDialogFactory.createDialog(v.getContext(),
+					final Dialog d = CustomDialogFactory.createDialog(v.getContext(),
 							v.getContext().getResources().getString(R.string.bulkselection_sell_confirmation_title),
 							v.getContext().getResources().getDrawable(android.R.drawable.ic_dialog_info),
 							message,

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

@@ -31,7 +31,6 @@ public final class DebugInterface {
 	private DebugButton[] buttons;
 	private List<DebugButton> tpButtons  = new ArrayList<DebugButton>();
 	private List<DebugButton> tpButtons2 = new ArrayList<DebugButton>();
-	private List<DebugButton> tpButtons3 = new ArrayList<DebugButton>();
 
 	public DebugInterface(ControllerContext controllers, WorldContext world, MainActivity mainActivity) {
 		this.controllerContext = controllers;
@@ -59,9 +58,6 @@ public final class DebugInterface {
 						for (DebugButton b : tpButtons2) {
 							b.b.setVisibility(View.GONE);
 						}
-						for (DebugButton b : tpButtons3) {
-							b.b.setVisibility(View.GONE);
-						}
 					}
 				})
 				,new DebugButton("teleport", new OnClickListener() {
@@ -152,12 +148,6 @@ public final class DebugInterface {
 			public void onClick(View arg0) {
 				showToast(mainActivity, "DEBUG: map=" + world.model.currentMaps.map.name , Toast.LENGTH_SHORT);
 			}
-		})
-				,new DebugButton("tim", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				world.model.worldData.tickWorldTime(10);
-			}
 		})
 		}));
 
@@ -188,7 +178,7 @@ public final class DebugInterface {
 				,new DebugButton("cr", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crossroads", "middle", 0, 0);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "houseatcrossroads4", "down", 0, 0);
 			}
 		})
 				,new DebugButton("lf", new OnClickListener() {
@@ -252,8 +242,11 @@ public final class DebugInterface {
 				new DebugButton("teleport", new OnClickListener() {
 					@Override
 					public void onClick(View arg0) {
-						for (DebugButton tpButton : tpButtons3) {
-							tpButton.b.setVisibility(View.VISIBLE);
+						for (int i = 0; i < buttons.length; i++) {
+							buttons[i].b.setVisibility(View.VISIBLE);
+						}
+						for (DebugButton tpButton : tpButtons) {
+							tpButton.b.setVisibility(View.GONE);
 						}
 						for (DebugButton tpButton : tpButtons2) {
 							tpButton.b.setVisibility(View.GONE);
@@ -284,151 +277,9 @@ 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);
-			}
-		})
-
-				,new DebugButton("la1", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "laerothisland2", "south2", 0, 0);
-			}
-		})
-
-				,new DebugButton("la2", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "island3", "cave", 0, 0);
-			}
-		})
-
-				,new DebugButton("wx", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "wexlow_village", "north", 0, 0);
-			}
-		})
-
-				,new DebugButton("fey", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "guynmart_wood_17", "north", 0, 0);
-			}
-		})
-
-
 		}));
 		buttonList.addAll(tpButtons2);
 
-		tpButtons3.addAll(Arrays.asList(new DebugButton[] {
-				new DebugButton("teleport", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						for (int i = 0; i < buttons.length; i++) {
-							buttons[i].b.setVisibility(View.VISIBLE);
-						}
-						for (DebugButton tpButton : tpButtons) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-						for (DebugButton tpButton : tpButtons2) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-						for (DebugButton tpButton : tpButtons3) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-					}
-				})
-				,new DebugButton("#1", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "swamp3", "north", 0, 0);
-			}
-		})
-
-				,new DebugButton("#2", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "beekeeper1", "south", 0, 0);
-			}
-		})
-
-
-				,new DebugButton("#3", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "guynmart", "west2", 0, 0);
-			}
-		})
-
-				,new DebugButton("#4", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "waterway5", "south", 0, 0);
-			}
-		})
-
-				,new DebugButton("#5", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "island1", "south2", 0, 0);
-			}
-		})
-
-				,new DebugButton("#6", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "laerothmanor1", "down2", 0, 0);
-			}
-		})
-
-				,new DebugButton("#7", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "final_cave1", "up", 0, 0);
-			}
-		})
-
-				,new DebugButton("#8", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "bwmfill3", "north2", 0, 0);
-			}
-		})
-
-				,new DebugButton("#9", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "island2", "down", 0, 0);
-			}
-		})
-
-				,new DebugButton("#10", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "laerothprison3", "south", 2, 0);
-			}
-		})
-
-		}));
-		buttonList.addAll(tpButtons3);
-
 		buttons = buttonList.toArray(new DebugButton[buttonList.size()]);
 		addDebugButtons(buttons);
 
@@ -438,9 +289,6 @@ public final class DebugInterface {
 		for (DebugButton b : tpButtons2) {
 			b.b.setVisibility(View.GONE);
 		}
-		for (DebugButton b : tpButtons3) {
-			b.b.setVisibility(View.GONE);
-		}
 	}
 
 	private void showToast(Context context, String msg, int duration) {

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 androidx.fragment.app.FragmentTabHost;
+import android.support.v4.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

@@ -1,17 +1,16 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
-import java.io.DataInputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 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;
@@ -20,8 +19,8 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.RequiresApi;
-import androidx.documentfile.provider.DocumentFile;
+import android.support.annotation.RequiresApi;
+import android.support.v4.provider.DocumentFile;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -41,7 +40,6 @@ import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
 import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 public final class LoadSaveActivity extends AndorsTrailBaseActivity implements OnClickListener {
     private boolean isLoading = true;
@@ -97,7 +95,9 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         importSaves.setTag(SLOT_NUMBER_IMPORT_SAVEGAMES);
         importWorldmap.setTag(SLOT_NUMBER_IMPORT_WORLDMAP);
 
-        ViewGroup exportImportContainer = (ViewGroup) findViewById(R.id.loadsave_export_import_save_container);
+        ViewGroup exportContainer = (ViewGroup) findViewById(R.id.loadsave_export_save_container);
+        ViewGroup importContainer = (ViewGroup) findViewById(R.id.loadsave_import_save_container);
+        ViewGroup importWorldmapContainer = (ViewGroup) findViewById(R.id.loadsave_import_worldmap_container);
 
 
         addSavegameSlotButtons(slotList, params, Savegames.getUsedSavegameSlots(this));
@@ -108,20 +108,19 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
             createNewSlot.setTag(SLOT_NUMBER_CREATE_NEW_SLOT);
             createNewSlot.setOnClickListener(this);
             newSlotContainer.setVisibility(View.VISIBLE);
-            exportImportContainer.setVisibility(View.GONE);
+            exportContainer.setVisibility(View.GONE);
+            importContainer.setVisibility(View.GONE);
+            importWorldmapContainer.setVisibility(View.GONE);
         } else {
             newSlotContainer.setVisibility(View.GONE);
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 exportSaves.setOnClickListener(this);
                 importSaves.setOnClickListener(this);
                 importWorldmap.setOnClickListener(this);
-                exportImportContainer.setVisibility(View.VISIBLE);
-
-                boolean hasSavegames = !Savegames.getUsedSavegameSlots(this).isEmpty();
-                exportSaves.setEnabled(hasSavegames);
-            } else {
-                exportImportContainer.setVisibility(View.GONE);
+                exportContainer.setVisibility(View.VISIBLE);
+                importContainer.setVisibility(View.VISIBLE);
+                importWorldmapContainer.setVisibility(View.VISIBLE);
             }
         }
     }
@@ -129,18 +128,14 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
     private static final int READ_EXTERNAL_STORAGE_REQUEST = 1;
     private static final int WRITE_EXTERNAL_STORAGE_REQUEST = 2;
 
+    @TargetApi(23)
     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);
             }
         }
     }
@@ -154,15 +149,11 @@ 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);
@@ -186,76 +177,41 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
     }
 
-    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();
+            List<Integer> usedSlots = Savegames.getUsedSavegameSlots(this);
+            if (usedSlots.isEmpty())
+                slot = SLOT_NUMBER_FIRST_SLOT;
+            else slot = Collections.max(usedSlots) + 1;
         } 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) {
-                i.putExtra("import_worldmap", true);
-            }
-            if (slot == SLOT_NUMBER_IMPORT_SAVEGAMES) {
-                i.putExtra("import_savegames", true);
-            }
-            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);
-        }
+        setResult(Activity.RESULT_OK, i);
         LoadSaveActivity.this.finish();
     }
 
-    private int getFirstFreeSlot() {
-        int slot;
-        List<Integer> usedSlots = Savegames.getUsedSavegameSlots(this);
-        if (usedSlots.isEmpty()) {
-            slot = SLOT_NUMBER_FIRST_SLOT;
-        } 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) {
@@ -264,14 +220,10 @@ 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);
     }
@@ -280,7 +232,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.P) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             switch (slot) {
                 case SLOT_NUMBER_IMPORT_WORLDMAP:
                     clickImportWorldmap();
@@ -294,9 +246,8 @@ 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);
             }
@@ -310,7 +261,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);
         }
@@ -318,11 +269,8 @@ 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 Dialog 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;
         }
@@ -331,32 +279,27 @@ 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);
+        File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
+        DocumentFile source = DocumentFile.fromFile(storageDir);
         DocumentFile target = DocumentFile.fromTreeUri(context, uri);
         if (target == null) {
             return;
         }
 
-        File[] files = storageDir.listFiles();
-        if (files == null) {
-            showErrorExportingSaveGamesUnknown();
-            return;
-        }
+        DocumentFile[] files = source.listFiles();
 
         boolean hasExistingFiles = false;
-        for (File file : files) {
+        for (DocumentFile file :
+                files) {
             String fileName = file.getName();
+            if (fileName == null)
+                continue;
 
             DocumentFile existingFile = target.findFile(fileName);
             if (existingFile != null) {
@@ -368,70 +311,52 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         if (hasExistingFiles) {
             showConfirmOverwriteByExportQuestion(resolver, target, files);
         } else {
-            exportSaveGamesFolderContentToFolder(target, files);
+            exportSaveGamesFolderContentToFolder(resolver, target, files);
         }
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void exportSaveGamesFolderContentToFolder(DocumentFile target, File[] files) {
-        DocumentFile[] sourceFiles = new DocumentFile[files.length];
+    private void exportSaveGamesFolderContentToFolder(ContentResolver resolver, DocumentFile target, DocumentFile[] files) {
+        for (DocumentFile file : files) {
+            String fileName = file.getName();
+            DocumentFile existingFile = target.findFile(fileName);
+            boolean hasExistingFile = existingFile != null && existingFile.exists();
 
-        File[] worldmapFiles = null;
-
-        for (int i = 0; i < files.length; i++) {
-            File file = files[i];
             if (file.isFile()) {
-                sourceFiles[i] = DocumentFile.fromFile(file);
-            } else if (file.isDirectory() && Objects.equals(file.getName(),
-                                                            Constants.FILENAME_WORLDMAP_DIRECTORY)) {
-                worldmapFiles = file.listFiles();
+                try {
+                    if (hasExistingFile)
+                        existingFile.delete();
+
+
+                    AndroidStorage.copyDocumentFileToNewOrExistingFile(file, resolver, target);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            } else if (file.isDirectory()) {
+                DocumentFile targetWorlmap = existingFile;
+                //if the folder exists already, put the files in the existing folder. (should not happen because of check earlier)
+                if (!hasExistingFile)
+                    //create a new folder for the worldmap-files
+                    targetWorlmap = target.createDirectory(Constants.FILENAME_WORLDMAP_DIRECTORY);
+
+                if (targetWorlmap == null)//Unable to create worldmap folder for some reason
+                    continue;
+
+                DocumentFile[] worldmapFiles = file.listFiles();
+                for (DocumentFile f : worldmapFiles) {
+                    try {
+                        AndroidStorage.copyDocumentFileToNewOrExistingFile(f, resolver, targetWorlmap);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
             }
         }
-        Context context = this;
-        File[] finalWorldmapFiles = worldmapFiles;
-        CopyFilesToExternalFolder(target, sourceFiles, context, finalWorldmapFiles);
 
+        completeLoadSaveActivity(SLOT_NUMBER_EXPORT_SAVEGAMES);
     }
 
-    @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.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)
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
     private void importSaveGames(Intent data) {
         Uri uri = data.getData();
         ClipData uris = data.getClipData();
@@ -442,8 +367,7 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
 
         Context context = getApplicationContext();
-        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this)
-                .getContentResolver();
+        ContentResolver resolver = context.getContentResolver();
 
         File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
         DocumentFile appSavegameFolder = DocumentFile.fromFile(storageDir);
@@ -452,18 +376,13 @@ 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.P)
-    private void importSaveGamesFromUris(Context context,
-                                         ContentResolver resolver,
-                                         DocumentFile appSavegameFolder,
-                                         List<Uri> uriList) {
+    private void importSaveGamesFromUris(Context context, ContentResolver resolver, DocumentFile appSavegameFolder, List<Uri> uriList) {
         int count = uriList.size();
 
         ArrayList<DocumentFile> alreadyExistingFiles = new ArrayList<>();
@@ -473,11 +392,10 @@ 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) {
@@ -487,51 +405,24 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
     }
 
-    @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];
-
-        boolean saveAsNew = false;
-        for (int i = 0; i < size; i++) {
-            DocumentFile file = saveFiles.get(i);
-            if (file == null) {//null is value a marker that the next should be saved as new
-                saveAsNew = true;
-                continue;
-            }
-
+    private void importSaveGames(ContentResolver resolver, DocumentFile appSavegameFolder, List<DocumentFile> saveFiles) {
+        for (DocumentFile file : saveFiles) {
             int slot = getSlotFromSavegameFileName(file.getName());
-            if (slot == -1) {
-                //invalid file name
-                continue;
-            }
-
-            if (saveAsNew) {
-                slot = getFirstFreeSlot();
-                saveAsNew = false;
-            }
-
-            String targetName = Savegames.getSlotFileName(slot);
-            sources[i] = file;
-            targets[i] = getOrCreateDocumentFile(appSavegameFolder, targetName);
+            importSaveGameFile(resolver, appSavegameFolder, file, slot);
         }
+    }
 
-        AndroidStorage.copyDocumentFilesFromToAsync(sources,
-                                                    this,
-                                                    targets,
-                                                    getString(R.string.loadsave_importing_savegames),
-                                                    (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);
+        }
     }
 
     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();
@@ -539,6 +430,7 @@ 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());
@@ -548,110 +440,116 @@ 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;
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
     private void importWorldmap(Intent data) {
         Uri uri = data.getData();
 
-        Context context = AndorsTrailApplication.getApplicationFromActivity(this).getApplicationContext();
+        Context context = getApplicationContext();
+        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this).getContentResolver();
 
-        DocumentFile chosenZip = DocumentFile.fromSingleUri(context, uri);
-        if (chosenZip == null || !chosenZip.isFile()) {
-            showErrorImportingWorldmapWrongDirectory();
-            return;
-        }
-        String chosenZipName = chosenZip.getName();
-        if (!chosenZipName.startsWith(Constants.FILENAME_WORLDMAP_DIRECTORY)) {
-            showErrorImportingWorldmapWrongDirectory();
-            return;
-        }
-
-        File ownWorldmapFolder = getOwnWorldmapFolder(context);
-
-
-        AndroidStorage.unzipDocumentFileToDirectoryAsync(chosenZip,
-                                                         this,
-                                                         ownWorldmapFolder,
-                                                         false,
-                                                         getString(R.string.loadsave_importing_worldmap),
-                                                         (success) -> completeLoadSaveActivity(
-                                                                 SLOT_NUMBER_IMPORT_WORLDMAP,
-                                                                 success));
-    }
-
-    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;
+        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()) {
+            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;
+        }
+
+        DocumentFile[] files = chosenFolder.listFiles();
+        for (DocumentFile file : files) {
+            if (file.isFile()) {
+                try {
+                    AndroidStorage.copyDocumentFileToNewOrExistingFile(file, resolver, ownWorldmapFolder);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
         }
-        if (ownWorldmapFolder == null) {
-            ownWorldmapFolder = new File(storageDir, Constants.FILENAME_WORLDMAP_DIRECTORY);
-            ownWorldmapFolder.mkdir();
-        }
-        return ownWorldmapFolder;
+
+        completeLoadSaveActivity(SLOT_NUMBER_IMPORT_WORLDMAP);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private void clickExportSaveGames() {
-        showStartExportInfo(view -> startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(),
-                                                           -SLOT_NUMBER_EXPORT_SAVEGAMES));
+        startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(), -SLOT_NUMBER_EXPORT_SAVEGAMES);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private void clickImportSaveGames() {
-        showStartImportSavesInfo(view -> startActivityForResult(AndroidStorage.getNewSelectMultipleSavegameFilesIntent(),
-                                                                -SLOT_NUMBER_IMPORT_SAVEGAMES));
+        startActivityForResult(AndroidStorage.getNewSelectMultipleSavegameFilesIntent(), -SLOT_NUMBER_IMPORT_SAVEGAMES);
+
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private void clickImportWorldmap() {
-        showStartImportWorldmapInfo(view -> startActivityForResult(AndroidStorage.getNewSelectZipIntent(),
-                                                                   -SLOT_NUMBER_IMPORT_WORLDMAP));
+        startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(), -SLOT_NUMBER_IMPORT_WORLDMAP);
 
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    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);
+    private void showConfirmOverwriteByExportQuestion(ContentResolver resolver, DocumentFile targetFolder, DocumentFile[] files) {
+        final Dialog 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);
 
-        CustomDialogFactory.addButton(d,
-                                      android.R.string.yes,
-                                      v -> exportSaveGamesFolderContentToFolder(targetFolder, files));
+        CustomDialogFactory.addButton(d, android.R.string.yes, v -> exportSaveGamesFolderContentToFolder(resolver, targetFolder, files));
         CustomDialogFactory.addDismissButton(d, android.R.string.no);
 
         CustomDialogFactory.show(d);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
     private void showConfirmOverwriteByImportQuestion(ContentResolver resolver,
                                                       DocumentFile appSavegameFolder,
                                                       List<DocumentFile> alreadyExistingFiles,
                                                       List<DocumentFile> newFiles) {
         final String title = getString(R.string.loadsave_import_overwrite_confirmation_title);
-        String message = getString(R.string.loadsave_import_file_exists_question);
+        String message = getString(R.string.loadsave_import_overwrite_confirmation);
 
         StringBuilder sb = new StringBuilder();
         sb.append('\n');
@@ -659,96 +557,48 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
         Context context = AndorsTrailApplication.getApplicationFromActivity(this).getApplicationContext();
 
-        ArrayList<CustomDialog> dialogs = new ArrayList<>(amount);
-
-        for (int i = 0; i < amount; i++) {
+        for (int i = 0; i < amount && i < 3; i++) {
             DocumentFile alreadyExistingFile = alreadyExistingFiles.get(i);
-            int slot = getSlotFromSavegameFileName(alreadyExistingFile.getName());
-            FileHeader existingFileHeader = Savegames.quickload(context, slot);
-            FileHeader importedFileHeader = null;
-            try (InputStream stream = resolver.openInputStream(alreadyExistingFile.getUri());
-                 DataInputStream dataStream = new DataInputStream(stream)) {
-                importedFileHeader = new FileHeader(dataStream, true);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-                continue;
-            } catch (IOException e) {
-                e.printStackTrace();
-                continue;
-            }
+            String alreadyExistingFileName = alreadyExistingFile.getName();
+            FileHeader fileHeader = Savegames.quickload(context, getSlotFromSavegameFileName(alreadyExistingFileName));
+            sb.append('\n');
+            String fileHeaderDesription = "";
+            if (fileHeader != null)
+                fileHeaderDesription = fileHeader.describe();
 
-            StringBuilder messageSb = new StringBuilder();
-            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);
-
-            CustomDialogFactory.addButton(dialog, R.string.loadsave_import_option_keep_existing, v -> {
-                //do nothing
-                GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-            });
-
-            CustomDialogFactory.addButton(dialog, R.string.loadsave_import_option_keep_imported, v -> {
-                newFiles.add(alreadyExistingFile);
-                GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-            });
-
-            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(alreadyExistingFile);
-                GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-            });
-
-            CustomDialogFactory.addCancelButton(dialog, android.R.string.cancel);
-            CustomDialogFactory.setCancelListener(dialog, v -> {
-                completeLoadSaveActivity(SLOT_NUMBER_IMPORT_SAVEGAMES, false);
-            });
-
-            dialogs.add(dialog);
+            sb.append(getString(R.string.loadsave_import_overwrite_confirmation_file_pattern, alreadyExistingFileName, fileHeaderDesription));
+//            sb.append(alreadyExistingFile.getName());
         }
+        if (amount > 3) {
+            sb.append("\n...");
+        }
+        message = message + sb;
+        final Dialog d = CustomDialogFactory.createDialog(this,
+                title,
+                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                message,
+                null,
+                true);
 
-        GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-    }
-
-    @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 {
+        CustomDialogFactory.addButton(d, android.R.string.yes, v -> newFiles.addAll(alreadyExistingFiles));
+        CustomDialogFactory.addDismissButton(d, android.R.string.no);
+        CustomDialogFactory.setDismissListener(d, dialog -> {
             importSaveGames(resolver, appSavegameFolder, newFiles);
-        }
+            completeLoadSaveActivity(SLOT_NUMBER_IMPORT_SAVEGAMES);
+        });
+        CustomDialogFactory.show(d);
     }
 
     @Override
     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) {
+//        Uri uri = data.getData();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             switch (-requestCode) {
                 case SLOT_NUMBER_EXPORT_SAVEGAMES:
                     exportSaveGames(data);
@@ -781,90 +631,48 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
     //region show Dialogs
 
-    //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);
-    }
-
-    @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));
+        final Dialog d = CustomDialogFactory.createErrorDialog(this,
+                getString(R.string.loadsave_import_worldmap_unsuccessfull),
+                getString(R.string.loadsave_import_worldmap_unsuccessfull_wrong_directory));
         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));
+    private void showErrorImportingSaveGameUnknown() {
+        final Dialog d = CustomDialogFactory.createErrorDialog(this,
+                getString(R.string.loadsave_import_save_unsuccessfull),
+                getString(R.string.loadsave_import_save_unsuccessfull_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));
+        final Dialog d = CustomDialogFactory.createErrorDialog(this,
+                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);
+        final Dialog 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);
         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);
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                title,
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                                                                message,
-                                                                null,
-                                                                true);
+    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 Dialog d = CustomDialogFactory.createDialog(this,
+                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/LoadingActivity.java

@@ -20,12 +20,11 @@ import com.gpl.rpg.AndorsTrail.savegames.Savegames;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 public final class LoadingActivity extends AndorsTrailBaseActivity implements OnResourcesLoadedListener, OnSceneLoadedListener {
 
 	private WorldSetup setup;
-	private CustomDialog progressDialog;
+	private Dialog progressDialog;
 	private CloudsAnimatorView clouds_back, clouds_mid, clouds_front;
 	boolean loaded = false;
 
@@ -166,7 +165,7 @@ public final class LoadingActivity extends AndorsTrailBaseActivity implements On
 	}
 
 	private void showLoadingFailedDialog(int messageResourceID) {
-		final CustomDialog d = CustomDialogFactory.createDialog(this, getResources().getString(R.string.dialog_loading_failed_title), null, getResources().getString(messageResourceID), null, true);
+		final Dialog d = CustomDialogFactory.createDialog(this, getResources().getString(R.string.dialog_loading_failed_title), null, getResources().getString(messageResourceID), null, true);
 		CustomDialogFactory.addDismissButton(d, android.R.string.ok);
 		CustomDialogFactory.setDismissListener(d, new OnDismissListener() {
 			@Override

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

@@ -43,7 +43,6 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CombatView;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 import com.gpl.rpg.AndorsTrail.view.DisplayActiveActorConditionIcons;
 import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
 import com.gpl.rpg.AndorsTrail.view.MainView;
@@ -248,7 +247,7 @@ public final class MainActivity
 					final ItemContainerAdapter inventoryListAdapter = new QuickslotsItemContainerAdapter(lv.getContext(), world.tileManager, world.model.player.inventory.usableItems(), world.model.player, wornTiles);
 					lv.setAdapter(inventoryListAdapter);
 
-					final CustomDialog d = CustomDialogFactory.createDialog(v.getContext(),
+					final Dialog d = CustomDialogFactory.createDialog(v.getContext(), 
 							v.getResources().getString(R.string.inventory_assign), 
 							v.getResources().getDrawable(R.drawable.ui_icon_equipment), 
 							v.getResources().getString(R.string.inventory_selectitem), view, false);
@@ -397,10 +396,12 @@ public final class MainActivity
 
 	@Override
 	public void onPlayerSteppedOnMapSignArea(MapObject area) {
+		Dialogs.showMapSign(this, controllers, area.id);
 	}
 
 	@Override
 	public void onPlayerSteppedOnKeyArea(MapObject area) {
+		Dialogs.showKeyArea(this, controllers, area.id);
 	}
 
 	@Override

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

@@ -1,7 +1,14 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 
@@ -32,5 +39,7 @@ public final class Preferences extends PreferenceActivity {
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		app.setLocale(this);
 	}
+
+
 }
 

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 androidx.fragment.app.FragmentTabHost;
+import android.support.v4.app.FragmentTabHost;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;

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

@@ -196,7 +196,7 @@ public final class SkillInfoActivity extends AndorsTrailBaseActivity {
 		case armorProficiencyShield: return res.getString(R.string.skill_longdescription_armor_prof_shield, SkillCollection.PER_SKILLPOINT_INCREASE_SHIELD_PROF_DR);
 		case armorProficiencyUnarmored: return res.getString(R.string.skill_longdescription_armor_prof_unarmored, SkillCollection.PER_SKILLPOINT_INCREASE_UNARMORED_BC);
 		case armorProficiencyLight: return res.getString(R.string.skill_longdescription_armor_prof_light, SkillCollection.PER_SKILLPOINT_INCREASE_LIGHT_ARMOR_BC_PERCENT);
-		case armorProficiencyHeavy: return res.getString(R.string.skill_longdescription_armor_prof_heavy, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_BC_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_MOVECOST_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_ATKCOST_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_USECOST_PERCENT);
+		case armorProficiencyHeavy: return res.getString(R.string.skill_longdescription_armor_prof_heavy, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_BC_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_MOVECOST_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_ATKCOST_PERCENT);
 		case fightstyleDualWield: return res.getString(R.string.skill_longdescription_fightstyle_dualwield, SkillCollection.DUALWIELD_EFFICIENCY_LEVEL0, SkillCollection.DUALWIELD_EFFICIENCY_LEVEL1, SkillCollection.DUALWIELD_LEVEL1_OFFHAND_AP_COST_PERCENT, SkillCollection.DUALWIELD_EFFICIENCY_LEVEL2);
 		case fightstyle2hand: return res.getString(R.string.skill_longdescription_fightstyle_2hand, SkillCollection.PER_SKILLPOINT_INCREASE_FIGHTSTYLE_2HAND_DMG_PERCENT);
 		case fightstyleWeaponShield: return res.getString(R.string.skill_longdescription_fightstyle_weapon_shield, SkillCollection.PER_SKILLPOINT_INCREASE_FIGHTSTYLE_WEAPON_AC_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_FIGHTSTYLE_SHIELD_BC_PERCENT);

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

@@ -11,7 +11,6 @@ import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -21,8 +20,8 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager.OnBackStackChangedListener;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager.OnBackStackChangedListener;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewTreeObserver;
@@ -115,7 +114,7 @@ public final class StartScreenActivity extends AndorsTrailBaseFragmentActivity i
 	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
 		if (grantResults.length > 0 && grantResults[0] != PackageManager.PERMISSION_GRANTED) {
 
-			final CustomDialog d = CustomDialogFactory.createDialog(this,
+			final Dialog d = CustomDialogFactory.createDialog(this,
 					getResources().getString(R.string.dialog_permission_information_title),
 					getResources().getDrawable(android.R.drawable.ic_dialog_info),
 					getResources().getString(R.string.dialog_permission_information),

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 androidx.fragment.app.Fragment;
+import android.support.v4.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 androidx.fragment.app.Fragment;
+import android.support.v4.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 androidx.fragment.app.Fragment;
+import android.support.v4.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 androidx.fragment.app.Fragment;
+import android.support.v4.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 androidx.fragment.app.Fragment;
+import android.support.v4.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 androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -28,8 +28,10 @@ import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.WorldSetup;
 import com.gpl.rpg.AndorsTrail.activity.AboutActivity;
+import com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity;
 import com.gpl.rpg.AndorsTrail.activity.LoadingActivity;
 import com.gpl.rpg.AndorsTrail.activity.Preferences;
+import com.gpl.rpg.AndorsTrail.activity.StartScreenActivity;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.savegames.Savegames;
@@ -38,17 +40,20 @@ import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
 import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 public class StartScreenActivity_MainMenu extends Fragment {
 
     private static final int INTENTREQUEST_PREFERENCES = 7;
     public static final int INTENTREQUEST_LOADGAME = 9;
+    public static final int INTENTREQUEST_EXPORT_SAVE = 11;
+    public static final int INTENTREQUEST_IMPORT_SAVE = 13;
 
     private boolean hasExistingGame = false;
     private Button startscreen_continue;
     private Button startscreen_newgame;
     private Button startscreen_load;
+    private Button startscreen_import;
+    private Button startscreen_export;
     private ViewGroup save_preview_holder;
     private ImageView save_preview_hero_icon;
     private TextView save_preview_hero_desc;
@@ -60,224 +65,231 @@ public class StartScreenActivity_MainMenu extends Fragment {
         super.onCreateView(inflater, container, savedInstanceState);
 
 
-		if (container != null) {
-			container.removeAllViews();
-		}
-		
-		View root = inflater.inflate(R.layout.startscreen_mainmenu, container, false);
+        if (container != null) {
+            container.removeAllViews();
+        }
 
-		save_preview_holder = (ViewGroup) root.findViewById(R.id.save_preview_holder);
-		save_preview_hero_icon = (ImageView) root.findViewById(R.id.save_preview_hero_icon);
-		save_preview_hero_desc = (TextView) root.findViewById(R.id.save_preview_hero_desc);
+        View root = inflater.inflate(R.layout.startscreen_mainmenu, container, false);
+
+        save_preview_holder = (ViewGroup) root.findViewById(R.id.save_preview_holder);
+        save_preview_hero_icon = (ImageView) root.findViewById(R.id.save_preview_hero_icon);
+        save_preview_hero_desc = (TextView) root.findViewById(R.id.save_preview_hero_desc);
 
 
-		startscreen_continue = (Button) root.findViewById(R.id.startscreen_continue);
-		startscreen_continue.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				continueGame(false, Savegames.SLOT_QUICKSAVE, null);
-			}
-		});
+        startscreen_continue = (Button) root.findViewById(R.id.startscreen_continue);
+        startscreen_continue.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View arg0) {
+                continueGame(false, Savegames.SLOT_QUICKSAVE, null);
+            }
+        });
 
-		startscreen_newgame = (Button) root.findViewById(R.id.startscreen_newgame);
-		startscreen_newgame.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				if (hasExistingGame) {
-					comfirmNewGame();
-				} else {
-					createNewGame();
-				}
-			}
-		});
+        startscreen_newgame = (Button) root.findViewById(R.id.startscreen_newgame);
+        startscreen_newgame.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View arg0) {
+                if (hasExistingGame) {
+                    comfirmNewGame();
+                } else {
+                    createNewGame();
+                }
+            }
+        });
 
-		Button b = (Button) root.findViewById(R.id.startscreen_about);
-		b.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				startActivity(new Intent(getActivity(), AboutActivity.class));
-			}
-		});
+        Button b = (Button) root.findViewById(R.id.startscreen_about);
+        b.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View arg0) {
+                startActivity(new Intent(getActivity(), AboutActivity.class));
+            }
+        });
 
-		b = (Button) root.findViewById(R.id.startscreen_preferences);
-		b.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				Intent intent = new Intent(getActivity(), Preferences.class);
-				StartScreenActivity_MainMenu.this.startActivityForResult(intent, INTENTREQUEST_PREFERENCES);
-			}
-		});
+        b = (Button) root.findViewById(R.id.startscreen_preferences);
+        b.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View arg0) {
+                Intent intent = new Intent(getActivity(), Preferences.class);
+                StartScreenActivity_MainMenu.this.startActivityForResult(intent, INTENTREQUEST_PREFERENCES);
+            }
+        });
 
-		startscreen_load = (Button) root.findViewById(R.id.startscreen_load);
-		startscreen_load.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
-				if (hasExistingGame && app != null && app.getWorld() != null && app.getWorld().model != null
-						&& app.getWorld().model.statistics != null && !app.getWorld().model.statistics.hasUnlimitedSaves()) {
-					final CustomDialog d = CustomDialogFactory.createDialog(getActivity(),
-							getString(R.string.startscreen_load_game),
-							getResources().getDrawable(android.R.drawable.ic_delete),
-							getString(R.string.startscreen_load_game_confirm),
-							null,
-							true);
-					CustomDialogFactory.addButton(d, android.R.string.ok, new View.OnClickListener() {
-						@Override
-						public void onClick(View v) {
-							Dialogs.showLoad(StartScreenActivity_MainMenu.this);
-						}
-					});
-					CustomDialogFactory.addDismissButton(d, android.R.string.cancel);
-					CustomDialogFactory.show(d);
+        startscreen_load = (Button) root.findViewById(R.id.startscreen_load);
+        startscreen_load.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View arg0) {
+                AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
+                if (hasExistingGame && app != null && app.getWorld() != null && app.getWorld().model != null
+                        && app.getWorld().model.statistics != null && !app.getWorld().model.statistics.hasUnlimitedSaves()) {
+                    final Dialog d = CustomDialogFactory.createDialog(getActivity(),
+                            getString(R.string.startscreen_load_game),
+                            getResources().getDrawable(android.R.drawable.ic_delete),
+                            getString(R.string.startscreen_load_game_confirm),
+                            null,
+                            true);
+                    CustomDialogFactory.addButton(d, android.R.string.ok, new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Dialogs.showLoad(StartScreenActivity_MainMenu.this);
+                        }
+                    });
+                    CustomDialogFactory.addDismissButton(d, android.R.string.cancel);
+                    CustomDialogFactory.show(d);
 
-				} else {
-					Dialogs.showLoad(StartScreenActivity_MainMenu.this);
-				}
-			}
-		});
+                } else {
+                    Dialogs.showLoad(StartScreenActivity_MainMenu.this);
+                }
+            }
+        });
 
+        if (AndorsTrailApplication.DEVELOPMENT_FORCE_STARTNEWGAME) {
+            if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
+                continueGame(true, 0, "Debug player");
+            } else {
+                continueGame(true, 0, "Player");
+            }
+        } else if (AndorsTrailApplication.DEVELOPMENT_FORCE_CONTINUEGAME) {
+            continueGame(false, Savegames.SLOT_QUICKSAVE, null);
+        }
 
-		if (AndorsTrailApplication.DEVELOPMENT_FORCE_STARTNEWGAME) {
-			if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
-				continueGame(true, 0, "Debug player");
-			} else {
-				continueGame(true, 0, "Player");
-			}
-		} else if (AndorsTrailApplication.DEVELOPMENT_FORCE_CONTINUEGAME) {
-			continueGame(false, Savegames.SLOT_QUICKSAVE, null);
-		}
+        // if it is a new version we first fire a welcome screen in onResume
+        // and afterwards check the permissions
+        if (!isNewVersion()) {
+            checkAndRequestPermissions(getActivity());
+            migrateDataOnDemand(getActivity());
+        }
 
-		// if it is a new version we first fire a welcome screen in onResume
-		// and afterwards check the permissions
-		if (!isNewVersion()) {
-			checkAndRequestPermissions(getActivity());
-			migrateDataOnDemand(getActivity());
-		}
+        return root;
+    }
 
-		return root;
-	}
+    @Override
+    public void onResume() {
+        super.onResume();
 
-	@Override
-	public void onResume() {
-		super.onResume();
+        String playerName;
+        String displayInfo = null;
+        int iconID = TileManager.CHAR_HERO;
+        boolean isDead = false;
 
-		String playerName;
-		String displayInfo = null;
-		int iconID = TileManager.CHAR_HERO;
-		boolean isDead = false;
+        FileHeader header = Savegames.quickload(getActivity(), Savegames.SLOT_QUICKSAVE);
+        if (header != null && header.playerName != null) {
+            playerName = header.playerName;
+            displayInfo = header.displayInfo;
+            iconID = header.iconID;
+            isDead = header.isDead;
+        } else {
+            // Before fileversion 14 (v0.6.7), quicksave was stored in Shared preferences
+            SharedPreferences p = getActivity().getSharedPreferences("quicksave", Activity.MODE_PRIVATE);
+            playerName = p.getString("playername", null);
+            if (playerName != null) {
+                displayInfo = "level " + p.getInt("level", -1);
+            }
+        }
+        hasExistingGame = (playerName != null);
+        setButtonState(playerName, displayInfo, iconID, isDead);
 
-		FileHeader header = Savegames.quickload(getActivity(), Savegames.SLOT_QUICKSAVE);
-		if (header != null && header.playerName != null) {
-			playerName = header.playerName;
-			displayInfo = header.displayInfo;
-			iconID = header.iconID;
-			isDead = header.isDead;
-		} else {
-			// Before fileversion 14 (v0.6.7), quicksave was stored in Shared preferences
-			SharedPreferences p = getActivity().getSharedPreferences("quicksave", Activity.MODE_PRIVATE);
-			playerName = p.getString("playername", null);
-			if (playerName != null) {
-				displayInfo = "level " + p.getInt("level", -1);
-			}
-		}
-		hasExistingGame = (playerName != null);
-		setButtonState(playerName, displayInfo, iconID, isDead);
+        if (isNewVersion()) {
+            Dialogs.showNewVersion(getActivity(), new DialogInterface.OnDismissListener() {
+                @Override
+                public void onDismiss(DialogInterface arg0) {
+                    setCurrentVersionForVersionCheck();
+                    checkAndRequestPermissions(getActivity());
+                    migrateDataOnDemand(getActivity());
+                    startscreen_load.setEnabled(true);
+                }
+            });
+        }
 
-		if (isNewVersion()) {
-			Dialogs.showNewVersion(getActivity(), new DialogInterface.OnDismissListener() {
-				@Override
-				public void onDismiss(DialogInterface arg0) {
-					setCurrentVersionForVersionCheck();
-					checkAndRequestPermissions(getActivity());
-					migrateDataOnDemand(getActivity());
-				}
-			});
-		}
+        startscreen_load.setEnabled(true);
+    }
 
-	}
+    @TargetApi(29)
+    public void migrateDataOnDemand(final Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+                if (AndroidStorage.shouldMigrateToInternalStorage(activity.getApplicationContext())) {
+                    final Dialog d = CustomDialogFactory.createDialog(activity,
+                            getString(R.string.startscreen_migration_title),
+                            activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                            getString(R.string.startscreen_migration_text),
+                            null,
+                            true);
+                    CustomDialogFactory.addDismissButton(d, android.R.string.ok);
+                    d.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                        @Override
+                        public void onDismiss(DialogInterface arg0) {
+                            startscreen_load.setEnabled(true);
+                        }
+                    });
+                    CustomDialogFactory.show(d);
+                    if (!AndroidStorage.migrateToInternalStorage(activity.getApplicationContext())) {
+                        final Dialog errorDlg = CustomDialogFactory.createDialog(activity,
+                                getString(R.string.startscreen_migration_title),
+                                activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                                getString(R.string.startscreen_migration_failure),
+                                null,
+                                true);
+                        CustomDialogFactory.addDismissButton(errorDlg, android.R.string.ok);
+                        d.cancel();
+                        CustomDialogFactory.show(errorDlg);
+                    }
+                } else {
+                    L.log("INFO: No external files or destination folder ist not empty. No data migration.");
+                }
+            } else {
+                L.log("INFO: No read permission on external folder. No data migration.");
+            }
+        }
+    }
 
-	@TargetApi(29)
-	public void migrateDataOnDemand(final Activity activity) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
-				if (AndroidStorage.shouldMigrateToInternalStorage(activity.getApplicationContext())) {
-					final CustomDialog d = CustomDialogFactory.createDialog(activity,
-							getString(R.string.startscreen_migration_title),
-							activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-							getString(R.string.startscreen_migration_text),
-							null,
-							true);
-					CustomDialogFactory.addDismissButton(d, android.R.string.ok);
-					CustomDialogFactory.show(d);
-					if (!AndroidStorage.migrateToInternalStorage(activity.getApplicationContext())) {
-						final CustomDialog errorDlg = CustomDialogFactory.createDialog(activity,
-								getString(R.string.startscreen_migration_title),
-								activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-								getString(R.string.startscreen_migration_failure),
-								null,
-								true);
-						CustomDialogFactory.addDismissButton(errorDlg, android.R.string.ok);
-						d.cancel();
-						CustomDialogFactory.show(errorDlg);
-					}
-				} else {
-					L.log("INFO: No external files or destination folder ist not empty. No data migration.");
-				}
-			} else {
-				L.log("INFO: No read permission on external folder. No data migration.");
-			}
-		}
-	}
+    private static final int READ_EXTERNAL_STORAGE_REQUEST = 1;
+    private static final int WRITE_EXTERNAL_STORAGE_REQUEST = 2;
 
-	private static final int READ_EXTERNAL_STORAGE_REQUEST=1;
-	private static final int WRITE_EXTERNAL_STORAGE_REQUEST=2;
+    @TargetApi(23)
+    public static void checkAndRequestPermissions(final Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+            if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                activity.requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, READ_EXTERNAL_STORAGE_REQUEST);
+            }
+            if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                activity.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, WRITE_EXTERNAL_STORAGE_REQUEST);
+            }
+        }
+    }
 
-	@TargetApi(23)
-	public static void checkAndRequestPermissions(final Activity activity) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
-			if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-				activity.requestPermissions(new String[] {Manifest.permission.READ_EXTERNAL_STORAGE}, READ_EXTERNAL_STORAGE_REQUEST);
-			}
-			if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-				activity.requestPermissions(new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, WRITE_EXTERNAL_STORAGE_REQUEST);
-			}
-		}
-	}
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        listener = (OnNewGameRequestedListener) activity;
+    }
 
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		listener = (OnNewGameRequestedListener) activity;
-	}
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        listener = null;
+    }
 
-	@Override
-	public void onDetach() {
-		super.onDetach();
-		listener = null;
-	}
+    private void setButtonState(final String playerName, final String displayInfo, int iconID, boolean isDead) {
+        startscreen_continue.setEnabled(hasExistingGame && !isDead);
+        startscreen_newgame.setEnabled(true);
+        if (hasExistingGame) {
+            TileManager tm = AndorsTrailApplication.getApplicationFromActivity(getActivity()).getWorld().tileManager;
+            tm.setImageViewTileForPlayer(getResources(), save_preview_hero_icon, iconID);
+            save_preview_hero_desc.setText((isDead ? getString(R.string.rip_startscreen) : "") + playerName + ", " + displayInfo);
+            save_preview_holder.setVisibility(View.VISIBLE);
+        } else {
+            save_preview_holder.setVisibility(View.GONE);
+        }
+    }
 
-	private void setButtonState(final String playerName, final String displayInfo, int iconID, boolean isDead) {
-		startscreen_continue.setEnabled(hasExistingGame && !isDead);
-		startscreen_newgame.setEnabled(true);
-		if (hasExistingGame) {
-			TileManager tm = AndorsTrailApplication.getApplicationFromActivity(getActivity()).getWorld().tileManager;
-			tm.setImageViewTileForPlayer(getResources(), save_preview_hero_icon, iconID);
-			save_preview_hero_desc.setText((isDead ? getString(R.string.rip_startscreen) : "") + playerName + ", " + displayInfo);
-			save_preview_holder.setVisibility(View.VISIBLE);
-		} else {
-			save_preview_holder.setVisibility(View.GONE);
-		}
-	}
+    private void continueGame(boolean createNewCharacter, int loadFromSlot, String name) {
+        final WorldSetup setup = AndorsTrailApplication.getApplicationFromActivity(getActivity()).getWorldSetup();
+        setup.createNewCharacter = createNewCharacter;
+        setup.loadFromSlot = loadFromSlot;
+        setup.newHeroName = name;
+        startActivity(new Intent(getActivity(), LoadingActivity.class));
+    }
 
-	private void continueGame(boolean createNewCharacter, int loadFromSlot, String name) {
-		final WorldSetup setup = AndorsTrailApplication.getApplicationFromActivity(getActivity()).getWorldSetup();
-		setup.createNewCharacter = createNewCharacter;
-		setup.loadFromSlot = loadFromSlot;
-		setup.newHeroName = name;
-		startActivity(new Intent(getActivity(), LoadingActivity.class));
-	}
-
-	private void comfirmNewGame() {
+    private void comfirmNewGame() {
 //		new AlertDialog.Builder(new ContextThemeWrapper(getActivity(), R.style.AndorsTrailStyle_Dialog))
 //		.setTitle(R.string.startscreen_newgame)
 //		.setMessage(R.string.startscreen_newgame_confirm)
@@ -295,38 +307,39 @@ public class StartScreenActivity_MainMenu extends Fragment {
 //		.create().show();
 //		
 //		
-		final CustomDialog d = CustomDialogFactory.createDialog(getActivity(),
-				getString(R.string.startscreen_newgame),
-				getResources().getDrawable(android.R.drawable.ic_delete),
-				getResources().getString(R.string.startscreen_newgame_confirm),
-				null,
-				true);
-		CustomDialogFactory.addButton(d, android.R.string.ok, new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				createNewGame();
-			}
-		});
-		CustomDialogFactory.addDismissButton(d, android.R.string.cancel);
+        final Dialog d = CustomDialogFactory.createDialog(getActivity(),
+                getString(R.string.startscreen_newgame),
+                getResources().getDrawable(android.R.drawable.ic_delete),
+                getResources().getString(R.string.startscreen_newgame_confirm),
+                null,
+                true);
+        CustomDialogFactory.addButton(d, android.R.string.ok, new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                createNewGame();
+            }
+        });
+        CustomDialogFactory.addDismissButton(d, android.R.string.cancel);
 
-		CustomDialogFactory.show(d);
+        CustomDialogFactory.show(d);
 
-	}
+    }
 
-	private static final String versionCheck = "lastversion";
-	private boolean isNewVersion() {
-		SharedPreferences s = getActivity().getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, Activity.MODE_PRIVATE);
-		int lastversion = s.getInt(versionCheck, 0);
-		if (lastversion >= AndorsTrailApplication.CURRENT_VERSION) return false;
-		return true;
-	}
+    private static final String versionCheck = "lastversion";
 
-	private void setCurrentVersionForVersionCheck() {
-		SharedPreferences s = getActivity().getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, Activity.MODE_PRIVATE);
-		Editor e = s.edit();
-		e.putInt(versionCheck, AndorsTrailApplication.CURRENT_VERSION);
-		e.commit();
-	}
+    private boolean isNewVersion() {
+        SharedPreferences s = getActivity().getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, Activity.MODE_PRIVATE);
+        int lastversion = s.getInt(versionCheck, 0);
+        if (lastversion >= AndorsTrailApplication.CURRENT_VERSION) return false;
+        return true;
+    }
+
+    private void setCurrentVersionForVersionCheck() {
+        SharedPreferences s = getActivity().getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, Activity.MODE_PRIVATE);
+        Editor e = s.edit();
+        e.putInt(versionCheck, AndorsTrailApplication.CURRENT_VERSION);
+        e.commit();
+    }
 
 
     @Override
@@ -334,17 +347,19 @@ public class StartScreenActivity_MainMenu extends Fragment {
         super.onActivityResult(requestCode, resultCode, data);
         switch (requestCode) {
             case INTENTREQUEST_LOADGAME:
-				boolean unsuccessful = resultCode != Activity.RESULT_OK;
-				if(data == null) break;
-
+                if (resultCode != Activity.RESULT_OK) break;
                 final boolean wasImportOrExport = data.getBooleanExtra("import_export", false);
-                if (wasImportOrExport) {
-					String message = getImportExportMessage(!unsuccessful, data);
-					Toast.makeText(getActivity(), message, Toast.LENGTH_LONG).show();
-					break;
-				}
-				if (unsuccessful) break;
                 final int slot = data.getIntExtra("slot", 1);
+                if (wasImportOrExport) {
+                    if(slot == LoadSaveActivity.SLOT_NUMBER_EXPORT_SAVEGAMES)
+                        Toast.makeText(getActivity(),R.string.loadsave_export_save_successfull, Toast.LENGTH_LONG).show();
+                    else if(slot == LoadSaveActivity.SLOT_NUMBER_IMPORT_SAVEGAMES)
+                        Toast.makeText(getActivity(),R.string.loadsave_import_save_successfull, Toast.LENGTH_LONG).show();
+                    else if(slot == LoadSaveActivity.SLOT_NUMBER_IMPORT_WORLDMAP)
+                        Toast.makeText(getActivity(),R.string.loadsave_import_worldmap_successfull, Toast.LENGTH_LONG).show();
+
+                    break;
+                }
                 continueGame(false, slot, null);
                 break;
             case INTENTREQUEST_PREFERENCES:
@@ -353,24 +368,7 @@ public class StartScreenActivity_MainMenu extends Fragment {
         }
     }
 
-	private String getImportExportMessage(boolean successful, Intent data) {
-		String message = "";
-		boolean isImportWorldmap = data.getBooleanExtra("import_worldmap", false);
-		boolean isImportSaves = data.getBooleanExtra("import_savegames", false);
-		boolean isExport = data.getBooleanExtra("export", false);
-
-		if(isImportWorldmap) {
-			message = getString(successful ? R.string.loadsave_import_worldmap_successfull : R.string.loadsave_import_worldmap_unsuccessfull);
-		} else if(isImportSaves) {
-			message = getString(successful ? R.string.loadsave_import_save_successfull : R.string.loadsave_import_save_unsuccessfull);
-		} else if(isExport) {
-			message = getString(successful ? R.string.loadsave_export_successfull : R.string.loadsave_export_unsuccessfull);
-		}
-
-		return message;
-	}
-
-	private void updatePreferences(boolean alreadyStartedLoadingResources) {
+    private void updatePreferences(boolean alreadyStartedLoadingResources) {
         AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
         AndorsTrailPreferences preferences = app.getPreferences();
         preferences.read(getActivity());
@@ -400,17 +398,17 @@ public class StartScreenActivity_MainMenu extends Fragment {
     }
 
 
-	public interface OnNewGameRequestedListener {
-		public void onNewGameRequested();
-	}
+    public interface OnNewGameRequestedListener {
+        public void onNewGameRequested();
+    }
 
-	private OnNewGameRequestedListener listener = null;
+    private OnNewGameRequestedListener listener = null;
 
-	private void createNewGame() {
-		if (listener != null) {
-			listener.onNewGameRequested();
-		}
-	}
+    private void createNewGame() {
+        if (listener != null) {
+            listener.onNewGameRequested();
+        }
+    }
 
 
 }

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 androidx.fragment.app.Fragment;
+import android.support.v4.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/ActorStatsController.java

@@ -76,7 +76,8 @@ public final class ActorStatsController {
 				c.magnitude -= magnitude;
 				actorConditionListeners.onActorConditionMagnitudeChanged(actor, c);
 			} else {
-				actorConditionsRemove(actor, c, i);
+				actor.conditions.remove(i);
+				actorConditionListeners.onActorConditionRemoved(actor, c);
 			}
 			break;
 		}
@@ -231,9 +232,9 @@ public final class ActorStatsController {
 	public void removeAllTemporaryConditions(final Actor actor) {
 		for(int i = actor.conditions.size() - 1; i >= 0; --i) {
 			ActorCondition c = actor.conditions.get(i);
-			if (c.isTemporaryEffect() || c.isDurationForeverUntilSleep()) {
-				actorConditionsRemove(actor, c, i);
-			}
+			if (!c.isTemporaryEffect()) continue;
+			actor.conditions.remove(i);
+			actorConditionListeners.onActorConditionRemoved(actor, c);
 		}
 	}
 
@@ -241,7 +242,8 @@ public final class ActorStatsController {
 		for(int i = actor.conditions.size() - 1; i >= 0; --i) {
 			ActorCondition c = actor.conditions.get(i);
 			if (!c.conditionType.conditionTypeID.equals(conditionTypeID)) continue;
-			actorConditionsRemove(actor, c, i);
+			actor.conditions.remove(i);
+			actorConditionListeners.onActorConditionRemoved(actor, c);
 		}
 	}
 
@@ -404,14 +406,14 @@ public final class ActorStatsController {
 			ActorCondition c = actor.conditions.get(i);
 			if (!c.isTemporaryEffect()) continue;
 			if (c.duration <= 1) {
-				actorConditionsRemove(actor, c, i);
+				actor.conditions.remove(i);
+				actorConditionListeners.onActorConditionRemoved(actor, c);
 				removedAnyConditions = true;
 			} else {
 				c.duration -= 1;
 				actorConditionListeners.onActorConditionDurationChanged(actor, c);
 			}
 		}
-		// Immunities
 		for(int i = actor.immunities.size() - 1; i >= 0; --i) {
 			ActorCondition c = actor.immunities.get(i);
 			if (!c.isTemporaryEffect()) continue;
@@ -455,50 +457,6 @@ public final class ActorStatsController {
 		}
 	}
 
-	int actorConditionsRemove(Actor actor, ActorCondition c, int i) {
-		int magnitude = 0;	//default: No condition from worn items
-
-		if (actor instanceof Player) {
-			Player player = (Player) actor;
-			magnitude = gotConditionFromWornItem(player, c);
-			if (magnitude > 0) {			//condition from worn items?
-				c.magnitude = magnitude;	// -> readd condition
-				actorConditionListeners.onActorConditionMagnitudeChanged(actor, c);
-				c.duration = ActorCondition.DURATION_FOREVER;
-				actorConditionListeners.onActorConditionDurationChanged(actor, c);
-			}
-		}
-		if (magnitude == 0) {
-			actor.conditions.remove(i);
-			actorConditionListeners.onActorConditionRemoved(actor, c);
-		}
-
-		return magnitude;
-	}
-
-	int gotConditionFromWornItem(Player player, ActorCondition c) {
-		int magnitude = 0;	//Default: No worn item with this condition
-
-		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
-			ItemType t = player.inventory.getItemTypeInWearSlot(slot);
-			if (t == null) continue;
-			ItemTraits_OnEquip equipEffects = t.effects_equip;
-			if (equipEffects == null) continue;
-			if (equipEffects.addedConditions == null) continue;
-			for (ActorConditionEffect e : equipEffects.addedConditions) {
-				if (e.conditionType.conditionTypeID.equals(c.conditionType.conditionTypeID)) {
-					if (e.magnitude == ActorCondition.MAGNITUDE_REMOVE_ALL) {
-						return 0;	//On an item-based immunity the result is always 0
-					}
-					if (magnitude < e.magnitude) {
-						magnitude = e.magnitude;
-					}
-				}
-			}
-		}
-		return magnitude;
-	}
-
 	public void applyUseEffect(Actor source, Actor target, ItemTraits_OnUse effect) {
 		if (effect == null) return;
 

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

@@ -250,8 +250,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		if (!loot.hasItemsOrGold()) {
 			world.model.currentMaps.map.removeGroundLoot(loot);
 		} else if (world.model.uiSelections.isInCombat) {
-			if(!killedMonsterBags.contains(loot))
-				killedMonsterBags.add(loot);
+			killedMonsterBags.add(loot);
 		}
 
 		combatActionListeners.onPlayerKilledMonster(killedMonster);
@@ -580,13 +579,6 @@ 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 = 20;
+	public static final int PERCENT_EXP_LOST_WHEN_DIED = 30;
 	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,7 +22,6 @@ 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;
@@ -125,9 +124,6 @@ public final class ConversationController {
 			case changeMapFilter:
 				changeMapFilter(res, effect.mapName, effect.effectID);
 				break;
-			case mapchange:
-				mapchange(effect.mapName, effect.effectID);
-				break;
 		}
 	}
 
@@ -176,13 +172,6 @@ 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);
@@ -322,18 +311,6 @@ 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/InputController.java

@@ -2,7 +2,6 @@ package com.gpl.rpg.AndorsTrail.controller;
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.util.SparseIntArray;
 import android.view.KeyEvent;
 import android.view.View;
@@ -99,36 +98,28 @@ public final class InputController implements OnClickListener, OnLongClickListen
 
 		// Keys mapping to UP_LEFT
 		key = KEY_MOVE_UP_LEFT;
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-			keyMap.put(KeyEvent.KEYCODE_DPAD_UP_LEFT, key);
-		}
+		keyMap.put(KeyEvent.KEYCODE_DPAD_UP_LEFT, key);
 		keyMap.put(KeyEvent.KEYCODE_NUMPAD_7, key);
 		keyMap.put(KeyEvent.KEYCODE_7, key);
 		keyMap.put(KeyEvent.KEYCODE_MOVE_HOME, key);
 
 		// Keys mapping to UP_RIGHT		
 		key = KEY_MOVE_UP_RIGHT;
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-			keyMap.put(KeyEvent.KEYCODE_DPAD_UP_RIGHT, key);
-		}
+		keyMap.put(KeyEvent.KEYCODE_DPAD_UP_RIGHT, key);
 		keyMap.put(KeyEvent.KEYCODE_NUMPAD_9, key);
 		keyMap.put(KeyEvent.KEYCODE_9, key);
 		keyMap.put(KeyEvent.KEYCODE_PAGE_UP, key);
 
 		// Keys mapping to DOWN_LEFT
 		key = KEY_MOVE_DOWN_LEFT;
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-			keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_LEFT, key);
-		}
+		keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_LEFT, key);
 		keyMap.put(KeyEvent.KEYCODE_NUMPAD_1, key);
 		keyMap.put(KeyEvent.KEYCODE_1, key);
 		keyMap.put(KeyEvent.KEYCODE_MOVE_END, key);
 
 		// Keys mapping to DOWN_RIGHT		
 		key = KEY_MOVE_DOWN_RIGHT;
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-			keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_RIGHT, key);
-		}
+		keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_RIGHT, key);
 		keyMap.put(KeyEvent.KEYCODE_NUMPAD_3, key);
 		keyMap.put(KeyEvent.KEYCODE_3, key);
 		keyMap.put(KeyEvent.KEYCODE_PAGE_DOWN, key);

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

@@ -68,7 +68,6 @@ public final class MapController {
 		case sign:
 			if (o.id == null || o.id.length() <= 0) return;
 			worldEventListeners.onPlayerSteppedOnMapSignArea(o);
-			runScriptInArea(o);
 			break;
 		case newmap:
 			if (o.map == null || o.place == null) return;
@@ -80,7 +79,7 @@ public final class MapController {
 			steppedOnRestArea(o);
 			break;
 		case script:
-			runScriptInArea(o);
+			runScriptArea(o);
 			break;
 		}
 	}
@@ -94,7 +93,7 @@ public final class MapController {
 		return true;
 	}
 
-	private void runScriptInArea(MapObject o) {
+	private void runScriptArea(MapObject o) {
 		Resources res = controllers.getResources();
 		mapScriptExecutor.proceedToPhrase(res, o.id, true, true);
 		controllers.mapController.applyCurrentMapReplacements(res, true);
@@ -165,7 +164,6 @@ public final class MapController {
 			return true;
 		}
 		worldEventListeners.onPlayerSteppedOnKeyArea(area);
-		runScriptInArea(area);
 		return false;
 	}
 

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

@@ -1,6 +1,5 @@
 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;
@@ -18,7 +17,6 @@ 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;
@@ -60,9 +58,6 @@ 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);
@@ -253,7 +248,6 @@ public final class SkillController {
 					addPercentBlockChance(player, itemType, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_BC_PERCENT * skillLevelHeavyArmor, 0);
 					playerTraits.moveCost -= getPercentage(itemType.effects_equip.stats.increaseMoveCost, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_MOVECOST_PERCENT * skillLevelHeavyArmor, 0);
 					playerTraits.attackCost -= getPercentage(itemType.effects_equip.stats.increaseAttackCost, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_ATKCOST_PERCENT * skillLevelHeavyArmor, 0);
-					playerTraits.useItemCost -= getPercentage(itemType.effects_equip.stats.increaseUseItemCost, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_USECOST_PERCENT * skillLevelHeavyArmor, 0);
 				}
 			}
 		}

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

@@ -21,23 +21,14 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public final class VisualEffectController {
-	private static final long EFFECT_UPDATE_INTERVAL = 25;
 	private int effectCount = 0;
 
 	private final ControllerContext controllers;
 	private final WorldContext world;
 	private final VisualEffectCollection effectTypes;
-	private final Handler animationHandler = new Handler();
-	private final List<VisualEffectAnimation> activeAnimations = new ArrayList<>();
 
 	public final VisualEffectFrameListeners visualEffectFrameListeners = new VisualEffectFrameListeners();
-	private long getEffectUpdateInterval() {
-		return EFFECT_UPDATE_INTERVAL * controllers.preferences.attackspeed_milliseconds / AndorsTrailPreferences.ATTACKSPEED_DEFAULT_MILLISECONDS;
-	}
 	
 	public VisualEffectController(ControllerContext controllers, WorldContext world) {
 		this.controllers = controllers;
@@ -47,42 +38,10 @@ public final class VisualEffectController {
 
 	public void startEffect(Coord position, VisualEffectCollection.VisualEffectID effectID, String displayValue, VisualEffectCompletedCallback callback, int callbackValue) {
 		++effectCount;
-		VisualEffectAnimation animation = new VisualEffectAnimation(effectTypes.getVisualEffect(effectID), position, displayValue, callback, callbackValue);
-		animation.start();
+		(new VisualEffectAnimation(effectTypes.getVisualEffect(effectID), position, displayValue, callback, callbackValue))
+		.start();
 	}
 
-	private void startAnimation(VisualEffectAnimation animation) {
-		activeAnimations.add(animation);
-		animation.update();
-		if (activeAnimations.size() == 1) {
-			animationHandler.postDelayed(animationRunnable, 0);
-		}
-	}
-
-	private final Runnable animationRunnable = new Runnable() {
-		@Override
-		public void run() {
-			if(!activeAnimations.isEmpty()) {
-				long updateInterval = getEffectUpdateInterval();
-				animationHandler.postDelayed(this, updateInterval);
-
-				for (int i = 0; i < activeAnimations.size(); i++) {
-					VisualEffectAnimation animation = activeAnimations.get(i);
-					animation.durationPassed += updateInterval;
-					animation.updateFrame();
-					animation.update();
-					if (controllers.preferences.attackspeed_milliseconds <= 0  ||  animation.currentFrame >= animation.effect.lastFrame) {
-						animation.onCompleted();
-						activeAnimations.remove(i);
-						effectCount--;
-						i--;
-					}
-				}
-				visualEffectFrameListeners.onNewAnimationFrames(activeAnimations);
-			}
-		}
-	};
-
 	private VisualEffectCollection.VisualEffectID enqueuedEffectID = null;
 	private int enqueuedEffectValue = 0;
 	public void enqueueEffect(VisualEffectCollection.VisualEffectID effectID, int displayValue) {
@@ -106,9 +65,10 @@ public final class VisualEffectController {
 		.start();
 	}
 
-	public final class SpriteMoveAnimation implements Runnable {
-		private final Handler handler = new Handler();
-
+	public final class SpriteMoveAnimation extends Handler implements Runnable {
+		
+//		private static final int millisecondsPerFrame=25;
+		
 		private final VisualEffectCompletedCallback callback;
 		private final int callbackValue;
 
@@ -122,6 +82,11 @@ public final class VisualEffectController {
 		@Override
 		public void run() {
 			onCompleted();
+//			update();
+//			if (System.currentTimeMillis() - actor.vfxStartTime >= duration) {
+//			} else {
+//				postDelayed(this, millisecondsPerFrame);
+//			}
 		}
 		
 		public SpriteMoveAnimation(Coord origin, Coord destination, int duration, Actor actor, PredefinedMap map, VisualEffectCompletedCallback callback, int callbackValue) {
@@ -134,6 +99,11 @@ public final class VisualEffectController {
 			this.destination = destination;
 
 		}
+		
+//		private void update() {
+//			
+//			visualEffectFrameListeners.onNewSpriteMoveFrame(this);
+//		}
 
 		private void onCompleted() {
 			--effectCount;
@@ -141,6 +111,7 @@ public final class VisualEffectController {
 			if (callback != null) callback.onVisualEffectCompleted(callbackValue);
 			visualEffectFrameListeners.onSpriteMoveCompleted(this);
 		}
+		
 
 		public void start() {
 			actor.hasVFXRunning = true;
@@ -149,9 +120,12 @@ public final class VisualEffectController {
 			visualEffectFrameListeners.onSpriteMoveStarted(this);
 			if (duration == 0 || !controllers.preferences.enableUiAnimations) onCompleted();
 			else {
-				handler.postDelayed(this, duration);
+				postDelayed(this, duration);
 			}
 		}
+		
+		
+		
 	}
 
 	public static final Paint textPaint = new Paint();
@@ -160,42 +134,41 @@ public final class VisualEffectController {
 		textPaint.setAlpha(255);
 		textPaint.setTextAlign(Align.CENTER);
 	}
+	
+	public final class VisualEffectAnimation extends Handler implements Runnable {
 
-	public final class VisualEffectAnimation  {
-		public int tileID;
-		public int textYOffset;
-		public long durationPassed = 0;
-
-		private void updateFrame() {
-			long frameDuration = (long) effect.millisecondPerFrame * controllers.preferences.attackspeed_milliseconds / AndorsTrailPreferences.ATTACKSPEED_DEFAULT_MILLISECONDS;
-			while (frameDuration > 0 && durationPassed > frameDuration) {
-				currentFrame++;
-				durationPassed -= frameDuration;
+		@Override
+		public void run() {
+			if (currentFrame >= effect.lastFrame) {
+				onCompleted();
+			} else {
+				postDelayed(this, effect.millisecondPerFrame * controllers.preferences.attackspeed_milliseconds / AndorsTrailPreferences.ATTACKSPEED_DEFAULT_MILLISECONDS);
+				update();
 			}
 		}
+
 		private void update() {
-			if (currentFrame >= effect.lastFrame) {
-				return;
+			++currentFrame;
+			int frame = currentFrame;
+
+			int tileID = effect.frameIconIDs[frame];
+			int textYOffset = -2 * (frame);
+			if (frame >= beginFadeAtFrame && displayText != null) {
+				textPaint.setAlpha(255 * (effect.lastFrame - frame) / (effect.lastFrame - beginFadeAtFrame));
 			}
-
-			tileID = effect.frameIconIDs[currentFrame];
-			textYOffset = -2 * (currentFrame);
-
-			if (currentFrame >= beginFadeAtFrame && displayText != null) {
-				textPaint.setAlpha(255 * (effect.lastFrame - currentFrame) / (effect.lastFrame - beginFadeAtFrame));
-			}
-
 			area.topLeft.y = position.y - 1;
+			visualEffectFrameListeners.onNewAnimationFrame(this, tileID, textYOffset);
 		}
 
 		private void onCompleted() {
+			--effectCount;
 			visualEffectFrameListeners.onAnimationCompleted(this);
 			if (callback != null) callback.onVisualEffectCompleted(callbackValue);
 		}
 
 		public void start() {
 			if (!controllers.preferences.enableUiAnimations) onCompleted();
-			else startAnimation(this);
+			else postDelayed(this, 0);
 		}
 
 		private int currentFrame = 0;
@@ -224,7 +197,7 @@ public final class VisualEffectController {
 			this.area = new CoordRect(new Coord(position.x - (widthNeededInTiles / 2), position.y - 1), new Size(widthNeededInTiles, 2));
 			this.beginFadeAtFrame = effect.lastFrame / 2;
 		}
-
+		
 		public Paint getTextPaint(){
 			return textPaint;
 		}

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

@@ -25,7 +25,6 @@ import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
 import com.gpl.rpg.AndorsTrail.model.map.MapLayer;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
@@ -315,32 +314,4 @@ public final class WorldMapController {
 
 		return true;
 	}
-
-	public static void populateWorldMap(Context context, WorldContext world, Resources res) throws IOException {
-		ensureWorldmapDirectoryExists(context);
-		File dir = getWorldmapDirectory(context);
-
-		File idFile = new File(dir, world.model.player.id);
-		if (idFile.exists()) return;
-		idFile.createNewFile();
-
-		for (PredefinedMap map : world.maps.getAllMaps()) {
-			if (!map.visited) continue;
-
-			String worldMapSegmentName = world.maps.getWorldMapSegmentNameForMap(map.name);
-			if (worldMapSegmentName == null) continue;
-
-			boolean mapFileExists = fileForMapExists(context, map);
-			File worldMapFile = getCombinedWorldMapFile(context, worldMapSegmentName);
-			if (mapFileExists && worldMapFile.exists()) continue;
-
-			LayeredTileMap mapTiles = TMXMapTranslator.readLayeredTileMap(res, world.tileManager.tileCache, map);
-			mapTiles.changeColorFilter(map.currentColorFilter);
-			TileCollection cachedTiles = world.tileManager.loadTilesFor(map, mapTiles, world, res);
-
-			MapRenderer renderer = new MapRenderer(world, map, mapTiles, cachedTiles);
-			updateCachedBitmap(context, map, renderer);
-			updateWorldMapSegment(context, res, world, worldMapSegmentName);
-		}
-	}
 }

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListener.java

@@ -4,10 +4,8 @@ import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.SpriteMoveAnima
 import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAnimation;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
-import java.util.List;
-
 public interface VisualEffectFrameListener {
-	void onNewAnimationFrames(List<VisualEffectAnimation> effects);
+	void onNewAnimationFrame(VisualEffectAnimation animation, int tileID, int textYOffset);
 	void onAnimationCompleted(VisualEffectAnimation animation);
 	void onSpriteMoveStarted(SpriteMoveAnimation animation);
 	void onNewSpriteMoveFrame(SpriteMoveAnimation animation);

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java

@@ -5,12 +5,10 @@ import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAni
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
-import java.util.List;
-
 public final class VisualEffectFrameListeners extends ListOfListeners<VisualEffectFrameListener> implements VisualEffectFrameListener {
 
-	private final Function1<VisualEffectFrameListener, List<VisualEffectAnimation>> onNewAnimationFrames = new Function1<VisualEffectFrameListener, List<VisualEffectAnimation>>() {
-		@Override public void call(VisualEffectFrameListener listener, List<VisualEffectAnimation> effects) { listener.onNewAnimationFrames(effects); }
+	private final Function3<VisualEffectFrameListener, VisualEffectAnimation, Integer, Integer> onNewAnimationFrame = new Function3<VisualEffectFrameListener, VisualEffectAnimation, Integer, Integer>() {
+		@Override public void call(VisualEffectFrameListener listener, VisualEffectAnimation animation, Integer tileID, Integer textYOffset) { listener.onNewAnimationFrame(animation, tileID, textYOffset); }
 	};
 
 	private final Function1<VisualEffectFrameListener, VisualEffectAnimation> onAnimationCompleted = new Function1<VisualEffectFrameListener, VisualEffectAnimation>() {
@@ -32,10 +30,10 @@ public final class VisualEffectFrameListeners extends ListOfListeners<VisualEffe
 	private final Function1<VisualEffectFrameListener, CoordRect> onAsyncAreaUpdate = new Function1<VisualEffectFrameListener, CoordRect>() {
 		@Override public void call(VisualEffectFrameListener listener, CoordRect area) { listener.onAsyncAreaUpdate(area); }
 	};
-
+	
 	@Override
-	public void onNewAnimationFrames(List<VisualEffectAnimation> effects) {
-		callAllListeners(this.onNewAnimationFrames, effects);
+	public void onNewAnimationFrame(VisualEffectAnimation animation, int tileID, int textYOffset) {
+		callAllListeners(this.onNewAnimationFrame, animation, tileID, textYOffset);
 	}
 
 	@Override

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

@@ -19,7 +19,6 @@ import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.model.quest.Quest;
-import com.gpl.rpg.AndorsTrail.util.HashMapHelper;
 
 public final class GameStatistics {
 	private int deaths = 0;
@@ -37,10 +36,10 @@ public final class GameStatistics {
 
 	public void addMonsterKill(MonsterType monsterType) {
 		// Track monster kills by type ID, for savegame file
-		killedMonstersByTypeID.put(monsterType.id, getNumberOfKillsForMonsterType(monsterType.id) + 1);
+		killedMonstersByTypeID.put(monsterType.id, killedMonstersByTypeID.getOrDefault((monsterType.id), 0) + 1);
 
 		// Also track by name, for statistics display (multiple IDs w/same name don't matter to player)
-		killedMonstersByName.put(monsterType.name, getNumberOfKillsForMonsterName(monsterType.name) + 1);
+		killedMonstersByName.put(monsterType.name, killedMonstersByName.getOrDefault(monsterType.name, 0) + 1);
 	}
 
 	public void addPlayerDeath(int lostExp) {
@@ -51,7 +50,8 @@ public final class GameStatistics {
 	}
 	public void addItemUsage(ItemType type) {
 		final String n = type.id;
-		usedItems.put(n, HashMapHelper.getOrDefault(usedItems, n,0) + 1);
+		if (!usedItems.containsKey(n)) usedItems.put(n, 1);
+		else usedItems.put(n, usedItems.get(n) + 1);
 	}
 
 	public int getDeaths() {
@@ -73,11 +73,15 @@ public final class GameStatistics {
 	public boolean isDead() { return !hasUnlimitedLives() && getLivesLeft() < 1; }
 
 	public int getNumberOfKillsForMonsterType(String monsterTypeID) {
-		return HashMapHelper.getOrDefault(killedMonstersByTypeID, monsterTypeID, 0);
+		Integer v = killedMonstersByTypeID.get(monsterTypeID);
+		if (v == null) return 0;
+		return v;
 	}
 
 	public int getNumberOfKillsForMonsterName(String monsterName) {
-		return HashMapHelper.getOrDefault(killedMonstersByName, monsterName, 0);
+		Integer v = killedMonstersByName.get(monsterName);
+		if (v == null) return 0;
+		return v;
 	}
 
 	public String getTop5MostCommonlyKilledMonsters(WorldContext world, Resources res) {
@@ -140,15 +144,20 @@ public final class GameStatistics {
 	}
 
 	public int getNumberOfUsedItems() {
-		return HashMapHelper.sumIntegerValues(usedItems);
+		int result = 0;
+		for (int v : usedItems.values()) result += v;
+		return result;
 	}
 
 	public int getNumberOfTimesItemHasBeenUsed(String itemId) {
-		return HashMapHelper.getOrDefault(usedItems, itemId, 0);
+		if (!usedItems.containsKey(itemId)) return 0;
+		return usedItems.get(itemId);
 	}
 
 	public int getNumberOfKilledMonsters() {
-		return HashMapHelper.sumIntegerValues(killedMonstersByTypeID);
+		int result = 0;
+		for (int v : killedMonstersByTypeID.values()) result += v;
+		return result;
 	}
 
 	private static final Comparator<Entry<String, Integer>> descendingValueComparator = new Comparator<Entry<String, Integer>>() {
@@ -177,7 +186,7 @@ public final class GameStatistics {
 			// Also track by name, for statistics display (multiple IDs w/same name don't matter to player)
 			MonsterType t = world.monsterTypes.getMonsterType(id);
 
-			if (t != null) 	killedMonstersByName.put(t.name, getNumberOfKillsForMonsterName(t.name) + value);
+			if (t != null) 	killedMonstersByName.put(t.name, killedMonstersByName.getOrDefault(t.name, 0) + value);
 		}
 
 		if (fileversion <= 17) return;

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

@@ -6,8 +6,6 @@ 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>();
@@ -38,62 +36,6 @@ 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/ActorCondition.java

@@ -9,7 +9,6 @@ import com.gpl.rpg.AndorsTrail.context.WorldContext;
 public final class ActorCondition {
 	public static final int MAGNITUDE_REMOVE_ALL = -99;
 	public static final int DURATION_FOREVER = 999;
-	public static final int DURATION_FOREVER_UNTIL_SLEEP = 998;
 	public static final int DURATION_NONE = 0;
 
 	public final ActorConditionType conditionType;
@@ -28,12 +27,7 @@ public final class ActorCondition {
 
 	public boolean isTemporaryEffect() { return isTemporaryEffect(duration); }
 	public static boolean isTemporaryEffect(int duration) {
-		return ( duration != DURATION_FOREVER && duration != DURATION_FOREVER_UNTIL_SLEEP );
-	}
-
-	public boolean isDurationForeverUntilSleep() { return isDurationForeverUntilSleep(duration); }
-	public static boolean isDurationForeverUntilSleep(int duration) {
-		return ( duration == DURATION_FOREVER_UNTIL_SLEEP );
+		return duration != DURATION_FOREVER;
 	}
 
 

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 = 10;
+	public static final int PER_SKILLPOINT_INCREASE_MORE_EXP_PERCENT = 5;
 	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;
@@ -112,7 +112,6 @@ public final class SkillCollection {
 	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_BC_PERCENT = 20;
 	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_MOVECOST_PERCENT = 25;
 	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_ATKCOST_PERCENT = 25;
-	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_USECOST_PERCENT = 25;
 	public static final int PER_SKILLPOINT_INCREASE_FIGHTSTYLE_2HAND_DMG_PERCENT = 30;
 	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_2HAND_DMG_PERCENT = 50;
 	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_2HAND_AC_PERCENT = 20;

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 = 9;
+		baseTraits.blockChance = 0;
 		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 respawnspeed;
+	private final Range spawnChance;
 	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 respawnspeed
+			, Range spawnChance
 			, String areaID
 			, String[] monsterTypeIDs
 			, boolean isUnique
@@ -40,7 +40,7 @@ public final class MonsterSpawnArea {
 	) {
 		this.area = area;
 		this.quantity = quantity;
-		this.respawnspeed = respawnspeed;
+		this.spawnChance = spawnChance;
 		this.areaID = areaID;
 		this.monsterTypeIDs = monsterTypeIDs;
 		this.isUnique = isUnique;
@@ -101,7 +101,7 @@ public final class MonsterSpawnArea {
 	}
 
 	public boolean rollShouldSpawn() {
-		return Constants.rollResult(respawnspeed);
+		return Constants.rollResult(spawnChance);
 	}
 
 	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 respawnspeed = 10;
+						int spawnChance = 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("respawnspeed")) {
-								respawnspeed = Integer.parseInt(p.value);
+							} else if (p.name.equalsIgnoreCase("spawnchance")) {
+								spawnChance = 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, respawnspeed)
+								,new Range(1000, spawnChance)
 								,object.name
 								,monsterTypeIDs
 								,isUnique
@@ -405,11 +405,6 @@ 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,10 +21,6 @@ public final class Requirement {
 		,random
 		,factionScoreEquals
 		,wearRemove
-		,date
-		,dateEquals
-		,time
-		,timeEquals
 	}
 
 	public final RequirementType requireType;
@@ -87,10 +83,6 @@ 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,7 +18,6 @@ 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,8 +137,7 @@ 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) {
-			String s = readStringFromRaw(r, itemsToLoad, i);
-			world.itemTypes.initialize(itemTypeParser, s);
+			world.itemTypes.initialize(itemTypeParser, readStringFromRaw(r, itemsToLoad, i));
 		}
 		itemsToLoad.recycle();
 		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ItemTypeParser");
@@ -251,18 +250,14 @@ 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);
 		final Size sz3x1 = new Size(3, 1);
-		final Size sz4x1 = new Size(4, 1);
 		final Size sz5x1 = new Size(5, 1);
 		final Size sz6x1 = new Size(6, 1);
 		final Size sz7x1 = new Size(7, 1);
-		final Size sz7x4 = new Size(7, 4);
 		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);
@@ -304,26 +299,22 @@ public final class ResourceLoader {
 		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_g03_package_omi1, "items_g03_package_omi1", sz1x1, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.items_japozero, "items_japozero", new Size(16, 37), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.items_newb, "items_newb", new Size(32, 27), 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);
-		loader.prepareTileset(R.drawable.items_phoenix01, "items_phoenix01", sz16x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.items_rijackson_1, "items_rijackson_1", new Size(5, 4), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.items_rings_1, "items_rings_1", 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", sz7x4, sz1x1, 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);
@@ -342,10 +333,6 @@ public final class ResourceLoader {
 		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_newb_1, "monsters_newb_1", new Size(40, 34), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_newb_2, "monsters_newb_2", new Size(8, 2), sz1x2, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_newb_3, "monsters_newb_3", new Size(10, 2), sz2x2, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_newb_4, "monsters_newb_4", new Size(4, 1), sz2x1, 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);
@@ -380,22 +367,17 @@ public final class ResourceLoader {
         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);
-		loader.prepareTileset(R.drawable.monsters_phoenix01, "monsters_phoenix01", sz16x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_cats, "monsters_cats", new Size(10, 2), sz1x1, mTileSize);
 		/*INSERT_NPCS_TILESETS_HERE*/
 		
 		loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_boats_1, "map_boats_1", new Size(16, 9), 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_brightport, "map_brightport", new Size(16, 7), 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_cavewall_5, "map_cavewall_5", new Size(6, 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);
@@ -403,7 +385,6 @@ public final class ResourceLoader {
 		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_entrance_3, "map_entrance_3", 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);
@@ -416,8 +397,6 @@ public final class ResourceLoader {
 		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_ground_9, "map_ground_9", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_guynmart, "map_guynmart", 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);
@@ -426,45 +405,36 @@ public final class ResourceLoader {
 		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_pillar_3, "map_pillar_3", new Size(16, 10), 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_plant_3, "map_plant_3", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_plateau, "map_plateau", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_plateau_2, "map_plateau_2", new Size(8, 8), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_ratdom, "map_ratdom", new Size(18, 6), 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_rock_3, "map_rock_3", new Size(6, 5), 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_roof_4, "map_roof_4", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_roof_5, "map_roof_5", 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_sign_ladder_omi2, "map_sign_ladder_omi2", new Size(8, 4), 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_temple_1, "map_temple_1", new Size(23, 16), 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_transition_6, "map_transition_6", new Size(18, 8), 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_tree_3, "map_tree_3", new Size(32, 17), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_tree_4, "map_tree_4", new Size(16, 8), 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_items_japozero, "map_items_japozero", new Size(16, 37), 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);
 		/*INSERT_MAP_TILESETS_HERE*/
 
 		loader.prepareTileset(R.drawable.effect_blood4, "effect_blood4", new Size(7, 2), sz1x1, mTileSize);

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

@@ -39,12 +39,6 @@ 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/parsers/WorldMapParser.java

@@ -8,7 +8,6 @@ import org.xmlpull.v1.XmlPullParserException;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.model.map.MapCollection;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea;
@@ -25,13 +24,11 @@ public final class WorldMapParser {
 	}
 
 	private static void read(XmlResourceParser xrp, final MapCollection maps, final TranslationLoader translationLoader) {
-		String s = "";
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) L.log("WorldMapParser:");
 		try {
 			int eventType;
 			while ((eventType = xrp.next()) != XmlResourceParser.END_DOCUMENT) {
 				if (eventType == XmlResourceParser.START_TAG) {
-					s = xrp.getName();
+					String s = xrp.getName();
 					if (s.equals("segment")) {
 						WorldMapSegment segment = parseSegment(xrp, maps, translationLoader);
 						maps.worldMapSegments.put(segment.name, segment);
@@ -40,7 +37,7 @@ public final class WorldMapParser {
 			}
 			xrp.close();
 		} catch (Exception e) {
-			L.log("Error reading worldmap: " + s + " " + e.toString());
+			L.log("Error reading worldmap: " + e.toString());
 		}
 	}
 
@@ -49,13 +46,11 @@ public final class WorldMapParser {
 		final WorldMapSegment segment = new WorldMapSegment(segmentName);
 
 		final ArrayList<Pair<String, String>> mapsInNamedAreas = new ArrayList<Pair<String,String>>();
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) L.log("segment: " + segmentName);
 		XmlResourceParserUtils.readCurrentTagUntilEnd(xrp, new XmlResourceParserUtils.TagHandler() {
 			@Override
 			public void handleTag(XmlResourceParser xrp, String tagName) throws XmlPullParserException, IOException {
 				if (tagName.equals("map")) {
 					String mapName = xrp.getAttributeValue(null, "id");
-					if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) L.log("  map: " + mapName);
 					if (maps.findPredefinedMap(mapName) == null) return;
 					Coord mapPosition = new Coord(
 							xrp.getAttributeIntValue(null, "x", -1),
@@ -70,7 +65,6 @@ public final class WorldMapParser {
 					String id = xrp.getAttributeValue(null, "id");
 					String name = translationLoader.translateWorldmapLocation(xrp.getAttributeValue(null, "name"));
 					String type = xrp.getAttributeValue(null, "type");
-					if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) L.log("  namedarea: id=" + id + " name=" + name + " type=" + type);
 					segment.namedAreas.put(id, new NamedWorldMapArea(id, name, type));
 				}
 			}

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

@@ -12,8 +12,6 @@ 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 {
@@ -41,12 +39,7 @@ public final class TileCache {
 		tileIDsPerLocalID.put(localID, tileID);
 	}
 	public int getTileID(String tileSetName, int localID) {
-
-		SparseIntArray sparseIntArray = tileIDsPerTilesetAndLocalID.get(tileSetName);
-		if(AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES && sparseIntArray == null){
-			L.log("Could not get tile " + tileSetName + " " + localID);
-		}
-		return sparseIntArray.get(localID);
+		return tileIDsPerTilesetAndLocalID.get(tileSetName).get(localID);
 	}
 
 	private static final class ResourceFileTile {
@@ -74,19 +67,13 @@ 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);
-				L.log("iconIDs: " + iconIDs);
-			}
-			if(tile != null || AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA){
-				SparseArray<ResourceFileTile> tiles = tilesToLoadPerSourceFile.get(tile.tileset);
-				if (tiles == null) {
-					tiles = new SparseArray<TileCache.ResourceFileTile>();
-					tilesToLoadPerSourceFile.put(tile.tileset, tiles);
-				}
-				tiles.put(tileID, tile);
-				maxTileID = Math.max(maxTileID, tileID);
+			SparseArray<ResourceFileTile> tiles = tilesToLoadPerSourceFile.get(tile.tileset);
+			if (tiles == null) {
+				tiles = new SparseArray<TileCache.ResourceFileTile>();
+				tilesToLoadPerSourceFile.put(tile.tileset, tiles);
 			}
+			tiles.put(tileID, tile);
+			maxTileID = Math.max(maxTileID, tileID);
 		}
 
 		boolean hasLoadedTiles = false;

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

@@ -18,7 +18,6 @@ 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;
@@ -34,7 +33,6 @@ 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 {
@@ -376,10 +374,6 @@ 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) {
@@ -397,9 +391,6 @@ 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/savegames/Savegames.java

@@ -1,6 +1,7 @@
 package com.gpl.rpg.AndorsTrail.savegames;
 
 import java.io.ByteArrayOutputStream;
+import java.io.Console;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -27,106 +28,101 @@ import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.controller.WorldMapController;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
 import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class Savegames {
-	public static final int SLOT_QUICKSAVE = 0;
-	public static final long DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED = -1;
+    public static final int SLOT_QUICKSAVE = 0;
+    public static final long DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED = -1;
 
-	private static long lastBackup = 0;
+    private static long lastBackup = 0;
 
 
+    public static enum LoadSavegameResult {
+        success, unknownError, savegameIsFromAFutureVersion, cheatingDetected
+    }
 
-	public static enum LoadSavegameResult {
-		success
-		, unknownError
-		, savegameIsFromAFutureVersion
-		, cheatingDetected
-	}
+    public static boolean saveWorld(WorldContext world, Context androidContext, int slot) {
+        try {
+            final String displayInfo = androidContext.getString(R.string.savegame_currenthero_displayinfo, world.model.player.getLevel(), world.model.player.getTotalExperience(), world.model.player.getGold());
+            if (slot != SLOT_QUICKSAVE && !world.model.statistics.hasUnlimitedSaves()) {
+                world.model.player.savedVersion++;
+            }
+            String id = world.model.player.id;
+            long savedVersion = world.model.player.savedVersion;
 
-	public static boolean saveWorld(WorldContext world, Context androidContext, int slot) {
-		try {
-			final String displayInfo = androidContext.getString(R.string.savegame_currenthero_displayinfo, world.model.player.getLevel(), world.model.player.getTotalExperience(), world.model.player.getGold());
-			if (slot != SLOT_QUICKSAVE && !world.model.statistics.hasUnlimitedSaves()) {
-				world.model.player.savedVersion++;
-			}
-			String id = world.model.player.id;
-			long savedVersion = world.model.player.savedVersion;
+            // Create the savegame in a temporary memorystream first to ensure that the savegame can
+            // be created correctly. We don't want to trash the user's file unneccessarily if there is an error.
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            saveWorld(world, bos, displayInfo);
+            byte[] savegame = bos.toByteArray();
+            bos.close();
 
-			// Create the savegame in a temporary memorystream first to ensure that the savegame can
-			// be created correctly. We don't want to trash the user's file unneccessarily if there is an error.
-			ByteArrayOutputStream bos = new ByteArrayOutputStream();
-			saveWorld(world, bos, displayInfo);
-			byte[] savegame = bos.toByteArray();
-			bos.close();
+            FileOutputStream fos = getOutputFile(androidContext, slot);
+            fos.write(savegame);
+            fos.close();
 
-			FileOutputStream fos = getOutputFile(androidContext, slot);
-			fos.write(savegame);
-			fos.close();
+            if (!world.model.statistics.hasUnlimitedSaves()) {
+                if (slot != SLOT_QUICKSAVE) {
+                    androidContext.deleteFile(Constants.FILENAME_SAVEGAME_QUICKSAVE);
+                    writeCheatCheck(androidContext, savedVersion, id);
+                } else if (SystemClock.uptimeMillis() > lastBackup + 120000) {
+                    writeBackup(androidContext, savegame, id);
+                    lastBackup = SystemClock.uptimeMillis();
+                }
+            }
 
-			if (!world.model.statistics.hasUnlimitedSaves()) {
-				if (slot != SLOT_QUICKSAVE) {
-					androidContext.deleteFile(Constants.FILENAME_SAVEGAME_QUICKSAVE);
-					writeCheatCheck(androidContext, savedVersion, id);
-				} else if (SystemClock.uptimeMillis() > lastBackup + 120000) {
-					writeBackup(androidContext, savegame, id);
-					lastBackup = SystemClock.uptimeMillis();
-				}
-			}
+            return true;
+        } catch (IOException e) {
+            L.log("Error saving world: " + e.toString());
+            return false;
+        }
+    }
 
-			return true;
-		} catch (IOException e) {
-			L.log("Error saving world: " + e.toString());
-			return false;
-		}
-	}
-
-	private static void writeBackup(Context androidContext, byte[] savegame, String playerId) throws IOException {
-		File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER);
+    private static void writeBackup(Context androidContext, byte[] savegame, String playerId) throws IOException {
+        File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER);
         ensureDirExists(cheatDetectionFolder);
-		File backupFile = new File(cheatDetectionFolder, playerId + "X");
-		FileOutputStream fileOutputStream = new FileOutputStream(backupFile);
-		fileOutputStream.write(savegame);
-		fileOutputStream.close();
-	}
+        File backupFile = new File(cheatDetectionFolder, playerId + "X");
+        FileOutputStream fileOutputStream = new FileOutputStream(backupFile);
+        fileOutputStream.write(savegame);
+        fileOutputStream.close();
+    }
 
-	public static LoadSavegameResult loadWorld(WorldContext world, ControllerContext controllers, Context androidContext, int slot) {
-		try {
-			FileHeader fh = quickload(androidContext, slot);
-			if(fh == null) {
-				return LoadSavegameResult.unknownError;
-			}
-			if (!fh.hasUnlimitedSaves && slot != SLOT_QUICKSAVE && triedToCheat(androidContext, fh)) {
-				return LoadSavegameResult.cheatingDetected;
-			}
+    public static LoadSavegameResult loadWorld(WorldContext world, ControllerContext controllers, Context androidContext, int slot) {
+        try {
+            FileHeader fh = quickload(androidContext, slot);
+            if (fh == null) {
+                return LoadSavegameResult.unknownError;
+            }
+            if (!fh.hasUnlimitedSaves && slot != SLOT_QUICKSAVE && triedToCheat(androidContext, fh)) {
+                return LoadSavegameResult.cheatingDetected;
+            }
 
-			FileInputStream fos = getInputFile(androidContext, slot);
-			LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, androidContext, fos, fh);
-			fos.close();
-			if (result == LoadSavegameResult.success && slot != SLOT_QUICKSAVE && !world.model.statistics.hasUnlimitedSaves()) {
+            FileInputStream fos = getInputFile(androidContext, slot);
+            LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, fos, fh);
+            fos.close();
+            if (result == LoadSavegameResult.success && slot != SLOT_QUICKSAVE && !world.model.statistics.hasUnlimitedSaves()) {
                 // save to the quicksave slot before deleting the file
                 if (!saveWorld(world, androidContext, SLOT_QUICKSAVE)) {
-					return LoadSavegameResult.unknownError;
-				}
-				getSlotFile(slot, androidContext).delete();
-				writeCheatCheck(androidContext, DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED, fh.playerId);
-			}
-			return result;
-		} catch (IOException e) {
-			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
-				L.log("Error loading world: " + e.toString());
-				StringWriter sw = new StringWriter();
-				PrintWriter pw = new PrintWriter(sw);
-				e.printStackTrace(pw);
-				L.log("Load error: " + sw.toString());
-			}
-			return LoadSavegameResult.unknownError;
-		}
-	}
+                    return LoadSavegameResult.unknownError;
+                }
+                getSlotFile(slot, androidContext).delete();
+                writeCheatCheck(androidContext, DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED, fh.playerId);
+            }
+            return result;
+        } catch (IOException e) {
+            if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
+                L.log("Error loading world: " + e.toString());
+                StringWriter sw = new StringWriter();
+                PrintWriter pw = new PrintWriter(sw);
+                e.printStackTrace(pw);
+                L.log("Load error: " + sw.toString());
+            }
+            return LoadSavegameResult.unknownError;
+        }
+    }
 
     private static boolean triedToCheat(Context androidContext, FileHeader fh) throws IOException {
         long savedVersionToCheck = 0;
@@ -142,9 +138,9 @@ public final class Savegames {
             fileInputStream.close();
         }
 
-		if (savedVersionToCheck == DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED) {
-			return true;
-		}
+        if (savedVersionToCheck == DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED) {
+            return true;
+        }
 
         if (androidContext.getFileStreamPath(fh.playerId).exists()) {
             FileInputStream fileInputStream = androidContext.openFileInput(fh.playerId);
@@ -156,16 +152,16 @@ public final class Savegames {
                 savedVersionToCheck = cheatDetection.savedVersion;
             }
 
-			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
-				L.log("Internal cheatcheck file savedVersion: " + cheatDetection.savedVersion);
-			}
+            if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
+                L.log("Internal cheatcheck file savedVersion: " + cheatDetection.savedVersion);
+            }
 
-			dataInputStream.close();
-			fileInputStream.close();
-		}
+            dataInputStream.close();
+            fileInputStream.close();
+        }
 
-		return (savedVersionToCheck == DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED || fh.savedVersion < savedVersionToCheck);
-	}
+        return (savedVersionToCheck == DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED || fh.savedVersion < savedVersionToCheck);
+    }
 
     private static FileOutputStream getOutputFile(Context androidContext, int slot) throws IOException {
         if (slot == SLOT_QUICKSAVE) {
@@ -211,62 +207,61 @@ public final class Savegames {
     }
 
 
-	public static void saveWorld(WorldContext world, OutputStream outStream, String displayInfo) throws IOException {
-		DataOutputStream dest = new DataOutputStream(outStream);
-		FileHeader.writeToParcel(dest, world.model.player.getName(),
-				displayInfo, world.model.player.iconID,
-				world.model.statistics.isDead(),
-				world.model.statistics.hasUnlimitedSaves(),
-				world.model.player.id,
-				world.model.player.savedVersion);
-		world.maps.writeToParcel(dest, world);
-		world.model.writeToParcel(dest);
-		dest.close();
-	}
+    public static void saveWorld(WorldContext world, OutputStream outStream, String displayInfo) throws IOException {
+        DataOutputStream dest = new DataOutputStream(outStream);
+        FileHeader.writeToParcel(dest, world.model.player.getName(),
+                displayInfo, world.model.player.iconID,
+                world.model.statistics.isDead(),
+                world.model.statistics.hasUnlimitedSaves(),
+                world.model.player.id,
+                world.model.player.savedVersion);
+        world.maps.writeToParcel(dest, world);
+        world.model.writeToParcel(dest);
+        dest.close();
+    }
 
-    public static LoadSavegameResult loadWorld(Resources res, WorldContext world, ControllerContext controllers, Context androidContext, InputStream inState, FileHeader fh) throws IOException {
+    public static LoadSavegameResult loadWorld(Resources res, WorldContext world, ControllerContext controllers, InputStream inState, FileHeader fh) throws IOException {
         DataInputStream src = new DataInputStream(inState);
         final FileHeader header = new FileHeader(src, fh.skipIcon);
         if (header.fileversion > AndorsTrailApplication.CURRENT_VERSION)
             return LoadSavegameResult.savegameIsFromAFutureVersion;
 
-		world.maps.readFromParcel(src, world, controllers, header.fileversion);
-		world.model = new ModelContainer(src, world, controllers, header.fileversion);
-		WorldMapController.populateWorldMap(androidContext, world, controllers.getResources());
-		src.close();
-		
-		if (header.fileversion < 45) {
-			LegacySavegamesContentAdaptations.adaptToNewContentForVersion45(world, controllers, res);
-		}
-		
-		onWorldLoaded(res, world, controllers);
+        world.maps.readFromParcel(src, world, controllers, header.fileversion);
+        world.model = new ModelContainer(src, world, controllers, header.fileversion);
+        src.close();
 
-		return LoadSavegameResult.success;
-	}
+        if (header.fileversion < 45) {
+            LegacySavegamesContentAdaptations.adaptToNewContentForVersion45(world, controllers, res);
+        }
 
-	private static void onWorldLoaded(Resources res, WorldContext world, ControllerContext controllers) {
-		controllers.actorStatsController.recalculatePlayerStats(world.model.player);
-		controllers.mapController.resetMapsNotRecentlyVisited();
-		controllers.movementController.prepareMapAsCurrentMap(world.model.currentMaps.map, res, false);
-		controllers.gameRoundController.resetRoundTimers();
-	}
+        onWorldLoaded(res, world, controllers);
 
-	public static FileHeader quickload(Context androidContext, int slot) {
-		try {
-			if (slot != SLOT_QUICKSAVE) {
-				File f = getSlotFile(slot, androidContext);
-				if (!f.exists()) return null;
-			}
-			FileInputStream fos = getInputFile(androidContext, slot);
-			DataInputStream src = new DataInputStream(fos);
-			final FileHeader header = new FileHeader(src, false);
-			src.close();
-			fos.close();
-			return header;
-		} catch (Exception e) {
-			return null;
-		}
-	}
+        return LoadSavegameResult.success;
+    }
+
+    private static void onWorldLoaded(Resources res, WorldContext world, ControllerContext controllers) {
+        controllers.actorStatsController.recalculatePlayerStats(world.model.player);
+        controllers.mapController.resetMapsNotRecentlyVisited();
+        controllers.movementController.prepareMapAsCurrentMap(world.model.currentMaps.map, res, false);
+        controllers.gameRoundController.resetRoundTimers();
+    }
+
+    public static FileHeader quickload(Context androidContext, int slot) {
+        try {
+            if (slot != SLOT_QUICKSAVE) {
+                File f = getSlotFile(slot, androidContext);
+                if (!f.exists()) return null;
+            }
+            FileInputStream fos = getInputFile(androidContext, slot);
+            DataInputStream src = new DataInputStream(fos);
+            final FileHeader header = new FileHeader(src, false);
+            src.close();
+            fos.close();
+            return header;
+        } catch (Exception e) {
+            return null;
+        }
+    }
 
     private static void writeCheatCheck(Context androidContext, long savedVersion, String playerId) throws IOException {
         File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER);
@@ -278,14 +273,14 @@ public final class Savegames {
         dataOutputStream.close();
         fileOutputStream.close();
 
-		fileOutputStream = androidContext.openFileOutput(playerId, Context.MODE_PRIVATE);
-		dataOutputStream = new DataOutputStream(fileOutputStream);
-		CheatDetection.writeToParcel(dataOutputStream, savedVersion);
-		dataOutputStream.close();
-		fileOutputStream.close();
-	}
+        fileOutputStream = androidContext.openFileOutput(playerId, Context.MODE_PRIVATE);
+        dataOutputStream = new DataOutputStream(fileOutputStream);
+        CheatDetection.writeToParcel(dataOutputStream, savedVersion);
+        dataOutputStream.close();
+        fileOutputStream.close();
+    }
 
-	private static final Pattern savegameFilenamePattern = Pattern.compile(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX + "(\\d+)");
+    private static final Pattern savegameFilenamePattern = Pattern.compile(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX + "(\\d+)");
 
     public static List<Integer> getUsedSavegameSlots(Context context) {
         try {
@@ -308,22 +303,22 @@ public final class Savegames {
         }
     }
 
-	private static final class CheatDetection {
-		public final int fileversion;
-		public final long savedVersion;
+    private static final class CheatDetection {
+        public final int fileversion;
+        public final long savedVersion;
 
-		// ====== PARCELABLE ===================================================================
+        // ====== PARCELABLE ===================================================================
 
-		public CheatDetection(DataInputStream src) throws IOException {
-			this.fileversion = src.readInt();
-			this.savedVersion = src.readLong();
-		}
+        public CheatDetection(DataInputStream src) throws IOException {
+            this.fileversion = src.readInt();
+            this.savedVersion = src.readLong();
+        }
 
-		public static void writeToParcel(DataOutputStream dest, long savedVersion) throws IOException {
-			dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
-			dest.writeLong(savedVersion);
-		}
-	}
+        public static void writeToParcel(DataOutputStream dest, long savedVersion) throws IOException {
+            dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
+            dest.writeLong(savedVersion);
+        }
+    }
 
 
     public static final class FileHeader {
@@ -337,12 +332,12 @@ public final class Savegames {
         public final String playerId;
         public final long savedVersion;
 
-		public String describe() {
-			return (fileversion == AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION ? "(D) " : "") + playerName + ", " + displayInfo;
-		}
+        public String describe() {
+            return (fileversion == AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION ? "(D) " : "") + playerName + ", " + displayInfo;
+        }
 
 
-		// ====== PARCELABLE ===================================================================
+        // ====== PARCELABLE ===================================================================
 
         public FileHeader(DataInputStream src, boolean skipIcon) throws IOException {
             int fileversion = src.readInt();
@@ -357,40 +352,40 @@ public final class Savegames {
                 this.displayInfo = null;
             }
 
-			if (fileversion >= 43) {
-				int id = src.readInt();
-				if (skipIcon || id > TileManager.LAST_HERO) {
-					this.iconID = TileManager.CHAR_HERO_0;
-					this.skipIcon = true;
-				} else {
-					this.iconID = id;
-				}
-			} else {
-				this.iconID = TileManager.CHAR_HERO_0;
-			}
+            if (fileversion >= 43) {
+                int id = src.readInt();
+                if (skipIcon || id > TileManager.LAST_HERO) {
+                    this.iconID = TileManager.CHAR_HERO_0;
+                    this.skipIcon = true;
+                } else {
+                    this.iconID = id;
+                }
+            } else {
+                this.iconID = TileManager.CHAR_HERO_0;
+            }
 
-			if (fileversion >= 49) {
-				this.isDead = src.readBoolean();
-				this.hasUnlimitedSaves = src.readBoolean();
-				this.playerId = src.readUTF();
-				this.savedVersion = src.readLong();
-			} else {
-				this.isDead = false;
-				this.hasUnlimitedSaves = true;
-				this.playerId = "";
-				this.savedVersion = 0;
-			}
-		}
+            if (fileversion >= 49) {
+                this.isDead = src.readBoolean();
+                this.hasUnlimitedSaves = src.readBoolean();
+                this.playerId = src.readUTF();
+                this.savedVersion = src.readLong();
+            } else {
+                this.isDead = false;
+                this.hasUnlimitedSaves = true;
+                this.playerId = "";
+                this.savedVersion = 0;
+            }
+        }
 
-		public static void writeToParcel(DataOutputStream dest, String playerName, String displayInfo, int iconID, boolean isDead, boolean hasUnlimitedSaves, String playerId, long savedVersion) throws IOException {
-			dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
-			dest.writeUTF(playerName);
-			dest.writeUTF(displayInfo);
-			dest.writeInt(iconID);
-			dest.writeBoolean(isDead);
-			dest.writeBoolean(hasUnlimitedSaves);
-			dest.writeUTF(playerId);
-			dest.writeLong(savedVersion);
-		}
-	}
+        public static void writeToParcel(DataOutputStream dest, String playerName, String displayInfo, int iconID, boolean isDead, boolean hasUnlimitedSaves, String playerId, long savedVersion) throws IOException {
+            dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
+            dest.writeUTF(playerName);
+            dest.writeUTF(displayInfo);
+            dest.writeInt(iconID);
+            dest.writeBoolean(isDead);
+            dest.writeBoolean(hasUnlimitedSaves);
+            dest.writeUTF(playerId);
+            dest.writeLong(savedVersion);
+        }
+    }
 }

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

@@ -6,30 +6,20 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import androidx.annotation.RequiresApi;
-import androidx.core.content.FileProvider;
-import androidx.documentfile.provider.DocumentFile;
+import android.support.annotation.NonNull;
+import android.support.annotation.RequiresApi;
+import android.support.v4.content.FileProvider;
+import android.support.v4.provider.DocumentFile;
+import android.webkit.MimeTypeMap;
 
-import android.os.Handler;
-import android.os.Looper;
-
-import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.util.BackgroundWorker.BackgroundWorkerCallback;
-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) {
@@ -43,16 +33,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;
@@ -61,11 +51,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);
+            L.log("Error migrating data: " + e.toString());
             return false;
         }
         return true;
@@ -106,187 +96,68 @@ 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) {
-
-        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 copyDocumentFileToNewOrExistingFile(DocumentFile sourceFile, ContentResolver resolver, DocumentFile targetFolder) throws IOException {
+        copyDocumentFileToNewOrExistingFile(sourceFile, resolver, targetFolder, Constants.NO_FILE_EXTENSION_MIME_TYPE);
     }
 
-    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();
-            Uri uri = FileProvider.getUriForFile(context, applicationId + ".fileprovider", worldmap);
+            Uri uri = FileProvider.getUriForFile(context, "com.gpl.rpg.AndorsTrail_beta2.fileprovider", worldmap);
             return uri.toString();
         } else {
             return "file://" + worldmap.getAbsolutePath();
         }
     }
 
+
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public static Intent getNewOpenDirectoryIntent() {
-        return new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+        return intent;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@@ -297,176 +168,4 @@ public final class AndroidStorage {
         intent.setType(Constants.SAVEGAME_FILE_MIME_TYPE);
         return intent;
     }
-
-    @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<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();
-                for (int i = 0; i < sources.length; i++) {
-                    if (worker.isCancelled()) {
-                        workerCallback.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;
-                    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));
-        worker.run();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    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, loadingMessage);
-        progressDialog.setOnCancelListener(dialog -> worker.cancel());
-        ContentResolver resolver = context.getContentResolver();
-        Handler handler = Handler.createAsync(Looper.getMainLooper());
-
-        worker.setTask(workerCallback -> {
-            try {
-                workerCallback.onInitialize();
-                for (int i = 0; i < files.length; i++) {
-                    if (worker.isCancelled()) {
-                        workerCallback.onFailure(new CancellationException("Cancelled"));
-                        return;
-                    }
-                    DocumentFile file = files[i];
-                    if (file == null) {
-                        continue;
-                    }
-
-                    copyDocumentFileToNewOrExistingFile(file, resolver, targetDirectory);
-                    float progress = i / (float) files.length;
-                    workerCallback.onProgress(progress);
-                }
-                workerCallback.onComplete(true);
-            } catch (NullPointerException e) {
-                if (worker.isCancelled()) {
-                    workerCallback.onFailure(new CancellationException("Cancelled"));
-                }
-            } catch (Exception e) {
-                workerCallback.onFailure(e);
-            }
-        });
-        worker.setCallback(getDefaultBackgroundWorkerCallback(handler, progressDialog, callback));
-        worker.run();
-    }
-
-    private static BackgroundWorkerCallback<Boolean> getDefaultBackgroundWorkerCallback(Handler handler,
-                                                                                        CustomDialogFactory.CustomDialog progressDialog,
-                                                                                        Consumer<Boolean> callback) {
-        return new BackgroundWorkerCallback<Boolean>() {
-            private int progress = -1;
-
-            @Override
-            public void onInitialize() {
-                handler.post(() -> {
-                    CustomDialogFactory.show(progressDialog);
-                });
-            }
-
-            @Override
-            public void onProgress(float progress) {
-                handler.post(() -> {
-                    int intProgress = (int) (progress * 100);
-                    if (this.progress == intProgress) {
-                        return;
-                    }
-
-                    this.progress = intProgress;
-
-                    if (progress == -1) {
-                        CustomDialogFactory.setDesc(progressDialog, null);
-                        return;
-                    }
-
-                    CustomDialogFactory.setDesc(progressDialog, intProgress + "%");
-                });
-            }
-
-            @RequiresApi(api = Build.VERSION_CODES.N)
-            @Override
-            public void onFailure(Exception e) {
-                this.onComplete(false);
-            }
-
-            @RequiresApi(api = Build.VERSION_CODES.N)
-            @Override
-            public void onComplete(Boolean result) {
-                handler.post(() -> {
-                    progressDialog.dismiss();
-                    callback.accept(result);
-                });
-            }
-        };
-    }
-
-    private static CustomDialogFactory.CustomDialog getLoadingDialog(Context context) {
-        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

@@ -1,46 +0,0 @@
-package com.gpl.rpg.AndorsTrail.util;
-
-import java.util.concurrent.Executors;
-
-public final class BackgroundWorker<T> {
-	boolean cancelled = false;
-	worker<T> task;
-	BackgroundWorkerCallback<T> callback;
-
-	public void setTask(worker<T> task) {
-		this.task = task;
-	}
-
-	public void setCallback(BackgroundWorkerCallback<T> callback) {
-		this.callback = callback;
-	}
-
-	public void cancel() {
-		cancelled = true;
-	}
-
-	interface worker<T> {
-		void doWork(BackgroundWorkerCallback<T> callback);
-	}
-
-	interface BackgroundWorkerCallback<T> {
-		void onInitialize();
-
-		default void onProgress(float progress) {
-		}
-
-		void onFailure(Exception e);
-
-		void onComplete(T result);
-	}
-
-	public void run() {
-		Executors.newSingleThreadExecutor().execute(() -> {
-			task.doWork(callback);
-		});
-	}
-
-	public boolean isCancelled() {
-		return cancelled;
-	}
-}

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

@@ -30,18 +30,6 @@ public final class CoordRect {
 		return true;
 	}
 
-	public static CoordRect union(CoordRect r1, CoordRect r2) {
-		int left = Math.min(r1.topLeft.x, r2.topLeft.x);
-		int top = Math.min(r1.topLeft.y, r2.topLeft.y);
-		int right = Math.max(r1.topLeft.x + r1.size.width, r2.topLeft.x + r2.size.width);
-		int bottom = Math.max(r1.topLeft.y + r1.size.height, r2.topLeft.y + r2.size.height);
-
-		int width = right - left;
-		int height = bottom - top;
-
-		return new CoordRect(new Coord(left, top), new Size(width, height));
-	}
-
 	/*
 	public static boolean contains(final int x, final int y, final Size size, final Coord p) {
 		if (p.x < x) return false;

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

@@ -1,16 +0,0 @@
-package com.gpl.rpg.AndorsTrail.util;
-
-import java.util.HashMap;
-
-public final class HashMapHelper {
-	public static <K,V> V getOrDefault(HashMap<K,V> map, K key, V defaultValue) {
-		V v = map.get(key);
-		return v == null ? defaultValue : v;
-	}
-	public static <K> Integer sumIntegerValues(HashMap<K,Integer> map) {
-		int sum = 0;
-		for (Integer v : map.values()) sum += v;
-		return sum;
-	}
-
-}

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

@@ -1,8 +1,8 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface.OnDismissListener;
-import android.content.DialogInterface.OnCancelListener;
 import android.graphics.Rect;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
@@ -23,225 +23,166 @@ import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public class CustomDialogFactory {
 
-	public static class CustomDialog extends android.app.Dialog {
-		public CustomDialog(Context context) {
-			super(context);
-		}
-		boolean verticalButtons = false;
-	}
+    public static class CustomDialog extends Dialog {
+        public CustomDialog(Context context) {
+            super(context);
+        }
 
-	public static CustomDialog createDialog(final Context context, String title, Drawable icon,
-											String desc, View content, boolean hasButtons, boolean canDismiss) {
-		return createDialog(context, title, icon, desc, content, hasButtons, canDismiss, false);
-	}
+    }
 
-	public static CustomDialog createDialog(final Context context, String title, Drawable icon,
-											String desc, View content, boolean hasButtons) {
-		return createDialog(context, title, icon, desc, content, hasButtons, true);
-	}
+    public static CustomDialog createDialog(final Context context, String title, Drawable icon, String desc, View content, boolean hasButtons) {
+        return createDialog(context, title, icon, desc, content, hasButtons, true);
+    }
 
-	public static CustomDialog createDialog(final Context context, String title, Drawable icon,
-											String desc, View content, boolean hasButtons,
-											final boolean canDismiss, final boolean verticalButtons) {
-		final CustomDialog dialog = new CustomDialog(new ContextThemeWrapper(context, ThemeHelper.getDialogTheme())) {
-			@Override
-			public boolean onTouchEvent(MotionEvent event) {
-				Rect r = new Rect();
-				this.getWindow().getDecorView().findViewById(R.id.dialog_hitrect).getHitRect(r);
+    public static CustomDialog createDialog(final Context context, String title, Drawable icon, String desc, View content, boolean hasButtons, final boolean canDismiss) {
+        final CustomDialog dialog = new CustomDialog(new ContextThemeWrapper(context, ThemeHelper.getDialogTheme())) {
+            @Override
+            public boolean onTouchEvent(MotionEvent event) {
+                Rect r = new Rect();
+                this.getWindow().getDecorView().findViewById(R.id.dialog_hitrect).getHitRect(r);
 
-				if (r.contains((int)event.getX(), (int)event.getY())) {
-					return super.onTouchEvent(event);
-				} else {
-					if (canDismiss) {
-						this.dismiss();
-						return true;
-					}
-					return false;
-				}
-			}
+                if (r.contains((int) event.getX(), (int) event.getY())) {
+                    return super.onTouchEvent(event);
+                } else {
+                    if (canDismiss) {
+                        this.dismiss();
+                        return true;
+                    }
+                    return false;
+                }
+            }
 
-			@Override
-			public void onWindowFocusChanged(boolean hasFocus) {
-				super.onWindowFocusChanged(hasFocus);
-				TextView title = (TextView) this.getWindow().getDecorView().findViewById(R.id.dialog_title);
-				if (title != null && title.getCompoundDrawables() != null && title.getCompoundDrawables()[0] != null) {
-					if (title.getCompoundDrawables()[0] instanceof AnimationDrawable) {
-						((AnimationDrawable)title.getCompoundDrawables()[0]).start();
-					}
-				}
-			}
-		};
-		dialog.verticalButtons = verticalButtons;
+            @Override
+            public void onWindowFocusChanged(boolean hasFocus) {
+                super.onWindowFocusChanged(hasFocus);
+                TextView title = (TextView) this.getWindow().getDecorView().findViewById(R.id.dialog_title);
+                if (title != null && title.getCompoundDrawables() != null && title.getCompoundDrawables()[0] != null) {
+                    if (title.getCompoundDrawables()[0] instanceof AnimationDrawable) {
+                        ((AnimationDrawable) title.getCompoundDrawables()[0]).start();
+                    }
+                }
+            }
+        };
 
-		dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		dialog.setContentView(R.layout.custom_dialog_title_icon);
-		dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
-		if (((AndorsTrailApplication)context.getApplicationContext()).getPreferences().fullscreen) {
-			dialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-		} else {
-			dialog.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-		}
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(R.layout.custom_dialog_title_icon);
+        dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+        if (((AndorsTrailApplication) context.getApplicationContext()).getPreferences().fullscreen) {
+            dialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        } else {
+            dialog.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
 
-		setTitle(dialog, title, icon);
+        setTitle(dialog, title, icon);
 
-		setDesc(dialog, desc);
+        setDesc(dialog, desc);
 
-		setContent(dialog, content);
+        setContent(dialog, content);
 
-		ViewGroup buttonsHolder = getButtonContainer(dialog);
-		ViewGroup unusedButtonsHolder = getUnusedButtonContainer(dialog);
+        ViewGroup buttonsHolder = (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
+        if (hasButtons) {
+            buttonsHolder.setVisibility(View.VISIBLE);
+        } else {
+            buttonsHolder.setVisibility(View.GONE);
+        }
 
-		unusedButtonsHolder.setVisibility(View.GONE);
-		if (hasButtons) {
-			buttonsHolder.setVisibility(View.VISIBLE);
-		} else {
-			buttonsHolder.setVisibility(View.GONE);
-		}
+        return dialog;
+    }
 
-		return dialog;
-	}
+    public static CustomDialog createErrorDialog(final Context context, String title, String description) {
+        final CustomDialog d = createDialog(context,
+                title,
+                context.getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                description,
+                null,
+                true);
+        CustomDialogFactory.addDismissButton(d, android.R.string.ok);
+        return d;
+    }
 
-	public static CustomDialog createErrorDialog(final Context context, String title, String description) {
-		final CustomDialog d = createDialog(context,
-				title,
-				context.getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-				description,
-				null,
-				true);
-		CustomDialogFactory.addDismissButton(d, android.R.string.ok);
-		return d;
-	}
+    public static CustomDialog setTitle(final CustomDialog dialog, String title, Drawable icon) {
+        TextView titleView = (TextView) dialog.findViewById(R.id.dialog_title);
+        if (title != null || icon != null) {
+            titleView.setText(title);
+            titleView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+            titleView.setVisibility(View.VISIBLE);
+        } else {
+            titleView.setVisibility(View.GONE);
+        }
+        return dialog;
+    }
 
-	public static CustomDialog setTitle(final CustomDialog dialog, String title, Drawable icon) {
-		TextView titleView = (TextView) dialog.findViewById(R.id.dialog_title);
-		if (title != null || icon != null) {
-			titleView.setText(title);
-			titleView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
-			titleView.setVisibility(View.VISIBLE);
-		} else {
-			titleView.setVisibility(View.GONE);
-		}
-		return dialog;
-	}
+    public static CustomDialog setDesc(final CustomDialog dialog, String desc) {
+        TextView descView = (TextView) dialog.findViewById(R.id.dialog_description);
+        ViewGroup descHolder = (ViewGroup) dialog.findViewById(R.id.dialog_description_container);
+        if (desc != null) {
+            descView.setText(desc);
+            descHolder.setVisibility(View.VISIBLE);
+            descView.setVisibility(View.VISIBLE);
+        } else {
+            descHolder.setVisibility(View.GONE);
+        }
+        return dialog;
+    }
 
-	public static CustomDialog setDesc(final CustomDialog dialog, String desc) {
-		TextView descView = (TextView) dialog.findViewById(R.id.dialog_description);
-		ViewGroup descHolder = (ViewGroup) dialog.findViewById(R.id.dialog_description_container);
-		if (desc != null) {
-			descView.setText(desc);
-			descHolder.setVisibility(View.VISIBLE);
-			descView.setVisibility(View.VISIBLE);
-		} else {
-			descHolder.setVisibility(View.GONE);
-		}
-		return dialog;
-	}
+    public static CustomDialog setContent(final CustomDialog dialog, View content) {
+        ViewGroup contentHolder = (ViewGroup) dialog.findViewById(R.id.dialog_content_container);
+        if (content != null) {
+            contentHolder.addView(content);
+            contentHolder.setVisibility(View.VISIBLE);
+        } else {
+            contentHolder.setVisibility(View.GONE);
+        }
+        return dialog;
+    }
 
-	public static CustomDialog setContent(final CustomDialog dialog, View content) {
-		ViewGroup contentHolder = (ViewGroup) dialog.findViewById(R.id.dialog_content_container);
-		if (content != null) {
-			contentHolder.addView(content);
-			contentHolder.setVisibility(View.VISIBLE);
-		} else {
-			contentHolder.setVisibility(View.GONE);
-		}
-		return dialog;
-	}
+    public static Dialog addButton(final Dialog dialog, int textId, final OnClickListener listener) {
 
-	public static CustomDialog addButton(final CustomDialog dialog, String text, final OnClickListener listener) {
-		return addButton(dialog, -1, text, listener);
-	}
-	public static CustomDialog addButton(final CustomDialog dialog, int textId, final OnClickListener listener) {
-		return addButton(dialog, textId, null, listener);
-	}
-	public static CustomDialog addButton(final CustomDialog dialog, int textId, String text, final OnClickListener listener) {
-		Button template = getButtonTemplate(dialog);
-		LayoutParams params = template.getLayoutParams();
-		ViewGroup buttonsHolder = getButtonContainer(dialog);
+        Button template = (Button) dialog.findViewById(R.id.dialog_template_button);
+        LayoutParams params = template.getLayoutParams();
+        ViewGroup buttonsHolder = (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
 
-		Button b = new Button(dialog.getContext());
-		b.setLayoutParams(params);
-		//Old android versions need this "reminder"
-		b.setBackgroundDrawable(ThemeHelper.getThemeDrawable(dialog.getContext(), R.attr.ui_theme_textbutton_drawable));
-		b.setTextColor(ThemeHelper.getThemeColor(dialog.getContext(), R.attr.ui_theme_dialogue_light_color));
+        Button b = new Button(dialog.getContext());
+        b.setLayoutParams(params);
+        //Old android versions need this "reminder"
+        b.setBackgroundDrawable(ThemeHelper.getThemeDrawable(dialog.getContext(), R.attr.ui_theme_textbutton_drawable));
+        b.setTextColor(ThemeHelper.getThemeColor(dialog.getContext(), R.attr.ui_theme_dialogue_light_color));
 
-		if(textId != -1) {
-			b.setText(textId);
-		} else {
-			b.setText(text);
-		}
+        b.setText(textId);
+        b.setOnClickListener(new OnClickListener() {
 
-		b.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                listener.onClick(v);
+                dialog.dismiss();
+            }
+        });
 
-			@Override
-			public void onClick(View v) {
-				listener.onClick(v);
-				dialog.dismiss();
-			}
-		});
+        buttonsHolder.addView(b, params);
+        return dialog;
+    }
 
-		buttonsHolder.addView(b, params);
-		return dialog;
-	}
+    public static Dialog addDismissButton(final Dialog dialog, int textId) {
+        return CustomDialogFactory.addButton(dialog, textId, new OnClickListener() {
 
-	public static CustomDialog addDismissButton(final CustomDialog dialog, int textId) {
-		return CustomDialogFactory.addButton(dialog, textId, new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+    }
 
-			@Override
-			public void onClick(View v) {
-				dialog.dismiss();
-			}
-		});
-	}
-	public static CustomDialog addCancelButton(final CustomDialog dialog, int textId) {
-		return CustomDialogFactory.addButton(dialog, textId, new OnClickListener() {
+    public static Dialog setDismissListener(Dialog dialog, OnDismissListener listener) {
+        dialog.setOnDismissListener(listener);
 
-			@Override
-			public void onClick(View v) {
-				dialog.cancel();
-			}
-		});
-	}
+        return dialog;
+    }
 
-	public static CustomDialog setDismissListener(CustomDialog dialog, OnDismissListener listener) {
-		dialog.setOnDismissListener(listener);
+    public static void show(Dialog dialog) {
 
-		return dialog;
-	}
+        dialog.findViewById(R.id.dialog_template_button).setVisibility(View.GONE);
+        dialog.show();
 
-	public static CustomDialog setCancelListener(CustomDialog dialog, OnCancelListener listener) {
-		dialog.setOnCancelListener(listener);
-		return dialog;
-	}
-
-	public static void show(CustomDialog dialog) {
-
-		dialog.findViewById(R.id.dialog_template_button).setVisibility(View.GONE);
-		dialog.findViewById(R.id.dialog_template_button_vertical).setVisibility(View.GONE);
-		dialog.show();
-
-	}
-
-
-	private static ViewGroup getUnusedButtonContainer(CustomDialog dialog) {
-		if (dialog.verticalButtons)
-			return (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
-		else
-			return (ViewGroup) dialog.findViewById(R.id.dialog_button_container_vertical);
-	}
-
-	private static ViewGroup getButtonContainer(CustomDialog dialog) {
-		if (dialog.verticalButtons)
-			return (ViewGroup) dialog.findViewById(R.id.dialog_button_container_vertical);
-		else
-			return (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
-	}
-
-	private static Button getButtonTemplate(CustomDialog dialog) {
-		if (dialog.verticalButtons)
-			return (Button) dialog.findViewById(R.id.dialog_template_button_vertical);
-		else
-			return (Button) dialog.findViewById(R.id.dialog_template_button);
-	}
+    }
 
 }

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

@@ -292,8 +292,6 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 			}
 			if (condition.duration == ActorCondition.DURATION_FOREVER || condition.duration == ActorCondition.DURATION_NONE) {
 				duration = "\u221e";
-			} else if (condition.duration == ActorCondition.DURATION_FOREVER_UNTIL_SLEEP) {
-				duration = "";
 			} else {
 				duration = Integer.toString(condition.duration);
 			}

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

@@ -1,7 +1,6 @@
 package com.gpl.rpg.AndorsTrail.view;
 
 import java.lang.ref.WeakReference;
-import java.util.List;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
@@ -159,8 +158,8 @@ public final class MainView extends SurfaceView
 //		this.surfaceSize = new Size(w, h);
 		this.surfaceSize = new Size((int) (getWidth() / scale), (int) (getHeight() / scale));
 		this.screenSizeTileCount = new Size(
-				 getWidth()  / scaledTileSize
-				,getHeight() / scaledTileSize
+				(int) Math.floor(getWidth() / scaledTileSize)
+				,(int) Math.floor(getHeight() / scaledTileSize)
 			);
 		
 		if (sh.getSurfaceFrame().right != surfaceSize.width || sh.getSurfaceFrame().bottom != surfaceSize.height) {
@@ -227,28 +226,28 @@ public final class MainView extends SurfaceView
 			if (scrolling && why != RedrawAllDebugReason.MapScrolling) return;
 			if (!scrolling && movingSprites > 0 && why != RedrawAllDebugReason.SpriteMoved) return;
 		}
-		redrawArea_(mapViewArea, null);
+		redrawArea_(mapViewArea, null, 0, 0);
 	}
 	private void redrawTile(final Coord p, RedrawTileDebugReason why) {
 		if (scrolling) return;
 		p1x1.topLeft.set(p);
-		redrawArea_(p1x1, null);
+		redrawArea_(p1x1, null, 0, 0);
 	}
 	private void redrawArea(final CoordRect area, RedrawAreaDebugReason why) {
 		if (scrolling) return;
-		redrawArea_(area, null);
+		redrawArea_(area, null, 0, 0);
 	}
-	private void redrawArea_(CoordRect area, final List<VisualEffectAnimation> effects) {
+	private void redrawArea_(CoordRect area, final VisualEffectAnimation effect, int tileID, int textYOffset) {
 		if (!hasSurface) return;
 
-
+		
 		if (!currentMap.intersects(area)) return;
 		if (!mapViewArea.intersects(area)) return;
 
 		if (shouldRedrawEverything()) {
 			area = mapViewArea;
 		}
-
+		
 		calculateRedrawRect(area);
 		redrawRect.intersect(redrawClip);
 		Canvas c = null;
@@ -264,7 +263,7 @@ public final class MainView extends SurfaceView
 			if (area == mapViewArea) {
 				area = adaptAreaToScrolling(area);
 			}
-
+			
 			synchronized (holder) { synchronized (tiles) {
 				int xScroll = 0;
 				int yScroll = 0;
@@ -276,25 +275,32 @@ public final class MainView extends SurfaceView
 				}
 				c.clipRect(redrawClip);
 				c.translate(screenOffset.x + xScroll, screenOffset.y + yScroll);
+//				c.scale(scale, scale);
 				doDrawRect(c, area);
-				renderEffects(c, effects);
+				if (effect != null) {
+					drawFromMapPosition(c, area, effect.position, tileID);
+					if (effect.displayText != null) {
+						drawEffectText(c, area, effect, textYOffset, effect.getTextPaint());
+					}
+				}
+
+//				c.drawRect(new Rect(
+//						(area.topLeft.x - mapViewArea.topLeft.x) * tileSize, 
+//						(area.topLeft.y - mapViewArea.topLeft.y) * tileSize, 
+//						(area.topLeft.x - mapViewArea.topLeft.x + area.size.width) * tileSize - 1, 
+//						(area.topLeft.y - mapViewArea.topLeft.y + area.size.height) * tileSize - 1),
+//						redrawHighlight);
+//				if (touchedTile != null) c.drawRect(new Rect(
+//						(touchedTile.x - mapViewArea.topLeft.x) * tileSize, 
+//						(touchedTile.y - mapViewArea.topLeft.y) * tileSize, 
+//						(touchedTile.x - mapViewArea.topLeft.x + 1) * tileSize - 1, 
+//						(touchedTile.y - mapViewArea.topLeft.y + 1) * tileSize - 1), 
+//						touchHighlight);
 			} }
 		} finally {
 			if (c != null) holder.unlockCanvasAndPost(c);
 		}
 	}
-
-	private void renderEffects(Canvas canvas ,List<VisualEffectAnimation> effects) {
-		if(effects == null) return;
-		for (VisualEffectAnimation effect : effects) {
-			int tileID = effect.tileID;
-			int textYOffset = effect.textYOffset;
-			drawFromMapPosition(canvas, effect.area, effect.position, tileID);
-			if (effect.displayText != null) {
-				drawEffectText(canvas, effect.area, effect, textYOffset, effect.getTextPaint());
-			}
-		}
-	}
 	
 	private boolean isRedrawRectWholeScreen(Rect redrawRect) {
 //		if (redrawRect.width() < mapViewArea.size.width * scaledTileSize) return false;
@@ -311,21 +317,11 @@ public final class MainView extends SurfaceView
 		return true;
 	}
 	private final Rect redrawRect = new Rect();
-	private void redrawAreaWithEffect(List<VisualEffectAnimation> effects) {
-		CoordRect area = null;
-		for (int i = 0; i < effects.size(); i++) {
-			VisualEffectAnimation effect = effects.get(i);
-			if (area == null) {
-				area = effect.area;
-			} else {
-				area = CoordRect.union(area, effect.area);
-			}
-		}
-		if (area != null) {
-			redrawArea_(area, effects);
-		}
+	private void redrawAreaWithEffect(final VisualEffectAnimation effect, int tileID, int textYOffset) {
+		CoordRect area = effect.area;
+//		if (shouldRedrawEverythingForVisualEffect()) area = mapViewArea;
+		redrawArea_(area, effect, tileID, textYOffset);
 	}
-
 	private void clearCanvas() {
 		if (!hasSurface) return;
 		Canvas c = null;
@@ -798,8 +794,8 @@ public final class MainView extends SurfaceView
 	}
 
 	@Override
-	public void onNewAnimationFrames(List<VisualEffectAnimation> effects) {
-		redrawAreaWithEffect(effects);
+	public void onNewAnimationFrame(VisualEffectAnimation animation, int tileID, int textYOffset) {
+		redrawAreaWithEffect(animation, tileID, textYOffset);
 	}
 
 	@Override

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

@@ -9,15 +9,13 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ListView;
 
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
-
 /**
  * Simply instantiate this class, implement abstract methods in an anonymous type, and tada, your Button is a Spinner! 
  */
 public abstract class SpinnerEmulator {
 	
 	private Button spinnerButton;
-	private CustomDialog spinnerDialog = null;
+	private Dialog spinnerDialog = null;
 	private ListView choicesList;
 	private Context context;
 	

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

@@ -61,9 +61,13 @@ public final class TraitsInfoView {
 		tv.setText(Integer.toString(attackCost));
 
 		row = (TableRow) group.findViewById(R.id.traitsinfo_attack_chance_row);
-		tv = (TextView) group.findViewById(R.id.traitsinfo_attack_chance);
-		tv.setText(Integer.toString(attackChance));
-
+		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));
+		}
 
 		row = (TableRow) group.findViewById(R.id.traitsinfo_attack_damage_row);
 		if (damagePotential != null && damagePotential.max != 0) {