Partial fixed for bugreport:6563 updated renewal casting and all 3rd job skills cast, delay, and cooldown.

Fixed bugreport:6583 where GN_MIX_COOKING and GN_MAKEBOMB doesn't produce the right amount of item.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16717 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
rud0lp20 2012-08-29 16:49:15 +00:00
parent f0fd2ca09a
commit fb23c27da5
2 changed files with 228 additions and 231 deletions

View File

@ -8,7 +8,7 @@
// AfterCastWalkDleay : amount of time before character can move again, in miliseconds
// Duration1 / Duration2 : usually the durations used by the skill, at special cases it is used to hold special data
// Cool Down : amount of time until character can re-use this skill, in miliseconds
// Fixed Casting Time: the skills fixed casting time (when 0, uses 20% of cast time)
// Fixed Casting Time: the skills fixed casting time (when 0, uses 20% of cast time and less than 0 means no fixed cast time)
//== Extra
// On all fields you can use ':' as a delimiter to level-specific values,
// - Example using SM_PROVOKE
@ -1074,48 +1074,48 @@
//===== Rune Knight ========================
//-- RK_ENCHANTBLADE
2001,1000,0,0,300000,0,0,0
2001,1000,0,0,300000,0,0,-1
//-- RK_SONICWAVE
2002,0,1000,0,0,0,2000,0
//-- RK_DEATHBOUND
2003,0,2000,0,2000,0,3000,0
//-- RK_HUNDREDSPEAR
2004,1000:900:800:700:600:500:400:300:200:100,500,0,0,0,3000,0
//-- RK_WINDCUTTER //CHECK duration 1
2005,0,0,0,0,0,2000,0
2004,1000:900:800:700:600:500:400:300:200:100,500,0,0,0,3000,-1
//-- RK_WINDCUTTER
2005,0,2000,0,0,0,2000,0
//-- RK_IGNITIONBREAK
2006,1000,0,0,0,0,2000,0
2006,1000,0,0,0,0,2000,-1
//-- RK_DRAGONBREATH //CHECK duration 1 burning
2008,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,5000,0,0,500
//-- RK_DRAGONBREATH
2008,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,10000,0,0,500
//-- RK_DRAGONHOWLING
2009,0,0,0,15000,0,10000,0
//-- RK_MILLENNIUMSHIELD //CHECK duration 2
2011,0,1000,0,300000,0,60000,0
//-- RK_MILLENNIUMSHIELD
2011,0,1000,0,180000,0,60000,0
//-- RK_CRUSHSTRIKE
2012,1000,0,0,0,0,30000,0
//-- RK_REFRESH //CHECK duration 1
2013,1000,0,0,30000,0,120000,0
2012,0,0,0,0,0,30000,1000
//-- RK_REFRESH
2013,0,0,0,60000,0,120000,1000
//-- RK_GIANTGROWTH
2014,1000,0,0,300000,0,0,0
//-- RK_STONEHARDSKIN //CHECK duration 2
2015,2000,0,0,300000,10000,0,0
2014,0,0,0,180000,0,0,1000
//-- RK_STONEHARDSKIN
2015,0,0,0,180000,10000,0,2000
//-- RK_VITALITYACTIVATION
2016,0,0,0,30000,0,0,0
//-- RK_STORMBLAST //CHECK duration 1
2017,2000,1000,0,1000,0,0,0
2016,0,0,0,180000,0,0,0
//-- RK_STORMBLAST
2017,0,0,0,0,0,0,2000
//-- RK_FIGHTINGSPIRIT
2018,0,0,0,300000,0,0,0
2018,0,0,0,180000,0,0,0
//-- RK_ABUNDANCE
2019,0,0,0,300000,0,0,0
2019,0,0,0,180000,0,0,0
//==========================================
//===== Gillotine Cross ====================
//-- GC_VENOMIMPRESS
2021,0,3000:2500:2000:1500:1000,0,10000:20000:30000:40000:50000,0,0,0
//-- GC_CROSSIMPACT
2022,0,2500:2000:1500:1000:500,2000,0,0,0,0
2022,0,2500:2000:1500:1000:500,0,0,0,0,0
//-- GC_DARKILLUSION
2023,0,1500,0,0,0,0,0
@ -1133,8 +1133,8 @@
2030,0,1000,0,60000,0,0,0
//-- GC_VENOMPRESSURE
2031,0,1000,0,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,0
//-- GC_POISONSMOKE
2032,0,2000,0,6000:8000:10000:12000:14000,0,0,2000
//-- GC_CLOAKINGEXCEED
2033,0,2000,0,0,0,0,0
//-- GC_PHANTOMMENACE
@ -1149,121 +1149,118 @@
//===== Arch Bishop ========================
//-- AB_JUDEX
2038,2500,500,0,0,0,0,0
2038,2000,500,0,0,0,0,500
//-- AB_ANCILLA
2039,1000,1000,0,0,0,0,0
//-- AB_ADORAMUS //CHECK Duration 1 is blindness and duration 2 is reduced AGI. FIX ME!!!!
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,0
2039,1000,1000,0,0,0,0,-1
//-- 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,-1
//-- AB_CLEMENTIA
2041,4000,0,0,120000:180000:240000,0,0,0
2041,3000,0,0,120000:180000:240000,0,0,1000
//-- AB_CANTO
2042,4000,0,0,120000:180000:240000,0,0,0
2042,3000,0,0,120000:180000:240000,0,0,1000
//-- AB_CHEAL
2043,4000:3500:3000,0,0,0,0,1000:2000:3000,0
2043,3000,0,0,0,0,2000,1000:500:0
//-- AB_EPICLESIS
2044,4000:4500:5000:5500:6000,2000,0,18000:21000:24000:27000:30000,0,60000,0
2044,2000:2500:3000:3500:4000,2000,0,18000:21000:24000:27000:30000,0,60000,2000
//-- AB_PRAEFATIO
2045,3000,0,0,120000,0,13000:16000:19000:22000:25000:28000:31000:34000:37000:40000,0
2045,2000,0,0,120000,0,13000:16000:19000:22000:25000:28000:31000:34000:37000:40000,1000
//-- AB_ORATIO
2046,5000,0,0,30000,0,2000,0
2046,4000,0,0,30000,0,2000,1000
//-- AB_LAUDAAGNUS
2047,1000,0,0,60000,0,3000,0
2047,1000,0,0,60000,0,3000,-1
//-- AB_LAUDARAMUS
2048,1000,0,0,60000,0,3000,0
2048,1000,0,0,60000,0,3000,-1
//-- AB_RENOVATIO
2050,5000,0,0,90000,0,1000,0
2050,3000,0,0,90000,0,0,2000
//-- AB_HIGHNESSHEAL
2051,1000,1000,0,0,0,3000,0
2051,1000,1000,0,0,0,3000,-1
//-- AB_CLEARANCE
2052,4000,0,0,0,0,10000,0
2052,4000,0,0,0,0,10000,-1
//-- AB_EXPIATIO
2053,2000,0,0,150000:180000:210000:240000:270000,0,0,0
2053,1000,0,0,150000:180000:210000:240000:270000,0,0,1000
//-- AB_DUPLELIGHT
2054,4000,1000,0,90000:120000:150000:180000:210000:240000:270000:300000:330000:360000,0,0,0
2054,2000,1000,0,90000:120000:150000:180000:210000:240000:270000:300000:330000:360000,0,0,2000
//-- AB_SILENTIUM
2057,4000,0,0,20000:30000:40000:50000:60000,0,15000,0
2057,4000,0,0,20000:30000:40000:50000:60000,0,15000,-1
//==========================================
//===== Warlock ============================
//-- WL_WHITEIMPRISON
2201,0,0,0,6000:8000:10000:12000:14000,15000,0,0
2201,0,0,0,6000:8000:10000:12000:14000,15000,4000,0
//-- WL_SOULEXPANSION
2202,2000,500,0,0,0,0,0
2202,2000,500,0,0,0,0,-1
//-- WL_FROSTMISTY
2203,2500,2000,0,40000,0,8000,0
2203,2000:2500:3000:3500:4000,1000,0,40000,0,4000,500
//-- WL_JACKFROST
2204,3000,2000,0,10000:15000:20000:25000:30000,0,0,0
//-- WL_MARSHOFABYSS //CHECK Duration 1 time
2205,500,1000,0,20000,0,2500:3000:3500:4000:4500,0
2204,2000:2500:3000:3500:4000,1000,0,10000:15000:20000:25000:30000,0,0,1000
//-- WL_MARSHOFABYSS //TODO: apply proper duration [malufett]
2205,2500,1000,0,30000,0,0,500
//-- WL_RECOGNIZEDSPELL
2206,2000,1000,0,20000:30000:40000:50000:60000,0,60000,0
//-- WL_SIENNAEXECRATE // Duration of the status for this skill appears to be hard coded. Fix later????
2207,2000,2000,0,10000:12000:14000:16000:18000,0,0,0
2206,1000,1000,0,60000:90000:120000:150000:180000,0,50000:80000:110000:140000:170000,1000
//-- WL_SIENNAEXECRATE
2207,2000,2000,0,10000:12000:14000:16000:18000,0,0,-1
//-- 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,0
//-- WL_STASIS //TODO: apply proper duration [malufett]
2209,3000,1000,0,10000:15000:20000:25000:30000,0,300000,1000
//-- WL_DRAINLIFE
2210,5000,0,0,0,0,2000,0
//-- WL_CRIMSONROCK //CHECK Whats duration 1 for?
2211,6000,2000,0,3000:4000:5000:6000:7000,0,5000,0
2210,4000,0,0,0,0,2000,1000
//-- WL_CRIMSONROCK
2211,5000,2000,0,3000:4000:5000:6000:7000,0,5000,2000
//-- WL_HELLINFERNO
2212,4000,1000,0,20000:30000:40000:50000:60000,0,0,0
//-- WL_COMET //CHECK Is burning on duration 1 correct?
2213,11000:12500:14000:15500:17000,5000,0,20000,0,180000,0
//-- WL_CHAINLIGHTNING //CHECK Whats duration 1 used for?
2214,4500:5000:5500:6000:6500,3000,0,1000,0,0,0
2212,3000,1000,0,15000,0,0,1000
//-- WL_COMET
2213,10000:11000:12000:13000:14000,0,15000,0,60000,1000:1500:2000:2500:3000
//-- WL_CHAINLIGHTNING
2214,3500:4000:4500:5000:5500,0,0,0,0,3000,1000
//-- WL_EARTHSTRAIN
2216,2000:3000:4000:5000:6000,1000,0,150,0,10000,2000
//-- WL_TETRAVORTEX //CHECK Duration 1 might be correct?
2217,6000:7000:8000:9000:10000,2000,0,20000,0,15000,0
//-- WL_TETRAVORTEX
2217,5000:6000:7000:8000:9000,2000,0,20000,0,15000,2000
//-- WL_SUMMONFB
2222,2000,0,0,30000:40000:50000:60000:70000,0,0,0
2222,2000,0,0,120000:160000:200000:240000:280000,0,0,-1
//-- WL_SUMMONBL
2223,2000,0,0,30000:40000:50000:60000:70000,0,0,0
2223,2000,0,0,120000:160000:200000:240000:280000,0,0,-1
//-- WL_SUMMONWB
2224,2000,0,0,30000:40000:50000:60000:70000,0,0,0
2224,2000,0,0,120000:160000:200000:240000:280000,0,0,-1
//-- WL_SUMMONSTONE
2229,2000,0,0,30000:40000:50000:60000:70000,0,0,0
2229,2000,0,0,120000:160000:200000:240000:280000,0,0,-1
//-- WL_READING_SB
2231,4000,500,0,0,0,5000,0
2231,5000,500,0,0,0,0,1000
//==========================================
//===== Ranger =============================
//-- RA_ARROWSTORM
2233,2500,0,0,0,0,3000,0
2233,2000:2200:2400:2600:2800,0,0,0,0,5400:5600:5800:6000:6400,-1
//-- RA_FEARBREEZE
2234,2000,0,0,60000:90000:120000:150000:180000,0,0,0
//-- RA_AIMEDBOLT
2236,5000,1000,0,0,0,0,0
//-- RA_DETONATOR //CHECK Is this timer needed for this skill at all???
2236,4000,1000,0,0,0,0,500
//-- RA_DETONATOR
2237,0,0,0,1000,0,0,0
//-- RA_ELECTRICSHOCKER //CHECK Is duration 1 and 2 what I think it is?
2238,0,0,0,15000,20000,0,0
//-- RA_CLUSTERBOMB //CHECK Thinking the same for this one too.
//-- RA_ELECTRICSHOCKER
2238,0,0,0,15000,20000:22000:24000:26000,0,0
//-- RA_CLUSTERBOMB
2239,0,0,0,15000,0,0,0
//-- RA_WUGMASTERY
2240,0,1000,0,0,0,0,0
//-- RA_WUGRIDER
2241,0,500,0,0,0,0,0
//-- RA_WUGDASH
2242,0,2000,0,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,0
//-- RA_WUGBITE
2244,0,2000,0,1000:2000:3000:4000:5000,0,4000:6000:8000:10000:12000,0
//-- RA_SENSITIVEKEEN
2246,0,3000,0,0,0,0,0
//-- RA_CAMOUFLAGE
2247,0,0,0,10000,0,0,0
//-- RA_MAGENTATRAP //CHECK Duration 1 and 2 should be correct?
//-- RA_MAGENTATRAP
2249,0,2000,0,15000,10000,0,0
//-- RA_COBALTTRAP
2250,0,2000,0,15000,10000,0,0
@ -1272,109 +1269,109 @@
//-- RA_VERDURETRAP
2252,0,2000,0,15000,10000,0,0
//-- RA_FIRINGTRAP
2253,0,0,0,15000,25000,0,0
2253,0,0,0,20000,15000,0,0
//-- RA_ICEBOUNDTRAP
2254,0,0,0,15000,25000,0,0
2254,0,0,0,20000,15000,0,0
//==========================================
//===== Mechanic ===========================
//-- NC_BOOSTKNUCKLE
2256,1000:1200:1400:1600:1800,0,0,0,0,0,0
2256,200:400:600:800:1000,0,0,0,0,0,-1
//-- NC_PILEBUNKER
2257,0,2000,0,0,0,5000,0
//-- NC_VULCANARM
2258,0,500:300:100,0,0,0,0,0
2258,0,300:200:100,0,0,0,0,0
//-- NC_FLAMELAUNCHER
2259,1500:1900:2300,1500:1000:500,0,7000:14000:21000,0,0,0
//-- NC_COLDSLOWER //CHECK Are freezing and frozen durations correct?
2260,1000,1000:2000:3000,0,5000:10000:15000,10000:15000:20000,0,0
2259,1000:1500:2000,1500:1000:500,0,7000:14000:21000,0,0,500
//-- NC_COLDSLOWER
2260,1000,1000:2000:3000,0,7000:14000:21000,0,0,-1
// -- NC_ARMSCANNON
2261,1400:1600:1800,500:1000:2000,0,0,0,0,0
2261,1400:1600:1800,500:1000:2000,0,0,0,0,600:400:200
//-- NC_ACCELERATION
2262,0,0,0,30000:60000:90000,0,0,0
//-- NC_HOVERING
2263,0,0,0,30000,0,0,0
2263,0,0,0,90000,0,0,0
//-- NC_F_SIDESLIDE
2264,0,500,0,0,0,0,0
//-- NC_B_SIDESLIDE
2265,0,500,0,0,0,0,0
//-- NC_SELFDESTRUCTION
2267,3500:3000:2500,0,0,0,0,0,0
2267,2000:1500:1000,0,0,0,0,300000,500
//-- NC_SHAPESHIFT
2268,2000,2000,0,300000,0,0,0
2268,0,2000,0,300000,0,0,2000
//-- NC_EMERGENCYCOOL
2269,0,500,0,0,0,5000,0
//-- NC_INFRAREDSCAN
2270,1000,500,0,10000,0,15000,0
2270,0,500,0,3000,0,3000,0
//-- NC_ANALYZE
2271,1000,1000,0,20000,0,0,0
2271,0,1000,0,20000,0,0,0
//-- NC_MAGNETICFIELD
2272,500:1000:1500,0,0,15000,0,300000,0
2272,500:1000:1500,0,0,15000,0,20000:15000:10000,-1
//-- NC_NEUTRALBARRIER
2273,500:1000:1500,0,0,30000:45000:60000,0,120000,0
2273,500:1000:1500,0,0,30000:45000:60000,0,20000:15000:10000,-1
//-- NC_STEALTHFIELD
2274,500:1000:1500,0,0,15000:20000:25000,0,120000,0
2274,500:1000:1500,0,0,15000:20000:25000,0,20000:15000:10000,-1
//-- NC_REPAIR
2275,500,1000,0,0,0,0,0
2275,200:300:400:500:600,1000,0,0,0,0,-1
//-- NC_AXEBOOMERANG
2278,0,0,0,0,0,5000,0
//-- NC_POWERSWING //CHECK Duration 1 is stun?
2279,0,1000,0,3000,0,0,0
2278,0,0,0,0,0,5000:4500:4000:3500:3000,0
//-- NC_POWERSWING
2279,0,1000,0,2000,0,0,0
//-- NC_AXETORNADO
2280,0,500,0,0,0,4000:3500:3000:2500:2000,0
//-- NC_SILVERSNIPER
2281,1800:1600:1400:1200:1000,0,0,10000:15000:20000:25000:30000,0,0,0
2281,0,0,0,20000:30000:40000:50000:60000,0,0,1800:1600:1400:1200:1000
//-- NC_MAGICDECOY
2282,1800:1600:1400:1200:1000,0,0,10000:15000:20000:25000:30000,0,0,0
2282,0,0,0,20000:30000:40000:50000:60000,0,0,1800:1600:1400:1200:1000
//-- NC_DISJOINT
2283,2000,0,0,0,0,0,0
2283,2000,0,0,0,0,0,-1
//==========================================
//===== Shadow Chaser ======================
//-- SC_FATALMENACE
2284,0,500,0,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,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,0
2286,4000:3600:3200:2800:2400:2000:1600:1200:800:400,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:300000,0,0,2000
//-- SC_SHADOWFORM
2287,0,1000,0,30000:40000:50000:60000:70000,0,0,0
//-- SC_TRIANGLESHOT
2288,1000,500,0,0,0,0,0
//-- SC_BODYPAINT //CHECK Whats duration 2 do?
2289,0,1000,0,5000:7000:9000:11000:13000,5000,2000,0
//-- SC_INVISIBILITY //CHECK Is duration 1 needed for this or it lasts until your out of SP?
2290,1000,1000,0,20000,0,300000,0
2288,1000,500,0,0,0,0,-1
//-- SC_BODYPAINT
2289,0,1000,0,5000:7000:9000:11000:13000,0,2000,0
//-- SC_INVISIBILITY
2290,1000,1000,0,20000,0,20000:30000:40000:50000:60000,-1
//-- SC_DEADLYINFECT
2291,0,1000,0,10000:15000:20000:25000:30000,0,2000,0
//-- SC_ENERVATION
2292,2000,1000,0,10000:15000:20000,0,2000,0
2292,2000,1000,0,10000:15000:20000,0,2000,-1
//-- SC_GROOMY
2293,2000,1000,0,10000:15000:20000,0,2000,0
2293,2000,1000,0,10000:15000:20000,0,2000,-1
//-- SC_IGNORANCE
2294,2000,1000,0,10000:15000:20000,0,2000,0
2294,2000,1000,0,10000:15000:20000,0,2000,-1
//-- SC_LAZINESS
2295,2000,1000,0,10000:15000:20000,0,2000,0
2295,2000,1000,0,10000:15000:20000,0,2000,-1
//-- SC_UNLUCKY
2296,2000,1000,0,10000:15000:20000,0,2000,0
2296,2000,1000,0,10000:15000:20000,0,2000,-1
//-- SC_WEAKNESS
2297,2000,1000,0,10000:15000:20000,0,2000,0
2297,2000,1000,0,10000:15000:20000,0,2000,-1
//-- SC_STRIPACCESORY
2298,1000,1000,0,60000:70000:80000:90000:100000,0,0,0
2298,1000,1000,0,60000:70000:80000:90000:100000,0,0,-1
//-- SC_MANHOLE
2299,1000,2000,0,5000:10000:15000,5000:10000:15000,0,0
2299,1000,2000,0,5000:10000:15000,5000:10000:15000,0,-1
//-- SC_DIMENSIONDOOR
2300,1000,2000,0,4000:8000:12000,0,0,0
2300,1000,2000,0,4000:8000:12000,0,0,-1
//-- SC_CHAOSPANIC
2301,2000,2000,0,5000:10000:15000,30000,0,0
2301,2000,2000,0,5000:10000:15000,4000:8000:12000,0,-1
//-- SC_MAELSTROM
2302,2000,2000,0,7000:14000:21000,0,0,0
2302,2000,2000,0,7000:14000:21000,0,0,-1
//-- SC_BLOODYLUST
2303,2000,2000,0,10000:20000:30000,30000,0,0
2303,2000,2000,0,10000:20000:30000,30000,0,-1
//-- SC_FEINTBOMB
2304,1000,0,0,1000,0,5000,0
2304,1000,0,0,1000,0,5000,-1
//==========================================
//==== Royal Guard skills ==================
@ -1382,31 +1379,31 @@
2307,0,0,0,0,0,2000,0
//-- LG_TRAMPLE
2309,0,1000,0,0,0,0,0
2309,0,0,0,0,0,1000,0
//-- LG_SHIELDPRESS
2310,0,0,0,5500:6000:6500:7000:7500,0,2000,0
2310,0,0,0,3500:4000:4500:5000:5500,0,2000,0
//-- LG_REFLECTDAMAGE
2311,0,0,0,300000,0,0,0
//-- LG_PINPOINTATTACK //CHECK Whats duration 1 for?
//-- LG_PINPOINTATTACK
2312,0,1000,0,5000,0,5000,0
//-- LG_FORCEOFVANGUARD
2313,1000,1000,0,120000,0,0,0
2313,0,1000,0,300000,0,0,0
//-- LG_RAGEBURST
2314,0,3000,0,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,0
//-- LG_EXEEDBREAK
2316,5000:5500:6000:6500:7000,1000,0,300000,0,0,0
//-- LG_OVERBRAND
2317,500,2000,0,0,0,0,0
//-- LG_PRESTIGE
2318,3000,0,0,30000:45000:60000:75000:90000,0,60000,0
2318,1000,0,0,30000:45000:60000:75000:90000,0,60000,2000
//-- LG_BANDING
2319,0,0,0,-1,2000:4000:6000:8000:10000,0,0
//-- LG_MOONSLASHER
2320,1000,1000,0,0,0,6000:5000:4000:3000:2000,0
//-- LG_RAYOFGENESIS
2321,2500:3000:3500:4000:4500,2000,0,10000,0,5000,0
2321,2000:2500:3000:3500:4000,2000,0,10000,0,5000,500
//-- LG_PIETY
2322,3000:2500:2000:1500:1000,0,0,60000:80000:100000:120000:140000,0,0,0
//-- LG_EARTHDRIVE
@ -1414,219 +1411,219 @@
//-- LG_HESPERUSLIT
2324,1000,3000,0,0,0,20000,0
//-- LG_INSPIRATION
2325,3000,2000,0,30000:45000:60000:75000:90000,0,540000:480000:420000:360000:300000,0
2325,2000,2000,0,30000:45000:60000:75000:90000,0,540000:480000:420000:360000:300000,1000
//==========================================
//===== Sura Skills ========================
//-- SR_DRAGONCOMBO //CHECK Is stun on duration 1 correct?
//-- SR_DRAGONCOMBO
2326,0,0,0,3000,0,0,0
//-- SR_SKYNETBLOW
2327,0,500,0,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,0
//-- SR_FALLENEMPIRE //CHECK The immoble is working?
//-- SR_EARTHSHAKER
2328,0,0,0,1000,0,3000,0
//-- SR_FALLENEMPIRE
2329,0,0,0,500:1000:1500:2000:2500,0,0,0
//-- SR_TIGERCANNON
2330,1100:1200:1300:1400:1500:1600:1700:1800:1900:2000,1000,0,0,0,5000,0
2330,1100:1200:1300:1400:1500:1600:1700:1800:1900:2000,1000,0,0,0,5000,-1
//-- SR_RAMPAGEBLASTER
2332,0,1000,0,0,0,10000,0
//-- SR_CRESCENTELBOW
2333,0,1000,0,10000:15000:20000:25000:30000,0,5000,0
2333,0,1000,0,3000:4000:5000:6000:7000,0,5000,0
//-- SR_CURSEDCIRCLE
2334,0,1000,0,3000:4000:5000:6000:7000,0,10000,0
//-- SR_LIGHTNINGWALK
2335,0,1000,0,10000:15000:20000:25000:30000,0,5000,0
2335,0,1000,0,5000:6000:7000:8000:9000,0,5000,0
//-- SR_KNUCKLEARROW
2336,0,1000,0,0,0,0,0
//-- SR_WINDMILL
2337,1000,500,0,0,0,3000,0
//-- 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,0
2337,1000,500,0,0,0,3000,-1
//-- SR_RAISINGDRAGON
2338,0,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0,30000,0
//-- SR_ASSIMILATEPOWER
2340,0,1000,0,0,0,5000,0
//-- SR_POWERVELOCITY
2341,2000,0,0,0,0,0,0
2341,1500,0,0,0,0,0,500
//-- SR_GATEOFHELL
2343,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,100:200:300:400:500:600:700:800:900:1000,0,0,0,5000,0
2343,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,100:200:300:400:500:600:700:800:900:1000,0,0,0,0,-1
//-- SR_GENTLETOUCH_QUIET
2344,0,0,0,5000:7000:9000:11000:13000,0,1000:1500:2000:2500:3000,0
//-- SR_GENTLETOUCH_CURE
2345,0,1000,0,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,0
2345,0,1000,0,0,0,1000:1500:2000:2500:3000,0
//-- SR_GENTLETOUCH_ENERGYGAIN
2346,1000,1000,0,240000,0,0,1000:1500:2000:2500:3000
//-- SR_GENTLETOUCH_CHANGE
2347,1000,1000,0,60000:120000:180000:240000:300000,0,0,0
2347,1000,1000,0,240000,0,200000:180000:160000:140000:120000,1000
//-- SR_GENTLETOUCH_REVITALIZE
2348,1000,1000,0,60000:120000:180000:240000:300000,0,0,0
2348,1000,1000,0,240000,0,200000:180000:160000:140000:120000,1000
//==========================================
//==== Wanderer skills =====================
//-- WA_SWING_DANCE
2350,1000,2000,0,60000,0,0,0
2350,1000,2000,0,60000,0,0,-1
//-- WA_SYMPHONY_OF_LOVER
2351,1000,2000,0,60000,0,0,0
2351,1000,2000,0,60000,0,0,-1
//-- WA_MOONLIT_SERENADE
2352,1000,2000,0,60000,0,0,0
2352,1000,2000,0,60000,0,0,-1
//==========================================
//==== Minstresl skills ====================
//-- MI_RUSH_WINDMILL
2381,1000,2000,0,60000,0,0,0
2381,0,2000,0,60000,0,0,0
//-- MI_ECHOSONG
2382,1000,2000,0,60000,0,0,0
2382,1000,2000,0,60000,0,0,-1
//-- MI_HARMONIZE
2383,1000,1000,0,60000,0,5000,0
2383,1000,1000,0,60000,0,5000,-1
//==========================================
//==== Minstrel/Wanderer skills ============
//-- WM_METALICSOUND
2413,1000:1500:2000:2500:3000,1000,0,0,0,2000:2500:3000:3500:4000,0
2413,1000:1500:2000:2500:3000,1000,0,0,0,2000:2500:3000:3500:4000,-1
//-- WM_REVERBERATION
2414,1100:1200:1300:1400:1500,1000,0,9000:10000:11000:12000:13000,0,0,0
2414,1100:1200:1300:1400:1500,1000,0,9000:10000:11000:12000:13000,0,0,-1
//-- WM_DOMINION_IMPULSE
2417,0,1000,0,0,0,0,0
//-- WM_SEVERE_RAINSTORM
2418,2000:2500:3000:3500:4000,1000,0,900:1500:2100:2700:3000,0,5000,0
2418,1000:1500:2000:2500:3000,1000,0,900:1500:2100:2700:3000,0,5000:5500:6000:6500:7000,500
//-- WM_POEMOFNETHERWORLD
2419,3000,0,0,9000:11000:13000:15000:17000,8000:10000:12000:14000:16000,0,0
2419,3000,0,0,9000:11000:13000:15000:17000,8000:10000:12000:14000:16000,0,-1
//-- WM_VOICEOFSIREN
2420,2000:2200:2400:2600:2800,1000,0,15000:18000:21000:24000:27000,0,5000,0
2420,2000:2200:2400:2600:2800,1000,0,15000:18000:21000:24000:27000,0,5000,-1
//-- WM_DEADHILLHERE
2421,4000:3500:3000:2500:2000,1000,0,0,0,0,0
2421,4000:3500:3000:2500:2000,1000,0,0,0,0,1000
//-- WM_LULLABY_DEEPSLEEP
2422,3000,1000,0,12000:14000:16000:18000:20000,0,10000,0
2422,2000,1000,0,12000:14000:16000:18000:20000,0,10000,1000
//-- WM_SIRCLEOFNATURE
2423,2000,1000,0,60000,0,15000,0
2423,2000,1000,0,60000,0,15000,-1
//-- WM_RANDOMIZESPELL
2424,0,1000,0,0,0,3000,0
//-- WM_GLOOMYDAY
2425,1000,1000,0,30000:45000:60000:75000:90000,0,10000,500
//-- WM_GREAT_ECHO
2426,2500:2700:2900:3100:3300,1000,0,0,0,10000,0
2426,2000:2200:2400:2600:2800,1000,0,0,0,10000,500
//-- WM_SONG_OF_MANA
2427,1500,1000,0,30000:60000:90000:120000:150000,0,90000,0
2427,1000,1000,0,30000:60000:90000:120000:150000,0,90000,500
//-- WM_DANCE_WITH_WUG
2428,2000:2500:3000:3500:4000,1000,0,30000:60000:90000:120000:150000,0,90000,0
2428,1500:2000:2500:3000:3500,1000,0,30000:60000:90000:120000:150000,0,90000,500
//-- WM_SOUND_OF_DESTRUCTION
2429,500:1000:1500:2000:2500,1000,0,0,0,20000,0
2429,0:500:1000:1500:2000,1000,0,0,0,20000,500
//-- WM_SATURDAY_NIGHT_FEVER
2430,2000:3000:4000:5000:6000,1000,0,20000:30000:40000:50000:60000,3000,180000,0
2430,1000:2000:3000:4000:5000,1000,0,10000:15000:20000:25000:30000,3000,180000,1000
//-- WM_LERADS_DEW
2431,1500,1000,0,20000:30000:40000:50000:60000,0,180000,0
2431,1000,1000,0,20000:30000:40000:50000:60000,0,180000,500
//-- WM_MELODYOFSINK
2432,1500,1000,0,20000:30000:40000:50000:60000,0,180000,0
2432,100,1000,0,20000:30000:40000:50000:60000,0,180000,500
//-- WM_BEYOND_OF_WARCRY
2433,1500,1000,0,20000:30000:40000:50000:60000,0,180000,0
2433,1000,1000,0,20000:30000:40000:50000:60000,0,180000,500
//-- WM_UNLIMITED_HUMMING_VOICE
2434,1500,1000,0,20000:30000:40000:50000:60000,0,180000,0
2434,1000,1000,0,60000:90000:120000:150000:180000,0,110000:120000:130000:140000:150000,500
//==========================================
//==== 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,0
2443,1000,1000,0,12000,0,0,-1
//-- 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,0
2444,1000,1000,0,12000,0,0,-1
//-- SO_SPELLFIST
2445,0,1000,0,20000:25000:30000:35000:40000,0,0,0
//-- SO_EARTHGRAVE
2446,2200:2400:2600:2800:3000,1000,0,500,8000:11000:14000:17000:20000,5000,0
2446,2200:2400:2600:2800:3000,1000,0,500,8000:11000:14000:17000:20000,5000,1800:1600:1400:1200:800
//-- SO_DIAMONDDUST
2447,5500:6000:6500:7000:7500,1000,0,500,12000:14000:16000:18000:20000,5000,0
2447,5000:5500:6000:6500:7000,1000,0,500,12000:14000:16000:18000:20000,5000,800:600:400:200:-1
//-- SO_POISON_BUSTER
2450,2000:3000:4000:5000:6000,1000,0,0,0,2000,0
2450,2200:3400:4600:5800:7000,1000,0,0,0,2000,800:600:400:200:-1
//-- SO_PSYCHIC_WAVE
2449,9000:9900:10800:11700:12600,1000,0,1200:1700:2200:2700:3200,0,5000,0
2449,8000:9000:10000:11000:12000,1000,0,1200:1700:2200:2700:3200,0,5000,1000:900:800:700:600
//-- SO_CLOUD_KILL
2450,3300:3500:3700:3900:4100,1000,0,8000:10000:12000:14000:16000,10000:15000:20000:25000:30000,5000,0
2450,2300:2500:2700:2900:3100,1000,0,8000:10000:12000:14000:16000,10000:15000:20000:25000:30000,5000,700:500:300:100:-1
//-- SO_STRIKING
2451,3000,1000,0,60000,0,2000,0
2451,1000,1000,0,60000,0,2000,-1
//-- SO_WARMER
2452,1700:1900:2100:2300:2500,1000,0,40000:45000:50000:55000:60000,30000,60000,0
2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000,1800:1600:1400:1200:1000
//-- SO_VACUUM_EXTREME
2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,0,5000,0
//-- SO_VARETYR_SPEAR //CHECK Duration 2 is used for the stun?
2454,1700:1900:2100:2300:2500,1000,0,0,3000,2000,0
//-- SO_VARETYR_SPEAR
2454,2200:2400:2600:2800:3000,1000,0,0,2200:2400:2600:2800:3000,2000,1800:1600:1400:1200:1000
//-- SO_ARULLO
2455,1500:2000:2500:3000:3500,1000,0,8000:10000:12000:14000:16000,0,5000:6000:7000:8000:9000,0
2455,2200:2400:2600:2800:3000,1000,0,8000:10000:12000:14000:16000,0,5000:6000:7000:8000:9000,800:600:400:200:-1
//-- SO_EL_CONTROL
2456,2000,0,0,0,0,5000,0
//-- 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,0
//-- 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,0
//-- 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,0
//-- 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,0
//-- SO_EL_ACTION
//-- SO_SUMMON_AGNI
2457,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
//-- SO_SUMMON_AQUA
2458,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
//-- SO_SUMMON_VENTUS
2459,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
//-- SO_SUMMON_TERA
2460,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
//-- SO_EL_ACTION //TODO apply proper cooldown [malufett]
2461,0,0,0,0,0,5000,0
//-- SO_EL_ANALYSIS
2462,2000,0,0,0,0,0,0
2462,0,0,0,0,0,0,2000
//-- SO_EL_CURE
2464,2000,1000,0,0,0,0,0
2464,2000,1000,0,0,0,0,-1
//-- SO_FIRE_INSIGNIA
2465,2000,0,0,60000,0,60000,0
2465,1000,0,0,600000:900000:1200000,0,60000,1000
//-- SO_WATER_INSIGNIA
2466,2000,0,0,60000,0,60000,0
2466,1000,0,0,600000:900000:1200000,0,60000,1000
//-- SO_WIND_INSIGNIA
2467,2000,0,0,60000,0,60000,0
2467,1000,0,0,600000:900000:1200000,0,60000,1000
//-- SO_EARTH_INSIGNIA
2468,2000,0,0,60000,0,60000,0
2468,1000,0,0,600000:900000:1200000,0,60000,1000
//==========================================
//==== Genetic skills ======================
//-- GN_CART_TORNADO //CHECK Duration 1 used for stun?
//-- GN_CART_TORNADO
2476,0,500,0,5000,0,0:500:1000:1500:2000,0
//-- GN_CARTCANNON
2477,1000:1500:2000:2500:3000,500,0,0,0,0,0
2477,1000:1500:2000:2500:3000,500,0,0,0,0,-1
//-- GN_CARTBOOST
2478,1500,500,0,90000,0,0,0
2478,1500,500,0,90000,0,0,-1
//-- GN_THORNS_TRAP
2479,1500,500,0,10000:12000:14000:16000:18000,20000,0,0
2479,1500,500,0,10000:12000:14000:16000:18000,20000,0,-1
//-- GN_BLOOD_SUCKER
2480,1500,500,0,20000:22000:24000:26000:28000,0,0,0
2480,1500,500,0,20000:22000:24000:26000:28000,0,0,-1
//-- GN_SPORE_EXPLOSION
2481,1500,500,0,2000:2000:3000:3000:4000,0,5000,0
2481,1500,500,0,2000:2000:3000:3000:4000,0,5000,-1
//-- GN_WALLOFTHORN
2482,1500,500,0,10000:11000:12000:13000:14000,0,5000,0
//-- GN_CRAZYWEED //CHECK Will need to recheck this skill later if durations needs to be set.
2482,1500,500,0,10000:11000:12000:13000:14000,0,5000,-1
//-- GN_CRAZYWEED
2483,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500,500,0,0,0,5000,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,0
//-- GN_DEMONIC_FIRE
2485,3000:3500:4000:4500:5000,500,0,10000:12000:14000:16000:18000,15000,5000,-1
//-- GN_FIRE_EXPANSION
2486,2000,500,0,0,0,0,0
2486,2000,500,0,0,0,0,-1
//-- GN_FIRE_EXPANSION_SMOKE_POWDER
2487,0,0,0,10000:12000:14000:16000:18000,0,0,0
//-- GN_FIRE_EXPANSION_TEAR_GAS
2488,0,0,0,10000:12000:14000:16000:18000,0,0,0
//-- GN_HELLS_PLANT
2490,3000:3500:4000:4500:5000,500,0,14000:21000:28000:35000:42000,0,0,0
2490,3000:3500:4000:4500:5000,500,0,14000:21000:28000:35000:42000,0,0,-1
//-- GN_HELLS_PLANT_ATK
2491,0,0,0,20000,0,0,0
//-- GN_MANDRAGORA
2492,1000,500,0,10000:15000:20000:25000:30000,0,15000,0
//-- GN_SLINGITEM //CHECK Whats durations 1 and 2 used for?
2492,1000,500,0,10000:15000:20000:25000:30000,0,15000,-1
//-- GN_SLINGITEM
2493,0,0,0,77000,10000,1000,0
//-- GN_SLINGITEM_RANGEMELEEATK //CHECK Whats duration 1 used for?
//-- GN_SLINGITEM_RANGEMELEEATK
2498,0,0,0,3000,0,0,0
//==========================================
//===== Extra 3rd Class Skills =============
//-- AB_SECRAMENT
2515,2000,500,0,60000:90000:120000:150000:180000,0,0,0
2515,1000,500,0,60000:90000:120000:150000:180000,0,0,1000
//-- SR_HOWLINGOFLION //CHECK Is duration 1 correct for fear?
2517,1500,0,0,10000,0,10000,0
//-- SR_HOWLINGOFLION
2517,1000,0,0,12000:14000:16000:18000:20000,0,10000,500
//-- SR_RIDEINLIGHTNING
2518,0,200,0,0,0,1000,0
2518,1000:2000:3000:4000:5000,200,0,0,0,1000,-1
//==========================================
//===== Misc. Skills =======================

View File

@ -1179,7 +1179,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
sc_start(bl,SC_FREEZE,100,skilllv,skill_get_time(skillid,skilllv));
break;
case RA_WUGBITE:
sc_start(bl, SC_BITE, (sd ? pc_checkskill(sd,RA_TOOTHOFWUG)*2 : 0), skilllv, (skilllv*1000 + (sd ? pc_checkskill(sd,RA_TOOTHOFWUG)*500 : 0)) );
sc_start(bl, SC_BITE, (sd ? pc_checkskill(sd,RA_TOOTHOFWUG)*2 : 0), skilllv, (skill_get_time(skillid,skilllv) + (sd ? pc_checkskill(sd,RA_TOOTHOFWUG)*500 : 0)) );
break;
case RA_SENSITIVEKEEN:
if( rnd()%100 < 8 * skilllv )
@ -1204,7 +1204,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
break;
case NC_COLDSLOWER:
sc_start(bl, SC_FREEZE, 10 * skilllv, skilllv, skill_get_time(skillid, skilllv));
sc_start(bl, SC_FREEZING, 20 + 10 * skilllv, skilllv, skill_get_time2(skillid, skilllv));
sc_start(bl, SC_FREEZING, 20 + 10 * skilllv, skilllv, skill_get_time(skillid, skilllv));
break;
case NC_POWERSWING:
sc_start(bl, SC_STUN, 5*skilllv, skilllv, skill_get_time(skillid, skilllv));
@ -7777,13 +7777,13 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
if( tsc && tsc->data[SC_STONE] )
status_change_end(bl,SC_STONE,INVALID_TIMER);
else
status_change_start(bl,SC_STONE,10000,skilllv,0,0,1000,(8+2*skilllv)*1000,2);
status_change_start(bl,SC_STONE,10000,skilllv,0,0,1000,skill_get_time(skillid, skilllv),2);
} else {
int rate = 40 + 8 * skilllv + ( sd? sd->status.job_level : 50 ) / 4;
// IroWiki says Rate should be reduced by target stats, but currently unknown
if( rnd()%100 < rate ) { // Success on First Target
if( !tsc->data[SC_STONE] )
rate = status_change_start(bl,SC_STONE,10000,skilllv,0,0,1000,(8+2*skilllv)*1000,2);
rate = status_change_start(bl,SC_STONE,10000,skilllv,0,0,1000,skill_get_time(skillid, skilllv),2);
else {
rate = 1;
status_change_end(bl,SC_STONE,INVALID_TIMER);
@ -13454,10 +13454,12 @@ int skill_vfcastfix (struct block_list *bl, double time, int skill_id, int skill
if( time < 0 )
return 0;
if( !fixed )
if( fixed == 0 ){
fixed = (int)time * 20 / 100; // fixed time
time = time * 80 / 100; // variable time
time = time * 80 / 100; // variable time
}else if( fixed < 0 ) // no fixed cast time
fixed = 0;
if(sd && !(skill_get_castnodex(skill_id, skill_lv)&4) ){ // Increases/Decreases fixed/variable cast time of a skill by item/card bonuses.
if( sd->bonus.varcastrate < 0 )
VARCAST_REDUCTION(sd->bonus.varcastrate);
@ -13507,7 +13509,7 @@ int skill_vfcastfix (struct block_list *bl, double time, int skill_id, int skill
fixcast_r = max(fixcast_r, 5 + skill_lv * 5);
// Fixed cast non percentage bonuses
if( sc->data[SC_MANDRAGORA] && (skill_id >= SM_BASH && skill_id <= RETURN_TO_ELDICASTES) )
fixed += 2000;
fixed += sc->data[SC_MANDRAGORA]->val1 * 1000 / 2;
if (sc->data[SC_IZAYOI] && (skill_id >= NJ_TOBIDOUGU && skill_id <= NJ_ISSEN))
fixed = 0;
}
@ -15513,12 +15515,12 @@ int skill_can_produce_mix (struct map_session_data *sd, int nameid, int trigger,
if((j=skill_produce_db[i].req_skill)>0 &&
pc_checkskill(sd,j) < skill_produce_db[i].req_skill_lv)
continue; // must iterate again to check other skills that produce it. [malufett]
if( j > 0 && sd->skillid_old > 0 && sd->skillid_old != j )
if( j > 0 && sd->menuskill_id > 0 && sd->menuskill_id != j )
continue; // special case
break;
}
}
sd->skillid_old = sd->skilllv_old = 0;
if( i >= MAX_SKILL_PRODUCE_DB )
return 0;
@ -15572,11 +15574,9 @@ int skill_produce_mix (struct map_session_data *sd, int skill_id, int nameid, in
nullpo_ret(sd);
status = status_get_status_data(&sd->bl);
if( sd->skillid_old == skill_id )
skilllv = sd->skilllv_old;
else
sd->skillid_old = skill_id;
if( !(idx=skill_can_produce_mix(sd,nameid,-1, qty)) )
return 0;
@ -16394,7 +16394,7 @@ int skill_changematerial(struct map_session_data *sd, int n, unsigned short *ite
nullpo_ret(sd);
nullpo_ret(item_list);
// Search for objects that can be created.
for( i = 0; i < MAX_SKILL_PRODUCE_DB; i++ ) {
if( skill_produce_db[i].itemlv == 26 ) {