Joyplim, Frillyar and Kalmurk

1 files changed, 40 insertions, 38 deletions

diff --git a/npc/008-1/hinnak.txt b/npc/008-1/hinnak.txt
index 3672ed93..2cf07931 100644
--- a/npc/008-1/hinnak.txt
+++ b/npc/008-1/hinnak.txt
@@ -12,7 +12,7 @@ L_No_NohMask:
     if (@state == 2) goto L_ThanksAgain;
     if (getequipid(equip_head) == 751) goto L_Intro_Hat;
 
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Argh! I hate them! I @#$% hate them! I @#$% hate these @#$% pinkies!\"";
     next;
     menu
@@ -28,13 +28,13 @@ L_Intro_Hat:
         "Whoa, what are you doing?", L_Intro_Hat_Explain;
 
 L_Intro_Hat_Explain:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Sorry, you look like a pinkie. They've been destroying my fields, and I guess I got a bit worked up.\"";
     next;
     goto L_Help;
 
 L_Reason:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"These @#$% beasts are jumping around in my fields destroying all my harvest.";
     mes "But they are too fast. I can't catch them.\"";
     next;
@@ -43,7 +43,7 @@ L_Reason:
         "Well, life ain't fair.", L_close;
 
 L_Help:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Yes, you look quite fast. Maybe you can catch some of them. That will pay them a lesson.";
     mes "Slay some of them and bring me 10 of their antennae.\"";
     @state = 1;
@@ -54,7 +54,7 @@ L_Help:
         "How much is this worth to you?", L_Reward;
 
 L_Reward:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Well, I can't offer you much. But I got an old scythe laying around. Maybe you can use it as a weapon.\"";
     goto L_close;
 
@@ -66,7 +66,7 @@ L_Exchange:
     goto L_Exchange_Start;
 
 L_Exchange_Start:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Have you got the 10 antennae?\"";
     next;
     menu
@@ -83,36 +83,36 @@ L_Exchange_Exchange:
     getitem "Scythe", 1;
     @state = 2;
     callsub S_Update_Mask;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Thank you very much. I've got something for you. My old scythe. Maybe you can use it as a weapon. It is a bit cumbersome but its strikes are deadly.\"";
     goto L_close;
 
 L_Exchange_Notenough:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"It doesn't look like you do.\"";
     goto L_close;
 
 L_Exchange_TooMany:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Looks like you don't have room for this. Come back later to receive your reward. Hold on to the antennea until then.\"";
     goto L_close;
 
 L_ThanksAgain:
     if (getequipid(equip_head) == 751)
         goto L_ThanksHat;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Good to see you again, and thanks again for helping me with the pinkies!\"";
     next;
     goto L_ThanksMenu;
 
 L_ThanksHat:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"That better be a trophy on your head.\"";
     menu
         "It is.", L_Next;
 
 L_Next:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Good then. Thanks for your help with the pinkies.\"";
     goto L_ThanksMenu;
 
@@ -123,7 +123,7 @@ L_ThanksMenu:
         "You're welcome. Bye!", L_Bye;
 
 L_Next1:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Actually, it's been a long day. If it's no trouble, could you get me a beer?\"";
     next;
     menu
@@ -132,7 +132,7 @@ L_Next1:
         "You shouldn't drink while working!", L_Next2;
 
 L_Next2:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Well, I'm done for the day, and I'm quite old enough to decide when I can have a beer, thank you!\"";
     next;
     menu
@@ -143,52 +143,52 @@ L_GiveBeer:
     if (countitem("Beer") < 1)
         goto L_NoBeer;
     delitem "Beer", 1;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "Hinnak takes a sip.";
     mes "\"Aaah!  Nothing like a well-deserved beer after a long day of tending the crops!\"";
     mes "\"Thanks, that was very kind of you!\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "He takes another sip.";
     mes "\"Thanks!  You know, I had the strangest thing happen to me. I had this patch of ground that was really clumpy; lots of clay, you see.\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Right over there.\"";
     mes "He points to a stretch of soft, raked ground.";
     mes "\"Looks much better now, doesn't it?  But how I got there is kind-a scary...\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"I'd been trying to break it up for a while, but that kind of work is a pain. So my wife said that I should go and see the witch, just in case she knows something.\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"And sure enough I ask the witch, and she has a look at it. 'Nothing I can do', she says, 'but I can ask a friend'.\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"So the next day another witch shows up. Gorgeous woman, but when she looked at me, the scares went scuttling down my spine....\"";
     mes "\"First thing she asked was if I'm a farmer. Said her friend had told her that I needed help.\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"I show her what the problem is, and she tells me to go inside and wait.\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Hinnak drains his beer in one long sip, then hesitates.";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"So I go inside. I'm barely in when it starts raining outside, pouring cats and mouboos!\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Not so weird, perhaps, except that it was been bright and sunny just a second before!  So I rush out, my wife telling me to leave the witch alone, and I see her standing there in the middle of the rain...\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"None of the raindrops touched her, as if they was afraid!\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Then she yells out some gobbledygook word, and out of the ground there comes a swarm of maggots, crawling and digging and climbing over each other's backs...\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"And then she turns to me!  Seeing her stare, for a moment there I think that she'll turn me into a pinkie, for sure...\"";
     next;
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"But all she says is, 'if you'd stayed inside, you wouldn't be wet now'.\"";
     next;
     menu
@@ -198,29 +198,31 @@ L_GiveBeer:
         "I better go now.", L_Bye;
 
 L_Sagatha_hahaha:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Yeah, funny now... But you should've seen that stare!  Ah, well, never mind.\"";
     goto L_close;
 
 L_Sagatha_scary:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Yeah, you could say that...\"";
     mes "He stares into his empty beer jug, as if wishing it weren't empty yet.";
     goto L_close;
 
 L_Sagatha_word:
-    mes "[Farmer Hinnak]";
-    mes "\"Oh, I can't be sure... but something like '" + get(.invocation$, "summon-maggots") + "', I think.\"";
+    mesn l("Farmer Hinnak");
+    mesq l("Oh, I can't be sure... but something like '%s', I think.", b("kalmurk"));
+    if (getskilllv(SKILL_MAGIC))
+        learnskill SKILL_KALMURK;
     goto L_close;
 
 L_NoBeer:
-    mes "[Farmer Hinnak]";
-    mes "\"Ah... no beer?  Oh well.\"";
+    mesn l("Farmer Hinnak");
+    mesq l("Ah... no beer?  Oh well.");
     goto L_close;
 
 L_Bye:
-    mes "[Farmer Hinnak]";
-    mes "\"Bye!\"";
+    mesn l("Farmer Hinnak");
+    mesq l("Bye!");
     goto L_close;
 
 L_NohMask:
@@ -230,12 +232,12 @@ L_NohMask:
         "Hello.", L_No_NohMask;
 
 L_NohMask_Mask:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"No. It tends to be too dark to see a mask.\"";
     goto L_close;
 
 L_NohMask_Satchel:
-    mes "[Farmer Hinnak]";
+    mesn l("Farmer Hinnak");
     mes "\"Yes, I saw someone with a large sack on their back go to the mining camp.\"";
     goto L_close;