summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-01-01 16:56:29 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-01-01 16:56:29 +0000
commit586bff9eeea827d340cbe5ed67be7ee2cf9b24a6 (patch)
treec35c41f6a7f68f96742ffa17859dd8f15bb61c94
parente3b4f8c0367635534990a79cf896a7973e4764e1 (diff)
downloadhercules-586bff9eeea827d340cbe5ed67be7ee2cf9b24a6.tar.gz
hercules-586bff9eeea827d340cbe5ed67be7ee2cf9b24a6.tar.bz2
hercules-586bff9eeea827d340cbe5ed67be7ee2cf9b24a6.tar.xz
hercules-586bff9eeea827d340cbe5ed67be7ee2cf9b24a6.zip
Update NJ_ISSEN to its official RE behavior.(bugreport:6114, bugreport:5426)
Fixed bugreport:6688 MO_EXTRIMITYFIST skill effect. Updated all non 3rd job skills to there official RE cast time delays. Updated WL_WHITEIMPRISON where cooldown should trigger whether success or not. Added missing status icon for SC_MATKPOTION and SC_ATKPOTION. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17069 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/re/skill_cast_db.txt1054
-rw-r--r--db/re/skill_db.txt2
-rw-r--r--src/map/battle.c33
-rw-r--r--src/map/skill.c103
-rw-r--r--src/map/status.c2
-rw-r--r--src/map/status.h4
6 files changed, 600 insertions, 598 deletions
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index 0e592fee5..1bb0b4801 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -20,85 +20,85 @@
//===== Swordman ===========================
//-- SM_PROVOKE
-6,0,0,0,30000,0,1000,0
+6,0,0,0,30000,0,0,-1
//-- SM_MAGNUM
-7,0,0,0,2000,10000,2000,0
+7,0,2000,0,2000,10000,0,-1
//-- SM_ENDURE
-8,0,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,10000,10000,0
+8,0,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,10000,10000,-1
//==========================================
//===== Mage ===============================
//-- MG_SIGHT
-10,0,0,0,10000,0,0,0
+10,0,0,0,10000,0,0,-1
//-- MG_NAPALMBEAT
-11,1000,1000:1000:1000:900:900:800:800:700:600:500,0,0,0,0,0
+11,500,1000:1000:1000:900:900:800:800:700:600:500,0,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,0,0
+12,4000:3600:3200:2800:2400:2000:1600:1200:800:400,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0,0,0
//-- MG_SOULSTRIKE
-13,500,1200:1000:1400:1200:1600:1400:1800:1600:2000:1800,0,0,0,0,0
+13,500,1200:1200:1600:1600:2000:2000:2400:2400:2800:2500,0,0,0,0,0
//-- MG_COLDBOLT
-14,350:700:1050:1400:1750:2100:2450:2800:3150:3500,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,0
-//-- MG_FROSTDRIVER
+14,800:1200:1600:2000:2400:3600:4000:4400,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,0
+//-- MG_FROSTDIVER
15,800,1500,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,0,0
//-- MG_STONECURSE
16,1000,0,0,5000,20000,0,0
//-- 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,0,0
+17,1600:1600:1600:1600:1600:1000:1000:1000:1000:1000,1500:1500:1500:1500:1500:1000:1000:1000:1000:1000,0,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,0,0
+18,2000:1800:1600:1400:1200:1100:1000:900:800:700,0,0,5000:6000:7000:8000:9000:10000:11000:12000:13000:14000,0,0,0
//-- MG_FIREBOLT
-19,350:700:1050:1400:1750:2100:2450:2800:3150:3500,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,0
+19,800:1200:1600:2000:2400:3600:4000:4400,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,0
//-- MG_LIGHTNINGBOLT
-20,350:700:1050:1400:1750:2100:2450:2800:3150:3500,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,0
+20,800:1200:1600:2000:2400:3600:4000:4400,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,0
//-- MG_THUNDERSTORM
-21,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,2000,0,500,0,0,0
+21,800:1600:2400:3200:4000:4800:5600:6400:7200:8000,2000,0,500,0,0,0
//==========================================
//===== Acolyte ============================
//-- AL_RUWACH
-24,0,0,0,10000,0,0,0
+24,0,0,0,10000,0,0,-1
//-- AL_PNEUMA
-25,0,0,0,10000,0,0,0
+25,0,0,0,10000,0,0,-1
//-- AL_TELEPORT
-26,0,0,0,0,0,0,0
+26,0,0,0,0,0,0,-1
//-- AL_WARP
-27,1000,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0,0,0
+27,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0,0,1000
//-- AL_HEAL
-28,0,1000,0,0,0,0,0
+28,0,1000,0,0,0,0,-1
//-- AL_INCAGI
29,1000,1000,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,0
//-- AL_DECAGI
-30,1000,1000,0,40000:50000:60000:70000:80000:90000:100000:110000:120000:130000,0,0,0
+30,750,1000,0,40000:50000:60000:70000:80000:90000:100000:110000:120000:130000,0,0,250
//-- AL_HOLYWATER
31,1000,500,0,0,0,0,0
//-- AL_CRUCIS
-32,500,2000,0,0,0,0,0
-//-- AL ANGELUS
-33,500,3500,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,0
+32,350,2000,0,0,0,0,150
+//-- AL_ANGELUS
+33,350,3500,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,150
//-- AL_BLESSING
-34,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,0
+34,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,-1
//-- AL_CURE
-35,0,1000,0,0,6000,0,0
+35,0,1000,0,0,6000,0,-1
//==========================================
//===== Archer =============================
//-- AC_CONCENTRATION
-45,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,0
+45,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,-1
//-- AC_DOUBLE
-46,0,0,0,100,0,0,0
+46,0,100,0,100,0,0,-1
//-- AC_SHOWER
-47,0,0,0,100,0,0,0
+47,0,100,0,100,0,0,-1
//==========================================
//===== Thief ==============================
//-- TF_HIDING
-51,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,0
+51,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,-1
//-- TF_POISON
-52,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,0
+52,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,-1
//==========================================
@@ -110,331 +110,321 @@
//===== Knight =============================
//-- KN_BRANDISHSPEAR
-57,700,0,0,0,0,0,0
-
+57,350,0,0,0,0,0,350
//-- KN_SPEARBOOMERANG
-59,0,1000,0,0,0,0,0
+59,0,1000,0,0,0,0,-1
//-- KN_TWOHANDQUICKEN
-60,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,0
+60,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,-1
//-- KN_AUTOCOUNTER
-61,0,0,0,400:800:1200:1600:2000,0,0,0
+61,0,0,0,400:800:1200:1600:2000,0,0,-1
//-- KN_BOWLINGBASH
-62,700,0,0,0,0,0,0
+62,350,0,0,0,0,0,350
//==========================================
//===== Priest =============================
//-- PR_IMPOSITIO
-66,0,3000,0,60000,0,0,0
+66,0,3000,0,60000,0,0,-1
//-- PR_SUFFRAGIUM
-67,0,2000,0,30000:20000:10000,0,0,0
+67,0,2000,0,30000:20000:10000,0,0,-1
//-- PR_ASPERSIO
-68,0,2000,0,60000:90000:120000:150000:180000,0,0,0
+68,0,2000,0,60000:90000:120000:150000:180000,0,0,-1
//-- PR_BENEDICTIO
-69,0,0,0,40000:80000:120000:160000:200000,0,0,0
+69,0,0,0,40000:80000:120000:160000:200000,0,0,-1
//-- PR_SANCTUARY
70,5000,0,0,4000:7000:10000:13000:16000:19000:22000:25000:28000:31000,0,0,0
//-- PR_SLOWPOISON
-71,0,0,0,10000:20000:30000:40000,0,0,0
+71,0,0,0,10000:20000:30000:40000,0,0,-1
//-- PR_STRECOVERY
-72,0,2000,0,0,30000,0,0
+72,0,2000,0,0,30000,0,-1
//-- PR_KYRIE
73,2000,2000,0,120000,0,0,0
//-- PR_MAGNIFICAT
74,4000,2000,0,30000:45000:60000:75000:90000,0,0,0
//-- PR_GLORIA
-75,0,2000,0,10000:15000:20000:25000:30000,0,0,0
+75,0,2000,0,10000:15000:20000:25000:30000,0,0,-1
//-- PR_LEXDIVINA
-76,0,3000,0,30000:35000:40000:45000:50000:60000:60000:60000:60000:60000,0,0,0
+76,0,3000,0,30000:35000:40000:45000:50000:60000:60000:60000:60000:60000,0,0,-1
//-- PR_TURNUNDEAD
77,1000,3000,0,0,0,0,0
//-- PR_LEXAETERNA
-78,0,3000,0,600000,0,0,0
+78,0,3000,0,600000,0,0,-1
//-- PR_MAGNUS
79,15000,4000,0,5000:6000:7000:8000:9000:10000:11000:12000:13000:14000,0,0,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,0,0
+80,2400:2160:1920:1680:1440:1200:960:720:480:240,1000,0,30000,600:800:1000:1200:1400:1600:1800:2000:2200:2400,0,0
//-- WZ_SIGHTRASHER
-81,700,2000,0,500,0,0,0
+81,400,2000,0,500,0,0,0
//-- WZ_METEOR
-83,15000,2000:3000:3000:4000:4000:5000:5000:6000:6000:7000,0,500,5000,0,0
+83,12000,2000:3000:3000:4000:4000:5000:5000:6000:6000:7000,0,500,5000,0,0
//-- WZ_JUPITEL
-84,2500:3000:3500:4000:4500:5000:5500:6000:6500:7000,0,0,0,0,0,0
+84,2000:2400:2800:3200:3600:4000:4400:4800:5200:5600,0,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,0,0
+85,12000:11600:11200:10800:10400:10000:9600:9200:8800:8400,5000,0,4000,5500:6000:6500:7000:7500:8000:8500:9000:9500:10000,0,0
//-- WZ_WATERBALL
-86,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,0,0,0,0,0,0
+86,800:1600:2400:3200:4000:4000:4000:4000:4000:4000,0,0,0,0,0,0
//-- WZ_ICEWALL
-87,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0,0,0
+87,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0,0,-1
//-- WZ_FROSTNOVA
-88,900:900:800:800:700:700:600:600:500:500,200,0,0,4000:5000:6000:8000:10000:12000:13000:15000:16000:17000,0,0
+88,800:800:720:720:640:640:560:560:480:480,200,0,0,4000:5000:6000:8000:10000:12000:13000:15000:16000:17000,0,0
//-- WZ_STORMGUST
-89,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,5000,0,4600,12000,0,0
+89,4800:5600:6400:7200:8000:8800:9600:10400:11200:12000,5000,0,4600,12000,0,0
//-- WZ_EARTHSPIKE
-90,1000:2000:3000:4000:5000,700,0,0,0,0,0
+90,560:1120:1680:2240:2800:2800:2800:2800:2800:2800,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,0
//-- WZ_HEAVENDRIVE
-91,1000:2000:3000:4000:5000,700,0,500,0,0,0
+91,800:1600:2400:3200:4000:4000:4000:4000:4000:4000,1000,0,500,0,0,0
//-- WZ_QUAGMIRE
-92,0,1000,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000,0,0
+92,0,1000,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000,0,-1
//==========================================
//===== Blacksmith =========================
//-- BS_REPAIRWEAPON
-108,7500,0,0,0,0,0,0
+108,2500,0,0,0,0,0,2500
//-- BS_HAMMERFALL
-110,0,0,0,0,5000,0,0
+110,0,0,0,0,5000,0,-1
//-- BS_ADRENALINE
-111,0,0,0,30000:60000:90000:120000:150000,0,0,0
-//-- BS_WEAPONPEFECT
-112,0,0,0,10000:20000:30000:40000:50000,0,0,0
+111,0,0,0,30000:60000:90000:120000:150000,0,0,-1
+//-- BS_WEAPONPERFECT
+112,0,0,0,10000:20000:30000:40000:50000,0,0,-1
//-- BS_OVERTHRUST
-113,0,0,0,20000:40000:60000:80000:100000,0,0,0
+113,0,0,0,20000:40000:60000:80000:100000,0,0,-1
//-- BS_MAXIMIZE
-114,0,0,0,1000:2000:3000:4000:5000,0,0,0
+114,0,0,0,1000:2000:3000:4000:5000,0,0,-1
//==========================================
//===== Hunter =============================
//-- HT_SKIDTRAP
-115,0,0,0,300000:240000:180000:120000:60000,0,0,0
+115,0,0,0,300000:240000:180000:120000:60000,0,0,-1
//-- HT_LANDMINE
-116,0,0,0,200000:160000:120000:80000:40000,5000,0,0
+116,0,0,0,200000:160000:120000:80000:40000,5000,0,-1
//-- HT_ANKLESNARE
-117,0,0,0,250000:200000:150000:100000:50000,4000:8000:12000:16000:20000,0,0
+117,0,0,0,250000:200000:150000:100000:50000,4000:8000:12000:16000:20000,0,-1
//-- HT_SHOCKWAVE
-118,0,0,0,200000:160000:120000:80000:40000,0,0,0
+118,0,0,0,200000:160000:120000:80000:40000,0,0,-1
//-- HT_SANDMAN
-119,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000,0,0
+119,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000,0,-1
//-- HT_FLASHER
-120,0,0,0,150000:120000:90000:60000:30000,10000:11000:12000:13000:14000,0,0
+120,0,0,0,150000:120000:90000:60000:30000,10000:11000:12000:13000:14000,0,-1
//-- HT_FREEZINGTRAP
-121,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000,0,0
+121,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000,0,-1
//-- HT_BLASTMINE
-122,0,0,0,25000:20000:15000:10000:5000,0,0,0
+122,0,0,0,25000:20000:15000:10000:5000,0,0,-1
//-- HT_CLAYMORETRAP
-123,0,0,0,20000:40000:60000:80000:100000,0,0,0
-
+123,0,0,0,20000:40000:60000:80000:100000,0,0,-1
//-- HT_TALKIEBOX
-125,0,0,0,600000,0,0,0
-
+125,0,0,0,600000,0,0,-1
//-- HT_BLITZBEAT
-129,1500,1000,0,0,0,0,0
+129,1000,1000,0,0,0,0,0
//==========================================
//===== Assassin ===========================
//-- AS_CLOAKING
-135,0,0,0,500:1000:2000:3000:4000:5000:6000:7000:8000:9000,0,0,0
+135,0,0,0,500:1000:2000:3000:4000:5000:6000:7000:8000:9000,0,0,-1
//-- AS_SONICBLOW
-136,0,2000,2000,0,5000,0,0
+136,0,0,2000,0,5000,0,-1
//-- 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,0,0
+138,0,0,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,10000:20000:30000:40000:50000:60000:70000:80000:90000:100000,0,-1
//-- AS_POISONREACT
-139,0,0,0,20000:25000:30000:35000:40000:45000:50000:55000:60000:65000,0,0,0
+139,0,0,0,20000:25000:30000:35000:40000:45000:50000:55000:60000:65000,0,0,-1
//-- 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,0,0
+140,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,-1
//-- 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,0,0
-
+141,500,0,0,5000:5500:6000:6500:7000:7500:8000:8500:9000:9500,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,7500:8000:8500:9000:9500:10000:10500:11000:11500:12000,500
//==========================================
//===== 1st Jobs Quest Skills===============
//-- NV_TRICKDEAD
-143,0,0,0,600000,0,0,0
+143,0,0,0,600000,0,0,-1
//-- SM_FATALBLOW
-145,0,0,0,0,5000,0,0
+145,0,0,0,0,5000,0,-1
//-- AC_CHARGEARROW
-148,1500,0,0,0,0,0,0
-//-- TF_SPRINKLESAND
-149,0,0,0,0,10000,0,0
+148,0,0,0,0,0,0,1500
+//-- TF_SPRINKLESAND
+149,0,0,0,0,10000,0,-1
//-- TF_PICKSTONE
-151,500,0,0,0,0,0,0
+151,0,0,0,0,0,0,500
//-- TF_THROWSTONE
-152,0,0,0,5000,8000,0,0
+152,0,100,0,5000,8000,0,-1
//-- MC_LOUD
-155,0,0,0,300000,0,0,0
+155,0,0,0,300000,0,0,-1
+
//-- AL_HOLYLIGHT
156,2000,0,0,0,0,0,0
+
//-- MG_ENERGYCOAT
-157,5000,0,0,300000,0,0,5000
+157,0,0,0,300000,0,0,5000
//==========================================
//===== NPC Skills Part 1 ==================
//-- NPC_ATTRICHANGE
-161,0,0,0,1800000,0,0,0
+161,0,0,0,1800000,0,0,-1
//-- NPC_CHANGEWATER
-162,0,0,0,1800000,0,0,0
+162,0,0,0,1800000,0,0,-1
//-- NPC_CHANGEGROUND
-163,0,0,0,1800000,0,0,0
+163,0,0,0,1800000,0,0,-1
//-- NPC_CHANGEFIRE
-164,0,0,0,1800000,0,0,0
+164,0,0,0,1800000,0,0,-1
//-- NPC_CHANGEWIND
-165,0,0,0,1800000,0,0,0
+165,0,0,0,1800000,0,0,-1
//-- NPC_CHANGEPOISON
-166,0,0,0,1800000,0,0,0
+166,0,0,0,1800000,0,0,-1
//-- NPC_CHANGEHOLY
-167,0,0,0,1800000,0,0,0
+167,0,0,0,1800000,0,0,-1
//-- NPC_CHANGEDARKNESS
-168,0,0,0,1800000,0,0,0
+168,0,0,0,1800000,0,0,-1
//-- NPC_CHANGETELEKINESIS
-169,0,0,0,1800000,0,0,0
+169,0,0,0,1800000,0,0,-1
//-- NPC_SELFDESTRUCTION
-173,0,0,0,3500,0,0,0
+173,0,0,0,3500,0,0,-1
//-- NPC_POISON
-176,0,0,0,0,60000,0,0
+176,0,0,0,0,60000,0,-1
//-- NPC_BLINDATTACK
-177,0,0,0,0,30000,0,0
+177,0,0,0,0,30000,0,-1
//-- NPC_SILENCEATTACK
-178,0,0,0,0,30000,0,0
-//-- NPC0,_STUNATTACK
-179,0,0,0,0,5000,0,0
+178,0,0,0,0,30000,0,-1
+//-- NPC_STUNATTACK
+179,0,0,0,0,5000,0,-1
//-- NPC_PETRIFYATTACK
-180,0,0,0,0,20000,0,0
+180,0,0,0,0,20000,0,-1
//-- NPC_CURSEATTACK
-181,0,0,0,0,30000,0,0
+181,0,0,0,0,30000,0,-1
//-- NPC_SLEEPATTACK
-182,0,0,0,0,30000,0,0
+182,0,0,0,0,30000,0,-1
//-- NPC_MAGICALATTACK
-192,0,0,0,15000,0,0,0
+192,0,0,0,15000,0,0,-1
//-- NPC_KEEPING
-201,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0,0,0
-
+201,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0,0,-1
//-- NPC_BARRIER
-204,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0,0,0
+204,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0,0,-1
//-- NPC_DEFENDER
-205,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0,0,0
+205,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0,0,-1
//-- NPC_LICK
-206,0,0,0,0,3000,0,0
+206,0,0,0,0,3000,0,-1
//-- NPC_HALLUCINATION
-207,0,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0,0,0
+207,0,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0,0,-1
//==========================================
//===== Rogue ==============================
-//-- RG_BACKSTAB
-212,0,500,0,5000,0,0,0
-
+//-- RG_BACKSTAP
+212,0,500,0,5000,0,0,-1
//-- RG_RAID
-214,0,0,0,5000,8000:9000:10000:11000:12000,0,0
-//-- RG_STRIPEWEAPON
-215,1000,1000,0,75000:90000:105000:120000:135000,0,0,0
-//-- RG_STRIPSHIELD
-216,1000,1000,0,75000:90000:105000:120000:135000,0,0,0
+214,0,0,0,5000,8000:9000:10000:11000:12000,0,-1
//-- RG_STRIPWEAPON
-217,1000,1000,0,75000:90000:105000:120000:135000,0,0,0
+215,700:900:1100:1500:1500:1500:1500:1500:1500,1000,0,75000:90000:105000:120000:135000,0,0,0
+//-- RG_STRIPSHIELD
+216,700:900:1100:1500:1500:1500:1500:1500:1500,1000,0,75000:90000:105000:120000:135000,0,0,0
+//-- RG_STRIPARMOR
+217,700:900:1100:1500:1500:1500:1500:1500:1500,1000,0,75000:90000:105000:120000:135000,0,0,0
//-- RG_STRIPHELM
-218,1000,1000,0,75000:90000:105000:120000:135000,0,0,0
-
-//-- RG_GRAFITTI
-220,0,0,0,180000,0,0,0
+218,700:900:1100:1500:1500:1500:1500:1500:1500,1000,0,75000:90000:105000:120000:135000,0,0,0
+//-- RG_GRAFFITI
+220,0,0,0,180000,0,0,-1
//==========================================
//===== Alchemist ==========================
//-- AM_DEMONSTRATION
-229,1000,0,0,40000:45000:50000:55000:60000,0,0,0
+229,1000,500,0,40000:45000:50000:55000:60000,0,0,0
//-- AM_ACIDTERROR
-230,1000,0,0,3:7:10:12:13,120000,0,0
+230,500,500,0,3:7:10:12:13,120000,0,500
//-- AM_POTIONPITCHER
-231,0,500,0,0,0,0,0
+231,0,500,0,0,0,0,-1
//-- AM_CANNIBALIZE
232,2000,500,0,300000:240000:180000:120000:60000,0,0,0
//-- AM_SPHEREMINE
233,2000,500,0,30000,0,0,0
//-- AM_CP_WEAPON
-234,2000,0,0,120000:240000:360000:480000:600000,0,0,0
+234,0,500,0,120000:240000:360000:480000:600000,0,0,2000
//-- AM_CP_SHIELD
-235,2000,0,0,120000:240000:360000:480000:600000,0,0,0
+235,0,500,0,120000:240000:360000:480000:600000,0,0,2000
//-- AM_CP_ARMOR
-236,2000,0,0,120000:240000:360000:480000:600000,0,0,0
+236,0,500,0,120000:240000:360000:480000:600000,0,0,2000
//-- AM_CP_HELM
-237,2000,0,0,120000:240000:360000:480000:600000,0,0,0
+237,0,500,0,120000:240000:360000:480000:600000,0,0,2000
//-- AM_RESURRECTHOMUN
-247,2000,0,0,0,0,0,0
+247,2000,0,0,0,0,0,1000
//==========================================
//===== Crusader ===========================
//-- CR_AUTOGUARD
-249,0,0,0,300000,0,0,0
+249,0,0,0,300000,0,0,-1
//-- CR_SHIELDCHARGE
-250,0,0,0,0,5000,0,0
+250,0,0,0,0,5000,0,-1
//-- CR_SHIELDBOOMERANG
-251,0,700,0,0,0,0,0
+251,0,700,0,0,0,0,-1
//-- CR_REFLECTSHIELD
-252,0,0,0,300000,0,0,0
+252,0,0,0,300000,0,0,-1
//-- CR_HOLYCROSS
-253,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,0
+253,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,-1
//-- CR_GRANDCROSS
-254,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,0
+254,1500,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,1500
//-- CR_DEVOTION
-255,3000,0,0,0,30000:45000:60000:75000:90000,0,0
+255,1500,0,0,0,30000:45000:60000:75000:90000,0,1500
//-- CR_PROVIDENCE
-256,3000,0,0,180000,0,0,0
+256,1500,0,0,180000,0,0,1500
//-- CR_DEFENDER
-257,0,800,0,180000,0,0,0
+257,0,800,0,180000,0,0,-1
//-- CR_SPEARQUICKEN
-258,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,0
+258,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,-1
//==========================================
//===== Monk ===============================
//-- MO_CALLSPIRITS
-261,1000,0,0,600000,0,0,0
+261,500,0,0,600000,0,0,500
//-- MO_ABSORBSPIRITS
-262,2000,0,0,0,0,0,0
+262,1000,0,0,0,0,0,1000
//-- MO_TRIPLEATTACK
-263,0,1000,0,0,0,0,0
+263,0,0,0,0,0,0,-1
//-- MO_INVESTIGATE
-266,1000,500,0,0,0,0,0
+266,500,500,0,0,0,0,500
//-- MO_FINGEROFFENSIVE
-267,1000,500,0:200:400:600:800,0,0,0,0
+267,500,500,0:200:400:600:800,0,0,0,500
//-- MO_STEELBODY
-268,5000,0,0,30000:60000:90000:120000:150000,0,0,0
+268,2500,0,0,30000:60000:90000:120000:150000,0,0,2500
//-- MO_BLADESTOP
-269,0,0,0,500:700:900:1100:1300,20000:30000:40000:50000:60000,0,0
+269,0,500,0,500:700:900:1100:1300,20000:30000:40000:50000:60000,0,-1
//-- MO_EXPLOSIONSPIRITS
-270,0,0,0,180000,0,0,0
+270,0,0,0,180000,0,0,-1
//-- MO_EXTREMITYFIST
-271,4000:3500:3000:2500:2000,3000:2500:2000:1500:1000,0,10000,300000,0,0
-//-- MO_CHAINCOMBO
-272,0,1000,0,0,0,0,0
-//-- MO_COMBOFINISH
-273,0,700,0,0,0,0,0
+271,2000:1750:1500:1250:1000:500:1000:1000:1000:1000,3000:2500:2000:1500:1000,0,10000,300000,0,2000:1750:1500:1250:1000:500:1000:1000:1000:1000
//==========================================
//===== Sage ===============================
//-- SA_MAGICROD
-276,0,0,0,400:600:800:1000:1200,0,0,0
+276,0,1000,0,400:600:800:1000:1200,0,0,-1
//-- SA_SPELLBREAKER
277,700,0,0,0,0,0,0
-
//-- SA_AUTOSPELL
-279,3000,0,0,120000:150000:180000:210000:240000:270000:300000:330000:360000:390000,0,0,0
+279,0,0,0,120000:150000:180000:210000:240000:270000:300000:330000:360000:390000,0,0,3000
//-- SA_FLAMELAUNCHER
-280,3000,0,0,1200000:1200000:1200000:1200000:1800000,0,0,0
+280,0,0,0,1200000:1200000:1200000:1200000:1800000,0,0,3000
//-- SA_FROSTWEAPON
-281,3000,0,0,1200000:1200000:1200000:1200000:1800000,0,0,0
+281,0,0,0,1200000:1200000:1200000:1200000:1800000,0,0,3000
//-- SA_LIGHTNINGLOADER
-282,3000,0,0,1200000:1200000:1200000:1200000:1800000,0,0,0
+282,0,0,0,1200000:1200000:1200000:1200000:1800000,0,0,3000
//-- SA_SEISMICWEAPON
-283,3000,0,0,1200000:1200000:1200000:1200000:1800000,0,0,0
-
+283,0,0,0,1200000:1200000:1200000:1200000:1800000,0,0,3000
//-- SA_VOLCANO
285,5000,0,0,60000:120000:180000:240000:300000,0,0,0
//-- SA_DELUGE
@@ -446,30 +436,29 @@
//-- SA_DISPELL
289,2000,0,0,0,0,0,0
//-- SA_REVERSEORCISH
-294,0,0,0,1200000,0,0,0
+294,0,0,0,1200000,0,0,-1
//==========================================
//===== Bard & Dancer (Ensemble Skills) ====
//-- BD_ADAPTATION
-304,0,0,0,0,5000,0,0
-
+304,0,0,0,0,5000,0,-1
//-- BD_LULLABY
-306,0,0,0,60000,15000,0,0
+306,0,0,0,60000,15000,0,-1
//-- BD_RICHMANKIM
-307,0,0,0,60000,60000,0,0
+307,0,0,0,60000,60000,0,-1
//-- BD_ETERNALCHAOS
-308,0,0,0,60000,60000,0,0
+308,0,0,0,60000,60000,0,-1
//-- BD_DRUMBATTLEFIELD
-309,0,0,0,60000,60000,0,0
+309,0,0,0,60000,60000,0,-1
//-- BD_RINGNIBELUNGEN
-310,0,0,0,60000,60000,0,0
+310,0,0,0,60000,60000,0,-1
//-- BD_ROKISWEIL
-311,0,0,0,60000,60000,0,0
+311,0,0,0,60000,60000,0,-1
//-- BD_INTOABYSS
-312,0,0,0,60000,60000,0,0
+312,0,0,0,60000,60000,0,-1
//-- BD_SIEGFRIED
-313,0,0,0,60000,60000,0,0
+313,0,0,0,60000,60000,0,-1
//==========================================
@@ -477,17 +466,17 @@
//-- BA_MUSICALSTRIKE
316,1500,0,0,0,0,0,0
//-- BA_DISSONANCE
-317,0,0,0,30000,3000,0,0
-//-- BA_FROSTJOKE
-318,0,3000,0,0,10000:11000:12000:13000:14000,0,0
+317,0,0,0,30000,3000,0,-1
+//-- BA_FROSTJOKER
+318,0,4000,0,0,10000:11000:12000:13000:14000,0,-1
//-- BA_WHISTLE
-319,0,0,0,60000,20000,0,0
+319,0,0,0,60000,20000,0,-1
//-- BA_ASSASSINCROSS
-320,0,0,0,120000,20000,0,0
+320,0,0,0,120000,20000,0,-1
//-- BA_POEMBRAGI
-321,0,0,0,180000,20000,0,0
+321,0,0,0,180000,20000,0,-1
//-- BA_APPLEIDUN
-322,0,0,0,180000,20000,0,0
+322,0,0,0,180000,20000,0,-1
//==========================================
@@ -495,275 +484,276 @@
//-- DC_THROWARROW
324,1500,0,0,0,0,0,0
//-- DC_UGLYDANCE
-325,0,0,0,30000,3000,0,0
+325,0,0,0,30000,3000,0,-1
//-- DC_SCREAM
-326,0,3000,0,0,5000,0,0
+326,0,4000,0,0,5000,0,-1
//-- DC_HUMMING
-327,0,0,0,60000,20000,0,0
+327,0,0,0,60000,20000,0,-1
//-- DC_DONTFORGETME
-328,0,0,0,180000,20000,0,0
+328,0,0,0,180000,20000,0,-1
//-- DC_FORTUNEKISS
-329,0,0,0,120000,20000,0,0
+329,0,0,0,120000,20000,0,-1
//-- DC_SERVICEFORYOU
-330,0,0,0,180000,20000,0,0
+330,0,0,0,180000,20000,0,-1
//==========================================
//===== Wedding Skills =====================
//-- WE_MALE
-334,3000,0,0,0,0,0,0
+334,1500,0,0,0,0,0,1500
//-- WE_FEMALE
-335,3000,0,0,0,0,0,0
+335,1500,0,0,0,0,0,1500
//-- WE_CALLPARTNER
-336,0,0,0,20000,0,0,0
+336,0,0,0,20000,0,0,-1
//==========================================
//===== NPC Skills Part 2 ==================
//-- NPC_GRANDDARKNESS
-339,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,0
+339,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,-1
//-- NPC_STOP
-342,0,0,0,10000,0,0,0
+342,0,0,0,10000,0,0,-1
//-- NPC_CHANGEUNDEAD
-348,0,0,0,30000,0,0,0
+348,0,0,0,30000,0,0,-1
//-- NPC_POWERUP
-349,0,0,0,10000:15000:20000:25000:30000,0,0,0
+349,0,0,0,10000:15000:20000:25000:30000,0,0,-1
//-- NPC_AGIUP
-350,0,0,0,10000:15000:20000:25000:30000,0,0,0
+350,0,0,0,10000:15000:20000:25000:30000,0,0,-1
//-- NPC_INVISIBLE
-353,0,0,0,30000,0,0,0
+353,0,0,0,30000,0,0,-1
//-- NPC_RUN
-354,0,0:500:1000:1500:2000:2500,0,0,0,0,0
+354,0,0:500:1000:1500:2000:2500,0,0,0,0,-1
//==========================================
//===== Lord Knight ========================
//-- LK_AURABLADE
-355,0,0,0,40000:60000:80000:100000:120000,0,0,0
+355,0,0,0,40000:60000:80000:100000:120000,0,0,-1
//-- LK_PARRYING
-356,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,0,0
+356,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,0,-1
//-- LK_CONCENTRATION
-357,0,0,0,25000:30000:35000:40000:45000,0,0,0
+357,0,0,0,25000:30000:35000:40000:45000,0,0,-1
//-- LK_TENSIONRELAX
-358,0,0,0,180000,0,0,0
+358,0,0,0,180000,0,0,-1
//-- LK_BERSERK
-359,0,0,0,300000,15000,0,0
+359,0,0,0,300000,15000,0,-1
//-- LK_FURY
-360,0,0,0,300000,0,0,0
+360,0,0,0,300000,0,0,-1
//==========================================
//===== High Priest ========================
//-- HP_ASSUMPTIO
-361,1000:1500:2000:2500:3000,1100:1200:1300:1400:1500,0,20000:40000:60000:80000:100000,0,0,0
+361,1000:1500:2000:2500:3000:3000:3000:3000:3000:3000,1100:1200:1300:1400:1500,0,20000:40000:60000:80000:100000,0,0,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,0,0
+362,0,2000:3000:4000:5000:6000,0,20000:25000:30000:35000:40000,20000:25000:30000:35000:40000,0,5000:6000:7000:8000:9000:9000:9000:9000:9000:9000
//==========================================
//===== High Wzard =========================
//-- HW_MAGICCRASHER
365,300,300,0,0,0,0,0
-//-- HW_MAGICPOWER
-366,700,0,0,30000,0,0,0
//==========================================
//===== Paladin ============================
//-- PA_PRESSURE
-367,2000:2500:3000:3500:4000,2000:2500:3000:3500:4000,0,0,2000:3000:4000:5000:6000,0,0
-//-- PA_SACRIFICE
-368,0,2000,0,0,0,0,0
+367,2000,2000:2500:3000:3500:4000,0,0,2000:3000:4000:5000:6000,0,0
//-- PA_GOSPEL
-369,0,0,0,60000,60000,0,0
+369,0,0,0,60000,60000,0,-1
//==========================================
//===== Champion ===========================
//-- CH_PALMSTRIKE
-370,0,300,0,0,0,0,0
+370,0,300,0,0,0,0,-1
//-- CH_TIGERFIST
-371,0,700,0,0,2000:4000:6000:8000:10000,0,0
-//-- CH_CHAINCRUSH
-372,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,0,0,0
+371,0,0,0,0,2000:4000:6000:8000:10000,0,-1
//==========================================
//===== Professor ==========================
//-- PF_HPCONVERSION
-373,0,1000:1200:1400:1600:1800,0,0,0,0,0
+373,0,1000:1200:1400:1600:1800,0,0,0,0,-1
//-- PF_SOULCHANGE
-374,3000,5000,0,0,0,0,0
+374,0,0,0,0,0,0,3000
//-- PF_SOULBURN
-375,0,0,0,0,0,10000:10000:10000:10000:15000,0
+375,0,0,0,0,0,10000:10000:10000:10000:15000,-1
//==========================================
//===== Assassin Cross =====================
//-- ASC_EDP
-378,0,2000,0,40000:45000:50000:55000:60000,20000:30000:40000:50000:60000,0,0
+378,0,2000,0,40000:45000:50000:55000:60000,20000:30000:40000:50000:60000,0,-1
//-- ASC_BREAKER
-379,700,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,0
+379,250,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,250
//==========================================
//===== Sniper =============================
//-- SN_SIGHT
-380,0,0,0,30000,0,0,0
+380,0,0,0,30000,0,0,-1
//-- SN_FALCONASSAULT
-381,1000,3000,0,0,0,0,0
+381,500,3000,0,0,0,0,500
//-- SN_SHARPSHOOTING
-382,2000,1500,0,0,0,0,0
+382,1000,1500,0,0,0,0,1000
//-- 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,0,0
+383,1500:1800:2100:2400:2700:3000:3300:3600:3900:4200,2000,0,130000:160000:190000:220000:250000:280000:310000:340000:370000:400000,0,0,500:600:700:800:900:1000:1100:1200:1300:1400
//==========================================
//===== 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,0,0
-
+384,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,5000,0,5:5:6:6:7:7:8:8:9:10
//-- WS_CARTBOOST
-387,0,0,0,60000,0,0,0
+387,0,0,0,60000,0,0,-1
//==========================================
//===== Stalker ============================
//-- ST_CHASEWALK
-389,1200,0,0,10000,30000,0,0
+389,500,0,0,10000,30000,0,500
//-- ST_REJECTSWORD
-390,0,0,0,300000,0,0,0
+390,0,0,0,300000,0,0,-1
//==========================================
//===== 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,0,0
+394,2000:2200:2400:2600:2800:3000:3200:3400:3600:3800,2000,2000,0,0,0,0
//-- CG_MOONLIT
-395,0,0,0,20000:25000:30000:35000:40000,0,0,0
+395,0,0,0,20000:25000:30000:35000:40000,0,0,-1
//-- CG_MARIONETTE
-396,0,0,0,1000,0,0,0
+396,0,0,0,1000,0,0,-1
//==========================================
//===== Mixed Advanced Skills ==============
//-- LK_SPIRALPIERCE
-397,300:500:700:900:1000,1200:1400:1600:1800:2000,0,0,1000,0,0
+397,150:250:350:450:500:500:500:500:500:500,1200:1400:1600:1800:2000,0,0,1000,0,150:250:350:450:500:500:500:500:500:500
//-- LK_HEADCRUSH
-398,0,500,0,0,120000,0,0
+398,0,500,0,0,120000,0,-1
//-- LK_JOINTBEAT
-399,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,30000,0,0
+399,0,800:800:800:800:1000,0,0,30000,0,-1
+
//-- HW_NAPALMVULCAN
400,1000,1000,0,0,45000,0,0
+
//-- CH_SOULCOLLECT
-401,2000,0,0,600000,0,0,2000
+401,0,0,0,600000,0,0,2000
+
//-- PF_MINDBREAKER
-402,0,800:900:1000:1100:1200,0,30000,0,0,0
+402,0,800:900:1000:1100:1200,0,30000,0,0,-1
//-- PF_MEMORIZE
-403,5000,0,0,0,0,0,0
+403,0,0,0,0,0,0,5000
//-- PF_FOGWALL
-404,0,0,0,20000,10000,0,0
+404,0,0,0,20000,10000,0,-1
//-- PF_SPIDERWEB
-405,0,0,0,30000,8000,0,0
+405,0,0,0,30000,8000,0,-1
+
//-- ASC_METEORASSAULT (Upkeep2 times are duration of: blind(lv1), stun(lv2) or bleeding (lv3))
-406,500,500,0,0,10000:5000:120000,0,0
+406,250,500,0,0,10000:5000:120000,0,250
//-- ASC_CDP
-407,0,500,0,0,0,0,0
+407,0,5000,0,0,0,0,-1
//==========================================
//===== Adoption Skills ====================
//-- WE_BABY
-408,3000,0,0,300000,0,0,0
+408,0,0,0,300000,0,0,2000
//-- WE_CALLPARENT
-409,0,0,0,20000,0,0,0
+409,0,0,0,20000,0,0,-1
//-- WE_CALLBABY
-410,0,0,0,20000,0,0,0
+410,0,0,0,20000,0,0,-1
//==========================================
//===== Taekwon ============================
//-- TK_RUN
-411,6000:5000:4000:3000:2000:1000:0:0:0:0,0,0,1000,150000,0,0
+411,3000:2500:2000:1500:100:500:0:0:0:0,300,0,1000,150000,0,3000:2500:2000:1500:100:500:0:0:0:0
//-- TK_DOWNKICK
-415,0,0,0,0,3000,0,0
+415,0,0,0,0,3000,0,-1
//-- TK_TURNKICK
-417,0,0,0,0,2000,0,0
+417,0,0,0,0,2000,0,-1
//-- TK_SPTIME
-423,0,0,0,1800000,0,0,0
+423,0,0,0,1800000,0,0,-1
//-- TK_SEVENWIND
-425,0,0,0,300000,0,0,0
+425,0,0,0,300000,0,0,-1
//-- TK_HIGHJUMP
-426,5000:4000:3000:2000:1000,0,0,0,0,0,0
+426,2500:2000:1500:1000:500:500:500:500:500:500,0,0,0,0,0,2500:2000:1500:1000:500:500:500:500:500:500
//==========================================
//===== Star Gladiator =====================
//-- SG_FEEL
-427,1000,0,0,0,0,0,0
-//SG_SUN_WARM
-428,0,1000,0,10000:20000:60000,0,0,0
-//SG_MOON_WARM
-429,0,1000,0,10000:20000:60000,0,0,0
-//SG_STAR_WARM
-430,0,1000,0,10000:20000:60000,0,0,0
-//SG_SUN_COMFORT
-431,0,1000,0,80000:160000:240000:320000,0,0,0
-//SG_MOON_COMFORT
-432,0,1000,0,80000:160000:240000:320000,0,0,0
-//SG_STAR_COMFORT
-433,0,1000,0,80000:160000:240000:320000,0,0,0
+427,0,0,0,0,0,0,3000
+//-- SG_SUN_WARM
+428,0,0,0,10000:20000:60000,0,0,-1
+//-- SG_MOON_WARM
+429,0,0,0,10000:20000:60000,0,0,-1
+//-- SG_STAR_WARM
+430,0,0,0,10000:20000:60000,0,0,-1
+//-- SG_SUN_COMFORT
+431,0,0,0,80000:160000:240000:320000,0,0,-1
+//-- SG_MOON_COMFORT
+432,0,0,0,80000:160000:240000:320000,0,0,-1
+//-- SG_STAR_COMFORT
+433,0,0,0,80000:160000:240000:320000,0,0,-1
//-- SG_HATE
-434,1000,0,0,0,0,0,0
-//SG_FRIEND
-442,0,0,0,10000,0,0,0
-//SG_KNOWLEDGE
-443,0,0,0,600000,0,0,0
-//SG_FUSION
-444,0,1000,0,600000,0,0,0
+434,0,0,0,0,0,0,3000
+//-- SG_FRIEND
+442,0,0,0,10000,0,0,-1
+//-- SG_KNOWLEDGE
+443,0,0,0,600000,0,0,-1
+//-- SG_FUSION
+444,0,0,0,600000,0,0,-1
//==========================================
//===== Soul Linker ========================
//-- SL_ALCHEMIST
-445,1000,500,0,150000:200000:250000:300000:350000,0,0,0
-//-- AM_BERSERKPITCHER - Copy of AM_POTIONPITCHER for now
-446,0,500,0,0,0,0,0
+445,0,0,0,150000:200000:250000:300000:350000,0,0,1000
+
+//-- AM_BERSERKPITCHER
+446,0,0,0,0,0,0,1000
+
//-- SL_MONK
-447,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+447,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_STAR
-448,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+448,1000,0,0,150000:200000:250000:300000:350000,0,0,0
//-- SL_SAGE
-449,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+449,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_CRUSADER
-450,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+450,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_SUPERNOVICE
-451,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+451,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_KNIGHT
-452,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+452,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_WIZARD
-453,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+453,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_PRIEST
-454,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+454,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_BARDDANCER
-455,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+455,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_ROGUE
-456,1000,500,0,150000:200000:250000:300000:350000,0,0,0
-//-- SL_ASSASSIN
-457,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+456,0,0,0,150000:200000:250000:300000:350000,0,0,1000
+//-- SL_ASSASIN
+457,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_BLACKSMITH
-458,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+458,0,0,0,150000:200000:250000:300000:350000,0,0,1000
+
//-- BS_ADRENALINE2
-459,0,0,0,150000,0,0,0
+459,0,0,0,150000,0,0,-1
+
//-- SL_HUNTER
-460,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+460,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_SOULLINKER
-461,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+461,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_KAIZEL
-462,4500:4000:3500:3000:2500:2000:1500,0,0,1800000,2000,0,0
+462,4500:4000:3500:3000:2500:2500:2500:2500:2500:2500,0,0,1800000,2000,0,0
//-- SL_KAAHI
-463,0,500,0,1800000,500,0,0
+463,0,0,0,1800000,500,0,-1
//-- SL_KAUPE
-464,500,500,0,600000,0,0,0
+464,500,0,0,600000,0,0,0
//-- SL_KAITE
-465,6000:5500:5000:4500:4000:3500:3000,0,0,60000:120000:180000:240000:300000:360000:600000,0,0,0
+465,6000:5500:5000:4500:4000:3500:3000:3000:3000:3000,0,0,60000:120000:180000:240000:300000:360000:600000,0,0,0
//-- SL_STIN
467,100,500,0,0,0,0,0
//-- SL_STUN
@@ -773,143 +763,151 @@
//-- SL_SWOO
470,1000,500,0,1000:2000:3000:4000:5000:6000:7000,0,0,0
//-- SL_SKE
-471,3000:2000:1000,500,0,10000:20000:30000,3000,0,0
+471,3000:2000:1000:1000:1000:1000:1000:1000:1000:1000,500,0,10000:20000:30000,3000,0,0
//-- SL_SKA
-472,3000:2000:1000,500,0,10000:20000:30000,0,0,0
+472,3000:2000:1000:1000:1000:1000:1000:1000:1000:1000,500,0,10000:20000:30000,0,0,0
//==========================================
//-- SM_SELFPROVOKE
-473,0,0,0,30000,0,0,0
+473,0,0,0,30000,0,0,-1
//===== Mixed Advanced Skills ==============
//-- ST_PRESERVE
-475,1000,0,0,600000,0,0,0
+475,0,0,0,600000,0,0,1000
//-- ST_FULLSTRIP
-476,0,1000,0,75000:90000:105000:120000:135000,0,0,0
+476,0,1000,0,75000:90000:105000:120000:135000,0,0,-1
//-- CR_SLIMPITCHER
-478,1000,1000,0,0,0,0,0
+478,1000,1000,0,0,0,0,1000
//-- CR_FULLPROTECTION
-479,2000,0,0,120000:240000:360000:480000:600000,0,0,0
+479,0,500,0,120000:240000:360000:480000:600000,0,0,1000
+
//-- PA_SHIELDCHAIN
480,1000,1000,0,0,0,0,0
+
//-- PF_DOUBLECASTING
482,2000,0,0,90000,0,0,0
+
//-- HW_GANBANTEIN
-483,3000,2000,0,0,0,0,0
+483,0,5000,0,0,0,0,3000
//-- HW_GRAVITATION
-484,5000,2000,0,5000:6000:7000:8000:9000,0,0,0
+484,0,5000:6000:7000:8000:9000,0,5000:6000:7000:8000:9000,0,0,5000
+
//-- WS_CARTTERMINATION
-485,0,0,0,0,5000,0,0
+485,0,0,0,0,5000,0,-1
//-- WS_OVERTHRUSTMAX
-486,0,0,0,180000,0,0,0
+486,0,0,0,180000,0,0,-1
+
//-- CG_LONGINGFREEDOM
-487,0,0,0,180000,0,0,0
+487,0,0,0,180000,0,0,-1
//-- CG_HERMODE
-488,0,0,0,10000:15000:20000:25000:30000,10000:15000:20000:25000:30000,0,0
+488,0,0,0,10000:15000:20000:25000:30000,10000:15000:20000:25000:30000,0,-1
//-- CG_TAROTCARD
-489,1000,3000,0,0,30000,0,0
+489,500,3000,0,0,30000,0,500
+
//-- CR_ACIDDEMONSTRATION
-490,1000,1000,0,0,0,0,0
+490,0,1000,0,0,0,0,1000
//-- CR_CULTIVATION
-491,0,0,0,300000,0,0,0
+491,0,0,0,300000,0,0,-1
//==========================================
//-- ITEM_ENCHANTARMS
-492,0,0,0,180000,0,0,0
+492,0,0,0,180000,0,0,-1
//===== Mixed Taekwon Skills ===============
//-- TK_MISSION
-493,1000,0,0,0,0,0,0
+493,0,0,0,0,0,0,1000
+
//-- SL_HIGH
-494,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+494,0,0,0,150000:200000:250000:300000:350000,0,0,1000
+
//-- KN_ONEHAND
-495,0,0,0,300000,0,0,0
+495,0,0,0,300000,0,0,-1
+
//-- AM_TWILIGHT1
-496,3000,10000,0,0,0,0,0
+496,0,0,0,0,0,0,3000
//-- AM_TWILIGHT2
-497,3000,10000,0,0,0,0,0
+497,0,0,0,0,0,0,3000
//-- AM_TWILIGHT3
-498,3000,10000,0,0,0,0,0
+498,0,0,0,0,0,0,3000
+
//-- HT_POWER
-499,0,0,0,100,0,0,0
+499,0,100,0,100,0,0,-1
//==========================================
//===== Gunslinger =========================
//-- GS_GLITTERING
-500,0,0,0,600000,0,0,0
+500,0,0,0,600000,0,0,-1
//-- GS_FLING
-501,0,0,0,30000,0,0,0
+501,0,0,0,30000,0,0,-1
//-- GS_BULLSEYE
-503,500,0,0,0,0,0,0
+503,1000,1000,0,0,0,0,0
//-- GS_MADNESSCANCEL
-504,3000,4000,0,15000,0,0,0
+504,2000,3000,0,15000,0,0,0
//-- GS_ADJUSTMENT
-505,1000,1000,0,30000,0,0,0
+505,1000,2000,0,30000,0,0,0
//-- GS_INCREASING
-506,0,1000,0,60000,0,0,0
+506,0,1000,0,60000,0,0,-1
//-- GS_CRACKER
-508,0,1000,0,0,5000,0,0
+508,0,1000,0,0,5000,0,-1
//-- GS_TRACKING
-512,1200:1400:1600:1800:2000:2200:2400:2600:2800:3000,0,0,0,0,0,0
+512,600:700:800:900:1000:1100:1200:1300:1400:1500,1500,0,0,0,0,600:700:800:900:1000:1100:1200:1300:1400:1500
//-- GS_DISARM
-513,0,0,0,30000,0,0,0
+513,2000,1000,0,30000,0,0,0
//-- GS_PIERCINGSHOT
-514,1500,0,0,0,120000,0,0
+514,1500,500,0,0,120000,0,0
//-- GS_RAPIDSHOWER
-515,0,1000,0,0,0,0,0
+515,0,1500,0,0,0,0,-1
//-- GS_DESPERADO
-516,0,1000,1000,1000,0,0,0
+516,0,1000,1000,1000,0,0,-1
//-- GS_GATLINGFEVER
-517,0,0,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0,0,0
+517,1000,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0,0,0
//-- GS_DUST
-518,1000,1000,0,0,0,0,0
+518,1500,1000,0,0,0,0,0
//-- GS_FULLBUSTER
-519,0,1200:1400:1600:1800:2000:2200:2400:2600:2800:3000,0,0,10000,0,0
+519,1000,1200:1400:1600:1800:2000:2200:2400:2600:2800:3000,0,0,10000,0,0
//-- GS_GROUNDDRIFT
-521,2000,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,10000,0,0
+521,1000,1000,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,10000,0,0
//==========================================
//===== Ninja ==============================
//-- NJ_KUNAI
-524,0,1000,0,0,0,0,0
+524,0,1000,0,0,0,0,-1
//-- NJ_HUUMA
525,3000,2000,0,100,0,0,0
//-- NJ_ZENYNAGE
-526,0,5000,0,0,0,0,0
+526,0,5000,0,0,0,0,-1
//-- NJ_TATAMIGAESHI
-527,0,3000,0,3000,3000,0,0
+527,0,3000,0,3000,3000,0,-1
//-- NJ_KASUMIKIRI
-528,0,1000,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,0
+528,0,1000,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,-1
//-- NJ_SHADOWJUMP
-529,0,1000,0,0,0,0,0
-//-- NJ_KIRIKAGE // Seems to have no delay (English Translation Project)
-530,0,0,0,0,0,0,0
+529,0,1000,0,0,0,0,-1
//-- NJ_UTSUSEMI
-531,0,1000,0,20000:30000:40000:50000:60000,0,0,0
+531,0,1000,0,20000:30000:40000:50000:60000,0,0,-1
//-- 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,0,0
//-- NJ_KOUENKA
-534,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,0,0,0,0,0,0
+534,700:1400:2100:2800:3500:4200:4800:5600:6300:7000,0,0,0,0,0,0
//-- NJ_KAENSIN
535,6000:5500:5000:4500:4000:3500:3000:2500:2000:1500,1000,0,20000,0,0,0
//-- NJ_BAKUENRYU
536,3000,2000,0,0,0,0,0
//-- NJ_HYOUSENSOU
-537,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,0,0,0,0,0,0
+537,700:1400:2100:2800:3500:4200:4800:5600:6300:7000,0,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,0,0
+538,3000,2000,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,0
//-- NJ_HYOUSYOURAKU
-539,2000:2500:3000:3500:4000,2000,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,0
+539,2000:2500:3000:3500:4000:4000:4000:4000:4000:4000,2000,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,0
//-- NJ_HUUJIN
-540,1000:1500:2000:2500:3000:3500:4000:5000:5500:6000,1000,0,0,0,0,0
+540,1000:1500:2000:2500:3000:3500:4000:4500:5000:5500,1000,0,0,0,0,0
//-- NJ_RAIGEKISAI
541,4000,0,0,100,0,0,0
//-- NJ_KAMAITACHI
542,4000,0,0,0,0,0,0
//-- NJ_NEN
-543,5000:4000:3000:2000:1000,0,0,30000:45000:60000:75000:90000,0,0,0
+543,5000:4000:3000:2000:1000:1000:1000:1000:1000:1000,0,0,30000:45000:60000:75000:90000,0,0,0
//==========================================
//===== Gangsi Branch and Other Skills =====
@@ -932,13 +930,14 @@
//568,1000:800:600:400:200,0,0,0,0,0
//-- SL_DEATHKNIGHT
-572,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+572,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_COLLECTOR
-573,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+573,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_NINJA
-574,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+574,0,0,0,150000:200000:250000:300000:350000,0,0,1000
//-- SL_GUNNER
-575,1000,500,0,150000:200000:250000:300000:350000,0,0,0
+575,0,0,0,150000:200000:250000:300000:350000,0,0,1000
+
//-- AM_TWILIGHT4
//576,3000,10000,0,0,0,0
@@ -964,135 +963,132 @@
//===== New Monster Skills =================
//-- NPC_ICEBREATH
-655,0,0,0,0,12000,0,0
+655,0,0,0,0,12000,0,-1
//-- NPC_ACIDBREATH
-657,0,0,0,0,60000,0,0
+657,0,0,0,0,60000,0,-1
//-- 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,0,0
+659,0,0,0,0,5000:30000:30000:120000,0,-1
//-- NPC_BLEEDING
-660,0,0,0,0,120000,0,0
+660,0,0,0,0,120000,0,-1
//-- NPC_HELLJUDGEMENT
-662,0,0,0,0,30000,0,0
+662,0,0,0,0,30000,0,-1
//-- NPC_WIDESILENCE
-663,0,0,0,0,30000,0,0
+663,0,0,0,0,30000,0,-1
//-- NPC_WIDEFREEZE
-664,0,0,0,0,12000,0,0
+664,0,0,0,0,12000,0,-1
//-- NPC_WIDEBLEEDING
-665,0,0,0,0,120000,0,0
+665,0,0,0,0,120000,0,-1
//-- NPC_WIDESTONE
-666,0,0,0,0,20000,0,0
+666,0,0,0,0,20000,0,-1
//-- NPC_WIDECONFUSE
-667,0,0,0,0,30000,0,0
+667,0,0,0,0,30000,0,-1
//-- NPC_WIDESLEEP
-668,0,0,0,0,30000,0,0
+668,0,0,0,0,30000,0,-1
//-- NPC_WIDESIGHT
-669,0,0,0,10000,0,0,0
+669,0,0,0,10000,0,0,-1
//-- NPC_EVILLAND
-670,0,0,0,30000,30000,0,0
+670,0,0,0,30000,30000,0,-1
//-- NPC_MAGICMIRROR
-671,0,0,0,30000,0,0,0
+671,0,0,0,30000,0,0,-1
//-- NPC_SLOWCAST
-672,0,0,0,0,30000,0,0
+672,0,0,0,0,30000,0,-1
//-- NPC_CRITICALWOUND
-673,0,0,0,0,30000,0,0
+673,0,0,0,0,30000,0,-1
//-- NPC_STONESKIN
-675,0,0,0,30000,0,0,0
+675,0,0,0,30000,0,0,-1
//-- NPC_ANTIMAGIC
-676,0,0,0,30000,0,0,0
+676,0,0,0,30000,0,0,-1
//-- NPC_WIDECURSE
-677,0,0,0,0,30000,0,0
+677,0,0,0,0,30000,0,-1
//-- NPC_WIDESTUN
-678,0,0,0,0,5000,0,0
+678,0,0,0,0,5000,0,-1
//==========================================
//===== New Monster Skills (12.1) ==========
//-- NPC_HELLPOWER
-683,0,0,0,0,300000,0,0
+683,0,0,0,0,300000,0,-1
//-- NPC_WIDEHELLDIGNITY
-684,0,0,0,0,300000,0,0
+684,0,0,0,0,300000,0,-1
//-- NPC_INVINCIBLE
-685,0,0,0,-1,0,0,0
+685,0,0,0,-1,0,0,-1
//-- NPC_INVINCIBLEOFF
-686,0,0,0,60000,0,0,0
-
+686,0,0,0,60000,0,0,-1
//===== Item Use-Only Skills ===============
//-- CASH_BLESSING
-689,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,0
+689,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,-1
//-- CASH_INCAGI
-690,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,0
+690,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,-1
//-- CASH_ASSUMPTIO
-691,0,0,0,20000:40000:60000:80000:100000,0,0,0
+691,0,0,0,20000:40000:60000:80000:100000,0,0,-1
+
//-- ALL_CATCRY
-692,0,5000,0,0,0,0,0
-//-- ALL_PARTYFLEE
-693,0,0,0,0,0,300000,0
+692,0,5000,0,0,0,0,-1
//-- ALL_DREAM_SUMMERNIGHT
-695,0,12000,0,0,0,0,0
-
+695,0,12000,0,0,0,0,-1
//-- ALL_WEWISH
-698,0,20000,0,0,0,0,0
+698,0,20000,0,0,0,0,-1
//==========================================
//===== 2nd Jobs Quest Skills ==============
//-- KN_CHARGEATK
-1001,300,300,0,0,0,0,0
+1001,250,0,0,0,0,0,250
//-- CR_SHRINK
-1002,0,0,0,300000,0,0,0
+1002,0,0,0,300000,0,0,-1
//-- AS_VENOMKNIFE
-1004,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,0
+1004,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,-1
//-- RG_CLOSECONFINE
-1005,0,0,0,10000,0,0,0
-//-- WZ_SIGHTBLASTER
-1006,2000,0,0,120000,0,0,0
+1005,0,0,0,10000,0,0,-1
+//-- WZ_SIGHTBLASTER
+1006,1600,0,0,120000,0,0,0
//-- SA_ELEMENTWATER
-1008,2000,1000,0,1800000,0,0,0
-//-- HT_PHANTASMIC
-1009,0,0,0,0,0,0,0
+1008,0,1000,0,1800000,0,0,2000
+
+
//-- BA_PANGVOICE
1010,1000,2000,0,17000,0,0,0
//-- DC_WINKCHARM (time1: Charm, time2: Confusion)
1011,1000,2000,0,10000,17000,0,0
-//-- BS_GREED
-1013,0,1000,0,0,0,0,0
+
//-- PR_REDEMPTIO
1014,4000,0,0,0,0,0,0
//-- MO_KITRANSLATION
-1015,2000,1000,0,600000,0,0,0
+1015,1000,1000,0,600000,0,0,1000
//-- MO_BALKYOUNG
-1016,0,2000,0,0,2000,0,0
+1016,0,2000,0,0,2000,0,-1
+
//-- SA_ELEMENTGROUND
-1017,2000,1000,0,1800000,0,0,0
+1017,0,1000,0,1800000,0,0,2000
//-- SA_ELEMENTFIRE
-1018,2000,1000,0,1800000,0,0,0
+1018,0,1000,0,1800000,0,0,2000
//-- SA_ELEMENTWIND
-1019,2000,1000,0,1800000,0,0,0
+1019,0,1000,0,1800000,0,0,2000
//==========================================
//===== Rune Knight ========================
//-- RK_ENCHANTBLADE
2001,1000,0,0,300000,0,0,-1
//-- RK_SONICWAVE
-2002,0,1000,0,0,0,2000,0
+2002,0,1000,0,0,0,2000,-1
//-- RK_DEATHBOUND
-2003,0,2000,0,2000,0,3000,0
+2003,0,2000,0,2000,0,3000,-1
//-- RK_HUNDREDSPEAR
2004,1000:900:800:700:600:500:400:300:200:100,500,0,0,0,3000,-1
//-- RK_WINDCUTTER
-2005,0,2000,0,0,0,2000,0
+2005,0,2000,0,0,0,2000,-1
//-- RK_IGNITIONBREAK
2006,1000,0,0,0,0,2000,-1
//-- RK_DRAGONBREATH
2008,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,10000,0,0,500
//-- RK_DRAGONHOWLING
-2009,0,0,0,15000,0,10000,0
+2009,0,0,0,15000,0,10000,-1
//-- RK_MILLENNIUMSHIELD
-2011,0,1000,0,180000,0,60000,0
+2011,0,1000,0,180000,0,60000,-1
//-- RK_CRUSHSTRIKE
2012,0,0,0,180000,0,30000,1000
//-- RK_REFRESH
@@ -1102,49 +1098,47 @@
//-- RK_STONEHARDSKIN
2015,0,0,0,180000,10000,0,2000
//-- RK_VITALITYACTIVATION
-2016,0,0,0,180000,0,0,0
+2016,0,0,0,180000,0,0,-1
//-- RK_STORMBLAST
2017,0,0,0,0,0,0,2000
//-- RK_FIGHTINGSPIRIT
-2018,0,0,0,180000,0,0,0
+2018,0,0,0,180000,0,0,-1
//-- RK_ABUNDANCE
-2019,0,0,0,180000,0,0,0
+2019,0,0,0,180000,0,0,-1
//==========================================
//===== Gillotine Cross ====================
//-- GC_VENOMIMPRESS
-2021,0,3000:2500:2000:1500:1000,0,10000:20000:30000:40000:50000,0,0,0
+2021,0,3000:2500:2000:1500:1000,0,10000:20000:30000:40000:50000,0,0,-1
//-- GC_CROSSIMPACT
-2022,0,2500:2000:1500:1000:500,0,0,0,0,0
+2022,0,2500:2000:1500:1000:500,0,0,0,0,-1
//-- GC_DARKILLUSION
-2023,0,1500,0,0,0,0,0
+2023,0,1500,0,0,0,0,-1
//-- GC_CREATENEWPOISON
-2025,0,500,0,0,0,0,0
-//-- GC_ANTIDOTE
-2026,0,0,0,0,0,0,0
+2025,0,500,0,0,0,0,-1
//-- GC_POISONINGWEAPON
-2027,0,1000,0,60000:120000:180000:240000:300000,300000,0,0
+2027,0,1000,0,60000:120000:180000:240000:300000,300000,0,-1
//-- GC_WEAPONBLOCKING
-2028,0,2000,0,180000,0,0,0
+2028,0,2000,0,180000,0,0,-1
//-- GC_COUNTERSLASH
-2029,0,2000,0,0,0,0,0
+2029,0,2000,0,0,0,0,-1
//-- GC_WEAPONCRUSH
-2030,0,1000,0,60000,0,0,0
+2030,0,1000,0,60000,0,0,-1
//-- GC_VENOMPRESSURE
-2031,0,1000,0,0,0,0,0
+2031,0,1000,0,0,0,0,-1
//-- GC_POISONSMOKE
2032,0,2000,0,6000:8000:10000:12000:14000,0,0,2000
//-- GC_CLOAKINGEXCEED
-2033,0,2000,0,0,0,0,0
+2033,0,2000,0,0,0,0,-1
//-- GC_PHANTOMMENACE
-2034,0,1000,0,0,0,0,0
+2034,0,1000,0,0,0,0,-1
//-- GC_HALLUCINATIONWALK
-2035,0,0,0,30000:35000:40000:45000:50000,25000,300000,0
+2035,0,0,0,30000:35000:40000:45000:50000,25000,300000,-1
//-- GC_ROLLINGCUTTER
-2036,0,200,0,3000,0,0,0
+2036,0,200,0,3000,0,0,-1
//-- GC_CROSSRIPPERSLASHER
-2037,0,1000,0,0,0,0,0
+2037,0,1000,0,0,0,0,-1
//==========================================
//===== Arch Bishop ========================
@@ -1188,7 +1182,7 @@
//===== Warlock ============================
//-- WL_WHITEIMPRISON
-2201,0,0,0,6000:8000:10000:12000:14000,15000,4000,0
+2201,0,0,0,6000:8000:10000:12000:14000,15000,4000,-1
//-- WL_SOULEXPANSION
2202,2000,500,0,0,0,0,-1
//-- WL_FROSTMISTY
@@ -1242,45 +1236,45 @@
//-- RA_AIMEDBOLT
2236,4000,1000,0,0,0,0,500
//-- RA_DETONATOR
-2237,0,0,0,1000,0,0,0
+2237,0,0,0,1000,0,0,-1
//-- RA_ELECTRICSHOCKER
-2238,0,0,0,15000,20000:22000:24000:26000,0,0
+2238,0,0,0,15000,20000:22000:24000:26000,0,-1
//-- RA_CLUSTERBOMB
-2239,0,0,0,15000,0,0,0
+2239,0,0,0,15000,0,0,-1
//-- RA_WUGMASTERY
-2240,0,1000,0,0,0,0,0
+2240,0,1000,0,0,0,0,-1
//-- RA_WUGRIDER
-2241,0,500,0,0,0,0,0
+2241,0,500,0,0,0,0,-1
//-- RA_WUGBITE
-2244,0,2000,0,1000:2000:3000:4000:5000,0,4000:6000:8000:10000:12000,0
+2244,0,2000,0,1000:2000:3000:4000:5000,0,4000:6000:8000:10000:12000,-1
//-- RA_SENSITIVEKEEN
-2246,0,3000,0,0,0,0,0
+2246,0,3000,0,0,0,0,-1
//-- RA_CAMOUFLAGE
-2247,0,0,0,10000,0,0,0
+2247,0,0,0,10000,0,0,-1
//-- RA_MAGENTATRAP
-2249,0,2000,0,15000,10000,0,0
+2249,0,2000,0,15000,10000,0,-1
//-- RA_COBALTTRAP
-2250,0,2000,0,15000,10000,0,0
+2250,0,2000,0,15000,10000,0,-1
//-- RA_MAIZETRAP
-2251,0,2000,0,15000,10000,0,0
+2251,0,2000,0,15000,10000,0,-1
//-- RA_VERDURETRAP
-2252,0,2000,0,15000,10000,0,0
+2252,0,2000,0,15000,10000,0,-1
//-- RA_FIRINGTRAP
-2253,0,0,0,20000,15000,0,0
+2253,0,0,0,20000,15000,0,-1
//-- RA_ICEBOUNDTRAP
-2254,0,0,0,20000,15000,0,0
+2254,0,0,0,20000,15000,0,-1
//==========================================
//===== Mechanic ===========================
//-- NC_BOOSTKNUCKLE
2256,200:400:600:800:1000,0,0,0,0,0,-1
//-- NC_PILEBUNKER
-2257,0,2000,0,0,0,5000,0
+2257,0,2000,0,0,0,5000,-1
//-- NC_VULCANARM
-2258,0,300:200:100,0,0,0,0,0
+2258,0,300:200:100,0,0,0,0,-1
//-- NC_FLAMELAUNCHER
2259,1000:1500:2000,1500:1000:500,0,7000:14000:21000,0,0,500
//-- NC_COLDSLOWER
@@ -1288,24 +1282,24 @@
// -- NC_ARMSCANNON
2261,1400:1600:1800,500:1000:2000,0,0,0,0,600:400:200
//-- NC_ACCELERATION
-2262,0,0,0,30000:60000:90000,0,0,0
+2262,0,0,0,30000:60000:90000,0,0,-1
//-- NC_HOVERING
-2263,0,0,0,90000,0,0,0
+2263,0,0,0,90000,0,0,-1
//-- NC_F_SIDESLIDE
-2264,0,500,0,0,0,0,0
+2264,0,500,0,0,0,0,-1
//-- NC_B_SIDESLIDE
-2265,0,500,0,0,0,0,0
+2265,0,500,0,0,0,0,-1
//-- NC_SELFDESTRUCTION
2267,2000:1500:1000,0,0,0,0,300000,500
//-- NC_SHAPESHIFT
2268,0,2000,0,300000,0,0,2000
//-- NC_EMERGENCYCOOL
-2269,0,500,0,0,0,5000,0
+2269,0,500,0,0,0,5000,-1
//-- NC_INFRAREDSCAN
-2270,0,500,0,3000,0,3000,0
+2270,0,500,0,3000,0,3000,-1
//-- NC_ANALYZE
-2271,0,1000,0,20000,0,0,0
+2271,0,1000,0,20000,0,0,-1
//-- NC_MAGNETICFIELD
2272,500:1000:1500,0,0,15000,0,20000:15000:10000,-1
//-- NC_NEUTRALBARRIER
@@ -1316,11 +1310,11 @@
2275,200:300:400:500:600,1000,0,0,0,0,-1
//-- NC_AXEBOOMERANG
-2278,0,0,0,0,0,5000:4500:4000:3500:3000,0
+2278,0,0,0,0,0,5000:4500:4000:3500:3000,-1
//-- NC_POWERSWING
-2279,0,1000,0,2000,0,0,0
+2279,0,1000,0,2000,0,0,-1
//-- NC_AXETORNADO
-2280,0,500,0,0,0,4000:3500:3000:2500:2000,0
+2280,0,500,0,0,0,4000:3500:3000:2500:2000,-1
//-- NC_SILVERSNIPER
2281,0,0,0,20000:30000:40000:50000:60000,0,0,1800:1600:1400:1200:1000
//-- NC_MAGICDECOY
@@ -1331,21 +1325,21 @@
//===== Shadow Chaser ======================
//-- SC_FATALMENACE
-2284,0,500,0,0,0,0,0
+2284,0,500,0,0,0,0,-1
//-- SC_REPRODUCE
-2285,0,1000,0,60000,0,0,0
+2285,0,1000,0,60000,0,0,-1
//-- SC_AUTOSHADOWSPELL
2286,4000:3600:3200:2800:2400:2000:1600:1200:800:400,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:300000,0,0,2000
//-- SC_SHADOWFORM
-2287,0,1000,0,30000:40000:50000:60000:70000,0,0,0
+2287,0,1000,0,30000:40000:50000:60000:70000,0,0,-1
//-- SC_TRIANGLESHOT
2288,1000,500,0,0,0,0,-1
//-- SC_BODYPAINT
-2289,0,1000,0,5000:7000:9000:11000:13000,0,2000,0
+2289,0,1000,0,5000:7000:9000:11000:13000,0,2000,-1
//-- SC_INVISIBILITY
2290,1000,1000,0,20000,0,20000:30000:40000:50000:60000,-1
//-- SC_DEADLYINFECT
-2291,0,1000,0,10000:15000:20000:25000:30000,0,2000,0
+2291,0,1000,0,10000:15000:20000:25000:30000,0,2000,-1
//-- SC_ENERVATION
2292,2000,1000,0,10000:15000:20000,0,2000,-1
//-- SC_GROOMY
@@ -1376,20 +1370,20 @@
//==== Royal Guard skills ==================
//-- LG_CANNONSPEAR
-2307,0,0,0,0,0,2000,0
+2307,0,0,0,0,0,2000,-1
//-- LG_TRAMPLE
-2309,0,0,0,0,0,1000,0
+2309,0,0,0,0,0,1000,-1
//-- LG_SHIELDPRESS
-2310,0,0,0,3500:4000:4500:5000:5500,0,2000,0
+2310,0,0,0,3500:4000:4500:5000:5500,0,2000,-1
//-- LG_REFLECTDAMAGE
-2311,0,0,0,300000,0,0,0
+2311,0,0,0,300000,0,0,-1
//-- LG_PINPOINTATTACK
-2312,0,1000,0,5000,0,5000,0
+2312,0,1000,0,5000,0,5000,-1
//-- LG_FORCEOFVANGUARD
-2313,0,1000,0,300000,0,0,0
+2313,0,1000,0,300000,0,0,-1
//-- LG_RAGEBURST
-2314,0,3000,0,0,0,0,0
+2314,0,3000,0,0,0,0,-1
//-- LG_SHIELDSPELL //TODO apply proper duration [malufett]
2315,1000,1000,0,3000:30000:30000,0,2000,0
//-- LG_EXEEDBREAK
@@ -1399,7 +1393,7 @@
//-- LG_PRESTIGE
2318,1000,0,0,30000:45000:60000:75000:90000,0,60000,2000
//-- LG_BANDING
-2319,0,0,0,-1,2000:4000:6000:8000:10000,0,0
+2319,0,0,0,-1,2000:4000:6000:8000:10000,0,-1
//-- LG_MOONSLASHER
2320,1000,1000,0,0,0,6000:5000:4000:3000:2000,0
//-- LG_RAYOFGENESIS
@@ -1416,42 +1410,42 @@
//===== Sura Skills ========================
//-- SR_DRAGONCOMBO
-2326,0,0,0,3000,0,0,0
+2326,0,0,0,3000,0,0,-1
//-- SR_SKYNETBLOW
-2327,0,500,0,0,0,0,0
+2327,0,500,0,0,0,0,-1
//-- SR_EARTHSHAKER
-2328,0,0,0,1000,0,3000,0
+2328,0,0,0,1000,0,3000,-1
//-- SR_FALLENEMPIRE
-2329,0,0,0,500:1000:1500:2000:2500,0,0,0
+2329,0,0,0,500:1000:1500:2000:2500,0,0,-1
//-- SR_TIGERCANNON
2330,1100:1200:1300:1400:1500:1600:1700:1800:1900:2000,1000,0,0,0,5000,-1
//-- SR_RAMPAGEBLASTER
-2332,0,1000,0,0,0,10000,0
+2332,0,1000,0,0,0,10000,-1
//-- SR_CRESCENTELBOW
-2333,0,1000,0,3000:4000:5000:6000:7000,0,5000,0
+2333,0,1000,0,3000:4000:5000:6000:7000,0,5000,-1
//-- SR_CURSEDCIRCLE
-2334,0,1000,0,3000:4000:5000:6000:7000,0,10000,0
+2334,0,1000,0,3000:4000:5000:6000:7000,0,10000,-1
//-- SR_LIGHTNINGWALK
-2335,0,1000,0,5000:6000:7000:8000:9000,0,5000,0
+2335,0,1000,0,5000:6000:7000:8000:9000,0,5000,-1
//-- SR_KNUCKLEARROW
-2336,0,1000,0,0,0,0,0
+2336,0,1000,0,0,0,0,-1
//-- SR_WINDMILL
2337,1000,500,0,0,0,3000,-1
//-- SR_RAISINGDRAGON
-2338,0,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0,30000,0
+2338,0,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0,30000,-1
//-- SR_ASSIMILATEPOWER
-2340,0,1000,0,0,0,5000,0
+2340,0,1000,0,0,0,5000,-1
//-- SR_POWERVELOCITY
2341,1500,0,0,0,0,0,500
//-- SR_GATEOFHELL
2343,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,100:200:300:400:500:600:700:800:900:1000,0,0,0,0,-1
//-- SR_GENTLETOUCH_QUIET
-2344,0,0,0,5000:7000:9000:11000:13000,0,1000:1500:2000:2500:3000,0
+2344,0,0,0,5000:7000:9000:11000:13000,0,1000:1500:2000:2500:3000,-1
//-- SR_GENTLETOUCH_CURE
-2345,0,1000,0,0,0,1000:1500:2000:2500:3000,0
+2345,0,1000,0,0,0,1000:1500:2000:2500:3000,-1
//-- SR_GENTLETOUCH_ENERGYGAIN
2346,1000,1000,0,240000,0,0,1000:1500:2000:2500:3000
//-- SR_GENTLETOUCH_CHANGE
@@ -1471,7 +1465,7 @@
//==== Minstresl skills ====================
//-- MI_RUSH_WINDMILL
-2381,0,2000,0,60000,0,0,0
+2381,0,2000,0,60000,0,0,-1
//-- MI_ECHOSONG
2382,1000,2000,0,60000,0,0,-1
//-- MI_HARMONIZE
@@ -1485,7 +1479,7 @@
2414,1100:1200:1300:1400:1500,1000,0,9000:10000:11000:12000:13000,0,0,-1
//-- WM_DOMINION_IMPULSE
-2417,0,1000,0,0,0,0,0
+2417,0,1000,0,0,0,0,-1
//-- WM_SEVERE_RAINSTORM
2418,1000:1500:2000:2500:3000,1000,0,900:1500:2100:2700:3000,0,5000:5500:6000:6500:7000,500
//-- WM_POEMOFNETHERWORLD
@@ -1499,7 +1493,7 @@
//-- WM_SIRCLEOFNATURE
2423,2000,1000,0,60000,0,15000,-1
//-- WM_RANDOMIZESPELL
-2424,0,1000,0,0,0,3000,0
+2424,0,1000,0,0,0,3000,-1
//-- WM_GLOOMYDAY
2425,1000,1000,0,30000:45000:60000:75000:90000,0,10000,500
//-- WM_GREAT_ECHO
@@ -1534,7 +1528,7 @@
//-- SO_DIAMONDDUST
2447,5000:5500:6000:6500:7000,1000,0,500,12000:14000:16000:18000:20000,5000,800:600:400:200:-1
//-- SO_POISON_BUSTER
-2450,2200:3400:4600:5800:7000,1000,0,0,0,2000,800:600:400:200:-1
+2448,2200:3400:4600:5800:7000,1000,0,0,0,2000,800:600:400:200:-1
//-- SO_PSYCHIC_WAVE
2449,8000:9000:10000:11000:12000,1000,0,1200:1700:2200:2700:3200,0,5000,1000:900:800:700:600
//-- SO_CLOUD_KILL
@@ -1578,7 +1572,7 @@
//==== Genetic skills ======================
//-- GN_CART_TORNADO
-2476,0,500,0,5000,0,0:500:1000:1500:2000,0
+2476,0,500,0,5000,0,0:500:1000:1500:2000,-1
//-- GN_CARTCANNON
2477,1000:1500:2000:2500:3000,500,0,0,0,0,-1
//-- GN_CARTBOOST
@@ -1594,28 +1588,28 @@
//-- GN_CRAZYWEED
2483,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500,500,0,0,0,5000,0
//-- GN_CRAZYWEED_ATK
-2484,0,0,0,100,0,0,0
+2484,0,0,0,100,0,0,-1
//-- GN_DEMONIC_FIRE
2485,3000:3500:4000:4500:5000,500,0,10000:12000:14000:16000:18000,15000,5000,-1
//-- GN_FIRE_EXPANSION
2486,2000,500,0,0,0,0,-1
//-- GN_FIRE_EXPANSION_SMOKE_POWDER
-2487,0,0,0,10000:12000:14000:16000:18000,0,0,0
+2487,0,0,0,10000:12000:14000:16000:18000,0,0,-1
//-- GN_FIRE_EXPANSION_TEAR_GAS
-2488,0,0,0,10000:12000:14000:16000:18000,0,0,0
+2488,0,0,0,10000:12000:14000:16000:18000,0,0,-1
//-- GN_HELLS_PLANT
2490,3000:3500:4000:4500:5000,500,0,14000:21000:28000:35000:42000,0,0,-1
//-- GN_HELLS_PLANT_ATK
-2491,0,0,0,20000,0,0,0
+2491,0,0,0,20000,0,0,-1
//-- GN_MANDRAGORA
2492,1000,500,0,10000:15000:20000:25000:30000,0,15000,-1
//-- GN_SLINGITEM
-2493,0,0,0,77000,10000,1000,0
+2493,0,0,0,77000,10000,1000,-1
//-- GN_SLINGITEM_RANGEMELEEATK
-2498,0,0,0,3000,0,0,0
+2498,0,0,0,3000,0,0,-1
//==========================================
//===== Extra 3rd Class Skills =============
@@ -1641,25 +1635,25 @@
//==== Kagerou & Oboro skills ==============
//-- KO_YAMIKUMO
-3001,0,0,0,60000,0,0,0
+3001,0,0,0,60000,0,0,-1
//-- KO_JYUMONJIKIRI
-3004,0,2500,0,5000,0,0,0
+3004,0,2500,0,5000,0,0,-1
//-- KO_SETSUDAN
-3005,0,2000,0,0,0,0,0
+3005,0,2000,0,0,0,0,-1
//-- KO_BAKURETSU
3006,1000:1500:2000:2500:3000,1000,0,100,0,3000,0
//-- KO_HAPPOKUNAI
-3007,0,1000,0,0,0,0,0
+3007,0,1000,0,0,0,0,-1
//-- KO_MUCHANAGE
-3008,0,0,0,100,0,10000,0
+3008,0,0,0,100,0,10000,-1
//-- KO_HUUMARANKA
-3009,0,3000,0,500,0,0,0
+3009,0,3000,0,500,0,0,-1
//-- KO_MAKIBISHI
-3010,0,0,0,12000:14000:16000:18000:20000,10000,0,0
+3010,0,0,0,12000:14000:16000:18000:20000,10000,0,-1
//-- KO_MEIKYOUSISUI
3011,3000,0,0,10000,0,0,0
//-- KO_ZANZOU
-3012,0,0,0,27000:24000:21000:18000:15000,0,0,0
+3012,0,0,0,27000:24000:21000:18000:15000,0,0,-1
//-- KO_KYOUGAKU
3013,1000,0,0,12000:14000:16000:18000:20000,0,0,0
//-- KO_JYUSATSU
@@ -1679,46 +1673,46 @@
//-- KO_GENWAKU
3021,500,0,0,5000,0,0,0
//-- KO_IZAYOI
-3022,0,0,0,30000:45000:60000:75000:90000,0,60000,0
+3022,0,0,0,30000:45000:60000:75000:90000,0,60000,-1
//-- KG_KAGEHUMI
-3023,0,0,0,5000,0,5000,0
+3023,0,0,0,5000,0,5000,-1
//-- KG_KYOMU
-3024,0,0,0,10000:15000:20000:25000:30000,0,0,0
+3024,0,0,0,10000:15000:20000:25000:30000,0,0,-1
//-- KG_KAGEMUSYA
-3025,0,0,0,60000:90000:120000:15000:180000,0,0,0
+3025,0,0,0,60000:90000:120000:15000:180000,0,0,-1
//-- OB_ZANGETSU
-3026,0,0,0,60000:75000:90000:105000:120000,0,0,0
+3026,0,0,0,60000:75000:90000:105000:120000,0,0,-1
//-- OB_OBOROGENSOU
-3027,0,0,0,10000:15000:20000:25000:30000,0,0,0
+3027,0,0,0,10000:15000:20000:25000:30000,0,0,-1
//-- OB_AKAITSUKI
-3029,0,0,0,10000:15000:20000:25000:30000,0,0,0
+3029,0,0,0,10000:15000:20000:25000:30000,0,0,-1
//==========================================
//===== Homunculus Skills ==================
//-- HLIF_HEAL
-8001,0,2000,0,0,0,0,0
+8001,0,2000,0,0,0,0,-1
//-- HLIF_AVOID
-8002,0,35000,0,40000:35000:30000:25000:20000,0,0,0
+8002,0,35000,0,40000:35000:30000:25000:20000,0,0,-1
//-- HLIF_CHANGE
-8004,0,600000:900000:1200000,0,60000:120000:180000,0,0,0
+8004,0,600000:900000:1200000,0,60000:120000:180000,0,0,-1
//-- HAMI_CASTLE
-8005,0,0,0,0,60000:70000:80000:90000:129000,0,0
+8005,0,0,0,0,60000:70000:80000:90000:129000,0,-1
//-- HAMI_DEFENCE
-8006,0,0,0,40000:35000:30000:25000:20000,0,0,0
+8006,0,0,0,40000:35000:30000:25000:20000,0,0,-1
//-- HAMI_BLOODLUST
-8008,0,0,0,60000:180000:300000,300000:600000:900000,0,0
+8008,0,0,0,60000:180000:300000,300000:600000:900000,0,-1
//-- HFLI_MOON
-8009,0,0,1000,0,0,0,0
+8009,0,0,1000,0,0,0,-1
//-- HFLI_FLEET
-8010,0,0,0,60000:55000:50000:45000:40000,60000:70000:80000:90000:120000,0,0
+8010,0,0,0,60000:55000:50000:45000:40000,60000:70000:80000:90000:120000,0,-1
//-- HFLI_SPEED
-8011,0,0,0,60000:55000:50000:45000:40000,60000:70000:80000:90000:120000,0,0
+8011,0,0,0,60000:55000:50000:45000:40000,60000:70000:80000:90000:120000,0,-1
//-- HVAN_CAPRICE
-8013,0,1000:1200:1400:1600:1800,0,0,0,0,0
+8013,0,1000:1200:1400:1600:1800,0,0,0,0,-1
//-- HVAN_CHAOTIC
-8014,0,1000,1000,0,0,0,0
+8014,0,1000,1000,0,0,0,-1
//-- HVAN_EXPLOSION
-8016,0,0,1000,0,0,0,0
+8016,0,0,1000,0,0,0,-1
//==========================================
//-- MH_SUMMON_LEGION
@@ -1900,17 +1894,17 @@
//===== Guild Skills =======================
//-- GD_LEADERSHIP
-10006,0,0,0,300000,0,0,0
+10006,0,0,0,300000,0,0,-1
//-- GD_GLORYWOUNDS
-10007,0,0,0,300000,0,0,0
+10007,0,0,0,300000,0,0,-1
//-- GD_SOULCOLD
-10008,0,0,0,300000,0,0,0
+10008,0,0,0,300000,0,0,-1
//-- GD_HAWKEYES
-10009,0,0,0,300000,0,0,0
+10009,0,0,0,300000,0,0,-1
//-- GD_BATTLEORDER
-10010,0,0,0,180000,300000,0,0
+10010,0,0,0,180000,300000,0,-1
//-- GD_REGENERATION
-10011,0,0,0,60000,300000,0,0
+10011,0,0,0,60000,300000,0,-1
//-- GD_RESTORE
10012,10000,0,0,0,300000,0,0
//-- GD_EMERGENCYCALL
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index 340ad37fb..177d54941 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -587,7 +587,7 @@
541,9,6,2,4,0x2,2:2:3:3:4,5,1,yes,0,0,0,magic,0, NJ_RAIGEKISAI,Lightning Strike of Destruction
542,9,8,1,4,0,3,5,1,yes,0,0,5:6:7:8:9,magic,0, NJ_KAMAITACHI,Kamaitachi
543,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0, NJ_NEN,Soul
-544,-5,6,1,0,0x40,0,10,1,no,0,0,0,weapon,0, NJ_ISSEN,Final Strike
+544,-5,8,1,0,0x40,0,10,1,no,0,0,0,weapon,0, NJ_ISSEN,Final Strike
// Additional NPC Skills (Episode 11.3)
653,0,8,4,0,0x6,5:7:9:11:13:5:7:9:11:13,10,1,no,0,0x2,0,magic,0, NPC_EARTHQUAKE,Earthquake
diff --git a/src/map/battle.c b/src/map/battle.c
index 13e740e88..57e5abfbc 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2059,16 +2059,16 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
switch (skill_id)
{ //Calc base damage according to skill
- case NJ_ISSEN:
- wd.damage = 40*sstatus->str +skill_lv*(sstatus->hp/10 + 35);
- wd.damage2 = 0;
- status_set_hp(src, 1, 0);
- break;
case PA_SACRIFICE:
wd.damage = (int64)sstatus->max_hp* 9/100;
wd.damage2 = 0;
break;
#ifndef RENEWAL
+ case NJ_ISSEN:
+ wd.damage = 40*sstatus->str +skill_lv*(sstatus->hp/10 + 35);
+ wd.damage2 = 0;
+ status_set_hp(src, 1, 0);
+ break;
case LK_SPIRALPIERCE:
case ML_SPIRALPIERCE:
if (sd) {
@@ -2478,6 +2478,11 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
skillratio += 20*(skill_lv-1);
#endif
break;
+#ifdef RENEWAL
+ case NJ_ISSEN:
+ skillratio += 100 * (skill_lv-1);
+ break;
+#endif
case NJ_HUUMA:
skillratio += 50 + 150*skill_lv;
break;
@@ -2960,6 +2965,18 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
case NJ_SYURIKEN:
ATK_ADD(4*skill_lv);
break;
+#ifdef RENEWAL
+ case NJ_ISSEN:
+ // Damage = (current HP + atk * skill_lv) - (sdef+edef)
+ ATK_ADD(sstatus->hp);
+ wd.damage2 = 0;// needs more info if this really 0 for dual weilding KG/OB. [malufett]
+ status_set_hp(src, max(sstatus->hp/100, 1), 0);
+ if( sc && sc->data[SC_BUNSINJYUTSU] && (i=sc->data[SC_BUNSINJYUTSU]->val2) > 0){
+ wd.div_ = -( i + 2 ); // mirror image number of hits + 2
+ ATK_ADDRATE(20 + i*20); // (20 + 20 * mirror image) %
+ }
+ break;
+#endif
case HT_FREEZINGTRAP:
if(sd)
ATK_ADD( 40 * pc_checkskill(sd, RA_RESEARCHTRAP) );
@@ -3187,6 +3204,12 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
if( src->type == BL_MOB && (skill=pc_checkskill(tsd,RA_RANGERMAIN))>0 &&
(sstatus->race == RC_BRUTE || sstatus->race == RC_FISH || sstatus->race == RC_PLANT) )
vit_def += skill*5;
+#ifdef RENEWAL
+ if( skill == NJ_ISSEN ){//TODO: do better implementation if other skills(same func) are found [malufett]
+ vit_def += def1;
+ def1 = 0;
+ }
+#endif
}
else { //Mob-Pet vit-eq
#ifndef RENEWAL
diff --git a/src/map/skill.c b/src/map/skill.c
index b9b05013c..918d10b53 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3699,49 +3699,35 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
status_change_end(src, SC_HIDING, INVALID_TIMER);
// fall through
case MO_EXTREMITYFIST:
- if( skill_id == MO_EXTREMITYFIST )
{
- status_change_end(src, SC_EXPLOSIONSPIRITS, INVALID_TIMER);
- status_change_end(src, SC_BLADESTOP, INVALID_TIMER);
+ short x, y, i = 2; // Move 2 cells for Issen(from target)
+ struct block_list *mbl = bl;
+ short dir = 0;
+
+ if( skill_id == MO_EXTREMITYFIST )
+ {
+ mbl = src;
+ i = 3; // for Asura(from caster)
+ status_change_end(src, SC_EXPLOSIONSPIRITS, INVALID_TIMER);
+ status_change_end(src, SC_BLADESTOP, INVALID_TIMER);
#ifdef RENEWAL
- sc_start(src,SC_EXTREMITYFIST2,100,skill_lv,skill_get_time(skill_id,skill_lv));
+ sc_start(src,SC_EXTREMITYFIST2,100,skill_lv,skill_get_time(skill_id,skill_lv));
#endif
- }
- //Client expects you to move to target regardless of distance
- {
- struct unit_data *ud = unit_bl2ud(src);
- short dx,dy;
- int i,speed;
- i = skill_id == MO_EXTREMITYFIST?1:2; //Move 2 cells for Issen, 1 for Asura
- dx = bl->x - src->x;
- dy = bl->y - src->y;
- if (dx < 0) dx-=i;
- else if (dx > 0) dx+=i;
- if (dy < 0) dy-=i;
- else if (dy > 0) dy+=i;
- if (!dx && !dy) dy++;
- if (map_getcell(src->m, src->x+dx, src->y+dy, CELL_CHKNOPASS))
- {
- dx = bl->x;
- dy = bl->y;
- } else {
- dx = src->x + dx;
- dy = src->y + dy;
}
-
skill_attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag);
- if(unit_walktoxy(src, dx, dy, 2) && ud) {
- //Increase can't walk delay to not alter your walk path
- ud->canmove_tick = tick;
- speed = status_get_speed(src);
- for (i = 0; i < ud->walkpath.path_len; i ++)
- {
- if(ud->walkpath.path[i]&1)
- ud->canmove_tick+=7*speed/5;
- else
- ud->canmove_tick+=speed;
- }
+ dir = map_calc_dir(src,bl->x,bl->y);
+ if( dir > 0 && dir < 4) x = -i;
+ else if( dir > 4 ) x = i;
+ else x = 0;
+ if( dir > 2 && dir < 6 ) y = -i;
+ else if( dir == 7 || dir < 2 ) y = i;
+ else y = 0;
+ if( (mbl == src || !map_flag_gvg(src->m) && !map[src->m].flag.battleground) && // only NJ_ISSEN don't have slide effect in GVG
+ unit_movepos(src, mbl->x+x, mbl->y+y, 1, 1) ) {
+ clif_slide(src, src->x, src->y);
+ //uncomment this if you want to remove MO_EXTREMITYFIST glitchy walking effect. [malufett]
+ //clif_fixpos(src);
}
}
break;
@@ -4140,11 +4126,11 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
short x, y;
short dir = map_calc_dir(src,bl->x,bl->y);
- if( dir > 4 ) x = -1;
- else if( dir > 0 && dir < 4 ) x = 1;
+ if( dir > 0 && dir < 4) x = 2;
+ else if( dir > 4 ) x = -2;
else x = 0;
- if( dir < 3 || dir > 5 ) y = -1;
- else if( dir > 3 && dir < 5 ) y = 1;
+ if( dir > 2 && dir < 6 ) y = 2;
+ else if( dir == 7 || dir < 2 ) y = -2;
else y = 0;
if( unit_movepos(src, bl->x+x, bl->y+y, 1, 1) )
@@ -6915,7 +6901,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
}
clif_skill_nodamage(src,bl,skill_id,skill_lv,
sc_start4(bl,type,100,skill_lv,skill_id,src->id,skill_get_time(skill_id,skill_lv),1000));
+#ifndef RENEWAL
if (sd) skill_blockpc_start (sd, skill_id, skill_get_time(skill_id, skill_lv)+3000);
+#endif
break;
case PF_MINDBREAKER:
@@ -7832,20 +7820,19 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
{
int rate = ( sd? sd->status.job_level : 50 ) / 4;
- if(src == bl ) rate = 100; // Success Chance: On self, 100%
+ if( src == bl ) rate = 100; // Success Chance: On self, 100%
else if(bl->type == BL_PC) rate += 20 + 10 * skill_lv; // On Players, (20 + 10 * Skill Level) %
else rate += 40 + 10 * skill_lv; // On Monsters, (40 + 10 * Skill Level) %
+
+ if( sd )
+ skill_blockpc_start(sd,skill_id,4000);
if( !(tsc && tsc->data[type]) ){
- i = sc_start2(bl,type,rate,skill_lv,src->id,(src == bl)?5000:(bl->type == BL_PC)?skill_get_time(skill_id,skill_lv):skill_get_time2(skill_id, skill_lv));
- clif_skill_nodamage(src,bl,skill_id,skill_lv,i);
+ if( i )
+ break;
}
-
- if( sd && i )
- skill_blockpc_start(sd,skill_id,4000); // Reuse Delay only activated on success
- else if(sd)
- clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
- }else if( sd )
+ }
+ if( sd )
clif_skill_fail(sd,skill_id,USESKILL_FAIL_TOTARGET,0);
break;
@@ -9368,16 +9355,8 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr_t data)
#endif
}
if (target && target->m == src->m)
- { //Move character to target anyway.
- int dx,dy;
- dx = target->x - src->x;
- dy = target->y - src->y;
- if(dx > 0) dx++;
- else if(dx < 0) dx--;
- if (dy > 0) dy++;
- else if(dy < 0) dy--;
-
- if (unit_movepos(src, src->x+dx, src->y+dy, 1, 1))
+ { //Move character to target anyway.
+ if (unit_movepos(src, src->x+3, src->y+3, 1, 1))
{ //Display movement + animation.
clif_slide(src,src->x,src->y);
clif_skill_damage(src,target,tick,sd->battle_status.amotion,0,0,1,ud->skill_id, ud->skill_lv, 5);
@@ -12750,7 +12729,11 @@ int skill_check_condition_castbegin(struct map_session_data* sd, short skill, sh
break;
case NJ_ISSEN:
+#ifdef RENEWAL
+ if (status->hp < (status->hp/100)) {
+#else
if (status->hp < 2) {
+#endif
clif_skill_fail(sd,skill,USESKILL_FAIL_LEVEL,0);
return 0;
}
diff --git a/src/map/status.c b/src/map/status.c
index ee5dbb7aa..1a8bc247d 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -794,6 +794,8 @@ void initChangeTables(void) {
StatusIconChangeTable[SC_SPL_DEF] = SI_SPL_DEF;
StatusIconChangeTable[SC_MANU_MATK] = SI_MANU_MATK;
StatusIconChangeTable[SC_SPL_MATK] = SI_SPL_MATK;
+ StatusIconChangeTable[SC_ATKPOTION] = SI_PLUSATTACKPOWER;
+ StatusIconChangeTable[SC_MATKPOTION] = SI_PLUSMAGICPOWER;
//Cash Items
StatusIconChangeTable[SC_FOOD_STR_CASH] = SI_FOOD_STR_CASH;
StatusIconChangeTable[SC_FOOD_AGI_CASH] = SI_FOOD_AGI_CASH;
diff --git a/src/map/status.h b/src/map/status.h
index c1975805d..44012566f 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -807,8 +807,8 @@ enum si_type {
SI_ADRENALINE2 = 147,
SI_GHOSTWEAPON = 148,
SI_SPIRIT = 149,
-// SI_PLUSATTACKPOWER = 150,
-// SI_PLUSMAGICPOWER = 151,
+ SI_PLUSATTACKPOWER = 150,
+ SI_PLUSMAGICPOWER = 151,
SI_DEVIL = 152,
SI_KAITE = 153,
// SI_SWOO = 154,