diff options
| -rw-r--r-- | db/pre-re/skill_cast_db.txt | 1011 | ||||
| -rw-r--r-- | src/map/battle.c | 18 | ||||
| -rw-r--r-- | src/map/pc.h | 14 | ||||
| -rw-r--r-- | src/map/skill.c | 6 | ||||
| -rw-r--r-- | src/map/status.c | 67 |
5 files changed, 583 insertions, 533 deletions
diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt index 122d13c3f..d1d938a18 100644 --- a/db/pre-re/skill_cast_db.txt +++ b/db/pre-re/skill_cast_db.txt @@ -1071,629 +1071,625 @@ 1019,2000,1000,0,1800000,0,0 //========================================== -//===== Rune Knight ======================== -//-- RK_ENCHANTBLADE +//===== Rune Knight ======================== +//-- RK_ENCHANTBLADE 2001,1000,0,0,300000,0,0 -//-- RK_SONICWAVE +//-- RK_SONICWAVE 2002,0,1000,0,0,0,2000 -//-- RK_DEATHBOUND +//-- RK_DEATHBOUND 2003,0,2000,0,2000,0,3000 -//-- RK_HUNDREDSPEAR -2004,1000,500,0,0,0,0 -//-- RK_WINDCUTTER //CHECK duration 1 -2005,0,0,0,0,0,2000 -//-- RK_IGNITIONBREAK +//-- RK_HUNDREDSPEAR +2004,1000:900:800:700:600:500:400:300:200:100,500,0,0,0,3000 +//-- RK_WINDCUTTER +2005,0,2000,0,0,0,2000 +//-- RK_IGNITIONBREAK 2006,1000,0,0,0,0,2000 -//-- RK_DRAGONBREATH //CHECK duration 1 burning -2008,500:500:500:1500:1500:1500:2000:2000:2500:2500,2000,0,5000,0,0 -//-- RK_DRAGONHOWLING -2009,0,0,0,15000,0,60000 - -//-- RK_MILLENNIUMSHIELD //CHECK duration 2 -2011,0,1000,0,300000,0,60000 -//-- RK_CRUSHSTRIKE -2012,1000,0,0,0,0,30000 -//-- RK_REFRESH //CHECK duration 1 -2013,1000,0,0,30000,0,120000 -//-- RK_GIANTGROWTH -2014,1000,0,0,300000,0,0 -//-- RK_STONEHARDSKIN //CHECK duration 2 -2015,2000,0,0,300000,10000,0 -//-- RK_VITALITYACTIVATION -2016,0,0,0,30000,0,0 -//-- RK_STORMBLAST //CHECK duration 1 -2017,2000,1000,0,1000,0,0 -//-- RK_FIGHTINGSPIRIT -2018,0,0,0,300000,0,0 -//-- RK_ABUNDANCE -2019,0,0,0,300000,0,0 -//========================================== - -//===== Gillotine Cross ==================== -//-- GC_VENOMIMPRESS +//-- RK_DRAGONBREATH +2008,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,10000,0,0 +//-- RK_DRAGONHOWLING +2009,0,0,0,15000,0,10000 + +//-- RK_MILLENNIUMSHIELD +2011,0,1000,0,180000,0,60000 +//-- RK_CRUSHSTRIKE +2012,0,0,0,0,0,30000 +//-- RK_REFRESH +2013,0,0,0,60000,0,120000 +//-- RK_GIANTGROWTH +2014,0,0,0,180000,0,0 +//-- RK_STONEHARDSKIN +2015,0,0,0,180000,10000,0 +//-- RK_VITALITYACTIVATION +2016,0,0,0,180000,0,0 +//-- RK_STORMBLAST +2017,0,0,0,0,0,0 +//-- RK_FIGHTINGSPIRIT +2018,0,0,0,180000,0,0 +//-- RK_ABUNDANCE +2019,0,0,0,180000,0,0 +//========================================== + +//===== Gillotine Cross ==================== +//-- GC_VENOMIMPRESS 2021,0,3000:2500:2000:1500:1000,0,10000:20000:30000:40000:50000,0,0 -//-- GC_CROSSIMPACT -2022,0,2500:2000:1500:1000:500,2000,0,0,0 -//-- GC_DARKILLUSION +//-- GC_CROSSIMPACT +2022,0,2500:2000:1500:1000:500,0,0,0,0 +//-- GC_DARKILLUSION 2023,0,1500,0,0,0,0 -//-- GC_CREATENEWPOISON +//-- GC_CREATENEWPOISON 2025,0,500,0,0,0,0 -//-- GC_ANTIDOTE +//-- GC_ANTIDOTE 2026,0,0,0,0,0,0 -//-- GC_POISONINGWEAPON +//-- GC_POISONINGWEAPON 2027,0,1000,0,60000:120000:180000:240000:300000,300000,0 -//-- GC_WEAPONBLOCKING +//-- GC_WEAPONBLOCKING 2028,0,2000,0,180000,0,0 -//-- GC_COUNTERSLASH +//-- GC_COUNTERSLASH 2029,0,2000,0,0,0,0 -//-- GC_WEAPONCRUSH +//-- GC_WEAPONCRUSH 2030,0,1000,0,60000,0,0 -//-- GC_VENOMPRESSURE +//-- GC_VENOMPRESSURE 2031,0,1000,0,0,0,0 -//-- GC_POISONSMOKE //CHECK Cast time is said 2 second fixed, but no variable. Check duration 1 (was added / thought to be AoE duration) -2032,2000,2000,0,6000:8000:10000:12000:14000,0,0 -//-- GC_CLOAKINGEXCEED +//-- GC_POISONSMOKE +2032,0,2000,0,6000:8000:10000:12000:14000,0,0 +//-- GC_CLOAKINGEXCEED 2033,0,2000,0,0,0,0 -//-- GC_PHANTOMMENACE +//-- GC_PHANTOMMENACE 2034,0,1000,0,0,0,0 -//-- GC_HALLUCINATIONWALK +//-- GC_HALLUCINATIONWALK 2035,0,0,0,30000:35000:40000:45000:50000,25000,300000 -//-- GC_ROLLINGCUTTER +//-- GC_ROLLINGCUTTER 2036,0,200,0,3000,0,0 -//-- GC_CROSSRIPPERSLASHER +//-- GC_CROSSRIPPERSLASHER 2037,0,1000,0,0,0,0 -//========================================== +//========================================== -//===== Arch Bishop ======================== -//-- AB_JUDEX -2038,2500,500,0,0,0,0 -//-- AB_ANCILLA +//===== Arch Bishop ======================== +//-- AB_JUDEX +2038,2000,500,0,0,0,0 +//-- AB_ANCILLA 2039,1000,1000,0,0,0,0 -//-- AB_ADORAMUS //CHECK Duration 1 is blindness and duration 2 is reduced AGI. FIX ME!!!! +//-- AB_ADORAMUS 2040,2000,500,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,2000 -//-- AB_CLEMENTIA -2041,4000,0,0,120000:180000:240000,0,0 -//-- AB_CANTO -2042,4000,0,0,120000:180000:240000,0,0 -//-- AB_CHEAL -2043,4000:3500:3000,0,0,0,0,1000:2000:3000 -//-- AB_EPICLESIS -2044,4000:4500:5000:5500:6000,2000,0,18000:21000:24000:27000:30000,0,60000 -//-- AB_PRAEFATIO -2045,3000,0,0,120000,0,13000:16000:19000:22000:25000:28000:31000:34000:37000:40000 -//-- AB_ORATIO -2046,5000,0,0,30000,0,2000 -//-- AB_LAUDAAGNUS +//-- AB_CLEMENTIA +2041,3000,0,0,120000:180000:240000,0,0 +//-- AB_CANTO +2042,3000,0,0,120000:180000:240000,0,0 +//-- AB_CHEAL +2043,3000,0,0,0,0,2000 +//-- AB_EPICLESIS +2044,2000:2500:3000:3500:4000,2000,0,18000:21000:24000:27000:30000,0,60000 +//-- AB_PRAEFATIO +2045,2000,0,0,120000,0,13000:16000:19000:22000:25000:28000:31000:34000:37000:40000 +//-- AB_ORATIO +2046,4000,0,0,30000,0,2000 +//-- AB_LAUDAAGNUS 2047,1000,0,0,60000,0,3000 -//-- AB_LAUDARAMUS +//-- AB_LAUDARAMUS 2048,1000,0,0,60000,0,3000 -//-- AB_RENOVATIO -2050,5000,0,0,90000,0,1000 -//-- AB_HIGHNESSHEAL -2051,1000,1000,0,0,0,3000:6000:9000:12000:15000 -//-- AB_CLEARANCE +//-- AB_RENOVATIO +2050,3000,0,0,90000,0,0 +//-- AB_HIGHNESSHEAL +2051,1000,1000,0,0,0,3000 +//-- AB_CLEARANCE 2052,4000,0,0,0,0,10000 -//-- AB_EXPIATIO -2053,2000,0,0,150000:180000:210000:240000:270000,0,0 -//-- AB_DUPLELIGHT -2054,4000,1000,0,90000:120000:150000:180000:210000:240000:270000:300000:330000:360000,0,0 +//-- AB_EXPIATIO +2053,1000,0,0,150000:180000:210000:240000:270000,0,0 +//-- AB_DUPLELIGHT +2054,2000,1000,0,90000:120000:150000:180000:210000:240000:270000:300000:330000:360000,0,0 -//-- AB_SILENTIUM +//-- AB_SILENTIUM 2057,4000,0,0,20000:30000:40000:50000:60000,0,15000 -//========================================== +//========================================== -//===== Warlock ============================ +//===== Warlock ============================ //-- WL_WHITEIMPRISON -2201,0,0,0,6000:8000:10000:12000:14000,15000,0 -//-- WL_SOULEXPANSION +2201,0,0,0,6000:8000:10000:12000:14000,15000,4000 +//-- WL_SOULEXPANSION 2202,2000,500,0,0,0,0 -//-- WL_FROSTMISTY -2203,2500,2000,0,40000,0,8000 -//-- WL_JACKFROST -2204,3000,2000,0,10000:15000:20000:25000:30000,0,0 -//-- WL_MARSHOFABYSS //CHECK Duration 1 time -2205,500,1000,0,20000,0,2500:3000:3500:4000:4500 -//-- WL_RECOGNIZEDSPELL -2206,2000,1000,0,20000:30000:40000:50000:60000,0,60000 -//-- WL_SIENNAEXECRATE // Duration of the status for this skill appears to be hard coded. Fix later???? +//-- WL_FROSTMISTY +2203,2000:2500:3000:3500:4000,1000,0,40000,0,4000 +//-- WL_JACKFROST +2204,2000:2500:3000:3500:4000,1000,0,10000:15000:20000:25000:30000,0,0 +//-- WL_MARSHOFABYSS +2205,2500,1000,0,25000,0,0 +//-- WL_RECOGNIZEDSPELL +2206,1000,1000,0,60000:90000:120000:150000:180000,0,50000:80000:110000:140000:170000 +//-- WL_SIENNAEXECRATE 2207,2000,2000,0,10000:12000:14000:16000:18000,0,0 -//-- WL_STASIS // Duration for the status will need to be hard coded soon to make stats reduce the duration. -2209,4000,2000,0,20000:30000:40000:50000:60000,0,180000:190000:200000:210000:220000 -//-- WL_DRAINLIFE -2210,5000,0,0,0,0,2000 -//-- WL_CRIMSONROCK //CHECK Whats duration 1 for? -2211,6000,2000,0,3000:4000:5000:6000:7000,0,5000 -//-- WL_HELLINFERNO -2212,4000,1000,0,20000:30000:40000:50000:60000,0,0 -//-- WL_COMET //CHECK Is burning on duration 1 correct? -2213,11000:12500:14000:15500:17000,5000,0,20000,0,180000 -//-- WL_CHAINLIGHTNING //CHECK Whats duration 1 used for? -2214,4500:5000:5500:6000:6500,3000,0,1000,0,0 +//-- WL_STASIS +2209,3000,1000,0,10000:15000:20000:25000:30000,0,300000 +//-- WL_DRAINLIFE +2210,4000,0,0,0,0,2000 +//-- WL_CRIMSONROCK +2211,5000,2000,0,3000:4000:5000:6000:7000,0,5000 +//-- WL_HELLINFERNO +2212,3000,1000,0,15000,0,0 +//-- WL_COMET +2213,10000:11000:12000:13000:14000,0,0,15000,0,60000 +//-- WL_CHAINLIGHTNING +2214,3500:4000:4500:5000:5500,0,0,100,0,3000 //-- WL_EARTHSTRAIN -2216,2000:3000:4000:5000:6000,1000,0,150,0,10000 -//-- WL_TETRAVORTEX //CHECK Duration 1 might be correct? -2217,6000:7000:8000:9000:10000,2000,0,20000,0,15000 - -//-- WL_SUMMONFB -2222,2000,0,0,30000:40000:50000:60000:70000,0,0 -//-- WL_SUMMONBL -2223,2000,0,0,30000:40000:50000:60000:70000,0,0 -//-- WL_SUMMONWB -2224,2000,0,0,30000:40000:50000:60000:70000,0,0 - -//-- WL_SUMMONSTONE -2229,2000,0,0,30000:40000:50000:60000:70000,0,0 - -//-- WL_READING_SB -2231,4000,500,0,0,0,5000 -//========================================== - -//===== Ranger ============================= -//-- RA_ARROWSTORM -2233,2500,0,0,0,0,3000 -//-- RA_FEARBREEZE +2216,2000:3000:4000:5000:6000,1000,0,150,75000:90000:105000:120000:135000,10000 +//-- WL_TETRAVORTEX +2217,5000:6000:7000:8000:9000,2000,0,20000,0,15000 + +//-- WL_SUMMONFB +2222,2000,0,0,120000:160000:200000:240000:280000,0,0 +//-- WL_SUMMONBL +2223,2000,0,0,120000:160000:200000:240000:280000,0,0 +//-- WL_SUMMONWB +2224,2000,0,0,120000:160000:200000:240000:280000,0,0 +//-- WL_SUMMONSTONE +2229,2000,0,0,120000:160000:200000:240000:280000,0,0 + +//-- WL_READING_SB +2231,5000,500,0,0,0,0 +//========================================== + +//===== Ranger ============================= +//-- RA_ARROWSTORM +2233,2000:2200:2400:2600:2800,0,0,0,0,5400:5600:5800:6000:6400 +//-- RA_FEARBREEZE 2234,2000,0,0,60000:90000:120000:150000:180000,0,0 -//-- RA_AIMEDBOLT -2236,5000,1000,0,0,0,0 -//-- RA_DETONATOR //CHECK Is this timer needed for this skill at all??? +//-- RA_AIMEDBOLT +2236,4000,1000,0,0,0,0 +//-- RA_DETONATOR 2237,0,0,0,1000,0,0 -//-- RA_ELECTRICSHOCKER //CHECK Is duration 1 and 2 what I think it is? -2238,0,0,0,15000,20000,0 -//-- RA_CLUSTERBOMB //CHECK Thinking the same for this one too. +//-- RA_ELECTRICSHOCKER +2238,0,0,0,15000,20000:22000:24000:26000,0 +//-- RA_CLUSTERBOMB 2239,0,0,0,15000,0,0 -//-- RA_WUGMASTERY +//-- RA_WUGMASTERY 2240,0,1000,0,0,0,0 -//-- RA_WUGRIDER +//-- RA_WUGRIDER 2241,0,500,0,0,0,0 -//-- RA_WUGDASH -2242,0,2000,0,0,0,0 -//-- RA_WUGBITE //CHECK Its found that the no movement duration is bugged. Keeping this at 10 sec for now. -2244,0,2000,0,10000,0,5000 +//-- RA_WUGBITE +2244,0,2000,0,1000:2000:3000:4000:5000,0,4000:6000:8000:10000:12000 -//-- RA_SENSITIVEKEEN +//-- RA_SENSITIVEKEEN 2246,0,3000,0,0,0,0 -//-- RA_CAMOUFLAGE +//-- RA_CAMOUFLAGE 2247,0,0,0,10000,0,0 -//-- RA_MAGENTATRAP //CHECK Duration 1 and 2 should be correct? +//-- RA_MAGENTATRAP 2249,0,2000,0,15000,10000,0 -//-- RA_COBALTTRAP +//-- RA_COBALTTRAP 2250,0,2000,0,15000,10000,0 -//-- RA_MAIZETRAP +//-- RA_MAIZETRAP 2251,0,2000,0,15000,10000,0 -//-- RA_VERDURETRAP +//-- RA_VERDURETRAP 2252,0,2000,0,15000,10000,0 -//-- RA_FIRINGTRAP -2253,0,0,0,15000,25000,0 -//-- RA_ICEBOUNDTRAP -2254,0,0,0,15000,25000,0 -//========================================== - -//===== Mechanic =========================== -//-- NC_BOOSTKNUCKLE -2256,1000:1200:1400:1600:1800,0,0,0,0,0 -//-- NC_PILEBUNKER +//-- RA_FIRINGTRAP +2253,0,0,0,20000,15000,0 +//-- RA_ICEBOUNDTRAP +2254,0,0,0,20000,15000,0 +//========================================== + +//===== Mechanic =========================== +//-- NC_BOOSTKNUCKLE +2256,200:400:600:800:1000,0,0,0,0,0 +//-- NC_PILEBUNKER 2257,0,2000,0,0,0,5000 -//-- NC_VULCANARM -2258,0,500:300:100,0,0,0,0 -//-- NC_FLAMELAUNCHER -2259,1500:1900:2300,1500:1000:500,0,7000:14000:21000,0,0 -//-- NC_COLDSLOWER //CHECK Are freezing and frozen durations correct? -2260,1000,1000:2000:3000,0,5000:10000:15000,10000:15000:20000,0 -// -- NC_ARMSCANNON +//-- NC_VULCANARM +2258,0,300:200:100,0,0,0,0 +//-- NC_FLAMELAUNCHER +2259,1000:1500:2000,1500:1000:500,0,7000:14000:21000,0,0 +//-- NC_COLDSLOWER +2260,1000,1000:2000:3000,0,7000:14000:21000,0,0 +// -- NC_ARMSCANNON 2261,1400:1600:1800,500:1000:2000,0,0,0,0 -//-- NC_ACCELERATION +//-- NC_ACCELERATION 2262,0,0,0,30000:60000:90000,0,0 -//-- NC_HOVERING -2263,0,0,0,30000,0,0 -//-- NC_F_SIDESLIDE +//-- NC_HOVERING +2263,0,0,0,90000,0,0 +//-- NC_F_SIDESLIDE 2264,0,500,0,0,0,0 -//-- NC_B_SIDESLIDE +//-- NC_B_SIDESLIDE 2265,0,500,0,0,0,0 -//-- NC_SELFDESTRUCTION -2267,3500:3000:2500,0,0,0,0,0 -//-- NC_SHAPESHIFT -2268,2000,2000,0,300000,0,0 -//-- NC_EMERGENCYCOOL +//-- NC_SELFDESTRUCTION +2267,2000:1500:1000,0,0,0,0,300000 +//-- NC_SHAPESHIFT +2268,0,2000,0,300000,0,0 +//-- NC_EMERGENCYCOOL 2269,0,500,0,0,0,5000 -//-- NC_INFRAREDSCAN -2270,1000,500,0,10000,0,15000 -//-- NC_ANALYZE -2271,1000,1000,0,20000,0,0 -//-- NC_MAGNETICFIELD -2272,500:1000:1500,0,0,15000,0,300000 -//-- NC_NEUTRALBARRIER -2273,500:1000:1500,0,0,30000:45000:60000,0,120000 -//-- NC_STEALTHFIELD -2274,500:1000:1500,0,0,15000:20000:25000,0,120000 -//-- NC_REPAIR -2275,500,1000,0,0,0,0 - -//-- NC_AXEBOOMERANG -2278,0,0,0,0,0,5000 -//-- NC_POWERSWING //CHECK Duration 1 is stun? -2279,0,1000,0,3000,0,0 -//-- NC_AXETORNADO +//-- NC_INFRAREDSCAN +2270,0,500,0,3000,0,3000 +//-- NC_ANALYZE +2271,0,1000,0,20000,0,0 +//-- NC_MAGNETICFIELD +2272,500:1000:1500,0,0,15000,0,20000:15000:10000 +//-- NC_NEUTRALBARRIER +2273,500:1000:1500,0,0,30000:45000:60000,0,20000:15000:10000 +//-- NC_STEALTHFIELD +2274,500:1000:1500,0,0,15000:20000:25000,0,20000:15000:10000 +//-- NC_REPAIR +2275,200:300:400:500:600,1000,0,0,0,0 + +//-- NC_AXEBOOMERANG +2278,0,0,0,0,0,5000:4500:4000:3500:3000 +//-- NC_POWERSWING +2279,0,1000,0,2000,0,0 +//-- NC_AXETORNADO 2280,0,500,0,0,0,4000:3500:3000:2500:2000 -//-- NC_SILVERSNIPER -2281,1800:1600:1400:1200:1000,0,0,10000:15000:20000:25000:30000,0,0 -//-- NC_MAGICDECOY -2282,1800:1600:1400:1200:1000,0,0,10000:15000:20000:25000:30000,0,0 -//-- NC_DISJOINT +//-- NC_SILVERSNIPER +2281,0,0,0,20000:30000:40000:50000:60000,0,0 +//-- NC_MAGICDECOY +2282,0,0,0,20000:30000:40000:50000:60000,0,0 +//-- NC_DISJOINT 2283,2000,0,0,0,0,0 -//========================================== +//========================================== -//===== Shadow Chaser ====================== -//-- SC_FATALMENACE +//===== Shadow Chaser ====================== +//-- SC_FATALMENACE 2284,0,500,0,0,0,0 -//-- SC_REPRODUCE //CHECK Does a duration limit still exist, or it just stays on until reused? +//-- SC_REPRODUCE 2285,0,1000,0,60000,0,0 -//-- SC_AUTOSHADOWSPELL -2286,6000:5600:5200:4800:4400:4000:3600:3200:2800:2400,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:300000,0,0 -//-- SC_SHADOWFORM +//-- 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 +//-- SC_SHADOWFORM 2287,0,1000,0,30000:40000:50000:60000:70000,0,0 -//-- SC_TRIANGLESHOT +//-- SC_TRIANGLESHOT 2288,1000,500,0,0,0,0 -//-- SC_BODYPAINT //CHECK Whats duration 2 do? -2289,0,1000,0,5000:7000:9000:11000:13000,5000,2000 -//-- SC_INVISIBILITY //CHECK Is duration 1 needed for this or it lasts until your out of SP? -2290,1000,1000,0,20000,0,300000 -//-- SC_DEADLYINFECT +//-- SC_BODYPAINT +2289,0,1000,0,5000:7000:9000:11000:13000,0,2000 +//-- SC_INVISIBILITY +2290,1000,1000,0,20000,0,20000:30000:40000:50000:60000 +//-- SC_DEADLYINFECT 2291,0,1000,0,10000:15000:20000:25000:30000,0,2000 -//-- SC_ENERVATION +//-- SC_ENERVATION 2292,2000,1000,0,10000:15000:20000,0,2000 -//-- SC_GROOMY +//-- SC_GROOMY 2293,2000,1000,0,10000:15000:20000,0,2000 -//-- SC_IGNORANCE +//-- SC_IGNORANCE 2294,2000,1000,0,10000:15000:20000,0,2000 -//-- SC_LAZINESS +//-- SC_LAZINESS 2295,2000,1000,0,10000:15000:20000,0,2000 -//-- SC_UNLUCKY +//-- SC_UNLUCKY 2296,2000,1000,0,10000:15000:20000,0,2000 -//-- SC_WEAKNESS +//-- SC_WEAKNESS 2297,2000,1000,0,10000:15000:20000,0,2000 -//-- SC_STRIPACCESORY +//-- SC_STRIPACCESORY 2298,1000,1000,0,60000:70000:80000:90000:100000,0,0 -//-- SC_MANHOLE +//-- SC_MANHOLE 2299,1000,2000,0,5000:10000:15000,5000:10000:15000,0 -//-- SC_DIMENSIONDOOR +//-- SC_DIMENSIONDOOR 2300,1000,2000,0,4000:8000:12000,0,0 -//-- SC_CHAOSPANIC +//-- SC_CHAOSPANIC 2301,2000,2000,0,5000:10000:15000,4000:8000:12000,0 -//-- SC_MAELSTROM +//-- SC_MAELSTROM 2302,2000,2000,0,7000:14000:21000,0,0 -//-- SC_BLOODYLUST +//-- SC_BLOODYLUST //dur2=intr 2303,2000,2000,0,10000:20000:30000,0,180000 -//-- SC_FEINTBOMB +//-- SC_FEINTBOMB 2304,1000,0,0,1000,0,5000 -//========================================== +//========================================== -//==== Royal Guard skills ================== -//-- LG_CANNONSPEAR +//==== Royal Guard skills ================== +//-- LG_CANNONSPEAR 2307,0,0,0,0,0,2000 -//-- LG_TRAMPLE -2309,0,1000,0,0,0,0 -//-- LG_SHIELDPRESS -2310,0,0,0,5500:6000:6500:7000:7500,0,2000 -//-- LG_REFLECTDAMAGE +//-- LG_TRAMPLE +2309,0,0,0,0,0,1000 +//-- LG_SHIELDPRESS +2310,0,0,0,3500:4000:4500:5000:5500,0,2000 +//-- LG_REFLECTDAMAGE 2311,0,0,0,300000,0,0 -//-- LG_PINPOINTATTACK //CHECK Whats duration 1 for? +//-- LG_PINPOINTATTACK 2312,0,1000,0,5000,0,5000 -//-- LG_FORCEOFVANGUARD -2313,1000,1000,0,120000,0,0 -//-- LG_RAGEBURST +//-- LG_FORCEOFVANGUARD +2313,0,1000,0,300000,0,0 +//-- LG_RAGEBURST 2314,0,3000,0,0,0,0 -//-- LG_SHIELDSPELL //CHECK Shound spells the shield casts use the original duration of that skill? +//-- LG_SHIELDSPELL //TODO apply proper duration [malufett] 2315,1000,1000,0,3000:30000:30000,0,2000 -//-- LG_EXEEDBREAK +//-- LG_EXEEDBREAK 2316,5000:5500:6000:6500:7000,1000,0,300000,0,0 -//-- LG_OVERBRAND +//-- LG_OVERBRAND 2317,500,2000,0,0,0,0 -//-- LG_PRESTIGE -2318,3000,0,0,30000:45000:60000:75000:90000,0,60000 -//-- LG_BANDING +//-- LG_PRESTIGE +2318,1000,0,0,30000:45000:60000:75000:90000,0,60000 +//-- LG_BANDING 2319,0,0,0,-1,2000:4000:6000:8000:10000,0 -//-- LG_MOONSLASHER +//-- LG_MOONSLASHER 2320,1000,1000,0,0,0,6000:5000:4000:3000:2000 -//-- LG_RAYOFGENESIS -2321,2500:3000:3500:4000:4500,2000,0,10000,0,5000 -//-- LG_PIETY +//-- LG_RAYOFGENESIS +2321,2000:2500:3000:3500:4000,2000,0,10000,0,5000 +//-- LG_PIETY 2322,3000:2500:2000:1500:1000,0,0,60000:80000:100000:120000:140000,0,0 -//-- LG_EARTHDRIVE +//-- LG_EARTHDRIVE 2323,1000,1000,0,3000:6000:9000:12000:15000,0,7000:6000:5000:4000:3000 -//-- LG_HESPERUSLIT +//-- LG_HESPERUSLIT 2324,1000,3000,0,0,0,20000 -//-- LG_INSPIRATION -2325,3000,2000,0,30000:45000:60000:75000:90000,0,540000:480000:420000:360000:300000 -//========================================== +//-- LG_INSPIRATION +2325,2000,2000,0,30000:45000:60000:75000:90000,0,540000:480000:420000:360000:300000 +//========================================== -//===== Sura Skills ======================== -//-- SR_DRAGONCOMBO //CHECK Is stun on duration 1 correct? +//===== Sura Skills ======================== +//-- SR_DRAGONCOMBO 2326,0,0,0,3000,0,0 -//-- SR_SKYNETBLOW +//-- SR_SKYNETBLOW 2327,0,500,0,0,0,0 -//-- SR_EARTHSHAKER //CHECK Duration 1 is correct, but is the stun working? -2328,0,0,0,1000:2000:2000:3000:3000,0,3000 -//-- SR_FALLENEMPIRE //CHECK The immoble is working? +//-- SR_EARTHSHAKER +2328,0,0,0,1000,0,3000 +//-- SR_FALLENEMPIRE 2329,0,0,0,500:1000:1500:2000:2500,0,0 -//-- SR_TIGERCANNON +//-- SR_TIGERCANNON 2330,1100:1200:1300:1400:1500:1600:1700:1800:1900:2000,1000,0,0,0,5000 -//-- SR_RAMPAGEBLASTER +//-- SR_RAMPAGEBLASTER 2332,0,1000,0,0,0,10000 -//-- SR_CRESCENTELBOW -2333,0,1000,0,10000:15000:20000:25000:30000,0,5000 -//-- SR_CURSEDCIRCLE +//-- SR_CRESCENTELBOW +2333,0,1000,0,3000:4000:5000:6000:7000,0,5000 +//-- SR_CURSEDCIRCLE 2334,0,1000,0,3000:4000:5000:6000:7000,0,10000 -//-- SR_LIGHTNINGWALK -2335,0,1000,0,10000:15000:20000:25000:30000,0,5000 -//-- SR_KNUCKLEARROW +//-- SR_LIGHTNINGWALK +2335,0,1000,0,5000:6000:7000:8000:9000,0,5000 +//-- SR_KNUCKLEARROW 2336,0,1000,0,0,0,0 -//-- SR_WINDMILL +//-- SR_WINDMILL 2337,1000,500,0,0,0,3000 -//-- SR_RAISINGDRAGON //CHECK Whats the set 5 seconds in the last column for? -2338,0,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,5000,30000 +//-- SR_RAISINGDRAGON +2338,0,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0,30000 -//-- SR_ASSIMILATEPOWER +//-- SR_ASSIMILATEPOWER 2340,0,1000,0,0,0,5000 -//-- SR_POWERVELOCITY -2341,2000,0,0,0,0,0 +//-- SR_POWERVELOCITY +2341,1500,0,0,0,0,0 -//-- 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,5000 -//-- SR_GENTLETOUCH_QUIET +//-- 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 +//-- SR_GENTLETOUCH_QUIET 2344,0,0,0,5000:7000:9000:11000:13000,0,1000:1500:2000:2500:3000 -//-- SR_GENTLETOUCH_CURE -2345,0,1000,0,0,0,0 -//-- SR_GENTLETOUCH_ENERGYGAIN //CHECK Desc shows these durations. Are they good as is? -2346,1000,1000,0,60000:120000:180000:240000:300000,0,0 -//-- SR_GENTLETOUCH_CHANGE -2347,1000,1000,0,60000:120000:180000:240000:300000,0,0 -//-- SR_GENTLETOUCH_REVITALIZE -2348,1000,1000,0,60000:120000:180000:240000:300000,0,0 -//========================================== - -//==== Wanderer skills ===================== -//-- WA_SWING_DANCE +//-- SR_GENTLETOUCH_CURE +2345,0,1000,0,0,0,1000:1500:2000:2500:3000 +//-- SR_GENTLETOUCH_ENERGYGAIN +2346,1000,1000,0,240000,0,0 +//-- SR_GENTLETOUCH_CHANGE +2347,1000,1000,0,240000,0,200000:180000:160000:140000:120000 +//-- SR_GENTLETOUCH_REVITALIZE +2348,1000,1000,0,240000,0,200000:180000:160000:140000:120000 +//========================================== + +//==== Wanderer skills ===================== +//-- WA_SWING_DANCE 2350,1000,2000,0,60000,0,0 -//-- WA_SYMPHONY_OF_LOVER +//-- WA_SYMPHONY_OF_LOVER 2351,1000,2000,0,60000,0,0 -//-- WA_MOONLIT_SERENADE +//-- WA_MOONLIT_SERENADE 2352,1000,2000,0,60000,0,0 -//========================================== +//========================================== -//==== Minstresl skills ==================== -//-- MI_RUSH_WINDMILL -2381,1000,2000,0,60000,0,0 -//-- MI_ECHOSONG +//==== Minstresl skills ==================== +//-- MI_RUSH_WINDMILL +2381,0,2000,0,60000,0,0 +//-- MI_ECHOSONG 2382,1000,2000,0,60000,0,0 -//-- MI_HARMONIZE +//-- MI_HARMONIZE 2383,1000,1000,0,60000,0,5000 -//========================================== +//========================================== -//==== Minstrel/Wanderer skills ============ -//-- WM_METALICSOUND +//==== Minstrel/Wanderer skills ============ +//-- WM_METALICSOUND 2413,1000:1500:2000:2500:3000,1000,0,0,0,2000:2500:3000:3500:4000 -//-- WM_REVERBERATION +//-- WM_REVERBERATION 2414,1100:1200:1300:1400:1500,1000,0,9000:10000:11000:12000:13000,0,0 -//-- WM_DOMINION_IMPULSE +//-- WM_DOMINION_IMPULSE 2417,0,1000,0,0,0,0 -//-- WM_SEVERE_RAINSTORM -2418,2000:2500:3000:3500:4000,1000,0,900:1500:2100:2700:3000,0,5000 -//-- WM_POEMOFNETHERWORLD +//-- WM_SEVERE_RAINSTORM +2418,1000:1500:2000:2500:3000,1000,0,900:1500:2100:2700:3000,0,5000:5500:6000:6500:7000 +//-- WM_POEMOFNETHERWORLD 2419,3000,0,0,9000:11000:13000:15000:17000,8000:10000:12000:14000:16000,0 -//-- WM_VOICEOFSIREN +//-- WM_VOICEOFSIREN 2420,2000:2200:2400:2600:2800,1000,0,15000:18000:21000:24000:27000,0,5000 -//-- WM_DEADHILLHERE +//-- WM_DEADHILLHERE 2421,4000:3500:3000:2500:2000,1000,0,0,0,0 -//-- WM_LULLABY_DEEPSLEEP -2422,3000,1000,0,12000:14000:16000:18000:20000,0,10000 -//-- WM_SIRCLEOFNATURE +//-- WM_LULLABY_DEEPSLEEP +2422,2000,1000,0,12000:14000:16000:18000:20000,0,10000 +//-- WM_SIRCLEOFNATURE 2423,2000,1000,0,60000,0,15000 -//-- WM_RANDOMIZESPELL +//-- WM_RANDOMIZESPELL 2424,0,1000,0,0,0,3000 -//-- WM_GLOOMYDAY +//-- WM_GLOOMYDAY 2425,1000,1000,0,30000:45000:60000:75000:90000,0,10000 -//-- WM_GREAT_ECHO -2426,2500:2700:2900:3100:3300,1000,0,0,0,10000 -//-- WM_SONG_OF_MANA -2427,1500,1000,0,30000:60000:90000:120000:150000,0,90000 -//-- WM_DANCE_WITH_WUG -2428,2000:2500:3000:3500:4000,1000,0,30000:60000:90000:120000:150000,0,90000 -//-- WM_SOUND_OF_DESTRUCTION -2429,500:1000:1500:2000:2500,1000,0,0,0,20000 -//-- WM_SATURDAY_NIGHT_FEVER -2430,2000:3000:4000:5000:6000,1000,0,20000:30000:40000:50000:60000,3000,180000 -//-- WM_LERADS_DEW -2431,1500,1000,0,20000:30000:40000:50000:60000,0,180000 -//-- WM_MELODYOFSINK -2432,1500,1000,0,20000:30000:40000:50000:60000,0,180000 -//-- WM_BEYOND_OF_WARCRY -2433,1500,1000,0,20000:30000:40000:50000:60000,0,180000 -//-- WM_UNLIMITED_HUMMING_VOICE -2434,1500,1000,0,20000:30000:40000:50000:60000,0,180000 -//========================================== - -//==== Sorcerer skills ===================== -//-- SO_FIREWALK //CHECK Duration 2 needs to be added for the PROPERTYWALK status ID. Ask me for more info. [Rytech] +//-- WM_GREAT_ECHO +2426,2000:2200:2400:2600:2800,1000,0,0,0,10000 +//-- WM_SONG_OF_MANA +2427,1000,1000,0,30000:60000:90000:120000:150000,0,90000 +//-- WM_DANCE_WITH_WUG +2428,1500:2000:2500:3000:3500,1000,0,30000:60000:90000:120000:150000,0,90000 +//-- WM_SOUND_OF_DESTRUCTION +2429,0:500:1000:1500:2000,1000,0,0,0,20000 +//-- WM_SATURDAY_NIGHT_FEVER +2430,1000:2000:3000:4000:5000,1000,0,10000:15000:20000:25000:30000,10000:8000:6000:4000:2000,180000 +//-- WM_LERADS_DEW +2431,1000,1000,0,20000:30000:40000:50000:60000,0,180000 +//-- WM_MELODYOFSINK +2432,100,1000,0,20000:30000:40000:50000:60000,0,180000 +//-- WM_BEYOND_OF_WARCRY +2433,1000,1000,0,20000:30000:40000:50000:60000,0,180000 +//-- WM_UNLIMITED_HUMMING_VOICE +2434,1000,1000,0,60000:90000:120000:150000:180000,0,110000:120000:130000:140000:150000 +//========================================== + +//==== Sorcerer skills ===================== +//-- SO_FIREWALK //CHECK Duration 2 needs to be added for the PROPERTYWALK status ID. Ask me for more info. [Rytech] 2443,1000,1000,0,12000,0,0 -//-- SO_ELECTRICWALK //CHECK Duration 2 needs to be added for the PROPERTYWALK status ID. Ask me for more info. [Rytech] +//-- SO_ELECTRICWALK //CHECK Duration 2 needs to be added for the PROPERTYWALK status ID. Ask me for more info. [Rytech] 2444,1000,1000,0,12000,0,0 -//-- SO_SPELLFIST +//-- SO_SPELLFIST 2445,0,1000,0,20000:25000:30000:35000:40000,0,0 -//-- SO_EARTHGRAVE +//-- SO_EARTHGRAVE 2446,2200:2400:2600:2800:3000,1000,0,500,8000:11000:14000:17000:20000,5000 -//-- SO_DIAMONDDUST -2447,5500:6000:6500:7000:7500,1000,0,500,12000:14000:16000:18000:20000,5000 -//-- SO_POISON_BUSTER -2450,2000:3000:4000:5000:6000,1000,0,0,0,2000 -//-- SO_PSYCHIC_WAVE -2449,9000:9900:10800:11700:12600,1000,0,1200:1700:2200:2700:3200,0,5000 -//-- SO_CLOUD_KILL -2450,3300:3500:3700:3900:4100,1000,0,8000:10000:12000:14000:16000,10000:15000:20000:25000:30000,5000 -//-- SO_STRIKING -2451,3000,1000,0,60000,0,2000 -//-- SO_WARMER -2452,1700:1900:2100:2300:2500,1000,0,40000:45000:50000:55000:60000,30000,60000 +//-- SO_DIAMONDDUST +2447,5000:5500:6000:6500:7000,1000,0,500,12000:14000:16000:18000:20000,5000 +//-- SO_POISON_BUSTER +2450,2200:3400:4600:5800:7000,1000,0,0,0,2000 +//-- SO_PSYCHIC_WAVE +2449,8000:9000:10000:11000:12000,1000,0,1200:1700:2200:2700:3200,0,5000 +//-- SO_CLOUD_KILL +2450,2300:2500:2700:2900:3100,1000,0,8000:10000:12000:14000:16000,10000:15000:20000:25000:30000,5000 +//-- SO_STRIKING +2451,1000,1000,0,60000,0,2000 +//-- SO_WARMER +2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000 //-- SO_VACUUM_EXTREME 2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,0,5000 -//-- SO_VARETYR_SPEAR //CHECK Duration 2 is used for the stun? -2454,1700:1900:2100:2300:2500,1000,0,0,3000,2000 -//-- SO_ARULLO -2455,1500:2000:2500:3000:3500,1000,0,8000:10000:12000:14000:16000,0,5000:6000:7000:8000:9000 -//-- SO_EL_CONTROL +//-- SO_VARETYR_SPEAR +2454,2200:2400:2600:2800:3000,1000,0,0,2200:2400:2600:2800:3000,2000 +//-- SO_ARULLO +2455,2200:2400:2600:2800:3000,1000,0,8000:10000:12000:14000:16000,0,5000:6000:7000:8000:9000 +//-- SO_EL_CONTROL 2456,2000,0,0,0,0,5000 -//-- SO_SUMMON_AGNI //CHECK Yoyo says the cooldown is 5 seconds. Need to confirm. -2457,3000:4000:5000,0,0,600000:900000:1200000,0,60000 -//-- SO_SUMMON_AQUA //CHECK Yoyo says the cooldown is 5 seconds. Need to confirm. -2458,3000:4000:5000,0,0,600000:900000:1200000,0,60000 -//-- SO_SUMMON_VENTUS //CHECK Yoyo says the cooldown is 5 seconds. Need to confirm. -2459,3000:4000:5000,0,0,600000:900000:1200000,0,60000 -//-- SO_SUMMON_TERA //CHECK Yoyo says the cooldown is 5 seconds. Need to confirm. -2460,3000:4000:5000,0,0,600000:900000:1200000,0,60000 -//-- SO_EL_ACTION +//-- SO_SUMMON_AGNI +2457,1000:2000:3000,0,0,600000:900000:1200000,0,60000 +//-- SO_SUMMON_AQUA +2458,1000:2000:3000,0,0,600000:900000:1200000,0,60000 +//-- SO_SUMMON_VENTUS +2459,1000:2000:3000,0,0,600000:900000:1200000,0,60000 +//-- SO_SUMMON_TERA +2460,1000:2000:3000,0,0,600000:900000:1200000,0,60000 +//-- SO_EL_ACTION 2461,0,0,0,0,0,5000 -//-- SO_EL_ANALYSIS -2462,2000,0,0,0,0,0 +//-- SO_EL_ANALYSIS +2462,0,0,0,0,0,0 -//-- SO_EL_CURE +//-- SO_EL_CURE 2464,2000,1000,0,0,0,0 -//-- SO_FIRE_INSIGNIA -2465,2000,0,0,60000,0,60000 -//-- SO_WATER_INSIGNIA -2466,2000,0,0,60000,0,60000 -//-- SO_WIND_INSIGNIA -2467,2000,0,0,60000,0,60000 -//-- SO_EARTH_INSIGNIA -2468,2000,0,0,60000,0,60000 -//========================================== - -//==== Genetic skills ====================== -//-- GN_CART_TORNADO //CHECK Duration 1 used for stun? +//-- SO_FIRE_INSIGNIA +2465,1000,0,0,60000,0,60000 +//-- SO_WATER_INSIGNIA +2466,1000,0,0,60000,0,60000 +//-- SO_WIND_INSIGNIA +2467,1000,0,0,60000,0,60000 +//-- SO_EARTH_INSIGNIA +2468,1000,0,0,60000,0,60000 +//========================================== + +//==== Genetic skills ====================== +//-- GN_CART_TORNADO 2476,0,500,0,5000,0,0:500:1000:1500:2000 -//-- GN_CARTCANNON +//-- GN_CARTCANNON 2477,1000:1500:2000:2500:3000,500,0,0,0,0 -//-- GN_CARTBOOST +//-- GN_CARTBOOST 2478,1500,500,0,90000,0,0 -//-- GN_THORNS_TRAP +//-- GN_THORNS_TRAP 2479,1500,500,0,10000:12000:14000:16000:18000,20000,0 -//-- GN_BLOOD_SUCKER +//-- GN_BLOOD_SUCKER 2480,1500,500,0,20000:22000:24000:26000:28000,0,0 -//-- GN_SPORE_EXPLOSION +//-- GN_SPORE_EXPLOSION 2481,1500,500,0,2000:2000:3000:3000:4000,0,5000 -//-- GN_WALLOFTHORN +//-- GN_WALLOFTHORN 2482,1500,500,0,10000:11000:12000:13000:14000,0,5000 //-- GN_CRAZYWEED 2483,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500,500,0,0,0,5000 -//-- GN_CRAZYWEED_ATK +//-- GN_CRAZYWEED_ATK 2484,0,0,0,100,0,0 -//-- GN_DEMONIC_FIRE //CHECK Is duration 2 the burning? -2485,3000:3500:4000:4500:5000,500,0,10000:12000:14000:16000:18000,10000,5000 -//-- GN_FIRE_EXPANSION +//-- GN_DEMONIC_FIRE +2485,3000:3500:4000:4500:5000,500,0,10000:12000:14000:16000:18000,15000,5000 +//-- GN_FIRE_EXPANSION 2486,2000,500,0,0,0,0 -//-- GN_FIRE_EXPANSION_SMOKE_POWDER +//-- GN_FIRE_EXPANSION_SMOKE_POWDER 2487,0,0,0,10000:12000:14000:16000:18000,0,0 -//-- GN_FIRE_EXPANSION_TEAR_GAS +//-- GN_FIRE_EXPANSION_TEAR_GAS 2488,0,0,0,10000:12000:14000:16000:18000,0,0 -//-- GN_HELLS_PLANT +//-- GN_HELLS_PLANT 2490,3000:3500:4000:4500:5000,500,0,14000:21000:28000:35000:42000,0,0 //-- GN_HELLS_PLANT_ATK 2491,0,0,0,20000,0,0 -//-- GN_MANDRAGORA +//-- GN_MANDRAGORA 2492,1000,500,0,10000:15000:20000:25000:30000,0,15000 -//-- GN_SLINGITEM //CHECK Whats durations 1 and 2 used for? +//-- GN_SLINGITEM 2493,0,0,0,77000,10000,1000 -//-- GN_SLINGITEM_RANGEMELEEATK //CHECK Whats duration 1 used for? +//-- GN_SLINGITEM_RANGEMELEEATK 2498,0,0,0,3000,0,0 -//========================================== +//========================================== -//===== Extra 3rd Class Skills ============= -//-- AB_SECRAMENT -2515,2000,500,0,60000:90000:120000:150000:180000,0,0 +//===== Extra 3rd Class Skills ============= +//-- AB_SECRAMENT +2515,1000,500,0,60000:90000:120000:150000:180000,0,0 -//-- SR_HOWLINGOFLION //CHECK Is duration 1 correct for fear? -2517,1500,0,0,10000,0,10000 -//-- SR_RIDEINLIGHTNING -2518,0,200,0,0,0,1000 -//========================================== +//-- SR_HOWLINGOFLION +2517,1000,0,0,12000:14000:16000:18000:20000,0,10000 +//-- SR_RIDEINLIGHTNING +2518,1000:2000:3000:4000:5000,200,0,0,0,1000 +//========================================== -//===== Misc. Skills ======================= -//-- ALL_ODINS_RECALL +//===== Misc. Skills ======================= +//-- ALL_ODINS_RECALL 2533,10000,0,0,0,0,300000 -//-- RETURN_TO_ELDICASTES +//-- RETURN_TO_ELDICASTES 2534,3000,0,0,0,0,300000 -//-- ALL_GUARDIAN_RECALL +//-- ALL_GUARDIAN_RECALL 2536,3000,0,0,0,0,300000 -//-- ALL_ODINS_POWER -//2537,5000,5000,0,60000,0,60000 -//========================================== - +//-- ALL_ODINS_POWER +2537,5000,5000,0,60000,0,60000 +//========================================== -//==== Kagerou & Oboro skills ============== -//-- KO_YAMIKUMO +//==== Kagerou & Oboro skills ============== +//-- KO_YAMIKUMO 3001,0,0,0,60000,0,0 -//-- KO_JYUMONJIKIRI +//-- KO_JYUMONJIKIRI 3004,0,2500,0,5000,0,0 -//-- KO_SETSUDAN +//-- KO_SETSUDAN 3005,0,2000,0,0,0,0 -//-- KO_BAKURETSU +//-- KO_BAKURETSU 3006,1000:1500:2000:2500:3000,1000,0,100,0,3000 -//-- KO_HAPPOKUNAI +//-- KO_HAPPOKUNAI 3007,0,1000,0,0,0,0 -//-- KO_MUCHANAGE +//-- KO_MUCHANAGE 3008,0,0,0,100,0,10000 -//-- KO_HUUMARANKA +//-- KO_HUUMARANKA 3009,0,3000,0,500,0,0 -//-- KO_MAKIBISHI +//-- KO_MAKIBISHI 3010,0,0,0,12000:14000:16000:18000:20000,10000,0 -//-- KO_MEIKYOUSISUI +//-- KO_MEIKYOUSISUI 3011,3000,0,0,10000,0,0 -//-- KO_ZANZOU +//-- KO_ZANZOU 3012,0,0,0,27000:24000:21000:18000:15000,0,0 -//-- KO_KYOUGAKU +//-- KO_KYOUGAKU 3013,1000,0,0,12000:14000:16000:18000:20000,0,0 -//-- KO_JYUSATSU +//-- KO_JYUSATSU 3014,1000,0,0,8000:10000:12000:14000:16000,0,0 -//-- KO_KAHU_ENTEN +//-- KO_KAHU_ENTEN 3015,500,0,0,300000,0,0 -//-- KO_HYOUHU_HUBUKI +//-- KO_HYOUHU_HUBUKI 3016,500,0,0,300000,0,0 -//-- KO_KAZEHU_SEIRAN +//-- KO_KAZEHU_SEIRAN 3017,500,0,0,300000,0,0 -//-- KO_DOHU_KOUKAI +//-- KO_DOHU_KOUKAI 3018,500,0,0,300000,0,0 -//-- KO_KAIHOU +//-- KO_KAIHOU 3019,1000,0,0,0,0,0 -//-- KO_ZENKAI +//-- KO_ZENKAI 3020,1000,0,0,10000,10000,0 -//-- KO_GENWAKU +//-- KO_GENWAKU 3021,500,0,0,5000,0,0 -//-- KO_IZAYOI +//-- KO_IZAYOI 3022,0,0,0,30000:45000:60000:75000:90000,0,60000 -//-- KG_KAGEHUMI +//-- KG_KAGEHUMI 3023,0,0,0,5000,0,5000 -//-- KG_KYOMU +//-- KG_KYOMU 3024,0,0,0,10000:15000:20000:25000:30000,0,0 -//-- KG_KAGEMUSYA +//-- KG_KAGEMUSYA 3025,0,0,0,60000:90000:120000:15000:180000,0,0 -//-- OB_ZANGETSU +//-- OB_ZANGETSU 3026,0,0,0,60000:75000:90000:105000:120000,0,0 -//-- OB_OBOROGENSOU +//-- OB_OBOROGENSOU 3027,0,0,0,10000:15000:20000:25000:30000,0,0 -//-- OB_AKAITSUKI +//-- OB_AKAITSUKI 3029,0,0,0,10000:15000:20000:25000:30000,0,0 //========================================== @@ -1724,58 +1720,57 @@ 8016,0,0,1000,0,0,0 //========================================== -//===== Mutated Homunculus Skills ========== CHECK - Need Aftercast and Cooldown times for these skills [Rytech] -//-- MH_SUMMON_LEGION -8018,2000,0,0,20000:30000:40000:50000:60000,0,0 -//-- MH_NEEDLE_OF_PARALYZE = Whats the duration of the paralyze status? [Rytech] -8019,1500,0,0,12000:14000:16000:18000:20000,0,0 -//-- MH_POISON_MIST -8020,1000:1200:1400:1600:1800,0,0,12000:14000:16000:18000:20000,4000:6000:8000:10000:12000,0 -//-- MH_PAIN_KILLER -8021,2000,0,0,20000:30000:40000:50000:60000,0,0 -//-- MH_LIGHT_OF_REGENE +//-- MH_SUMMON_LEGION +8018,1600:1400:1200:1000:800,0,0,20000:30000:40000:50000:60000,0,0 +//-- MH_NEEDLE_OF_PARALYZE +8019,1000:1100:1200:1300:1400,0,0,12000:14000:16000:18000:20000,0,0 +//-- MH_POISON_MIST +8020,500:700:900:1100:1300,0,0,12000:14000:16000:18000:20000,4000:6000:8000:10000:12000,0 +//-- MH_PAIN_KILLER +8021,1000:1200:1400:1600:1800,0,0,20000:30000:40000:50000:60000,0,0 +//-- MH_LIGHT_OF_REGENE 8022,1600:1400:1200:1000:800,0,0,360000:420000:480000:540000:600000,0,0 -//-- MH_OVERED_BOOST -8023,1000,0,0,30000:45000:60000:75000:90000,0,0 -//-- MH_ERASER_CUTTER +//-- MH_OVERED_BOOST +8023,800:700:600:500:400,0,0,30000:45000:60000:75000:90000,0,0 +//-- MH_ERASER_CUTTER 8024,1000:1500:2000:2500:3000,0,0,0,0,0 -//-- MH_XENO_SLASHER - CHECK Whats the duration of bleeding status? [Rytech] -8025,2000:3000:4000:5000:6000,0,0,500,0,0 -//-- MH_SILENT_BREEZE +//-- MH_XENO_SLASHER +8025,1500:2500:3500:4500:5500,0,0,500,0,0 +//-- MH_SILENT_BREEZE 8026,2000,0,0,9000:12000:15000:18000:21000,0,0 -//-- MH_STYLE_CHANGE -//8027,0,0,0,0,0,0 -//-- MH_SONIC_CRAW -//8028,0,0,0,0,0,0 -//-- MH_SILVERVEIN_RUSH -//8029,0,0,0,0,0,0 -//-- MH_MIDNIGHT_FRENZY -//8030,0,0,0,0,0,0 -//-- MH_STAHL_HORN - dur1 = stun time -8031,1000,0,0,5000,0,0 -//-- MH_GOLDENE_FERSE +//-- MH_STYLE_CHANGE +//8027,0,0,0,0,0,0,0 +//-- MH_SONIC_CRAW +//8028,0,0,0,0,0,0,0 +//-- MH_SILVERVEIN_RUSH +//8029,0,0,0,0,0,0,0 +//-- MH_MIDNIGHT_FRENZY +//8030,0,0,0,0,0,0,0 +//-- MH_STAHL_HORN +8031,800:600:400:200:0,0,0,5000,0,0 +//-- MH_GOLDENE_FERSE 8032,1000:1200:1400:1600:1800,0,0,30000:45000:60000:75000:90000,0,0 -//-- MH_STEINWAND +//-- MH_STEINWAND 8033,1000,0,0,30000:45000:60000:75000:90000,0,0 -//-- MH_HEILIGE_STANGE -8034,2000,0,0,0,0,0 -//-- MH_ANGRIFFS_MODUS +//-- MH_HEILIGE_STANGE +8034,200:400:600:800:1000,0,0,0,0,0 +//-- MH_ANGRIFFS_MODUS 8035,200:400:600:800:1000,0,0,30000:45000:60000:75000:90000,0,0 -//-- MH_TINDER_BREAKER -//8036,0,0,0,0,0,0 -//-- MH_CBC -//8037,0,0,0,0,0,0 -//-- MH_EQC -//8038,0,0,0,0,0,0 -//-- MH_MAGMA_FLOW -8039,4000,0,0,30000:45000:60000:75000:90000,0,0 -//-- MH_GRANITIC_ARMOR +//-- MH_TINDER_BREAKER +//8036,0,0,0,0,0,0,0 +//-- MH_CBC +//8037,0,0,0,0,0,0,0 +//-- MH_EQC +//8038,0,0,0,0,0,0,0 +//-- MH_MAGMA_FLOW +8039,2000:2500:3000:3500:4000,0,0,30000:45000:60000:75000:90000,0,0 +//-- MH_GRANITIC_ARMOR 8040,6000:5500:5000:4500:4000,0,0,60000,0,0 -//-- MH_LAVA_SLIDE +//-- MH_LAVA_SLIDE 8041,6000:5500:5000:4500:4000,0,0,12000:14000:16000:18000:20000,0,0 -//-- MH_PYROCLASTIC -8042,6000:5500:5000:4500:4000,0,0,60000:90000:120000:150000:180000,0,0 -//-- MH_VOLCANIC_ASH +//-- MH_PYROCLASTIC +8042,5000:4500:4000:3500:3000,0,0,60000:90000:120000:150000:180000,0,0 +//-- MH_VOLCANIC_ASH 8043,5000:4500:4000:3500:3000,0,0,12000:14000:16000:18000:20000,0,0 //========================================== @@ -1840,62 +1835,62 @@ 8240,1000,1000,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0 //========================================== -//===== Elemental Skills ======================= -//-- EL_CIRCLE_OF_FIRE +//===== Elemental Skills ======================= +//-- EL_CIRCLE_OF_FIRE 8401,0,0,0,-1,0,0 -//-- EL_FIRE_CLOAK +//-- EL_FIRE_CLOAK 8402,0,0,0,-1,0,0 -//-- EL_FIRE_MANTLE +//-- EL_FIRE_MANTLE 8403,0,0,0,15000,0,0 -//-- EL_WATER_SCREEN +//-- EL_WATER_SCREEN 8404,0,0,0,-1,0,0 -//-- EL_WATER_DROP +//-- EL_WATER_DROP 8405,0,0,0,-1,0,0 -//-- EL_WATER_BARRIER +//-- EL_WATER_BARRIER 8406,1000,0,0,15000,0,0 -//-- EL_WIND_STEP +//-- EL_WIND_STEP 8407,0,0,0,-1,0,0 -//-- EL_WIND_CURTAIN +//-- EL_WIND_CURTAIN 8408,0,0,0,-1,0,0 -//-- EL_ZEPHYR +//-- EL_ZEPHYR 8409,0,0,0,15000,0,0 -//-- EL_STONE_SHIELD +//-- EL_STONE_SHIELD 8411,0,0,0,-1,0,0 -//-- EL_POWER_OF_GAIA +//-- EL_POWER_OF_GAIA 8412,0,0,0,15000,0,0 -//-- EL_PYROTECHNIC +//-- EL_PYROTECHNIC 8413,0,0,0,-1,0,0 -//-- EL_HEATER +//-- EL_HEATER 8414,0,0,0,-1,0,0 -//-- EL_TROPIC +//-- EL_TROPIC 8415,0,0,0,-1,0,0 -//-- EL_AQUAPLAY +//-- EL_AQUAPLAY 8416,0,0,0,-1,0,0 -//-- EL_COOLER +//-- EL_COOLER 8417,0,0,0,-1,0,0 -//-- EL_CHILLY_AIR +//-- EL_CHILLY_AIR 8418,0,0,0,-1,0,0 -//-- EL_GUST +//-- EL_GUST 8419,0,0,0,-1,0,0 -//-- EL_BLAST +//-- EL_BLAST 8420,0,0,0,-1,0,0 -//-- EL_WILD_STORM +//-- EL_WILD_STORM 8421,0,0,0,-1,0,0 -//-- EL_PETROLOGY +//-- EL_PETROLOGY 8422,0,0,0,-1,0,0 -//-- EL_CURSED_SOIL +//-- EL_CURSED_SOIL 8423,0,0,0,-1,0,0 -//-- EL_UPHEAVAL +//-- EL_UPHEAVAL 8424,0,0,0,-1,0,0 -//-- EL_TIDAL_WEAPON +//-- EL_TIDAL_WEAPON 8433,0,0,0,-1,0,0 -//-- EL_TYPOON_MIS +//-- EL_TYPOON_MIS 8437,0,0,0,15000,0,0 -//-- EL_STONE_HAMMER +//-- EL_STONE_HAMMER 8439,0,0,0,5000,0,0 -//-- EL_ROCK_CRUSHER +//-- EL_ROCK_CRUSHER 8440,0,0,0,15000,0,0 -//-- EL_ROCK_CRUSHER_ATK +//-- EL_ROCK_CRUSHER_ATK 8441,0,0,0,15000,0,0 //========================================== diff --git a/src/map/battle.c b/src/map/battle.c index 27f67ee3b..3bbdcc210 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -502,7 +502,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li } break; case BF_WEAPON: - if( sd && !(nk&NK_NO_CARDFIX_ATK) ) + if( sd && !(nk&NK_NO_CARDFIX_ATK) && (left&2) ) { short cardfix_ = 1000; if(sd->state.arrow_atk) @@ -550,7 +550,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li if( tstatus->race != RC_DEMIHUMAN ) cardfix=cardfix*(100+sd->right_weapon.addrace[RC_NONDEMIHUMAN])/100; - if( left ) + if( left&1 ) { cardfix_=cardfix_*(100+sd->left_weapon.addrace[tstatus->race])/100; if (!(nk&NK_NO_ELEFIX)) { @@ -610,7 +610,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li } } - if( left ) + if( left&1 ) { for( i = 0; i < ARRAYLENGTH(sd->left_weapon.add_dmg) && sd->left_weapon.add_dmg[i].rate; i++ ) { @@ -630,7 +630,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li cardfix_ = cardfix_ * (100 + sd->sc.data[SC_EDP]->val1 * 60 ) / 100; } #endif - if( left && cardfix_ != 1000 ) + if( (left&1) && cardfix_ != 1000 ) damage = damage * cardfix_ / 1000; else if( cardfix != 1000 ) damage = damage * cardfix / 1000; @@ -649,7 +649,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li ele_fix += tsd->subele2[i].rate; } cardfix=cardfix*(100-ele_fix)/100; - if( left && s_ele_ != s_ele ) + if( left&1 && s_ele_ != s_ele ) { int ele_fix_lh = tsd->subele[s_ele_]; for (i = 0; ARRAYLENGTH(tsd->subele2) > i && tsd->subele2[i].rate != 0; i++) @@ -3311,9 +3311,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo } //Card Fix, sd side - wd.damage = battle_calc_cardfix(BF_WEAPON, src, (tsd?NULL:target), nk, s_ele, s_ele_, wd.damage, 0, wd.flag); + wd.damage = battle_calc_cardfix(BF_WEAPON, src, target, nk, s_ele, s_ele_, wd.damage, 2, wd.flag); if( flag.lh ) - wd.damage2 = battle_calc_cardfix(BF_WEAPON, src, (tsd?NULL:target), nk, s_ele, s_ele_, wd.damage2, 1, wd.flag); + wd.damage2 = battle_calc_cardfix(BF_WEAPON, src, target, nk, s_ele, s_ele_, wd.damage2, 3, wd.flag); if (skill_num == CR_SHIELDBOOMERANG || skill_num == PA_SHIELDCHAIN) { //Refine bonus applies after cards and elements. @@ -3323,9 +3323,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo } } //if (sd) - //Card Fix, tsd sid + //Card Fix, tsd side if(tsd) - wd.damage = battle_calc_cardfix(BF_WEAPON, (sd?NULL:src), target, nk, s_ele, s_ele_, wd.damage, flag.lh, wd.flag); + wd.damage = battle_calc_cardfix(BF_WEAPON, src, target, nk, s_ele, s_ele_, wd.damage, flag.lh, wd.flag); if (flag.infdef) { //Plants receive 1 damage when hit diff --git a/src/map/pc.h b/src/map/pc.h index 8d74b8953..971fce1d2 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -654,8 +654,18 @@ enum equip_index { #define pc_rightside_def(sd) ((sd)->battle_status.def2) #define pc_leftside_mdef(sd) ((sd)->battle_status.mdef) #define pc_rightside_mdef(sd) ( (sd)->battle_status.mdef2 - ((sd)->battle_status.vit>>1) ) -#define pc_leftside_matk(sd) ((sd)->battle_status.matk_min) -#define pc_rightside_matk(sd) ((sd)->battle_status.matk_max) +#define pc_leftside_matk(sd) \ + (\ + ((sd)->sc.data[SC_MAGICPOWER] && (sd)->sc.data[SC_MAGICPOWER]->val4) \ + ?((sd)->battle_status.matk_min * 100 + 50) / ((sd)->sc.data[SC_MAGICPOWER]->val3+100) \ + :(sd)->battle_status.matk_min \ + ) +#define pc_rightside_matk(sd) \ + (\ + ((sd)->sc.data[SC_MAGICPOWER] && (sd)->sc.data[SC_MAGICPOWER]->val4) \ + ?((sd)->battle_status.matk_max * 100 + 50) / ((sd)->sc.data[SC_MAGICPOWER]->val3+100) \ + :(sd)->battle_status.matk_max \ + ) #endif int pc_class2idx(int class_); diff --git a/src/map/skill.c b/src/map/skill.c index 2fe20e2ec..f599ed63d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -16611,6 +16611,12 @@ static void skill_toggle_magicpower(struct block_list *bl, short skillid) } else { sc->data[SC_MAGICPOWER]->val4 = 1; status_calc_bl(bl, status_sc2scb_flag(SC_MAGICPOWER)); +#ifndef RENEWAL + if(bl->type == BL_PC){// update current display. + clif_updatestatus(((TBL_PC *)bl),SP_MATK1); + clif_updatestatus(((TBL_PC *)bl),SP_MATK2); + } +#endif } } } diff --git a/src/map/status.c b/src/map/status.c index fcefedbbe..c534233f8 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3296,6 +3296,9 @@ static unsigned int status_calc_maxsp(struct block_list *,struct status_change * static unsigned char status_calc_element(struct block_list *bl, struct status_change *sc, int element); static unsigned char status_calc_element_lv(struct block_list *bl, struct status_change *sc, int lv); static unsigned short status_calc_mode(struct block_list *bl, struct status_change *sc, int mode); +#ifdef RENEWAL +static unsigned short status_calc_ematk(struct block_list *,struct status_change *,int); +#endif //Calculates base regen values. void status_calc_regen(struct block_list *bl, struct status_data *status, struct regen_data *regen) @@ -3786,10 +3789,14 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag) **/ status->matk_min = status->matk_max = status_base_matk(status, status_get_lv(bl)); if( bl->type&BL_PC ){ + // Any +MATK you get from skills and cards, including cards in weapon, is added here. if( sd->bonus.ematk > 0 ){ status->matk_max += sd->bonus.ematk; status->matk_min += sd->bonus.ematk; } + status->matk_min = status_calc_ematk(bl, sc, status->matk_min); + status->matk_max = status_calc_ematk(bl, sc, status->matk_max); + //This is the only portion in MATK that varies depending on the weapon level and refinement rate. if( status->rhw.matk > 0 ){ int wMatk = status->rhw.matk; int variance = wMatk * status->rhw.wlv / 10; @@ -3807,7 +3814,7 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag) status->matk_max = status_calc_matk(bl, sc, status->matk_max); if ((bl->type&BL_HOM && battle_config.hom_setting&0x20) //Hom Min Matk is always the same as Max Matk - || ( sc && sc->data[SC_RECOGNIZEDSPELL] )) + || sc->data[SC_RECOGNIZEDSPELL]) status->matk_min = status->matk_max; #ifdef RENEWAL @@ -4540,28 +4547,44 @@ static unsigned short status_calc_watk(struct block_list *bl, struct status_chan return (unsigned short)cap_value(watk,0,USHRT_MAX); } +#ifdef RENEWAL +static unsigned short status_calc_ematk(struct block_list *bl, struct status_change *sc, int matk) +{ + + if (!sc || !sc->count) + return cap_value(matk,0,USHRT_MAX); + if (sc->data[SC_MATKPOTION]) + matk += sc->data[SC_MATKPOTION]->val1; + if (sc->data[SC_MATKFOOD]) + matk += sc->data[SC_MATKFOOD]->val1; + if (sc->data[SC_MANA_PLUS]) + matk += sc->data[SC_MANA_PLUS]->val1; + if (sc->data[SC_AQUAPLAY_OPTION]) + matk += sc->data[SC_AQUAPLAY_OPTION]->val2; + if (sc->data[SC_CHILLY_AIR_OPTION]) + matk += sc->data[SC_CHILLY_AIR_OPTION]->val2; + if (sc->data[SC_WATER_BARRIER]) + matk -= sc->data[SC_WATER_BARRIER]->val3; + if (sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 3) + matk += 50; + if (sc->data[SC_ODINS_POWER]) + matk += 40 + 30 * sc->data[SC_ODINS_POWER]->val1; //70 lvl1, 100lvl2 + if (sc->data[SC_IZAYOI]) + matk += 50 * sc->data[SC_IZAYOI]->val1; + return (unsigned short)cap_value(matk,0,USHRT_MAX); +} +#endif static unsigned short status_calc_matk(struct block_list *bl, struct status_change *sc, int matk) { if (!sc || !sc->count) return cap_value(matk,0,USHRT_MAX); - +#ifndef RENEWAL + // take note fixed value first before % modifiers if (sc->data[SC_MATKPOTION]) matk += sc->data[SC_MATKPOTION]->val1; if (sc->data[SC_MATKFOOD]) matk += sc->data[SC_MATKFOOD]->val1; - if (sc->data[SC_MAGICPOWER] && sc->data[SC_MAGICPOWER]->val4) - matk += matk * sc->data[SC_MAGICPOWER]->val3/100; - if (sc->data[SC_MINDBREAKER]) - matk += matk * sc->data[SC_MINDBREAKER]->val2/100; - if (sc->data[SC_INCMATKRATE]) - matk += matk * sc->data[SC_INCMATKRATE]->val1/100; - if (sc->data[SC_MOONLITSERENADE]) - matk += matk * sc->data[SC_MOONLITSERENADE]->val2/100; - if (sc->data[SC_MELODYOFSINK]) - matk += matk * sc->data[SC_MELODYOFSINK]->val3/100; - if (sc->data[SC_BEYONDOFWARCRY]) - matk -= matk * sc->data[SC_BEYONDOFWARCRY]->val3/100; if (sc->data[SC_MANA_PLUS]) matk += sc->data[SC_MANA_PLUS]->val1; if (sc->data[SC_AQUAPLAY_OPTION]) @@ -4576,6 +4599,19 @@ static unsigned short status_calc_matk(struct block_list *bl, struct status_chan matk += 40 + 30 * sc->data[SC_ODINS_POWER]->val1; //70 lvl1, 100lvl2 if (sc->data[SC_IZAYOI]) matk += 50 * sc->data[SC_IZAYOI]->val1; +#endif + if (sc->data[SC_MAGICPOWER]) + matk += matk * sc->data[SC_MAGICPOWER]->val3/100; + if (sc->data[SC_MINDBREAKER]) + matk += matk * sc->data[SC_MINDBREAKER]->val2/100; + if (sc->data[SC_INCMATKRATE]) + matk += matk * sc->data[SC_INCMATKRATE]->val1/100; + if (sc->data[SC_MOONLITSERENADE]) + matk += matk * sc->data[SC_MOONLITSERENADE]->val2/100; + if (sc->data[SC_MELODYOFSINK]) + matk += matk * sc->data[SC_MELODYOFSINK]->val3/100; + if (sc->data[SC_BEYONDOFWARCRY]) + matk -= matk * sc->data[SC_BEYONDOFWARCRY]->val3/100; if (sc->data[SC_ZANGETSU]) matk += matk * sc->data[SC_ZANGETSU]->val2 / 100; @@ -6988,6 +7024,9 @@ int status_change_start(struct block_list *bl,enum sc_type type,int rate,int val case SC_INVINCIBLEOFF: status_change_end(bl, SC_INVINCIBLE, INVALID_TIMER); break; + case SC_MAGICPOWER: + status_change_end(bl, type, INVALID_TIMER); + break; } //Check for overlapping fails |