Merge pull request #327 from nashley/more_dialog_changes

Various dialog fixes in Tulimshar

3 files changed, 28 insertions, 26 deletions

diff --git a/world/map/npc/001-1/adrian.txt b/world/map/npc/001-1/adrian.txt
index dba78c21..de2966b5 100644
--- a/world/map/npc/001-1/adrian.txt
+++ b/world/map/npc/001-1/adrian.txt
@@ -10,29 +10,31 @@
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
 
     mes "[Adrian]";
-    mes "\"Hello. Are you here to get the luggage for some of our passengers?\"";
+    mes "\"Hello. Are you here to pick up some luggage?\"";
     if (@state == 1)
         menu
-            "Yes, Kylian sent me to get his luggage.",L_Get,
+            "Yes. Kylian sent me to get his luggage.",L_Get,
             "No.",L_No;
     menu
         "No.",L_No;
 L_No:
+    next;
     mes "[Adrian]";
-    mes "\"Too bad. I want to go and drink a beer, but I have to wait here until all the luggage is picked up.\"";
+    mes "\"Too bad. I'd like to go get a beer, but I have to wait here until all the luggage is picked up.\"";
     mes "He sighs.";
     goto L_Close;
 
 L_Get:
+    next;
     mes "[Adrian]";
-    mes "\"Wonderful! Show me the ticket.\"";
-    mes "He checks the paper Kylian gave you and then takes a critical look at you.";
+    mes "\"Wonderful! Please show me your ticket.\"";
+    mes "He checks the paper Kylian gave you and then gives you a critical look.";
     next;
     getinventorylist;
     if ((checkweight("LeatherSuitcase", 1) == 0) || (@inventorylist_count == 100))
         goto L_Inventory;
     mes "[Adrian]";
-    mes "\"Alright, here it is.\"";
+    mes "\"Alright. Here it is. Good luck carrying that thing.\"";
     mes "Adrain hands you a very heavy suitcase.";
     getitem "LeatherSuitcase", 1;
     set @state, 2;
@@ -41,8 +43,8 @@ L_Get:
 
 L_Inventory:
     mes "[Adrian]";
-    mes "\"The suitcase is rather heavy. You doesn't look as if you can handle that.";
-    mes "Maybe if you get rid of some of the other stuff you're carrying.\"";
+    mes "\"The suitcase is rather heavy. No offense, but you don't look like you can carry it.\"";
+    mes "Maybe you should get rid of some of the other stuff you're carrying.\"";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/001-1/ched.txt b/world/map/npc/001-1/ched.txt
index b6159583..ddfddd95 100644
--- a/world/map/npc/001-1/ched.txt
+++ b/world/map/npc/001-1/ched.txt
@@ -3,21 +3,21 @@
 001-1,43,48,0|script|Ched|113
 {
     mes "[Ched]";
-    mes "\"I'm trying to get a spell to work. It's supposed to combine two potions, but I can't seem to figure out which two those are...\"";
+    mes "\"I'm trying to get a spell to work, but I'm having some trouble.\"";
+    mes "\"It's supposed to combine two potions, but I can't seem to figure out which two to combine...\"";
     next;
     menu
-        "Well, good luck with that!", L_Done,
-        "What spell is that?", L_Next;
+        "Good luck with that.", L_Done,
+        "What spell is it?", L_Next;
 
 L_Next:
+    mes "";
     mes "[Ched]";
-    mes "\"Well, I don't know what it's called... I took it out of `Timbleweed's Advanced Transmutations.'  It seems awfully hard to cast, somehow.\"";
+    mes "\"Well, I don't remember what it's called... I took it out of 'Timbleweed's Advanced Transmutations,' but it seems awfully hard to cast.\"";
     next;
-    mes "[Ched]";
-    mes "\"Well, the invocation is `" + getspellinvocation("merge-concentration-potions") + "'. You're supposed to just hold up the potions and cast it, and then they're supposed to merge.\"";
+    mes "\"If you want to try it, the invocation is '" + getspellinvocation("merge-concentration-potions") + ".' I just can't get the hang of it though.\"";
     next;
-    mes "[Ched]";
-    mes "\"Maybe I should go back to `detect magic' until I can cast that one properly.\"";
+    mes "\"Maybe I should go back to practicing '" + getspellinvocation("detect-magic") + "' until I can cast it properly.\" %%6";
     goto L_Done;
 
 L_Done:
diff --git a/world/map/npc/001-1/tombstones.txt b/world/map/npc/001-1/tombstones.txt
index 39c98ade..e064a60d 100644
--- a/world/map/npc/001-1/tombstones.txt
+++ b/world/map/npc/001-1/tombstones.txt
@@ -4,7 +4,7 @@
 {
 
     mes "~ wushin ~";
-    mes "Tonori swallowed him whole.";
+    mes "\"Tonori swallowed him whole.\"";
     close;
 }
 
@@ -12,7 +12,7 @@
 {
 
     mes "~ Nard ~";
-    mes "Crushed by a loom.";
+    mes "\"Crushed by a loom.\"";
     close;
 }
 
@@ -20,7 +20,7 @@
 {
 
     mes "~ tux9th ~";
-    mes "Eaten by bugs.";
+    mes "\"Eaten by bugs.\"";
     close;
 }
 
@@ -28,7 +28,7 @@
 {
 
     mes "~ o11c ~";
-    mes "He asked for it. So they gave it to him.";
+    mes "\"He asked for it, so they gave it to him.\"";
     close;
 }
 
@@ -36,41 +36,41 @@
 {
 
     mes "~ " + strcharinfo(0) + " ~";
-    mes "The tombstone is blank and the grave freshly dug.";
+    mes "The epitath is blank and the grave freshly dug.";
     close;
 }
 001-1,56,106,0|script|RIP#6|400
 {
 
     mes "~ Cassy ~";
-    mes "Eaten by trolls.";
+    mes "\"Eaten by trolls.\"";
     close;
 }
 
 001-1,57,106,0|script|RIP#7|400
 {
     mes "~ George ~";
-    mes "Eaten by Snakes.";
+    mes "\"Eaten by snakes.\"";
     close;
 }
 
 001-1,58,106,0|script|RIP#8|400
 {
     mes "~ Kieron ~";
-    mes "He was right, monsters were in the cave.";
+    mes "\"He was right; monsters were in the cave.\"";
     close;
 }
 
 001-1,59,106,0|script|RIP#9|400
 {
     mes "~ William ~";
-    mes "Kieron was definitely right.";
+    mes "\"Kieron was definitely right.\"";
     close;
 }
 
 001-1,60,106,0|script|RIP#10|400
 {
     mes "~ Tyer ~";
-    mes "An experiement went wrong.";
+    mes "\"An experiement went wrong.\"";
     close;
 }