From cc6a573ef056a5d61dbb6b3d3e69eb52fdeb575e Mon Sep 17 00:00:00 2001
From: "Nut.andor" <nut.andor@posteo.de>
Date: Fri, 8 Apr 2022 21:11:52 +0200
Subject: [PATCH] next version, together with critical bugfix

---
 AndorsTrail/AndroidManifest.xml                 |  4 +++-
 AndorsTrail/res/xml/elm5f_1.tmx                 | 17 +++++++++++------
 .../rpg/AndorsTrail/AndorsTrailApplication.java |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 119e74349..1ac9018af 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
 	android:versionCode="64"
-	android:versionName="0.7.17dev"
+	android:versionName="0.7.17"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
@@ -22,6 +22,7 @@
 	
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.READ_LOGS"/>
 
 
 	<application 
@@ -34,6 +35,7 @@
 		android:requestLegacyExternalStorage="true"
 		android:hasFragileUserData="true"
 		android:preserveLegacyExternalStorage="true"
+		android:debuggable="true"
 		>
 		<activity 
 		    android:name=".activity.StartScreenActivity" 
diff --git a/AndorsTrail/res/xml/elm5f_1.tmx b/AndorsTrail/res/xml/elm5f_1.tmx
index 0c47f3b48..97a8f11d4 100644
--- a/AndorsTrail/res/xml/elm5f_1.tmx
+++ b/AndorsTrail/res/xml/elm5f_1.tmx
@@ -197,12 +197,12 @@
  </layer>
  <layer name="Ground" width="18" height="20">
   <data encoding="base64" compression="zlib">
-   eJyNVMGNwkAMjMIPKW9ekfLlOjgkGoAKgAq4u1aumfvcBikEKcmHcqgAW3iUidkEHiOt7d0Zr2eTTZYkG8NWEPIeZ4LGlaAW7GTfIXvEml/Me4611cBRClqCnmkEHfE2lteYOVhfda8EPfNv+dbW4NJ4bxy101fd22yIk+Wv1EewGPfonD6f/8sfKCmPPqp8OAuvDRyl1y/Bd/a8j+/reaDt/cLMYlrgQV3jYtbn2nx8Zr+LIU9J9Yp0/bz8zHw/3GsT0X0HIXJmzCvA15Zpknykz7XY/MBxIk+09iMefgrHKp32IZin7Bfz8Lfo58G++++sc97CJ/92/D3gP/yqSfMVD7xn/8+O4x0eeM/3iL2FMMGDmVzsHnij/i3wfEta81z9npiHYzxTYA79fyrgR0G8d78CLVg=
+   eJyNVEFOw0AMjNJbpZx7WqnX8gOQ+EB5AfACWr7CZ7iwQUpSKc2lz+EF2KpHmTgm9DDS2t6dWXs22VdFsTc8CXIa0RI0bgSd4Fn2vVbXWPOb9cjxaDVw1IIzQc/0goF4e8trzBysr7oXgp75svzZ1uDS+MU4Oqevuj+rKb4tf6F7ZIvRx+D0+fxnuqKmPO7RpOksvDbwJnc9CI7VfB/363mg7f3CzCIt8KCu8XY19yqa2cdmylNTvUmxV9HM/H34rn2gewtycCbyKqdxbr62K4virpzXovnx7OGJ1t7Fw3vheCiXfcjmKfvFPPwt+nmwtv/OBuctfPJvx2vgTcCvjjT/44H3LZ1rHcctPPCe+4jeQl7gQS8n6wNv1L8F7rumNc/V74k8/ItnCcyh/08F/NgS7y8DZS1z
   </data>
  </layer>
  <layer name="Objects" width="18" height="20">
   <data encoding="base64" compression="zlib">
-   eJyNU81KA0EMHhZkUQplZnUXxbH4d/MZ9QmkT7D1AaSWtZ70WBS0vagn0Yse9OBJj8WDEydhMj9b/GBoJ5t8yZdkhPBxrYS4Ue7+o0SEdynEs3T3uyr2mZjvbxhb5EKsmrOWx36L0Ej/vmvi98zZR55bLcTUnOOuvR9hHR+s5hn+72XO9ln5h1Ajz9DYztB+kNAP/JD3r0ZtddbG/6Sy9iHyrLCcVAfFeTqZDXKPWE2gcSOLYyhugHnPkeMrqBfqIh/iC0F967O8oHGZ5YW6DitrB67XRF+ob6NgH9aRh7S3+fHe9IKYVD6OJqGLtPJZAS7M74uyv2OdjgeNk7I931y7mY8TuQGdItaoCpfvGzWFM+eagHuz8HOEtfK7/Mcbm7ZwUW2A7Tze1ZrtEccp+j0smBFxQU9g3/oJHpoXf78Ql5Vx3dAT6lsH637sOj18zylOlbGmJuBMYabt+73Hd78T7EWj43cGINuAfZOYA3brSdrYS2O/wjjozdKW7Q/M/BeybG9i
+   eJyNU81KA0EMDguyKIUys9pFcSz+3XxGfQLpE2x9glq2vSmeioK2F/UketGDHjzpUXpw4iRMdmZa/GBoJ5t8yZdkAJq41gA32t/nGiK8K4Bn5e93Zewzsd/fKLbIAdbt2chjv2WoVfO+b+MP7DkknlsDMLXntO3uJ1THh6h5Rv+7mbd9ls3DqIhnYG3nZD9K6Ed+zPtXo3E6K+t/Vjr7gHjWRE6ug+MaOoUNcw9FTahxK4tjGH3KOyKOr6BerIt9mC8E960n8qLGVZEX6zounR25XhN94b4Ng33YJB7WvshP9qYbaE7lk6gTulirnBUCe/Wi3e/YpONR46SzON+P8TMfJ3IjWkWsURc+3zdpCmcuNSH3dtHMEdYq7+ofb2wacI3ocG2I3Tze1UrskcQV+T0smRFzYU9w33oJHp6XfL8Yl3XiurEn3LcW1f3Y9r2Qe85xuhNrqgPOFGbGvd97evd7wV7UJn5nCLb1xTdFOXC3npSLvbD2S4rD3qzsuP7gzH8BfatvWA==
   </data>
  </layer>
  <layer name="Above" width="18" height="20">
@@ -212,12 +212,12 @@
  </layer>
  <layer name="Top" width="18" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYCAdHBajjvpLVDLnMgFz0PVhsxdkBj73EJLHZRep8qSYM1ecNu7BJkZq2BAbXpTYS4o5tAYg/+JLh4TSKAyA3I7P/fjCA1kfPnNIyS+H8cQjPndeRrKfUFrAZw6yPwilBWzmPBZDyJGTloixg5YAAIa2LzU=
+   eJxjYCAdHBajjvpLVDLnMgFz0PVhsxdkBj73EJLHZRep8qSYM1ec+u7B5UdSw4bUuMXmFmqaQw+ALx0SSqPI6vC5H194IOs7jMccUvLLYTzpHp87kf1BKO/gMwfZH4TSAjZzHosh5MhJS8TYQUsAAMVrLYI=
   </data>
  </layer>
  <layer name="Walkable" width="18" height="20">
   <data encoding="base64" compression="zlib">
-   eJylkssNwCAMQ5mC/Vfohj30klr+IZA4REQvtsla//Ps786avc/rDutnMxIr6VCcpNfpU+w0o/XNdKBXxW78sVmM0+h2mhXPZZk47X4pRsO99c1qlensTXpPtap+nOd0ubwUBz0hK+Wj+pw/5N/sXtpdpQt9uixU3f7vC56Koz8=
+   eJzbKMbAsHGIYGQwmMzBJk6s/fjMwGcOse4nxh5SwwybWaSYgy8OsPGJAYTChlBYUhJXpJhDbPogR46a5iDL41JLTHhQyxxi1BLrJ0L2EROulJpBLAYA0IfZqQ==
   </data>
  </layer>
  <objectgroup name="Mapevents">
@@ -245,19 +245,24 @@
   </object>
   <object name="elm5f_potion" type="container" x="32" y="544" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" visible="0">
   <object name="elm5f_monster1" type="spawn" x="416" y="320" width="32" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="elm_mine5"/>
    </properties>
   </object>
-  <object name="elm5f_monster2" type="spawn" x="224" y="128" width="64" height="32">
+  <object name="elm5f_monster2" type="spawn" x="224" y="96" width="96" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="elm_mine5"/>
    </properties>
   </object>
+  <object name="elm5f_monster3" type="spawn" x="224" y="96" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="elm_mine6"/>
+   </properties>
+  </object>
   <object name="elm5f_monster4" type="spawn" x="32" y="416" width="64" height="128">
    <properties>
     <property name="quantity" value="3"/>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index 94dccbef5..8974efa10 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -28,7 +28,7 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
 	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
 	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
-	public static final String CURRENT_VERSION_DISPLAY = "0.7.17dev";
+	public static final String CURRENT_VERSION_DISPLAY = "0.7.17";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
 	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;