Merge fixes

AndorsTrail/play/listings/en-US/whatsnew.txt

@@ -1,5 +1,33 @@
 I put both (release notes + forum announcement) into this source, so it will be easier to maintain them parallel:
 
+APK 62 (0.7.15)  //just fixes+translations
+
+Release notes
+=============
+* Fix of missing scout and of a non disappearing Ortholion and Ehrenfest in certain conditions
+* Various small changes and bug fixes
+* Translations actualized
+
+
+Forum announcement  //2021-12-1x
+==================
+Hello fellow adventurers,
+
+here is a new Andor's Trail! 8-)
+
+There is no new content - and also no christmas edition  (awww)
+We publish this release mainly to fix a nasty bug that could prevent you from getting entry to the Elm mine.
+
+This is what we have done:
+- Fix of missing scout and of a non disappearing Ortholion and Ehrenfest in certain conditions
+- Venom dagger gets poisonous
+- actual translations
+- diverse fixes of little bugs and typos
+
+And here is the link to the productive version: static/AndorsTrail_v0.7.15.apk
+
+
+
 APK 61 (0.7.14)  //Omi2
 
 Release notes

AndorsTrail/res/raw/conversationlist_omi2.json

@@ -783,6 +783,16 @@
     {
         "id":"ehrenfest_selector_2",
         "replies":[
+            {
+                "nextPhraseID":"omi2_fix_ehrenfest_53",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Omi2_bwm1",
+                        "value":53
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"ehrenfest_49",
                 "requires":[
@@ -6433,6 +6443,13 @@
                 "text":"[muttering] I hope so. The potion was expensive enough!",
                 "nextPhraseID":"arghest_alert_9"
             }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"bwm72_beginning",
+                "value":22
+            }
         ]
     },
     {
@@ -6451,13 +6468,6 @@
                 "text":"Don't worry, I won't cause too much trouble.",
                 "nextPhraseID":"X"
             }
-        ],
-        "rewards":[
-            {
-                "rewardType":"questProgress",
-                "rewardID":"bwm72_beginning",
-                "value":22
-            }
         ]
     },
     {
@@ -8291,9 +8301,14 @@
                 "mapName":"elm5f_2"
             },
             {
-                "rewardType":"deactivateSpawnArea",
+                "rewardType":"removeSpawnArea",
                 "rewardID":"ehrenfest",
-                "mapName":"elm5f_2"
+                "mapName":"blackwater_mountain43"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"ortholion",
+                "mapName":"blackwater_mountain43"
             },
             {
                 "rewardType":"questProgress",
@@ -9573,12 +9588,16 @@
                         "requireType":"questProgress",
                         "requireID":"Omi2_bwm1",
                         "value":46
-                    },
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"omi2_fix_ortholion_bwm43_10",
+                "requires":[
                     {
                         "requireType":"questProgress",
                         "requireID":"Omi2_bwm1",
-                        "value":47,
-                        "negate":true
+                        "value":47
                     }
                 ]
             }
@@ -9591,6 +9610,27 @@
                 "rewardType":"removeSpawnArea",
                 "rewardID":"ortholion",
                 "mapName":"blackwater_mountain43"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"ehrenfest",
+                "mapName":"blackwater_mountain43"
+            }
+        ]
+    },
+    {
+        "id":"omi2_fix_ehrenfest_53",
+        "message":"You are wrong. I'm not here, just an illusion.",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"ortholion",
+                "mapName":"blackwater_mountain43"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"ehrenfest",
+                "mapName":"blackwater_mountain43"
             }
         ]
     }

AndorsTrail/res/raw/droplists_omi2.json

@@ -1636,7 +1636,7 @@
                 }
             },
             {
-                "itemID":"large_bottle",
+               "itemID":"health_major2",
                 "chance":"1/8",
                 "quantity":{
                     "min":1,