Fixed Garm's and Bacsojin's skills being cancelable

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11168 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 19 insertions, 16 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 88bbb9ffc..991510d03 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -28,6 +28,7 @@
 
 ========================
 09/10
+	* Fixed Garm's and Bacsojin's skills being cancelable [Playtester]
 	* Fixed Asura Strike autocast being self targetted [Playtester]
 09/09
 	* Fixed size of NPC_EVILLAND [Playtester]
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 0fa2ecc24..b8e0d2fba 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -1143,8 +1143,8 @@
 1252,Garm@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
 1252,Garm@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,
 1252,Garm@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,
-1252,Garm@NPC_WIDEFREEZE,chase,664,5,10000,1000,20000,yes,self,always,,,,,,,36
-1252,Garm@NPC_WIDEFREEZE,attack,664,5,10000,1000,20000,yes,self,always,,,,,,,36
+1252,Garm@NPC_WIDEFREEZE,chase,664,5,10000,1000,20000,no,self,always,,,,,,,36
+1252,Garm@NPC_WIDEFREEZE,attack,664,5,10000,1000,20000,no,self,always,,,,,,,36
 1252,Garm@NPC_WEAPONBRAKER,attack,343,10,500,0,30000,no,target,always,0,,,,,,6
 1252,Garm@NPC_AGIUP,attack,350,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6
 1252,Garm@WZ_STORMGUST,chase,89,10,2000,0,5000,no,target,always,0,,,,,,
@@ -2588,16 +2588,16 @@
 1516,Increase Soil@NPC_METAMORPHOSIS,attack,193,2,50,5000,5000,no,self,always,0,1516,,,,,
 1517,Li Me Mang Ryang@NPC_RANGEATTACK,chase,160,1,2000,0,5000,yes,target,always,0,,,,,,24
 1517,Li Me Mang Ryang@NPC_CRITICALSLASH,attack,170,1,500,500,5000,yes,target,always,0,,,,,,6
-1518,Bacsojin@NPC_INVISIBLE,chase,353,1,2000,1000,30000,yes,self,always,0,,,,,,29
+1518,Bacsojin@NPC_INVISIBLE,chase,353,1,2000,1000,30000,no,self,always,0,,,,,,29
 1518,Bacsojin@PR_SANCTUARY,attack,70,10,2000,0,10000,yes,self,always,0,,,,,,18
-1518,Bacsojin@HP_ASSUMPTIO,idle,361,5,10000,500,100000,yes,self,always,0,,,,,,
-1518,Bacsojin@HP_ASSUMPTIO,chase,361,5,10000,500,100000,yes,self,always,0,,,,,,
-1518,Bacsojin@HP_ASSUMPTIO,attack,361,5,10000,500,100000,yes,self,always,0,,,,,,
-1518,Bacsojin@NPC_WIDESLEEP,chase,668,5,10000,700,25000,yes,self,always,0,,,,,,
-1518,Bacsojin@NPC_WIDESLEEP,attack,668,5,10000,700,25000,yes,self,myhpltmaxrate,80,,,,,,
-1518,Bacsojin@WZ_WATERBALL,chase,86,3,2000,1000,5000,yes,target,always,0,,,,,,
+1518,Bacsojin@HP_ASSUMPTIO,idle,361,5,10000,500,100000,no,self,always,0,,,,,,
+1518,Bacsojin@HP_ASSUMPTIO,chase,361,5,10000,500,100000,no,self,always,0,,,,,,
+1518,Bacsojin@HP_ASSUMPTIO,attack,361,5,10000,500,100000,no,self,always,0,,,,,,
+1518,Bacsojin@NPC_WIDESLEEP,chase,668,5,10000,700,25000,no,self,always,0,,,,,,
+1518,Bacsojin@NPC_WIDESLEEP,attack,668,5,10000,700,25000,no,self,myhpltmaxrate,80,,,,,,
+1518,Bacsojin@WZ_WATERBALL,chase,86,3,2000,1000,5000,no,target,always,0,,,,,,
 1518,Bacsojin@WZ_WATERBALL,attack,86,5,1000,0,5000,yes,target,always,0,,,,,,
-1518,Bacsojin@NPC_STOP,attack,342,1,2000,500,15000,yes,target,always,0,,,,,,6
+1518,Bacsojin@NPC_STOP,attack,342,1,2000,500,15000,no,target,always,0,,,,,,6
 1518,Bacsojin@AL_TELEPORT,idle,26,1,1000,0,30000,yes,self,always,0,,,,,,
 1518,Bacsojin@NPC_SUMMONSLAVE,idle,196,3,10000,0,5000,no,self,slavele,1,1519,,,,,
 1518,Bacsojin@NPC_SUMMONSLAVE,attack,196,3,10000,0,5000,no,self,slavele,1,1519,,,,,
@@ -2775,14 +2775,16 @@
 1629,Hill Wind (Spear)@NPC_WINDATTACK,chase,187,3,500,500,5000,no,target,always,0,,,,,,
 1629,Hill Wind (Spear)@NPC_WINDATTACK,attack,187,3,500,500,5000,no,target,always,0,,,,,,
 1629,Hill Wind (Spear)@KN_SPEARBOOMERANG,chase,59,5,500,0,5000,yes,target,always,0,,,,,,
-1630,Bacsojin@NPC_INVISIBLE,chase,353,1,2000,1000,30000,yes,self,always,0,,,,,,29
+1630,Bacsojin@NPC_INVISIBLE,chase,353,1,2000,1000,30000,no,self,always,0,,,,,,29
 1630,Bacsojin@PR_SANCTUARY,attack,70,10,2000,0,10000,yes,self,always,0,,,,,,18
-1630,Bacsojin@HP_ASSUMPTIO,idle,361,5,10000,500,100000,yes,self,always,0,,,,,,
-1630,Bacsojin@HP_ASSUMPTIO,chase,361,5,10000,500,100000,yes,self,always,0,,,,,,
-1630,Bacsojin@HP_ASSUMPTIO,attack,361,5,10000,500,100000,yes,self,always,0,,,,,,
-1630,Bacsojin@WZ_WATERBALL,chase,86,3,2000,1000,5000,yes,target,always,0,,,,,,
+1630,Bacsojin@HP_ASSUMPTIO,idle,361,5,10000,500,100000,no,self,always,0,,,,,,
+1630,Bacsojin@HP_ASSUMPTIO,chase,361,5,10000,500,100000,no,self,always,0,,,,,,
+1630,Bacsojin@HP_ASSUMPTIO,attack,361,5,10000,500,100000,no,self,always,0,,,,,,
+1630,Bacsojin@NPC_WIDESLEEP,chase,668,5,10000,700,25000,no,self,always,0,,,,,,
+1630,Bacsojin@NPC_WIDESLEEP,attack,668,5,10000,700,25000,no,self,myhpltmaxrate,80,,,,,,
+1630,Bacsojin@WZ_WATERBALL,chase,86,3,2000,1000,5000,no,target,always,0,,,,,,
 1630,Bacsojin@WZ_WATERBALL,attack,86,5,1000,0,5000,yes,target,always,0,,,,,,
-1630,Bacsojin@NPC_STOP,attack,342,1,2000,500,15000,yes,target,always,0,,,,,,6
+1630,Bacsojin@NPC_STOP,attack,342,1,2000,500,15000,no,target,always,0,,,,,,6
 1630,Bacsojin@AL_TELEPORT,idle,26,1,1000,0,30000,yes,self,always,0,,,,,,
 1630,Bacsojin@NPC_SUMMONSLAVE,idle,196,3,10000,0,5000,no,self,slavele,1,1631,,,,,
 1630,Bacsojin@NPC_SUMMONSLAVE,attack,196,3,10000,0,5000,no,self,slavele,1,1631,,,,,