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

dialogue polishing and cosmetic equipment adjustments for tulimshar guardhouse npcs

See merge request ml/serverdata!76

1 files changed, 6 insertions, 6 deletions

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);