3 files changed, 8 insertions, 3 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 5f5d7bae5..9f5cdc69a 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -26,6 +26,11 @@
 	-----
 
 =========================
+
+05/04
+	* Modified NPC_STUNATTACK: Max level is 5, stun duration is 1+lv seconds
+	  (these duration values are guessed, but they are better than the previous
+	  5+lv seconds) [Skotlex]
 05/03
 	* Fusion's cast time reduced to 0. [Skotlex]
 	* Removed all Novice Job bonusses [Playtester]
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 6f26fab77..514c1fa4d 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -296,7 +296,7 @@
 //-- NPC_SILENCEATTACK
 178,0,0,0,0,10000:12000:14000:16000:18000:20000:22000:24000:26000:28000
 //-- NPC_STUNATTACK
-179,0,0,0,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000
+179,0,0,0,0,2000:3000:4000:5000:6000
 //-- NPC_PETRIFYATTACK
 180,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
 //-- NPC_CURSEATTACK
@@ -741,7 +741,7 @@
 //-- SL_KAIZEL
 462,4500:4000:3500:3000:2500:2000:1500,0,0,1800000,2000
 //-- SL_KAAHI
-463,0,0,0,1800000,0
+463,0,0,0,1800000,500
 //-- SL_KAUPE
 464,500,0,0,600000,0
 //-- SL_KAITE
diff --git a/db/skill_db.txt b/db/skill_db.txt
index e4e2fe851..328a45de7 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -198,7 +198,7 @@
 176,-1,6,1,-1,0,0,10,1,no,0,2,0,weapon,0	//NPC_POISON#Poison Attack#
 177,7,6,1,-1,0,0,10,1,no,0,2,0,weapon,0	//NPC_BLINDATTACK#Darkness Attack#
 178,-1,6,1,-1,0,0,10,1,no,0,2,0,weapon,0	//NPC_SILENCEATTACK#Silence Attack#
-179,-1,6,1,-1,0,0,10,1,no,0,2,0,weapon,0	//NPC_STUNATTACK#Stun Attack#
+179,-1,6,1,-1,0,0,5,1,no,0,2,0,weapon,0	//NPC_STUNATTACK#Stun Attack#
 180,7,6,1,-1,0,0,10,1,no,0,2,0,weapon,0	//NPC_PETRIFYATTACK#Petrify Attack#
 181,7,6,1,7,0,0,10,1,no,0,2,0,weapon,0	//NPC_CURSEATTACK#Cursing Attack #
 182,-1,6,1,-1,0,0,10,1,no,0,2,0,weapon,0	//NPC_SLEEPATTACK#Sleep attack#