fix small issues found by jesusalva

1 files changed, 14 insertions, 12 deletions

diff --git a/npc/008-2-2/kfahr.txt b/npc/008-2-2/kfahr.txt
index 478c8c6e..2b77835e 100644
--- a/npc/008-2-2/kfahr.txt
+++ b/npc/008-2-2/kfahr.txt
@@ -14,7 +14,7 @@
 //    3    Bone knife quest finished
 
 
-008-2-2,44,36,0	script	Kfahr#008-2-2	NPC_YOUNG_MAN_KFAHR,{
+008-2-2,44,36,0	script	Kfahr	NPC_YOUNG_MAN_KFAHR,{
     @beer_count = 0;
     @current_story = 0;
     @last_story = 0;
@@ -44,7 +44,7 @@
 
 switch (getq(HurnscaldQuests_Kfahr)) {
     case 0:
-        narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
+        narrator S_LAST_NEXT,
             l("You stand before a battle-scarred, darkly tanned warrior, brimming with muscles."),
             l("Just looking at him you smell danger, adventure, excitement..."),
             l("..."),
@@ -106,14 +106,14 @@ function kfahr_first_met {
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("ah, I knew it!  So you have come to hear some tales about the dangers of the desert?  You've come to the right man!");
             setq HurnscaldQuests_Kfahr, 1;
-            close;
+            kfahr_main_dialog;
     }
 
     return;
 }
 
 function kfahr_default_greeting {
-    narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
+    narrator S_LAST_NEXT,
         l("Kfahr nods and grins as you greet him.");
     speech S_LAST_NEXT,
         l("Came back for more stories about Desert Worms, Desert Temples and the Hero of Tulimshar? Have a seat!");
@@ -208,11 +208,15 @@ function give_beer {
         kfahr_has_beer();
         return;
     }
-    else
+    else {
         @has_beer = 1;
+        delitem Beer, 1;
+    }
 
-    if (@beer_count > 4)
+    if (@beer_count > 4) {
         kfahr_drunk();
+        return;
+    }
 
     ++@beer_count;
 
@@ -235,8 +239,6 @@ function give_beer {
         narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Kfahr seems quite relaxed now.");
 
-    next;
-
     return;
 }
 
@@ -645,7 +647,7 @@ function bone_quest_check_items {
         l("Kfahr eyes you with unconcealed amusement.");
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("Welcome back!  Did you bring me the things I asked for?");
-    next;
+
     select
         l("Yes, here they are!"),
         l("Er, what were those things again?"),
@@ -697,15 +699,15 @@ function bone_quest_final_check {
     narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("Kfahr is delighted.");
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-         l("Well done, well done!  Now that's what I call Warrior spirit!");
+         l("Well done, well done! Now that's what I call warrior spirit!");
     narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("He laughs, then suddenly stops, turning to you with suspicion in his eyes.");
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-         l("You DID get those yourself, didn't you?  Not buy them or somesuch...?");
+         l("You DID get those yourself, didn't you? Not buy them or somesuch...?");
     narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("Before you can answer, he laughs and slaps you on the back again.");
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-        l("Ah, what am I thinking!  Too many years in the desert make you a little suspicious of everyone and everything!  Naah, I believe you.");
+        l("Ah, what am I thinking! Too many years in the desert make you a little suspicious of everyone and everything! Naah, I believe you.");
     narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("He pulls a strangely curved knife out of a side pocket and holds it up to the light. The blade is partly transparent, and looks quite sharp.");
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,