feygard_1 with hash bug

AndorsTrail/.gitignore

@@ -1,3 +1,6 @@
+# Android ignores
+app/src/main/res
+app/src/main/assets
 gen/
 bin/
 target/
@@ -5,7 +8,6 @@ local.properties
 app/build/intermediates/
 build/
 debug/
-beta/
 release/
 .gradle/
 
@@ -50,6 +52,4 @@ gradle-app.setting
 /AndorsTrail/gradle/wrapper
 /AndorsTrail/app/build/
 /AndorsTrail/app/debug/
-/AndorsTrail/app/beta/
 /AndorsTrail/app/release/
-/AndorsTrail/app/beta/

AndorsTrail/app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-
-    compileSdkVersion 35
+    compileSdkVersion 31
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.gpl.rpg.AndorsTrail"
         minSdkVersion 14
-        targetSdkVersion 35
+        targetSdkVersion 31
     }
 
     buildTypes {
@@ -19,73 +19,34 @@ android {
         debug {
             manifestPlaceholders icon_name: 'icon_beta', fileproviderPath: 'AndorsTrail.beta2'
             applicationIdSuffix 'beta2'
-            versionNameSuffix = "dev"
-			signingConfig signingConfigs.debug
-        }
-        beta {
-            manifestPlaceholders icon_name: 'icon_beta', fileproviderPath: 'AndorsTrail.beta2'
-            applicationIdSuffix 'beta2'
-            versionNameSuffix = "beta"
-            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'
+    implementation 'com.android.support:support-v4:28.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"
+    into "${projectDir}/src/main/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"
+    into "${projectDir}/src/main/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"
+    delete "${projectDir}/src/main/res", "${projectDir}/src/main/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
-
+    preBuild.dependsOn project.tasks.copyRes
+    preBuild.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="83"
-	android:versionName="0.8.16"
+	android:versionCode="73"
+	android:versionName="0.8.7"
 	android:installLocation="auto"
 	>
 
@@ -31,9 +31,9 @@
 		android:hasFragileUserData="true"
 		android:preserveLegacyExternalStorage="true"
 		>
-		<activity
-			android:exported="true"
+		<activity 
 		    android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
+			android:exported="true"
 		    android:clearTaskOnLaunch="true"
 		    >
 			<intent-filter>
@@ -63,7 +63,7 @@
 		<activity android:name="com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity" />
 
         <provider
-        android:name="androidx.core.content.FileProvider"
+        android:name="android.support.v4.content.FileProvider"
         android:authorities="${applicationId}.fileprovider"
         android:grantUriPermissions="true"
         android:exported="false">

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

@@ -8,41 +8,31 @@ 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.util.AndroidStorage;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.graphics.Insets;
-import android.os.Build;
 import android.os.Environment;
-import android.util.Pair;
-import android.view.View;
 import android.view.Window;
-import android.view.WindowInsets;
-import android.view.WindowInsetsController;
 import android.view.WindowManager;
 
-import androidx.annotation.RequiresApi;
-
-
 public final class AndorsTrailApplication extends Application {
-	public static final String CURRENT_VERSION_DISPLAY = BuildConfig.VERSION_NAME;
-	public static final boolean IS_DEV_VERSION = CURRENT_VERSION_DISPLAY.endsWith("dev");
-	public static final boolean IS_BETA_VERSION = CURRENT_VERSION_DISPLAY.endsWith("beta");
-	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-zA-Z].*");
 
 	public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
 	public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
 	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
-    public static final boolean DEVELOPMENT_DEBUGBUTTONS = IS_DEV_VERSION;
+	public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = IS_BETA_VERSION;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = IS_DEV_VERSION;
+	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
+	public static final String CURRENT_VERSION_DISPLAY = "0.8.7";
+	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
 	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
-	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : BuildConfig.VERSION_CODE;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 73;
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();
@@ -67,45 +57,13 @@ public final class AndorsTrailApplication extends Application {
 
 	public void setWindowParameters(Activity activity) {
 		activity.requestWindowFeature(Window.FEATURE_NO_TITLE);
-	}
-
-	public void setFullscreenMode(Activity activity) {
-		setFullscreenMode(preferences.fullscreen, activity.getWindow());
-	}
-	public static void setFullscreenMode(boolean fullscreen, Window window) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-
-			final WindowInsetsController insetsController = window.getInsetsController();
-			if (insetsController != null) {
-				insetsController.setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
-				int insetType = WindowInsets.Type.statusBars();
-				if (fullscreen) {
-					insetsController.hide(insetType);
-				} else {
-					insetsController.show(insetType);
-				}
-			}
+		if (preferences.fullscreen) {
+			activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		} else {
-			if (fullscreen) {
-				window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-
-			} else {
-				window.setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-			}
+			activity.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		}
 	}
 
-	@RequiresApi(Build.VERSION_CODES.R)
-	public int getUsableTouchAreaInsetMask(){
-		int i = 0;
-		i |= WindowInsets.Type.displayCutout();
-		i |= WindowInsets.Type.navigationBars();
-		if (!preferences.fullscreen) {
-			i |= WindowInsets.Type.statusBars();
-		}
-		return i;
-	}
-
 	//Get default locale at startup, as somehow it seems that changing the app's 
 	//configured locale impacts the value returned by Locale.getDefault() nowadays.
 	private final Locale defaultLocale = Locale.getDefault();
@@ -208,18 +166,4 @@ public final class AndorsTrailApplication extends Application {
 		controllers = new ControllerContext(this, world);
 		setup = new WorldSetup(world, controllers, getApplicationContext());
 	}
-
-	public void setUsablePadding(View root) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-			root.setOnApplyWindowInsetsListener((v, insets) -> {
-				Insets bars = insets.getInsets(getUsableTouchAreaInsetMask());
-				int left = Math.max(bars.left, v.getPaddingLeft());
-				int top = Math.max(bars.top, v.getPaddingTop());
-				int right = Math.max(bars.right, v.getPaddingRight());
-				int bottom = Math.max(bars.bottom, v.getPaddingBottom());
-				v.setPadding(left, top, right, bottom);
-				return WindowInsets.CONSUMED;
-			});
-		}
-	}
 }

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;
@@ -66,6 +66,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);
 	}
@@ -346,6 +354,7 @@ public final class Dialogs {
 		CustomDialogFactory.show(d);
 	}
 
+	@TargetApi(23)
 	private static boolean hasPermissions(final Activity activity) {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			if (activity.getApplicationContext().checkSelfPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED

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

@@ -24,7 +24,9 @@ public final class AboutActivity extends AndorsTrailBaseActivity implements Imag
 		super.onCreate(savedInstanceState);
 
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-		initializeView(this, R.layout.about, R.id.about_root);
+		app.setWindowParameters(this);
+
+		setContentView(R.layout.about);
 		final Resources res = getResources();
 
 		final TextView tv = (TextView) findViewById(R.id.about_contents);

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

@@ -30,16 +30,14 @@ public final class ActorConditionInfoActivity extends AndorsTrailBaseActivity {
 
 		String conditionTypeID = getIntent().getData().getLastPathSegment();
 		ActorConditionType conditionType = world.actorConditionsTypes.getActorConditionType(conditionTypeID);
-		initializeView(this, R.layout.actorconditioninfo, R.id.actorconditioninfo_root);
+
+		setContentView(R.layout.actorconditioninfo);
+
 
 		TextView tv = (TextView) findViewById(R.id.actorconditioninfo_title);
 		tv.setText(conditionType.name);
 		world.tileManager.setImageViewTile(getResources(), tv, conditionType);
 
-		TextView descriptionTv = (TextView) findViewById(R.id.actorconditioninfo_description);
-		if(conditionType.description != null && !conditionType.description.isEmpty()) descriptionTv.setText(conditionType.description);
-		else descriptionTv.setVisibility(View.GONE);
-
 		Button b = (Button) findViewById(R.id.actorconditioninfo_close);
 		b.setOnClickListener(new OnClickListener() {
 			@Override

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

@@ -2,10 +2,6 @@ package com.gpl.rpg.AndorsTrail.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.view.View;
-
-import androidx.annotation.IdRes;
-import androidx.annotation.LayoutRes;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 
@@ -23,13 +19,5 @@ public abstract class AndorsTrailBaseActivity extends Activity {
         AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
         app.setLocale(this);
     }
-    protected void initializeView(Activity activity, @LayoutRes int layoutId, @IdRes int rootViewId) {
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(activity);
-        app.setWindowParameters(activity);
-        activity.setContentView(layoutId);
-        View root = activity.findViewById(rootViewId);
-        app.setUsablePadding(root);
-        app.setFullscreenMode(activity);
-    }
 }
 

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

@@ -1,12 +1,7 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
-import android.app.Activity;
 import android.os.Bundle;
-import android.view.View;
-
-import androidx.annotation.IdRes;
-import androidx.annotation.LayoutRes;
-import androidx.fragment.app.FragmentActivity;
+import android.support.v4.app.FragmentActivity;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 
@@ -24,13 +19,4 @@ public abstract class AndorsTrailBaseFragmentActivity extends FragmentActivity {
         AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
         app.setLocale(this);
     }
-
-    protected void initializeView(Activity activity, @LayoutRes int layoutId, @IdRes int rootViewId) {
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(activity);
-        app.setWindowParameters(activity);
-        activity.setContentView(layoutId);
-        View root = activity.findViewById(rootViewId);
-        app.setUsablePadding(root);
-        app.setFullscreenMode(activity);
-    }
 }

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

@@ -89,7 +89,8 @@ public final class BulkSelectionInterface extends AndorsTrailBaseActivity implem
 		interfaceType = BulkInterfaceType.valueOf(params.getString("interfaceType"));
 
 		int intialSelection = 1;
-		initializeView(this, R.layout.bulkselection, R.id.bulkselection_root);
+
+		setContentView(R.layout.bulkselection);
 
 		// initialize UI variables
 		TextView bulkselection_action_type = (TextView)findViewById(R.id.bulkselection_action_type);

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

@@ -75,11 +75,13 @@ public final class ConversationActivity
 
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 
-		initializeView(this, R.layout.conversation, R.id.conversation_root);
+		setContentView(R.layout.conversation);
 
-        setFinishOnTouchOutside(false);
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+			setFinishOnTouchOutside(false);
+		}
 
-        replyGroup = new RadioGroup(this);
+		replyGroup = new RadioGroup(this);
 		replyGroup.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, ListView.LayoutParams.WRAP_CONTENT));
 		statementList = (ListView) findViewById(R.id.conversation_statements);
 		statementList.addFooterView(replyGroup);

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

@@ -29,6 +29,8 @@ public final class DebugInterface {
 	private final WorldContext world;
 
 	private DebugButton[] buttons;
+	private List<DebugButton> tpButtons  = new ArrayList<DebugButton>();
+	private List<DebugButton> tpButtons2 = new ArrayList<DebugButton>();
 
 	public DebugInterface(ControllerContext controllers, WorldContext world, MainActivity mainActivity) {
 		this.controllerContext = controllers;
@@ -50,23 +52,33 @@ public final class DebugInterface {
 						for (int i = 1; i < buttons.length; i++) {
 							buttons[i].b.setVisibility(hidden ? View.GONE : View.VISIBLE);
 						}
+						for (DebugButton b : tpButtons) {
+							b.b.setVisibility(View.GONE);
+						}
+						for (DebugButton b : tpButtons2) {
+							b.b.setVisibility(View.GONE);
+						}
 					}
 				})
 				,new DebugButton("teleport", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "debugmap", "entry", 0, 0);
-					}
-				})
+			public void onClick(View arg0) {
+				for (int i = 0; i < buttons.length; i++) {
+					buttons[i].b.setVisibility(View.GONE);
+				}
+				for (DebugButton tpButton : tpButtons) {
+					tpButton.b.setVisibility(View.VISIBLE);
+				}
+			}
+		})
 				,new DebugButton("dmg", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						world.model.player.damagePotential.set(500, 500);
-						world.model.player.attackChance = 500;
-						world.model.player.attackCost = 1;
-						showToast(mainActivity, "DEBUG: damagePotential=500, chance=500%, cost=1", Toast.LENGTH_SHORT);
-					}
-				})
+			@Override
+			public void onClick(View arg0) {
+				world.model.player.damagePotential.set(500, 500);
+				world.model.player.attackChance = 500;
+				world.model.player.attackCost = 1;
+				showToast(mainActivity, "DEBUG: damagePotential=500, chance=500%, cost=1", Toast.LENGTH_SHORT);
+			}
+		})
 				/*,new DebugButton("dmg=1", new OnClickListener() {
                     @Override
                     public void onClick(View arg0) {
@@ -75,78 +87,208 @@ public final class DebugInterface {
                     }
                 })*/
 				,new DebugButton("itm", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						for (ItemType item : world.itemTypes.UNITTEST_getAllItemTypes().values()) {
-							world.model.player.inventory.addItem(item, 10);
-						}
-						world.model.player.inventory.gold += 50000;
-						showToast(mainActivity, "DEBUG: added items", Toast.LENGTH_SHORT);
-					}
-				})
+			@Override
+			public void onClick(View arg0) {
+				for (ItemType item : world.itemTypes.UNITTEST_getAllItemTypes().values()) {
+					world.model.player.inventory.addItem(item, 10);
+				}
+				world.model.player.inventory.gold += 50000;
+				showToast(mainActivity, "DEBUG: added items", Toast.LENGTH_SHORT);
+			}
+		})
 				,new DebugButton("xp", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						controllerContext.actorStatsController.addExperience(10000);
-						showToast(mainActivity, "DEBUG: given 10000 exp", Toast.LENGTH_SHORT);
-					}
-				})
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.actorStatsController.addExperience(10000);
+				showToast(mainActivity, "DEBUG: given 10000 exp", Toast.LENGTH_SHORT);
+			}
+		})
 				,new DebugButton("rst", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						for(PredefinedMap map : world.maps.getAllMaps()) {
-							map.resetTemporaryData();
-						}
-						showToast(mainActivity, "DEBUG: maps respawned", Toast.LENGTH_SHORT);
-					}
-				})
+			@Override
+			public void onClick(View arg0) {
+				for(PredefinedMap map : world.maps.getAllMaps()) {
+					map.resetTemporaryData();
+				}
+				showToast(mainActivity, "DEBUG: maps respawned", Toast.LENGTH_SHORT);
+			}
+		})
 				,new DebugButton("hp", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						world.model.player.baseTraits.maxHP = 500;
-						world.model.player.health.max = world.model.player.baseTraits.maxHP;
-						controllerContext.actorStatsController.setActorMaxHealth(world.model.player);
-						world.model.player.conditions.clear();
-						showToast(mainActivity, "DEBUG: hp set to max", Toast.LENGTH_SHORT);
-					}
-				})
+			@Override
+			public void onClick(View arg0) {
+				world.model.player.baseTraits.maxHP = 500;
+				world.model.player.health.max = world.model.player.baseTraits.maxHP;
+				controllerContext.actorStatsController.setActorMaxHealth(world.model.player);
+				world.model.player.conditions.clear();
+				showToast(mainActivity, "DEBUG: hp set to max", Toast.LENGTH_SHORT);
+			}
+		})
 				,new DebugButton("skl", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						world.model.player.availableSkillIncreases += 10;
-						showToast(mainActivity, "DEBUG: 10 skill points", Toast.LENGTH_SHORT);
-					}
-				})
+			@Override
+			public void onClick(View arg0) {
+				world.model.player.availableSkillIncreases += 10;
+				showToast(mainActivity, "DEBUG: 10 skill points", Toast.LENGTH_SHORT);
+			}
+		})
 				,new DebugButton("spd", new OnClickListener() {
-					boolean fast = Constants.MINIMUM_INPUT_INTERVAL == Constants.MINIMUM_INPUT_INTERVAL_FAST;
-					@Override
-					public void onClick(View arg0) {
-						fast = !fast;
-						if (fast) {
-							Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_FAST;
-						} else {
-							Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_STD;
-						}
-						MainView.SCROLL_DURATION = Constants.MINIMUM_INPUT_INTERVAL;
-						AndorsTrailApplication.getApplicationFromActivity(mainActivity).getControllerContext().movementController.resetMovementHandler();
-					}
-				})
+			boolean fast = Constants.MINIMUM_INPUT_INTERVAL == Constants.MINIMUM_INPUT_INTERVAL_FAST;
+			@Override
+			public void onClick(View arg0) {
+				fast = !fast;
+				if (fast) {
+					Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_FAST;
+				} else {
+					Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_STD;
+				}
+				MainView.SCROLL_DURATION = Constants.MINIMUM_INPUT_INTERVAL;
+				AndorsTrailApplication.getApplicationFromActivity(mainActivity).getControllerContext().movementController.resetMovementHandler();
+			}
+		})
 				,new DebugButton("map", new OnClickListener() {
-					@Override
-					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);
-					}
-				})
+			@Override
+			public void onClick(View arg0) {
+				showToast(mainActivity, "DEBUG: map=" + world.model.currentMaps.map.name , Toast.LENGTH_SHORT);
+			}
+		})
 		}));
 
+		tpButtons.addAll(Arrays.asList(new DebugButton[] {
+				new DebugButton("teleport", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						for (DebugButton tpButton : tpButtons2) {
+							tpButton.b.setVisibility(View.VISIBLE);
+						}
+						for (DebugButton tpButton : tpButtons) {
+							tpButton.b.setVisibility(View.GONE);
+						}
+					}
+				})
+				,new DebugButton("cg", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crossglen", "hall", 0, 0);
+			}
+		})
+				,new DebugButton("vg", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "vilegard_s", "tavern", 0, 0);
+			}
+		})
+				,new DebugButton("cr", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "houseatcrossroads4", "down", 0, 0);
+			}
+		})
+				,new DebugButton("lf", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "loneford9", "south", 0, 0);
+			}
+		})
+				,new DebugButton("fh", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "fallhaven_ne", "clothes", 0, 0);
+			}
+		})
+				,new DebugButton("prm", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "blackwater_mountain29", "south", 0, 0);
+			}
+		})
+				,new DebugButton("bwm", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "blackwater_mountain43", "south", 0, 0);
+			}
+		})
+				,new DebugButton("rmg", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "remgard0", "east", 0, 0);
+			}
+		})
+				,new DebugButton("chr", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "waytolostmine2", "minerhouse4", 0, 0);
+			}
+		})
+				,new DebugButton("ldr", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lodarhouse0", "lodarhouse", 0, 0);
+			}
+		})
+				,new DebugButton("sf", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "wild20", "south2", 0, 0);
+			}
+		})
+				,new DebugButton("gm", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "guynmart_wood_1", "farmhouse", 0, 0);
+			}
+		})
+		}));
+		buttonList.addAll(tpButtons);
+
+		tpButtons2.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);
+						}
+					}
+				})
+				,new DebugButton("brv", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "brimhaven4", "south2", 0, 0);
+			}
+		})
+				,new DebugButton("aru", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "mountainlake5", "north", 0, 0);
+			}
+		})
+				,new DebugButton("ws", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "woodsettlement0", "east", 0, 0);
+			}
+		})
+				,new DebugButton("sul", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "sullengard2", "south", 0, 0);
+			}
+		})
+		}));
+		buttonList.addAll(tpButtons2);
+
 		buttons = buttonList.toArray(new DebugButton[buttonList.size()]);
 		addDebugButtons(buttons);
+
+		for (DebugButton b : tpButtons) {
+			b.b.setVisibility(View.GONE);
+		}
+		for (DebugButton b : tpButtons2) {
+			b.b.setVisibility(View.GONE);
+		}
 	}
 
 	private void showToast(Context context, String msg, int duration) {

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

@@ -38,7 +38,10 @@ public final class DisplayWorldMapActivity extends AndorsTrailBaseActivity {
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
 		this.world = app.getWorld();
-		initializeView(this, R.layout.displayworldmap, R.id.worldmap_root);
+
+		app.setWindowParameters(this);
+
+		setContentView(R.layout.displayworldmap);
 
 		displayworldmap_webview = (WebView) findViewById(R.id.displayworldmap_webview);
 		displayworldmap_webview.setBackgroundColor(ThemeHelper.getThemeColor(this, R.attr.ui_theme_displayworldmap_bg_color));

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;
@@ -29,7 +29,10 @@ public final class HeroinfoActivity extends AndorsTrailBaseFragmentActivity {
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
 		this.world = app.getWorld();
-		initializeView(this, R.layout.tabbedlayout, android.R.id.tabhost);
+
+		app.setWindowParameters(this);
+
+		setContentView(R.layout.tabbedlayout);
 
 		Resources res = getResources();
 

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

@@ -14,7 +14,6 @@ import android.widget.TextView;
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
@@ -46,7 +45,7 @@ public final class ItemInfoActivity extends AndorsTrailBaseActivity {
 		boolean buttonEnabled = params.getBoolean("buttonEnabled");
 		boolean moreButtonEnabled = params.getBoolean("moreActions");
 
-		initializeView(this, R.layout.iteminfo, R.id.iteminfo_root);
+		setContentView(R.layout.iteminfo);
 
 		TextView tv = (TextView) findViewById(R.id.iteminfo_title);
 		tv.setText(itemType.getName(world.model.player));
@@ -55,7 +54,7 @@ public final class ItemInfoActivity extends AndorsTrailBaseActivity {
 		tv = (TextView) findViewById(R.id.iteminfo_description);
 		String description = itemType.getDescription();
 		if (description != null) {
-			tv.setText(description.replace(Constants.PLACEHOLDER_PLAYERNAME, world.model.player.getName()));
+			tv.setText(description);
 			tv.setVisibility(View.VISIBLE);
 		} else {
 			tv.setVisibility(View.GONE);
@@ -68,10 +67,8 @@ public final class ItemInfoActivity extends AndorsTrailBaseActivity {
 				itemType.effects_equip,
 				itemType.effects_use == null ? null : Collections.singletonList(itemType.effects_use),
 				itemType.effects_hit == null ? null : Collections.singletonList(itemType.effects_hit),
-				itemType.effects_miss == null ? null : Collections.singletonList(itemType.effects_miss),
 				itemType.effects_kill == null ? null : Collections.singletonList(itemType.effects_kill),
 				itemType.effects_hitReceived == null ? null : Collections.singletonList(itemType.effects_hitReceived),
-				itemType.effects_missReceived == null ? null : Collections.singletonList(itemType.effects_missReceived),
 				null,
 				itemType.isWeapon()
 			);

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

@@ -37,7 +37,7 @@ public final class LevelUpActivity extends AndorsTrailBaseActivity {
 
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 
-		initializeView(this, R.layout.levelup, R.id.levelup_root);
+		setContentView(R.layout.levelup);
 
 		levelup_title = (TextView) findViewById(R.id.levelup_title);
 		levelup_description = (TextView) findViewById(R.id.levelup_description);

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 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;
@@ -70,7 +70,7 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         String loadsave = getIntent().getData().getLastPathSegment();
         isLoading = (loadsave.equalsIgnoreCase("load"));
 
-        initializeView(this, R.layout.loadsave, R.id.loadsave_root);
+        setContentView(R.layout.loadsave);
 
         TextView tv = (TextView) findViewById(R.id.loadsave_title);
         if (isLoading) {

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

@@ -36,7 +36,8 @@ public final class LoadingActivity extends AndorsTrailBaseActivity implements On
 		setTheme(ThemeHelper.getBaseTheme());
 		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-		initializeView(this, R.layout.startscreen, R.id.startscreen_fragment_container);
+		app.setWindowParameters(this);
+		setContentView(R.layout.startscreen);
 
 		TextView tv = (TextView) findViewById(R.id.startscreen_version);
 		tv.setVisibility(View.GONE);

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

@@ -91,9 +91,9 @@ public final class MainActivity
 		AndorsTrailPreferences preferences = app.getPreferences();
 		this.world = app.getWorld();
 		this.controllers = app.getControllerContext();
+		app.setWindowParameters(this);
 
-		initializeView(this, R.layout.main, R.id.main_container);
-
+		setContentView(R.layout.main);
 		mainview = (MainView) findViewById(R.id.main_mainview);
 		statusview = (StatusView) findViewById(R.id.main_statusview);
 		combatview = (CombatView) findViewById(R.id.main_combatview);
@@ -397,10 +397,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/MonsterEncounterActivity.java

@@ -34,7 +34,7 @@ public final class MonsterEncounterActivity extends AndorsTrailBaseActivity {
 			return;
 		}
 
-		initializeView(this, R.layout.monsterencounter, R.id.monsterencounter_root);
+		setContentView(R.layout.monsterencounter);
 
 		CharSequence difficulty = getText(MonsterInfoActivity.getMonsterDifficultyResource(controllers, monster));
 

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

@@ -43,7 +43,7 @@ public final class MonsterInfoActivity extends AndorsTrailBaseActivity {
 		this.controllers = app.getControllerContext();
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 
-		initializeView(this, R.layout.monsterinfo, R.id.monsterinfo_root);
+		setContentView(R.layout.monsterinfo);
 
 		monsterinfo_title = (TextView) findViewById(R.id.monsterinfo_title);
 		monsterinfo_difficulty = (TextView) findViewById(R.id.monsterinfo_difficulty);
@@ -90,10 +90,8 @@ public final class MonsterInfoActivity extends AndorsTrailBaseActivity {
 				null,
 				null,
 				monster.getOnHitEffectsAsList(),
-				monster.getOnMissEffectsAsList(),
 				null,
 				monster.getOnHitReceivedEffectsAsList(),
-				monster.getOnMissReceivedEffectsAsList(),
 				monster.getOnDeathEffects(),
 				false);
 		hp.update(monster.getMaxHP(), monster.getCurrentHP());

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

@@ -13,16 +13,17 @@ public final class Preferences extends PreferenceActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		setTheme(ThemeHelper.getBaseTheme());
-		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-		app.setWindowParameters(this);
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		super.onCreate(savedInstanceState);
-		app.setFullscreenMode(this);
-
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (app.getPreferences().fullscreen) {
+			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		} else {
+			getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		}
 
 		app.setLocale(this);
 		addPreferencesFromResource(R.xml.preferences);
-
-
 	}
 
 	@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 androidx.fragment.app.FragmentTabHost;
+import android.support.v4.app.FragmentTabHost;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -23,8 +23,9 @@ public final class ShopActivity extends AndorsTrailBaseFragmentActivity {
 
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
+		app.setWindowParameters(this);
 
-		initializeView(this, R.layout.tabbedlayout, android.R.id.tabhost);
+		setContentView(R.layout.tabbedlayout);
 
 		final Resources res = getResources();
 

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

@@ -31,7 +31,9 @@ public final class SkillInfoActivity extends AndorsTrailBaseActivity {
 		final WorldContext world = app.getWorld();
 		final Player player = world.model.player;
 
-		initializeView(this, R.layout.skill_info_view, R.id.skillinfo_root);
+		app.setWindowParameters(this);
+
+		setContentView(R.layout.skill_info_view);
 
 		final Resources res = getResources();
 		final Intent intent = getIntent();
@@ -194,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

@@ -21,10 +21,8 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-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;
@@ -51,9 +49,9 @@ public final class StartScreenActivity extends AndorsTrailBaseFragmentActivity i
 		final Resources res = getResources();
 		TileManager tileManager = app.getWorld().tileManager;
 		tileManager.setDensity(res);
+		app.setWindowParameters(this);
 
-		initializeView(this, R.layout.startscreen, R.id.startscreen_fragment_container);
-		app.setFullscreenMode(this);
+		setContentView(R.layout.startscreen);
 
 		if (findViewById(R.id.startscreen_fragment_container) != null) {
 			StartScreenActivity_MainMenu mainMenu = new StartScreenActivity_MainMenu();
@@ -69,11 +67,9 @@ public final class StartScreenActivity extends AndorsTrailBaseFragmentActivity i
 		
 		
 		tv = (TextView) findViewById(R.id.startscreen_version);
-		app.setUsablePadding(tv);
 		tv.setText('v' + AndorsTrailApplication.CURRENT_VERSION_DISPLAY);
 		
 		development_version = (TextView) findViewById(R.id.startscreen_dev_version);
-		app.setUsablePadding((View) development_version.getParent());
 		if (AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAMES) {
 			development_version.setText(R.string.startscreen_incompatible_savegames);
 			development_version.setVisibility(View.VISIBLE);
@@ -100,10 +96,6 @@ public final class StartScreenActivity extends AndorsTrailBaseFragmentActivity i
 				}
 			});
 		}
-		View titleLogo = findViewById(R.id.title_logo);
-		if (titleLogo != null) {
-			app.setUsablePadding(titleLogo);
-		}
 		
 		if (development_version.getVisibility() == View.VISIBLE) {
 			development_version.setText(development_version.getText()
@@ -120,7 +112,7 @@ public final class StartScreenActivity extends AndorsTrailBaseFragmentActivity i
 	}
 
 	@Override
-	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, int[] grantResults) {
+	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
 		if (grantResults.length > 0 && grantResults[0] != PackageManager.PERMISSION_GRANTED) {
 
 			final CustomDialog d = CustomDialogFactory.createDialog(this,

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;
@@ -183,25 +183,19 @@ public final class HeroinfoActivity_Stats extends Fragment {
 		);
 
 		ArrayList<ItemTraits_OnUse> effects_hit = new ArrayList<ItemTraits_OnUse>();
-		ArrayList<ItemTraits_OnUse> effects_miss = new ArrayList<ItemTraits_OnUse>();
 		ArrayList<ItemTraits_OnUse> effects_kill = new ArrayList<ItemTraits_OnUse>();
 		ArrayList<ItemTraits_OnHitReceived> effects_hitReceived = new ArrayList<ItemTraits_OnHitReceived>();
-		ArrayList<ItemTraits_OnHitReceived> effects_missReceived = new ArrayList<ItemTraits_OnHitReceived>();
 		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
 			ItemType type = player.inventory.getItemTypeInWearSlot(slot);
 			if (type == null) continue;
 			if (type.effects_hit != null) effects_hit.add(type.effects_hit);
-			if (type.effects_miss != null) effects_miss.add(type.effects_miss);
 			if (type.effects_kill != null) effects_kill.add(type.effects_kill);
 			if (type.effects_hitReceived != null) effects_hitReceived.add(type.effects_hitReceived);
-			if (type.effects_missReceived != null) effects_missReceived.add(type.effects_missReceived);
 		}
 		if (effects_hit.isEmpty()) effects_hit = null;
-		if (effects_miss.isEmpty()) effects_miss = null;
 		if (effects_kill.isEmpty()) effects_kill = null;
 		if (effects_hitReceived.isEmpty()) effects_hitReceived = null;
-		if (effects_missReceived.isEmpty()) effects_missReceived = null;
-		actorinfo_onhiteffects.update(null, null, effects_hit, effects_miss, effects_kill, effects_hitReceived,effects_missReceived, null, false);
+		actorinfo_onhiteffects.update(null, null, effects_hit, effects_kill, effects_hitReceived, null, false);
 
 
 		updateStatsTableRow(world.model.statistics.getNumberOfCompletedQuests(world), R.id.heroinfo_gamestats_quests, R.id.heroinfo_gamestats_quests_row);

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/ShopActivity_Buy.java

@@ -24,7 +24,7 @@ public final class ShopActivity_Buy extends ShopActivityFragment {
 	@Override
 	public void onItemInfoClicked(int position, ItemType itemType) {
 		int price = ItemController.getBuyingPrice(player, itemType);
-		boolean enableButton = (price > 0 && ItemController.canAfford(player, price));
+		boolean enableButton = ItemController.canAfford(player, price);
 		String text = getResources().getString(R.string.shop_buyitem, price);
 		Intent intent = Dialogs.getIntentForItemInfo(getActivity(), itemType.id, ItemInfoActivity.ItemInfoAction.buy, text, enableButton, null);
 		startActivityForResult(intent, INTENTREQUEST_ITEMINFO);

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;
@@ -59,6 +59,7 @@ public class StartScreenActivity_MainMenu extends Fragment {
         updatePreferences(false);
         super.onCreateView(inflater, container, savedInstanceState);
 
+
 		if (container != null) {
 			container.removeAllViews();
 		}
@@ -195,6 +196,7 @@ public class StartScreenActivity_MainMenu extends Fragment {
 
 	}
 
+	@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) {
@@ -230,6 +232,7 @@ public class StartScreenActivity_MainMenu extends Fragment {
 	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) {

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

@@ -3,8 +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;
@@ -40,7 +39,8 @@ public class StartScreenActivity_NewGame extends Fragment {
 		}
 		
 		View root = inflater.inflate(R.layout.startscreen_newgame, container, false);
-
+		
+		
 		startscreen_enterheroname = (TextView) root.findViewById(R.id.startscreen_enterheroname);
 
 		new SpinnerEmulator(root, R.id.startscreen_mode_selector_button, R.array.startscreen_mode_selector, R.string.startscreen_game_mode) {

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

@@ -1,6 +1,5 @@
 package com.gpl.rpg.AndorsTrail.context;
 
-import com.gpl.rpg.AndorsTrail.model.ChecksumBuilder;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
@@ -14,8 +13,6 @@ import com.gpl.rpg.AndorsTrail.resource.ConversationLoader;
 import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
-import java.security.DigestException;
-
 public final class WorldContext {
 	//Objectcollections
 	public final ConversationLoader conversationLoader;
@@ -65,11 +62,4 @@ public final class WorldContext {
 	public void resetForNewGame() {
 		maps.resetForNewGame();
 	}
-
-	public byte[] getChecksum() throws DigestException {
-		ChecksumBuilder checksumBuilder = new ChecksumBuilder();
-		model.addToChecksum(checksumBuilder);
-		maps.addToChecksum(checksumBuilder, this);
-		return checksumBuilder.build();
-	}
 }

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 .
@@ -595,10 +587,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 
 	private AttackResult attack(final Actor attacker, final Actor target) {
 		int hitChance = getAttackHitChance(attacker, target);
-		if (!Constants.roll100(hitChance)) {
-			applyAttackMissStatusEffects(attacker, target);
-			return AttackResult.MISS;
-		}
+		if (!Constants.roll100(hitChance)) return AttackResult.MISS;
 
 		int damage = Constants.rollValue(attacker.getDamagePotential());
 		boolean isCriticalHit = false;
@@ -632,21 +621,6 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		}
 	}
 
-	private void applyAttackMissStatusEffects(Actor attacker, Actor target) {
-		ItemTraits_OnUse[] onMissEffects = attacker.getOnMissEffects();
-		ItemTraits_OnHitReceived[] onMissReceivedEffects = target.getOnMissReceivedEffects();
-		if (onMissEffects != null) {
-			for (ItemTraits_OnUse e : onMissEffects) {
-				controllers.actorStatsController.applyUseEffect(attacker, target, e);
-			}
-		}
-		if (onMissReceivedEffects != null) {
-			for (ItemTraits_OnHitReceived e : onMissReceivedEffects) {
-				controllers.actorStatsController.applyHitReceivedEffect(target, attacker, e);
-			}
-		}
-	}
-
 	public void endOfCombatRound() {
 		world.model.worldData.tickWorldTime();
 		controllers.gameRoundController.resetRoundTimers();

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

@@ -48,12 +48,9 @@ public final class Constants {
 	public static final String FILENAME_WORLDMAP_HTMLFILE_SUFFIX = ".html";
 	public static final String FILENAME_SAVEGAME_FILENAME_PREFIX = "savegame";
 	public static final String PLACEHOLDER_PLAYERNAME = "$playername";
-	public static final String PLACEHOLDER_REG1 = "$reg1";
 	public static final String CHEAT_DETECTION_FOLDER = "dEAGyGE3YojqXjI3x4x7";
 	public static final String PASSIVE_ACHIEVEMENT_CHECK_PHRASE = "passive_achievement_check";
 
-	public static final String FACTION_SCORE_CALC_REGISTER_NAME = "reg1";
-
 	public static final String SAVEGAME_FILE_MIME_TYPE = "application/octet-stream";
 	public static final String WORLDMAP_FILE_MIME_TYPE = "image/png";
 	public static final String NO_FILE_EXTENSION_MIME_TYPE = "application/no_file_extension_mime_type";

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

@@ -1,7 +1,5 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
-import static com.gpl.rpg.AndorsTrail.controller.SkillController.canLevelupSkillWithQuest;
-
 import java.util.ArrayList;
 
 import android.content.res.Resources;
@@ -24,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;
@@ -100,24 +97,6 @@ public final class ConversationController {
 			case alignmentSet:
 				setAlignmentReward(player, effect.effectID, effect.value);
 				break;
-			case alignmentToReg1:
-				toAkkuAlignmentReward(player, effect.effectID);
-				break;
-			case alignmentFromReg1:
-				fromAkkuAlignmentReward(player, effect.effectID);
-				break;
-			case alignmentAdd:
-				addAlignmentReward(player, effect.effectID);
-				break;
-			case alignmentSub:
-				subAlignmentReward(player, effect.effectID);
-				break;
-			case alignmentDiv:
-				divAlignmentReward(player, effect.effectID, effect.value);
-				break;
-			case alignmentMult:
-				multAlignmentReward(player, effect.effectID, effect.value);
-				break;
 			case giveItem:
 				addItemReward(effect.effectID, effect.value, result);
 				break;
@@ -145,9 +124,6 @@ public final class ConversationController {
 			case changeMapFilter:
 				changeMapFilter(res, effect.mapName, effect.effectID);
 				break;
-			case mapchange:
-				mapchange(effect.mapName, effect.effectID);
-				break;
 		}
 	}
 
@@ -196,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);
@@ -213,47 +182,6 @@ public final class ConversationController {
 		MovementController.refreshMonsterAggressiveness(world.model.currentMaps.map, world.model.player);
 	}
 
-	private void toAkkuAlignmentReward(Player player, String faction) {
-		Integer i = player.getAlignment(faction);
-		player.setAlignment("akku", i);
-	}
-
-	private void fromAkkuAlignmentReward(Player player, String faction) {
-		Integer i = player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER_NAME);
-		player.setAlignment(faction, i);
-		MovementController.refreshMonsterAggressiveness(world.model.currentMaps.map, world.model.player);
-	}
-
-	private void addAlignmentReward(Player player, String faction) {
-		Integer i = player.getAlignment(faction);
-		player.addAlignment(Constants.FACTION_SCORE_CALC_REGISTER_NAME, i);
-	}
-
-	private void subAlignmentReward(Player player, String faction) {
-		Integer i = -1 * player.getAlignment(faction);
-		player.addAlignment(Constants.FACTION_SCORE_CALC_REGISTER_NAME, i);
-	}
-
-	/// @param multiplier multiplies the faction alignment before dividing. Use 100 for percentages.
-	private void divAlignmentReward(Player player, String faction, int multiplier ) {
-		Integer i1, i2;
-		if (multiplier == 0) { multiplier = 1; }
-		i1 = player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER_NAME);
-		i2 = player.getAlignment(faction) * multiplier;
-		if (i2 != 0)
-		{
-			player.setAlignment(Constants.FACTION_SCORE_CALC_REGISTER_NAME, i1 / i2 );
-		}
-	}
-
-	/// @param multiplier the factor to multiply by. If 0, uses the faction score from the {@link Constants.FACTION_SCORE_CALC_REGISTER_NAME} as multiplier.
-	private void multAlignmentReward(Player player, String faction, int multiplier ) {
-		Integer  i;
-		if (multiplier == 0) { multiplier = player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER_NAME); }
-		i = player.getAlignment(faction) * multiplier;
-		player.setAlignment(Constants.FACTION_SCORE_CALC_REGISTER_NAME, i );
-	}
-
 	private void addQuestProgressReward(Player player, String questID, int questProgress, ScriptEffectResult result) {
 		QuestProgress progress = new QuestProgress(questID, questProgress);
 		boolean added = player.addQuestProgress(progress);
@@ -383,28 +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;
-			case skillIncrease:
-				int levels;
-				if  (requirement.value <= 0){
-					levels = 1;
-				}else{
-					levels = requirement.value;
-				}
-				SkillInfo skill = world.skills.getSkill(SkillCollection.SkillID.valueOf(requirement.requireID));
-				result =  canLevelupSkillWithQuest(player, skill, levels);
-				break;
 			default:
 				result =  true;
 		}
@@ -431,8 +337,7 @@ public final class ConversationController {
 	private static String getDisplayMessage(Phrase phrase, Player player) { return replacePlayerName(phrase.message, player); }
 	private static String getDisplayMessage(Reply reply, Player player) { return replacePlayerName(reply.text, player); }
 	private static String replacePlayerName(String s, Player player) {
-		return s.replace(Constants.PLACEHOLDER_PLAYERNAME, player.getName())
-				.replace(Constants.PLACEHOLDER_REG1, String.valueOf(player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER_NAME)));
+		return s.replace(Constants.PLACEHOLDER_PLAYERNAME, player.getName());
 	}
 
 	public static final class ConversationStatemachine {

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

@@ -195,27 +195,19 @@ public final class ItemController {
 
 	public static void recalculateHitEffectsFromWornItems(Player player) {
 		ArrayList<ItemTraits_OnUse> effects_onHit = null;
-		ArrayList<ItemTraits_OnUse> effects_onMiss = null;
 		ArrayList<ItemTraits_OnHitReceived> effects_onHitReceived = null;
-		ArrayList<ItemTraits_OnHitReceived> effects_onMissReceived = null;
 		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
 			ItemType type = player.inventory.getItemTypeInWearSlot(slot);
 			if (type == null) continue;
 			ItemTraits_OnUse eh = type.effects_hit;
 			ItemTraits_OnHitReceived ehr = type.effects_hitReceived;
-			ItemTraits_OnUse em = type.effects_miss;
-			ItemTraits_OnHitReceived emr = type.effects_missReceived;
-			if (eh == null && ehr == null && em == null && emr == null) continue;
+			if (eh == null && ehr == null) continue;
 
 			if (effects_onHit == null) effects_onHit = new ArrayList<ItemTraits_OnUse>();
 			if (eh != null) effects_onHit.add(eh);
-			if (effects_onMiss == null) effects_onMiss = new ArrayList<ItemTraits_OnUse>();
-			if (em != null) effects_onMiss.add(em);
 			
 			if (effects_onHitReceived == null) effects_onHitReceived = new ArrayList<ItemTraits_OnHitReceived>();
 			if (ehr != null) effects_onHitReceived.add(ehr);
-			if (effects_onMissReceived == null) effects_onMissReceived = new ArrayList<ItemTraits_OnHitReceived>();
-			if (emr != null) effects_onMissReceived.add(emr);
 		}
 
 		if (effects_onHit != null) {
@@ -225,13 +217,6 @@ public final class ItemController {
 		} else {
 			player.onHitEffects = null;
 		}
-		if (effects_onMiss != null) {
-			ItemTraits_OnUse[] effects_ = new ItemTraits_OnUse[effects_onMiss.size()];
-			effects_ = effects_onMiss.toArray(effects_);
-			player.onMissEffects = effects_;
-		} else {
-			player.onMissEffects = null;
-		}
 
 		if (effects_onHitReceived != null) {
 			ItemTraits_OnHitReceived[] effects_ = new ItemTraits_OnHitReceived[effects_onHitReceived.size()];
@@ -240,13 +225,6 @@ public final class ItemController {
 		} else {
 			player.onHitReceivedEffects = null;
 		}
-		if (effects_onMissReceived != null) {
-			ItemTraits_OnHitReceived[] effects_ = new ItemTraits_OnHitReceived[effects_onMissReceived.size()];
-			effects_ = effects_onMissReceived.toArray(effects_);
-			player.onMissReceivedEffects = effects_;
-		} else {
-			player.onMissReceivedEffects = null;
-		}
 	}
 
 	public void consumeNonItemLoot(Loot loot) {

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);
@@ -91,17 +86,17 @@ public final class SkillController {
 	}
 
 
-	static boolean canLevelupSkillWithQuest(Player player, SkillInfo skill, int levels) {
+	private static boolean canLevelupSkillWithQuest(Player player, SkillInfo skill) {
 		final int playerSkillLevel = player.getSkillLevel(skill.id);
 		if (skill.hasMaxLevel()) {
-			if (playerSkillLevel + levels > skill.maxLevel) return false;
+			if (playerSkillLevel >= skill.maxLevel) return false;
 		}
-		if (!skill.canLevelUpSkillTo(player, playerSkillLevel + levels)) return false;
+		if (!skill.canLevelUpSkillTo(player, playerSkillLevel + 1)) return false;
 		return true;
 	}
 	public static boolean canLevelupSkillManually(Player player, SkillInfo skill) {
 		if (!player.hasAvailableSkillpoints()) return false;
-		if (!canLevelupSkillWithQuest(player, skill, 1)) return false;
+		if (!canLevelupSkillWithQuest(player, skill)) return false;
 		if (skill.levelupVisibility == SkillInfo.LevelUpType.onlyByQuests) return false;
 		if (skill.levelupVisibility == SkillInfo.LevelUpType.firstLevelRequiresQuest) {
 			if (!player.hasSkill(skill.id)) return false;
@@ -114,7 +109,7 @@ public final class SkillController {
 		addSkillLevel(skill.id);
 	}
 	public boolean levelUpSkillByQuest(Player player, SkillInfo skill) {
-		if (!canLevelupSkillWithQuest(player, skill, 1)) return false;
+		if (!canLevelupSkillWithQuest(player, skill)) return false;
 		addSkillLevel(skill.id);
 		return true;
 	}
@@ -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,21 +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;
@@ -44,41 +37,11 @@ public final class VisualEffectController {
 	}
 
 	public void startEffect(Coord position, VisualEffectCollection.VisualEffectID effectID, String displayValue, VisualEffectCompletedCallback callback, int callbackValue) {
-		VisualEffectAnimation animation = new VisualEffectAnimation(effectTypes.getVisualEffect(effectID), position, displayValue, callback, callbackValue);
-		animation.start();
+		++effectCount;
+		(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();
-				if(updateInterval > 0) 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);
-						i--;
-					}
-				}
-				visualEffectFrameListeners.onNewAnimationFrames(activeAnimations);
-			}
-		}
-	};
-
 	private VisualEffectCollection.VisualEffectID enqueuedEffectID = null;
 	private int enqueuedEffectValue = 0;
 	public void enqueueEffect(VisualEffectCollection.VisualEffectID effectID, int displayValue) {
@@ -97,13 +60,15 @@ public final class VisualEffectController {
 	}
 	
 	public void startActorMoveEffect(Actor actor, PredefinedMap map, Coord origin, Coord destination, int duration, VisualEffectCompletedCallback callback, int callbackValue) {
+		++effectCount;
 		(new SpriteMoveAnimation(origin, destination, duration, actor, map, callback, callbackValue))
 		.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;
 
@@ -117,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) {
@@ -129,12 +99,19 @@ public final class VisualEffectController {
 			this.destination = destination;
 
 		}
+		
+//		private void update() {
+//			
+//			visualEffectFrameListeners.onNewSpriteMoveFrame(this);
+//		}
 
 		private void onCompleted() {
+			--effectCount;
 			actor.hasVFXRunning = false;
 			if (callback != null) callback.onVisualEffectCompleted(callbackValue);
 			visualEffectFrameListeners.onSpriteMoveCompleted(this);
 		}
+		
 
 		public void start() {
 			actor.hasVFXRunning = true;
@@ -143,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();
@@ -154,45 +134,41 @@ public final class VisualEffectController {
 		textPaint.setAlpha(255);
 		textPaint.setTextAlign(Align.CENTER);
 	}
+	
+	public final class VisualEffectAnimation extends Handler implements Runnable {
 
-	/// only for combat effects, movement & blood splatters etc. are handled elsewhere.
-	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
-					|| effect.duration == 0
-					|| controllers.preferences.attackspeed_milliseconds <= 0) onCompleted();
-            else startAnimation(this);
+			if (!controllers.preferences.enableUiAnimations) onCompleted();
+			else postDelayed(this, 0);
 		}
 
 		private int currentFrame = 0;
@@ -221,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;
 		}
@@ -232,7 +208,7 @@ public final class VisualEffectController {
 	}
 
 	public boolean isRunningVisualEffect() {
-		return !activeAnimations.isEmpty();
+		return effectCount > 0;
 	}
 
 
@@ -292,10 +268,10 @@ public final class VisualEffectController {
 			return -1;
 		}
 	}
-
+	
 	public void asyncUpdateArea(CoordRect area) {
 		visualEffectFrameListeners.onAsyncAreaUpdate(area);
 	}
 
-
+	
 }

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/ChecksumBuilder.java

@@ -1,115 +0,0 @@
-package com.gpl.rpg.AndorsTrail.model;
-
-import android.os.Build;
-
-import com.gpl.rpg.AndorsTrail.util.L;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
-import java.security.DigestException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-public class ChecksumBuilder {
-
-	public static final int CHECKSUM_LENGTH = 32;// 256 bits (depends on the hash algorithm)
-	public static final String CHECKSUM_ALGORITHM = "SHA-256"; //Should be available in all Android versions
-	private ByteBuffer buffer;
-	private final MessageDigest digest;
-
-	private ChecksumBuilder(int initialCapacity, ByteOrder byteOrder) {
-		buffer = ByteBuffer.allocate(initialCapacity);
-		buffer.order(byteOrder);
-		try {
-			digest = MessageDigest.getInstance(CHECKSUM_ALGORITHM); // Or SHA-512 for even stronger hash
-		} catch (NoSuchAlgorithmException e) {
-			throw new RuntimeException("Hash algorithm not found", e);
-		}
-	}
-
-	private ChecksumBuilder(int initialCapacity) {
-		this(initialCapacity, ByteOrder.BIG_ENDIAN); // Default to big-endian
-	}
-
-	public ChecksumBuilder() {
-		this(1024*10); // A reasonable default initial capacity
-	}
-
-	// --- Methods for adding different data types ---
-
-	public ChecksumBuilder add(String value) {
-		if (value != null) {
-			byte[] bytes;
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-				bytes = value.getBytes(StandardCharsets.UTF_8);
-			} else {
-				bytes = value.getBytes();
-			}
-			add(bytes);
-		} else {
-			add(-1); // Use -1 to represent a null string
-		}
-		return this;
-	}
-
-	public ChecksumBuilder add(byte[] bytes) {
-		add(bytes.length);						  // Add length prefix
-		ensureCapacity(bytes.length + 4); // +4 for length prefix (int)
-		buffer.put(bytes);
-		return this;
-	}
-
-	public ChecksumBuilder add(boolean value) {
-		ensureCapacity(1);
-		buffer.put(value ? (byte) 1 : (byte) 0);
-		return this;
-	}
-
-	public ChecksumBuilder add(long value) {
-		ensureCapacity(8);
-		buffer.putLong(value);
-		return this;
-	}
-
-	public ChecksumBuilder add(int value) {
-		ensureCapacity(4);
-		buffer.putInt(value);
-		return this;
-	}
-
-	public ChecksumBuilder add(float value) {
-		ensureCapacity(8);
-		buffer.putFloat(value);
-		return this;
-	}
-
-	public ChecksumBuilder add(double value) {
-		ensureCapacity(4);
-		buffer.putDouble(value);
-		return this;
-	}
-
-	// --- Method to finalize and get the checksum ---
-
-	public byte[] build() throws DigestException {
-		buffer.flip(); // Prepare for reading
-		digest.update(buffer);// Only use the actually used part of the buffer
-		buffer.flip(); // Prepare for further writing
-		return digest.digest();
-	}
-
-
-	// --- Utility method to ensure sufficient capacity ---
-	private void ensureCapacity(int required) {
-		if (buffer.remaining() < required) {
-			int newCapacity = Math.max(buffer.capacity() * 2, buffer.capacity() + required);
-			ByteBuffer newBuffer = ByteBuffer.allocate(newCapacity);
-			newBuffer.order(buffer.order());
-			buffer.flip(); // Prepare for reading
-			newBuffer.put(buffer); // Copy existing data
-			buffer = newBuffer;    // Assign the new buffer to the field
-		}
-	}
-
-}

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;
@@ -23,8 +22,6 @@ import com.gpl.rpg.AndorsTrail.model.quest.Quest;
 import com.gpl.rpg.AndorsTrail.util.HashMapHelper;
 
 public final class GameStatistics {
-	private boolean isAlteredSavegame = false;
-	private byte[] checksum = new byte[ChecksumBuilder.CHECKSUM_LENGTH];
 	private int deaths = 0;
 	private final HashMap<String, Integer> killedMonstersByTypeID = new HashMap<String, Integer>();
 	private final HashMap<String, Integer> killedMonstersByName = new HashMap<String, Integer>();
@@ -70,7 +67,6 @@ public final class GameStatistics {
 	public boolean hasUnlimitedLives() { return startLives == -1; }
 
 	public int getStartLives() { return startLives; }
-	public boolean getIsAlteredSavegame() { return isAlteredSavegame; }
 
 	public int getLivesLeft() { return hasUnlimitedLives() ? -1 : startLives - deaths; }
 
@@ -162,18 +158,6 @@ public final class GameStatistics {
 		}
 	};
 
-	public void setChecksum(byte[] checksum) {
-		if (checksum.length != ChecksumBuilder.CHECKSUM_LENGTH) throw new IllegalArgumentException("Invalid checksum length.");
-		this.checksum = checksum;
-	}
-
-	public boolean compareChecksum(byte[] checksum) {
-		return this.checksum.length == checksum.length && MessageDigest.isEqual(this.checksum, checksum);
-	}
-
-	public void markAsAlteredSavegame() {
-		isAlteredSavegame = true;
-	}
 
 	// ====== PARCELABLE ===================================================================
 
@@ -210,11 +194,6 @@ public final class GameStatistics {
 
 		this.startLives = src.readInt();
 		this.unlimitedSaves = src.readBoolean();
-		if (fileversion < 81) return;
-		this.isAlteredSavegame = src.readBoolean();
-		final int checksumLength = src.readInt();
-		this.checksum = new byte[checksumLength];
-		if( src.read(checksum) != checksumLength) throw new IOException("Failed to read full checksum.");
 	}
 
 	public void writeToParcel(DataOutputStream dest) throws IOException {
@@ -234,29 +213,5 @@ public final class GameStatistics {
 		dest.writeInt(spentGold);
 		dest.writeInt(startLives);
 		dest.writeBoolean(unlimitedSaves);
-		dest.writeBoolean(isAlteredSavegame);
-		dest.writeInt(checksum.length);
-		dest.write(checksum);
-	}
-
-
-	public void addToChecksum(ChecksumBuilder builder) {
-		builder.add(deaths);
-		Set<Entry<String, Integer> > set = killedMonstersByTypeID.entrySet();
-		builder.add(set.size());
-		for (Entry<String, Integer> e : set) {
-			builder.add(e.getKey());
-			builder.add(e.getValue());
-		}
-		set = usedItems.entrySet();
-		builder.add(set.size());
-		for (Entry<String, Integer> e : set) {
-			builder.add(e.getKey());
-			builder.add(e.getValue());
-		}
-		builder.add(spentGold);
-		builder.add(startLives);
-		builder.add(unlimitedSaves);
-		builder.add(isAlteredSavegame);
 	}
 }

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

@@ -51,12 +51,4 @@ public final class InterfaceData {
 		}
 		dest.writeUTF(selectedTabHeroInfo);
 	}
-
-	public void addToChecksum(ChecksumBuilder builder) {
-		builder.add(isMainActivityVisible);
-		builder.add(isInCombat);
-		builder.add(selectedPosition != null);
-		if (selectedPosition != null) selectedPosition.addToChecksum(builder);
-		builder.add(selectedTabHeroInfo);
-	}
 }

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

@@ -49,11 +49,4 @@ public final class ModelContainer {
 		statistics.writeToParcel(dest);
 		worldData.writeToParcel(dest);
 	}
-	public void addToChecksum(ChecksumBuilder builder){
-		player.addToChecksum(builder);
-		builder.add(currentMaps.map.name);
-		uiSelections.addToChecksum(builder);
-		statistics.addToChecksum(builder);
-		worldData.addToChecksum(builder);
-    }
 }

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 {
@@ -114,13 +56,4 @@ public final class WorldData {
 			dest.writeLong(e.getValue());
 		}
 	}
-
-	public void addToChecksum(ChecksumBuilder builder) {
-		builder.add(worldTime);
-		builder.add(timers.size());
-		for(Map.Entry<String, Long> e : timers.entrySet()) {
-			builder.add(e.getKey());
-			builder.add(e.getValue());
-		}
-	}
 }

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

@@ -5,12 +5,10 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.ChecksumBuilder;
 
 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;
@@ -29,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;
 	}
 
 
@@ -52,11 +45,4 @@ public final class ActorCondition {
 		dest.writeInt(magnitude);
 		dest.writeInt(duration);
 	}
-
-	public void addToChecksum(ChecksumBuilder builder) {
-		builder.add(conditionType.conditionTypeID);
-		builder.add(magnitude);
-		builder.add(duration);
-	}
-
 }

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

@@ -10,7 +10,6 @@ public final class ActorConditionType {
 
 	public final String conditionTypeID;
 	public final String name;
-	public final String description;
 	public final int iconID;
 	public final ConditionCategory conditionCategory;
 	public final boolean isStacking;
@@ -22,7 +21,6 @@ public final class ActorConditionType {
 	public ActorConditionType(
 			String conditionTypeID
 			, String name
-			, String description
 			, int iconID
 			, ConditionCategory conditionCategory
 			, boolean isStacking
@@ -33,7 +31,6 @@ public final class ActorConditionType {
 	) {
 		this.conditionTypeID = conditionTypeID;
 		this.name = name;
-		this.description = description;
 		this.iconID = iconID;
 		this.conditionCategory = conditionCategory;
 		this.isStacking = isStacking;

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

@@ -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;
@@ -187,12 +186,12 @@ public final class SkillCollection {
 		initializeSkill(new SkillInfo(SkillID.resistanceBlood, MAX_LEVEL_RESISTANCE, SkillInfo.LevelUpType.alwaysShown, SkillCategory.immunity, null, position++));
 		initializeSkill(new SkillInfo(SkillID.shadowBless, 1, SkillInfo.LevelUpType.onlyByQuests, SkillCategory.immunity, null, position++));
 		initializeSkill(new SkillInfo(SkillID.crit1, 1, SkillInfo.LevelUpType.alwaysShown, SkillCategory.criticals, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 2)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 2)
+			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 3)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 3)
 		}, position++));
 		initializeSkill(new SkillInfo(SkillID.crit2, 1, SkillInfo.LevelUpType.alwaysShown, SkillCategory.criticals, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 4)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 4)
+			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 6)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 6)
 			,SkillLevelRequirement.requireOtherSkill(SkillID.crit1, 1)
 		}, position++));
 		initializeSkill(new SkillInfo(SkillID.rejuvenation, 1, SkillInfo.LevelUpType.alwaysShown, SkillCategory.immunity, new SkillLevelRequirement[] {

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

@@ -35,9 +35,7 @@ public class Actor {
 	public int blockChance;
 	public int damageResistance;
 	public ItemTraits_OnUse[] onHitEffects;
-	public ItemTraits_OnUse[] onMissEffects;
 	public ItemTraits_OnHitReceived[] onHitReceivedEffects;
-	public ItemTraits_OnHitReceived[] onMissReceivedEffects;
 	public ItemTraits_OnUse onDeathEffects;
 	public boolean hasVFXRunning = false;
 	public long vfxStartTime = 0;
@@ -71,12 +69,8 @@ public class Actor {
 	public int getDamageResistance() { return damageResistance; }
 	public ItemTraits_OnUse[] getOnHitEffects() { return onHitEffects; }
 	public List<ItemTraits_OnUse> getOnHitEffectsAsList() { return onHitEffects == null ? null : Arrays.asList(onHitEffects); }
-	public ItemTraits_OnUse[] getOnMissEffects() { return onMissEffects; }
-	public List<ItemTraits_OnUse> getOnMissEffectsAsList() { return onMissEffects == null ? null : Arrays.asList(onMissEffects); }
 	public ItemTraits_OnHitReceived[] getOnHitReceivedEffects() { return onHitReceivedEffects; }
 	public List<ItemTraits_OnHitReceived> getOnHitReceivedEffectsAsList() { return onHitReceivedEffects == null ? null : Arrays.asList(onHitReceivedEffects); }
-	public ItemTraits_OnHitReceived[] getOnMissReceivedEffects() { return onMissReceivedEffects; }
-	public List<ItemTraits_OnHitReceived> getOnMissReceivedEffectsAsList() { return onMissReceivedEffects == null ? null : Arrays.asList(onMissReceivedEffects); }
 	public ItemTraits_OnUse getOnDeathEffects() { return onDeathEffects; }
 	
 	public boolean hasCriticalSkillEffect() { return getCriticalSkill() != 0; }

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

@@ -6,7 +6,6 @@ import java.io.IOException;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.model.ChecksumBuilder;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
 import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
 import com.gpl.rpg.AndorsTrail.model.item.DropList;
@@ -30,14 +29,11 @@ public final class Monster extends Actor {
 	public final MonsterType monsterType;
 	public final MonsterSpawnArea area;
 
-	public final boolean isFlippedX;
-
 	public Monster(MonsterType monsterType, MonsterSpawnArea area) {
 		super(monsterType.tileSize, false, monsterType.isImmuneToCriticalHits());
 		this.monsterType = monsterType;
 		this.area = area;
 		this.iconID = monsterType.iconID;
-		this.isFlippedX = Constants.roll100(monsterType.horizontalFlipChance);
 		this.nextPosition = new CoordRect(new Coord(), monsterType.tileSize);
 		resetStatsToBaseTraits();
 		this.ap.setMax();
@@ -197,43 +193,4 @@ public final class Monster extends Actor {
 			dest.writeBoolean(false);
 		}
 	}
-
-	public void addToChecksum(ChecksumBuilder builder) {
-		builder.add(getMonsterTypeID());
-		if (attackCost == monsterType.attackCost
-				&& attackChance == monsterType.attackChance
-				&& criticalSkill == monsterType.criticalSkill
-				&& criticalMultiplier == monsterType.criticalMultiplier
-				&& damagePotential.equals(monsterType.damagePotential)
-				&& blockChance == monsterType.blockChance
-				&& damageResistance == monsterType.damageResistance
-		) {
-			builder.add(false);
-		} else {
-			builder.add(true);
-			builder.add(attackCost);
-			builder.add(attackChance);
-			builder.add(criticalSkill);
-			builder.add(criticalMultiplier);
-			damagePotential.addToChecksum(builder);
-			builder.add(blockChance);
-			builder.add(damageResistance);
-		}
-		ap.addToChecksum(builder);
-		health.addToChecksum(builder);
-		position.addToChecksum(builder);
-		builder.add(conditions.size());
-		for (ActorCondition c : conditions) {
-			c.addToChecksum(builder);
-		}
-		builder.add(moveCost);
-
-		builder.add(forceAggressive);
-		if (shopItems != null) {
-			builder.add(true);
-			shopItems.addToChecksum(builder);
-		} else {
-			builder.add(false);
-		}
-	}
 }

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

@@ -37,7 +37,6 @@ public final class MonsterType {
 
 	public final Size tileSize;
 	public final int iconID;
-	public final int horizontalFlipChance;
 	public final int maxAP;
 	public final int maxHP;
 	public final int moveCost;
@@ -65,7 +64,6 @@ public final class MonsterType {
 			, AggressionType aggressionType
 			, Size tileSize
 			, int iconID
-			, int horizontalFlipChance
 			, int maxAP
 			, int maxHP
 			, int moveCost
@@ -92,7 +90,6 @@ public final class MonsterType {
 		this.aggressionType = aggressionType;
 		this.tileSize = tileSize;
 		this.iconID = iconID;
-		this.horizontalFlipChance = horizontalFlipChance;
 		this.maxAP = maxAP;
 		this.maxHP = maxHP;
 		this.moveCost = moveCost;

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

@@ -19,7 +19,6 @@ 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.Constants;
-import com.gpl.rpg.AndorsTrail.model.ChecksumBuilder;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
 import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
 import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
@@ -476,62 +475,5 @@ public final class Player extends Actor {
 		dest.writeUTF(id);
 		dest.writeLong(savedVersion);
 	}
-	public void addToChecksum(ChecksumBuilder builder) {
-		//builder.add(baseTraits.iconID);// Do not add to checksum so that it can be changed without invalidating checksums
-		builder.add(baseTraits.maxAP);
-		builder.add(baseTraits.maxHP);
-		//builder.add(name);// Do not add to checksum so that it can be changed without invalidating checksums
-		builder.add(moveCost); // TODO: Should we really write this?
-		builder.add(baseTraits.attackCost);
-		builder.add(baseTraits.attackChance);
-		builder.add(baseTraits.criticalSkill);
-		builder.add(baseTraits.criticalMultiplier);
-		baseTraits.damagePotential.addToChecksum(builder);
-		builder.add(baseTraits.blockChance);
-		builder.add(baseTraits.damageResistance);
-		builder.add(baseTraits.moveCost);
-
-		ap.addToChecksum(builder);
-		health.addToChecksum(builder);
-		position.addToChecksum(builder);
-		builder.add(conditions.size());
-		for (ActorCondition c : conditions) {
-			c.addToChecksum(builder);
-		}
-		builder.add(immunities.size());
-		for (ActorCondition c : immunities) {
-			c.addToChecksum(builder);
-		}
-		lastPosition.addToChecksum(builder);
-		nextPosition.addToChecksum(builder);
-		builder.add(level);
-		builder.add(totalExperience);
-		inventory.addToChecksum(builder);
-		builder.add(baseTraits.useItemCost);
-		builder.add(baseTraits.reequipCost);
-		builder.add(skillLevels.size());
-		for (int i = 0; i < skillLevels.size(); ++i) {
-			builder.add(skillLevels.keyAt(i));
-			builder.add(skillLevels.valueAt(i));
-		}
-		builder.add(spawnMap);
-		builder.add(spawnPlace);
-		builder.add(questProgress.size());
-		for(Entry<String, LinkedHashSet<Integer> > e : questProgress.entrySet()) {
-			builder.add(e.getKey());
-			builder.add(e.getValue().size());
-			for(int progress : e.getValue()) {
-				builder.add(progress);
-			}
-		}
-		builder.add(availableSkillIncreases);
-		builder.add(alignments.size());
-		for(Entry<String, Integer> e : alignments.entrySet()) {
-			builder.add(e.getKey());
-			builder.add(e.getValue());
-		}
-		builder.add(id);
-		builder.add(savedVersion);
-	}
 }
 

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

@@ -5,7 +5,6 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.ChecksumBuilder;
 import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer;
 
 public final class Inventory extends ItemContainer {
@@ -209,21 +208,4 @@ public final class Inventory extends ItemContainer {
 			}
 		}
 	}
-	public void addToChecksum(ChecksumBuilder builder) {
-		super.addToChecksum(builder);
-		builder.add(gold);
-		builder.add(NUM_WORN_SLOTS);
-		for(int i = 0; i < NUM_WORN_SLOTS; ++i) {
-			if (wear[i] != null) {
-				builder.add(wear[i].id);
-			}
-		}
-		builder.add(NUM_QUICK_SLOTS);
-		for(int i = 0; i < NUM_QUICK_SLOTS; ++i) {
-			if (quickitem[i] != null) {
-				builder.add(quickitem[i].id);
-			}
-		}
-
-	}
 }

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

@@ -8,7 +8,6 @@ import java.util.Collections;
 import java.util.Comparator;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.ChecksumBuilder;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 
 public class ItemContainer {
@@ -43,10 +42,6 @@ public class ItemContainer {
 			dest.writeUTF(itemType.id);
 			dest.writeInt(quantity);
 		}
-		public void addToChecksum(ChecksumBuilder builder) {
-			builder.add(itemType.id);
-			builder.add(quantity);
-		}
 	}
 
 	public void addItem(ItemType itemType, int quantity) {
@@ -285,10 +280,4 @@ public class ItemContainer {
 			e.writeToParcel(dest);
 		}
 	}
-	public void addToChecksum(ChecksumBuilder builder) {
-		builder.add(items.size());
-		for (ItemEntry e : items) {
-			e.addToChecksum(builder);
-		}
-	}
 }

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

@@ -33,10 +33,8 @@ public final class ItemType {
 	public final ItemTraits_OnEquip effects_equip;
 	public final ItemTraits_OnUse effects_use;
 	public final ItemTraits_OnUse effects_hit;
-	public final ItemTraits_OnUse effects_miss;
 	public final ItemTraits_OnUse effects_kill;
 	public final ItemTraits_OnHitReceived effects_hitReceived;
-	public final ItemTraits_OnHitReceived effects_missReceived;
 
 	public ItemType(
 			String id
@@ -50,10 +48,8 @@ public final class ItemType {
 			, ItemTraits_OnEquip effects_equip
 			, ItemTraits_OnUse effects_use
 			, ItemTraits_OnUse effects_hit
-			, ItemTraits_OnUse effects_miss
 			, ItemTraits_OnUse effects_kill
 			, ItemTraits_OnHitReceived effects_hitReceived
-			, ItemTraits_OnHitReceived effects_missReceived
 	) {
 		this.id = id;
 		this.iconID = iconID;
@@ -67,10 +63,8 @@ public final class ItemType {
 		this.effects_equip = effects_equip;
 		this.effects_use = effects_use;
 		this.effects_hit = effects_hit;
-		this.effects_miss = effects_miss;
 		this.effects_kill = effects_kill;
 		this.effects_hitReceived = effects_hitReceived;
-		this.effects_missReceived = effects_missReceived;
 		this.hasPersonalizedName = name.contains(Constants.PLACEHOLDER_PLAYERNAME);
 	}
 

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

@@ -5,7 +5,6 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.ChecksumBuilder;
 import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 
@@ -89,12 +88,4 @@ public final class Loot {
 		position.writeToParcel(dest);
 		dest.writeBoolean(isVisible);
 	}
-
-	public void addToChecksum(ChecksumBuilder builder) {
-		builder.add(exp);
-		builder.add(gold);
-		items.addToChecksum(builder);
-		position.addToChecksum(builder);
-		builder.add(isVisible);
-	}
 }

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

@@ -11,7 +11,6 @@ import java.util.List;
 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.model.ChecksumBuilder;
 import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForMap;
 import com.gpl.rpg.AndorsTrail.util.L;
 
@@ -100,16 +99,4 @@ public final class MapCollection {
 			map.writeToParcel(dest, world);
 		}
 	}
-
-	public void addToChecksum(ChecksumBuilder checksumBuilder, WorldContext world) {
-		List<PredefinedMap> mapsToExport = new ArrayList<PredefinedMap>();
-		for(PredefinedMap map : getAllMaps()) {
-			if (shouldSaveMap(world, map)) mapsToExport.add(map);
-		}
-		checksumBuilder.add(mapsToExport.size());
-		for(PredefinedMap map : mapsToExport) {
-			checksumBuilder.add(map.name);
-			map.addToChecksum(checksumBuilder, world);
-		}
-	}
 }

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

@@ -8,7 +8,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.model.ChecksumBuilder;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
 import com.gpl.rpg.AndorsTrail.util.Coord;
@@ -18,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>();
@@ -31,7 +30,7 @@ public final class MonsterSpawnArea {
 	public MonsterSpawnArea(
 			CoordRect area
 			, Range quantity
-			, Range respawnspeed
+			, Range spawnChance
 			, String areaID
 			, String[] monsterTypeIDs
 			, boolean isUnique
@@ -41,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;
@@ -102,7 +101,7 @@ public final class MonsterSpawnArea {
 	}
 
 	public boolean rollShouldSpawn() {
-		return Constants.rollResult(respawnspeed);
+		return Constants.rollResult(spawnChance);
 	}
 
 	public void removeAllMonsters() {
@@ -141,12 +140,4 @@ public final class MonsterSpawnArea {
 			m.writeToParcel(dest);
 		}
 	}
-
-	public void addToChecksum(ChecksumBuilder builder) {
-		builder.add(isSpawning);
-		builder.add(monsters.size());
-		for (Monster m : monsters) {
-			m.addToChecksum(builder);
-		}
-	}
 }

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

@@ -12,7 +12,6 @@ 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.VisualEffectController.BloodSplatter;
-import com.gpl.rpg.AndorsTrail.model.ChecksumBuilder;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
@@ -399,30 +398,4 @@ public final class PredefinedMap {
 		dest.writeBoolean(visited);
 		dest.writeUTF(lastSeenLayoutHash);
 	}
-
-	public void addToChecksum(ChecksumBuilder builder, WorldContext world) {
-		if (shouldSaveMapData(world)) {
-			builder.add(true);
-			builder.add(spawnAreas.length);
-			for(MonsterSpawnArea a : spawnAreas) {
-				builder.add(a.areaID);
-				a.addToChecksum(builder);
-			}
-			builder.add(activeMapObjectGroups.size());
-			for(String s : activeMapObjectGroups) {
-				builder.add(s);
-			}
-			builder.add(groundBags.size());
-			for(Loot l : groundBags) {
-				l.addToChecksum(builder);
-			}
-			builder.add(currentColorFilter != null);
-			if (currentColorFilter != null) builder.add(currentColorFilter);
-			builder.add(lastVisitTime);
-		} else {
-			builder.add(false);
-		}
-		builder.add(visited);
-		builder.add(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 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,11 +21,6 @@ public final class Requirement {
 		,random
 		,factionScoreEquals
 		,wearRemove
-		,date
-		,dateEquals
-		,time
-		,timeEquals
-		,skillIncrease		// Check if possible to increase
 	}
 
 	public final RequirementType requireType;
@@ -86,13 +81,8 @@ public final class Requirement {
 			case questProgress:
 				return requireID != null && value >= 0;
 			case skillLevel:
-			case skillIncrease:
 				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

@@ -9,12 +9,6 @@ public final class ScriptEffect {
 		, actorConditionImmunity
 		, alignmentChange
 		, alignmentSet
-		, alignmentToReg1
-		, alignmentFromReg1
-		, alignmentAdd
-		, alignmentSub
-		, alignmentMult
-		, alignmentDiv
 		, giveItem
 		, createTimer
 		, spawnAll
@@ -24,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,21 +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 sz8x4 = new Size(8, 4);
-		final Size sz10x2 = new Size(10, 2);
-		final Size sz16x8 = new Size(16, 8);
-		final Size sz16x10 = new Size(16, 10);
 		final Size sz20x12 = new Size(20, 12);
 		final Size mapTileSize = new Size(16, 8);
 		final Size sz8x8 = new Size(8, 8);
@@ -285,7 +277,6 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.actorconditions_1, "actorconditions_1", new Size(14, 8), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.actorconditions_2, "actorconditions_2", sz3x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.actorconditions_japozero, "actorconditions_japozero", new Size(16, 4), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.actorconditions_newb, "actorconditions_newb", new Size(20, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.actorconditions_omi1, "actorconditions_omi1", sz2x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.actorconditions_omi2, "actorconditions_omi2", sz5x1, sz1x1, mTileSize);
 		/*INSERT_ACTORCONDITIONS_TILESETS_HERE*/
@@ -308,38 +299,34 @@ 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);
 		loader.prepareTileset(R.drawable.monsters_eye4, "monsters_eye4", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_ghost1, "monsters_ghost1", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_hydra1, "monsters_hydra1", sz1x1, sz2x2, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_insects, "monsters_insects", sz16x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_johny, "monsters_johny", sz20x12, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_insects, "monsters_insects", sz6x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_karvis1, "monsters_karvis1", sz2x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_karvis2, "monsters_karvis2", new Size(9, 1), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_ld1, "monsters_ld1", sz20x12, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_ld2, "monsters_ld2", sz20x12, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_ld1, "monsters_ld1", new Size(20, 12), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_ld2, "monsters_ld2", new Size(20, 12), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_liches, "monsters_liches", new Size(4, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_mage, "monsters_mage", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_mage2, "monsters_mage2", sz1x1, sz1x1, mTileSize);
@@ -347,10 +334,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, 10), 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,30 +363,22 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.monsters_omi1_b, "monsters_omi1_b", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_unknown, "monsters_unknown", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_arulirs, "monsters_arulirs", new Size(8, 2), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_fatboy73, "monsters_fatboy73", sz20x12, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_fatboy73, "monsters_fatboy73", new Size(20, 12), sz1x1, mTileSize);
         loader.prepareTileset(R.drawable.monsters_giantbasilisk, "monsters_giantbasilisk", sz1x1, sz2x2, mTileSize);
         loader.prepareTileset(R.drawable.monsters_gisons, "monsters_gisons", new Size(8, 2), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_bosses_2x2, "monsters_bosses_2x2", sz8x4, sz2x2, 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);
-		loader.prepareTileset(R.drawable.monsters_1x2, "monsters_1x2", new Size(10, 5), sz1x2, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_antison, "monsters_antison", sz10x2, sz1x1, mTileSize);
 		/*INSERT_NPCS_TILESETS_HERE*/
 		
-		loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1", sz16x10, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_boats_1, "map_boats_1", new Size(16, 9), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_border_1, "map_border_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_bridge_1, "map_bridge_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_bridge_2, "map_bridge_2", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_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_cavewall_6, "map_cavewall_6", new Size(18, 6), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_chair_table_1, "map_chair_table_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_chair_table_2, "map_chair_table_2", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_crate_1, "map_crate_1", mapTileSize, sz1x1, mTileSize);
@@ -411,7 +386,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);
@@ -424,59 +398,45 @@ 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_ground_10, "map_ground_10", 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);
 		loader.prepareTileset(R.drawable.map_indoor_2, "map_indoor_2", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_items, "map_items", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_kitchen_1, "map_kitchen_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_outdoor_1, "map_outdoor_1", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_outdoor_2, "map_outdoor_2", 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_table_3, "map_table_3", new Size(12, 10), 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);
+		loader.prepareTileset(R.drawable.map_ratdom, "map_ratdom", new Size(18, 6), sz1x1, mTileSize);
 		/*INSERT_MAP_TILESETS_HERE*/
 
 		loader.prepareTileset(R.drawable.effect_blood4, "effect_blood4", new Size(7, 2), sz1x1, mTileSize);

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

@@ -8,7 +8,7 @@ import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
 import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
-import android.util.Pair;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class ActorConditionsTypeParser extends JsonCollectionParserFor<ActorConditionType> {
 
@@ -26,7 +26,6 @@ public final class ActorConditionsTypeParser extends JsonCollectionParserFor<Act
 		ActorConditionType result = new ActorConditionType(
 				conditionTypeID
 				,translationLoader.translateActorConditionName(o.getString(JsonFieldNames.ActorCondition.name))
-				,translationLoader.translateActorConditionName(o.optString(JsonFieldNames.ActorCondition.description))
 				,ResourceParserUtils.parseImageID(tileLoader, o.getString(JsonFieldNames.ActorCondition.iconID))
 				,ActorConditionType.ConditionCategory.valueOf(o.getString(JsonFieldNames.ActorCondition.category))
 				,o.optInt(JsonFieldNames.ActorCondition.isStacking) > 0

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

@@ -13,7 +13,7 @@ import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonArrayParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
 import com.gpl.rpg.AndorsTrail.util.L;
-import android.util.Pair;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class ConversationListParser extends JsonCollectionParserFor<Phrase> {
 

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

@@ -11,7 +11,7 @@ import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonArrayParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
 import com.gpl.rpg.AndorsTrail.util.L;
-import android.util.Pair;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class DropListParser extends JsonCollectionParserFor<DropList> {
 
@@ -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/ItemCategoryParser.java

@@ -8,7 +8,7 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemCategory;
 import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
-import android.util.Pair;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class ItemCategoryParser extends JsonCollectionParserFor<ItemCategory> {
 

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

@@ -13,7 +13,7 @@ import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
 import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
-import android.util.Pair;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class ItemTypeParser extends JsonCollectionParserFor<ItemType> {
 
@@ -41,11 +41,9 @@ public final class ItemTypeParser extends JsonCollectionParserFor<ItemType> {
 		final ItemTraits_OnEquip equipEffect = itemTraitsParser.parseItemTraits_OnEquip(o.optJSONObject(JsonFieldNames.ItemType.equipEffect));
 		final ItemTraits_OnUse useEffect = itemTraitsParser.parseItemTraits_OnUse(o.optJSONObject(JsonFieldNames.ItemType.useEffect));
 		final ItemTraits_OnUse hitEffect = itemTraitsParser.parseItemTraits_OnUse(o.optJSONObject(JsonFieldNames.ItemType.hitEffect));
-		final ItemTraits_OnUse missEffect = itemTraitsParser.parseItemTraits_OnUse(o.optJSONObject(JsonFieldNames.ItemType.missEffect));
 		final ItemTraits_OnUse killEffect = itemTraitsParser.parseItemTraits_OnUse(o.optJSONObject(JsonFieldNames.ItemType.killEffect));
 		final ItemTraits_OnHitReceived hitReceivedEffect = itemTraitsParser.parseItemTraits_OnHitReceived(o.optJSONObject(JsonFieldNames.ItemType.hitReceivedEffect));
-		final ItemTraits_OnHitReceived missReceivedEffect = itemTraitsParser.parseItemTraits_OnHitReceived(o.optJSONObject(JsonFieldNames.ItemType.missReceivedEffect));
-
+		
 		final int baseMarketCost = o.optInt(JsonFieldNames.ItemType.baseMarketCost);
 		final boolean hasManualPrice = o.optInt(JsonFieldNames.ItemType.hasManualPrice, 0) > 0;
 		final ItemType itemType = new ItemType(
@@ -53,17 +51,15 @@ public final class ItemTypeParser extends JsonCollectionParserFor<ItemType> {
 				, ResourceParserUtils.parseImageID(tileLoader, o.getString(JsonFieldNames.ItemType.iconID))
 				, itemTypeName
 				, description
-				, itemCategories.getItemCategory(o.optString(JsonFieldNames.ItemType.category, "other"))
+				, itemCategories.getItemCategory(o.getString(JsonFieldNames.ItemType.category))
 				, ItemType.DisplayType.fromString(o.optString(JsonFieldNames.ItemType.displaytype, null), ItemType.DisplayType.ordinary)
 				, hasManualPrice
 				, baseMarketCost
 				, equipEffect
 				, useEffect
 				, hitEffect
-				, missEffect
 				, killEffect
 				, hitReceivedEffect
-				, missReceivedEffect
 			);
 		return new Pair<String, ItemType>(id, itemType);
 	}

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

@@ -14,7 +14,7 @@ import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
-import android.util.Pair;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class MonsterTypeParser extends JsonCollectionParserFor<MonsterType> {
@@ -55,8 +55,6 @@ public final class MonsterTypeParser extends JsonCollectionParserFor<MonsterType
 
 		final int exp = getExpectedMonsterExperience(attackCost, attackChance, damagePotential, criticalSkill, criticalMultiplier, blockChance, damageResistance, hitEffect, maxHP, maxAP);
 
-		final int horizontalFlipChance = o.optInt(JsonFieldNames.Monster.horizontalFlipChance, 0);
-
 		return new Pair<String, MonsterType>(monsterTypeID, new MonsterType(
 				monsterTypeID
 				, translationLoader.translateMonsterTypeName(o.getString(JsonFieldNames.Monster.name))
@@ -70,7 +68,6 @@ public final class MonsterTypeParser extends JsonCollectionParserFor<MonsterType
 				, MonsterType.AggressionType.fromString(o.optString(JsonFieldNames.Monster.movementAggressionType, null), MonsterType.AggressionType.none)
 				, ResourceParserUtils.parseTilesetTileSize(tileLoader, o.optString(JsonFieldNames.Monster.iconID, null), size1x1)
 				, ResourceParserUtils.parseImageID(tileLoader, o.getString(JsonFieldNames.Monster.iconID))
-				, horizontalFlipChance
 				, maxAP
 				, maxHP
 				, o.optInt(JsonFieldNames.Monster.moveCost, 10)

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

@@ -12,7 +12,7 @@ import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonArrayParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
-import android.util.Pair;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class QuestParser extends JsonCollectionParserFor<Quest> {
 	private final TranslationLoader translationLoader;

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;
@@ -16,7 +15,7 @@ import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
 import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.L;
-import android.util.Pair;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 import com.gpl.rpg.AndorsTrail.util.XmlResourceParserUtils;
 
 public final class WorldMapParser {
@@ -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/parsers/json/JsonCollectionParserFor.java

@@ -11,7 +11,7 @@ import org.json.JSONException;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.util.L;
-import android.util.Pair;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public abstract class JsonCollectionParserFor<T> extends JsonParserFor<Pair<String, T>> {
 	public HashSet<String> parseRows(String input, HashMap<String, T> dest) {

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

@@ -4,7 +4,6 @@ public final class JsonFieldNames {
 	public static final class ActorCondition {
 		public static final String conditionTypeID = "id";
 		public static final String name = "name";
-		public static final String description = "description";
 		public static final String iconID = "iconID";
 		public static final String category = "category";
 		public static final String isStacking = "isStacking";
@@ -105,7 +104,6 @@ public final class JsonFieldNames {
 	public static final class Monster {
 		public static final String monsterTypeID = "id";
 		public static final String iconID = "iconID";
-		public static final String horizontalFlipChance = "horizontalFlipChance";
 		public static final String name = "name";
 		public static final String spawnGroup = "spawnGroup";
 		public static final String monsterClass = "monsterClass";
@@ -168,10 +166,8 @@ public final class JsonFieldNames {
 		public static final String equipEffect = "equipEffect";
 		public static final String useEffect = "useEffect";
 		public static final String hitEffect = "hitEffect";
-		public static final String missEffect = "missEffect";
 		public static final String killEffect = "killEffect";
 		public static final String hitReceivedEffect = "hitReceivedEffect";
-		public static final String missReceivedEffect = "missReceivedEffect";
 	}
 
 

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/TileCollection.java

@@ -2,20 +2,14 @@ package com.gpl.rpg.AndorsTrail.resource.tiles;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.graphics.Matrix;
 import android.graphics.Paint;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public final class TileCollection {
 	private final Bitmap[] bitmaps;
-	private final Map<Integer, Bitmap> flippedBitmaps;
 	public final int maxTileID;
 
 	public TileCollection(int maxTileID) {
 		this.bitmaps = new Bitmap[maxTileID+1];
-		this.flippedBitmaps = new HashMap<>();
 		this.maxTileID = maxTileID;
 	}
 
@@ -25,30 +19,9 @@ public final class TileCollection {
 
 	public void setBitmap(int tileID, Bitmap bitmap) {
 		bitmaps[tileID] = bitmap;
-		flippedBitmaps.remove(tileID); // Remove cached flipped version if it exists
 	}
 
 	public void drawTile(Canvas canvas, int tile, int px, int py, Paint mPaint) {
-		drawTile(canvas, tile, px, py, mPaint, false);
-	}
-	public void drawTile(Canvas canvas, int tile, int px, int py, Paint mPaint, boolean isFlippedX) {
-		if (isFlippedX) {
-			canvas.drawBitmap(getFlippedBitmap(tile), px, py, mPaint);
-		} else canvas.drawBitmap(bitmaps[tile], px, py, mPaint);
-	}
-
-	private Bitmap getFlippedBitmap(int tile) {
-		if (flippedBitmaps.containsKey(tile)) {
-			return flippedBitmaps.get(tile);
-		}
-		Bitmap flipped = flipBitmapX(bitmaps[tile]);
-		flippedBitmaps.put(tile, flipped);
-		return flipped;
-	}
-
-	private static Bitmap flipBitmapX(Bitmap source) {
-		Matrix matrix = new Matrix();
-		matrix.postScale(-1, 1, source.getWidth() / 2f, source.getHeight() / 2f);
-		return Bitmap.createBitmap(source, 0, 0, source.getWidth(), source.getHeight(), matrix, true);
+		canvas.drawBitmap(bitmaps[tile], px, py, mPaint);
 	}
 }

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

@@ -12,7 +12,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.security.DigestException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -28,7 +27,6 @@ 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;
@@ -80,7 +78,7 @@ public final class Savegames {
 			}
 
 			return true;
-		} catch (IOException | DigestException e) {
+		} catch (IOException e) {
 			L.log("Error saving world: " + e.toString());
 			return false;
 		}
@@ -88,7 +86,7 @@ public final class Savegames {
 
 	private static void writeBackup(Context androidContext, byte[] savegame, String playerId) throws IOException {
 		File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER);
-		ensureDirExists(cheatDetectionFolder);
+        ensureDirExists(cheatDetectionFolder);
 		File backupFile = new File(cheatDetectionFolder, playerId + "X");
 		FileOutputStream fileOutputStream = new FileOutputStream(backupFile);
 		fileOutputStream.write(savegame);
@@ -106,18 +104,18 @@ public final class Savegames {
 			}
 
 			FileInputStream fos = getInputFile(androidContext, slot);
-			LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, androidContext, fos, fh);
+			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)) {
+                // 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 | DigestException e) {
+		} catch (IOException e) {
 			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
 				L.log("Error loading world: " + e.toString());
 				StringWriter sw = new StringWriter();
@@ -129,33 +127,33 @@ public final class Savegames {
 		}
 	}
 
-	private static boolean triedToCheat(Context androidContext, FileHeader fh) throws IOException {
-		long savedVersionToCheck = 0;
-		File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER);
-		ensureDirExists(cheatDetectionFolder);
-		File cheatDetectionFile = new File(cheatDetectionFolder, fh.playerId);
-		if (cheatDetectionFile.exists()) {
-			FileInputStream fileInputStream = new FileInputStream(cheatDetectionFile);
-			DataInputStream dataInputStream = new DataInputStream(fileInputStream);
-			final CheatDetection cheatDetection = new CheatDetection(dataInputStream);
-			savedVersionToCheck = cheatDetection.savedVersion;
-			dataInputStream.close();
-			fileInputStream.close();
-		}
+    private static boolean triedToCheat(Context androidContext, FileHeader fh) throws IOException {
+        long savedVersionToCheck = 0;
+        File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER);
+        ensureDirExists(cheatDetectionFolder);
+        File cheatDetectionFile = new File(cheatDetectionFolder, fh.playerId);
+        if (cheatDetectionFile.exists()) {
+            FileInputStream fileInputStream = new FileInputStream(cheatDetectionFile);
+            DataInputStream dataInputStream = new DataInputStream(fileInputStream);
+            final CheatDetection cheatDetection = new CheatDetection(dataInputStream);
+            savedVersionToCheck = cheatDetection.savedVersion;
+            dataInputStream.close();
+            fileInputStream.close();
+        }
 
 		if (savedVersionToCheck == DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED) {
 			return true;
 		}
 
-		if (androidContext.getFileStreamPath(fh.playerId).exists()) {
-			FileInputStream fileInputStream = androidContext.openFileInput(fh.playerId);
-			DataInputStream dataInputStream = new DataInputStream(fileInputStream);
-			final CheatDetection cheatDetection = new CheatDetection(dataInputStream);
-			if (cheatDetection.savedVersion == DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED) {
-				savedVersionToCheck = DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED;
-			} else if (cheatDetection.savedVersion > savedVersionToCheck) {
-				savedVersionToCheck = cheatDetection.savedVersion;
-			}
+        if (androidContext.getFileStreamPath(fh.playerId).exists()) {
+            FileInputStream fileInputStream = androidContext.openFileInput(fh.playerId);
+            DataInputStream dataInputStream = new DataInputStream(fileInputStream);
+            final CheatDetection cheatDetection = new CheatDetection(dataInputStream);
+            if (cheatDetection.savedVersion == DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED) {
+                savedVersionToCheck = DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED;
+            } else if (cheatDetection.savedVersion > savedVersionToCheck) {
+                savedVersionToCheck = cheatDetection.savedVersion;
+            }
 
 			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
 				L.log("Internal cheatcheck file savedVersion: " + cheatDetection.savedVersion);
@@ -168,98 +166,82 @@ public final class Savegames {
 		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) {
-			return androidContext.openFileOutput(Constants.FILENAME_SAVEGAME_QUICKSAVE, Context.MODE_PRIVATE);
-		} else {
-			ensureSavegameDirectoryExists(androidContext);
-			return new FileOutputStream(getSlotFile(slot, androidContext));
-		}
-	}
+    private static FileOutputStream getOutputFile(Context androidContext, int slot) throws IOException {
+        if (slot == SLOT_QUICKSAVE) {
+            return androidContext.openFileOutput(Constants.FILENAME_SAVEGAME_QUICKSAVE, Context.MODE_PRIVATE);
+        } else {
+            ensureSavegameDirectoryExists(androidContext);
+            return new FileOutputStream(getSlotFile(slot, androidContext));
+        }
+    }
 
-	private static void ensureSavegameDirectoryExists(Context context) {
-		File dir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
-		ensureDirExists(dir);
-	}
+    private static void ensureSavegameDirectoryExists(Context context) {
+        File dir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
+        ensureDirExists(dir);
+    }
 
-	public static boolean ensureDirExists(File dir) {
-		if (!dir.exists()) {
-			boolean worked = dir.mkdir();
-			return worked;
-		}
-		return true;
-	}
+    public static boolean ensureDirExists(File dir) {
+        if (!dir.exists()) {
+            boolean worked = dir.mkdir();
+            return worked;
+        }
+        return true;
+    }
 
-	private static FileInputStream getInputFile(Context androidContext, int slot) throws IOException {
-		if (slot == SLOT_QUICKSAVE) {
-			return androidContext.openFileInput(Constants.FILENAME_SAVEGAME_QUICKSAVE);
-		} else {
-			return new FileInputStream(getSlotFile(slot, androidContext));
-		}
-	}
+    private static FileInputStream getInputFile(Context androidContext, int slot) throws IOException {
+        if (slot == SLOT_QUICKSAVE) {
+            return androidContext.openFileInput(Constants.FILENAME_SAVEGAME_QUICKSAVE);
+        } else {
+            return new FileInputStream(getSlotFile(slot, androidContext));
+        }
+    }
 
-	public static File getSlotFile(int slot, Context context) {
-		File root = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
-		return getSlotFile(slot, root);
-	}
+    public static File getSlotFile(int slot, Context context) {
+        File root = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
+        return getSlotFile(slot, root);
+    }
 
-	public static File getSlotFile(int slot, File directory) {
-		return new File(directory, getSlotFileName(slot));
-	}
+    public static File getSlotFile(int slot, File directory) {
+        return new File(directory, getSlotFileName(slot));
+    }
 
-	public static String getSlotFileName(int slot) {
-		return Constants.FILENAME_SAVEGAME_FILENAME_PREFIX + slot;
-	}
+    public static String getSlotFileName(int slot) {
+        return Constants.FILENAME_SAVEGAME_FILENAME_PREFIX + slot;
+    }
 
 
-	public static void saveWorld(WorldContext world, OutputStream outStream, String displayInfo) throws IOException, DigestException {
+	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.model.statistics.getIsAlteredSavegame());
-
-		byte[] checksum = world.getChecksum();
-		world.model.statistics.setChecksum(checksum);
-
+				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, DigestException {
-		DataInputStream src = new DataInputStream(inState);
-		final FileHeader header = new FileHeader(src, fh.skipIcon);
-		if (header.fileversion > AndorsTrailApplication.CURRENT_VERSION)
-			return LoadSavegameResult.savegameIsFromAFutureVersion;
+    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);
 		src.close();
-		if (header.fileversion >= 81) {
-			checkChecksum(world);
-		}
-		WorldMapController.populateWorldMap(androidContext, world, controllers.getResources());
-
+		
 		if (header.fileversion < 45) {
 			LegacySavegamesContentAdaptations.adaptToNewContentForVersion45(world, controllers, res);
 		}
-
+		
 		onWorldLoaded(res, world, controllers);
 
 		return LoadSavegameResult.success;
 	}
 
-	private static void checkChecksum(WorldContext world) throws DigestException {
-		byte[] checksum = world.getChecksum();
-		if (!world.model.statistics.compareChecksum(checksum)) {
-			world.model.statistics.markAsAlteredSavegame();
-		}
-	}
-
 	private static void onWorldLoaded(Resources res, WorldContext world, ControllerContext controllers) {
 		controllers.actorStatsController.recalculatePlayerStats(world.model.player);
 		controllers.mapController.resetMapsNotRecentlyVisited();
@@ -284,15 +266,15 @@ public final class Savegames {
 		}
 	}
 
-	private static void writeCheatCheck(Context androidContext, long savedVersion, String playerId) throws IOException {
-		File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER);
-		ensureDirExists(cheatDetectionFolder);
-		File cheatDetectionFile = new File(cheatDetectionFolder, playerId);
-		FileOutputStream fileOutputStream = new FileOutputStream(cheatDetectionFile);
-		DataOutputStream dataOutputStream = new DataOutputStream(fileOutputStream);
-		CheatDetection.writeToParcel(dataOutputStream, savedVersion);
-		dataOutputStream.close();
-		fileOutputStream.close();
+    private static void writeCheatCheck(Context androidContext, long savedVersion, String playerId) throws IOException {
+        File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER);
+        ensureDirExists(cheatDetectionFolder);
+        File cheatDetectionFile = new File(cheatDetectionFolder, playerId);
+        FileOutputStream fileOutputStream = new FileOutputStream(cheatDetectionFile);
+        DataOutputStream dataOutputStream = new DataOutputStream(fileOutputStream);
+        CheatDetection.writeToParcel(dataOutputStream, savedVersion);
+        dataOutputStream.close();
+        fileOutputStream.close();
 
 		fileOutputStream = androidContext.openFileOutput(playerId, Context.MODE_PRIVATE);
 		dataOutputStream = new DataOutputStream(fileOutputStream);
@@ -303,26 +285,26 @@ public final class Savegames {
 
 	private static final Pattern savegameFilenamePattern = Pattern.compile(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX + "(\\d+)");
 
-	public static List<Integer> getUsedSavegameSlots(Context context) {
-		try {
-			final List<Integer> result = new ArrayList<Integer>();
-			AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY).listFiles(new FilenameFilter() {
-				@Override
-				public boolean accept(File f, String filename) {
-					Matcher m = savegameFilenamePattern.matcher(filename);
-					if (m != null && m.matches()) {
-						result.add(Integer.parseInt(m.group(1)));
-						return true;
-					}
-					return false;
-				}
-			});
-			Collections.sort(result);
-			return result;
-		} catch (Exception e) {
-			return new ArrayList<Integer>();
-		}
-	}
+    public static List<Integer> getUsedSavegameSlots(Context context) {
+        try {
+            final List<Integer> result = new ArrayList<Integer>();
+            AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY).listFiles(new FilenameFilter() {
+                @Override
+                public boolean accept(File f, String filename) {
+                    Matcher m = savegameFilenamePattern.matcher(filename);
+                    if (m != null && m.matches()) {
+                        result.add(Integer.parseInt(m.group(1)));
+                        return true;
+                    }
+                    return false;
+                }
+            });
+            Collections.sort(result);
+            return result;
+        } catch (Exception e) {
+            return new ArrayList<Integer>();
+        }
+    }
 
 	private static final class CheatDetection {
 		public final int fileversion;
@@ -342,17 +324,16 @@ public final class Savegames {
 	}
 
 
-	public static final class FileHeader {
-		public final int fileversion;
-		public final String playerName;
-		public final String displayInfo;
-		public final int iconID;
-		public final boolean isAlteredSavegame;
-		public boolean skipIcon = false;
-		public final boolean isDead;
-		public final boolean hasUnlimitedSaves;
-		public final String playerId;
-		public final long savedVersion;
+    public static final class FileHeader {
+        public final int fileversion;
+        public final String playerName;
+        public final String displayInfo;
+        public final int iconID;
+        public boolean skipIcon = false;
+        public final boolean isDead;
+        public final boolean hasUnlimitedSaves;
+        public final String playerId;
+        public final long savedVersion;
 
 		public String describe() {
 			return (fileversion == AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION ? "(D) " : "") + playerName + ", " + displayInfo;
@@ -361,18 +342,18 @@ public final class Savegames {
 
 		// ====== PARCELABLE ===================================================================
 
-		public FileHeader(DataInputStream src, boolean skipIcon) throws IOException {
-			int fileversion = src.readInt();
-			if (fileversion == 11)
-				fileversion = 5; // Fileversion 5 had no version identifier, but the first byte was 11.
-			this.fileversion = fileversion;
-			if (fileversion >= 14) { // Before fileversion 14 (0.6.7), we had no file header.
-				this.playerName = src.readUTF();
-				this.displayInfo = src.readUTF();
-			} else {
-				this.playerName = null;
-				this.displayInfo = null;
-			}
+        public FileHeader(DataInputStream src, boolean skipIcon) throws IOException {
+            int fileversion = src.readInt();
+            if (fileversion == 11)
+                fileversion = 5; // Fileversion 5 had no version identifier, but the first byte was 11.
+            this.fileversion = fileversion;
+            if (fileversion >= 14) { // Before fileversion 14 (0.6.7), we had no file header.
+                this.playerName = src.readUTF();
+                this.displayInfo = src.readUTF();
+            } else {
+                this.playerName = null;
+                this.displayInfo = null;
+            }
 
 			if (fileversion >= 43) {
 				int id = src.readInt();
@@ -397,14 +378,9 @@ public final class Savegames {
 				this.playerId = "";
 				this.savedVersion = 0;
 			}
-			if(fileversion >= 81){
-				this.isAlteredSavegame = src.readBoolean();
-			}else{
-				this.isAlteredSavegame = false;
-			}
 		}
 
-		public static void writeToParcel(DataOutputStream dest, String playerName, String displayInfo, int iconID, boolean isDead, boolean hasUnlimitedSaves, String playerId, long savedVersion, boolean isAlteredSavegame) 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);
@@ -413,7 +389,6 @@ public final class Savegames {
 			dest.writeBoolean(hasUnlimitedSaves);
 			dest.writeUTF(playerId);
 			dest.writeLong(savedVersion);
-			dest.writeBoolean(isAlteredSavegame);
 		}
 	}
 }

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 androidx.annotation.RequiresApi;
-import androidx.core.content.FileProvider;
-import androidx.documentfile.provider.DocumentFile;
+import android.support.annotation.RequiresApi;
+import android.support.v4.content.FileProvider;
+import android.support.v4.provider.DocumentFile;
 
 import android.os.Handler;
 import android.os.Looper;

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

@@ -1,7 +1,5 @@
 package com.gpl.rpg.AndorsTrail.util;
 
-import com.gpl.rpg.AndorsTrail.model.ChecksumBuilder;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -49,9 +47,4 @@ public final class Coord {
 		dest.writeInt(x);
 		dest.writeInt(y);
 	}
-
-	public void addToChecksum(ChecksumBuilder builder) {
-		builder.add(x);
-		builder.add(y);
-	}
 }

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/Pair.java

@@ -0,0 +1,11 @@
+package com.gpl.rpg.AndorsTrail.util;
+
+// Should really use android.util.Pair<> instead, but it is not available for API level 4 (Android 1.6).
+public final class Pair<T1, T2> {
+	public final T1 first;
+	public final T2 second;
+	public Pair(T1 a, T2 b) {
+		this.first = a;
+		this.second = b;
+	}
+}

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

@@ -1,7 +1,5 @@
 package com.gpl.rpg.AndorsTrail.util;
 
-import com.gpl.rpg.AndorsTrail.model.ChecksumBuilder;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -101,9 +99,4 @@ public final class Range {
 		dest.writeInt(max);
 		dest.writeInt(current);
 	}
-
-	public void addToChecksum(ChecksumBuilder builder) {
-		builder.add(max);
-		builder.add(current);
-	}
 }

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

@@ -13,6 +13,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.TextView;
 
@@ -75,8 +76,11 @@ public class CustomDialogFactory {
 		dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		dialog.setContentView(R.layout.custom_dialog_title_icon);
 		dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
-		boolean fullscreen = ((AndorsTrailApplication) context.getApplicationContext()).getPreferences().fullscreen;
-		AndorsTrailApplication.setFullscreenMode(fullscreen, dialog.getWindow());
+		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);
 

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/ItemEffectsView.java

@@ -20,17 +20,13 @@ public final class ItemEffectsView extends LinearLayout {
 	private final ActorConditionEffectList itemeffect_onequip_conditions;
 	private final ItemEffectsView_OnUse itemeffect_onuse;
 	private final ItemEffectsView_OnUse itemeffect_onhit;
-	private final ItemEffectsView_OnUse itemeffect_onmiss;
 	private final ItemEffectsView_OnUse itemeffect_onkill;
 	private final ItemEffectsView_OnHitReceived itemeffect_onhitreceived;
-	private final ItemEffectsView_OnHitReceived itemeffect_onmissreceived;
 	private final ItemEffectsView_OnDeath itemeffect_ondeath;
 	private final TextView itemeffect_onuse_title;
 	private final TextView itemeffect_onhit_title;
-	private final TextView itemeffect_onmiss_title;
 	private final TextView itemeffect_onkill_title;
 	private final TextView itemeffect_onhitreceived_title;
-	private final TextView itemeffect_onmissreceived_title;
 	private final TextView itemeffect_ondeath_title;
 
 	public ItemEffectsView(Context context, AttributeSet attr) {
@@ -45,17 +41,13 @@ public final class ItemEffectsView extends LinearLayout {
 
 		itemeffect_onuse = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onuse);
 		itemeffect_onhit = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onhit);
-		itemeffect_onmiss = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onmiss);
 		itemeffect_onkill = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onkill);
 		itemeffect_onhitreceived = (ItemEffectsView_OnHitReceived) findViewById(R.id.itemeffect_onhitreceived);
-		itemeffect_onmissreceived = (ItemEffectsView_OnHitReceived) findViewById(R.id.itemeffect_onmissreceived);
 		itemeffect_ondeath = (ItemEffectsView_OnDeath) findViewById(R.id.itemeffect_ondeath);
 		itemeffect_onuse_title = (TextView) findViewById(R.id.itemeffect_onuse_title);
 		itemeffect_onhit_title = (TextView) findViewById(R.id.itemeffect_onhit_title);
-		itemeffect_onmiss_title = (TextView) findViewById(R.id.itemeffect_onmiss_title);
 		itemeffect_onkill_title = (TextView) findViewById(R.id.itemeffect_onkill_title);
 		itemeffect_onhitreceived_title = (TextView) findViewById(R.id.itemeffect_onhitreceived_title);
-		itemeffect_onmissreceived_title = (TextView) findViewById(R.id.itemeffect_onmissreceived_title);
 		itemeffect_ondeath_title = (TextView) findViewById(R.id.itemeffect_ondeath_title);
 	}
 
@@ -63,10 +55,8 @@ public final class ItemEffectsView extends LinearLayout {
 			ItemTraits_OnEquip effects_equip,
 			Collection<ItemTraits_OnUse> effects_use,
 			Collection<ItemTraits_OnUse> effects_hit,
-			Collection<ItemTraits_OnUse> effects_miss,
 			Collection<ItemTraits_OnUse> effects_kill,
 			Collection<ItemTraits_OnHitReceived> effects_hitreceived,
-			Collection<ItemTraits_OnHitReceived> effects_missreceived,
 			ItemTraits_OnUse effects_death,
 			boolean isWeapon
 			) {
@@ -100,12 +90,6 @@ public final class ItemEffectsView extends LinearLayout {
 		} else {
 			itemeffect_onhit_title.setVisibility(View.GONE);
 		}
-		itemeffect_onmiss.update(effects_miss);
-		if (effects_miss != null) {
-			itemeffect_onmiss_title.setVisibility(View.VISIBLE);
-		} else {
-			itemeffect_onmiss_title.setVisibility(View.GONE);
-		}
 
 		itemeffect_onkill.update(effects_kill);
 		if (effects_kill != null) {
@@ -120,12 +104,6 @@ public final class ItemEffectsView extends LinearLayout {
 		} else {
 			itemeffect_onhitreceived_title.setVisibility(View.GONE);
 		}
-		itemeffect_onmissreceived.update(effects_missreceived);
-		if (effects_missreceived != null) {
-			itemeffect_onmissreceived_title.setVisibility(View.VISIBLE);
-		} else {
-			itemeffect_onmissreceived_title.setVisibility(View.GONE);
-		}
 
 		itemeffect_ondeath.update(effects_death);
 		if (effects_death != null) {

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;
@@ -431,13 +427,13 @@ public final class MainView extends SurfaceView
 		for (MonsterSpawnArea a : currentMap.spawnAreas) {
 			for (Monster m : a.monsters) {
 				if (!m.hasVFXRunning) {
-					drawFromMapPosition(canvas, area, m.rectPosition, m.iconID, m.isFlippedX);
+					drawFromMapPosition(canvas, area, m.rectPosition, m.iconID);
 				} else if (area.intersects(m.rectPosition) || area.intersects(new CoordRect(m.lastPosition,m.rectPosition.size))) {
 					int vfxElapsedTime = (int) (System.currentTimeMillis() - m.vfxStartTime);
 					if (vfxElapsedTime > m.vfxDuration) vfxElapsedTime = m.vfxDuration;
 					int x = ((m.position.x - mapViewArea.topLeft.x) * tileSize * vfxElapsedTime + ((m.lastPosition.x - mapViewArea.topLeft.x) * tileSize * (m.vfxDuration - vfxElapsedTime))) / m.vfxDuration;
 					int y = ((m.position.y - mapViewArea.topLeft.y) * tileSize * vfxElapsedTime + ((m.lastPosition.y - mapViewArea.topLeft.y) * tileSize * (m.vfxDuration - vfxElapsedTime))) / m.vfxDuration;
-					tiles.drawTile(canvas, m.iconID, x, y, mPaint, m.isFlippedX);
+					tiles.drawTile(canvas, m.iconID, x, y, mPaint);
 				}
 			}
 		}
@@ -503,27 +499,16 @@ public final class MainView extends SurfaceView
 		if (!area.contains(p)) return;
 		_drawFromMapPosition(canvas, area, p.x, p.y, tile);
 	}
-	private void drawFromMapPosition(Canvas canvas, final CoordRect area, final Coord p, final int tile, final boolean isFlippedX) {
-		if (!area.contains(p)) return;
-		_drawFromMapPosition(canvas, area, p.x, p.y, tile, isFlippedX);
-	}
 	private void drawFromMapPosition(Canvas canvas, final CoordRect area, final CoordRect p, final int tile) {
 		if (!area.intersects(p)) return;
 		_drawFromMapPosition(canvas, area, p.topLeft.x, p.topLeft.y, tile);
 	}
-	private void drawFromMapPosition(Canvas canvas, final CoordRect area, final CoordRect p, final int tile, final boolean isFlippedX) {
-		if (!area.intersects(p)) return;
-		_drawFromMapPosition(canvas, area, p.topLeft.x, p.topLeft.y, tile, isFlippedX);
-	}
 	private void _drawFromMapPosition(Canvas canvas, final CoordRect area, int x, int y, final int tile) {
-		_drawFromMapPosition(canvas, area, x, y, tile, false);
-	}
-	private void _drawFromMapPosition(Canvas canvas, final CoordRect area, int x, int y, final int tile, final boolean isFlippedX) {
 		x -= mapViewArea.topLeft.x;
 		y -= mapViewArea.topLeft.y;
 //		if (	   (x >= 0 && x < mapViewArea.size.width)
 //				&& (y >= 0 && y < mapViewArea.size.height)) {
-		tiles.drawTile(canvas, tile, x * tileSize, y * tileSize, mPaint, isFlippedX);
+			tiles.drawTile(canvas, tile, x * tileSize, y * tileSize, mPaint);
 //		}
 	}
 
@@ -809,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/ShopItemContainerAdapter.java

@@ -56,7 +56,7 @@ public final class ShopItemContainerAdapter extends ArrayAdapter<ItemEntry> {
 		} else {
 			int price = ItemController.getBuyingPrice(player, itemType);
 			b.setText(r.getString(R.string.shop_buyitem, price));
-			b.setEnabled(price > 0 && ItemController.canAfford(player, price));
+			b.setEnabled(ItemController.canAfford(player, price));
 		}
 		b.setOnClickListener(new OnClickListener() {
 			@Override

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) {