From 1ea98ade0adb103de6e0b1697b8cda116c699f01 Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Fri, 2 Sep 2011 20:35:08 +0200
Subject: barbarians: some dialogue cleanup in kimarr and fixed something in
 the debug npc

---
 world/map/npc/033-1/debug.txt  | 2 ++
 world/map/npc/033-1/kimarr.txt | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'world/map')

diff --git a/world/map/npc/033-1/debug.txt b/world/map/npc/033-1/debug.txt
index fcf79d3d..d062ae55 100644
--- a/world/map/npc/033-1/debug.txt
+++ b/world/map/npc/033-1/debug.txt
@@ -17,6 +17,7 @@ L_Fluffy:
     set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT;
     set @state, 3;
     callsub S_Update_Mask;
+    wolvern_count
     close;
 
 L_Reset:
@@ -24,6 +25,7 @@ L_Reset:
     set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT;
     set @state, 0;
     callsub S_Update_Mask;
+    set wolvern_count, 0;
     close;
 
 S_Update_Mask:
diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt
index ebeadacd..ee768428 100644
--- a/world/map/npc/033-1/kimarr.txt
+++ b/world/map/npc/033-1/kimarr.txt
@@ -64,8 +64,6 @@
         "Sure! What shall I do?", -,
         "No, I don't need to prove anything.", L_Close;
 
-L_Explain:
-    mes "[Kimarr]";
     mes "\"Every young member of our tribe proves his or her worth by hunting monsters.\"";
     next;
     mes "\"The first monsters to hunt are fluffies. Fluffies give a good meal for a young person and the fur can be used to make clothes and blankets.\"";
@@ -128,7 +126,7 @@ L_Reward:
     if (@inventorylist_count == 100)
         goto L_Full_Inv;
     set @inventorylist_count, 0;
-    mes "[Kimarr]";
+
     mes "\"Take this as a symbol of your strength. You're a member of our tribe now.\"";
     getitem "YetiSkinShirt", 1;
     set @state, 3;
@@ -137,7 +135,6 @@ L_Reward:
     goto L_Close;
 
 L_Full_Inv:
-    mes "[Kimarr]";
     mes "\"You can't carry the reward I want to give you.\"";
     goto L_Close;
 
@@ -213,7 +210,6 @@ L_ContinueTimer:
     end;
 
 L_GotOut:
-    // TODO: this is the only use of $@Fluffy_Fighter$, can we remove it?
     npctalk "What a strange thing... " + $@Fluffy_Fighter$ + " just disappeared!";
     callsub S_Clean;
     end;
-- 
cgit v1.2.3-60-g2f50