3 files changed, 18 insertions, 4 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index d3f8d31d8..33b5efbd2 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -19,6 +19,12 @@
 	-----
 
 ========================
+10/19
+	* Added the actual skill delay of 1000ms to Triple Attack and Chain combo
+	  in skill_cast_db. Added Combo Finish and TigerFist as well with a delay of
+	  700ms. [Skotlex]
+	* Added the Monk combos to skill_castnodex so their delay is not decreased
+	  by skills. [Skotlex]
 10/18
 	* Updated the packetdb for the 2006-10-17a client. [Zephiris]
 10/16
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index bcc587ea6..a037f1a35 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -414,7 +414,8 @@
 261,1000,0,0,600000,0
 //-- MO_ABSORBSPIRITS
 262,2000,0,0,0,0
-
+//-- MO_TRIPLEATTACK
+263,0,1000,0,0,0
 //-- MO_INVESTIGATE
 266,1000,500,0,0,0
 //-- MO_FINGEROFFENSIVE
@@ -427,9 +428,12 @@
 270,0,0,0,180000,0
 //-- MO_EXTREMITYFIST
 271,4000:3500:3000:2500:2000,3000:2500:2000:1500:1000,0,0,300000
+//-- MO_CHAINCOMBO
+272,0,1000,0,0,0
+//-- MO_COMBOFINISH
+273,0,700,0,0,0
 //==========================================
 
-
 //===== Sage ===============================
 //-- SA_MAGICROD
 276,0,1500,0,400:600:800:1000:1200,0
@@ -595,7 +599,7 @@
 //-- CH_PALMSTRIKE
 370,0,300,0,0,0
 //-- CH_TIGERFIST
-371,0,0,0,0,2000:4000:6000:8000:10000
+371,0,700,0,0,2000:4000:6000:8000:10000
 //-- CH_CHAINCRUSH
 372,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,0
 //==========================================
diff --git a/db/skill_castnodex_db.txt b/db/skill_castnodex_db.txt
index f80859840..6639dce22 100644
--- a/db/skill_castnodex_db.txt
+++ b/db/skill_castnodex_db.txt
@@ -8,10 +8,14 @@
 // Delay: With 0, dex affects the skill's delay rate
 // Example - 46,1,1 = Double Strafe's casting time and delay is not affected by dex.
 // By default, dex NEVER affects after-cast delay, so no need of putting 'x,0,1' in this file
-
+263,0,2 //MO_TRIPLEATTACK
+272,0,2 //MO_CHAINCOMBO
+273,0,2 //MO_COMBOFINISH
 336,1	//WE_CALLPARTNER
 366,1	//HW_MAGICPOWER
 370,1	//CH_PALMSTRIKE
+371,0,2 //CH_TIGERFIST
+372,0,2 //CH_CHAINCRUSH
 403,3	//PF_MEMORIZE
 408,1	//WE_BABY
 409,1	//WE_CALLPARENT