Barbarians quests: dialogue polishing.

4 files changed, 42 insertions, 44 deletions

diff --git a/world/map/npc/033-1/birrod.txt b/world/map/npc/033-1/birrod.txt
index 791d2c4d..c0e159e3 100644
--- a/world/map/npc/033-1/birrod.txt
+++ b/world/map/npc/033-1/birrod.txt
@@ -15,16 +15,15 @@
     if (@state == 1) goto L_Fluffy;
 
     mes "[Barbarian]";
-    mes "\"Welcome. My name is Birrod, warrior of the Mangarr.\"";
-    next;
-    mes "\"We usually live high up in the snowy mountains, but we need to solve a problem, so we came down here.\"";
+    mes "\"Welcome. My name is Birrod, warrior of the Mangarr.";
+    mes "We usually live high up in the snowy mountains, but we need to solve a problem, so we came down here.\"";
     next;
     mes "\"But this shouldn't concern you.\"";
     goto L_Close;
 
 L_Fluffy:
     mes "[Birrod]";
-    mes "\"Kimarr asked you to perform the fluffy hunting? I'm curious how you're going to do it.\"";
+    mes "\"Kimarr asked you to perform the Fluffy hunting? I'm curious how you're going to do it.\"";
     mes "He grins.";
     goto L_Close;
 
@@ -41,12 +40,12 @@ L_Hunting:
     mes "[Birrod]";
     mes "\"Hello, " + strcharinfo(0) + "! Would you like to prove your hunting skills again?\"";
     next;
-    mes "\"I noticed some groups of wolverns in the forest west of here which are unusually aggressive.";
+    mes "\"I noticed some groups of Wolverns in the forest west of here which are unusually aggressive.";
     mes "This makes it dangerous for all the small people from the town nearby to go there.\"";
     next;
-    mes "\"To prove your skills, go to the forest and hunt down " + $@Q_Barbarians_wolvern_amount + " of the very aggressive wolverns.\"";
+    mes "\"To prove your skills, go to the forest and hunt down " + $@Q_Barbarians_wolvern_amount + " of the very aggressive Wolverns.\"";
     next;
-    mes "\"There are also some wolverns that behave normally and attack you only when you come too close to them.";
+    mes "\"There are also some Wolverns that behave normally and attack you only when you come too close to them.";
     mes "Those are not the ones I mean, but those that seek the battle themselves.\"";
     set @state, 4;
     callsub S_Update_Mask;
@@ -68,16 +67,18 @@ L_Wolverns_Done:
     set wolvern_count, 0;
     mes "[Birrod]";
     mes "\"" + strcharinfo(0) + "!";
-    mes "Good work. Now this area is much safer.\"";
+    mes "Good work. This area is much safer now.\"";
     next;
     getexp @wolvern_exp, 0;
-    if (getskilllv(SKILL_POOL) == 0) goto L_Not_Ready;
+    if (getskilllv(SKILL_POOL) == 0)
+        goto L_Not_Ready;
     mes "\"Your skills are impressing. You are worthy to be called a warrior of the Mangarr, if you accept.\"";
     next;
     goto L_Questions;
 
 L_Questions:
-    if (getskilllv(SKILL_POOL) == 0) goto L_Not_Ready;
+    if (getskilllv(SKILL_POOL) == 0)
+        goto L_Not_Ready;
     mes "Birrod has a very ceremonial look on his face.";
     mes "[Birrod]";
     mes "\"" + strcharinfo(0) + ", are you ready to become a full-fledged member of our tribe, the Mangarr?\"";
@@ -206,13 +207,9 @@ L_Impressed:
     mes "\"I'm very proud of you being a member of the tribe.\"";
     goto L_Close;
 
-L_No_Items:
-    mes "\"" + strcharinfo(0) + ", remember that a member of our tribe is candid and honest.\"";
-    goto L_Close;
-
 L_Not_Ready:
     mes "[Birrod]";
-    mes "\"" + strcharinfo(0) + ", you've shown that you have great hunting skills and are an enrichment to our tribe.";
+    mes "\"" + strcharinfo(0) + ", you've shown great hunting skills and are an enrichment to our tribe.";
     mes "But you still lack the needed mental skills to become a full member of our tribe.\"";
     next;
     mes "\"Roam this world to find more experienced persons than yourself to learn new things.";
diff --git a/world/map/npc/033-1/debug.txt b/world/map/npc/033-1/debug.txt
index 5fab2310..6d135151 100644
--- a/world/map/npc/033-1/debug.txt
+++ b/world/map/npc/033-1/debug.txt
@@ -11,6 +11,7 @@
     cleararray $Record_Fluffy_Kills, 0, MAX_HIGH_SCORES;
     cleararray $Record_Fluffy_Name$, "", MAX_HIGH_SCORES;
     cleararray $Record_Fluffy_Date$, "", MAX_HIGH_SCORES;
+    close;
 
 L_Fluffy:
     set @Q_Barbarians_MASK, NIBBLE_0_MASK;
diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt
index c8924df8..abe8a843 100644
--- a/world/map/npc/033-1/kimarr.txt
+++ b/world/map/npc/033-1/kimarr.txt
@@ -51,36 +51,36 @@
     mes "\"You are very small, better be careful in this snowy mountains. It is cold and dangerous monsters are here.\"";
     menu
         "Hello, my name is " + strcharinfo(0) + " and I'm not small. I'm a great warrior!",-,
-        "I'm " + strcharinfo(0) + ", don't underestimate me. I'm an experienced adventurer!" ,-,
+        "I'm " + strcharinfo(0) + ", don't underestimate me. I'm an experienced adventurer!",-,
         "I'm the legendary " + strcharinfo(0) + ", I've fought countless battles.",-;
 
     mes "Kimarr seems to be amused.";
     mes "[Kimarr]";
     mes "\"Really? Do you want to prove it?\"";
     menu
-        "Sure! What shall I do?", -,
-        "No, I don't need to prove anything.", L_Close;
+        "Sure! What shall I do?",-,
+        "No, I don't need to prove anything.",L_Close;
 
     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.\"";
+    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.\"";
     next;
     set @state, 1;
     callsub S_Update_Mask;
 
 L_Explain_Game:
     mes "[Kimarr]";
-    mes "\"In that cave there are living fluffies. They like to eat apples.\"";
+    mes "\"In that cave there are living Fluffies. They like to eat apples.\"";
     next;
     mes "\"I also saw one of them getting excited about one of that sweet things you call 'cake'.\"";
     next;
-    mes "\"You should be careful, other monsters living here might like the food as well.\"";
-    next;
     mes "\"Go to the cave entrance and throw food on the floor to make them come out.\"";
     next;
-    mes "\"Then hunt as many fluffies as you can until I tell you to stop.\"";
+    mes "\"You should be careful, other monsters living here might like the food as well.\"";
     next;
-    mes "\"Drop more food when no fluffies are left.\"";
+    mes "\"Hunt as many Fluffies as you can until I tell you to stop.\"";
+    next;
+    mes "\"Drop more food when no Fluffies are left.\"";
     next;
 
 // dialog starts here if you've asked about it but not done it (@state == 1)
@@ -88,9 +88,9 @@ L_Ask:
     mes "[Kimarr]";
     mes "\"So, are you going to try?\"";
     menu
-        "Yeah, let's start!", L_Game,
-        "Could you explain again?", L_Explain_Game,
-        "Maybe later.", -;
+        "Yeah, let's start!",L_Game,
+        "Could you explain again?",L_Explain_Game,
+        "Maybe later.",-;
     goto L_Close;
 
 L_AlreadyGotReward:
@@ -133,7 +133,6 @@ L_Reward:
     getitem "YetiSkinShirt", 1;
     set @state, 3;
     callsub S_Update_Mask;
-
     goto L_Close;
 
 L_Full_Inv:
@@ -143,11 +142,11 @@ L_Full_Inv:
 // dialog starts here after you've completed this quest
 L_Again:
     mes "[Kimarr]";
-    mes "\"Does the hunter " + strcharinfo(0) + " want to hunt some fluffies again?\"";
+    mes "\"Does the hunter " + strcharinfo(0) + " want to hunt some Fluffies again?\"";
     menu
-        "Yeah!", L_Game,
-        "Can you tell me who were the most successful fluffy hunters?", L_ShowRecord,
-        "Not now.", L_Close;
+        "Yeah!",L_Game,
+        "Can you tell me who were the most successful Fluffy hunters?",L_ShowRecord,
+        "Not now.",L_Close;
 
 L_Game:
     if ($@Fluffy_Hunting)
@@ -170,7 +169,7 @@ L_Someone_Else:
     goto L_Close;
 
 L_Attention:
-    message strcharinfo(0), "Kimarr: You should be focused on hunting fluffies, not talking.";
+    message strcharinfo(0), "Kimarr: You should be focused on hunting Fluffies, not talking.";
     end;
 
 OnTimer1000:
@@ -245,12 +244,12 @@ L_BeginHunting:
     // limit the number of monsters that can be spawned, to prevent people creating lag with massive amount of monsters
     if (($@Fluffy_Spawn + $@Fluffy_Alive) <= 100)
         goto L_SpawnFluffies;
-    message strcharinfo(0), "Wow, calm down, there are already too many fluffies around here.";
+    message strcharinfo(0), "Wow, calm down, there are already too many Fluffies around here.";
     set $@Fluffy_Spawn, 100 - $@Fluffy_Alive;
     if ($@Fluffy_Spawn <= 0)
         goto L_ContinueTimer;
 
- L_SpawnFluffies:
+L_SpawnFluffies:
     areamonster "033-1.gat", 79, 29, 88, 42, "", 1089, $@Fluffy_Spawn, "Kimarr::OnFluffyDeath";
 
     set $@Fluffy_Extra, 5 * @Fluffy_XmasCake + 3 * @Fluffy_Cake + 12 * ($@Fluffy_Alive + $@Fluffy_Spawn) + 7 * BaseLevel;
@@ -390,8 +389,8 @@ L_FinallyInsertMe:
     goto L_Reward1;
 
 L_NotGoodEnough:
-    npctalk  "What a disapointment, " + strcharinfo(0) + " hunted only " + $@Fluffy_Kills + " Fluffies.";
-    message strcharinfo(0), "Kimarr: What a disapointment, you hunted only " + $@Fluffy_Kills + " Fluffies.";
+    npctalk  "What a disappointment, " + strcharinfo(0) + " hunted only " + $@Fluffy_Kills + " Fluffies.";
+    message strcharinfo(0), "Kimarr: What a disappointment, you hunted only " + $@Fluffy_Kills + " Fluffies.";
     callsub S_Clean;
     end;
 
@@ -401,7 +400,7 @@ L_ShowRecord:
 L_ShowNextRecord:
     if ($Record_Fluffy_Kills[@loop] == 0)
         goto L_Close;
-    mes (@loop + 1) + " - " + $Record_Fluffy_Name$[@loop] + " - " + $Record_Fluffy_Kills[@loop] + " fluffies killed at " + $Record_Fluffy_Date$[@loop];
+    mes (@loop + 1) + " - " + $Record_Fluffy_Name$[@loop] + " - " + $Record_Fluffy_Kills[@loop] + " Fluffies killed at " + $Record_Fluffy_Date$[@loop];
     set @loop, @loop + 1;
     goto L_ShowNextRecord;
 
diff --git a/world/map/npc/033-1/yerrnk.txt b/world/map/npc/033-1/yerrnk.txt
index c5d37ce9..8cb9e13d 100644
--- a/world/map/npc/033-1/yerrnk.txt
+++ b/world/map/npc/033-1/yerrnk.txt
@@ -57,7 +57,7 @@ L_Mission:
     mes "\"Our tribe is going through dire straits. We used to live in harmony with the mountain ever since.";
     mes "Life is hard in the snowy mountains, but this life suits our nature.\"";
     next;
-    mes "\"But some weeks ago the Yetis started to act very strange. Usually they are very shy, but now...";
+    mes "\"Some weeks ago the Yetis started to act very strange. Usually they are very shy, but now...";
     mes "They left the secluded areas high up in the mountains they used to live on and started roaming our hunting grounds.\"";
     next;
     mes "\"It became very dangerous to leave the village, so it's even harder to gather enough food to survive.";
@@ -66,7 +66,7 @@ L_Mission:
     mes "\"Other wild animals got more aggressive as well, though the Yetis are the most dangerous.";
     mes "Something like that has never happened before. We have no idea what could cause the animals to behave like this.\"";
     next;
-    mes "\"That's why we were sent on a mission to find and talk to Santa, one of the Sages of Kazei.";
+    mes "\"That's why we were sent on a mission to find and talk to Santa, one of the Sages of Kaizei.";
     mes "The Sages are wizards of great power and wisdom, and we hope Santa might be able to give us advice.\"";
     goto L_Close;
 
@@ -75,11 +75,12 @@ L_Birrod:
     mes "\"" + strcharinfo(0) + ", I have to admit that I'm surprised by your skills.";
     mes "You've proved your braveness and strength.\"";
     next;
-    if (getskilllv(SKILL_POOL) == 0) goto L_Not_Ready;
+    if (getskilllv(SKILL_POOL) == 0)
+        goto L_Not_Ready;
     mes "\"Please talk to Birrod to receive the initiation ritual to become a warrior of the Mangarr.\"";
     menu
         "Alright.",-,
-        "Can you tell me again what are you here for?",L_Mission;
+        "Can you tell me again what you are here for?",L_Mission;
     goto L_Close;
 
 L_Not_Ready:
@@ -98,7 +99,7 @@ L_Warrior:
     menu
         "Everything's alright, thanks.",-,
         "What are you doing down here?",L_Mission,
-        "Can you explain the raging ability to me?",L_Skill,
+        "Can you explain the Raging ability to me?",L_Skill,
         "Do you have a task for me?",L_Task;
     goto L_Close;
 
@@ -143,7 +144,7 @@ L_Hunt_Yeti:
     menu
         "I'm on it.",-,
         "What are you doing down here?",L_Mission,
-        "Can you explain the raging ability to me?",L_Skill;
+        "Can you explain the Raging ability to me?",L_Skill;
     goto L_Close;
 
 L_Yeti_Success: