Merge branch 'master' into jesusalva/serenajesusalva/serena

2 files changed, 5 insertions, 5 deletions

diff --git a/npc/012-2-4/morgan.txt b/npc/012-2-4/morgan.txt
index 23e97aaf..b68e8d98 100644
--- a/npc/012-2-4/morgan.txt
+++ b/npc/012-2-4/morgan.txt
@@ -8,14 +8,14 @@
 012-2-4,26,37,0	script	Morgan	NPC_MORGAN,{
     speech
         l("Hello Wanderer."),
-        l("I am Morgan, the alchimist."),
+        l("I am Morgan, the alchemist."),
         l("(People do not like to hear the word 'witch' so much, as we live close to Hurnscald)."),
-        l("Unfortunately my apprentice Zitoni does not bring fresh potions, so if you need something you should come back later.");
+        l("Unfortunately my apprentice Zitoni does not bring me fresh potions, so if you need something you should come back later.");
 
     close;
 
 OnInit:
     .sex = G_MALE;
-    .distance = 2;
+    .distance = 4;
     end;
 }
diff --git a/npc/012-2-4/zitoni.txt b/npc/012-2-4/zitoni.txt
index 7b94cba3..b1be3bdf 100644
--- a/npc/012-2-4/zitoni.txt
+++ b/npc/012-2-4/zitoni.txt
@@ -67,11 +67,11 @@ L_mick:
     next;
     mesq l("Can you do a last task for me and try to find Micksha? He sure can help me to look a bit less ugly.");
     next;
-   mesq("That would be so helpful! Please return soon to tell me about your progress.");
+    mesq("That would be so helpful! Please return soon to tell me about your progress.");
     close;
 
 OnInit:
     .sex = G_MALE;
-    .distance = 2;
+    .distance = 3;
     end;
 }