From d0241aaae2ee58987a5f65b4d69d2ee8d7408283 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 3 Mar 2006 18:46:51 +0000 Subject: - Added a column in skill_cast_db for specifying can't walk delays. - Removed the apply walk-delay entry from skill_cast_nodex - Fixed autoloot dropping the item to the ground even when it was autolooted. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5450 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 6 + db/skill_cast_db.txt | 637 +++++++++++++++++++++++----------------------- db/skill_castnodex_db.txt | 6 +- src/map/mob.c | 2 +- src/map/skill.c | 51 ++-- src/map/skill.h | 4 +- 6 files changed, 352 insertions(+), 354 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index aaa68d8fd..fe5767bd8 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,12 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS 2006/03/03 + * Added a column in skill_cast_db for specifying can't walk delays. It's + all set to 0 currently, so someone get updating them! [Skotlex] + * Removed the apply walk-delay entry from skill_cast_nodex as the new walk + delay column handles this now. [Skotlex] + * Fixed autoloot dropping the item to the ground even when it was + autolooted. [Skotlex] * Fixed character deletion working on SQL without an email address (Thanks to Valaris) [Zephiris] * Added event 8 for mobspawns that should spawn with special ai set. This means that now in the mob_spawn files if you use 8 as the last entry, the diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index 8eb825fca..d3d9bdbfb 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,AfterCastDelay,Duration1,Duration2 +// SkillID,CastingTime,AfterCastActDelay,AfterCastWalkDelay,Duration1,Duration2 // //========================================== // Rough list of Contents: @@ -32,834 +32,831 @@ //===== Swordman =========================== //-- SM_PROVOKE -6,0,0,30000,0 +6,0,0,0,30000,0 //-- SM_MAGNUM -7,0,0,2000,10000 +7,0,0,0,2000,10000 //-- SM_ENDURE -8,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,0 +8,0,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,0 //========================================== //===== Mage =============================== //-- MG_SIGHT -10,0,0,10000,0 +10,0,0,0,10000,0 //-- MG_NAPALMBEAT -11,1000,1000:1000:1000:900:900:800:800:700:600:500,0,0 +11,1000,1000:1000:1000:900:900:800:800:700:600:500,0,0,0 //-- MG_SAFETYWALL -12,4000:3500:3500:2500:2000:1500:1000:1000:1000:1000,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0 +12,4000:3500:3500:2500:2000:1500:1000:1000:1000:1000,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 +13,500,1200:1000:1400:1200:1600:1400:1800:1600:2000:1800,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 +14,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0 //-- MG_FROSTDRIVER -15,800,1500,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000 +15,800,1500,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000 //-- MG_STONECURSE -16,1000,0,0,11000:12000:13000:14000:15000:16000:17000:18000:19000:20000 +16,1000,0,0,0,11000:12000:13000:14000:15000:16000:17000:18000:19000: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 +17,1500:1500:1500:1500:1500:1000:1000:1000:1000:1000,1500:1500:1500:1500:1500:1000:1000:1000:1000:1000,0,0,0 //-- MG_FIREWALL -18,2000:1850:1700:1550:1400:1250:1100:950:800:650,0,5000:6000:7000:8000:9000:10000:11000:12000:13000:14000,0 +18,2000:1850:1700:1550:1400:1250:1100:950:800:650,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 +19,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,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 +20,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0 //-- MG_THUNDERSTORM -21,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,2000,500,0 +21,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,2000,0,500,0 //========================================== //===== Acolyte ============================ //-- AL_RUWACH -24,0,0,10000,0 +24,0,0,0,10000,0 //-- AL_PNEUMA -25,0,0,10000,0 +25,0,0,0,10000,0 //-- AL_TELEPORT -26,0,0,0,0 +26,0,0,0,0,0 //-- AL_WARP -27,1000,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0 +27,1000,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0 //-- AL_HEAL -28,0,1000,0,0 +28,0,1000,0,0,0 //-- AL_INCAGI -29,1000,1000,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0 +29,1000,1000,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0 //-- AL_DECAGI -30,1000,1000,40000:50000:60000:70000:80000:90000:100000:110000:120000:130000,0 +30,1000,1000,0,40000:50000:60000:70000:80000:90000:100000:110000:120000:130000,0 //-- AL_HOLYWATER -31,1000,500,0,0 +31,1000,500,0,0,0 //-- AL_CRUCIS -32,500,2000,0,0 +32,500,2000,0,0,0 //-- AL ANGELUS -33,500,3500,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0 +33,500,3500,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0 //-- AL_BLESSING -34,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0 +34,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0 //-- AL_CURE -35,0,1000,0,0 +35,0,1000,0,0,0 //========================================== //===== Archer ============================= //-- AC_CONCENTRATION -45,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0 +45,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0 //-- AC_DOUBLE -46,0,-100,100,0 +46,0,-100,0,100,0 //-- AC_SHOWER -47,0,-100,100,0 +47,0,-100,0,100,0 //========================================== //===== Thief ============================== //-- TF_HIDING -51,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0 +51,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0 //-- TF_POISON -52,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000 +52,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 +54,6000:4000:2000:0,0:1000:2000:3000,0,0,0 //========================================== //===== Knight ============================= //-- KN_BRANDISHSPEAR -57,700,0,0,0 +57,700,0,0,0,0 //-- KN_SPEARBOOMERANG -59,0,1000,0,0 +59,0,1000,0,0,0 //-- KN_TWOHANDQUICKEN -60,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0 +60,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0 //-- KN_AUTOCOUNTER -61,0,0,400:800:1200:1600:2000,0 +61,0,0,0,400:800:1200:1600:2000,0 //-- KN_BOWLINGBASH -62,700,0,0,0 +62,700,0,0,0,0 //========================================== //===== Priest ============================= //-- PR_IMPOSITIO -66,0,3000,60000,0 +66,0,3000,0,60000,0 //-- PR_SUFFRAGIUM -67,0,2000,30000:20000:10000,0 +67,0,2000,0,30000:20000:10000,0 //-- PR_ASPERSIO -68,0,2000,60000:90000:120000:150000:180000,0 +68,0,2000,0,60000:90000:120000:150000:180000,0 //-- PR_BENEDICTIO -69,0,0,40000:80000:120000:160000:200000,0 +69,0,0,0,40000:80000:120000:160000:200000,0 //-- PR_SANCTUARY -70,5000,0,4000:7000:10000:13000:16000:19000:22000:25000:28000:31000,0 +70,5000,0,0,4000:7000:10000:13000:16000:19000:22000:25000:28000:31000,0 //-- PR_SLOWPOISON -71,0,0,10000:20000:30000:40000,0 +71,0,0,0,10000:20000:30000:40000,0 //-- PR_STRECOVERY -72,0,2000,0,0 +72,0,2000,0,0,0 //-- PR_KYRIE -73,2000,2000,120000,0 +73,2000,2000,0,120000,0 //-- PR_MAGNIFICAT -74,4000,2000,30000:45000:60000:75000:90000,0 +74,4000,2000,0,30000:45000:60000:75000:90000,0 //-- PR_GLORIA -75,0,2000,10000:15000:20000:25000:30000:,0 +75,0,2000,0,10000:15000:20000:25000:30000,0 //-- PR_LEXDIVINA -76,0,3000,30000:35000:40000:45000:50000:60000:60000:60000:60000:60000,0 +76,0,3000,0,30000:35000:40000:45000:50000:60000:60000:60000:60000:60000,0 //-- PR_TURNUNDEAD -77,1000,3000,0,0 +77,1000,3000,0,0,0 //-- PR_LEXAETERNA -78,0,3000,600000,0 +78,0,3000,0,600000,0 //-- PR_MAGNUS -79,15000,4000,5000:6000:7000:8000:9000:10000:11000:12000:13000:14000,0 +79,15000,4000,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,2000,30000,0 +80,3000:2700:2400:2100:1800:1500:1200:900:600:300,2000,0,30000,0 //-- WZ_SIGHTRASHER -81,700,2000,500,0 +81,700,2000,0,500,0 //-- WZ_METEOR -83,15000,2000:3000:3000:4000:4000:5000:5000:6000:6000:7000,500,3200:3400:3600:3800:4000:4200:4400:4600:4800:5000 +83,15000,2000:3000:3000:4000:4000:5000:5000:6000:6000:7000,0,500,3200:3400:3600:3800:4000:4200:4400:4600:4800:5000 //-- WZ_JUPITEL -84,2500:3000:3500:4000:4500:5000:5500:6000:6500:7000,0,0,0 +84,2500:3000:3500:4000:4500:5000:5500:6000:6500:7000,0,0,0,0 //-- WZ_VERMILION -85,15000:14500:14000:13500:13000:12500:12000:11500:11000:10500,5000,4000,5500:6000:6500:7000:7500:8000:8500:9000:9500:10000 +85,15000:14500:14000:13500:13000:12500:12000:11500:11000:10500,5000,0,4000,5500:6000:6500:7000:7500:8000:8500:9000:9500:10000 //-- WZ_WATERBALL -86,1000:2000:3000:4000:5000,0,0,0 +86,1000:2000:3000:4000:5000,0,0,0,0 //-- WZ_ICEWALL -87,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0 +87,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,1500:3000:4500:6000:7500:9000:10500:12000:13500:15000 +88,5000:4700:4400:4100:3800:3500:3200:2900:2700:2500,1000,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,4600,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 +89,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,5000,0,4600,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 //-- WZ_EARTHSPIKE -90,1000:2000:3000:4000:5000,700,0,0 +90,1000:2000:3000:4000:5000,700,0,0,0 //-- WZ_HEAVENDRIVE -91,1000:2000:3000:4000:5000,700,500,0 +91,1000:2000:3000:4000:5000,700,0,500,0 //-- WZ_QUAGMIRE -92,0,1000,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000 +92,0,1000,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000 //========================================== //===== Blacksmith ========================= //-- BS_REPAIRWEAPON -108,7500,0,0 +108,7500,0,0,0,0 //-- BS_HAMMERFALL -110,0,0,0,6000:7000:8000:9000:10000:11000 +110,0,0,0,0,6000:7000:8000:9000:10000:11000 //-- BS_ADRENALINE -111,0,0,30000:60000:90000:120000:150000,0 +111,0,0,0,30000:60000:90000:120000:150000,0 //-- BS_WEAPONPEFECT -112,0,0,10000:20000:30000:40000:50000,0 +112,0,0,0,10000:20000:30000:40000:50000,0 //-- BS_OVERTHRUST -113,0,0,20000:40000:60000:80000:100000,0 +113,0,0,0,20000:40000:60000:80000:100000,0 //-- BS_MAXIMIZE -114,0,0,1000:2000:3000:4000:5000,0 +114,0,0,0,1000:2000:3000:4000:5000,0 //========================================== //===== Hunter ============================= //-- HT_SKIDTRAP -115,0,0,300000:240000:180000:120000:60000,0 +115,0,0,0,300000:240000:180000:120000:60000,0 //-- HT_LANDMINE -116,0,0,20000:160000:120000:80000:40000,6000:7000:8000:9000:10000:11000 +116,0,0,0,20000:160000:120000:80000:40000,6000:7000:8000:9000:10000:11000 //-- HT_ANKLESNARE -117,0,0,250000:200000:150000:100000:50000,4000:8000:12000:16000:20000 +117,0,0,0,250000:200000:150000:100000:50000,4000:8000:12000:16000:20000 //-- HT_SHOCKWAVE -118,0,0,200000:160000:120000:80000:40000,0 +118,0,0,0,200000:160000:120000:80000:40000,0 //-- HT_SANDMAN -119,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000 +119,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000 //-- HT_FLASHER -120,0,0,150000:120000:90000:60000:30000,10000:11000:12000:13000:14000 +120,0,0,0,150000:120000:90000:60000:30000,10000:11000:12000:13000:14000 //-- HT_FREEZINGTRAP -121,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000 +121,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000 //-- HT_BLASTMINE -122,0,0,25000:20000:15000:10000:5000,0 +122,0,0,0,25000:20000:15000:10000:5000,0 //-- HT_CLAYMORETRAP -123,0,0,20000:40000:60000:80000:100000,0 +123,0,0,0,20000:40000:60000:80000:100000,0 //-- HT_TALKIEBOX -125,0,0,600000,0 +125,0,0,0,600000,0 //-- HT_BLITZBEAT -129,1500,1000,0,0 +129,1500,1000,0,0,0 //========================================== //===== Assassin =========================== //-- AS_CLOAKING -135,0,0,500:1000:2000:3000:4000:5000:6000:7000:8000:9000,0 +135,0,0,0,500:1000:2000:3000:4000:5000:6000:7000:8000:9000,0 //-- AS_SONICBLOW -136,0,2000,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000 +136,0,2000,0,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000 //-- AS_GRIMTOOTH -137,0,0,0,1000 +137,0,0,0,0,1000 //-- AS_ENCHANTPOISON -138,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,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,20000:25000:30000:35000:40000:45000:50000:55000:60000:65000,0 +139,0,0,0,20000:25000:30000:35000:40000:45000:50000:55000:60000:65000,0 //-- AS_VENOMDUST -140,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,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,11000:10000:9000:8000:7000:6000:5000:4000:3000:2000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000 +141,1000,0,0,11000:10000:9000:8000:7000:6000:5000:4000:3000:2000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000 //========================================== //===== 1st Jobs Quest Skills=============== //-- NV_TRICKDEAD -143,0,0,600000,0 +143,0,0,0,600000,0 //-- SM_FATALBLOW -145,0,0,0,8000 +145,0,0,0,0,8000 //-- AC_CHARGEARROW -148,1500,0,0,0 +148,1500,0,0,0,0 //-- TF_SPRINKLESAND -149,0,0,0,10000 +149,0,0,0,0,10000 //-- TF_THROWSTONE -152,0,100,0,8000 +152,0,100,0,0,8000 //-- MC_LOUD -155,0,0,300000,0 +155,0,0,0,300000,0 //-- AL_HOLYLIGHT -156,2000,0,0,0 +156,2000,0,0,0,0 //-- MG_ENERGYCOAT -157,5000,0,300000,0 +157,5000,0,0,300000,0 //========================================== //===== NPC Skills Part 1 ================== //-- NPC_SELFDESTRUCTION -173,0,0,3500,0 +173,0,0,0,3500,0 //-- NPC_POISON -176,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000 +176,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000 //-- NPC_BLINDATTACK -177,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 +177,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 //-- NPC_SILENCEATTACK -178,0,0,0,10000:12000:14000:16000:18000:20000:22000:24000:26000:28000 +178,0,0,0,0,10000:12000:14000:16000:18000:20000:22000:24000:26000:28000 //-- NPC_STUNATTACK -179,0,0,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000 +179,0,0,0,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000 //-- NPC_PETRIFYATTACK -180,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 +180,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 //-- NPC_CURSEATTACK -181,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000 +181,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000 //-- NPC_SLEEPATTACK -182,0,0,0,8000:10000:12000:14000:16000:18000:20000:22000:24000:26000 +182,0,0,0,0,8000:10000:12000:14000:16000:18000:20000:22000:24000:26000 //-- NPC_KEEPING -201,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0 +201,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0 //-- NPC_BARRIER -204,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0 +204,0,0,0,60000:70000:80000:90000:100000:110000:120000:130000:140000:150000,0 //-- NPC_LICK -206,0,0,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000 +206,0,0,0,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000 //-- NPC_HALLUCINATION -207,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0 +207,0,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0 //========================================== //===== Rogue ============================== //-- RG_BACKSTAB -212,0,500,0,0 +212,0,500,0,0,0 //-- RG_RAID -214,0,0,0,8000:9000:10000:11000:12000 +214,0,0,0,0,8000:9000:10000:11000:12000 //-- RG_STRIPEWEAPON -215,1000,1000,75000:90000:105000:120000:135000,0 +215,1000,1000,0,75000:90000:105000:120000:135000,0 //-- RG_STRIPSHIELD -216,1000,1000,75000:90000:105000:120000:135000,0 +216,1000,1000,0,75000:90000:105000:120000:135000,0 //-- RG_STRIPWEAPON -217,1000,1000,75000:90000:105000:120000:135000,0 +217,1000,1000,0,75000:90000:105000:120000:135000,0 //-- RG_STRIPHELM -218,1000,1000,75000:90000:105000:120000:135000,0 +218,1000,1000,0,75000:90000:105000:120000:135000,0 //-- RG_GRAFITTI -220,0,0,180000,0 +220,0,0,0,180000,0 //========================================== //===== Alchemist ========================== //-- AM_DEMONSTRATION -229,1000,0,40000:45000:50000:55000:60000,0 +229,1000,0,0,40000:45000:50000:55000:60000,0 //-- AM_ACIDTERROR -230,1000,0,3:7:10:12:13,120000 +230,1000,0,0,3:7:10:12:13,120000 //-- AM_POTIONPITCHER -231,0,500,0,0 +231,0,500,0,0,0 //-- AM_CANNIBALIZE -232,2000,500,300000:240000:180000:120000:60000,0 +232,2000,500,0,300000:240000:180000:120000:60000,0 //-- AM_SPHEREMINE -233,2000,500,40000:50000:60000:70000:80000,0 +233,2000,500,0,40000:50000:60000:70000:80000,0 //-- AM_CP_WEAPON -234,2000,0,120000:240000:360000:480000:600000,0 +234,2000,0,0,120000:240000:360000:480000:600000,0 //-- AM_CP_SHIELD -235,2000,0,120000:240000:360000:480000:600000,0 +235,2000,0,0,120000:240000:360000:480000:600000,0 //-- AM_CP_ARMOR -236,2000,0,120000:240000:360000:480000:600000,0 +236,2000,0,0,120000:240000:360000:480000:600000,0 //-- AM_CP_HELM -237,2000,0,120000:240000:360000:480000:600000,0 +237,2000,0,0,120000:240000:360000:480000:600000,0 //========================================== //===== Crusader =========================== //-- CR_AUTOGUARD -249,0,0,300000,0 +249,0,0,0,300000,0 //-- CR_SHIELDCHARGE -250,0,0,0,8000:9000:10000:11000:12000 +250,0,0,0,0,8000:9000:10000:11000:12000 //-- CR_SHIELDBOOMERANG -251,0,700,0,0 +251,0,700,0,0,0 //-- CR_REFLECTSHIELD -252,0,0,300000,0 +252,0,0,0,300000,0 //-- CR_HOLYCROSS -253,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 +253,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 //-- CR_GRANDCROSS -254,2000,1500,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 +254,2000,1500,0,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 //-- CR_DEVOTION -255,3000,0,0,30000:45000:60000:75000:90000 +255,3000,0,0,0,30000:45000:60000:75000:90000 //-- CR_PROVIDENCE -256,3000,0,180000,0 +256,3000,0,0,180000,0 //-- CR_DEFENDER -257,0,800,180000,0 +257,0,800,0,180000,0 //-- CR_SPAERQUICKEN -258,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0 +258,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0 //========================================== //===== Monk =============================== //-- MO_CALLSPIRITS -261,1000,0,600000,0 +261,1000,0,0,600000,0 //-- MO_ABSORBSPIRITS -262,2000,0,0,0 +262,2000,0,0,0,0 //-- MO_INVESTIGATE -266,1000,500,0,0 +266,1000,500,0,0,0 //-- MO_FINGEROFFENSIVE -267,1000,500,0,0 +267,1000,500,0,0,0 //-- MO_STEELBODY -268,5000,0,30000:60000:90000:120000:150000,0 +268,5000,0,0,30000:60000:90000:120000:150000,0 //-- MO_BLADESTOP -269,0,0,500:700:900:1100:1300,20000:30000:40000:50000:60000 +269,0,0,0,500:700:900:1100:1300,20000:30000:40000:50000:60000 //-- MO_EXPLOSIONSPIRITS -270,0,0,180000,0 +270,0,0,0,180000,0 //-- MO_EXTREMITYFIST -271,4000:3500:3000:2500:2000,3000:2500:2000:1500:1000,0,300000 +271,4000:3500:3000:2500:2000,3000:2500:2000:1500:1000,0,0,300000 //========================================== //===== Sage =============================== //-- SA_MAGICROD -276,0,1500,400:600:800:1000:1200,0 +276,0,1500,0,400:600:800:1000:1200,0 //-- SA_SPELLBREAKER -277,700,0,0,0 +277,700,0,0,0,0 //-- SA_AUTOSPELL -279,3000,0,120000:150000:180000:210000:240000:270000:300000:330000:360000:390000,0 +279,3000,0,0,120000:150000:180000:210000:240000:270000:300000:330000:360000:390000,0 //-- SA_FLAMELAUNCHER -280,3000,0,1200000:1200000:1200000:1200000:1800000,0 +280,3000,0,0,1200000:1200000:1200000:1200000:1800000,0 //-- SA_FROSTWEAPON -281,3000,0,1200000:1200000:1200000:1200000:1800000,0 +281,3000,0,0,1200000:1200000:1200000:1200000:1800000,0 //-- SA_LIGHTNINGLOADER -282,3000,0,1200000:1200000:1200000:1200000:1800000,0 +282,3000,0,0,1200000:1200000:1200000:1200000:1800000,0 //-- SA_SEISMICWEAPON -283,3000,0,1200000:1200000:1200000:1200000:1800000,0 +283,3000,0,0,1200000:1200000:1200000:1200000:1800000,0 //-- SA_VOLCANO -285,5000,0,60000:120000:180000:240000:300000,60000:120000:180000:240000:300000 +285,5000,0,0,60000:120000:180000:240000:300000,60000:120000:180000:240000:300000 //-- SA_DELUGE -286,5000,0,60000:120000:180000:240000:300000,60000:120000:180000:240000:300000 +286,5000,0,0,60000:120000:180000:240000:300000,60000:120000:180000:240000:300000 //-- SA_VIOLENTGALE -287,5000,0,60000:120000:180000:240000:300000,60000:120000:180000:240000:300000 +287,5000,0,0,60000:120000:180000:240000:300000,60000:120000:180000:240000:300000 //-- SA_LANDPROTECTOR -288,5000,0,60000:120000:180000:240000:300000,60000:120000:180000:240000:300000 +288,5000,0,0,60000:120000:180000:240000:300000,60000:120000:180000:240000:300000 //-- SA_DISPELL -289,2000,0,0,0 +289,2000,0,0,0,0 //-- SA_REVERSEORCISH -294,0,0,1200000,0 +294,0,0,0,1200000,0 //========================================== //===== Bard & Dancer (Ensemble Skills) ==== //-- BD_ADAPTATION -304,0,0,0,5000 +304,0,0,0,0,5000 //-- BD_LULLABY -306,0,0,60000,15000 +306,0,0,0,60000,15000 //-- BD_RICHMANKIM -307,0,0,60000,60000 +307,0,0,0,60000,60000 //-- BD_ETERNALCHAOS -308,0,0,60000,60000 +308,0,0,0,60000,60000 //-- BD_DRUMBATTLEFIELD -309,0,0,60000,60000 +309,0,0,0,60000,60000 //-- BD_RINGNIBELUNGEN -310,0,0,60000,60000 +310,0,0,0,60000,60000 //-- BD_ROKISWEIL -311,0,0,60000,60000 +311,0,0,0,60000,60000 //-- BD_INTOABYSS -312,0,0,60000,60000 +312,0,0,0,60000,60000 //-- BD_SIEGFRIED -313,0,0,60000,60000 +313,0,0,0,60000,60000 //========================================== //===== Bard =============================== //-- BA_MUSICALSTRIKE -316,1500,0,0,0 +316,1500,0,0,0,0 //-- BA_DISSONANCE -317,0,0,30000,3000 +317,0,0,0,30000,3000 //-- BA_FROSTJOKE -318,0,3000,0,10000:11000:12000:13000:14000 +318,0,3000,0,0,10000:11000:12000:13000:14000 //-- BA_WHISTLE -319,0,0,60000,20000 +319,0,0,0,60000,20000 //-- BA_ASSASSINCROSS -320,0,0,120000,20000 +320,0,0,0,120000,20000 //-- BA_POEMBRAGI -321,0,0,180000,20000 +321,0,0,0,180000,20000 //-- BA_APPLEIDUN -322,0,0,180000,20000 +322,0,0,0,180000,20000 //========================================== //===== Dancer ============================= //-- DC_THROWARROW -324,1500,0,0,0 +324,1500,0,0,0,0 //-- DC_UGLYDANCE -325,0,0,30000,3000 +325,0,0,0,30000,3000 //-- DC_SCREAM -326,0,3000,0,10000:11000:12000:13000:14000 +326,0,3000,0,0,10000:11000:12000:13000:14000 //-- DC_HUMMING -327,0,0,60000,20000 +327,0,0,0,60000,20000 //-- DC_DONTFORGETME -328,0,0,180000,20000 +328,0,0,0,180000,20000 //-- DC_FORTUNEKISS -329,0,0,120000,20000 +329,0,0,0,120000,20000 //-- DC_SERVICEFORYOU -330,0,0,180000,20000 +330,0,0,0,180000,20000 //========================================== //===== Wedding Skills ===================== //-- WE_MALE -334,3000,0,0,0 +334,3000,0,0,0,0 //-- WE_FEMALE -335,3000,0,0,0 +335,3000,0,0,0,0 //-- WE_CALLPARTNER -336,0,0,20000,0 +336,0,0,0,20000,0 //========================================== //===== NPC Skills Part 2 ================== //-- NPC_DARKGRANDCROSS -339,2000,1500,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 +339,2000,1500,0,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 //-- NPC_STOP -340,0,0,10000,0 +340,0,0,0,10000,0 //========================================== //===== Lord Knight ======================== //-- LK_AURABLADE -355,0,0,40000:60000:80000:100000:120000,0 +355,0,0,0,40000:60000:80000:100000:120000,0 //-- LK_PARRYING -356,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0 +356,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0 //-- LK_CONCENTRATION -357,0,0,25000:30000:35000:40000:45000,0 +357,0,0,0,25000:30000:35000:40000:45000,0 //-- LK_TENSIONRELAX -358,0,0,180000,0 +358,0,0,0,180000,0 //-- LK_BERSERK -359,0,0,300000,0 +359,0,0,0,300000,0 //-- LK_FURY -360,0,0,300000,0 +360,0,0,0,300000,0 //========================================== //===== High Priest ======================== //-- HP_ASSUMPTIO -361,1000:1500:2000:2500:3000,1100:1200:1300:1400:1500,20000:40000:60000:80000:100000,0 +361,1000:1500:2000:2500:3000,1100:1200:1300:1400:1500,0,20000:40000:60000:80000:100000,0 //-- HP_BASILICA -362,5000:6000:7000:8000:9000,2000:3000:4000:5000:6000,20000:25000:30000:35000:40000,20000:25000:30000:35000:40000 +362,5000:6000:7000:8000:9000,2000:3000:4000:5000:6000,0,20000:25000:30000:35000:40000,20000:25000:30000:35000:40000 //========================================== //===== High Wzard ========================= //-- HW_MAGICCRASHER -365,300,300,0,0 +365,300,300,0,0,0 //-- HW_MAGICPOWER -366,700,0,30000,0 +366,700,0,0,30000,0 //========================================== //===== Paladin ============================ //-- PA_PRESSURE -367,2000:2500:3000:3500:4000,2000:2500:3000:3500:4000,0,2000:3000:4000:5000:6000 +367,2000:2500:3000:3500:4000,2000:2500:3000:3500:4000,0,0,2000:3000:4000:5000:6000 //-- PA_SACRIFICE -368,0,2000,0,0 +368,0,2000,0,0,0 //-- PA_GOSPEL -369,0,0,60000,60000 +369,0,0,0,60000,60000 //========================================== //===== Champion =========================== //-- CH_PALMSTRIKE -370,0,300,0,0 +370,0,300,0,0,0 //-- CH_TIGERFIST -371,0,0,0,2000:4000:6000:8000:10000 +371,0,0,0,0,2000:4000:6000:8000:10000 //-- CH_CHAINCRUSH -372,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0 +372,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,0 //========================================== //===== Professor ========================== //-- PF_HPCONVERSION -373,0,1000:1200:1400:1600:1800,0,0 +373,0,1000:1200:1400:1600:1800,0,0,0 //-- PF_SOULCHANGE -374,3000,5000,0,0 +374,3000,5000,0,0,0 //-- PF_SOULBURN -375,0,0,0,0 +375,0,0,0,0,0 //========================================== //===== Assassin Cross ===================== //-- ASC_EDP -378,0,2000,20000:30000:40000:50000:60000,20000:30000:40000:50000:60000 +378,0,2000,0,20000:30000:40000:50000:60000,20000:30000:40000:50000:60000 //-- ASC_BREAKER -379,1000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0 +379,1000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0 //========================================== //===== Sniper ============================= //-- SN_SIGHT -380,0,0,30000,0 +380,0,0,0,30000,0 //-- SN_FALCONASSAULT -381,1000,3000,0,0,0 +381,1000,3000,0,0,0,0 //-- SN_SHARPSHOOTING -382,2000,1500,0,0 +382,2000,1500,0,0,0 //-- SN_WINDWALK -383,2000:2400:2800:3200:3600:4000:4400:4800:5200:5600,2000,130000:160000:190000:220000:250000:280000:310000:340000:370000:400000,0 +383,2000:2400:2800:3200:3600:4000:4400:4800:5200:5600,2000,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,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,5000 +384,500:500:600:600:700:700:800:800:900:1000,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,5000 //-- WS_CARTBOOST -387,0,0,60000,0 +387,0,0,0,60000,0 //========================================== //===== Stalker ============================ //-- ST_CHASEWALK -389,0,0,10000,30000 +389,0,0,0,10000,30000 //-- ST_REJECTSWORD -390,0,0,300000,0 +390,0,0,0,300000,0 //========================================== //===== Clown / Gypsy ====================== //-- CG_ARROWVULCAN -394,2000:2200:2400:2600:2800:3000:3200:3400:3600:3800,800:800:800:800:800:1000:1000:1000:1000:1000,0,0 +394,2000:2200:2400:2600:2800:3000:3200:3400:3600:3800,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,0 //-- CG_MOONLIT -395,0,0,20000:25000:30000:35000:40000,0 +395,0,0,0,20000:25000:30000:35000:40000,0 //-- CG_MARIONETTE -396,0,0,300000,0 +396,0,0,0,300000,0 //========================================== //===== Mixed Advanced Skills ============== //-- LK_SPIRALPIERCE -397,300:500:700:900:1000,1200:1400:1600:1800:2000,0,1000 +397,300:500:700:900:1000,1200:1400:1600:1800:2000,0,0,1000 //-- LK_HEADCRUSH -398,0,500,0,120000 +398,0,500,0,0,120000 //-- LK_JOINTBEAT -399,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,30000 +399,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,30000 //-- HW_NAPALMVULCAN -400,1700,1000,0,0,0 +400,1700,1000,0,0,0,0 //-- CH_SOULCOLLECT -401,2000,0,600000,0 +401,2000,0,0,600000,0 //-- PF_MINDBREAKER -402,0,800:900:1000:1100:1200,30000,0 +402,0,800:900:1000:1100:1200,0,30000,0 //-- PF_MEMORIZE -403,5000,0,0,0 +403,5000,0,0,0,0 //-- PF_FOGWALL -404,0,0,20000,10000 +404,0,0,0,20000,10000 //-- PF_SPIDERWEB -405,0,0,30000,8000 +405,0,0,0,30000,8000 //-- ASC_METEORASSAULT (Upkeep2 times are duration of: blind(lv1), stun(lv2) or bleeding (lv3) -406,500,500,0,10000:5000:120000 +406,500,500,0,0,10000:5000:120000 //-- ASC_CDP -407,0,5000,0,0 +407,0,5000,0,0,0 //========================================== //===== Adoption Skills ==================== //-- WE_BABY -408,3000,0,300000,0 +408,3000,0,0,300000,0 //-- WE_CALLPARENT -409,20000,0,0,0 +409,20000,0,0,0,0 //-- WE_CALLBABY -410,20000,0,0,0 +410,20000,0,0,0,0 //========================================== //===== Taekwon ============================ //-- TK_RUN -411,1000,0,1000,150000 +411,1000,0,0,1000,150000 //-- TK_DOWNKICK -415,0,0,3000,0 +415,0,0,0,3000,0 //-- TK_SPTIME -423,0,0,1800000,0 +423,0,0,0,1800000,0 //-- TK_SEVENWIND -425,0,0,300000,0 +425,0,0,0,300000,0 //-- TK_HIGHJUMP -426,5000:4000:3000:2000:1000,0,0,0 +426,5000:4000:3000:2000:1000,0,0,0,0 //========================================== //===== Soul Linker ======================== //-- SL_ALCHEMIST -445,1000,0,150000:200000:250000:300000:350000,3000 +445,1000,0,0,150000:200000:250000:300000:350000,3000 //-- AM_BERSERKPITCHER - Copy of AM_POTIONPITCHER for now -446,0,500,0,0 +446,0,500,0,0,0 //-- SL_MONK -447,1000,0,150000:200000:250000:300000:350000,3000 +447,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_STAR -448,1000,0,150000:200000:250000:300000:350000,3000 +448,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_SAGE -449,1000,0,150000:200000:250000:300000:350000,3000 +449,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_CRUSADER -450,1000,0,150000:200000:250000:300000:350000,3000 +450,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_SUPERNOVICE -451,1000,0,150000:200000:250000:300000:350000,3000 +451,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_KNIGHT -452,1000,0,150000:200000:250000:300000:350000,3000 +452,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_WIZARD -453,1000,0,150000:200000:250000:300000:350000,3000 +453,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_PRIEST -454,1000,0,150000:200000:250000:300000:350000,3000 +454,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_BARDDANCER -455,1000,0,150000:200000:250000:300000:350000,3000 +455,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_ROGUE -456,1000,0,150000:200000:250000:300000:350000,3000 +456,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_ASSASSIN -457,1000,0,150000:200000:250000:300000:350000,3000 +457,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_BLACKSMITH -458,1000,0,150000:200000:250000:300000:350000,3000 +458,1000,0,0,150000:200000:250000:300000:350000,3000 //-- BS_ADRENALINE2 -459,0,0,150000,0 +459,0,0,0,150000,0 //-- SL_HUNTER -460,1000,0,150000:200000:250000:300000:350000,3000 +460,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_SOULLINKER -461,1000,0,150000:200000:250000:300000:350000,3000 +461,1000,0,0,150000:200000:250000:300000:350000,3000 //-- SL_KAIZEL -462,4500:4000:3500:3000:2500:2000:1500,0,1800000,2000 +462,4500:4000:3500:3000:2500:2000:1500,0,0,1800000,2000 //-- SL_KAAHI -463,0,0,1800000,0 +463,0,0,0,1800000,0 //-- SL_KAUPE -464,500,0,600000,0 +464,500,0,0,600000,0 //-- SL_KAITE -465,6000:5500:5000:4500:4000:3500:3000,0,60000:120000:180000:240000:300000:360000:600000,0 +465,6000:5500:5000:4500:4000:3500:3000,0,0,60000:120000:180000:240000:300000:360000:600000,0 //-- SL_STIN -467,100,500,0,3000 +467,100,500,0,0,3000 //-- SL_STUN -468,100,500,2000,3000 +468,100,500,0,2000,3000 //-- SL_SMA -469,2000,500,0,0 +469,2000,500,0,0,0 //-- SL_SWOO -470,1000,500,1000:2000:3000:4000:5000:6000:7000,0 +470,1000,500,0,1000:2000:3000:4000:5000:6000:7000,0 //-- SL_SKE -471,3000:2000:1000,500,10000:20000:30000,3000 +471,3000:2000:1000,500,0,10000:20000:30000,3000 //-- SL_SKA -472,3000:2000:1000,500,10000:20000:30000,0 +472,3000:2000:1000,500,0,10000:20000:30000,0 //========================================== //===== Star Gladiator ===================== //-- SG_FEEL -427,1000,0,0,0 +427,1000,0,0,0,0 //SG_SUN_WARM -428,0,1000,10000:20000:60000,0 +428,0,1000,0,10000:20000:60000,0 //SG_MOON_WARM -429,0,1000,10000:20000:60000,0 +429,0,1000,0,10000:20000:60000,0 //SG_STAR_WARM -430,0,1000,10000:20000:60000,0 +430,0,1000,0,10000:20000:60000,0 //SG_SUN_COMFORT -431,0,1000,80000:160000:240000:320000,0 +431,0,1000,0,80000:160000:240000:320000,0 //SG_MOON_COMFORT -432,0,1000,80000:160000:240000:320000,0 +432,0,1000,0,80000:160000:240000:320000,0 //SG_STAR_COMFORT -433,0,1000,80000:160000:240000:320000,0 +433,0,1000,0,80000:160000:240000:320000,0 //-- SG_HATE -434,1000,0,0,0 +434,1000,0,0,0,0 //SG_FRIEND -442,0,0,10000,0 +442,0,0,0,10000,0 //SG_FUSION -444,1000,1000,600000,0 +444,1000,1000,0,600000,0 //========================================== //===== Mixed Advanced Skills ============== //-- ST_PRESERVE -475,1000,0,600000,0 +475,1000,0,0,600000,0 //-- ST_FULLSTRIP -476,0,1000,75000:90000:105000:120000:135000,0 +476,0,1000,0,75000:90000:105000:120000:135000,0 //-- CR_SLIMPITCHER -478,1000,1000,0,0 +478,1000,1000,0,0,0 //-- CR_FULLPROTECTION -479,2000,0,120000:240000:360000:480000:600000,0 +479,2000,0,0,120000:240000:360000:480000:600000,0 //-- PA_SHIELDCHAIN -480,1000,1000,0,0 +480,1000,1000,0,0,0 //-- PF_DOUBLECASTING -482,2000,0,90000,0 +482,2000,0,0,90000,0 //-- HW_GANBANTEIN -483,3000,5000,0,0 +483,3000,5000,0,0,0 //-- HW_GRAVITATION -484,5000,2000,5000:6000:7000:8000:9000,0 +484,5000,2000,0,5000:6000:7000:8000:9000,0 //-- WS_CARTTERMINATION -485,0,0,0,6000:7000:8000:9000:10000:11000 +485,0,0,0,0,6000:7000:8000:9000:10000:11000 //-- WS_OVERTHRUSTMAX -486,0,0,180000,0 +486,0,0,0,180000,0 //-- CG_LONGINGFREEDOM -487,0,0,180000,0 +487,0,0,0,180000,0 //-- CG_HERMODE -488,0,0,10000:15000:20000:25000:30000,10000:15000:20000:25000:30000 +488,0,0,0,10000:15000:20000:25000:30000,10000:15000:20000:25000:30000 //-- CG_TAROTCARD -489,1000,3000,0,0 +489,1000,3000,0,0,0 //-- CR_ACIDDEMONSTRATION -490,1000,1000,0,0 +490,1000,1000,0,0,0 //========================================== //===== Mixed Taekwon Skills =============== //-- TK_MISSION -493,1000,0,0,0 +493,1000,0,0,0,0 //-- SL_HIGH -494,1,0,150000:200000:250000:300000:350000,0 +494,1,0,0,150000:200000:250000:300000:350000,0 //-- KN_ONEHAND -495,0,0,300000,0 +495,0,0,0,300000,0 //-- AM_TWILIGHT1 -496,3000,10000,50,0 +496,3000,10000,0,50,0 //-- AM_TWILIGHT2 -497,3000,10000,50,0 +497,3000,10000,0,50,0 //-- AM_TWILIGHT3 -498,3000,10000,50,0 +498,3000,10000,0,50,0 //-- HT_POWER -499,0,-100,100,0 +499,0,-100,0,100,0 //========================================== //===== 2nd Jobs Quest Skills ============== //-- KN_CHARGEATK -1001,300,300,0,0 +1001,300,300,0,0,0 //-- CR_SHRINK -1002,0,0,300000,0 +1002,0,0,0,300000,0 //-- AS_VENOMKNIFE -1004,0,200,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000 +1004,0,200,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000 //-- RG_CLOSECONFINE -1005,0,0,10000,0 +1005,0,0,0,10000,0 //-- WZ_SIGHTBLASTER -1006,2000,0,120000,0 +1006,2000,0,0,120000,0 //-- SA_ELEMENTWATER -1008,2000,1000,1800000,0 +1008,2000,1000,0,1800000,0 //-- HT_PHANTASMIC -1009,0,0,0,0 +1009,0,0,0,0,0 //-- BA_PANGVOICE -1010,1000,2000,17000,0 +1010,1000,2000,0,17000,0 //-- DC_WINKCHARM (time1: Charm, time2: Confusion) -1011,1000,2000,10000,17000 +1011,1000,2000,0,10000,17000 //-- BS_GREED -1013,0,1000,0,0 +1013,0,1000,0,0,0 //-- PR_REDEMPTIO -1014,4000,0,0,0 +1014,4000,0,0,0,0 //-- MO_KITRANSLATION -1015,2000,1000,600000,0 +1015,2000,1000,0,600000,0 //-- MO_BALKYOUNG -1016,0,2000,0,2000 +1016,0,2000,0,0,2000 //-- SA_ELEMENTGROUND -1017,2000,1000,1800000,0 +1017,2000,1000,0,1800000,0 //-- SA_ELEMENTFIRE -1018,2000,1000,1800000,0 +1018,2000,1000,0,1800000,0 //-- SA_ELEMENTWIND -1019,2000,1000,1800000,0 +1019,2000,1000,0,1800000,0 //========================================== //===== Guild Skills ======================= //-- GD_LEADERSHIP -10006,0,0,300000,0 +10006,0,0,0,300000,0 //-- GD_GLORYWOUNDS -10007,0,0,300000,0 +10007,0,0,0,300000,0 //-- GD_SOULCOLD -10008,0,0,300000,0 +10008,0,0,0,300000,0 //-- GD_HAWKEYES -10009,0,0,300000,0 +10009,0,0,0,300000,0 //-- GD_BATTLEORDER -10010,5000,1000,60000,300000 +10010,5000,1000,0,60000,300000 //-- GD_REGENERATION -10011,5000,1000,60000,300000 +10011,5000,1000,0,60000,300000 //-- GD_RESTORE -10012,5000,1000,0,300000 +10012,5000,1000,0,0,300000 //-- GD_EMERGENCYCALL -10013,5000,1000,0,300000 +10013,5000,1000,0,0,300000 //========================================== - - - diff --git a/db/skill_castnodex_db.txt b/db/skill_castnodex_db.txt index cb25166a2..28a6dad01 100644 --- a/db/skill_castnodex_db.txt +++ b/db/skill_castnodex_db.txt @@ -1,18 +1,14 @@ -//,,, +//,, // Cast: With 1, dex does not affect the skill's cast rate // Cast: With 0, dex affects the skill's cast rate // Delay: With 1, dex does not affect the skill's delay rate // Delay: With 0, dex affects the skill's delay rate -// Walk Delay: With 1, characters can't move while the skill's delay is active. -// Walk Delay: With 0, characters can move as soon as the spell finishes casting. // Example - 46,1,1 = Double Strafe's casting time and delay is not affected by dex. // By default, dex NEVER affects after-cast delay, so no need of putting 'x,0,1' in this file -136,0,0,1 //AS_SONICBLOW 336,1 //WE_CALLPARTNER 366,1 //HW_MAGICPOWER 370,1 //CH_PALMSTRIKE -394,0,0,1 //CG_ARROWVULCAN 403,1 //PF_MEMORIZE 408,1 //WE_BABY 409,1 //WE_CALLPARENT diff --git a/src/map/mob.c b/src/map/mob.c index 1f66fccec..13df3a67c 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -2095,7 +2095,7 @@ static void mob_item_drop(struct mob_data *md, unsigned int tick, struct delay_i ditem->first_sd->status.party_id? party_search(ditem->first_sd->status.party_id): NULL, - ditem->first_sd,&ditem->item_data) + ditem->first_sd,&ditem->item_data) == 0 ) { aFree(ditem); return; diff --git a/src/map/skill.c b/src/map/skill.c index 1d536b8ed..3d56a13bc 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -597,6 +597,7 @@ int skill_get_zeny( int id ,int lv ){ skill_get (skill_db[id].zeny[lv-1], id, lv int skill_get_num( int id ,int lv ){ skill_get (skill_db[id].num[lv-1], id, lv); } int skill_get_cast( int id ,int lv ){ skill_get (skill_db[id].cast[lv-1], id, lv); } int skill_get_delay( int id ,int lv ){ skill_get (skill_db[id].delay[lv-1], id, lv); } +int skill_get_walkdelay( int id ,int lv ){ skill_get (skill_db[id].walkdelay[lv-1], id, lv); } int skill_get_time( int id ,int lv ){ skill_get (skill_db[id].upkeep_time[lv-1], id, lv); } int skill_get_time2( int id ,int lv ){ skill_get (skill_db[id].upkeep_time2[lv-1], id, lv); } int skill_get_castdef( int id ){ skill_get (skill_db[id].cast_def_rate, id, 1); } @@ -608,7 +609,6 @@ int skill_get_blewcount( int id ,int lv ){ skill_get (skill_db[id].blewcount[lv- int skill_get_mhp( int id ,int lv ){ skill_get (skill_db[id].mhp[lv-1], id, lv); } int skill_get_castnodex( int id ,int lv ){ skill_get (skill_db[id].castnodex[lv-1], id, lv); } int skill_get_delaynodex( int id ,int lv ){ skill_get (skill_db[id].delaynodex[lv-1], id, lv); } -int skill_get_delaynowalk( int id ,int lv ){ skill_get (skill_db[id].delaynowalk[lv-1], id, lv); } int skill_get_nocast ( int id ){ skill_get (skill_db[id].nocast, id, 1); } int skill_get_type( int id ){ skill_get (skill_db[id].skill_type, id, 1); } int skill_get_unit_id ( int id, int flag ){ skill_get (skill_db[id].unit_id[flag], id, 1); } @@ -5651,7 +5651,7 @@ int skill_castend_id( int tid, unsigned int tick, int id,int data ) { struct map_session_data* sd = map_id2sd(id)/*,*target_sd=NULL*/; struct block_list *bl; - int delay,inf2; + int inf2; nullpo_retr(0, sd); @@ -5672,8 +5672,8 @@ int skill_castend_id( int tid, unsigned int tick, int id,int data ) return 0; } - if(sd->skillid != SA_CASTCANCEL && sd->skilltimer != -1 && (delay = pc_checkskill(sd,SA_FREECAST) > 0)) //Hope ya don't mind me borrowing delay :X - status_quick_recalc_speed(sd, SA_FREECAST, delay, 0); + if(sd->skillid != SA_CASTCANCEL && sd->skilltimer != -1 && (inf2 = pc_checkskill(sd,SA_FREECAST) > 0)) //Hope ya don't mind me borrowing inf2 :X + status_quick_recalc_speed(sd, SA_FREECAST, inf2, 0); if(sd->skillid != SA_CASTCANCEL) sd->skilltimer=-1; @@ -5760,13 +5760,10 @@ int skill_castend_id( int tid, unsigned int tick, int id,int data ) pc_stop_walking(sd,0); if (sd->skillid == SA_MAGICROD) - delay = 0; + sd->canact_tick = tick; else - delay = skill_delayfix(&sd->bl, sd->skillid, sd->skilllv, 0); - - sd->canact_tick = tick + delay; - if (skill_get_delaynowalk(sd->skillid, sd->skilllv)) //Skills that block you from moving until delay ends. [Skotlex] - sd->canmove_tick = tick + delay; + sd->canact_tick = tick + skill_delayfix(&sd->bl, sd->skillid, sd->skilllv, 0); + sd->canmove_tick = tick + skill_get_walkdelay(sd->skillid, sd->skilllv); if (skill_get_casttype(sd->skillid) == CAST_NODAMAGE) skill_castend_nodamage_id(&sd->bl,bl,sd->skillid,sd->skilllv,tick,0); else @@ -5793,7 +5790,7 @@ int skill_castend_id( int tid, unsigned int tick, int id,int data ) int skill_castend_pos( int tid, unsigned int tick, int id,int data ) { struct map_session_data* sd=map_id2sd(id)/*,*target_sd=NULL*/; - int delay,maxcount; + int maxcount; nullpo_retr(0, sd); @@ -5807,8 +5804,8 @@ int skill_castend_pos( int tid, unsigned int tick, int id,int data ) return 0; } - if(sd->skillid != SA_CASTCANCEL && sd->skilltimer != -1 && (delay = pc_checkskill(sd,SA_FREECAST) > 0)) //Hope ya don't mind me borrowing delay :X - status_quick_recalc_speed(sd, SA_FREECAST, delay, 0); + if(sd->skillid != SA_CASTCANCEL && sd->skilltimer != -1 && (maxcount = pc_checkskill(sd,SA_FREECAST) > 0)) //Hope ya don't mind me borrowing maxcount :X + status_quick_recalc_speed(sd, SA_FREECAST, maxcount, 0); sd->skilltimer=-1; if (sd->bl.prev == NULL || sd->skillid == -1 || sd->skilllv <= 0) @@ -5872,10 +5869,8 @@ int skill_castend_pos( int tid, unsigned int tick, int id,int data ) ShowInfo("PC %d skill castend skill=%d\n",sd->bl.id,sd->skillid); pc_stop_walking(sd,0); - delay = skill_delayfix(&sd->bl, sd->skillid, sd->skilllv, 0); - sd->canact_tick = tick + delay; - if (skill_get_delaynowalk(sd->skillid, sd->skilllv)) //Skills that block you from moving until delay ends. [Skotlex] - sd->canmove_tick = tick + delay; + sd->canact_tick = tick + skill_delayfix(&sd->bl, sd->skillid, sd->skilllv, 0); + sd->canmove_tick = tick + skill_get_walkdelay(sd->skillid, sd->skilllv); skill_castend_pos2(&sd->bl,sd->skillx,sd->skilly,sd->skillid,sd->skilllv,tick,0); @@ -11251,15 +11246,21 @@ int skill_readdb(void) ShowError("can't read %s\n", path); return 1; } + + l=0; while(fgets(line,1020,fp)){ + l++; char *split[50]; memset(split,0,sizeof(split)); // [Valaris] thanks to fov if(line[0]=='/' && line[1]=='/') continue; - j = skill_split_str(line,split,5); - if(split[4]==NULL || j<5) + j = skill_split_str(line,split,6); + if(split[0]==NULL || j<2) + continue; //Blank line. + if(split[5]==NULL || j<6) { + ShowWarning("skill_cast_db.txt: Insufficient number of fields at line %d\n", l); continue; - + } i=atoi(split[0]); if (i>=10000 && i<10015) // for guild skills [Celest] i -= 9500; @@ -11268,8 +11269,9 @@ int skill_readdb(void) skill_split_atoi(split[1],skill_db[i].cast); skill_split_atoi(split[2],skill_db[i].delay); - skill_split_atoi(split[3],skill_db[i].upkeep_time); - skill_split_atoi(split[4],skill_db[i].upkeep_time2); + skill_split_atoi(split[3],skill_db[i].walkdelay); + skill_split_atoi(split[4],skill_db[i].upkeep_time); + skill_split_atoi(split[5],skill_db[i].upkeep_time2); } fclose(fp); ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n",path); @@ -11447,7 +11449,7 @@ int skill_readdb(void) if(line[0]=='/' && line[1]=='/') continue; memset(split,0,sizeof(split)); - j = skill_split_str(line,split,4); + j = skill_split_str(line,split,3); if(split[0]==0) //fixed by Lupus continue; i=atoi(split[0]); @@ -11460,9 +11462,6 @@ int skill_readdb(void) if (!split[2]) continue; skill_split_atoi(split[2],skill_db[i].delaynodex); - if(!split[3]) - continue; - skill_split_atoi(split[3],skill_db[i].delaynowalk); } fclose(fp); ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n",path); diff --git a/src/map/skill.h b/src/map/skill.h index 24ff74066..46752ed11 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -48,7 +48,7 @@ struct skill_db { char *desc; int range[MAX_SKILL_LEVEL],hit,inf,pl,nk,splash[MAX_SKILL_LEVEL],max; int num[MAX_SKILL_LEVEL]; - int cast[MAX_SKILL_LEVEL],delay[MAX_SKILL_LEVEL]; + int cast[MAX_SKILL_LEVEL],walkdelay[MAX_SKILL_LEVEL],delay[MAX_SKILL_LEVEL]; int upkeep_time[MAX_SKILL_LEVEL],upkeep_time2[MAX_SKILL_LEVEL]; int castcancel,cast_def_rate; int inf2,maxcount,skill_type; @@ -58,7 +58,6 @@ struct skill_db { int itemid[10],amount[10]; int castnodex[MAX_SKILL_LEVEL]; int delaynodex[MAX_SKILL_LEVEL]; - int delaynowalk[MAX_SKILL_LEVEL]; int nocast; int unit_id[2]; int unit_layout_type[MAX_SKILL_LEVEL]; @@ -150,6 +149,7 @@ int skill_get_zeny( int id ,int lv ); int skill_get_num( int id ,int lv ); int skill_get_cast( int id ,int lv ); int skill_get_delay( int id ,int lv ); +int skill_get_walkdelay( int id ,int lv ); int skill_get_time( int id ,int lv ); int skill_get_time2( int id ,int lv ); int skill_get_castdef( int id ); -- cgit v1.2.3-70-g09d2