Official status change base durations for Stun (#1234) (#1632)

- NPC_LICK now has a base chance of 20%*level and a base duration of 5s
- Excruciating Palm now has a base duration 5s
- Shield Press now has a base duration of 5s+0.5s*level
- Earth Shaker now has a base duration of 2s (level 2-3) and 3s (level
4-5)
- Sightless Mind now has a base duration of 30s in pre-re and 20s in
renewal
- Credit rathena/rathena@80e026433

3 files changed, 35 insertions, 55 deletions

diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index a5c27257f..39ae0b313 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2016  Hercules Dev Team
+//= Copyright (C) 2014-2017  Hercules Dev Team
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -6041,7 +6041,7 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData2: 3000
+	SkillData2: 5000
 	CoolDown: 0
 },
 {
@@ -6177,18 +6177,7 @@ skill_db: (
 	}
 	SplashRange: 1
 	SkillData1: 5000
-	SkillData2: {
-		Lv1: 8000
-		Lv2: 9000
-		Lv3: 10000
-		Lv4: 11000
-		Lv5: 12000
-		Lv6: 13000
-		Lv7: 14000
-		Lv8: 15000
-		Lv9: 16000
-		Lv10: 17000
-	}
+	SkillData2: 30000
 	CoolDown: 0
 	Requirements: {
 		SPCost: 20
@@ -17952,7 +17941,7 @@ skill_db: (
 	SplashRange: 1
 	KnockBackTiles: 5
 	AfterCastActDelay: 2000
-	SkillData2: 2000
+	SkillData2: 5000
 	CoolDown: 0
 	Requirements: {
 		HPCost: 10
@@ -24040,16 +24029,11 @@ skill_db: (
 	}
 	AttackType: "Weapon"
 	SkillData1: {
-		Lv1: 3500
-		Lv2: 4000
-		Lv3: 4500
-		Lv4: 5000
-		Lv5: 5500
-		Lv6: 6000
-		Lv7: 6500
-		Lv8: 7000
-		Lv9: 7500
-		Lv10: 8000
+		Lv1: 5500
+		Lv2: 6000
+		Lv3: 6500
+		Lv4: 7000
+		Lv5: 7500
 	}
 	CoolDown: 2000
 	Requirements: {
@@ -24805,7 +24789,13 @@ skill_db: (
 		Lv9: 9
 		Lv10: 10
 	}
-	SkillData1: 1000
+	SkillData1: {
+		Lv1: 1000
+		Lv2: 2000
+		Lv3: 2000
+		Lv4: 3000
+		Lv5: 3000
+	}
 	CoolDown: 3000
 	Requirements: {
 		SPCost: {
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 8eb2b40fa..03d35b687 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2016  Hercules Dev Team
+//= Copyright (C) 2014-2017  Hercules Dev Team
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -6271,7 +6271,7 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData2: 3000
+	SkillData2: 5000
 	FixedCastTime: 0
 },
 {
@@ -6408,18 +6408,7 @@ skill_db: (
 	}
 	SplashRange: 3
 	SkillData1: 5000
-	SkillData2: {
-		Lv1: 8000
-		Lv2: 9000
-		Lv3: 10000
-		Lv4: 11000
-		Lv5: 12000
-		Lv6: 13000
-		Lv7: 14000
-		Lv8: 15000
-		Lv9: 16000
-		Lv10: 17000
-	}
+	SkillData2: 20000
 	FixedCastTime: 0
 	Requirements: {
 		SPCost: 20
@@ -18494,7 +18483,7 @@ skill_db: (
 	SplashRange: 1
 	KnockBackTiles: 5
 	AfterCastActDelay: 2000
-	SkillData2: 2000
+	SkillData2: 5000
 	FixedCastTime: -1
 	Requirements: {
 		HPCost: 10
@@ -24690,16 +24679,11 @@ skill_db: (
 	}
 	AttackType: "Weapon"
 	SkillData1: {
-		Lv1: 3500
-		Lv2: 4000
-		Lv3: 4500
-		Lv4: 5000
-		Lv5: 5500
-		Lv6: 6000
-		Lv7: 6500
-		Lv8: 7000
-		Lv9: 7500
-		Lv10: 8000
+		Lv1: 5500
+		Lv2: 6000
+		Lv3: 6500
+		Lv4: 7000
+		Lv5: 7500
 	}
 	CoolDown: 2000
 	FixedCastTime: -1
@@ -25464,7 +25448,13 @@ skill_db: (
 		Lv9: 9
 		Lv10: 10
 	}
-	SkillData1: 1000
+	SkillData1: {
+		Lv1: 1000
+		Lv2: 2000
+		Lv3: 2000
+		Lv4: 3000
+		Lv5: 3000
+	}
 	CoolDown: 3000
 	FixedCastTime: -1
 	Requirements: {
diff --git a/src/map/skill.c b/src/map/skill.c
index 51a8a28e7..cd7006de0 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2012-2016  Hercules Dev Team
+ * Copyright (C) 2012-2017  Hercules Dev Team
  * Copyright (C)  Athena Dev Teams
  *
  * Hercules is free software: you can redistribute it and/or modify
@@ -7470,8 +7470,8 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 
 		case NPC_LICK:
 			status_zap(bl, 0, 100);
-			clif->skill_nodamage(src,bl,skill_id,skill_lv,
-				sc_start(src,bl,type,(skill_lv*5),skill_lv,skill->get_time2(skill_id,skill_lv)));
+			clif->skill_nodamage(src, bl, skill_id, skill_lv,
+				sc_start(src, bl, type, (skill_lv * 20), skill_lv, skill->get_time2(skill_id, skill_lv)));
 			break;
 
 		case NPC_SUICIDE: