From 101f56cae15f792cf4e2cdd6184b75d449119033 Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Wed, 11 Jan 2012 18:11:07 +0100
Subject: Barbarians: some fix in Fluffy Hunting minigame to prevent a level 1
 char doing the quest with doing nothing.

Also remove some debug code and comments in ambushs.txt and update submodule pointer.
---
 world/map/npc/033-1/kimarr.txt  | 4 ++--
 world/map/npc/034-1/ambushs.txt | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'world/map')

diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt
index 8c6efd7c..a4e3f6f2 100644
--- a/world/map/npc/033-1/kimarr.txt
+++ b/world/map/npc/033-1/kimarr.txt
@@ -160,8 +160,7 @@ L_Game:
     set $@Fluffy_Fighter$, strcharinfo(0);
     set $@Fluffy_FighterID, getcharid(3);
     set $@Fluffy_Time, 180;
-
-    set $@Fluffy_Min, (BaseLevel*7)/10;
+    set $@Fluffy_Min, 1 + (BaseLevel*7)/10;
 
     warp "033-1.gat", 79, 34;
     initnpctimer;
@@ -401,6 +400,7 @@ L_FinallyInsertMe:
 
 L_NotGoodEnough:
     callsub S_Clean;
+    end;
 
 L_ShowRecord:
     set @rank, 0;
diff --git a/world/map/npc/034-1/ambushs.txt b/world/map/npc/034-1/ambushs.txt
index 6412e105..a6fc01dc 100644
--- a/world/map/npc/034-1/ambushs.txt
+++ b/world/map/npc/034-1/ambushs.txt
@@ -1,6 +1,5 @@
 // This file belongs to the wolvern hunting quest given by 033-1/birrod.txt
 // Author: Jenalya
-// TODO: add more ambushs all over the map
 
 034-1.gat,118,59,0|script|#Ambush0Trigger|32767,1,1,{
     set @Q_Barbarians_MASK, NIBBLE_0_MASK;
@@ -9,8 +8,8 @@
     if (@state != 4)
         end;
 
-//    if (rand(50) > wolvern_count) // TODO: eventally use different argument for rand
-//        end;
+    if (rand(50) > wolvern_count)
+        end;
 
     if ($@Ambush0_Active != 0)
         end;
-- 
cgit v1.2.3-60-g2f50