NPC Improvements

5 files changed, 55 insertions, 53 deletions

diff --git a/npc/003-1/aidan.txt b/npc/003-1/aidan.txt
index 47c7cf387..400529d84 100644
--- a/npc/003-1/aidan.txt
+++ b/npc/003-1/aidan.txt
@@ -16,7 +16,7 @@
         {
             select
             rif(Zeny >= 2000, l("Register")),
-            rif(Zeny < 2000, l("How do I get so much money?!")),
+            rif(Zeny < 2000, l("Where do I get so much money?!")),
             l("Not at the moment"),
             l("Information");
 
@@ -77,7 +77,7 @@
     if (getq(General_Hunter) == 0) goto L_Assign;
     mes "";
     goto L_Assign;
-    close; // Will never be reach.
+    close; // Will never be reached.
 
 L_Weak:
     mesn;
@@ -91,7 +91,7 @@ L_Register:
     mesq l("The alliance also have a special program, called ##BGrand Hunter Quest##b, where you kill 10,000 of a monster and get great rewards.");
     next;
     mesn;
-    mesq l("You can gain rares, even. Come register for this special program. It's free!");
+    mesq l("You can gain rare treasures, even. Come register for this special program. It's free!");
     if (askyesno() == ASK_YES) {
         GHQUEST=1;
         setarray GHMEMO, 0, 0, 0;
diff --git a/npc/003-1/constableperry.txt b/npc/003-1/constableperry.txt
index 9eb9b292c..610809534 100644
--- a/npc/003-1/constableperry.txt
+++ b/npc/003-1/constableperry.txt
@@ -15,21 +15,20 @@ L_Intro:
     next;
     mesq l("Yes, I am a mouboo. Why? Can't a mouboo be a law and order enforcer?!");
     next;
-    mesq l("Have you ever felt struck? Lost? Didn't know about a quest, or an item is troubling you?");
-    mesq l("Have no idea where in the world you are? Or what a certain mob drops, or even if you should challenge it?");
+    mesq l("Have you ever felt stuck? Lost? Didn't know about a quest, or an item is troubling you?");
+    mesq l("Have no idea where in the world you are? Or what a certain foe drops, or if you should even dare to challenge it?");
     next;
     mesn;
     mesq l("Fear not! You can check our [@@https://wiki.moubootaurlegends.org|Wiki@@] to find that and other awesome stuff!");
-    //mesq l("Fear not! You can check our [@@https://gitlab.com/TMW2/Docs/wikis/home|Wiki@@] to find that and other awesome stuff!");
     mesc l("(To see the rules, use ##B@rules##b.)");
     next;
     mesq l("You can even join the project there. Contributors are greatly appreciated! %%N");
     close;
 
 L_Quest:
-    // Quest Requeriment of 48 hours or idle before speaking for 60 min
+    // Quest Requirement of 48 hours or idle before speaking for 60 min
     if (AFKING < 57600 && checkidle() < 3600) {
-        npctalkonce l("What's that? He seems to be AFK but is not?");
+        npctalkonce l("What's that? They seem to be AFK but are not?");
         if (.@touchevent)
             end;
         else
@@ -38,10 +37,10 @@ L_Quest:
     // No warning given
     if (!@afkbotwarned) {
         mesn;
-        mesq l("Stop right there, meliant. I can see you're AFK, it is written in your hat!");
+        mesq l("Stop right there, miscreant. I can see you're AFK, it is written on your hat!");
         next;
         mesn;
-        mesq l("Moving while AFK is botting! I'll send you to a %s if you move while AFK! YOU HAVE BEEN WARNED!", b(l("cold, hard, iron cell")));
+        mesq l("Moving while AFK is botting! I'll send you to a %s if you move while AFK! ##BYOU HAVE BEEN WARNED!##b", b(l("cold, bleak and isolated cell")));
         @afkbotwarned=true;
         close;
     }
@@ -52,7 +51,7 @@ L_Quest:
 
 L_NowYouHaveDoneIt:
     mesn;
-    mesq l("NOW YOU HAVE DONE IT! By the powers to me vested as a Constable and Game Master, I sentence you to HALF HOUR IN A %s!", b(strtoupper(l("cold, hard, iron cell"))));
+    mesq l("##BNOW YOU HAVE DONE IT!##b By the powers to me vested as a Constable and Game Master, I sentence you to HALF AN HOUR IN A %s!", b(strtoupper(l("cold, bleak and isolated cell"))));
     next;
     mesn;
     mesq l("Do you have any last wishes before being JAILED for your CRIMES?!");
@@ -81,7 +80,7 @@ L_NowYouHaveDoneIt:
                 getitem Blanket, 1;
                 setq1 FrostiaQuest_AFKCap, 3;
             } else {
-                mesq l("This is not the first time you're arrested for AFK botting, so, NO!");
+                mesq l("This is not the first time you've been arrested for AFK botting, so, ##BNO!##b");
             }
             break;
         case 5:
diff --git a/npc/003-1/hasan.txt b/npc/003-1/hasan.txt
index 11df5e8ce..08d9cacdb 100644
--- a/npc/003-1/hasan.txt
+++ b/npc/003-1/hasan.txt
@@ -2,20 +2,20 @@
 // Author:
 //  Jesusalva
 // Description:
-//  Hasan is the city bully and steals the player. He lost his father to a Murderer
-//  Scorpion. Will respect player if they kill one. His mother is Sorfina, whom
-//  explains this and cries that he never touched a Soul Menhir. Allowing player
-//  to kill scorpion on Mahoud's Basement.
+//  Hasan is the city bully and steals from the player. He lost his father to a Murderer
+//  Scorpion. Will respect player if they kill one. His mother is Sorfina, who
+//  explains this and cries that he never touched a Soul Menhir. Allows the player
+//  to kill the scorpion on Mahoud's Basement.
 //
 //  Player must report theft first to Dausen, who will tell the player that's
-//  normal and nobody messes with Hasan, and giving player pointer that he should
+//  normal and nobody messes with Hasan, and giving player a pointer that they should
 //  tell his mother, Sorfina.
 //
-//  Reward: Cotton Short, Hasan won't steal you anymore.
+//  Reward: Cotton Short, Hasan won't steal from you anymore.
 //
 //  GETQ1 Variable Value;
-//  0 - Never stolen by Hasan
-//  1 - Already stolen by Hasan
+//  0 - Hasan has never stolen from the player
+//  1 - Hasan already stole from the player
 //  2 - Dausen pointed player to Sorfina
 //  3 - Sorfina unlocked Mahoud's Basement
 //  4 - Player killed Murderer Scorpion
@@ -37,7 +37,7 @@
     if (getq(TulimsharQuest_Hasan) == 4) goto L_Finish;
     if (getq(TulimsharQuest_Hasan) >= 5) goto L_Complete;
     mesn strcharinfo(0);
-    mesq l("Give me back what you've stole, thief!");
+    mesq l("Give me back what you stole, thief!");
     next;
     mesn;
     mesq l("I stole nothing from you. Do you have any proof?");
@@ -62,16 +62,17 @@ L_Print:
     mesq l("Photoshopped. Definitely. Good luck convincing somebody with that! %%a");
     next;
     mesn;
-    mesq l("If you go to Lieutenant Dausen, he'll say that you used Gimp. Just give up.");
+    mesq l("If you go to Lieutenant Dausen, he'll say that you used GIMP. Just give up.");
     close;
 
 // TODO
 L_Finish:
     mesn;
-    mesq l("Is that... Wait... Wow. You... Killed a murderer scorpion.");
+    // The scorpion and not a scorpion because of dramatic buildup.
+    mesq l("Is that... Wait... Wow. You... Killed the murderer scorpion.");
     next;
     mesn;
-    mesq l("I promise I'll never steal from you again. Here, take this shorts.");
+    mesq l("I promise I'll never steal from you again. Here, take these shorts.");
     mesq l("Good job, man!");
     setq TulimsharQuest_Hasan, 5;
     getitem CottonShorts, 1;
@@ -164,7 +165,7 @@ OnTouch:
     end;
 
 L_Steal:
-    npctalkonce(l("*whistle*"));
+    npctalkonce(l("*whistles*"));
     if (getq(TulimsharQuest_Hasan) == 0) goto L_DoSteal;
     if (getq(TulimsharQuest_Hasan) <= 4 && rand(0,100) < 20) goto L_DoSteal;
     end;
diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt
index 5f1dbb99f..797f0b424 100644
--- a/npc/003-1/ishi.txt
+++ b/npc/003-1/ishi.txt
@@ -3,8 +3,8 @@
 // Crazyfefe
 // Jesusalva
 //
-// Do not add void items to array.
-// note : the rare item system suck.
+// Do not add void items to the array.
+// note: the rare item system sucks.
 
 003-1,97,97,0	script	Ishi	NPC_PLAYER_ARGAES,{
 
@@ -14,8 +14,9 @@
         close;
     }
     if (BaseLevel < 10) {
-        dispbottom l("##1Bug abuser detected! Automatically banning!!");
-        atcommand "@ban 5mn "+strcharinfo(0);
+        // TODO: make jail stuff a function and replace this with the new function
+        dispbottom l("##1You abused a bug and will be jailed. If this was done in error, you have found a bug. Contact the nearest developer if this is the case.");
+        atcommand "@jailfor 5mn "+strcharinfo(0);
         end;
     }
 
@@ -37,8 +38,8 @@
     if (Mobpt < @mpq_cost)
     {
         mesn l("Ishi, the Rewards Master");
-        mesq l("Welcome! I see you have @@ Monster Points. But that isn't enough to get items at your current level, sorry!", Mobpt);
-        mesc l("I need at minimum @@ Monster Points to get items at current level.",@mpq_cost);
+        mesq l("Welcome! I see you have %d Monster Points. But that isn't enough to get items at your current level, sorry!", Mobpt);
+        mesc l("I need at minimum %d Monster Points to get items at current level.",@mpq_cost);
         close;
     }
 
@@ -99,10 +100,11 @@
     }
 
     mesn l("Ishi, the Rewards Master");
-    mesq l("Welcome! I see you have @@ Monster Points. Would you like to exchange some of those for items?", Mobpt);
+    // Highlight the amount of monster points in bold for better visibility since players will probably exchange monster points a lot
+    mesq l("Welcome! I see you have ##B%d Monster Points##b. Would you like to exchange some of those for items?", Mobpt);
     next;
     if (@mpq_cost > 0)
-        mesc l("You can get up to @@ items.", (Mobpt/@mpq_cost));
+        mesc l("You can get up to %d items.", (Mobpt/@mpq_cost));
 
     menuint
         rif(Mobpt >= @mpq_cost,     "1"), 1,
@@ -174,18 +176,18 @@ L_Items:
         if (.@lucked) {
             mes "";
             mes l("Wow!");
-            mes l("I can't believe.");
-            mes l("you got lucky and got a(n) @@!", getitemlink(.@reward));
+            mes l("I can't believe it.");
+            mes l("You got lucky and got a(n) %s!", getitemlink(.@reward));
             mes "";
         } else {
-            mesq l("You received one @@!", getitemlink(.@reward));
+            mesq l("You received one %s!", getitemlink(.@reward));
         }
 
     }
     close;
 
 L_Continue:
-    mesq l("You still have @@ Monster Points! Do you want more items?", Mobpt);
+    mesq l("You still have ##B%d Monster Points##b! Do you want more items?", Mobpt);
     select
         l("Yes"),
         l("No");
@@ -205,7 +207,7 @@ L_Give_all:
     .@var = Mobpt / @mpq_cost;
     if (.@var > 50) { // limit to avoid lag server. Probably a bad idea.
         .@var = 50;
-        mes l("You have too much points. I can't allow you to take all at once right now. I'll try to give you 50, and you come back later!");
+        mes l("You have too many points. I can't allow you to take all at once right now. I'll try to give you 50, and you can come back later!");
         next;
     }
 
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 44b410dcf..d2edf6265 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -42,7 +42,7 @@
     next;
     select
         rif(!.@q, l("Yes sir. I will help them.")),
-        rif(getq(TulimsharQuest_Hasan) == 1, l("A guy named Hasan stole me!")),
+        rif(getq(TulimsharQuest_Hasan) == 1, l("A guy named Hasan stole from me!")),
         rif (strcharinfo(2) == "Monster King", l("I'm with the Monster King.")),
         l("What can you say about the monsters here?"),
         l("Good bye, sir.");
@@ -60,7 +60,7 @@
         // Hasan Quest
         case 2:
             setq TulimsharQuest_Hasan, 2;
-            speech S_FIRST_BLANK_LINE, lg("Ah, Hasan... Sorry pal, afraid I can't do anything for you. Try talking to his mother Sorfina, she is on Mahoud's house, near the Inn.");
+            speech S_FIRST_BLANK_LINE, lg("Ah, Hasan... Sorry pal, afraid I can't do anything for you. Try talking to his mother Sorfina, she is in Mahoud's house, near the Inn.");
             break;
         // The Monster King guild have a special menu
         case 3:
@@ -89,11 +89,11 @@ L_Reward:
 
     next;
 
-    speech 0x0,
-        l("Wait a minute..."),
-        l("The Tulimshar guards needs an freelance employee who would help us in our work. We are searching for people as you."),
-        l("Take this badge, so you can get access to the guard house. You will find more work there. Bye, and good luck!");
-    close;
+        speech 0x0,
+            l("Wait a minute..."),
+            l("The Tulimshar guards needs an freelance employee who would help us with our work. We are searching for people like you."),
+            l("Take this badge, so you can enter the guard house. You will find more work there. Bye, and good luck!");
+    return;
 
 // Mob Tutorial Quest
 function DausenMobTutorial {
@@ -134,10 +134,10 @@ function DausenMobTutorial {
         mesq l("So. Uhm. The monsters here have varying levels of strength... I think the best way is to witness that yourself.");
         next;
         mesn;
-        mesq l("Do you see the crocs, with their claws and such? They have high defense, this means your attacks deal less damage.");
+        mesq l("Do you see the crocs, with their claws and hard shell? They have high defense, this means your attacks deal less damage.");
         next;
         mesn;
-        mesq l("They're not too dangerous, but takes a lot to kill. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.");
+        mesq l("They're not too dangerous, but they can take a lot of hits. So, if you kill 10 of them, I'll know you're dedicated in learning which monsters are out there.");
         next;
         mesn;
         mesq l("Can you do that? I'll be waiting!");
@@ -149,7 +149,7 @@ function DausenMobTutorial {
         // Level Requeriment (same as blubs)
         if (BaseLevel < 14) {
             mesn;
-            mesq l("There's some diversity, but you should keep aiming at helping people and killing small-fry. If you ever want a challenge, there's a Giant Maggot inside the town which will one-shot you.");
+            mesq l("There's some diversity, but you should keep aiming at helping people and killing small-fry. If you ever want a challenge, there's a Giant Maggot inside the town which can kill you in one hit.");
             next;
             mesn;
             mesq l("Have you found Tulimshar's Secret Beach yet? Tulimshar is full of secrets. Some NPCs which only say hi may say something else depending on your level or insistence.");
@@ -158,10 +158,10 @@ function DausenMobTutorial {
         // Reward
         if (.@k >= 37) {
             mesn;
-            mesq l("Hmm, that's some progress. Nobody goes to the beach because these slimes, but it looks like this might change sometime soon.");
+            mesq l("Hmm, that's some progress. Nobody goes to the beach because of these slimes, but it looks like this might change sometime soon.");
             next;
             mesn;
-            mesq l("Also, the Inn folks said the Ducks keep bothering them, but they've noticed a small decrease lately.");
+            mesq l("Also, the Inn folks said the Ducks keep bothering them, but they've noticed a small decrease already.");
             next;
             mesn;
             mesq l("I don't know what you did, but both the Ducks and Blubs did got scared. I thank you in the name of the city guard. Please come back later.");
@@ -176,13 +176,13 @@ function DausenMobTutorial {
         mesq l("West of here is a beach. There's a secret passage to it, underground. In there you'll find slime-like creatures called Blubs.");
         next;
         mesn;
-        mesq l("Some are small, others are bigger. But they all fight togheter, so be mindful when they're in groups.");
+        mesq l("Some are small, others are bigger. But they all fight together, so be mindful when they're in groups.");
         next;
         mesn;
-        mesq b(l("The big one without hat"))+" "+l("is your target. They spawn smaller versions of itself! Kill @@ of them and make the beach safe for tourists.", 37);
+        mesq b(l("The big one without hat"))+" "+l("is your target. They spawn smaller versions of themselves! Kill @@ of them and make the beach safe for tourists.", 37);
         next;
         mesn;
-        mesq l("Or make yourself useful killing a Duck. They steal all Cherry Cake from the Inn and the staff is getting angry at me. It'll serve, too.");
+        mesq l("Or make yourself useful by killing some Ducks. They snatch all the Cherry Cake from the Inn and the staff is getting angry at me. It'll serve, too.");
         compareandsetq TulimsharQuest_MobTutorial, 2, 3;
         close;
     case 4: