From 0d3efd84edc523cf4ce658be2c1b018d9f1e7c17 Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Sun, 16 Jun 2013 13:40:50 +0200
Subject: [PATCH] Minor fixes to v070 content.

---
 AndorsTrail/res/raw/conversationlist_falothen.json   | 8 ++++----
 AndorsTrail/res/raw/conversationlist_v070signs1.json | 4 ----
 AndorsTrail/res/xml/tradehouse0.tmx                  | 5 +++++
 AndorsTrail/res/xml/tradehouse1.tmx                  | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/AndorsTrail/res/raw/conversationlist_falothen.json b/AndorsTrail/res/raw/conversationlist_falothen.json
index 61f7baa89..87c9736a0 100644
--- a/AndorsTrail/res/raw/conversationlist_falothen.json
+++ b/AndorsTrail/res/raw/conversationlist_falothen.json
@@ -154,7 +154,7 @@
         "nextPhraseID": "falothen1_7_f1"
       }
     ],
-    "message": "Bare fists, now that's my kind of style! When not being hampered by either a weapon or shield, you can be a lot more flexible in your moves."
+    "message": "Unarmed, now that's my kind of style! When not being hampered by either a weapon or shield, you can be a lot more flexible in your moves."
   },
   {
     "id": "falothen1_7_f1",
@@ -168,7 +168,7 @@
         "nextPhraseID": "falothen1_6"
       }
     ],
-    "message": "Fighting bare-handed can make you land more successful punches, and will also make you quicker when dodging blows."
+    "message": "Fighting unarmed can make you land more successful punches, and will also make you quicker when dodging blows."
   },
   {
     "id": "falothen1_7_f2",
@@ -631,7 +631,7 @@
         "nextPhraseID": "falothen1_2nd_f1"
       }
     ],
-    "message": "Bare fists, now that's my kind of style! When not being hampered by either a weapon or shield, you can be a lot more flexible in your moves."
+    "message": "Unarmed, now that's my kind of style! When not being hampered by either a weapon or shield, you can be a lot more flexible in your moves."
   },
   {
     "id": "falothen1_2nd_f1",
@@ -646,7 +646,7 @@
         "nextPhraseID": "falothen1_14"
       }
     ],
-    "message": "Fighting bare-handed can make you land more successful punches, and will also make you quicker when dodging blows."
+    "message": "Fighting unarmed can make you land more successful punches, and will also make you quicker when dodging blows."
   },
   {
     "id": "falothen1_2nd_f2",
diff --git a/AndorsTrail/res/raw/conversationlist_v070signs1.json b/AndorsTrail/res/raw/conversationlist_v070signs1.json
index c55968d77..e2969bf47 100644
--- a/AndorsTrail/res/raw/conversationlist_v070signs1.json
+++ b/AndorsTrail/res/raw/conversationlist_v070signs1.json
@@ -8,10 +8,6 @@
         "requires": { "progress": "lodar:20" },
         "text": "Examine the stones more closely",
         "nextPhraseID": "sign_rbfcr1_2"
-      },
-      {
-        "nextPhraseID": "X",
-        "text": "Leave"
       }
     ]
   },
diff --git a/AndorsTrail/res/xml/tradehouse0.tmx b/AndorsTrail/res/xml/tradehouse0.tmx
index 3a8aa9a7e..6b9a2241a 100644
--- a/AndorsTrail/res/xml/tradehouse0.tmx
+++ b/AndorsTrail/res/xml/tradehouse0.tmx
@@ -171,5 +171,10 @@
     <property name="phrase" value="charwood_rest"/>
    </properties>
   </object>
+  <object name="charwood1:60" type="key" x="384" y="128" width="32" height="32">
+   <properties>
+    <property name="phrase" value="charwood_rest"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/AndorsTrail/res/xml/tradehouse1.tmx b/AndorsTrail/res/xml/tradehouse1.tmx
index 8650e516d..853eaec88 100644
--- a/AndorsTrail/res/xml/tradehouse1.tmx
+++ b/AndorsTrail/res/xml/tradehouse1.tmx
@@ -149,8 +149,8 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" width="18" height="8">
-  <object name="lethenlor" type="spawn" x="512" y="160" width="32" height="32"/>
-  <object name="lleglaris" type="spawn" x="32" y="160" width="32" height="32"/>
+  <object name="lethenlor" type="spawn" x="288" y="96" width="32" height="64"/>
+  <object name="lleglaris" type="spawn" x="32" y="160" width="64" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" width="18" height="8"/>
 </map>