remove duplicates

Currently translated at 84.4% (14413 of 17061 strings)

AndorsTrail/.gitignore

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

AndorsTrail/app/build.gradle

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

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -3,8 +3,8 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="70"
-	android:versionName="0.8.5"
+	android:versionCode="78"
+	android:versionName="0.8.12dev"
 	android:installLocation="auto"
 	>
 
@@ -31,9 +31,9 @@
 		android:hasFragileUserData="true"
 		android:preserveLegacyExternalStorage="true"
 		>
-		<activity 
-		    android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
+		<activity
 			android:exported="true"
+		    android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
 		    android:clearTaskOnLaunch="true"
 		    >
 			<intent-filter>
@@ -63,7 +63,7 @@
 		<activity android:name="com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity" />
 
         <provider
-        android:name="android.support.v4.content.FileProvider"
+        android:name="androidx.core.content.FileProvider"
         android:authorities="${applicationId}.fileprovider"
         android:grantUriPermissions="true"
         android:exported="false">

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

@@ -26,13 +26,13 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
 	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
 	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.5";
+	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
+	public static final String CURRENT_VERSION_DISPLAY = "0.8.12dev";
 	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 : 71;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 78;
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();

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

@@ -15,7 +15,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -66,14 +66,6 @@ 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);
 	}

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

@@ -134,9 +134,8 @@ public final class WorldSetup {
 					onSceneLoadedListener = null;
 					if (o == null) return;
 
-					if (loadResult == Savegames.LoadSavegameResult.success
-					 || loadResult == Savegames.LoadSavegameResult.editDetected) {
-						o.onSceneLoaded(loadResult);
+					if (loadResult == Savegames.LoadSavegameResult.success) {
+						o.onSceneLoaded();
 					} else {
 						o.onSceneLoadFailed(loadResult);
 					}
@@ -162,7 +161,7 @@ public final class WorldSetup {
 
 
 	public static interface OnSceneLoadedListener {
-		void onSceneLoaded(Savegames.LoadSavegameResult loadResult);
+		void onSceneLoaded();
 		void onSceneLoadFailed(Savegames.LoadSavegameResult loadResult);
 	}
 	public interface OnResourcesLoadedListener {

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

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

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

@@ -31,6 +31,7 @@ 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;
@@ -58,6 +59,9 @@ 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() {
@@ -178,7 +182,7 @@ public final class DebugInterface {
 				,new DebugButton("cr", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "houseatcrossroads4", "down", 0, 0);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crossroads", "middle", 0, 0);
 			}
 		})
 				,new DebugButton("lf", new OnClickListener() {
@@ -242,11 +246,8 @@ public final class DebugInterface {
 				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 : tpButtons3) {
+							tpButton.b.setVisibility(View.VISIBLE);
 						}
 						for (DebugButton tpButton : tpButtons2) {
 							tpButton.b.setVisibility(View.GONE);
@@ -277,9 +278,144 @@ 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("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, "waterway11_east", "west", 0, 0);
+			}
+		})
+
+				,new DebugButton("#2", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "laerothtomb1", "north", 0, 0);
+			}
+		})
+
+
+				,new DebugButton("#3", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "mountainlake8", "north", 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);
 
@@ -289,6 +425,9 @@ 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 android.support.v4.app.FragmentTabHost;
+import androidx.fragment.app.FragmentTabHost;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;

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

@@ -20,8 +20,8 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.RequiresApi;
-import android.support.v4.provider.DocumentFile;
+import androidx.annotation.RequiresApi;
+import androidx.documentfile.provider.DocumentFile;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;

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

@@ -141,18 +141,13 @@ public final class LoadingActivity extends AndorsTrailBaseActivity implements On
 	
 	
 	@Override
-	public void onSceneLoaded(Savegames.LoadSavegameResult loadResult) {
+	public void onSceneLoaded() {
 		synchronized (semaphore) {
 			if (progressDialog != null) progressDialog.dismiss();
 			loaded =true;
 		}
-
-		if (loadResult == Savegames.LoadSavegameResult.editDetected) {
-			showLoadingWarnDialog(R.string.dialog_loading_warning_edit);
-		}else{
-			startActivity(new Intent(this, MainActivity.class));
-			this.finish();
-		}
+		startActivity(new Intent(this, MainActivity.class));
+		this.finish();
 	}
 
 	@Override
@@ -170,19 +165,6 @@ public final class LoadingActivity extends AndorsTrailBaseActivity implements On
 		}
 	}
 
-	private void showLoadingWarnDialog(int messageResourceID) {
-		final CustomDialog d = CustomDialogFactory.createDialog(this, getResources().getString(R.string.dialog_loading_warning_title), null, getResources().getString(messageResourceID), null, true);
-		CustomDialogFactory.addDismissButton(d, android.R.string.ok);
-		CustomDialogFactory.setDismissListener(d, new OnDismissListener() {
-			@Override
-			public void onDismiss(DialogInterface dialog) {
-
-				startActivity(new Intent(LoadingActivity.this, MainActivity.class));
-				LoadingActivity.this.finish();
-			}
-		});
-		CustomDialogFactory.show(d);
-	}
 	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);
 		CustomDialogFactory.addDismissButton(d, android.R.string.ok);

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

@@ -397,12 +397,10 @@ 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/ShopActivity.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/context/WorldContext.java

@@ -1,8 +1,5 @@
 package com.gpl.rpg.AndorsTrail.context;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
@@ -15,10 +12,6 @@ import com.gpl.rpg.AndorsTrail.model.quest.QuestCollection;
 import com.gpl.rpg.AndorsTrail.resource.ConversationLoader;
 import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail.util.ByteUtils;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 
 public final class WorldContext {
 	//Objectcollections
@@ -69,13 +62,4 @@ public final class WorldContext {
 	public void resetForNewGame() {
 		maps.resetForNewGame();
 	}
-
-    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public String createHash() throws NoSuchAlgorithmException {
-		MessageDigest digest = MessageDigest.getInstance("MD5");
-		this.maps.createHash(digest);
-		this.model.createHash(digest);
-		byte[] hash = digest.digest();
-		return ByteUtils.toHexString(hash);
-    }
 }

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

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

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

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

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

@@ -68,6 +68,7 @@ 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;
@@ -79,7 +80,7 @@ public final class MapController {
 			steppedOnRestArea(o);
 			break;
 		case script:
-			runScriptArea(o);
+			runScriptInArea(o);
 			break;
 		}
 	}
@@ -93,7 +94,7 @@ public final class MapController {
 		return true;
 	}
 
-	private void runScriptArea(MapObject o) {
+	private void runScriptInArea(MapObject o) {
 		Resources res = controllers.getResources();
 		mapScriptExecutor.proceedToPhrase(res, o.id, true, true);
 		controllers.mapController.applyCurrentMapReplacements(res, true);
@@ -164,6 +165,7 @@ 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,5 +1,6 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListeners;
@@ -17,6 +18,7 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemCategory;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class SkillController {
 	private final ControllerContext controllers;
@@ -58,6 +60,9 @@ public final class SkillController {
 
 	public static int getDropChanceRollBias(DropItem item, Player player) {
 		if (player == null) return 0;
+		if(item.itemType == null && AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES){
+			L.log("Item type missing: " + item + " " + player.id);
+		}
 
 		if (ItemTypeCollection.isGoldItemType(item.itemType.id)) {
 			return getRollBias(item, player, SkillID.coinfinder, SkillCollection.PER_SKILLPOINT_INCREASE_COINFINDER_CHANCE_PERCENT);

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

@@ -3,7 +3,6 @@ package com.gpl.rpg.AndorsTrail.model;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -13,8 +12,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import android.content.res.Resources;
-import android.os.Build;
-import android.support.annotation.RequiresApi;
 
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -22,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.ByteUtils;
 import com.gpl.rpg.AndorsTrail.util.HashMapHelper;
 
 public final class GameStatistics {
@@ -218,21 +214,4 @@ public final class GameStatistics {
 		dest.writeInt(startLives);
 		dest.writeBoolean(unlimitedSaves);
 	}
-
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public void createHash(MessageDigest digest) {
-		digest.update(ByteUtils.toBytes(deaths));
-
-		for (Entry<String, Integer> e : killedMonstersByTypeID.entrySet()) {
-			digest.update(ByteUtils.toBytes(e.getKey()));
-			digest.update(ByteUtils.toBytes(e.getValue()));
-		}
-		for (Entry<String, Integer> e : usedItems.entrySet()) {
-			digest.update(ByteUtils.toBytes(e.getKey()));
-			digest.update(ByteUtils.toBytes(e.getValue()));
-		}
-		digest.update(ByteUtils.toBytes(spentGold));
-		digest.update(ByteUtils.toBytes(startLives));
-		digest.update(ByteUtils.toBytes(unlimitedSaves));
-	}
 }

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

@@ -3,10 +3,8 @@ package com.gpl.rpg.AndorsTrail.model;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail.util.ByteUtils;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class InterfaceData {
@@ -53,12 +51,4 @@ public final class InterfaceData {
 		}
 		dest.writeUTF(selectedTabHeroInfo);
 	}
-
-    public void createHash(MessageDigest digest) {
-		digest.update(ByteUtils.toBytes(isMainActivityVisible));
-		digest.update(ByteUtils.toBytes(isInCombat));
-		if(selectedPosition != null){
-			selectedPosition.createHash(digest);
-		}
-    }
 }

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

@@ -1,17 +1,12 @@
 package com.gpl.rpg.AndorsTrail.model;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.util.ByteUtils;
 
 public final class ModelContainer {
 
@@ -54,14 +49,4 @@ public final class ModelContainer {
 		statistics.writeToParcel(dest);
 		worldData.writeToParcel(dest);
 	}
-
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public void createHash(MessageDigest digest) {
-		player.createHash(digest);
-		digest.update(ByteUtils.toBytes(currentMaps.map.name));
-		uiSelections.createHash(digest);
-		statistics.createHash(digest);
-		worldData.createHash(digest);
-
-	}
 }

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

@@ -1,17 +1,13 @@
 package com.gpl.rpg.AndorsTrail.model;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
-import com.gpl.rpg.AndorsTrail.util.ByteUtils;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 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>();
@@ -42,6 +38,62 @@ public final class WorldData {
 		return v + duration <= worldTime;
 	}
 
+	public int getDate(String format) {
+		Calendar now = Calendar.getInstance();
+		int ret;
+		switch (format) {
+			case "YYYYMMDD":
+				ret = now.get(Calendar.YEAR)*10000 + (now.get(Calendar.MONTH) + 1)*100 + now.get(Calendar.DAY_OF_MONTH);
+				break;
+			case "YYYYMM":
+				ret = now.get(Calendar.YEAR)*100 + (now.get(Calendar.MONTH) + 1);
+				break;
+			case "YYYY":
+				ret = now.get(Calendar.YEAR);
+				break;
+			case "MMDD":
+				ret = (now.get(Calendar.MONTH) + 1)*100 + now.get(Calendar.DAY_OF_MONTH);
+				break;
+			case "MM":
+				ret = (now.get(Calendar.MONTH) + 1);
+				break;
+			case "DD":
+				ret = now.get(Calendar.DAY_OF_MONTH);
+				break;
+			default:
+				ret = 99999999;		//never true
+		}
+		return ret;
+	}
+
+	public int getTime(String format) {
+		Calendar now = Calendar.getInstance();
+		int ret;
+		switch (format) {
+			case "HHMMSS":
+				ret = now.get(Calendar.HOUR_OF_DAY)*10000 + now.get(Calendar.MINUTE)*100 + now.get(Calendar.SECOND);
+				break;
+			case "HHMM":
+				ret = now.get(Calendar.HOUR_OF_DAY)*100 + now.get(Calendar.MINUTE);
+				break;
+			case "HH":
+				ret = now.get(Calendar.HOUR_OF_DAY);
+				break;
+			case "MMSS":
+				ret = now.get(Calendar.MINUTE)*100 + now.get(Calendar.SECOND);
+				break;
+			case "MM":
+				ret = now.get(Calendar.MINUTE);
+				break;
+			case "SS":
+				ret = now.get(Calendar.SECOND);
+				break;
+			default:
+				ret = 99999999;		//never true
+		}
+		return ret;
+	}
+
 	// ====== PARCELABLE ===================================================================
 
 	public WorldData(DataInputStream src, int fileversion) throws IOException {
@@ -62,13 +114,4 @@ public final class WorldData {
 			dest.writeLong(e.getValue());
 		}
 	}
-
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public void createHash(MessageDigest digest) {
-		digest.update(ByteUtils.toBytes(worldTime));
-		for (Map.Entry<String, Long> e: timers.entrySet() ) {
-			digest.update(ByteUtils.toBytes(e.getKey()));
-			digest.update(ByteUtils.toBytes(e.getValue()));
-		}
-	}
 }

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

@@ -1,15 +1,10 @@
 package com.gpl.rpg.AndorsTrail.model.ability;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.util.ByteUtils;
 
 public final class ActorCondition {
 	public static final int MAGNITUDE_REMOVE_ALL = -99;
@@ -50,12 +45,4 @@ public final class ActorCondition {
 		dest.writeInt(magnitude);
 		dest.writeInt(duration);
 	}
-
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public void createHash(MessageDigest digest) {
-		digest.update(ByteUtils.toBytes(conditionType.conditionTypeID));
-		digest.update(ByteUtils.toBytes(magnitude));
-		digest.update(ByteUtils.toBytes(duration));
-
-	}
 }

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

@@ -1,12 +1,8 @@
 package com.gpl.rpg.AndorsTrail.model.actor;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
@@ -17,7 +13,6 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForMonster;
-import com.gpl.rpg.AndorsTrail.util.ByteUtils;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.Range;
@@ -198,28 +193,4 @@ public final class Monster extends Actor {
 			dest.writeBoolean(false);
 		}
 	}
-
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public void createHash(MessageDigest digest) {
-		digest.update(ByteUtils.toBytes(getMonsterTypeID()));
-		digest.update(ByteUtils.toBytes(attackCost));
-		digest.update(ByteUtils.toBytes(attackChance));
-		digest.update(ByteUtils.toBytes(criticalSkill));
-		digest.update(ByteUtils.toBytes(criticalMultiplier));
-		damagePotential.createHash(digest);
-		digest.update(ByteUtils.toBytes(blockChance));
-		digest.update(ByteUtils.toBytes(damageResistance));
-		ap.createHash(digest);
-		health.createHash(digest);
-		position.createHash(digest);
-		for (ActorCondition c: conditions){
-			c.createHash(digest);
-		}
-
-		digest.update(ByteUtils.toBytes(moveCost));
-		digest.update(ByteUtils.toBytes(forceAggressive));
-		if (shopItems != null) {
-			shopItems.createHash(digest);
-		}
-	}
 }

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

@@ -3,7 +3,6 @@ package com.gpl.rpg.AndorsTrail.model.actor;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -14,8 +13,6 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.UUID;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.util.SparseIntArray;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
@@ -30,7 +27,6 @@ import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.model.quest.Quest;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForPlayer;
-import com.gpl.rpg.AndorsTrail.util.ByteUtils;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.Range;
 import com.gpl.rpg.AndorsTrail.util.Size;
@@ -59,11 +55,9 @@ public final class Player extends Actor {
 	public String id = UUID.randomUUID().toString();
 	public long savedVersion = 1; // the version get's increased for cheat detection everytime a player with limited saves is saved
 
-	public boolean wasEditingDetected;
-	public String hash;
 
 
-    // Unequipped stats
+	// Unequipped stats
 	public static final class PlayerBaseTraits {
 		public int iconID;
 		public int maxAP;
@@ -422,13 +416,6 @@ public final class Player extends Actor {
 			this.id = src.readUTF();
 			this.savedVersion = src.readLong();
 		}
-		if (fileversion >= 71){
-			this.hash = src.readUTF();
-			this.wasEditingDetected = src.readBoolean();
-		}else{
-			this.hash = "";
-			this.wasEditingDetected = false;
-		}
 	}
 
 	public void writeToParcel(DataOutputStream dest) throws IOException {
@@ -487,58 +474,6 @@ public final class Player extends Actor {
 		}
 		dest.writeUTF(id);
 		dest.writeLong(savedVersion);
-		dest.writeUTF(hash);
-		dest.writeBoolean(wasEditingDetected);
-	}
-
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public void createHash(MessageDigest digest) {
-		//skipping icon ID so that it can be changed without hash difference
-		digest.update(ByteUtils.toBytes(baseTraits.maxAP));
-		digest.update(ByteUtils.toBytes(baseTraits.maxHP));
-		//skipping name so that it can be changed without hash difference
-		digest.update(ByteUtils.toBytes(moveCost));
-		digest.update(ByteUtils.toBytes(baseTraits.attackCost));
-		digest.update(ByteUtils.toBytes(baseTraits.attackChance));
-		digest.update(ByteUtils.toBytes(baseTraits.criticalSkill));
-		digest.update(ByteUtils.toBytes(baseTraits.criticalMultiplier));
-		baseTraits.damagePotential.createHash(digest);
-		digest.update(ByteUtils.toBytes(baseTraits.blockChance));
-		digest.update(ByteUtils.toBytes(baseTraits.damageResistance));
-		digest.update(ByteUtils.toBytes(baseTraits.moveCost));
-		ap.createHash(digest);
-		health.createHash(digest);
-		position.createHash(digest);
-		for(ActorCondition c :  conditions){
-			c.createHash(digest);
-		}
-		lastPosition.createHash(digest);
-		nextPosition.createHash(digest);
-		digest.update(ByteUtils.toBytes(level));
-		digest.update(ByteUtils.toBytes(totalExperience));
-		inventory.createHash(digest);
-		digest.update(ByteUtils.toBytes(baseTraits.useItemCost));
-		digest.update(ByteUtils.toBytes(baseTraits.reequipCost));
-		for (int i = 0; i<skillLevels.size(); i++){
-			digest.update(ByteUtils.toBytes(skillLevels.keyAt(i)));
-			digest.update(ByteUtils.toBytes(skillLevels.valueAt(i)));
-		}
-		digest.update(ByteUtils.toBytes(spawnMap));
-		digest.update(ByteUtils.toBytes(spawnPlace));
-		for (Entry<String, LinkedHashSet<Integer> > e:questProgress.entrySet()		 ) {
-			digest.update(ByteUtils.toBytes(e.getKey()));
-			for(int progress: e.getValue()){
-				digest.update(ByteUtils.toBytes(progress));
-			}
-		}
-		digest.update(ByteUtils.toBytes(availableSkillIncreases));
-		for (Entry<String, Integer> e:alignments.entrySet()			 ) {
-			digest.update(ByteUtils.toBytes(e.getKey()));
-			digest.update(ByteUtils.toBytes(e.getValue()));
-		}
-		digest.update(ByteUtils.toBytes(id));
-//		digest.update(ByteUtils.toBytes(savedVersion));
-//		digest.update(ByteUtils.toBytes(wasEditingDetected));
 	}
 }
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java

@@ -1,19 +1,14 @@
 package com.gpl.rpg.AndorsTrail.model.item;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.util.ByteUtils;
 
 public class ItemContainer {
 	public final ArrayList<ItemEntry> items = new ArrayList<ItemEntry>();
@@ -28,8 +23,7 @@ public class ItemContainer {
 		return result;
 	}
 
-
-    public static final class ItemEntry {
+	public static final class ItemEntry {
 		public final ItemType itemType;
 		public int quantity;
 		public ItemEntry(ItemType itemType, int initialQuantity) {
@@ -48,12 +42,6 @@ public class ItemContainer {
 			dest.writeUTF(itemType.id);
 			dest.writeInt(quantity);
 		}
-
-		@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-		public void createHash(MessageDigest digest) {
-			digest.update(ByteUtils.toBytes(itemType.id));
-			digest.update(ByteUtils.toBytes(quantity));
-		}
 	}
 
 	public void addItem(ItemType itemType, int quantity) {
@@ -292,12 +280,4 @@ public class ItemContainer {
 			e.writeToParcel(dest);
 		}
 	}
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public void createHash(MessageDigest digest) {
-		for (ItemEntry e :
-				items) {
-			e.createHash(digest);
-		}
-
-	}
 }

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/item/Loot.java

@@ -1,16 +1,11 @@
 package com.gpl.rpg.AndorsTrail.model.item;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer;
-import com.gpl.rpg.AndorsTrail.util.ByteUtils;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class Loot {
@@ -93,13 +88,4 @@ public final class Loot {
 		position.writeToParcel(dest);
 		dest.writeBoolean(isVisible);
 	}
-
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public void createHash(MessageDigest digest) {
-		digest.update(ByteUtils.toBytes(exp));
-		digest.update(ByteUtils.toBytes(exp));
-		items.createHash(digest);
-		position.createHash(digest);
-		digest.update(ByteUtils.toBytes(isVisible));
-	}
 }

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

@@ -1,12 +1,8 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -92,27 +88,15 @@ public final class MapCollection {
 		return false;
 	}
 
-	private List<PredefinedMap> getAllSavedMaps(WorldContext world) {
+	public void writeToParcel(DataOutputStream dest, WorldContext world) throws IOException {
 		List<PredefinedMap> mapsToExport = new ArrayList<PredefinedMap>();
 		for(PredefinedMap map : getAllMaps()) {
 			if (shouldSaveMap(world, map)) mapsToExport.add(map);
 		}
-		return mapsToExport;
-	}
-
-	public void writeToParcel(DataOutputStream dest, WorldContext world) throws IOException {
-		List<PredefinedMap> mapsToExport = getAllSavedMaps(world);
 		dest.writeInt(mapsToExport.size());
 		for(PredefinedMap map : mapsToExport) {
 			dest.writeUTF(map.name);
 			map.writeToParcel(dest, world);
 		}
 	}
-
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public void createHash(MessageDigest digest) {
-		for (PredefinedMap map : getAllMaps()) {
-			map.createHash(digest);
-		}
-	}
 }

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

@@ -1,12 +1,8 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -14,7 +10,6 @@ import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail.util.ByteUtils;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.Range;
@@ -22,7 +17,7 @@ import com.gpl.rpg.AndorsTrail.util.Range;
 public final class MonsterSpawnArea {
 	public final CoordRect area;
 	public final Range quantity;
-	private final Range spawnChance;
+	private final Range respawnspeed;
 	public final String areaID;
 	public final String[] monsterTypeIDs;
 	public final List<Monster> monsters = new CopyOnWriteArrayList<Monster>();
@@ -35,7 +30,7 @@ public final class MonsterSpawnArea {
 	public MonsterSpawnArea(
 			CoordRect area
 			, Range quantity
-			, Range spawnChance
+			, Range respawnspeed
 			, String areaID
 			, String[] monsterTypeIDs
 			, boolean isUnique
@@ -45,7 +40,7 @@ public final class MonsterSpawnArea {
 	) {
 		this.area = area;
 		this.quantity = quantity;
-		this.spawnChance = spawnChance;
+		this.respawnspeed = respawnspeed;
 		this.areaID = areaID;
 		this.monsterTypeIDs = monsterTypeIDs;
 		this.isUnique = isUnique;
@@ -106,7 +101,7 @@ public final class MonsterSpawnArea {
 	}
 
 	public boolean rollShouldSpawn() {
-		return Constants.rollResult(spawnChance);
+		return Constants.rollResult(respawnspeed);
 	}
 
 	public void removeAllMonsters() {
@@ -145,13 +140,4 @@ public final class MonsterSpawnArea {
 			m.writeToParcel(dest);
 		}
 	}
-
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public void createHash(MessageDigest digest) {
-		digest.update(ByteUtils.toBytes(isSpawning));
-		for (Monster m :
-				monsters) {
-			m.createHash(digest);
-		}
-	}
 }

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

@@ -1,12 +1,8 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -20,7 +16,6 @@ import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.model.map.MapObject.MapObjectType;
-import com.gpl.rpg.AndorsTrail.util.ByteUtils;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.L;
@@ -345,7 +340,6 @@ public final class PredefinedMap {
 				}
 			}
 		} else {
-			currentColorFilter = null;
 			activeMapObjectGroups.clear();
 			activeMapObjectGroups.addAll(initiallyActiveMapObjectGroups);
 			activateMapObjects();
@@ -366,20 +360,16 @@ public final class PredefinedMap {
 	}
 
 	public boolean shouldSaveMapData(WorldContext world) {
-		if (this == world.model.currentMaps.map) return true;
-		return mapDataNeedsToBeSaved();
-	}
-
-	private boolean mapDataNeedsToBeSaved() {
 		if (!hasResetTemporaryData()) return true;
+		if (this == world.model.currentMaps.map) return true;
 		if (!groundBags.isEmpty()) return true;
 		for (MonsterSpawnArea a : spawnAreas) {
 			if (this.visited && a.isUnique) return true;
 			if (a.isSpawning != a.isSpawningForNewGame) return true;
 		}
-		if (!activeMapObjectGroups.containsAll(initiallyActiveMapObjectGroups)
-		 || !initiallyActiveMapObjectGroups.containsAll(activeMapObjectGroups)) return true;
-		if (currentColorFilter != null && !currentColorFilter.equals(initialColorFilter)) return true;
+		if (!activeMapObjectGroups.containsAll(initiallyActiveMapObjectGroups) 
+				|| !initiallyActiveMapObjectGroups.containsAll(activeMapObjectGroups)) return true;
+		if (currentColorFilter != null) return true;
 		return false;
 	}
 
@@ -408,23 +398,4 @@ public final class PredefinedMap {
 		dest.writeBoolean(visited);
 		dest.writeUTF(lastSeenLayoutHash);
 	}
-
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public void createHash(MessageDigest digest) {
-		if (mapDataNeedsToBeSaved()) {
-			for (MonsterSpawnArea a : spawnAreas) {
-				a.createHash(digest);
-			}
-			for (String g : activeMapObjectGroups) {
-				digest.update(ByteUtils.toBytes(g));
-			}
-			for (Loot l : groundBags) {
-				l.createHash(digest);
-			}
-			digest.update(ByteUtils.toBytes(currentColorFilter));
-			//skip lastVisitTime since it is too volatile
-		}
-		digest.update( ByteUtils.toBytes(visited));
-		digest.update( ByteUtils.toBytes(lastSeenLayoutHash));
-	}
 }

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

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

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

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

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

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

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

@@ -137,7 +137,8 @@ public final class ResourceLoader {
 		final ItemTypeParser itemTypeParser = new ItemTypeParser(loader, world.actorConditionsTypes, world.itemCategories, translationLoader);
 		final TypedArray itemsToLoad = r.obtainTypedArray(itemsResourceId);
 		for (int i = 0; i < itemsToLoad.length(); ++i) {
-			world.itemTypes.initialize(itemTypeParser, readStringFromRaw(r, itemsToLoad, i));
+			String s = readStringFromRaw(r, itemsToLoad, i);
+			world.itemTypes.initialize(itemTypeParser, s);
 		}
 		itemsToLoad.recycle();
 		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ItemTypeParser");
@@ -250,6 +251,7 @@ public final class ResourceLoader {
 
 	private static void prepareTilesets(DynamicTileLoader loader, int mTileSize) {
 		final Size sz1x1 = new Size(1, 1);
+		final Size sz1x2 = new Size(1, 2);
 		final Size sz2x1 = new Size(2, 1);
 		final Size sz2x2 = new Size(2, 2);
 		final Size sz2x3 = new Size(2, 3);
@@ -258,6 +260,7 @@ public final class ResourceLoader {
 		final Size sz6x1 = new Size(6, 1);
 		final Size sz7x1 = new Size(7, 1);
 		final Size sz8x3 = new Size(8, 3);
+		final Size sz16x8 = new Size(16, 8);
 		final Size sz20x12 = new Size(20, 12);
 		final Size mapTileSize = new Size(16, 8);
 		final Size sz8x8 = new Size(8, 8);
@@ -299,16 +302,19 @@ 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);
@@ -334,6 +340,10 @@ 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);
@@ -368,9 +378,12 @@ 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", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_border_1, "map_border_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_bridge_1, "map_bridge_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_bridge_2, "map_bridge_2", mapTileSize, sz1x1, mTileSize);
@@ -379,6 +392,7 @@ public final class ResourceLoader {
 		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);
@@ -386,6 +400,7 @@ 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);
@@ -398,6 +413,8 @@ 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);
@@ -406,37 +423,45 @@ 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_guynmart, "map_guynmart", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_cavewall_5, "map_cavewall_5", new Size(6, 6), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_rock_3, "map_rock_3", new Size(6, 5), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_sign_ladder_omi2, "map_sign_ladder_omi2", new Size(8, 4), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_transition_6, "map_transition_6", new Size(18, 8), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_ratdom, "map_ratdom", new Size(18, 6), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_items_japozero, "map_items_japozero", new Size(16, 37), 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,6 +39,12 @@ public final class DropListParser extends JsonCollectionParserFor<DropList> {
 			if (items == null) {
 				L.log("OPTIMIZE: Droplist \"" + droplistID + "\" has no dropped items.");
 			}
+			for (int i = 0; i < items.length; i++) {
+				DropItem item = items[i];
+				if (item.itemType == null) {
+					L.log("Item at index " + i + " in droplist " + droplistID + " was null");
+				}
+			}
 		}
 
 		return new Pair<String, DropList>(droplistID, new DropList(items));

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

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

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

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

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/savegames/Savegames.java

@@ -12,7 +12,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -21,7 +20,6 @@ import java.util.regex.Pattern;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.os.Build;
 import android.os.SystemClock;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
@@ -44,7 +42,6 @@ public final class Savegames {
 
 	public static enum LoadSavegameResult {
 		success
-		, editDetected
 		, unknownError
 		, savegameIsFromAFutureVersion
 		, cheatingDetected
@@ -81,7 +78,7 @@ public final class Savegames {
 			}
 
 			return true;
-		} catch (IOException | NoSuchAlgorithmException e) {
+		} catch (IOException e) {
 			L.log("Error saving world: " + e.toString());
 			return false;
 		}
@@ -213,18 +210,14 @@ public final class Savegames {
     }
 
 
-	public static void saveWorld(WorldContext world, OutputStream outStream, String displayInfo) throws IOException, NoSuchAlgorithmException {
+	public static void saveWorld(WorldContext world, OutputStream outStream, String displayInfo) throws IOException {
 		DataOutputStream dest = new DataOutputStream(outStream);
-		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-			world.model.player.hash = world.createHash();
-		}
 		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.model.player.wasEditingDetected);
+				world.model.player.savedVersion);
 		world.maps.writeToParcel(dest, world);
 		world.model.writeToParcel(dest);
 		dest.close();
@@ -246,15 +239,6 @@ public final class Savegames {
 		
 		onWorldLoaded(res, world, controllers);
 
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-			try {
-				String worldHash = world.createHash();
-				if(!worldHash.equals(world.model.player.hash)){
-					world.model.player.wasEditingDetected = true;
-					return LoadSavegameResult.editDetected;
-				}
-			} catch (NoSuchAlgorithmException ignored) { }
-		}
 		return LoadSavegameResult.success;
 	}
 
@@ -350,7 +334,6 @@ public final class Savegames {
         public final boolean hasUnlimitedSaves;
         public final String playerId;
         public final long savedVersion;
-		public final boolean wasEditingDetected;
 
 		public String describe() {
 			return (fileversion == AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION ? "(D) " : "") + playerName + ", " + displayInfo;
@@ -395,14 +378,9 @@ public final class Savegames {
 				this.playerId = "";
 				this.savedVersion = 0;
 			}
-			if (fileversion >= 70){
-				this.wasEditingDetected = src.readBoolean();
-			}else{
-				this.wasEditingDetected = false;
-			}
 		}
 
-		public static void writeToParcel(DataOutputStream dest, String playerName, String displayInfo, int iconID, boolean isDead, boolean hasUnlimitedSaves, String playerId, long savedVersion, boolean wasEditingDetected) throws IOException {
+		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);
@@ -411,7 +389,6 @@ public final class Savegames {
 			dest.writeBoolean(hasUnlimitedSaves);
 			dest.writeUTF(playerId);
 			dest.writeLong(savedVersion);
-			dest.writeBoolean(wasEditingDetected);
 		}
 	}
 }

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

@@ -6,9 +6,9 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.FileProvider;
-import android.support.v4.provider.DocumentFile;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.FileProvider;
+import androidx.documentfile.provider.DocumentFile;
 
 import android.os.Handler;
 import android.os.Looper;

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

@@ -1,17 +1,6 @@
 package com.gpl.rpg.AndorsTrail.util;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-
 public final class ByteUtils {
-
-	private static int bytes;
-
 	public static String toHexString(byte[] bytes) { return toHexString(bytes, bytes.length); }
 	public static String toHexString(byte[] bytes, int numBytes) {
 		if (bytes == null) return "";
@@ -32,57 +21,4 @@ public final class ByteUtils {
 			array[i] ^= mask[i];
 		}
 	}
-
-	public static byte[] toBytes(long l){
-
-		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-			bytes = Long.BYTES;
-		}else{
-			bytes = 8;
-		}
-		ByteBuffer buffer = ByteBuffer.allocate(bytes);
-		buffer.putLong(l);
-		return buffer.array();
-	}
-
-	public static byte[] toBytes(int i){
-
-		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-			bytes = Integer.BYTES;
-		}else{
-			bytes = 4;
-		}
-		ByteBuffer buffer = ByteBuffer.allocate(bytes);
-		buffer.putInt(i);
-		return buffer.array();
-	}
-
-	public static byte[] toBytes(float f) {
-		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-			bytes = Float.BYTES;
-		}else{
-			bytes = 4;
-		}
-		ByteBuffer buffer = ByteBuffer.allocate(bytes);
-		buffer.putFloat(f);
-		return buffer.array();
-	}
-	public static byte[] toBytes(boolean bool){
-		byte b;
-		if(bool){
-			b = 0;
-		}else{
-			b = 1;
-		}
-		return new byte[] {b};
-	}
-	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
-	public static byte[] toBytes(String x) {
-		if (x == null) {
-			return new byte[]{};
-		}
-		return x.getBytes(StandardCharsets.UTF_8);
-	}
-
-
 }

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

@@ -3,7 +3,6 @@ package com.gpl.rpg.AndorsTrail.util;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 
 public final class Coord {
 	public int x;
@@ -48,9 +47,4 @@ public final class Coord {
 		dest.writeInt(x);
 		dest.writeInt(y);
 	}
-
-	public void createHash(MessageDigest digest) {
-		digest.update(ByteUtils.toBytes(x));
-		digest.update(ByteUtils.toBytes(y));
-	}
 }

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

@@ -1,11 +1,8 @@
 package com.gpl.rpg.AndorsTrail.util;
 
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.MessageDigest;
 
 public final class Range {
 	public int max;
@@ -102,9 +99,4 @@ public final class Range {
 		dest.writeInt(max);
 		dest.writeInt(current);
 	}
-
-	public void createHash(MessageDigest digest) {
-		digest.update(ByteUtils.toBytes(max));
-		digest.update(ByteUtils.toBytes(current));
-	}
 }

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

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