Merge branch 'pulls/1829009049/98' into AT_Source_Next_Release

this can be triggered by
 - walking up to an enemy
 - get the popup to attack it
 - cancel it, which finishes the round
 - repeat

with this it is very easy to for example use a heal over time food in a very short time or getting rid of an unwanted actor condition

the fix tries to just not grant a finished round when closing the window asking if the player wants to start attacking

Signed-off-by: OMGeeky <git@omgeeky.de>

AndorsTrail/.gitignore

@@ -5,6 +5,7 @@ local.properties
 app/build/intermediates/
 build/
 debug/
+beta/
 release/
 .gradle/
 
@@ -49,4 +50,6 @@ 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

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
 
-    compileSdkVersion 34
+    compileSdkVersion 35
 
     defaultConfig {
         applicationId "com.gpl.rpg.AndorsTrail"
         minSdkVersion 14
-        targetSdkVersion 34
+        targetSdkVersion 35
     }
 
     buildTypes {
@@ -19,8 +19,15 @@ 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'
     

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="80"
-	android:versionName="0.8.13"
+	android:versionCode="83"
+	android:versionName="0.8.16"
 	android:installLocation="auto"
 	>
 

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

@@ -8,31 +8,41 @@ 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 = false;
+    public static final boolean DEVELOPMENT_DEBUGBUTTONS = IS_DEV_VERSION;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
-	public static final String CURRENT_VERSION_DISPLAY = "0.8.13";
-	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
+	public static final boolean DEVELOPMENT_VALIDATEDATA = IS_BETA_VERSION;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = IS_DEV_VERSION;
 	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 : 80;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : BuildConfig.VERSION_CODE;
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();
@@ -57,13 +67,45 @@ public final class AndorsTrailApplication extends Application {
 
 	public void setWindowParameters(Activity activity) {
 		activity.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		if (preferences.fullscreen) {
-			activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+	}
+
+	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);
+				}
+			}
 		} else {
-			activity.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+			if (fullscreen) {
+				window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+			} else {
+				window.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();
@@ -166,4 +208,18 @@ 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

@@ -346,7 +346,6 @@ 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,9 +24,7 @@ public final class AboutActivity extends AndorsTrailBaseActivity implements Imag
 		super.onCreate(savedInstanceState);
 
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-		app.setWindowParameters(this);
-
-		setContentView(R.layout.about);
+		initializeView(this, R.layout.about, R.id.about_root);
 		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,9 +30,7 @@ public final class ActorConditionInfoActivity extends AndorsTrailBaseActivity {
 
 		String conditionTypeID = getIntent().getData().getLastPathSegment();
 		ActorConditionType conditionType = world.actorConditionsTypes.getActorConditionType(conditionTypeID);
-
-		setContentView(R.layout.actorconditioninfo);
-
+		initializeView(this, R.layout.actorconditioninfo, R.id.actorconditioninfo_root);
 
 		TextView tv = (TextView) findViewById(R.id.actorconditioninfo_title);
 		tv.setText(conditionType.name);

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

@@ -2,6 +2,10 @@ 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;
 
@@ -19,5 +23,13 @@ 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,6 +1,11 @@
 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 com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
@@ -19,4 +24,13 @@ 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,8 +89,7 @@ public final class BulkSelectionInterface extends AndorsTrailBaseActivity implem
 		interfaceType = BulkInterfaceType.valueOf(params.getString("interfaceType"));
 
 		int intialSelection = 1;
-
-		setContentView(R.layout.bulkselection);
+		initializeView(this, R.layout.bulkselection, R.id.bulkselection_root);
 
 		// 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,13 +75,11 @@ public final class ConversationActivity
 
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 
-		setContentView(R.layout.conversation);
+		initializeView(this, R.layout.conversation, R.id.conversation_root);
 
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-			setFinishOnTouchOutside(false);
-		}
+        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,9 +29,6 @@ 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>();
-	private List<DebugButton> tpButtons3 = new ArrayList<DebugButton>();
 
 	public DebugInterface(ControllerContext controllers, WorldContext world, MainActivity mainActivity) {
 		this.controllerContext = controllers;
@@ -53,36 +50,23 @@ 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);
-						}
-						for (DebugButton b : tpButtons3) {
-							b.b.setVisibility(View.GONE);
-						}
 					}
 				})
 				,new DebugButton("teleport", new OnClickListener() {
-			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);
-				}
-			}
-		})
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "debugmap", "entry", 0, 0);
+					}
+				})
 				,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) {
@@ -91,356 +75,78 @@ 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);
-			}
-		})
+					@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);
-			}
-		})
-		}));
-
-		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);
-						}
+						world.model.worldData.tickWorldTime(10);
 					}
 				})
-				,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, "crossroads", "middle", 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 (DebugButton tpButton : tpButtons3) {
-							tpButton.b.setVisibility(View.VISIBLE);
-						}
-						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);
-			}
-		})
-				,new DebugButton("gal", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_19", "south", 0, 0);
-			}
-		})
-
-				,new DebugButton("apl", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "sullengard_apple_farm_east", "house", 0, 0);
-			}
-		})
-
-				,new DebugButton("wch", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lake_shore_road_0", "west", 0, 0);
-			}
-		})
-
-				,new DebugButton("la1", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "laerothisland2", "south2", 0, 0);
-			}
-		})
-
-				,new DebugButton("la2", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "island3", "cave", 0, 0);
-			}
-		})
-
-				,new DebugButton("wx", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "wexlow_village", "north", 0, 0);
-			}
-		})
-
-				,new DebugButton("fey", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "guynmart_wood_17", "north", 0, 0);
-			}
-		})
-
-
-		}));
-		buttonList.addAll(tpButtons2);
-
-		tpButtons3.addAll(Arrays.asList(new DebugButton[] {
-				new DebugButton("teleport", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						for (int i = 0; i < buttons.length; i++) {
-							buttons[i].b.setVisibility(View.VISIBLE);
-						}
-						for (DebugButton tpButton : tpButtons) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-						for (DebugButton tpButton : tpButtons2) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-						for (DebugButton tpButton : tpButtons3) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-					}
-				})
-				,new DebugButton("#1", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lake_shore_road_9", "north", 5, 0);
-			}
-		})
-
-				,new DebugButton("#2", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crackshot_hideout3", "South", 0, 0);
-			}
-		})
-
-
-				,new DebugButton("#3", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "fallhaven_derelict2", "up", 0, 0);
-			}
-		})
-
-				,new DebugButton("#4", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "loneford4", "south", 0, 0);
-			}
-		})
-
-				,new DebugButton("#5", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "waytogalmore1", "entrance2", 0, 0);
-			}
-		})
-
-				,new DebugButton("#6", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_32", "south", 19, 0);
-			}
-		})
-
-				,new DebugButton("#7", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "cabin_norcity_road1", "north", 5, 0);
-			}
-		})
-
-				,new DebugButton("#8", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_86", "west", 0, 5);
-			}
-		})
-
-				,new DebugButton("#9", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_58", "north", 0, 0);
-			}
-		})
-
-				,new DebugButton("#10", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "laerothprison3", "south", 2, 0);
-			}
-		})
-
-		}));
-		buttonList.addAll(tpButtons3);
 
 		buttons = buttonList.toArray(new DebugButton[buttonList.size()]);
 		addDebugButtons(buttons);
-
-		for (DebugButton b : tpButtons) {
-			b.b.setVisibility(View.GONE);
-		}
-		for (DebugButton b : tpButtons2) {
-			b.b.setVisibility(View.GONE);
-		}
-		for (DebugButton b : tpButtons3) {
-			b.b.setVisibility(View.GONE);
-		}
 	}
 
 	private void showToast(Context context, String msg, int duration) {

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

@@ -38,10 +38,7 @@ public final class DisplayWorldMapActivity extends AndorsTrailBaseActivity {
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
 		this.world = app.getWorld();
-
-		app.setWindowParameters(this);
-
-		setContentView(R.layout.displayworldmap);
+		initializeView(this, R.layout.displayworldmap, R.id.worldmap_root);
 
 		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

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

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

@@ -14,6 +14,7 @@ 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;
@@ -45,7 +46,7 @@ public final class ItemInfoActivity extends AndorsTrailBaseActivity {
 		boolean buttonEnabled = params.getBoolean("buttonEnabled");
 		boolean moreButtonEnabled = params.getBoolean("moreActions");
 
-		setContentView(R.layout.iteminfo);
+		initializeView(this, R.layout.iteminfo, R.id.iteminfo_root);
 
 		TextView tv = (TextView) findViewById(R.id.iteminfo_title);
 		tv.setText(itemType.getName(world.model.player));
@@ -54,7 +55,7 @@ public final class ItemInfoActivity extends AndorsTrailBaseActivity {
 		tv = (TextView) findViewById(R.id.iteminfo_description);
 		String description = itemType.getDescription();
 		if (description != null) {
-			tv.setText(description);
+			tv.setText(description.replace(Constants.PLACEHOLDER_PLAYERNAME, world.model.player.getName()));
 			tv.setVisibility(View.VISIBLE);
 		} else {
 			tv.setVisibility(View.GONE);
@@ -67,8 +68,10 @@ 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);
 
-		setContentView(R.layout.levelup);
+		initializeView(this, R.layout.levelup, R.id.levelup_root);
 
 		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

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

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

@@ -36,8 +36,7 @@ public final class LoadingActivity extends AndorsTrailBaseActivity implements On
 		setTheme(ThemeHelper.getBaseTheme());
 		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-		app.setWindowParameters(this);
-		setContentView(R.layout.startscreen);
+		initializeView(this, R.layout.startscreen, R.id.startscreen_fragment_container);
 
 		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);
 
-		setContentView(R.layout.main);
+		initializeView(this, R.layout.main, R.id.main_container);
+
 		mainview = (MainView) findViewById(R.id.main_mainview);
 		statusview = (StatusView) findViewById(R.id.main_statusview);
 		combatview = (CombatView) findViewById(R.id.main_combatview);
@@ -139,7 +139,7 @@ public final class MainActivity
 			if (resultCode == Activity.RESULT_OK) {
 				controllers.combatController.enterCombat(CombatController.BeginTurnAs.player);
 			} else {
-				controllers.combatController.exitCombat(false);
+				controllers.combatController.exitCombat(false, true);
 			}
 			break;
 		case INTENTREQUEST_CONVERSATION:

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

@@ -34,7 +34,7 @@ public final class MonsterEncounterActivity extends AndorsTrailBaseActivity {
 			return;
 		}
 
-		setContentView(R.layout.monsterencounter);
+		initializeView(this, R.layout.monsterencounter, R.id.monsterencounter_root);
 
 		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);
 
-		setContentView(R.layout.monsterinfo);
+		initializeView(this, R.layout.monsterinfo, R.id.monsterinfo_root);
 
 		monsterinfo_title = (TextView) findViewById(R.id.monsterinfo_title);
 		monsterinfo_difficulty = (TextView) findViewById(R.id.monsterinfo_difficulty);
@@ -90,8 +90,10 @@ 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,17 +13,16 @@ public final class Preferences extends PreferenceActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		setTheme(ThemeHelper.getBaseTheme());
-		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		super.onCreate(savedInstanceState);
 		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.setWindowParameters(this);
+		super.onCreate(savedInstanceState);
+		app.setFullscreenMode(this);
+
 
 		app.setLocale(this);
 		addPreferencesFromResource(R.xml.preferences);
+
+
 	}
 
 	@Override

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

@@ -23,9 +23,8 @@ public final class ShopActivity extends AndorsTrailBaseFragmentActivity {
 
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
-		app.setWindowParameters(this);
 
-		setContentView(R.layout.tabbedlayout);
+		initializeView(this, R.layout.tabbedlayout, android.R.id.tabhost);
 
 		final Resources res = getResources();
 

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

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

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

@@ -21,6 +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.view.KeyEvent;
@@ -49,9 +51,9 @@ public final class StartScreenActivity extends AndorsTrailBaseFragmentActivity i
 		final Resources res = getResources();
 		TileManager tileManager = app.getWorld().tileManager;
 		tileManager.setDensity(res);
-		app.setWindowParameters(this);
 
-		setContentView(R.layout.startscreen);
+		initializeView(this, R.layout.startscreen, R.id.startscreen_fragment_container);
+		app.setFullscreenMode(this);
 
 		if (findViewById(R.id.startscreen_fragment_container) != null) {
 			StartScreenActivity_MainMenu mainMenu = new StartScreenActivity_MainMenu();
@@ -67,9 +69,11 @@ 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);
@@ -96,6 +100,10 @@ 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()
@@ -112,7 +120,7 @@ public final class StartScreenActivity extends AndorsTrailBaseFragmentActivity i
 	}
 
 	@Override
-	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+	public void onRequestPermissionsResult(int requestCode, @NonNull 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_Stats.java

@@ -183,19 +183,25 @@ 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;
-		actorinfo_onhiteffects.update(null, null, effects_hit, effects_kill, effects_hitReceived, null, false);
+		if (effects_missReceived.isEmpty()) effects_missReceived = null;
+		actorinfo_onhiteffects.update(null, null, effects_hit, effects_miss, effects_kill, effects_hitReceived,effects_missReceived, 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/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 = ItemController.canAfford(player, price);
+		boolean enableButton = (price > 0 && 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

@@ -59,7 +59,6 @@ public class StartScreenActivity_MainMenu extends Fragment {
         updatePreferences(false);
         super.onCreateView(inflater, container, savedInstanceState);
 
-
 		if (container != null) {
 			container.removeAllViews();
 		}
@@ -196,7 +195,6 @@ 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) {
@@ -232,7 +230,6 @@ 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,6 +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.view.LayoutInflater;
 import android.view.View;
@@ -39,8 +40,7 @@ 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,5 +1,6 @@
 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;
@@ -13,6 +14,8 @@ 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;
@@ -62,4 +65,11 @@ 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/CombatController.java

@@ -57,6 +57,9 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		else continueTurn();
 	}
 	public void exitCombat(boolean pickupLootBags) {
+		exitCombat(pickupLootBags, false);
+	}
+	public void exitCombat(boolean pickupLootBags, boolean canceledCombat) {
 		setCombatSelection(null, null);
 		world.model.uiSelections.isInCombat = false;
 		if (pickupLootBags) {
@@ -66,7 +69,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		controllers.actorStatsController.setActorMaxAP(world.model.player);
 		world.model.uiSelections.selectedPosition = null;
 		world.model.uiSelections.selectedMonster = null;
-		if (world.model.player.isDead()) {
+		if (world.model.player.isDead() || canceledCombat) {
 			controllers.gameRoundController.resetRoundTimers();
 		} else {
 			endOfCombatRound();
@@ -595,7 +598,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
 
 	private AttackResult attack(final Actor attacker, final Actor target) {
 		int hitChance = getAttackHitChance(attacker, target);
-		if (!Constants.roll100(hitChance)) return AttackResult.MISS;
+		if (!Constants.roll100(hitChance)) {
+			applyAttackMissStatusEffects(attacker, target);
+			return AttackResult.MISS;
+		}
 
 		int damage = Constants.rollValue(attacker.getDamagePotential());
 		boolean isCriticalHit = false;
@@ -629,6 +635,21 @@ 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,9 +48,16 @@ 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 PLACEHOLDER_REG2 = "$reg2";
+	public static final String PLACEHOLDER_REG3 = "$reg3";
 	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_REGISTER1_NAME = "reg1";
+	public static final String FACTION_SCORE_CALC_REGISTER2_NAME = "reg2";
+	public static final String FACTION_SCORE_CALC_REGISTER3_NAME = "reg3";
+
 	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,5 +1,7 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import static com.gpl.rpg.AndorsTrail.controller.SkillController.canLevelupSkillWithQuest;
+
 import java.util.ArrayList;
 
 import android.content.res.Resources;
@@ -98,6 +100,30 @@ public final class ConversationController {
 			case alignmentSet:
 				setAlignmentReward(player, effect.effectID, effect.value);
 				break;
+			case alignmentToReg1:
+				toAkkuAlignmentReward(player, effect.effectID, Constants.FACTION_SCORE_CALC_REGISTER1_NAME);
+				break;
+			case alignmentToReg2:
+				toAkkuAlignmentReward(player, effect.effectID, Constants.FACTION_SCORE_CALC_REGISTER2_NAME);
+				break;
+			case alignmentToReg3:
+				toAkkuAlignmentReward(player, effect.effectID, Constants.FACTION_SCORE_CALC_REGISTER3_NAME);
+				break;
+			case alignmentFromReg1:
+				fromAkkuAlignmentReward(player, effect.effectID, Constants.FACTION_SCORE_CALC_REGISTER1_NAME);
+				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;
@@ -193,6 +219,47 @@ public final class ConversationController {
 		MovementController.refreshMonsterAggressiveness(world.model.currentMaps.map, world.model.player);
 	}
 
+	private void toAkkuAlignmentReward(Player player, String faction, String reg) {
+		Integer i = player.getAlignment(faction);
+		player.setAlignment(reg, i);
+	}
+
+	private void fromAkkuAlignmentReward(Player player, String faction, String reg) {
+		Integer i = player.getAlignment(reg);
+		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_REGISTER1_NAME, i);
+	}
+
+	private void subAlignmentReward(Player player, String faction) {
+		Integer i = -1 * player.getAlignment(faction);
+		player.addAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_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_REGISTER1_NAME) * multiplier;
+		i2 = player.getAlignment(faction);
+		if (i2 != 0)
+		{
+			player.setAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_NAME, i1 / i2 );
+		}
+	}
+
+	/// @param multiplier the factor to multiply by. If 0, uses the faction score from the {@link Constants.FACTION_SCORE_CALC_REGISTER1_NAME} as multiplier.
+	private void multAlignmentReward(Player player, String faction, int multiplier ) {
+		Integer  i;
+		if (multiplier == 0) { multiplier = player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_NAME); }
+		i = player.getAlignment(faction) * multiplier;
+		player.setAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_NAME, i );
+	}
+
 	private void addQuestProgressReward(Player player, String questID, int questProgress, ScriptEffectResult result) {
 		QuestProgress progress = new QuestProgress(questID, questProgress);
 		boolean added = player.addQuestProgress(progress);
@@ -334,6 +401,16 @@ public final class ConversationController {
 			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;
 		}
@@ -360,7 +437,10 @@ 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());
+		return s.replace(Constants.PLACEHOLDER_PLAYERNAME, player.getName())
+				.replace(Constants.PLACEHOLDER_REG1, String.valueOf(player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_NAME)))
+				.replace(Constants.PLACEHOLDER_REG2, String.valueOf(player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER2_NAME)))
+				.replace(Constants.PLACEHOLDER_REG3, String.valueOf(player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER3_NAME)));
 	}
 
 	public static final class ConversationStatemachine {

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

@@ -195,19 +195,27 @@ 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;
-			if (eh == null && ehr == null) continue;
+			ItemTraits_OnUse em = type.effects_miss;
+			ItemTraits_OnHitReceived emr = type.effects_missReceived;
+			if (eh == null && ehr == null && em == null && emr == 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) {
@@ -217,6 +225,13 @@ 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()];
@@ -225,6 +240,13 @@ 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/SkillController.java

@@ -91,17 +91,17 @@ public final class SkillController {
 	}
 
 
-	private static boolean canLevelupSkillWithQuest(Player player, SkillInfo skill) {
+	static boolean canLevelupSkillWithQuest(Player player, SkillInfo skill, int levels) {
 		final int playerSkillLevel = player.getSkillLevel(skill.id);
 		if (skill.hasMaxLevel()) {
-			if (playerSkillLevel >= skill.maxLevel) return false;
+			if (playerSkillLevel + levels > skill.maxLevel) return false;
 		}
-		if (!skill.canLevelUpSkillTo(player, playerSkillLevel + 1)) return false;
+		if (!skill.canLevelUpSkillTo(player, playerSkillLevel + levels)) return false;
 		return true;
 	}
 	public static boolean canLevelupSkillManually(Player player, SkillInfo skill) {
 		if (!player.hasAvailableSkillpoints()) return false;
-		if (!canLevelupSkillWithQuest(player, skill)) return false;
+		if (!canLevelupSkillWithQuest(player, skill, 1)) 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 +114,7 @@ public final class SkillController {
 		addSkillLevel(skill.id);
 	}
 	public boolean levelUpSkillByQuest(Player player, SkillInfo skill) {
-		if (!canLevelupSkillWithQuest(player, skill)) return false;
+		if (!canLevelupSkillWithQuest(player, skill, 1)) return false;
 		addSkillLevel(skill.id);
 		return true;
 	}

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

@@ -0,0 +1,115 @@
+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,6 +3,7 @@ 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;
@@ -22,6 +23,8 @@ 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>();
@@ -67,6 +70,7 @@ 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; }
 
@@ -158,6 +162,18 @@ 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 ===================================================================
 
@@ -194,6 +210,11 @@ 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 {
@@ -213,5 +234,29 @@ 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,4 +51,12 @@ 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,4 +49,11 @@ 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

@@ -114,4 +114,13 @@ 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,6 +5,7 @@ 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;
@@ -51,4 +52,11 @@ 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/actor/Actor.java

@@ -35,7 +35,9 @@ 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;
@@ -69,8 +71,12 @@ 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,6 +6,7 @@ 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;
@@ -29,11 +30,14 @@ 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();
@@ -193,4 +197,43 @@ 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,6 +37,7 @@ 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;
@@ -64,6 +65,7 @@ public final class MonsterType {
 			, AggressionType aggressionType
 			, Size tileSize
 			, int iconID
+			, int horizontalFlipChance
 			, int maxAP
 			, int maxHP
 			, int moveCost
@@ -90,6 +92,7 @@ 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,6 +19,7 @@ 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;
@@ -475,5 +476,62 @@ 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,6 +5,7 @@ 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 {
@@ -208,4 +209,21 @@ 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,6 +8,7 @@ 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 {
@@ -42,6 +43,10 @@ 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) {
@@ -280,4 +285,10 @@ 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,8 +33,10 @@ 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
@@ -48,8 +50,10 @@ 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;
@@ -63,8 +67,10 @@ 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,6 +5,7 @@ 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;
 
@@ -88,4 +89,12 @@ 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,6 +11,7 @@ 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;
 
@@ -99,4 +100,16 @@ 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,6 +8,7 @@ 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;
@@ -140,4 +141,12 @@ 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,6 +12,7 @@ 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;
@@ -398,4 +399,30 @@ 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/script/Requirement.java

@@ -25,6 +25,7 @@ public final class Requirement {
 		,dateEquals
 		,time
 		,timeEquals
+		,skillIncrease		// Check if possible to increase
 	}
 
 	public final RequirementType requireType;
@@ -85,6 +86,7 @@ public final class Requirement {
 			case questProgress:
 				return requireID != null && value >= 0;
 			case skillLevel:
+			case skillIncrease:
 				return requireID != null && value >= 0;
 			case spentGold:
 			case date:

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

@@ -9,6 +9,16 @@ public final class ScriptEffect {
 		, actorConditionImmunity
 		, alignmentChange
 		, alignmentSet
+		, alignmentToReg1
+		, alignmentToReg2
+		, alignmentToReg3
+		, alignmentFromReg1
+		, alignmentFromReg2
+		, alignmentFromReg3
+		, alignmentAdd
+		, alignmentSub
+		, alignmentMult
+		, alignmentDiv
 		, giveItem
 		, createTimer
 		, spawnAll

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

@@ -262,6 +262,8 @@ public final class ResourceLoader {
 		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);
@@ -381,10 +383,12 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.monsters_fatboy73, "monsters_fatboy73", sz20x12, sz1x1, mTileSize);
         loader.prepareTileset(R.drawable.monsters_giantbasilisk, "monsters_giantbasilisk", sz1x1, sz2x2, mTileSize);
         loader.prepareTileset(R.drawable.monsters_gisons, "monsters_gisons", new Size(8, 2), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_bosses_2x2, "monsters_bosses_2x2", sz1x1, sz2x2, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_bosses_2x2, "monsters_bosses_2x2", sz8x4, 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);
@@ -399,6 +403,7 @@ public final class ResourceLoader {
 		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);
@@ -420,13 +425,16 @@ public final class ResourceLoader {
 		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);
@@ -449,6 +457,7 @@ public final class ResourceLoader {
 		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);

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 com.gpl.rpg.AndorsTrail.util.Pair;
+import android.util.Pair;
 
 public final class ActorConditionsTypeParser extends JsonCollectionParserFor<ActorConditionType> {
 

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 com.gpl.rpg.AndorsTrail.util.Pair;
+import android.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 com.gpl.rpg.AndorsTrail.util.Pair;
+import android.util.Pair;
 
 public final class DropListParser extends JsonCollectionParserFor<DropList> {
 

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 com.gpl.rpg.AndorsTrail.util.Pair;
+import android.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 com.gpl.rpg.AndorsTrail.util.Pair;
+import android.util.Pair;
 
 public final class ItemTypeParser extends JsonCollectionParserFor<ItemType> {
 
@@ -41,9 +41,11 @@ 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(
@@ -51,15 +53,17 @@ public final class ItemTypeParser extends JsonCollectionParserFor<ItemType> {
 				, ResourceParserUtils.parseImageID(tileLoader, o.getString(JsonFieldNames.ItemType.iconID))
 				, itemTypeName
 				, description
-				, itemCategories.getItemCategory(o.getString(JsonFieldNames.ItemType.category))
+				, itemCategories.getItemCategory(o.optString(JsonFieldNames.ItemType.category, "other"))
 				, 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 com.gpl.rpg.AndorsTrail.util.Pair;
+import android.util.Pair;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class MonsterTypeParser extends JsonCollectionParserFor<MonsterType> {
@@ -55,6 +55,8 @@ 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))
@@ -68,6 +70,7 @@ 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 com.gpl.rpg.AndorsTrail.util.Pair;
+import android.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

@@ -16,7 +16,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 com.gpl.rpg.AndorsTrail.util.Pair;
+import android.util.Pair;
 import com.gpl.rpg.AndorsTrail.util.XmlResourceParserUtils;
 
 public final class WorldMapParser {

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 com.gpl.rpg.AndorsTrail.util.Pair;
+import android.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

@@ -105,6 +105,7 @@ 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";
@@ -167,8 +168,10 @@ 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/TileCollection.java

@@ -2,14 +2,20 @@ 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;
 	}
 
@@ -19,9 +25,30 @@ 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) {
-		canvas.drawBitmap(bitmaps[tile], px, py, 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);
 	}
 }

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

@@ -12,6 +12,7 @@ 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;
@@ -79,7 +80,7 @@ public final class Savegames {
 			}
 
 			return true;
-		} catch (IOException e) {
+		} catch (IOException | DigestException e) {
 			L.log("Error saving world: " + e.toString());
 			return false;
 		}
@@ -87,7 +88,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);
@@ -108,15 +109,15 @@ public final class Savegames {
 			LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, androidContext, 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 e) {
+		} catch (IOException | DigestException e) {
 			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
 				L.log("Error loading world: " + e.toString());
 				StringWriter sw = new StringWriter();
@@ -128,33 +129,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);
@@ -167,83 +168,98 @@ 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 {
+	public static void saveWorld(WorldContext world, OutputStream outStream, String displayInfo) throws IOException, DigestException {
 		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.player.savedVersion,
+				world.model.statistics.getIsAlteredSavegame());
+
+		byte[] checksum = world.getChecksum();
+		world.model.statistics.setChecksum(checksum);
+
 		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 {
-        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, 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;
 
 		world.maps.readFromParcel(src, world, controllers, header.fileversion);
 		world.model = new ModelContainer(src, world, controllers, header.fileversion);
-		WorldMapController.populateWorldMap(androidContext, world, controllers.getResources());
 		src.close();
-		
+		if (header.fileversion >= 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();
@@ -268,15 +284,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);
@@ -287,26 +303,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;
@@ -326,16 +342,17 @@ 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 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 final boolean isAlteredSavegame;
+		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;
@@ -344,18 +361,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();
@@ -380,9 +397,14 @@ 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) throws IOException {
+		public static void writeToParcel(DataOutputStream dest, String playerName, String displayInfo, int iconID, boolean isDead, boolean hasUnlimitedSaves, String playerId, long savedVersion, boolean isAlteredSavegame) throws IOException {
 			dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
 			dest.writeUTF(playerName);
 			dest.writeUTF(displayInfo);
@@ -391,6 +413,7 @@ 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/Coord.java

@@ -1,5 +1,7 @@
 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;
@@ -47,4 +49,9 @@ 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/Pair.java

@@ -1,11 +0,0 @@
-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,5 +1,7 @@
 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;
@@ -99,4 +101,9 @@ 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,7 +13,6 @@ 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;
 
@@ -76,11 +75,8 @@ public class CustomDialogFactory {
 		dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		dialog.setContentView(R.layout.custom_dialog_title_icon);
 		dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
-		if (((AndorsTrailApplication)context.getApplicationContext()).getPreferences().fullscreen) {
-			dialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-		} else {
-			dialog.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-		}
+		boolean fullscreen = ((AndorsTrailApplication) context.getApplicationContext()).getPreferences().fullscreen;
+		AndorsTrailApplication.setFullscreenMode(fullscreen, dialog.getWindow());
 
 		setTitle(dialog, title, icon);
 

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

@@ -20,13 +20,17 @@ 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) {
@@ -41,13 +45,17 @@ 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);
 	}
 
@@ -55,8 +63,10 @@ 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
 			) {
@@ -90,6 +100,12 @@ 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) {
@@ -104,6 +120,12 @@ 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

@@ -431,13 +431,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);
+					drawFromMapPosition(canvas, area, m.rectPosition, m.iconID, m.isFlippedX);
 				} 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);
+					tiles.drawTile(canvas, m.iconID, x, y, mPaint, m.isFlippedX);
 				}
 			}
 		}
@@ -503,16 +503,27 @@ 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);
+		tiles.drawTile(canvas, tile, x * tileSize, y * tileSize, mPaint, isFlippedX);
 //		}
 	}
 

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(ItemController.canAfford(player, price));
+			b.setEnabled(price > 0 && ItemController.canAfford(player, price));
 		}
 		b.setOnClickListener(new OnClickListener() {
 			@Override