General update so stuff make sense again + bugfixes

5 files changed, 33 insertions, 10 deletions

diff --git a/db/re/exp_group_db.conf b/db/re/exp_group_db.conf
index 4acbb5c7d..d4d492fdb 100644
--- a/db/re/exp_group_db.conf
+++ b/db/re/exp_group_db.conf
@@ -36,11 +36,12 @@ base_exp_group_db: {
                 1860,1990,2240,2504,2950,3426,3934,4474,6889,7995,
                 9174,10425,11748,13967,15775,17678,19677,21773,30543,34212,
                 38065,42102,46323,53026,58419,64041,69892,75973,102468,115254,
-                128692,142784,157528,178184,196300,215198,234879,255341,330188,365914,
+                128692,142784,157528,178184,196300,215198,234879,255341,330188,
                 ]
     }
 }
 /*
+                365914,
                 403224,442116,482590,536948,585191,635278,687211,740988,925400,1473746,
                 1594058,1718928,1848355,1982340,2230113,2386162,2547417,2713878,3206160,3681024,
                 4022472,4377024,4744680,5125440,5767272,6204000,6655464,7121664,7602600,8238720,
@@ -200,12 +201,13 @@ job_exp_group_db: {
                 5,12,20,30,42,93,153,207,270,342,
                 412,522,642,782,917,1072,1200,1368,1450,1668,
                 1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,
-                16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,
+                16891,18570,23229,28359,36478,39716,43088,52417,62495,
         ]
     }
 }
 
 /*
+                78160,
                 84175,90404,107611,125915,153941,191781,204351,248352,286212,386371,
                 409795,482092,509596,982092,992092,1002092,1012092,1022092,1032092,1042092,
                 1052092,1062092,1072092,1082092,1092092,1102092,1112092,1122092,1132092,1142092,
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index 42ab22070..4fa381688 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -415,7 +415,7 @@ SKILL_COND2 = {
 			SkillState: "MSS_BERSERK"
 			SkillLevel: 20
 			Rate: 8000
-			Delay: 180000
+			Delay: 80000
 			Cancelable: true
 			SkillTarget: "MST_TARGET"
 			CastCondition: "MSC_FRIENDHPLTMAXRATE"
@@ -437,13 +437,23 @@ SKILL_COND2 = {
 			SkillState: "MSS_ANYTARGET"
 			SkillLevel: 1
 			Rate: 10000
-			CastTime: 2000
+			CastTime: 1000
 			Delay: 270000
 			SkillTarget: "MST_SELF"
 			CastCondition: "MSC_MYHPLTMAXRATE"
-			ConditionData: 20
+			ConditionData: 25
 			val0: 1024
 		}
+		NPC_POISON: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 20
+			Rate: 7500
+			Delay: 20000
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_MYHPLTMAXRATE"
+			ConditionData: 7
+		}
 	}
 
 }
diff --git a/npc/012-2/helena.txt b/npc/012-2/helena.txt
index bc9f36296..8425142ce 100644
--- a/npc/012-2/helena.txt
+++ b/npc/012-2/helena.txt
@@ -9,8 +9,8 @@
 //          Affects beer prices on Hurnscald.
 //      HurnscaldQuest_Bandits
 //          q1 -> Current status
-//          q2 -> Counter, and Bandit Hood timer
-//          q3 -> 
+//          q2 -> Treasure Key Timer
+//          q3 -> Bandit Hood Timer
 
 012-2,47,40,0	script	Helena	NPC_FEMALE,{
     .@q=getq(HurnscaldQuest_Bandits);
@@ -209,7 +209,18 @@ L_BanditLord:
 
 L_Finish:
     mesn;
-    mesq l("Wow");
+    mesq l("Ah... You did it!");
+    next;
+    mesn;
+    mesq l("That's easy to know, because the bandits are less coordinated. Perhaps we will be able to sleep in peace this night!");
+    next;
+    inventoryplace ForestArmor, 1;
+    getitem ForestArmor, 1;
+    mesn;
+    mesq l("Here is the @@, my armor, and one of the best for rangers.", getitemlink(ForestArmor));
+    next;
+    mesn;
+    mesq l("Any friend of Hurnscald is my friend too. Come to me if you want to do daily quests!");
     close;
 
 OnInit:
diff --git a/npc/015-2/_warps.txt b/npc/015-2/_warps.txt
index d9c0ebaf2..9752cefb9 100644
--- a/npc/015-2/_warps.txt
+++ b/npc/015-2/_warps.txt
@@ -17,7 +17,7 @@
 015-2,113,182,0	warp	#015-2_113_182	0,0,015-2,47,184
 015-2,122,211,0	warp	#015-2_122_211	0,0,015-2,24,205
 015-2,68,235,0	warp	#015-2_68_235	0,0,015-2,97,168
-015-2,251,278,0	warp	#015-2_251_278	0,0,015-2,94,266
+015-2,251,278,0	warp	#015-2_251_278	0,0,015-2,94,226
 015-2,266,182,0	warp	#015-2_266_182	0,0,015-2,249,233
 015-2,174,256,0	warp	#015-2_174_256	0,0,015-2,264,237
 015-2,264,236,0	warp	#015-2_264_236	0,0,015-2,174,255
diff --git a/npc/015-2/guard.txt b/npc/015-2/guard.txt
index 6efe4c4b0..ac7b6da48 100644
--- a/npc/015-2/guard.txt
+++ b/npc/015-2/guard.txt
@@ -11,7 +11,7 @@
     if (.@q == 6) goto L_BanditLord;
     mesn;
     mesq lg("Welcome.");
-    mesq l("This small island is a good place to heal our wounds, the slimes and the snakes are not threating.");
+    mesq l("This small island is a good place to heal our wounds, and the monsters here are not threating.");
     close;
 
 L_SilverKey: