From acf202b10c902545edeb640ca41d54246acf3913 Mon Sep 17 00:00:00 2001
From: "Nut.andor" <nut.andor@posteo.de>
Date: Sun, 7 Nov 2021 11:28:57 +0100
Subject: [PATCH 1/2] fix BWM32, actualize translation status

---
 AndorsTrail/res/raw/monsterlist_omi2.json     |  1 +
 AndorsTrail/res/values/arrays.xml             | 24 +++++++++----------
 AndorsTrail/res/xml/blackwater_mountain32.tmx | 16 ++++++++++++-
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/AndorsTrail/res/raw/monsterlist_omi2.json b/AndorsTrail/res/raw/monsterlist_omi2.json
index 8b5085227..23067f47e 100644
--- a/AndorsTrail/res/raw/monsterlist_omi2.json
+++ b/AndorsTrail/res/raw/monsterlist_omi2.json
@@ -318,6 +318,7 @@
         "iconID":"monsters_rltiles1:76",
         "monsterClass":"humanoid",
         "movementAggressionType":"none",
+        "spawnGroup":"prim_guard7",
         "phraseID":"prim_guard7_sleeping"
     },
     {
diff --git a/AndorsTrail/res/values/arrays.xml b/AndorsTrail/res/values/arrays.xml
index 503089805..028a0ddb8 100644
--- a/AndorsTrail/res/values/arrays.xml
+++ b/AndorsTrail/res/values/arrays.xml
@@ -141,18 +141,18 @@
 		<item>@string/preferences_language_default</item>
 		<item>English</item>
 		<item>čeština (62%)</item>
-		<item>Deutsch (99%)</item>
-		<item>Español (99%)</item>
-		<item>Française (93%)</item>
-		<item>Italiano (99%)</item>
-		<item>Magyar (35%)</item>
-		<item>Polski (81%)</item>
-		<item>Português (90%)</item>
-		<item>Português Brasil (98%)</item>
-		<item>Русский язык (99%)</item>
-		<item>Türkçe (37%)</item>
-		<item>日本人 (99%)</item>
-		<item>中文 (42%)</item>
+		<item>Deutsch (91%)</item>
+		<item>Español (90%)</item>
+		<item>Française (86%)</item>
+		<item>Italiano (90%)</item>
+		<item>Magyar (32%)</item>
+		<item>Polski (90%)</item>
+		<item>Português (83%)</item>
+		<item>Português Brasil (89%)</item>
+		<item>Русский язык (90%)</item>
+		<item>Türkçe (39%)</item>
+		<item>日本人 (90%)</item>
+		<item>中文 (41%)</item>
 	</string-array>
 
 	<!-- see AndorsTrailApplication.localeForLanguageTag for allowed formats -->
diff --git a/AndorsTrail/res/xml/blackwater_mountain32.tmx b/AndorsTrail/res/xml/blackwater_mountain32.tmx
index 749a121de..abf20f2d6 100644
--- a/AndorsTrail/res/xml/blackwater_mountain32.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain32.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="23">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="25">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -315,6 +315,20 @@
     <property name="spawngroup" value="ortholion_subdued"/>
    </properties>
   </object>
+  <object id="23" name="wild_berry" type="spawn" x="32" y="480" width="192" height="384">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="wild_berry2"/>
+   </properties>
+  </object>
+  <object id="24" name="wild_berry2" type="spawn" x="64" y="32" width="608" height="96">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wild_berry2"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup id="7" name="Keys" visible="0">
   <object id="19" name="ortholion_subdued_1" type="key" x="352" y="96" width="32" height="32">

From badce708d144301198d6877e65db32778972da42 Mon Sep 17 00:00:00 2001
From: "Nut.andor" <nut.andor@posteo.de>
Date: Sun, 7 Nov 2021 11:32:38 +0100
Subject: [PATCH 2/2] fix Moyra reply

---
 AndorsTrail/res/raw/conversationlist_prim_outside.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndorsTrail/res/raw/conversationlist_prim_outside.json b/AndorsTrail/res/raw/conversationlist_prim_outside.json
index 343da2a5e..e83290e1c 100644
--- a/AndorsTrail/res/raw/conversationlist_prim_outside.json
+++ b/AndorsTrail/res/raw/conversationlist_prim_outside.json
@@ -164,10 +164,6 @@
                 "text":"What are you hiding from?",
                 "nextPhraseID":"moyra_2"
             },
-            {
-                "text":"Who are you?",
-                "nextPhraseID":"moyra_3"
-            },
             {
                 "text":"Do you know anything about the accident with Lorn?",
                 "nextPhraseID":"moyra_8",
@@ -185,6 +181,10 @@
                     }
                 ]
             },
+            {
+                "text":"Who are you?",
+                "nextPhraseID":"moyra_3"
+            },
             {
                 "text":"Do you know anything about the accident with Lorn?",
                 "nextPhraseID":"moyra_12",