From 06feff98c1ab22dd54daffd536c291f92d28eacc Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Tue, 20 Aug 2013 20:40:07 +0200
Subject: [PATCH] Update Elwyl/Elwel conversation to switch active NPC

---
 AndorsTrail/res/raw/conversationlist_elwyl.json  | 12 ++++++++++++
 AndorsTrail/res/raw/monsterlist_v0611_npcs2.json |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/AndorsTrail/res/raw/conversationlist_elwyl.json b/AndorsTrail/res/raw/conversationlist_elwyl.json
index b880dcf74..e8004d00f 100644
--- a/AndorsTrail/res/raw/conversationlist_elwyl.json
+++ b/AndorsTrail/res/raw/conversationlist_elwyl.json
@@ -176,6 +176,17 @@
     {
         "id": "elwyl_6",
         "message": "She's always nagging me about how I should move out of what she considers to be HER house, when it in fact is MY house and SHE is the one that should move out so that things can settle down.",
+        "replies": [
+            {
+                "text": "N",
+                "nextPhraseID": "elwyl_7"
+            }
+        ]
+    },
+    {
+        "id": "elwyl_7",
+        "message": "Ahem. As I've told you several times, Elwyl, since it's YOU that is causing all the trouble, I think it would be best for both our sakes if YOU moved out.",
+        "switchToNPC": "elwel",
         "replies": [
             {
                 "text": "N",
@@ -186,6 +197,7 @@
     {
         "id": "elwyl_8",
         "message": "Argh. I am so upset at her!",
+        "switchToNPC": "elwyl",
         "replies": [
             {
                 "text": "Good luck with that. I'll leave you to your fighting.",
diff --git a/AndorsTrail/res/raw/monsterlist_v0611_npcs2.json b/AndorsTrail/res/raw/monsterlist_v0611_npcs2.json
index 830ac93cf..e453e4bc1 100644
--- a/AndorsTrail/res/raw/monsterlist_v0611_npcs2.json
+++ b/AndorsTrail/res/raw/monsterlist_v0611_npcs2.json
@@ -9,7 +9,7 @@
     },
     {
         "id": "elwyl",
-        "iconID": "monsters_rltiles3:17",
+        "iconID": "monsters_ld1:187",
         "name": "Elwyl",
         "spawnGroup": "elwyl",
         "monsterClass": "humanoid",
@@ -17,7 +17,7 @@
     },
     {
         "id": "elwel",
-        "iconID": "monsters_rltiles3:17",
+        "iconID": "monsters_ld1:188",
         "name": "Elwel",
         "spawnGroup": "elwel",
         "monsterClass": "humanoid",