Building v079 from ATCS v079

AndorsTrail/res/raw/conversationlist_arulir_mountain.json

@@ -1139,8 +1139,8 @@
         "message":"The ground is very slippery. You can't get back onto the solid rock!",
         "replies":[
             {
-                "text":"Oh no...",
-                "nextPhraseID":"X"
+                "text":"Oh no... I can't swim!",
+                "nextPhraseID":"arulircave_trap10_10"
             }
         ],
         "rewards":[
@@ -2042,5 +2042,29 @@
                 "nextPhraseID":"F"
             }
         ]
+    },
+    {
+        "id":"arulircave_trap10_10",
+        "message":"You feel that you can no longer hold on. You will have to slide into the cold water ...",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"arulircave_trap10_20"
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap10_20",
+        "message":"You think of Mikhail, and of Andor ... your strength is slowly leaving you. ...",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"arulircave_trap10_30"
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap10_30",
+        "message":"Maybe the current will wash you ashore somewhere?"
     }
 ]

AndorsTrail/res/raw/itemlist_graveyard1.json

@@ -14,6 +14,7 @@
         "iconID":"items_misc_3:231",
         "name":"LifeTaker",
         "displaytype":"extraordinary",
+        "hasManualPrice":1,
         "baseMarketCost":5045,
         "category":"lsword",
         "description":"A fine blade enhanced by undead forces.",

AndorsTrail/res/raw/itemlist_guynmart.json

@@ -83,7 +83,7 @@
         "id":"guynmart_flute",
         "iconID":"items_japozero:371",
         "name":"Lovis' Flute",
-        "displaytype":"extraordinary",
+        "displaytype":"quest",
         "category":"other"
     },
     {

AndorsTrail/res/raw/monsterlist_stoutford_combined.json

@@ -183,6 +183,14 @@
                     "duration":3,
                     "chance":"25"
                 }
+            ],
+            "conditionsTarget":[
+                {
+                    "condition":"stunned",
+                    "magnitude":1,
+                    "duration":3,
+                    "chance":"25"
+                }
             ]
         }
     },
@@ -234,7 +242,7 @@
     },
     {
         "id":"cave_scorpion_1",
-        "name":"Agressive cave scorpion",
+        "name":"Aggressive cave scorpion",
         "iconID":"monsters_tometik3:72",
         "maxHP":35,
         "maxAP":10,