Merge branch 'more-dark-skin' into 'master'

dialogue polishing and cosmetic equipment adjustments for tulimshar guardhouse npcs

See merge request ml/serverdata!76

3 files changed, 24 insertions, 24 deletions

diff --git a/npc/003-10/guarddevoir.txt b/npc/003-10/guarddevoir.txt
index c9965d62b..ae7c966ad 100644
--- a/npc/003-10/guarddevoir.txt
+++ b/npc/003-10/guarddevoir.txt
@@ -7,30 +7,30 @@
 // Variable:
 //      TulimsharQuest_Devoir
 
-003-10,38,60,0	script	Guard Devoir	NPC_GUARD2,{
+003-10,38,60,0	script	Guard Devoir	NPC_TONORI_GUARD_FEMALE,{
 
     mesn;
-    mesq l("That's terrible! Monsters are piling up near city gates! We need to stop their progression.");
+    mesq l("That's terrible! Monsters are piling up near the city gates! We need to stop them from advancing!");
     if (BaseLevel >= 25) goto L_Menu;
     close;
 
 L_Menu:
     mesn;
-    mesq l("Would you like to help us to protect the town from a red scorpion invasion??");
+    mesq l("Would you like to help us to protect the town from the red scorpion infestation?");
     mes "";
     menu
-        l("Yeah, sure! I'm brave as Simon."),L_Quest, // famous player name
+        l("Yeah, sure! I'm as brave as Simon."),L_Quest, // famous player name
         l("Where can I find them?"),L_Where,
         l("No, thanks."),L_Close;
 
 L_Quest:
     mes "";
     .@q=getq(TulimsharQuest_Devoir);
-    mesq l("Nice! I want you to kill some red scorpions, as I said!");
+    mesq l("Amazing! I want you to kill some red scorpions, as I said!");
     next;
     if (.@q == 0) goto L_Continue;
     .@q2=getq2(TulimsharQuest_Devoir) + 60 * 60 * 36;
-    if (santime() >= .@q2) goto L_Repeat; // Repats every 36 hours
+    if (santime() >= .@q2) goto L_Repeat; // Repeats every 36 hours
     mesn;
     mesq l("But, it wouldn't look nice if I let you do all the killing! The other guards are working right now!");
     next;
@@ -39,22 +39,22 @@ L_Quest:
     close;
 
 L_Continue:
-    mesq l("Red Scorpion breed as fast as the Ratto! With our current numbers, it's nearly impossible to take over.");
+    mesq l("Red Scorpions breed as fast as Rattos! They are multiplying fast and soon they will outnumber us greatly.");
     next;
-    mesq l("I usually ask for 7, but to prove you are going to help us in this purge, I will ask you for 14 @@! I will reward you for your bravure.", getitemlink(RedScorpionStinger));
+    mesq l("I usually ask for just 7, but to prove you are going to help us in this purge, I will ask you for 14 %s! I will reward you for your bravery.", getitemlink(RedScorpionStinger));
     mes "";
     menu
-        rif(countitem(RedScorpionStinger) >= 14, l("Here they are, miss!")), L_Finish,
+        rif(countitem(RedScorpionStinger) >= 14, l("Here they are!")), L_Finish,
         l("I'll get to it."), L_Close;
-    close; // double sure
+    close; // double check
 
 L_Repeat:
-    mesq l("How is your purge going? I hope you had success at it!");
+    mesq l("How is the extermination going? I hope you are successful!");
     next;
-    mesq l("Did you brought me 7 @@?", getitemlink(RedScorpionStinger));
+    mesq l("Did you bring me 7 @@?", getitemlink(RedScorpionStinger));
     mes "";
     menu
-        rif(countitem(RedScorpionStinger) >= 7, l("Here they are miss!")), L_Finish2,
+        rif(countitem(RedScorpionStinger) >= 7, l("Here they are!")), L_Finish2,
         l("I'll get to it."), L_Close;
     close;
 
@@ -66,7 +66,7 @@ L_Finish:
     setq TulimsharQuest_Devoir, 1, santime();
     mes "";
     mesn;
-    mesq l("Many thanks! Come back later to bring me extra @@!", getitemlink(RedScorpionStinger));
+    mesq l("Many thanks! Come back later to bring me extra %s!", getitemlink(RedScorpionStinger));
     close;
 
 // Repeat
@@ -77,14 +77,14 @@ L_Finish2:
     setq TulimsharQuest_Devoir, 1, santime();
     mes "";
     mesn;
-    mesq l("Many thanks! Come back later to bring me extra @@!", getitemlink(RedScorpionStinger));
+    mesq l("Many thanks! Come back later to bring me extra %s!", getitemlink(RedScorpionStinger));
     close;
 
 L_Where:
     mes "";
-    mesq l("Ah, there are lots on the miners cave.");
+    mesq l("There are lots in the mines.");
     next;
-    mes l("Take care though, don't attack them when they are in group!");
+    mes l("Take care though, don't attack them when there are multiple of them, since they will swarm!");
     next;
     mes l("Good luck.");
     goto L_Close;
diff --git a/npc/003-10/kreist.txt b/npc/003-10/kreist.txt
index c4ca9b312..fd7efe07c 100644
--- a/npc/003-10/kreist.txt
+++ b/npc/003-10/kreist.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Tulimshar Guardhouse Taskmaster
 
-003-10,41,63,0	script	Kreist	NPC_PLAYER,{
+003-10,41,63,0	script	Kreist	NPC_PLAYER_TONORI,{
     .@d=gettimeparam(GETTIME_DAYOFMONTH);
     mesn l("Kreist, Taskmaster");
     mesq l("Hello, and welcome to the Tulimshar guard house.");
diff --git a/npc/003-10/officer.txt b/npc/003-10/officer.txt
index e06afe04c..789eeabab 100644
--- a/npc/003-10/officer.txt
+++ b/npc/003-10/officer.txt
@@ -12,17 +12,17 @@
     }
     if (.@q == 0) {
         mesn;
-        mesq l("Hey. If you want to kill monsters, you need a good sword. I think, a @@ would be the perfect fit for you.", getitemlink(WoodenSword));
+        mesq l("Hey. If you want to kill monsters, you need a good sword. I think, a %s would be the perfect fit for you.", getitemlink(WoodenSword));
         next;
         mesn;
-        mesq l("I think, for just 25 @@, I could arrange one for you. Eh... Just don't think that you have an amazing weapon, alright?", getitemlink(RawLog));
+        mesq l("I think, for just 25 %s I could arrange one for you. Eh... Just don't think that you have an amazing weapon, alright?", getitemlink(RawLog));
         next;
         mesn;
-        mesq l("You can kill @@ on the desert. It's a dangerous area though, so take care.", getmonsterlink(DesertLogHead));
+        mesq l("You can kill %s in the desert canyon. It's a dangerous area though, so take care.", getmonsterlink(DesertLogHead));
         setq TulimsharQuest_WoodenSword, 1;
     } else {
         mesn;
-        mesq l("I think, for just 25 @@, I could arrange a @@ for you.", getitemlink(RawLog), getitemlink(WoodenSword));
+        mesq l("I think, for just 25, %s I could arrange a %s for you.", getitemlink(RawLog), getitemlink(WoodenSword));
     }
     mes "";
     select
@@ -36,14 +36,14 @@
         setq TulimsharQuest_WoodenSword, 2;
         getexp 580, 20;
         mesn;
-        mesq lg("Here's your sword, novice. Now go kill monsters.");
+        mesq lg("Here's your sword, son. Now go kill some monsters.");
     }
     close;
 
 OnInit:
     .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, DesertHelmet);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, Chainmail);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, BromenalChest);
     setunitdata(.@npcId, UDT_HEADBOTTOM, WoodenSword);
     setunitdata(.@npcId, UDT_WEAPON, JeansShorts);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 2);