- Implemented first version of Archbishop skills. Preliminary version, see doc/3rd_job_notes.txt for details/bugs/issues with skills.

- Implemented fixed cast time, old cast time mechanics no longer available. Added bFixedCastRate used for reducing fixed cast time mechanic.
  Cast time calculations probably still needs work, as the cast rate reductions are probably additive and multiplicative as they used to be.
- As a result, skill_delayfix_sc() has been removed, status effects that modify cast time are now calculated DURING cast time, not after.
- Implemented skill cooldown in skill_cast_db.txt. Known issue is that the cooldowns should save on logout/server shutdown/etc.
- Implemented new heal calculation and started work on MATK. Added bWeaponMatk, and bEquipmentMatk for use with new MATK mechanic.
- Removed custom features and their config settings: delay_dependon_dex, delay_dependon_agi, castrate_dex_scale.
- Increased max_def to 9999 for now, as that is by default the largest defense increase found in the Renewal database (Ahura_mazdah, GM item)
- Added shield aspd reduction from job_db1.txt-- Not 100% sure on this one yet. Should be considered a WIP.
- Modified updatestatus(), to display information more in line with the client's status window.
- Updated some calculations in status_calc_misc to match renewal, needs a lot of work still.
- ST_CHASEWALK and HP_BASILICA no longer have 0 cast time while being canceled.
* Implemented 'Boss' Decrease AGI, like 'Boss' Heal - editable in skill.conf
* clif_skill_fail() now accepts a new parameter, to be used in later messages.
* status_change_start() now stores tick as duration upon being called, which fixes timers calling the function from showing negative durations.
* Implemented skill ALL_PARTYFLEE. 1 level, increases party member flee by 10.


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

1 files changed, 539 insertions, 452 deletions

diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index df31fa116..f21ee043f 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -1,7 +1,7 @@
 // Skill Times Database
 //
 // Structure of Database:
-// SkillID,CastingTime,AfterCastActDelay,AfterCastWalkDelay,Duration1,Duration2
+// SkillID,CastingTime,FixedCastingTime,AfterCastActDelay,Cooldown,AfterCastWalkDelay,Duration1,Duration2
 //
 //==========================================
 // Rough list of Contents:
@@ -34,1104 +34,1191 @@
 
 //===== Swordman ===========================
 //-- SM_PROVOKE
-6,0,0,0,30000,0
+6,0,0,0,0,0,30000,0
 //-- SM_MAGNUM
-7,0,0,0,2000,10000
+7,0,0,2000,0,0,2000,10000
 //-- SM_ENDURE
-8,0,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,10000
+8,0,0,0,10000,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,10000
 //==========================================
 
 
 //===== Mage ===============================
 //-- MG_SIGHT
-10,0,0,0,10000,0
+10,0,0,0,0,0,10000,0
 //-- MG_NAPALMBEAT
-11,1000,1000:1000:1000:900:900:800:800:700:600:500,0,0,0
+11,400,100,1000:1000:1000:900:900:800:800:700:600:500,0,0,0,0
 //-- MG_SAFETYWALL
-12,4000:3500:3500:2500:2000:1500:1000:1000:1000:1000,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0
+12,3200:2880:2560:2240:1920:1600:1280:960:640:320,800:720:640:560:480:400:320:240:160:80,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0
 //-- MG_SOULSTRIKE
-13,500,1200:1000:1400:1200:1600:1400:1800:1600:2000:1800,0,0,0
+13,400,100,1200:1200:1600:1600:2000:2000:2400:2400:2800:2500,0,0,0,0
 //-- MG_COLDBOLT
-14,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0
+14,640:960:1280:1600:1920:2100:1560:2880:3200:3520,160:240:320:400:480:700:640:720:800:880,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0
 //-- MG_FROSTDRIVER
-15,800,1500,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000
+15,640,160,1500,0,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000
 //-- MG_STONECURSE
-16,1000,0,0,5000,20000
+16,800,100,0,0,0,5000,20000
 //-- MG_FIREBALL
-17,1500:1500:1500:1500:1500:1000:1000:1000:1000:1000,1500:1500:1500:1500:1500:1000:1000:1000:1000:1000,0,0,0
+17,1280:1280:1280:1280:1280:800:800:800:800:800,320:320:320:320:320:200:200:200:200:200,1500:1500:1500:1500:1500:1000:1000:1000:1000:1000,0,0,0,0
 //-- MG_FIREWALL
-18,2000:1850:1700:1550:1400:1250:1100:950:800:650,0,0,5000:6000:7000:8000:9000:10000:11000:12000:13000:14000,0
+18,1600:1440:1280:1120:960:880:800:720:640:560,400:360:320:280:240:220:200:180:160:140,0,0,0,5000:6000:7000:8000:9000:10000:11000:12000:13000:14000,0
 //-- MG_FIREBOLT
-19,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0
+19,640:960:1280:1600:1920:2100:1560:2880:3200:3520,160:240:320:400:480:700:640:720:800:880,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0
 //-- MG_LIGHTNINGBOLT
-20,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0
+20,640:960:1280:1600:1920:2100:1560:2880:3200:3520,160:240:320:400:480:700:640:720:800:880,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0
 //-- MG_THUNDERSTORM
-21,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,2000,0,500,0
+21,640:1280:1920:2560:3200:3840:4480:5120:5760:6400,160:320:480:640:800:960:1120:1280:1440:1600,2000,0,0,500,0
 //==========================================
 
 
 //===== Acolyte ============================
 //-- AL_RUWACH
-24,0,0,0,10000,0
+24,0,0,0,0,0,10000,0
 //-- AL_PNEUMA
-25,0,0,0,10000,0
+25,0,0,0,0,0,10000,0
 //-- AL_TELEPORT
-26,0,0,0,0,0
+26,0,0,0,0,0,0,0
 //-- AL_WARP
-27,1000,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0
+27,0,1000,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0
 //-- AL_HEAL
-28,0,1000,0,0,0
+28,0,0,1000,0,0,0,0
 //-- AL_INCAGI
-29,1000,1000,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
+29,800,200,1000,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
 //-- AL_DECAGI
-30,1000,1000,0,40000:50000:60000:70000:80000:90000:100000:110000:120000:130000,0
+30,750,250,1000,0,0,40000:50000:60000:70000:80000:90000:100000:110000:120000:130000,0
 //-- AL_HOLYWATER
-31,1000,500,0,0,0
+31,800,400,500,0,0,0,0
 //-- AL_CRUCIS
-32,500,2000,0,0,0
+32,350,150,2000,0,0,0,0
 //-- AL ANGELUS
-33,500,3500,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
+33,350,150,3500,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
 //-- AL_BLESSING
-34,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
+34,0,0,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
 //-- AL_CURE
-35,0,1000,0,0,6000
+35,0,0,1000,0,0,0,6000
 //==========================================
 
 
 //===== Archer =============================
 //-- AC_CONCENTRATION
-45,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
+45,0,0,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
 //-- AC_DOUBLE
-46,0,0,0,100,0
+46,0,0,100,0,100,0,0
 //-- AC_SHOWER
-47,0,0,0,100,0
+47,0,0,100,0,0,100,0
 //==========================================
 
 
 //===== Thief ==============================
 //-- TF_HIDING
-51,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
+51,0,0,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
 //-- TF_POISON
-52,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000
+52,0,0,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000
 //==========================================
 
 
 //===== First planned to be shared =========
 //-- ALL_RESURRECTION
-54,6000:4000:2000:0,0:1000:2000:3000,0,0,0
+54,4800:3200:1600:0,1200:800:400:0,0:1000:2000:3000,0,0,0,0
 //==========================================
 
 
 //===== Knight =============================
 //-- KN_BRANDISHSPEAR
-57,700,0,0,0,0
+57,350,350,0,0,0,0,0
 
 //-- KN_SPEARBOOMERANG
-59,0,1000,0,0,0
+59,0,0,1000,0,0,0,0
 //-- KN_TWOHANDQUICKEN
-60,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
+60,0,0,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
 //-- KN_AUTOCOUNTER
-61,0,0,0,400:800:1200:1600:2000,0
+61,0,0,0,0,0,400:800:1200:1600:2000,0
 //-- KN_BOWLINGBASH
-62,700,0,0,0,0
+62,350,350,0,0,0,0,0
 //==========================================
 
 
 //===== Priest =============================
 //-- PR_IMPOSITIO
-66,0,3000,0,60000,0
+66,0,0,3000,0,0,60000,0
 //-- PR_SUFFRAGIUM
-67,0,2000,0,30000:20000:10000,0
+67,0,0,2000,0,0,30000:20000:10000,0
 //-- PR_ASPERSIO
-68,0,2000,0,60000:90000:120000:150000:180000,0
+68,0,0,2000,0,0,60000:90000:120000:150000:180000,0
 //-- PR_BENEDICTIO
-69,0,0,0,40000:80000:120000:160000:200000,0
+69,0,0,0,0,0,40000:80000:120000:160000:200000,0
 //-- PR_SANCTUARY
-70,5000,0,0,4000:7000:10000:13000:16000:19000:22000:25000:28000:31000,0
+70,4000,1000,0,0,0,4000:7000:10000:13000:16000:19000:22000:25000:28000:31000,0
 //-- PR_SLOWPOISON
-71,0,0,0,10000:20000:30000:40000,0
+71,0,0,0,0,0,10000:20000:30000:40000,0
 //-- PR_STRECOVERY
-72,0,2000,0,0,30000
+72,0,0,2000,0,0,0,30000
 //-- PR_KYRIE
-73,2000,2000,0,120000,0
+73,1600,400,2000,0,0,120000,0
 //-- PR_MAGNIFICAT
-74,4000,2000,0,30000:45000:60000:75000:90000,0
+74,3200,800,2000,0,0,30000:45000:60000:75000:90000,0
 //-- PR_GLORIA
-75,0,2000,0,10000:15000:20000:25000:30000,0
+75,0,0,2000,0,0,10000:15000:20000:25000:30000,0
 //-- PR_LEXDIVINA
-76,0,3000,0,30000:35000:40000:45000:50000:60000:60000:60000:60000:60000,0
+76,0,0,3000,0,0,30000:35000:40000:45000:50000:60000:60000:60000:60000:60000,0
 //-- PR_TURNUNDEAD
-77,1000,3000,0,0,0
+77,800,200,3000,0,0,0,0
 //-- PR_LEXAETERNA
-78,0,3000,0,600000,0
+78,0,0,3000,0,0,600000,0
 //-- PR_MAGNUS
-79,15000,4000,0,5000:6000:7000:8000:9000:10000:11000:12000:13000:14000,0
+79,12000,3000,4000,0,0,5000:6000:7000:8000:9000:10000:11000:12000:13000:14000,0
 //==========================================
 
 
 //===== Wizard =============================
 //-- WZ_FIREPILLAR
-80,3000:2700:2400:2100:1800:1500:1200:900:600:300,1000,0,30000,600:800:1000:1200:1400:1600:1800:2000:2200:2400
+80,1920:1728:1536:1344:1152:960:768:576:384:192,480:432:384:336:288:240:192:144:96:48,1000,0,0,30000,600:800:1000:1200:1400:1600:1800:2000:2200:2400
 //-- WZ_SIGHTRASHER
-81,700,2000,0,500,0
+81,320,80,2000,0,0,500,0
 
 //-- WZ_METEOR
-83,15000,2000:3000:3000:4000:4000:5000:5000:6000:6000:7000,0,500,5000
+83,9600,2400,2000:3000:3000:4000:4000:5000:5000:6000:6000:7000,0,0,500,5000
 //-- WZ_JUPITEL
-84,2500:3000:3500:4000:4500:5000:5500:6000:6500:7000,0,0,0,0
+84,1600:1920:2240:2560:2880:3200:3520:3840:4160:4480,400:480:560:640:720:800:880:960:1040:1120,0,0,0,0,0
 //-- WZ_VERMILION
-85,15000:14500:14000:13500:13000:12500:12000:11500:11000:10500,5000,0,4000,5500:6000:6500:7000:7500:8000:8500:9000:9500:10000
+85,9600:9280:8960:8640:8320:8000:7680:7360:7040:6720,2400:2320:2240:2160:2080:2000:1920:1840:1760:1680,5000,0,0,4000,5500:6000:6500:7000:7500:8000:8500:9000:9500:10000
 //-- WZ_WATERBALL
-86,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,0,0,0,0
+86,640:1280:1920:2560:3200:3200:3200:3200:3200:3200,160:320:480:640:800:800:800:800:800:800,0,0,0,0,0
 //-- WZ_ICEWALL
-87,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0
+87,0,0,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0
 //-- WZ_FROSTNOVA
-88,5000:4700:4400:4100:3800:3500:3200:2900:2700:2500,1000,0,0,1500:3000:4500:6000:7500:9000:10500:12000:13500:15000
+88,640:640:576:576:512:512:448:448:384:384,160:160:144:144:128:128:112:112:96:96,200,0,0,0,1500:3000:4500:6000:7500:9000:10500:12000:13500:15000
 //-- WZ_STORMGUST
-89,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,5000,0,4600,12000
+89,3840:4480:5120:5760:6400:7040:7680:8320:8960:9600,960:1120:1280:1440:1600:1760:1920:2080:2240:2400,5000,0,0,4600,12000
 //-- WZ_EARTHSPIKE
-90,1000:2000:3000:4000:5000,700,0,0,0
+90,448:896:1344:1792:2240,112:224:336:448:560,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0
 //-- WZ_HEAVENDRIVE
-91,1000:2000:3000:4000:5000,700,0,500,0
+91,640:1280:1920:2560:3200,160:320:480:640:800,1000,0,0,500,0
 //-- WZ_QUAGMIRE
-92,0,1000,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000
+92,0,0,1000,0,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000
 //==========================================
 
 
 //===== Blacksmith =========================
 //-- BS_REPAIRWEAPON
-108,7500,0,0,0,0
+108,2500,2500,0,0,0,0,0
 //-- BS_HAMMERFALL
-110,0,0,0,0,5000
+110,0,0,0,0,0,0,5000
 //-- BS_ADRENALINE
-111,0,0,0,30000:60000:90000:120000:150000,0
+111,0,0,0,0,0,30000:60000:90000:120000:150000,0
 //-- BS_WEAPONPEFECT
-112,0,0,0,10000:20000:30000:40000:50000,0
+112,0,0,0,0,0,10000:20000:30000:40000:50000,0
 //-- BS_OVERTHRUST
-113,0,0,0,20000:40000:60000:80000:100000,0
+113,0,0,0,0,0,20000:40000:60000:80000:100000,0
 //-- BS_MAXIMIZE
-114,0,0,0,1000:2000:3000:4000:5000,0
+114,0,0,0,0,0,1000:2000:3000:4000:5000,0
 //==========================================
 
 
 //===== Hunter =============================
 //-- HT_SKIDTRAP
-115,0,0,0,300000:240000:180000:120000:60000,0
+115,0,0,0,0,0,300000:240000:180000:120000:60000,0
 //-- HT_LANDMINE
-116,0,0,0,200000:160000:120000:80000:40000,5000
+116,0,0,0,0,0,200000:160000:120000:80000:40000,5000
 //-- HT_ANKLESNARE
-117,0,0,0,250000:200000:150000:100000:50000,4000:8000:12000:16000:20000
+117,0,0,0,0,0,250000:200000:150000:100000:50000,4000:8000:12000:16000:20000
 //-- HT_SHOCKWAVE
-118,0,0,0,200000:160000:120000:80000:40000,0
+118,0,0,0,0,0,200000:160000:120000:80000:40000,0
 //-- HT_SANDMAN
-119,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000
+119,0,0,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000
 //-- HT_FLASHER
-120,0,0,0,150000:120000:90000:60000:30000,10000:11000:12000:13000:14000
+120,0,0,0,0,0,150000:120000:90000:60000:30000,10000:11000:12000:13000:14000
 //-- HT_FREEZINGTRAP
-121,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000
+121,0,0,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000
 //-- HT_BLASTMINE
-122,0,0,0,25000:20000:15000:10000:5000,0
+122,0,0,0,0,0,25000:20000:15000:10000:5000,0
 //-- HT_CLAYMORETRAP
-123,0,0,0,20000:40000:60000:80000:100000,0
+123,0,0,0,0,0,20000:40000:60000:80000:100000,0
 
 //-- HT_TALKIEBOX
-125,0,0,0,600000,0
+125,0,0,0,0,0,600000,0
 
 //-- HT_BLITZBEAT
-129,1500,1000,0,0,0
+129,800,200,1000,0,0,0,0
 //==========================================
 
 
 //===== Assassin ===========================
 //-- AS_CLOAKING
-135,0,0,0,500:1000:2000:3000:4000:5000:6000:7000:8000:9000,0
+135,0,0,0,0,0,500:1000:2000:3000:4000:5000:6000:7000:8000:9000,0
 //-- AS_SONICBLOW
-136,0,2000,2000,0,5000
+136,0,0,2000,0,2000,0,5000
 //-- AS_ENCHANTPOISON
-138,0,0,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,10000:20000:30000:40000:50000:60000:70000:80000:90000:100000
+138,0,0,0,0,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,10000:20000:30000:40000:50000:60000:70000:80000:90000:100000
 //-- AS_POISONREACT
-139,0,0,0,20000:25000:30000:35000:40000:45000:50000:55000:60000:65000,0
+139,0,0,0,0,0,20000:25000:30000:35000:40000:45000:50000:55000:60000:65000,0
 //-- AS_VENOMDUST
-140,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000
+140,0,0,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000
 //-- AS_SPLASHER
-141,1000,0,0,5000:5500:6000:6500:7000:7500:8000:8500:9000:9500,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000
+141,500,500,0,7500:8000:8500:9000:9500:10000:10500:11000:11500:12000,0,5000:5500:6000:6500:7000:7500:8000:8500:9000:9500,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000
 
 //==========================================
 
 
 //===== 1st Jobs Quest Skills===============
 //-- NV_TRICKDEAD
-143,0,0,0,600000,0
+143,0,0,0,0,0,600000,0
 
 //-- SM_FATALBLOW
-145,0,0,0,0,5000
+145,0,0,0,0,0,0,5000
 
 //-- AC_CHARGEARROW
-148,1500,0,0,0,0
+148,0,1500,0,0,0,0,0
 //-- TF_SPRINKLESAND
-149,0,0,0,0,10000
+149,0,0,0,0,0,0,10000
 
 //-- TF_PICKSTONE
-151,500,0,0,0,0
+151,0,500,0,0,0,0,0
 //-- TF_THROWSTONE
-152,0,0,0,5000,8000
+152,0,0,100,0,0,5000,8000
 
 //-- MC_LOUD
-155,0,0,0,300000,0
+155,0,0,0,0,0,300000,0
 //-- AL_HOLYLIGHT
-156,2000,0,0,0,0
+156,1600,400,0,0,0,0,0
 //-- MG_ENERGYCOAT
-157,5000,0,0,300000,0
+157,0,5000,0,0,0,300000,0
 //==========================================
 
 
 //===== NPC Skills Part 1 ==================
 //-- NPC_ATTRICHANGE
-161,0,0,0,1800000,0
+161,0,0,0,0,0,1800000,0
 //-- NPC_CHANGEWATER
-162,0,0,0,1800000,0
+162,0,0,0,0,0,1800000,0
 //-- NPC_CHANGEGROUND
-163,0,0,0,1800000,0
+163,0,0,0,0,0,1800000,0
 //-- NPC_CHANGEFIRE
-164,0,0,0,1800000,0
+164,0,0,0,0,0,1800000,0
 //-- NPC_CHANGEWIND
-165,0,0,0,1800000,0
+165,0,0,0,0,0,1800000,0
 //-- NPC_CHANGEPOISON
-166,0,0,0,1800000,0
+166,0,0,0,0,0,1800000,0
 //-- NPC_CHANGEHOLY
-167,0,0,0,1800000,0
+167,0,0,0,0,0,1800000,0
 //-- NPC_CHANGEDARKNESS
-168,0,0,0,1800000,0
+168,0,0,0,0,0,1800000,0
 //-- NPC_CHANGETELEKINESIS
-169,0,0,0,1800000,0
+169,0,0,0,0,0,1800000,0
 
 //-- NPC_SELFDESTRUCTION
-173,0,0,0,3500,0
+173,0,0,0,0,0,3500,0
 
 //-- NPC_POISON
-176,0,0,0,0,60000
+176,0,0,0,0,0,0,60000
 //-- NPC_BLINDATTACK
-177,0,0,0,0,30000
+177,0,0,0,0,0,0,30000
 //-- NPC_SILENCEATTACK
-178,0,0,0,0,30000
+178,0,0,0,0,0,0,30000
 //-- NPC_STUNATTACK
-179,0,0,0,0,5000
+179,0,0,0,0,0,0,5000
 //-- NPC_PETRIFYATTACK
-180,0,0,0,0,20000
+180,0,0,0,0,0,0,20000
 //-- NPC_CURSEATTACK
-181,0,0,0,0,30000
+181,0,0,0,0,0,0,30000
 //-- NPC_SLEEPATTACK
-182,0,0,0,0,30000
+182,0,0,0,0,0,0,30000
 
 //-- NPC_MAGICALATTACK
-192,0,0,0,15000,0
+192,0,0,0,0,0,15000,0
 
 //-- NPC_KEEPING
-201,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0
+201,0,0,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0
 
 //-- NPC_BARRIER
-204,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0
+204,0,0,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0
 //-- NPC_DEFENDER
-205,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0
+205,0,0,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0
 //-- NPC_LICK
-206,0,0,0,0,3000
+206,0,0,0,0,0,0,3000
 //-- NPC_HALLUCINATION
-207,0,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0
+207,0,0,0,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0
 //==========================================
 
 
 //===== Rogue ==============================
-//-- RG_BACKSTAB
-212,0,500,0,0,0
+//-- RG_STEALCOIN
+211,0,0,500,0,0,0,0
+//-- RG_BACKSTAP
+212,0,0,500,0,0,0,0
 
 //-- RG_RAID
-214,0,0,0,5000,8000:9000:10000:11000:12000
+214,0,0,0,0,0,5000,8000:9000:10000:11000:12000
 //-- RG_STRIPEWEAPON
-215,1000,1000,0,75000:90000:105000:120000:135000,0
+215,560:720:880:1140:1200,140:180:220:260:300,1000,0,0,75000:90000:105000:120000:135000,0
 //-- RG_STRIPSHIELD
-216,1000,1000,0,75000:90000:105000:120000:135000,0
+216,560:720:880:1140:1200,140:180:220:260:300,1000,0,0,75000:90000:105000:120000:135000,0
 //-- RG_STRIPWEAPON
-217,1000,1000,0,75000:90000:105000:120000:135000,0
+217,560:720:880:1140:1200,140:180:220:260:300,1000,0,0,75000:90000:105000:120000:135000,0
 //-- RG_STRIPHELM
-218,1000,1000,0,75000:90000:105000:120000:135000,0
+218,560:720:880:1140:1200,140:180:220:260:300,1000,0,0,75000:90000:105000:120000:135000,0
 
 //-- RG_GRAFITTI
-220,0,0,0,180000,0
+220,0,0,0,0,0,180000,0
 //==========================================
 
 
 //===== Alchemist ==========================
 //-- AM_DEMONSTRATION
-229,1000,0,0,40000:45000:50000:55000:60000,0
+229,800,200,500,0,0,40000:45000:50000:55000:60000,0
 //-- AM_ACIDTERROR
-230,1000,0,0,3:7:10:12:13,120000
+230,500,500,500,0,0,3:7:10:12:13,120000
 //-- AM_POTIONPITCHER
-231,0,500,0,0,0
+231,0,0,500,0,0,0,0
 //-- AM_CANNIBALIZE
-232,2000,500,0,300000:240000:180000:120000:60000,0
+232,1600,400,500,0,0,300000:240000:180000:120000:60000,0
 //-- AM_SPHEREMINE
-233,2000,500,0,30000,0
+233,1600,400,500,0,0,30000,0
 //-- AM_CP_WEAPON
-234,2000,0,0,120000:240000:360000:480000:600000,0
+234,0,2000,500,0,0,120000:240000:360000:480000:600000,0
 //-- AM_CP_SHIELD
-235,2000,0,0,120000:240000:360000:480000:600000,0
+235,0,2000,500,0,0,120000:240000:360000:480000:600000,0
 //-- AM_CP_ARMOR
-236,2000,0,0,120000:240000:360000:480000:600000,0
+236,0,2000,500,0,0,120000:240000:360000:480000:600000,0
 //-- AM_CP_HELM
-237,2000,0,0,120000:240000:360000:480000:600000,0
+237,0,2000,500,0,0,120000:240000:360000:480000:600000,0
+//-- AM_HEALHOMUN
+//246,800,200,500,0,0,0,0
 //-- AM_RESURRECTHOMUN
-247,2000,0,0,0,0
+247,2000,1000,0,0,0,0,0
 //==========================================
 
 
 //===== Crusader ===========================
 //-- CR_AUTOGUARD
-249,0,0,0,300000,0
+249,0,0,0,0,0,300000,0
 //-- CR_SHIELDCHARGE
-250,0,0,0,0,5000
+250,0,0,0,0,0,0,5000
 //-- CR_SHIELDBOOMERANG
-251,0,700,0,0,0
+251,0,0,700,0,0,0,0
 //-- CR_REFLECTSHIELD
-252,0,0,0,300000,0
+252,0,0,0,0,0,300000,0
 //-- CR_HOLYCROSS
-253,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
+253,0,0,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
 //-- CR_GRANDCROSS
-254,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
+254,1500,1500,1500,0,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
 //-- CR_DEVOTION
-255,3000,0,0,0,30000:45000:60000:75000:90000
+255,1500,1500,0,0,0,0,30000:45000:60000:75000:90000
 //-- CR_PROVIDENCE
-256,3000,0,0,180000,0
+256,1500,1500,0,0,0,180000,0
 //-- CR_DEFENDER
-257,0,800,0,180000,0
+257,0,0,800,0,0,180000,0
 //-- CR_SPEARQUICKEN
-258,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
+258,0,0,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
 //==========================================
 
 
 //===== Monk ===============================
 //-- MO_CALLSPIRITS
-261,1000,0,0,600000,0
+261,500,500,0,0,0,600000,0
 //-- MO_ABSORBSPIRITS
-262,2000,0,0,0,0
+262,1000,1000,0,0,0,0,0
 //-- MO_TRIPLEATTACK
-263,0,1000,0,0,0
+263,0,0,1000,0,0,0,0
 //-- MO_INVESTIGATE
-266,1000,500,0,0,0
+266,500,500,500,0,0,0,0
 //-- MO_FINGEROFFENSIVE
-267,1000,500,0:200:400:600:800,0,0
+267,500,500,500,0,0:200:400:600:800,0,0
 //-- MO_STEELBODY
-268,5000,0,0,30000:60000:90000:120000:150000,0
+268,2500,2500,0,0,0,30000:60000:90000:120000:150000,0
 //-- MO_BLADESTOP
-269,0,0,0,500:700:900:1100:1300,20000:30000:40000:50000:60000
+269,0,0,500,0,0,500:700:900:1100:1300,20000:30000:40000:50000:60000
 //-- MO_EXPLOSIONSPIRITS
-270,0,0,0,180000,0
+270,0,0,0,0,0,180000,0
 //-- MO_EXTREMITYFIST
-271,4000:3500:3000:2500:2000,3000:2500:2000:1500:1000,0,0,300000
+271,2000:1750:1500:1250:1000:500:1000,2000:1750:1500:1250:1000:500:1000,3000:2500:2000:1500:1000,0,0,0,300000
 //-- MO_CHAINCOMBO
-272,0,1000,0,0,0
+272,0,0,1000,0,0,0,0
 //-- MO_COMBOFINISH
-273,0,700,0,0,0
+273,0,0,700,0,0,0,0
 //==========================================
 
 //===== Sage ===============================
 //-- SA_MAGICROD
-276,0,0,0,400:600:800:1000:1200,0
+276,0,0,1000,0,0,400:600:800:1000:1200,0
 //-- SA_SPELLBREAKER
-277,700,0,0,0,0
+277,560,140,0,0,0,0,0
 
 //-- SA_AUTOSPELL
-279,3000,0,0,120000:150000:180000:210000:240000:270000:300000:330000:360000:390000,0
+279,0,3000,0,0,0,120000:150000:180000:210000:240000:270000:300000:330000:360000:390000,0
 //-- SA_FLAMELAUNCHER
-280,3000,0,0,1200000:1200000:1200000:1200000:1800000,0
+280,0,3000,0,0,0,1200000:1200000:1200000:1200000:1800000,0
 //-- SA_FROSTWEAPON
-281,3000,0,0,1200000:1200000:1200000:1200000:1800000,0
+281,0,3000,0,0,0,1200000:1200000:1200000:1200000:1800000,0
 //-- SA_LIGHTNINGLOADER
-282,3000,0,0,1200000:1200000:1200000:1200000:1800000,0
+282,0,3000,0,0,0,1200000:1200000:1200000:1200000:1800000,0
 //-- SA_SEISMICWEAPON
-283,3000,0,0,1200000:1200000:1200000:1200000:1800000,0
+283,0,3000,0,0,0,1200000:1200000:1200000:1200000:1800000,0
 
 //-- SA_VOLCANO
-285,5000,0,0,60000:120000:180000:240000:300000,0
+285,4000,1000,0,0,0,60000:120000:180000:240000:300000,0
 //-- SA_DELUGE
-286,5000,0,0,60000:120000:180000:240000:300000,0
+286,4000,1000,0,0,0,60000:120000:180000:240000:300000,0
 //-- SA_VIOLENTGALE
-287,5000,0,0,60000:120000:180000:240000:300000,0
+287,4000,1000,0,0,0,60000:120000:180000:240000:300000,0
 //-- SA_LANDPROTECTOR
-288,5000,0,0,165000:210000:255000:300000:345000,0
+288,4000,1000,0,0,0,165000:210000:255000:300000:345000,0
 //-- SA_DISPELL
-289,2000,0,0,0,0
+289,1600,400,0,0,0,0,0
 //-- SA_REVERSEORCISH
-294,0,0,0,1200000,0
+294,0,0,0,0,0,1200000,0
 //==========================================
 
 
 //===== Bard & Dancer (Ensemble Skills) ====
 //-- BD_ADAPTATION
-304,0,0,0,0,5000
+304,0,0,0,0,0,0,5000
 
 //-- BD_LULLABY
-306,0,0,0,60000,15000
+306,0,0,0,0,0,60000,15000
 //-- BD_RICHMANKIM
-307,0,0,0,60000,60000
+307,0,0,0,0,0,60000,60000
 //-- BD_ETERNALCHAOS
-308,0,0,0,60000,60000
+308,0,0,0,0,0,60000,60000
 //-- BD_DRUMBATTLEFIELD
-309,0,0,0,60000,60000
+309,0,0,0,0,0,60000,60000
 //-- BD_RINGNIBELUNGEN
-310,0,0,0,60000,60000
+310,0,0,0,0,0,60000,60000
 //-- BD_ROKISWEIL
-311,0,0,0,60000,60000
+311,0,0,0,0,0,60000,60000
 //-- BD_INTOABYSS
-312,0,0,0,60000,60000
+312,0,0,0,0,0,60000,60000
 //-- BD_SIEGFRIED
-313,0,0,0,60000,60000
+313,0,0,0,0,0,60000,60000
 //==========================================
 
 
 //===== Bard ===============================
 //-- BA_MUSICALSTRIKE
-316,1500,0,0,0,0
+316,1200,300,0,0,0,0,0
 //-- BA_DISSONANCE
-317,0,0,0,30000,3000
+317,0,0,0,0,0,30000,3000
 //-- BA_FROSTJOKE
-318,0,3000,0,0,10000:11000:12000:13000:14000
+318,0,0,4000,0,0,0,10000:11000:12000:13000:14000
 //-- BA_WHISTLE
-319,0,0,0,60000,20000
+319,0,0,0,0,0,60000,20000
 //-- BA_ASSASSINCROSS
-320,0,0,0,120000,20000
+320,0,0,0,0,0,120000,20000
 //-- BA_POEMBRAGI
-321,0,0,0,180000,20000
+321,0,0,0,0,0,180000,20000
 //-- BA_APPLEIDUN
-322,0,0,0,180000,20000
+322,0,0,0,0,0,180000,20000
 //==========================================
 
 
 //===== Dancer =============================
 //-- DC_THROWARROW
-324,1500,0,0,0,0
+324,1200,300,0,0,0,0,0
 //-- DC_UGLYDANCE
-325,0,0,0,30000,3000
+325,0,0,0,0,0,30000,3000
 //-- DC_SCREAM
-326,0,3000,0,0,5000
+326,0,0,4000,0,0,0,5000
 //-- DC_HUMMING
-327,0,0,0,60000,20000
+327,0,0,0,0,0,60000,20000
 //-- DC_DONTFORGETME
-328,0,0,0,180000,20000
+328,0,0,0,0,0,180000,20000
 //-- DC_FORTUNEKISS
-329,0,0,0,120000,20000
+329,0,0,0,0,0,120000,20000
 //-- DC_SERVICEFORYOU
-330,0,0,0,180000,20000
+330,0,0,0,0,0,180000,20000
 //==========================================
 
 
 //===== Wedding Skills =====================
 //-- WE_MALE
-334,3000,0,0,0,0
+334,1500,1500,0,0,0,0,0
 //-- WE_FEMALE
-335,3000,0,0,0,0
+335,1500,1500,0,0,0,0,0
 //-- WE_CALLPARTNER
-336,0,0,0,20000,0
+336,0,0,0,0,0,20000,0
 //==========================================
 
 
 //===== NPC Skills Part 2 ==================
 //-- NPC_GRANDDARKNESS
-339,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
+339,2000,0,1500,0,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
 //-- NPC_STOP
-342,0,0,0,10000,0
+342,0,0,0,0,0,10000,0
 //-- NPC_CHANGEUNDEAD
-348,0,0,0,30000,0
+348,0,0,0,0,0,30000,0
 //-- NPC_POWERUP
-349,0,0,0,10000:15000:20000:25000:30000,0
+349,0,0,0,0,0,10000:15000:20000:25000:30000,0
 //-- NPC_AGIUP
-350,0,0,0,10000:15000:20000:25000:30000,0
+350,0,0,0,0,0,10000:15000:20000:25000:30000,0
 //-- NPC_INVISIBLE
-353,0,0,0,30000,0
+353,0,0,0,0,0,30000,0
 //-- NPC_RUN
-354,0,0:500:1000:1500:2000:2500,0,0,0
+354,0,0,0:500:1000:1500:2000:2500,0,0,0,0
 //==========================================
 
 
 //===== Lord Knight ========================
 //-- LK_AURABLADE
-355,0,0,0,40000:60000:80000:100000:120000,0
+355,0,0,0,0,0,40000:60000:80000:100000:120000,0
 //-- LK_PARRYING
-356,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0
+356,0,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0
 //-- LK_CONCENTRATION
-357,0,0,0,25000:30000:35000:40000:45000,0
+357,0,0,0,0,0,25000:30000:35000:40000:45000,0
 //-- LK_TENSIONRELAX
-358,0,0,0,180000,0
+358,0,0,0,0,0,180000,0
 //-- LK_BERSERK
-359,0,0,0,300000,15000
+359,0,0,0,0,0,300000,15000
 //-- LK_FURY
-360,0,0,0,300000,0
+360,0,0,0,0,0,300000,0
 //==========================================
 
 
 //===== High Priest ========================
 //-- HP_ASSUMPTIO
-361,1000:1500:2000:2500:3000,1100:1200:1300:1400:1500,0,20000:40000:60000:80000:100000,0
+361,800:1200:1600:2000:2400,200:300:400:500:600,1100:1200:1300:1400:1500,0,0,20000:40000:60000:80000:100000,0
 //-- HP_BASILICA
-362,5000:6000:7000:8000:9000,2000:3000:4000:5000:6000,0,20000:25000:30000:35000:40000,20000:25000:30000:35000:40000
+362,0,5000:6000:7000:8000:9000,2000:3000:4000:5000:6000,0,0,20000:25000:30000:35000:40000,20000:25000:30000:35000:40000
 //==========================================
 
 
 //===== High Wzard =========================
 //-- HW_MAGICCRASHER
-365,300,300,0,0,0
+365,240,60,300,0,0,0,0
 //-- HW_MAGICPOWER
-366,700,0,0,30000,0
+366,700,0,0,0,0,30000,0
 //==========================================
 
 
 //===== Paladin ============================
 //-- PA_PRESSURE
-367,2000:2500:3000:3500:4000,2000:2500:3000:3500:4000,0,0,2000:3000:4000:5000:6000
+367,1600,0,2000:2500:3000:3500:4000,400,0,0,2000:3000:4000:5000:6000
 //-- PA_SACRIFICE
-368,0,2000,0,0,0
+368,0,0,2000,0,0,0,0
 //-- PA_GOSPEL
-369,0,0,0,60000,60000
+369,0,0,0,0,0,60000,60000
 //==========================================
 
 
 //===== Champion ===========================
 //-- CH_PALMSTRIKE
-370,0,300,0,0,0
+370,0,0,300,0,0,0,0
 //-- CH_TIGERFIST
-371,0,700,0,0,2000:4000:6000:8000:10000
+371,0,0,700,0,0,0,2000:4000:6000:8000:10000
 //-- CH_CHAINCRUSH
-372,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,0
+372,0,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,0,0
 //==========================================
 
 
 //===== Professor ==========================
 //-- PF_HPCONVERSION
-373,0,1000:1200:1400:1600:1800,0,0,0
+373,0,0,1000:1200:1400:1600:1800,0,0,0,0
 //-- PF_SOULCHANGE
-374,3000,5000,0,0,0
+374,0,3000,5000,0,0,0,0
 //-- PF_SOULBURN
-375,0,0,0,0,0
+375,0,0,0,10000:10000:10000:10000:15000,0,0,0
 //==========================================
 
 
 //===== Assassin Cross =====================
 //-- ASC_EDP
-378,0,2000,0,40000:45000:50000:55000:60000,20000:30000:40000:50000:60000
+378,0,0,2000,0,0,40000:45000:50000:55000:60000,20000:30000:40000:50000:60000
 //-- ASC_BREAKER
-379,700,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0
+379,250,250,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0
 //==========================================
 
 
 //===== Sniper =============================
 //-- SN_SIGHT
-380,0,0,0,30000,0
+380,0,0,0,0,0,30000,0
 //-- SN_FALCONASSAULT
-381,1000,3000,0,0,0
+381,500,500,3000,0,0,0,0
 //-- SN_SHARPSHOOTING
-382,2000,1500,0,0,0
+382,1000,1000,1500,0,0,0,0
 //-- SN_WINDWALK
-383,2000:2400:2800:3200:3600:4000:4400:4800:5200:5600,2000,0,130000:160000:190000:220000:250000:280000:310000:340000:370000:400000,0
+383,1500:1800:2100:2400:2700:3000:3300:3600:3900:4200,500:600:700:800:900:1000:1100:1200:1300:1400,2000,0,0,130000:160000:190000:220000:250000:280000:310000:340000:370000:400000,0
 //==========================================
 
 
 //===== Whitesmith =========================
 //-- WS_MELTDOWN
-384,500:500:600:600:700:700:800:800:900:1000,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,5000
+384,0,500:500:600:600:700:700:800:800:900:1000,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,5000
+//-- WS_CREATECOIN
+//385,0,10:20:30:30:30:30:30:30:30:30,0,0,0,0,0
+//-- WS_CREATENUGGET
+//386,0,10:20:30:30:30:30:30:30:30:30,0,0,0,0,0
 
 //-- WS_CARTBOOST
-387,0,0,0,60000,0
+387,0,0,0,0,0,60000,0
 //==========================================
 
 
 //===== Stalker ============================
 //-- ST_CHASEWALK
-389,1200,0,0,10000,30000
+389,500,500,0,0,0,10000,30000
 //-- ST_REJECTSWORD
-390,0,0,0,300000,0
+390,0,0,0,0,0,300000,0
 //==========================================
 
 
 //===== Clown / Gypsy ======================
 //-- CG_ARROWVULCAN
-394,2000:2200:2400:2600:2800:3000:3200:3400:3600:3800,2800:2800:2800:2800:2800:3000:3000:3000:3000:3000,2000,0,0
+394,1600:1760:1920:2080:2240:2400:2560:2720:2880:3040,400:440:480:520:560:600:640:680:720:760,2000,0,2000,0,0
 //-- CG_MOONLIT
-395,0,0,0,20000:25000:30000:35000:40000,0
+395,0,0,0,0,0,20000:25000:30000:35000:40000,0
 //-- CG_MARIONETTE
-396,0,0,0,1000,0
+396,0,0,0,0,0,1000,0
 //==========================================
 
 //===== Mixed Advanced Skills ==============
 //-- LK_SPIRALPIERCE
-397,300:500:700:900:1000,1200:1400:1600:1800:2000,0,0,1000
+397,150:250:350:450:500,150:250:350:450:500,1200:1400:1600:1800:2000,0,0,0,1000
 //-- LK_HEADCRUSH
-398,0,500,0,0,120000
+398,0,0,500,0,0,0,120000
 //-- LK_JOINTBEAT
-399,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,30000
+399,0,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,0,30000
 //-- HW_NAPALMVULCAN
-400,1000,1000,0,0,45000
+400,800,200,1000,0,0,0,45000
 //-- CH_SOULCOLLECT
-401,2000,0,0,600000,0
+401,0,2000,0,0,0,600000,0
 //-- PF_MINDBREAKER
-402,0,800:900:1000:1100:1200,0,30000,0
+402,0,0,800:900:1000:1100:1200,0,0,30000,0
 //-- PF_MEMORIZE
-403,5000,0,0,0,0
+403,0,5000,0,0,0,0,0
 //-- PF_FOGWALL
-404,0,0,0,20000,10000
+404,0,0,0,0,0,20000,10000
 //-- PF_SPIDERWEB
-405,0,0,0,30000,8000
+405,0,0,0,0,0,30000,8000
 //-- ASC_METEORASSAULT (Upkeep2 times are duration of: blind(lv1), stun(lv2) or bleeding (lv3))
-406,500,500,0,0,10000:5000:120000
+406,250,250,500,0,0,0,10000:5000:120000
 //-- ASC_CDP
-407,0,500,0,0,0
+407,0,0,5000,0,0,0,0
 //==========================================
 
 
 //===== Adoption Skills ====================
 //-- WE_BABY
-408,3000,0,0,300000,0
+408,0,2000,0,0,0,300000,0
 //-- WE_CALLPARENT
-409,0,0,0,20000,0
+409,0,0,0,0,0,20000,0
 //-- WE_CALLBABY
-410,0,0,0,20000,0
+410,0,0,0,0,0,20000,0
 //==========================================
 
 
 //===== Taekwon ============================
 //-- TK_RUN
-411,6000:5000:4000:3000:2000:1000:0:0:0:0,0,0,1000,150000
+411,3000:2500:2000:1500:100:500:0:0:0:0,3000:2500:2000:1500:1000:500:0:0:0:0,300,0,0,1000,150000
 //-- TK_DOWNKICK
-415,0,0,0,0,3000
+415,0,0,0,0,0,0,3000
 //-- TK_TURNKICK
-417,0,0,0,0,2000
+417,0,0,0,0,0,0,2000
 //-- TK_SPTIME
-423,0,0,0,1800000,0
+423,0,0,0,0,0,1800000,0
 //-- TK_SEVENWIND
-425,0,0,0,300000,0
+425,0,0,0,0,0,300000,0
 //-- TK_HIGHJUMP
-426,5000:4000:3000:2000:1000,0,0,0,0
+426,2500:2000:1500:1000:500:500:500:500:500:500,2500:2000:1500:1000:500:500:500:500:500:500,0,0,0,0,0
 //==========================================
 
 //===== Star Gladiator =====================
 //-- SG_FEEL
-427,1000,0,0,0,0
+427,0,3000,0,0,0,0,0
 //SG_SUN_WARM
-428,0,1000,0,10000:20000:60000,0
+428,0,0,1000,0,0,10000:20000:60000,0
 //SG_MOON_WARM
-429,0,1000,0,10000:20000:60000,0
+429,0,0,1000,0,0,10000:20000:60000,0
 //SG_STAR_WARM
-430,0,1000,0,10000:20000:60000,0
+430,0,0,1000,0,0,10000:20000:60000,0
 //SG_SUN_COMFORT
-431,0,1000,0,80000:160000:240000:320000,0
+431,0,0,1000,0,0,80000:160000:240000:320000,0
 //SG_MOON_COMFORT
-432,0,1000,0,80000:160000:240000:320000,0
+432,0,0,1000,0,0,80000:160000:240000:320000,0
 //SG_STAR_COMFORT
-433,0,1000,0,80000:160000:240000:320000,0
+433,0,0,1000,0,0,80000:160000:240000:320000,0
 //-- SG_HATE
-434,1000,0,0,0,0
+434,0,3000,0,0,0,0,0
 //SG_FRIEND
-442,0,0,0,10000,0
+442,0,0,0,0,0,10000,0
 //SG_KNOWLEDGE
-443,0,0,0,600000,0
+443,0,0,0,0,0,600000,0
 //SG_FUSION
-444,0,1000,0,600000,0
+444,0,0,1000,0,0,600000,0
 //==========================================
 
 //===== Soul Linker ========================
 //-- SL_ALCHEMIST
-445,1000,500,0,150000:200000:250000:300000:350000,0
+445,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- AM_BERSERKPITCHER - Copy of AM_POTIONPITCHER for now
-446,0,500,0,0,0
+446,0,1000,500,0,0,0,0
 //-- SL_MONK
-447,1000,500,0,150000:200000:250000:300000:350000,0
+447,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_STAR
-448,1000,500,0,150000:200000:250000:300000:350000,0
+448,800,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_SAGE
-449,1000,500,0,150000:200000:250000:300000:350000,0
+449,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_CRUSADER
-450,1000,500,0,150000:200000:250000:300000:350000,0
+450,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_SUPERNOVICE
-451,1000,500,0,150000:200000:250000:300000:350000,0
+451,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_KNIGHT
-452,1000,500,0,150000:200000:250000:300000:350000,0
+452,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_WIZARD
-453,1000,500,0,150000:200000:250000:300000:350000,0
+453,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_PRIEST
-454,1000,500,0,150000:200000:250000:300000:350000,0
+454,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_BARDDANCER
-455,1000,500,0,150000:200000:250000:300000:350000,0
+455,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_ROGUE
-456,1000,500,0,150000:200000:250000:300000:350000,0
+456,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_ASSASSIN
-457,1000,500,0,150000:200000:250000:300000:350000,0
+457,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_BLACKSMITH
-458,1000,500,0,150000:200000:250000:300000:350000,0
+458,0,1000,500,0,0,150000:200000:250000:300000:350000,0
 //-- BS_ADRENALINE2
-459,0,0,0,150000,0
+459,0,0,0,0,0,150000,0
 //-- SL_HUNTER
-460,1000,500,0,150000:200000:250000:300000:350000,0
+460,0,0,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_SOULLINKER
-461,1000,500,0,150000:200000:250000:300000:350000,0
+461,0,0,500,0,0,150000:200000:250000:300000:350000,0
 //-- SL_KAIZEL
-462,4500:4000:3500:3000:2500:2000:1500,0,0,1800000,2000
+462,3600:3200:2800:2400:2000:2000:2000,900:800:700:600:500:500:500,0,0,0,1800000,2000
 //-- SL_KAAHI
-463,0,500,0,1800000,500
+463,0,0,500,0,0,1800000,500
 //-- SL_KAUPE
-464,500,500,0,600000,0
+464,400,100,500,0,0,600000,0
 //-- SL_KAITE
-465,6000:5500:5000:4500:4000:3500:3000,0,0,60000:120000:180000:240000:300000:360000:600000,0
+465,4800:4400:4000:3600:3200:2800:2400,1200:1100:1000:900:800:700:600,0,0,0,60000:120000:180000:240000:300000:360000:600000,0
 //-- SL_STIN
-467,100,500,0,0,0
+467,80,20,500,0,0,0,0
 //-- SL_STUN
-468,100,500,0,2000,0
+468,80,20,500,0,0,2000,0
 //-- SL_SMA
-469,2000,500,0,3000,0
+469,1600,400,500,0,0,3000,0
 //-- SL_SWOO
-470,1000,500,0,1000:2000:3000:4000:5000:6000:7000,0
+470,800,200,500,0,0,1000:2000:3000:4000:5000:6000:7000,0
 //-- SL_SKE
-471,3000:2000:1000,500,0,10000:20000:30000,3000
+471,2400:1600:800,600:400:200,500,0,0,10000:20000:30000,3000
 //-- SL_SKA
-472,3000:2000:1000,500,0,10000:20000:30000,0
+472,2400:1600:800,600:400:200,500,0,0,10000:20000:30000,0
 //==========================================
 //-- SM_SELFPROVOKE
-473,0,0,0,30000,0
+473,0,0,0,0,0,30000,0
 
 //===== Mixed Advanced Skills ==============
 //-- ST_PRESERVE
-475,1000,0,0,600000,0
+475,0,1000,0,0,0,600000,0
 //-- ST_FULLSTRIP
-476,0,1000,0,75000:90000:105000:120000:135000,0
+476,0,0,1000,0,0,75000:90000:105000:120000:135000,0
 
 //-- CR_SLIMPITCHER
-478,1000,1000,0,0,0
+478,1000,1000,1000,0,0,0,0
 //-- CR_FULLPROTECTION
-479,2000,0,0,120000:240000:360000:480000:600000,0
+479,0,1000,500,0,0,120000:240000:360000:480000:600000,0
 //-- PA_SHIELDCHAIN
-480,1000,1000,0,0,0
+480,800,200,1000,0,0,0,0
 //-- PF_DOUBLECASTING
-482,2000,0,0,90000,0
+482,1600,400,0,0,0,90000,0
 //-- HW_GANBANTEIN
-483,3000,2000,0,0,0
+483,0,3000,5000,0,0,0,0
 //-- HW_GRAVITATION
-484,5000,2000,0,5000:6000:7000:8000:9000,0
+484,0,5000,2000,5000:6000:7000:8000:9000,0,5000:6000:7000:8000:9000,0
 //-- WS_CARTTERMINATION
-485,0,0,0,0,5000
+485,0,0,0,0,0,0,5000
 //-- WS_OVERTHRUSTMAX
-486,0,0,0,180000,0
+486,0,0,0,0,0,180000,0
 //-- CG_LONGINGFREEDOM
-487,0,0,0,180000,0
+487,0,0,0,0,0,180000,0
 //-- CG_HERMODE
-488,0,0,0,10000:15000:20000:25000:30000,10000:15000:20000:25000:30000
+488,0,0,0,0,0,10000:15000:20000:25000:30000,10000:15000:20000:25000:30000
 //-- CG_TAROTCARD
-489,1000,3000,0,0,30000
+489,500,500,3000,0,0,0,30000
 //-- CR_ACIDDEMONSTRATION
-490,1000,1000,0,0,0
+490,0,1000,1000,0,0,0,0
 //-- CR_CULTIVATION
-491,0,0,0,300000,0
+491,0,0,0,0,0,300000,0
 //==========================================
 
 //-- ITEM_ENCHANTARMS
-492,0,0,0,180000,0
+492,0,0,0,0,0,180000,0
 
 //===== Mixed Taekwon Skills ===============
 //-- TK_MISSION
-493,1000,0,0,0,0
+493,0,1000,0,0,0,0,0
 //-- SL_HIGH
-494,1000,500,0,150000:200000:250000:300000:350000,0
+494,1000,0,500,0,0,150000:200000:250000:300000:350000,0
 //-- KN_ONEHAND
-495,0,0,0,300000,0
+495,0,0,0,0,0,300000,0
 //-- AM_TWILIGHT1
-496,3000,10000,0,0,0
+496,3000,3000,10000,0,0,0,0
 //-- AM_TWILIGHT2
-497,3000,10000,0,0,0
+497,3000,3000,10000,0,0,0,0
 //-- AM_TWILIGHT3
-498,3000,10000,0,0,0
+498,3000,3000,10000,0,0,0,0
 //-- HT_POWER
-499,0,0,0,100,0
+499,0,0,100,0,0,0,0
 //==========================================
 
 
 //===== Gunslinger =========================
 //-- GS_GLITTERING
-500,0,0,0,600000,0
+500,0,0,0,0,0,600000,0
 //-- GS_FLING
-501,0,0,0,30000,0
+501,0,0,0,0,0,30000,0
+//-- GS_TRIPLEACTION
+502,0,0,1000,0,0,0,0
 //-- GS_BULLSEYE
-503,500,0,0,0,0
+503,800,200,1000,0,0,0,0
 //-- GS_MADNESSCANCEL
-504,3000,4000,0,15000,0
+504,1600,400,3000,0,0,15000,0
 //-- GS_ADJUSTMENT
-505,1000,1000,0,30000,0
+505,800,200,2000,0,0,30000,0
 //-- GS_INCREASING
-506,0,1000,0,60000,0
+506,0,0,1000,0,0,60000,0
+//-- GS_MAGICALBULLET
+507,0,0,500,0,0,0,0
 //-- GS_CRACKER
-508,0,1000,0,0,5000
+508,0,0,1000,0,0,0,5000
 //-- GS_TRACKING
-512,1200:1400:1600:1800:2000:2200:2400:2600:2800:3000,0,0,0,0
+512,600:700:800:900:1000:1100:1200:1300:1400:1500,600:700:800:900:1000:1100:1200:1300:1400:1500,1500,0,0,0,0
 //-- GS_DISARM
-513,0,0,0,30000,0
+513,1600,400,1000,0,0,30000,0
 //-- GS_PIERCINGSHOT
-514,1500,0,0,0,120000
+514,1200,200,500,0,0,0,120000
 //-- GS_RAPIDSHOWER
-515,0,1000,0,0,0
+515,0,0,1500,0,0,0,0
 //-- GS_DESPERADO
-516,0,1000,1000,1000,0
+516,0,0,1000,0,1000,1000,0
 //-- GS_GATLINGFEVER
-517,0,0,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0
+517,800,200,1000,0,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0
 //-- GS_DUST
-518,1000,1000,0,0,0
+518,1200,300,1000,0,0,0,0
 //-- GS_FULLBUSTER
-519,0,1200:1400:1600:1800:2000:2200:2400:2600:2800:3000,0,0,10000
+519,800,200,1200:1400:1600:1800:2000:2200:2400:2600:2800:3000,0,0,0,10000
+//-- GS_SPREADATTACK
+520,800,200,1000,0,0,0,0
 //-- GS_GROUNDDRIFT
-521,2000,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,10000
+521,800,200,1000,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,10000
 //==========================================
 
 
 //===== Ninja ==============================
 //-- NJ_KUNAI
-524,0,1000,0,0,0
+524,0,0,1000,0,0,0,0
 //-- NJ_HUUMA
-525,3000,2000,0,0,0
+525,2400,600,2000,0,0,0,0
 //-- NJ_ZENYNAGE
-526,0,5000,0,0,0
+526,0,0,5000,0,0,0,0
 //-- NJ_TATAMIGAESHI
-527,0,3000,0,3000,3000
+527,0,0,3000,0,0,3000,3000
 //-- NJ_KASUMIKIRI
-528,0,1000,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
+528,0,0,1000,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
 //-- NJ_SHADOWJUMP
-529,0,1000,0,0,0
-//-- NJ_KIRIKAGE // Seems to have no delay (English Translation Project)
-530,0,0,0,0,0
+529,0,0,1000,0,0,0,0
+//-- NJ_KIRIKAGE
+530,0,0,0,0,0,0,0
 //-- NJ_UTSUSEMI
-531,0,1000,0,20000:30000:40000:50000:60000,0
+531,0,0,1000,0,0,20000:30000:40000:50000:60000,0
 //-- NJ_BUNSINJYUTSU
-532,4000:3500:3000:2500:2000:1500:1000:1000:1000:1000,1000,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
+532,3200:2800:2400:2000:1600:1200:800:800:800:800,800:700:600:500:400:300:200:200:200:200,2000,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
 //-- NJ_KOUENKA
-534,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,0,0,0,0
+534,560:1120:1680:2240:2800:3360:3840:4480:5040:5600,140:280:420:560:700:840:960:1120:1260:1400,0,0,0,0,0
 //-- NJ_KAENSIN
-535,6000:5500:5000:4500:4000:3500:3000:2500:2000:1500,1000,0,20000,0
+535,4800:4400:4000:3600:3200:2800:2400:2000:1600:1200,1200:1100:1000:900:800:700:600:500:400:300,1000,0,0,20000,0
 //-- NJ_BAKUENRYU
-536,3000,2000,0,0,0
+536,2400,600,2000,0,0,0,0
 //-- NJ_HYOUSENSOU
-537,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,0,0,0,0
+537,560:1120:1680:2240:2800:3360:3840:4480:5040:5600,140:280:420:560:700:840:960:1120:1260:1400,0,0,0,0,0
 //-- NJ_SUITON
-538,3000,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000
+538,2400,600,2000,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000
 //-- NJ_HYOUSYOURAKU
-539,2000:2500:3000:3500:4000,2000,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
+539,1600:2000:2400:2800:3200:3200:3200:3200:3200:3200,400:500:600:700:800:800:800:800:800:800,2000,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
 //-- NJ_HUUJIN
-540,1000:1500:2000:2500:3000:3500:4000:5000:5500:6000,1000,0,0,0
+540,800:1200:1600:2000:2400:2800:3200:3600:4000:4400,200:300:400:500:600:700:800:900:1000:1100,1000,0,0,0,0
 //-- NJ_RAIGEKISAI
-541,4000,0,0,0,0
+541,3200,800,0,0,0,0,0
 //-- NJ_KAMAITACHI
-542,4000,0,0,0,0
+542,3200,800,0,0,0,0,0
 //-- NJ_NEN
-543,5000:4000:3000:2000:1000,0,0,30000:45000:60000:75000:90000,0
+543,4000:3200:2400:1600:800,800:600:400:200,0,0,0,30000:45000:60000:75000:90000,0
+//-- NJ_ISSEN
+544,0,0,3000,0,0,0,0
 //==========================================
 
 //===== New Monster Skills =================
 //-- NPC_ICEBREATH
-655,0,0,0,0,12000
+655,0,0,0,0,0,0,12000
 //-- NPC_ACIDBREATH
-657,0,0,0,0,60000
+657,0,0,0,0,0,0,60000
 //-- NPC_DRAGONFEAR (Upkeep2 times are duration of: Stun(lv1), Silence(lv2), Confusion(lv3) and Bleeding(lv4))
-659,0,0,0,0,5000:30000:30000:120000
+659,0,0,0,0,0,0,5000:30000:30000:120000
 //-- NPC_BLEEDING
-660,0,0,0,0,120000
+660,0,0,0,0,0,0,120000
 //-- NPC_HELLJUDGEMENT
-662,0,0,0,0,30000
+662,0,0,0,0,0,0,30000
 //-- NPC_WIDESILENCE
-663,0,0,0,0,30000
+663,0,0,0,0,0,0,30000
 //-- NPC_WIDEFREEZE
-664,0,0,0,0,12000
+664,0,0,0,0,0,0,12000
 //-- NPC_WIDEBLEEDING
-665,0,0,0,0,120000
+665,0,0,0,0,0,0,120000
 //-- NPC_WIDESTONE
-666,0,0,0,0,20000
+666,0,0,0,0,0,0,20000
 //-- NPC_WIDECONFUSE
-667,0,0,0,0,30000
+667,0,0,0,0,0,0,30000
 //-- NPC_WIDESLEEP
-668,0,0,0,0,30000
+668,0,0,0,0,0,0,30000
 //-- NPC_WIDESIGHT
-669,0,0,0,10000,0
+669,0,0,0,0,0,10000,0
 //-- NPC_EVILLAND
-670,0,0,0,30000,30000
+670,0,0,0,0,0,30000,30000
 //-- NPC_MAGICMIRROR
-671,0,0,0,30000,0
+671,0,0,0,0,0,30000,0
 //-- NPC_SLOWCAST
-672,0,0,0,0,30000
+672,0,0,0,0,0,0,30000
 //-- NPC_CRITICALWOUND
-673,0,0,0,0,30000
+673,0,0,0,0,0,0,30000
 //-- NPC_STONESKIN
-675,0,0,0,30000,0
+675,0,0,0,0,0,30000,0
 //-- NPC_ANTIMAGIC
-676,0,0,0,30000,0
+676,0,0,0,0,0,30000,0
 //-- NPC_WIDECURSE
-677,0,0,0,0,30000
+677,0,0,0,0,0,0,30000
 //-- NPC_WIDESTUN
-678,0,0,0,0,5000
+678,0,0,0,0,0,0,5000
 //==========================================
 
 //===== New Monster Skills (12.1) ==========
 //-- NPC_HELLPOWER
-683,0,0,0,0,300000
+683,0,0,0,0,0,0,300000
 //-- NPC_WIDEHELLDIGNITY
-684,0,0,0,0,300000
+684,0,0,0,0,0,0,300000
 //-- NPC_INVINCIBLE
-685,0,0,0,-1,0
+685,0,0,0,0,0,-1,0
 //-- NPC_INVINCIBLEOFF
-686,0,0,0,60000,0
+686,0,0,0,0,0,60000,0
 
 //===== Item Use-Only Skills ===============
 //-- CASH_BLESSING
-689,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
+689,0,0,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
 //-- CASH_INCAGI
-690,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
+690,0,0,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
 //-- CASH_ASSUMPTIO
-691,0,0,0,20000:40000:60000:80000:100000,0
+691,0,0,0,0,0,20000:40000:60000:80000:100000,0
+//-- ALL_CATCRY
+//692,0,0,5000,0,0,0,0
+//-- ALL_PARTYFLEE
+693,0,0,0,0,0,300000,0
+//-- ALL_DREAM_SUMMERNIGHT
+//695,0,0,12000,0,0,0,0
 //-- ALL_WEWISH
-698,0,20000,0,0,0
+698,0,0,20000,0,0,0,0
 //==========================================
 
 //===== 2nd Jobs Quest Skills ==============
 //-- KN_CHARGEATK
-1001,300,300,0,0,0
+1001,250,250,300,0,0,0,0
 //-- CR_SHRINK
-1002,0,0,0,300000,0
+1002,0,0,0,0,0,300000,0
 
 //-- AS_VENOMKNIFE
-1004,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000
+1004,0,0,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000
 //-- RG_CLOSECONFINE
-1005,0,0,0,10000,0
+1005,0,0,0,0,0,10000,0
 //-- WZ_SIGHTBLASTER
-1006,2000,0,0,120000,0
+1006,1280,320,0,0,0,120000,0
 
 //-- SA_ELEMENTWATER
-1008,2000,1000,0,1800000,0
+1008,2000,0,1000,0,0,1800000,0
 //-- HT_PHANTASMIC
-1009,0,0,0,0,0
+1009,0,0,0,0,0,0,0
 //-- BA_PANGVOICE
-1010,1000,2000,0,17000,0
-//-- DC_WINKCHARM (time1: Charm, time2: Confusion)
-1011,1000,2000,0,10000,17000
+1010,800,200,2000,0,0,17000,0
+//-- DC_WINKCHARM (time1: Charm,time2: Confusion)
+1011,800,200,2000,0,0,10000,17000
 
 //-- BS_GREED
-1013,0,1000,0,0,0
+1013,0,0,1000,0,0,0,0
 //-- PR_REDEMPTIO
-1014,4000,0,0,0,0
+1014,3200,800,0,0,0,0,0
 //-- MO_KITRANSLATION
-1015,2000,1000,0,600000,0
+1015,1000,1000,1000,0,0,600000,0
 //-- MO_BALKYOUNG
-1016,0,2000,0,0,2000
+1016,0,0,2000,0,0,0,2000
 //-- SA_ELEMENTGROUND
-1017,2000,1000,0,1800000,0
+1017,2000,2000,1000,0,0,1800000,0
 //-- SA_ELEMENTFIRE
-1018,2000,1000,0,1800000,0
+1018,2000,2000,1000,0,0,1800000,0
 //-- SA_ELEMENTWIND
-1019,2000,1000,0,1800000,0
+1019,2000,2000,1000,0,0,1800000,0
 //==========================================
 
+
+//===== Archbishop =========================
+//-- AB_JUDEX
+2038,2000,500,500,0,0,0,0
+//-- AB_ANCILLA
+2039,1000,0,1000,0,0,0,0
+//-- AB_ADORAMUS
+//Duration1 - Lifetime of SC_BLIND; Duration2 - Lifetime of SC_ADORAMUS;
+2040,2000,0,500,2000,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000
+//-- AB_CLEMENTIA
+2041,3000,1000,0,0,0,120000:180000:240000,0
+//-- AB_CANTO
+2042,3000,1000,0,0,0,120000:180000:240000,0
+//-- AB_CHEAL
+2043,3000,1000:500:0,0,1000:2000:3000,0,0,0
+//-- AB_EPICLESIS
+2044,4000:4500:5000:5500:6000,2000,2000,60000,0,18000:21000:24000:27000:30000,0
+//-- AB_PRAEFATIO
+2045,2000,1000,0,13000:16000:19000:22000:25000:28000:31000:34000:37000:40000,0,120000,0
+//-- AB_ORATIO
+2046,4000,1000,0,2000,0,30000,0
+//-- AB_LAUDAAGNUS
+2047,1000,0,0,3000,0,60000,0
+//-- AB_LAUDARAMUS
+2048,1000,0,0,3000,0,60000,0
+//-- AB_RENOVATIO
+2050,3000,2000,0,1000,0,90000,0
+//-- AB_HIGHNESSHEAL
+2051,1000,0,1000,3000:6000:9000:12000:15000,0,0,0
+//-- AB_CLEARANCE
+2052,4000,0,0,10000,0,0,0
+//-- AB_EXPIATIO
+2053,1000,1000,0,0,0,150000:180000:210000:240000:270000,0
+//-- AB_DUPLELIGHT
+2054,2000,2000,1000,0,0,90000:120000:150000:180000:210000:240000:270000:300000:330000:360000,0
+//-- AB_SILENTIUM
+2057,4000,0,0,15000,0,20000:30000:40000:50000:60000,0
+
+//-- AB_SECRAMENT
+2515,1000,0,500,0,0,60000:90000:120000:150000:180000,0
+//==========================================
+
+
 //===== Homunculus Skills ==================
 //-- HLIF_HEAL
-8001,0,2000,0,0,0
+8001,0,0,2000,0,0,0,0
 //-- HLIF_AVOID
-8002,0,35000,0,40000:35000:30000:25000:20000,0
+8002,0,0,35000,0,0,40000:35000:30000:25000:20000,0
 //-- HLIF_CHANGE
-8004,0,600000:900000:1200000,0,60000:120000:180000,0
+8004,0,0,600000:900000:1200000,0,0,60000:120000:180000,0
 //-- HAMI_CASTLE
-8005,0,0,0,0,60000:70000:80000:90000:129000
+8005,0,0,0,0,0,0,60000:70000:80000:90000:129000
 //-- HAMI_DEFENCE
-8006,0,0,0,40000:35000:30000:25000:20000,0
+8006,0,0,0,0,0,40000:35000:30000:25000:20000,0
 //-- HAMI_BLOODLUST
-8008,0,0,0,60000:180000:300000,300000:600000:900000
+8008,0,0,0,0,0,60000:180000:300000,300000:600000:900000
 //-- HFLI_MOON
-8009,0,0,1000,0,0
+8009,0,0,0,0,1000,0,0
 //-- HFLI_FLEET
-8010,0,0,0,60000:55000:50000:45000:40000,60000:70000:80000:90000:120000
+8010,0,0,0,0,0,60000:55000:50000:45000:40000,60000:70000:80000:90000:120000
 //-- HFLI_SPEED
-8011,0,0,0,60000:55000:50000:45000:40000,60000:70000:80000:90000:120000
+8011,0,0,0,0,0,60000:55000:50000:45000:40000,60000:70000:80000:90000:120000
 //-- HVAN_CAPRICE
-8013,0,1000:1200:1400:1600:1800,0,0,0
+8013,0,0,1000:1200:1400:1600:1800,0,0,0,0
 //-- HVAN_CHAOTIC
-8014,0,1000,1000,0,0
+8014,0,0,1000,0,1000,0,0
 //-- HVAN_EXPLOSION
-8016,0,0,1000,0,0
+8016,0,0,0,0,1000,0,0
 //==========================================
+// global skill delays - homun skills
+//HAMI_CASTLE 1000:1000:1000:1000:1000
+//HAMI_DEFENCE 30000:30000:30000:30000:30000
+//HAMI_SKIN 1000:1000:1000:1000:1000
+//HAMI_BLOODLUST 300000:600000:900000
+//HFLI_MOON 2000:2000:2000:2000:2000
+//HFLI_FLEET 60000:75000:90000:105000:120000
+//HFLI_SPEED 60000:75000:90000:105000:120000
+//HFLI_SBR44 1000:1000:1000
+//HLIF_HEAL 20000:20000:20000:20000:20000
+//HLIF_AVOID 35000:35000:35000:35000:35000
+//HLIF_CHANGE 600000:900000:1200000
+//HVAN_CAPRICE 2000:2200:2400:2600:2800
+//HVAN_CHAOTIC 3000:3000:3000:3000:3000
+//HVAN_EXPLOSION 1000:1000:1000
 
 //===== Mercenary Skills ===================
+//-- MS_BASH
+8201,0,0,800,0,0,0,0
 //-- MS_MAGNUM
-8202,0,0,0,2000,10000
-//-- KN_BOWLINGBASH
-8203,700,0,0,0,0
-//-- LK_PARRYING
-8204,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0
-//-- CR_REFLECTSHIELD
-8205,0,0,0,300000,0
+8202,0,0,1500,0,0,2000,10000
+//-- MS_BOWLINGBASH
+8203,400,100,2500,0,0,0,0
+//-- MS_PARRYING
+8204,0,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0
+//-- MS_REFLECTSHIELD
+8205,0,0,0,0,0,300000,0
 //-- MS_BERSERK
-8206,0,0,0,300000,15000
+8206,0,0,0,0,0,300000,15000
 //-- MA_DOUBLE
-8207,0,0,0,100,0
+8207,0,0,1000,0,100,0,0
 //-- MA_SHOWER
-8208,0,0,0,100,0
+8208,0,0,1200,0,0,100,0
 //-- MA_SKIDTRAP
-8209,0,0,0,300000:240000:180000:120000:60000,0
+8209,0,0,0,0,0,300000:240000:180000:120000:60000,0
 //-- MA_LANDMINE
-8210,0,0,0,200000:160000:120000:80000:40000,5000
+8210,0,0,0,0,0,200000:160000:120000:80000:40000,5000
 //-- MA_SANDMAN
-8211,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000
+8211,0,0,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000
 //-- MA_FREEZINGTRAP
-8212,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000
+8212,0,0,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000
 //-- MA_CHARGEARROW
-8214,1500,0,0,0,0
+8214,750,750,1000,0,0,0,0
 //-- MA_SHARPSHOOTING
-8215,2000,1500,0,0,0
+8215,1000,1000,2500,0,0,0,0
+//-- ML_PIERCE
+8216,0,0,1000,0,0,0,0
 //-- ML_BRANDISHSPEAR
-8217,700,0,0,0,0
+8217,350,350,1200,0,0,0,0
 //-- ML_SPIRALPIERCE
-8218,300:500:700:900:1000,1200:1400:1600:1800:2000,0,0,1000
+8218,150:250:350:450:500,150:250:350:450:500,2500,0,0,0,1000
 //-- ML_DEFENDER
-8219,0,800,0,180000,0
+8219,0,1500,800,0,0,180000,0
 //-- ML_AUTOGUARD
-8220,0,0,0,300000,0
+8220,0,0,0,0,0,300000,0
 //-- ML_DEVOTION
-8221,3000,0,0,0,30000:45000:60000:75000:90000
+8221,1500,0,0,0,0,0,30000:45000:60000:75000:90000
 //-- MER_MAGNIFICAT
-8222,4000,2000,0,30000:45000:60000:75000:90000,0
+8222,3200,800,2000,0,0,30000:45000:60000:75000:90000,0
 //-- MER_QUICKEN
-8223,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
+8223,0,0,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
 //-- MER_SIGHT
-8224,0,0,0,10000,0
+8224,0,0,0,0,0,10000,0
 //-- MER_CRASH
-8225,1000,2000,0,0,5000
+8225,1000,0,2000,0,0,0,5000
 //-- MER_PROVOKE
-8232,0,0,0,30000,0
+8232,0,0,0,0,0,30000,0
 //-- MER_DECAGI
-8234,1000,1000,0,40000:50000:60000:70000:80000:90000:100000:110000:120000:130000,0
+8234,800,200,1000,0,0,40000:50000:60000:70000:80000:90000:100000:110000:120000:130000,0
 //-- MER_SCAPEGOAT
-8235,3000,0,0,0,0
+8235,3000,0,0,0,0,0,0
 //-- MER_LEXDIVINA
-8236,0,3000,0,30000:35000:40000:45000:50000:60000:60000:60000:60000:60000,0
+8236,0,0,3000,0,0,30000:35000:40000:45000:50000:60000:60000:60000:60000:60000,0
 //-- MER_KYRIE
-8238,2000,2000,0,120000,0
+8238,2000,0,2000,0,0,120000,0
 //-- MER_BLESSING
-8239,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
+8239,0,0,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
 //-- MER_INCAGI
-8240,1000,1000,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
+8240,1000,0,1000,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
 //==========================================
 
 //===== Guild Skills =======================
 //-- GD_LEADERSHIP
-10006,0,0,0,300000,0
+10006,0,0,0,0,0,300000,0
 //-- GD_GLORYWOUNDS
-10007,0,0,0,300000,0
+10007,0,0,0,0,0,300000,0
 //-- GD_SOULCOLD
-10008,0,0,0,300000,0
+10008,0,0,0,0,0,300000,0
 //-- GD_HAWKEYES
-10009,0,0,0,300000,0
+10009,0,0,0,0,0,300000,0
 //-- GD_BATTLEORDER
-10010,0,0,0,60000,300000
+10010,0,0,0,0,0,60000,300000
 //-- GD_REGENERATION
-10011,0,0,0,60000,300000
+10011,0,0,0,0,0,60000,300000
 //-- GD_RESTORE
-10012,10000,0,0,0,300000
+10012,0,10000,0,0,0,0,300000
 //-- GD_EMERGENCYCALL
-10013,5000,0,0,0,300000
+10013,0,5000,0,0,0,0,300000
 //==========================================
+
+//-- ALL_TIMEIN
+//xxx,0,1000,0,0,0,0,0
\ No newline at end of file