Merge pull request #15 from DinoPaskvan/master

Small changes and fixes for NPC dialogues 

7 files changed, 64 insertions, 64 deletions

diff --git a/world/map/npc/027-2/barman.txt b/world/map/npc/027-2/barman.txt
index ee65d710..36b20533 100644
--- a/world/map/npc/027-2/barman.txt
+++ b/world/map/npc/027-2/barman.txt
@@ -1,9 +1,9 @@
 027-2.gat,103,22,0|script|Bennet|310,{
     mes "[Bennet]";
-    mes "\"Hi there stranger!  My name is Bennet, the bartender here.\"";
+    mes "\"Hi there, stranger!  My name is Bennet, the bartender here.\"";
     next;
     mes "[Bennet]";
-    mes "\"If you are planning to stick around for a while, please check back with me later.  I might have some work for you.\"";
-    mes "\"In the meanwhile, enjoy your stay!\"";
+    mes "\"If you're planning to stick around for a while, please check back with me later.  I might have some work for you.\"";
+    mes "\"In the meantime, enjoy your stay!\"";
     close;
 }
diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index d9bd17df..c3959604 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -15,22 +15,22 @@ L_Begin:
     if (QUEST_Graveyard_Caretaker == 5) goto L_Has_Letter;
 
     mes "[Caretaker]";
-    mes "\"...Another adventurer comes to slay the already dead.\"";
+    mes "\"...another adventurer comes to slay the already dead.\"";
     next;
     menu
         "And what are you?", L_Who,
-        "Thats right, so move and let me kill that demon behind you.", -;
+        "That's right, so move and let me kill that demon behind you.", -;
     close;
 
 L_Who:
     mes "[Caretaker]";
-    mes "\"I was once the caretaker to these cemetery grounds, but look at what they have become.";
-    mes "I now care only for my wife. I watch over her... make sure that nobody ever does her harm.\"";
+    mes "\"I was once the caretaker of these cemetery grounds, but look at what they have become.";
+    mes "Now, I care only for my wife. I watch over her... make sure that nobody ever does her harm.\"";
     next;
     menu
         "You guard her corpse day and night?", -;
     mes "[Caretaker]";
-    mes "\"I am bound to this place by the very same spell that was cast to keep the undead from leaving. Until the day that this cemetery is cured of its curse, I remain within these gates.\"";
+    mes "\"I am bound to this wretched place by the very same spell that was cast to keep the undead from leaving. Until the day that this cemetery is free from its curse, I shall remain within these gates.\"";
     set QUEST_Graveyard_Caretaker, 1;
     close;
 
@@ -40,15 +40,15 @@ L_Return_Dialog:
     mes "Perhaps you can do me a favor?\"";
     next;
     menu
-        "What is the favor?", L_Favor,
+        "What's the favor?", L_Favor,
         "I'm sure I can, for a price.", L_Favor,
         "Sorry, I am busy.", -;
     close;
 
 L_Favor:
     mes "[Caretaker]";
-    mes "\"I have not seen my daughter since I was cursed to stay in this cemetery 25 years ago.";
-    mes "We communicate now through letters. Would you please take this to her?";
+    mes "\"I have not seen my daughter since I was cursed to stay in this cemetery, twenty-five years ago.";
+    mes "We communicate through letters, now. Would you please take this to her?";
     mes "I am sure she will compensate you for your trouble.\"";
     next;
     menu
@@ -59,7 +59,7 @@ L_Favor:
 
 L_Receive:
     set QUEST_Graveyard_Caretaker, 2;
-    mes "You receive the letter and put it in a special place so it doesn't get lost among your inventory.";
+    mes "You receive the letter and put it in a special place so it doesn't get lost in your inventory.";
     if (@menu == 2)
         goto L_Location;
     close;
@@ -69,7 +69,7 @@ L_Location:
 
 L_Location_Real:
     mes "[Caretaker]";
-    mes "\"Her name is Airlia. She works at the city hall in Hurnscald. Thank you for your help.\"";
+    mes "\"Her name is Airlia. She works at the town hall in Hurnscald. Thank you for your help.\"";
     close;
 
 L_Has_Letter:
@@ -77,7 +77,7 @@ L_Has_Letter:
     mes "\"Have you found my daughter?\"";
     next;
     menu
-        "Not Yet.", -,
+        "Not yet.", -,
         "I'll get there when I get there.", -,
         "Where did you say I could find her?", L_Location_Real;
     close;
@@ -104,7 +104,7 @@ L_Give_New_Letter:
 
 L_Give_New_Letter_Real:
     set QUEST_Graveyard_Caretaker, 5;
-    mes "You receive the letter and put it in a special place so it doesn't get lost among your inventory.";
+    mes "You receive the letter and put it in a special place so it doesn't get lost in your inventory.";
     next;
     mes "[Caretaker]";
     mes "\"Thank you.\"";
diff --git a/world/map/npc/027-2/cerhan.txt b/world/map/npc/027-2/cerhan.txt
index 83598354..6f453835 100644
--- a/world/map/npc/027-2/cerhan.txt
+++ b/world/map/npc/027-2/cerhan.txt
@@ -2,7 +2,7 @@
 
 027-2.gat,70,77,0|script|Cerhan|311,{
     mes "[Cerhan]";
-    mes "\"Ah, hello! It is good to see another normal human at this strange place!\"";
+    mes "\"Ah, hello! It's good to see another normal human at this strange place!\"";
     next;
     menu
         "That's true. What are you doing here?",L_Story,
@@ -11,25 +11,25 @@
 
 L_Story:
     mes "[Cerhan]";
-    mes "\"I came from Thermin, a town in Kazei area.\"";
+    mes "\"I came from Thermin, a town in the Kazei area.\"";
     next;
-    mes "\"I'm an experienced weapon master and thinking about establishing a smithy here. But I'll need some more equipment.\"";
+    mes "\"I'm an experienced weapon master and I was thinking about establishing a smithy here. I'll need some more equipment, though.\"";
     next;
     if (countitem("MylarinDust") > 0)
         menu
             "Do you know something about 'Mylarin Dust'?", L_Mylarin,
             "Good luck with that.",-;
     mes "[Cerhan]";
-    mes "\"If you are interested in weapons and armor, you may want to come back later.\"";
+    mes "\"If you're interested in weapons and armor, you may want to come back later.\"";
     goto L_Close;
 
 L_Mylarin:
     mes "[Cerhan]";
     mes "\"Mylarin dust?! Where did you get that? That's amazing!\"";
     next;
-    mes "\"I can craft you an amazing strong armor with that - uhm, well, I first need to set up my smithy here.\"";
+    mes "\"I can craft you an amazing strong armor with that - uhm, well, first I need to set up my smithy here.\"";
     next;
-    mes "\"Please come back, when I'm ready with that. Mylarin dust... amazing.\"";
+    mes "\"Please come back, when I'm ready for that. Mylarin dust... amazing.\"";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/027-2/crying_child.txt b/world/map/npc/027-2/crying_child.txt
index 54b05120..f6df816c 100644
--- a/world/map/npc/027-2/crying_child.txt
+++ b/world/map/npc/027-2/crying_child.txt
@@ -42,7 +42,7 @@ L_intro:
     next;
     mes "\"Waaahhhaaa!\"";
     next;
-    mes "You bend your knees near the child, trying to gain his confidence and ask why he is crying. But looking closely, you are surprised to see that his skin color is an awful cadaveric grey...";
+    mes "You bend your knees near the child, trying to gain his confidence and ask why he is crying. But looking closely, you are surprised to see that his skin color is an awful, cadaveric grey...";
     menu
         "Calm down kid, what happened?",-,
         "Leave the kid alone.",L_Close;
@@ -50,45 +50,45 @@ L_intro:
     mes "\"Oh, what? Who are you "+@madamsir$+", what are you doing here?\"";
     next;
     menu
-        "My name is "+strcharinfo(0)+". I heard you cry and decided to ask if you need help.",-;
+        "My name is "+strcharinfo(0)+". I heard you cry and decided to check if you needed any help.",-;
     mes "The child looks at you from head to toe and says: \"" +@madamsir$+ ", aren't you scared of me?\"";
     next;
     menu
         "No... Why would I be scared of you?",-;
     mes "[Crying Child]";
-    mes "\"I am, you know... dead. And Mom and dad, and a lot of people in this inn... But most of them don't like to talk about it.\"";
+    mes "\"I am, you know... dead. Like Mom and Dad, and a lot of other people in this inn... But most of them don't like to talk about it.\"";
     menu
         "You are a brave and smart kid... I have nothing to be afraid of.",-;
     mes "[Crying Child]";
-    mes "\"It is nice to talk to you. I don't have any friends and Mom is always sad and Dad is always angry with something I don't know... and... Did you see the man in the room next to me? The one with horns? Ohh, I don't like him! \"";
+    mes "\"It's nice to talk to you. I don't have any friends and Mom is always sad and Dad is always angry about something I don't know... and... Did you see the man in the room next to me? The one with horns? Oh, I don't like him! \"";
     next;
     mes "[Crying Child]";
-    mes "\"My parents told me not to talk to strangers... But you look nice... I guess I can trust you... I'm Aldred and we live here, my parents and me. This is our inn.\"";
+    mes "\"My parents told me not to talk to strangers... But you look nice... I guess I can trust you... I'm Aldred and we live here, my parents and I. This is our inn.\"";
     next;
     mes "[Aldred]";
     mes "\"You asked why I was crying. My problem is... I don't know what to do... My dad will be so angry with me... He used to be very nice, but now... if you do something wrong... he... Waaaaa!\"";
     next;
     menu
-        "Here, here, don't cry... What did you do?",-;
+        "There, there. Don't cry... What did you do?",-;
     mes "[Aldred]";
-    mes "\"Err.. I was looking at my parents stuff and I found this funny thing! It looked like a normal ring, but with a round empty space... I thought it would be fun to take it with me and maybe look for a stone or a gem to fill the empty space. But I... I lost it...\"";
+    mes "\"Umm... I was looking at my parents' stuff and I found this funny thing! It looked like a normal ring, but with a round empty space... I thought it would be fun to take it with me and maybe look for a stone or a gem to fit into the empty space. But I... I lost it...\"";
     next;
-    mes "\"I don't know what happened. I was in this room and... I heard some very loud noises, people screaming, cracking sounds... and a smell, a terrible smell, like something rotten. And then I can't remember anything else!\"";
+    mes "\"I don't know what happened. I was in this room and... I heard some very loud noises, people screaming, cracking sounds... and a smell, a terrible smell, like something rotten. And then... I can't remember anything else!\"";
     next;
-    mes "\"I think it was something very bad, because, after all that, I woke up the way I am now and I couldn't find the ring in my pocket. Oh, and my parents are acting like they are not themselves. I don't know what happened, maybe it was my fault... I shouldn't have played with that ring... \"";
+    mes "\"I think it was something very bad, because, after all that, I woke up the way I am now and I couldn't find the ring in my pocket. Oh, and my parents are acting like they're not themselves. I don't know what happened, maybe it was my fault... I shouldn't have played with that ring... \"";
     next;
     menu
         "Don't worry, I will look around. Maybe I can find it for you...",-,
-        "Hey, you messed up, now you deal with this.",L_Close;
+        "Hey, you messed up. Deal with it.",L_Close;
     mes "[Aldred]";
-    mes "\"Thank you " +strcharinfo(0)+"! Find it for me, pleeeease! Ohh, and don't tell my parents I lost their ring, okay?\"";
+    mes "\"Thank you " +strcharinfo(0)+"! Find it for me, pleeeease! Oh, and don't tell my parents that I lost their ring, okay?\"";
     set @state, 1;
     callsub S_Update_Mask;
     goto L_Close;
 
 L_return:
     mes "[Aldred]";
-    mes "\"Please, help me " +@madamsir$+ ". If you find that ring I think things can be a little better between me and my parents.\"";
+    mes "\"Please, help me " +@madamsir$+ ". If you find that ring, I think things will be a little better between me and my parents.\"";
     goto L_Close;
 
 
@@ -96,17 +96,17 @@ L_return1:
     menu
         "Hi Aldred. I found the ring!",-;
     mes "[Aldred]";
-    mes "\"Great! You are the best! Where did you find it?\"";
+    mes "\"Great! You're the best! Where did you find it?\"";
     next;
     menu
-        "It was easy, it was with one of the monsters outside.",-;
+        "It was easy, I found it on one of the monsters outside.",-;
     mes "[Aldred]";
-    mes "\"Ohh.. a monster? He must be a fine monster since he returned it so easily to you!\"";
+    mes "\"Ohh.. a monster? It must've been a nice monster since it returned it so easily to you!\"";
     next;
     menu
         "Err... kind of...",-;
     mes "[Aldred]";
-    mes "\"Now I will put this thing back in its proper place... Thank you!\"";
+    mes "\"Now, I'll put this thing back in its proper place... Thank you!\"";
     set @state, 3;
     callsub S_Update_Mask;
     goto L_Close;
@@ -118,7 +118,7 @@ L_return2:
     menu
         "Don't worry, you don't need to give me anything...",-;
     mes "[Aldred]";
-    mes "\"Are you serious? That is why you are so great! But hey, I have an idea. What if you talk to my parents about this thing? If it is not important or valuable, I don't think it would be a problem to let you keep it. And I really want to know if they are acting all weird because I lost it. Would you do this for me?\"";
+    mes "\"Are you sure? That's why you're so great! But hey, I have an idea. What if you talk to my parents about this thing? If it's not important or valuable, I don't think it would be a problem to let you keep it. And I really want to know if they're acting all weird because I lost it. Would you do this for me?\"";
     next;
     menu
         "Sounds interesting... But who are your parents?",-,
@@ -126,15 +126,15 @@ L_return2:
     set @state, 4;
     callsub S_Update_Mask;
     mes "[Aldred]";
-    mes "\"Ok, great... But please, don't tell them about it. I don't want my parents to know I was playing with their stuff. My father is always carrying a lantern... I guess he is still afraid of the dark. My mother is the innkeeper. She is very beautiful and she is wearing a red dress.\"";
+    mes "\"Okay, great... But please, don't tell them about it. I don't want my parents to know I was playing with their stuff. My father is always carrying a lantern... I guess he's still afraid of the dark. My mother is the innkeeper. She's very beautiful and she's wearing a red dress.\"";
     next;
-    mes "\"Don't forget to come back with the ring after you talk to my parents.\"";
-    message strcharinfo(0), "Aldred hands you the ring and you keep it in a small pocket of your backpack";
+    mes "\"Don't forget to come back with the ring after you've talked to my parents.\"";
+    message strcharinfo(0), "Aldred hands you the ring and you keep it in a small pocket on your backpack.";
     goto L_Close;
 
 L_return3:
     mes "[Aldred]";
-    mes "\"I hope this ring doesn't mean a lot to my parents. This way you can keep it as a gift and I won't feel guilty about taking it.\"";
+    mes "\"I hope this ring doesn't mean a lot to my parents. That way you can keep it as a gift and I won't feel guilty about taking it.\"";
     goto L_Close;
 
 L_return4:
@@ -143,26 +143,26 @@ L_return4:
     mes "[Aldred]";
     mes "\"Really? What did my father say about it?\"";
     menu
-        "He said it is just a cheap ring. And it does not belong to him.",-;
+        "He said it's just a cheap ring. And it doesn't belong to him.",-;
     mes "[Aldred]";
     mes "\"And what did my mother say?\"";
     menu
-        "She said it was a gift to her, but she doesn't want it anymore.",-;
+        "She said it was a gift, but she doesn't want it anymore.",-;
     mes "[Aldred]";
-    mes "\"Really? A gift? And why she doesn't want it?\"";
+    mes "\"Really? A gift? And why doesn't she want it anymore?\"";
     next;
     menu
         "She said it makes her sad.",-;
-    mes "\"Ohh... really? I don't like when my mother gets sad... If this ring is making her feel bad, I should keep it away from her. \"";
+    mes "\"Ohh... really? I don't like it when my mother gets sad... If this ring is making her feel bad, I should keep it away from her. \"";
     next;
-    mes "\"Well, I guess you can keep it, but don't show it to my mother again, she is already very sad. But now I am really curious, who else would give a gift to my mother? There are so many strange things happening lately...\"";
+    mes "\"Well, I guess you can keep it, but don't show it to my mother again, she's already very sad. But now I'm really curious. Who else would give a gift to my mother? There are so many strange things happening lately...\"";
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_full;
     getitem "SimpleRing", 1;
     set @state, 7;
     callsub S_Update_Mask;
-    mes "\"I will tell my parents how great and helpful you are. Maybe they can even let you stay here at the inn for free!\"";
+    mes "\"I'll tell my parents how great and helpful you are. Maybe they can even let you stay here at the inn for free!\"";
     goto L_Close;
 
 L_return5:
diff --git a/world/map/npc/027-2/diary.txt b/world/map/npc/027-2/diary.txt
index 06a8d067..bfef84a6 100644
--- a/world/map/npc/027-2/diary.txt
+++ b/world/map/npc/027-2/diary.txt
@@ -11,24 +11,24 @@
     end;
 
 L_Diary:
-    mes "You pull out Reid's diary from behind a huge poem book. In the back of the book, you find some entries which seem to be about Savaric.";
+    mes "You pull out Reid's diary from behind a huge poetry book. Towards the end of the diary, you find some entries which seem to be about Savaric.";
     next;
-    mes "'Savaric keeps confusing me - one time he is so flirty and slinky, another time he is cold and unfriendly. What is it with this man?'";
+    mes "'Savaric keeps confusing me - one time he is so flirtatious and smooth, another time he is cold and unfriendly. What is it with this man?'";
     next;
-    mes "'I need to stay away from him! It's not right, what I am feeling. It seems Hamond doesn't suspect anything of my feelings - but I know, it's just a matter of time. I need to come to my senses again!'";
+    mes "'I need to stay away from him! It's not right, what I am feeling. It seems Hamond doesn't suspect anything about my feelings - but I know, it's just a matter of time. I need to come to my senses again!'";
     next;
-    mes "'Oh, this chaos between Savaric and me is getting serious. I was in his room today and he put his arms around me - I wanted to push him away, but I couldn't move. It was such a sweet feeling. I was torn between my brain saying 'No!' and my body wanting to feel his touch. Then Aldred showed up and Savaric let me go.'";
+    mes "'Oh, this chaotic situation between Savaric and me is getting serious. I was in his room today and he put his arms around me - I wanted to push him away, but I couldn't move. It was such a sweet feeling. I was torn between my brain saying 'No!' and my body wanting to feel his touch. Then, Aldred showed up and Savaric let me go.'";
     next;
-    mes "The next part is blurred - it seems Reid was crying while writing.";
-    mes "'Savaric was talking again about leaving, because he can't find the mana seed. The thought that I would never see him again made me feel like I was falling into a big black hole! I need to decide what to do. But Hamond - I owe him so much. And what about Aldred?'";
+    mes "The next part is blurred - it seems Reid was crying while writing it.";
+    mes "'Savaric was talking again about leaving, because he can't find the mana seed. The thought that I would never see him again made me feel like I was falling into a dark abyss! I need to decide what to do. But Hamond - I owe him so much. And what about Aldred?'";
     next;
-    mes "'We kissed each other - oh, I'm feeling so bad. I'm a disloyal slut. But I want it to happen again.'";
+    mes "'We kissed each other - oh, I'm feeling so bad. I'm an unfaithful slut. But I want it to happen again, so badly.'";
     next;
-    mes "'I told Savaric we have to stop with it - he was very understanding. But then he started to hold me again and I couldn't resist. I completely don't know what to do! His touch at my waist, even though over my clothes, made me feel hotter than Hamonds touch ever did.'";
+    mes "'I told Savaric we have to stop with this - he was very understanding. But then he started to hold me again and I couldn't resist. I don't know what to do, at all! His touch on my waist, even through my clothes, made me feel more excited than Hamond's touch ever did.'";
     next;
-    mes "'I don't know if Hamond suspects us - he was holding me tight all through the night, whispering declarations of love in my ears. Oh, I'm feeling so bad.'";
+    mes "'I don't know if Hamond suspects us - he was holding me tight all through the night, whispering declarations of love in my ears. Oh, I feel so bad.'";
     next;
-    mes "'Hamond won't be here tomorrow night - he needs to visit our wine supplier to negotiate the prices. Savaric knows this. I'm feeling so excited - I should go with Hamond, but I told him I need to take care of the inn while he's away. Savaric.. '";
+    mes "'Hamond won't be here tomorrow night - he needs to visit our wine supplier to negotiate the prices. Savaric knows this. I'm feeling so excited - I should go with Hamond, but I told him I need to take care of the inn while he's away. Savaric... '";
     next;
     mes "This is the last entry.";
     if (@reid != 6)
diff --git a/world/map/npc/027-2/evil_guard.txt b/world/map/npc/027-2/evil_guard.txt
index 276cc3c1..bbb349df 100644
--- a/world/map/npc/027-2/evil_guard.txt
+++ b/world/map/npc/027-2/evil_guard.txt
@@ -4,10 +4,10 @@
     mes "The guard glares at you, silently daring you to try something.";
     next;
     mes "[Evil Guard]";
-    mes "\"I give you warning young human.  My master will suffer no fools here.\"";
+    mes "\"Heed my warning, young human.  My master will suffer no fools here.\"";
     next;
     mes "[Evil Guard]";
-    mes "\"He created this as a place of leisure, and we are here to ensure that it stays that way.\"";
+    mes "\"He created this as a place of leisure, and we are here to ensure that it remains undisturbed.\"";
     close;
 }
 
@@ -18,9 +18,9 @@
     mes "[Evil Guard]";
     mes "\"I am your father...\"";
     next;
-    mes "There is an awkward pause, and the guard bursts out laughing.";
+    mes "There is an awkward pause, and then the guard bursts out laughing.";
     mes "";
     mes "[Evil Guard]";
-    mes "\"Just kidding! Can you imagine Golbenez' reaction if we had such puny offspring?\"";
+    mes "\"Just kidding! Can you imagine Golbenez's reaction if we had such puny offspring?\"";
     close;
 }
diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt
index 982b001b..4298106f 100644
--- a/world/map/npc/027-2/gy_inn_shops.txt
+++ b/world/map/npc/027-2/gy_inn_shops.txt
@@ -28,8 +28,8 @@
     set @cost, 1000;
 
     mes "[" + @npcname$ + "]";
-    mes "\"Don't be shy darling.";
-    mes "\"Come on in and have a nice long ... long slumber ...";
+    mes "\"Don't be shy, darling.";
+    mes "\"Come on in and have a nice long... long slumber...";
     next;
     callfunc "Inn";
 }