Merge remote-tracking branch 'testing/master'v2011.09.08

1 files changed, 8 insertions, 9 deletions

diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt
index b2a7d2e6..7d565001 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.\"";
@@ -114,7 +112,7 @@ L_Reward1:
     // as far as I can tell, this fails because it won't resume from the "next"
     // when the script is executed via the "OnFluffyDeath" callback
     // (I haven't tried via the 301st call of OnTimer1000)
-    message strcharinfo(0), "Kimarr: talk to me for your reward";
+    message strcharinfo(0), "Kimarr: Talk to me for your reward.";
     goto L_Close;
 
 // this label is reached on completion of the quest, or, if you inventory was
@@ -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;
 
@@ -160,7 +157,10 @@ L_Game:
     set $@Fluffy_FighterID, getcharid(3);
     set $@Fluffy_Time, 180;
 
-//TODO: set minimum number of killed fluffies (maybe based on level?)
+//TODO: set minimum number of killed fluffies, here are some ideas
+//    set $@Fluffy_Min, (baselevel*7)/10;
+//    set $@Fluffy_Min, (baselevel*2)/3;
+//    set $@Fluffy_Min, (baselevel*3)/4;
     set $@Fluffy_Min, 2;
     warp "033-1.gat", 79, 34;
     initnpctimer;
@@ -212,7 +212,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;
@@ -261,7 +260,7 @@ L_BeginHunting:
 
     areamonster "033-1.gat", 79, 29, 88, 42, "", 1089, $@Fluffy_Spawn, "Kimarr::OnFluffyDeath";
 
-    set $@Fluffy_Extra, 5 * @Fluffy_XmasCake + 3 * @Fluffy_Cake + 10 * BaseLevel;
+    set $@Fluffy_Extra, 5 * @Fluffy_XmasCake + 3 * @Fluffy_Cake + 12 * ($@Fluffy_Alive + $@Fluffy_Spawn) + 7 * BaseLevel;
     if ((BaseLevel > 40) && (rand($@Fluffy_Extra) > 500)) // Ice Goblin
         areamonster "033-1.gat", 79, 29, 88, 42, "", 1058, 1, "Kimarr::OnIceGoblinDeath";
     if ((BaseLevel > 60) && (rand($@Fluffy_Extra) > 550)) // Santa Slime
@@ -313,7 +312,7 @@ OnFluffyDeath:
     //  message strcharinfo(0), "Fluffies killed: " + $@Fluffy_Kills;
     if ($@Fluffy_Alive != 0)
         end;
-    if (attachrid($@Fluffy_FighterID))
+    if (attachrid($@Fluffy_FighterID) == 1)
         goto L_Killedall;
     goto L_GotOut;
     end;