Updated Mado Gear effects (#2103)
* Fixes #2099. * Added Emergency Magic Gear. -- Mounts the user to a Madogear. -- Only usable by Mechanic class. -- Has a reuse delay of 3 minutes. * Increased maximum weight limit by 1500. * HP naturally recovers similar to Swordman Moving HP-Recovery. * Updated Emergency Cool's interaction with Overheat calculation. * Added new Emergency Cool cooling devices. * The three cooling devices now lower Overheat by 45, 75, and 105 respectively. * Overheat now only increases on every attack by 1 or by 3 with Fire element. * The Overheat limit is increased to 150, 200, 280, 360, and 450 respective to skill level. * Updated the check for Acceleration, Self Destruction, Shape Shift, Emergency Cool, Magnetic Field, Neutral Barrier, and Stealth Field to also check inventory for required equipment. * Updated Magic Gear Master NPC. -- Added Emergency Magic Gear purchase option. -- Added High Quality Cooler and Special Cooler upgrade options. Thanks to @Felleonel, @Rytech2, @exneval and @mrjnumber1!
This commit is contained in:
Aleos
GitHub
parent
801d3ed942
commit
dc413a3c57
@ -68,7 +68,7 @@
|
||||
// 0x00800 - skill range affected by RA_RESEARCHTRAP
|
||||
// 0x01000 - skill that does not affect user that has NC_HOVERING active
|
||||
// 0x02000 - skill that can be using while riding warg
|
||||
// 0x04000 - skill that can't be used while in mado
|
||||
// 0x04000 - skill that can be used while on Madogear
|
||||
// 0x08000 - skill that can be used to target while under SC__MANHOLE effect
|
||||
// 0x10000 - skill that affects hidden targets
|
||||
// 0x20000 - skill that affects SC_GLOOMYDAY_SK
|
||||
|
||||
@ -68,7 +68,7 @@
|
||||
// 0x00800 - skill range affected by RA_RESEARCHTRAP
|
||||
// 0x01000 - skill that does not affect user that has NC_HOVERING active
|
||||
// 0x02000 - skill that can be using while riding warg
|
||||
// 0x04000 - skill that can't be used while in mado
|
||||
// 0x04000 - skill that can be used while on Madogear
|
||||
// 0x08000 - skill that can be used to target while under SC__MANHOLE effect
|
||||
// 0x10000 - skill that affects hidden targets
|
||||
// 0x20000 - skill that affects SC_GLOOMYDAY_SK
|
||||
@ -91,7 +91,7 @@
|
||||
//****
|
||||
// Mage
|
||||
9,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, MG_SRECOVERY,Increase SP Recovery
|
||||
10,0,6,4,3,0x3,3,1,1,yes,0,0,0,magic,0,0x4000, MG_SIGHT,Sight
|
||||
10,0,6,4,3,0x3,3,1,1,yes,0,0,0,magic,0,0x0, MG_SIGHT,Sight
|
||||
11,9,6,1,8,0x6,1,10,1,yes,0,0x42000,0,magic,0,0x0, MG_NAPALMBEAT,Napalm Beat
|
||||
12,9,8,2,8,0x1,0,10,1,yes,0,0,0,magic,0,0x0, MG_SAFETYWALL,Safety Wall
|
||||
13,9,8,1,8,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0x2000,0,magic,0,0x0, MG_SOULSTRIKE,Soul Strike
|
||||
@ -110,7 +110,7 @@
|
||||
23,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0, AL_DEMONBANE,Demon Bane
|
||||
24,0,6,4,6,0x3,2,1,1,yes,0,0,0,magic,0,0x0, AL_RUWACH,Ruwach
|
||||
25,9,6,2,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0, AL_PNEUMA,Pneuma
|
||||
26,0,6,4,0,0x1,0,2,1,yes,0,0,0,magic,0,0x40, AL_TELEPORT,Teleport
|
||||
26,0,6,4,0,0x1,0,2,1,yes,0,0,0,magic,0,0x4040, AL_TELEPORT,Teleport
|
||||
27,9,6,2,0,0x1,0,4,1,yes,0,0,3,magic,0,0x0, AL_WARP,Warp Portal
|
||||
28,9,6,16,6,0x21,0,10,1,yes,0,0x2000,0,magic,0,0x0, AL_HEAL,Heal
|
||||
29,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x1000, AL_INCAGI,Increase AGI
|
||||
@ -213,13 +213,13 @@
|
||||
105,0,0,0,0,0,0,1,0,no,0,0,0,weapon,0,0x0, BS_HILTBINDING,Hilt Binding
|
||||
106,0,0,0,0,0,0,1,0,no,0,0,0,weapon,0,0x0, BS_FINDINGORE,Ore Discovery
|
||||
107,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0, BS_WEAPONRESEARCH,Weaponry Research
|
||||
108,2,6,16,0,0x1,0,1,1,yes,0,0,0,weapon,0,0x4000, BS_REPAIRWEAPON,Weapon Repair
|
||||
108,2,6,16,0,0x1,0,1,1,yes,0,0,0,weapon,0,0x0, BS_REPAIRWEAPON,Weapon Repair
|
||||
109,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,0x0, BS_SKINTEMPER,Skin Tempering
|
||||
110,1,6,2,0,0x3,2:2:2:2:2:12,5,1,no,0,0,0,weapon,0,0x4000, BS_HAMMERFALL,Hammer Fall
|
||||
111,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x4000, BS_ADRENALINE,Adrenaline Rush
|
||||
112,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x4000, BS_WEAPONPERFECT,Weapon Perfection
|
||||
113,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x4000, BS_OVERTHRUST,Power-Thrust
|
||||
114,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x4000, BS_MAXIMIZE,Maximize Power
|
||||
110,1,6,2,0,0x3,2:2:2:2:2:12,5,1,no,0,0,0,weapon,0,0x0, BS_HAMMERFALL,Hammer Fall
|
||||
111,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x0, BS_ADRENALINE,Adrenaline Rush
|
||||
112,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x0, BS_WEAPONPERFECT,Weapon Perfection
|
||||
113,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x0, BS_OVERTHRUST,Power-Thrust
|
||||
114,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0, BS_MAXIMIZE,Maximize Power
|
||||
|
||||
//****
|
||||
// Hunter
|
||||
@ -561,10 +561,10 @@
|
||||
|
||||
//****
|
||||
// Whitesmith
|
||||
384,0,0,4,0,0x1,0,10,1,yes,0,0,0,weapon,0,0x4000, WS_MELTDOWN,Shattering Strike
|
||||
384,0,0,4,0,0x1,0,10,1,yes,0,0,0,weapon,0,0x0, WS_MELTDOWN,Shattering Strike
|
||||
385,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0,0x0, WS_CREATECOIN,Create Coins
|
||||
386,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0,0x0, WS_CREATENUGGET,Create Nuggets
|
||||
387,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,0x4000, WS_CARTBOOST,Cart Boost
|
||||
387,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,0x0, WS_CARTBOOST,Cart Boost
|
||||
388,9,6,2,0,0x1,0,5,1,no,0,0,0,none,0,0x0, WS_SYSTEMCREATE,Auto Attack System
|
||||
|
||||
//****
|
||||
@ -678,7 +678,7 @@
|
||||
|
||||
//****
|
||||
// Blacksmith
|
||||
459,0,6,4,0,0x3,-1,1,1,no,0,0x8,0,weapon,0 ,0x4000, BS_ADRENALINE2,Advanced Adrenaline Rush
|
||||
459,0,6,4,0,0x3,-1,1,1,no,0,0x8,0,weapon,0 ,0x0, BS_ADRENALINE2,Advanced Adrenaline Rush
|
||||
|
||||
//****
|
||||
// Soul Linker
|
||||
@ -702,7 +702,7 @@
|
||||
474,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0,0x0, NPC_EMOTION_ON,Emotion ON
|
||||
475,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0,0x0, ST_PRESERVE,Preserve
|
||||
476,1,6,1,0,0x1,0,5,1,yes,0,0,0,weapon,0,0x0, ST_FULLSTRIP,Divest All
|
||||
477,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x4000, WS_WEAPONREFINE,Upgrade Weapon
|
||||
477,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0, WS_WEAPONREFINE,Upgrade Weapon
|
||||
478,3,6,2,0,0x3,3,10,1,no,0,0,0,none,0,0x0, CR_SLIMPITCHER,Aid Condensed Potion
|
||||
479,1,6,16,0,0x1,0,5,1,yes,0,0,0,weapon,0,0x0, CR_FULLPROTECTION,Full Protection
|
||||
480,5,8,1,0,0,0,5,5,no,0,0,0,weapon,0,0x20000, PA_SHIELDCHAIN,Shield Chain
|
||||
@ -710,8 +710,8 @@
|
||||
482,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0, PF_DOUBLECASTING,Double Casting
|
||||
483,18,6,2,0,0x1,1:2:3:4:5,1,1,no,0,0,0,none,0,0x0, HW_GANBANTEIN,Ganbantein
|
||||
484,18,6,2,2,0xD1,0,5,1,yes,0,0x18000,0,misc,0,0x11010, HW_GRAVITATION,Gravitation Field
|
||||
485,-2,6,1,-1,0x8,0,10,1,no,0,0,0,weapon,0,0x4000, WS_CARTTERMINATION,Cart Termination
|
||||
486,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x4000, WS_OVERTHRUSTMAX,Maximum Power Thrust
|
||||
485,-2,6,1,-1,0x8,0,10,1,no,0,0,0,weapon,0,0x0, WS_CARTTERMINATION,Cart Termination
|
||||
486,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0, WS_OVERTHRUSTMAX,Maximum Power Thrust
|
||||
487,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x8, CG_LONGINGFREEDOM,Longing for Freedom
|
||||
488,0,6,4,0,0x1,1,5,1,no,0,0x20,0,misc,0,0x1, CG_HERMODE,Wand of Hermode
|
||||
489,9,6,1,0,0x41,0,5,1,no,0,0,0,misc,0,0x0, CG_TAROTCARD,Tarot Card of Fate
|
||||
@ -907,8 +907,8 @@
|
||||
1009,-9,6,1,-1,0,0,1,1,no,0,0x1,0,weapon,3,0x0, HT_PHANTASMIC,Phantasmic Arrow
|
||||
1010,9,6,1,0,0x1,0,1,0,no,0,0x1,0,misc,0,0x0, BA_PANGVOICE,Pang Voice
|
||||
1011,9,6,1,0,0x1,0,1,0,no,0,0x1,0,misc,0,0x0, DC_WINKCHARM,Wink of Charm
|
||||
1012,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0,0x4000, BS_UNFAIRLYTRICK,Unfair Trick
|
||||
1013,0,6,4,0,0x3,2,1,0,no,0,0x1,0,weapon,0,0x2000, BS_GREED,Greed
|
||||
1012,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0,0x0, BS_UNFAIRLYTRICK,Unfair Trick
|
||||
1013,0,6,4,0,0x3,2,1,0,no,0,0x1,0,weapon,0,0x6000, BS_GREED,Greed
|
||||
1014,0,6,4,6,0x3,14,1,0,yes,0,0x1,0,magic,0,0x0, PR_REDEMPTIO,Redemptio
|
||||
1015,9,6,16,0,0x1,0,1,1,no,0,0x401,0,weapon,0,0x0, MO_KITRANSLATION,Ki Translation
|
||||
1016,-1,6,1,-1,0x2,1,1,1,no,0,0x1,0,weapon,5,0x0, MO_BALKYOUNG,Ki Explosion
|
||||
@ -1048,34 +1048,34 @@
|
||||
//****
|
||||
// NC Mechanic
|
||||
2255,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0, NC_MADOLICENCE,Mado License
|
||||
2256,11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, NC_BOOSTKNUCKLE,Boost Knuckle
|
||||
2257,3,6,1,-1,0,0,3,1,no,0,0,0,weapon,0,0x0, NC_PILEBUNKER,Pile Bunker
|
||||
2258,13,6,1,-1,0x2,1,3,1,no,0,0x40000,0,weapon,0,0x0, NC_VULCANARM,Vulcan Arm
|
||||
2259,5,6,1,3,0,1,3,1,no,0,0,5,weapon,0,0x0, NC_FLAMELAUNCHER,Flame Launcher
|
||||
2260,7,6,2,1,0x2,2:3:4,3,1,no,0,0x40000,0,weapon,0,0x0, NC_COLDSLOWER,Cold Slower
|
||||
2261,9:11:13,6,1,-1,0x42,3:2:1,3,1,no,0,0,0,weapon,0,0x0, NC_ARMSCANNON,Arm Cannon
|
||||
2262,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x0, NC_ACCELERATION,Acceleration
|
||||
2263,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0, NC_HOVERING,Hovering
|
||||
2264,0,6,4,0,0x1,0,1,1,no,0,0,0,none,7,0x0, NC_F_SIDESLIDE,Front-Side Slide
|
||||
2265,0,6,4,0,0x1,0,1,1,no,0,0,0,none,7,0x0, NC_B_SIDESLIDE,Back-Side Slide
|
||||
2256,11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x4000, NC_BOOSTKNUCKLE,Boost Knuckle
|
||||
2257,3,6,1,-1,0,0,3,1,no,0,0,0,weapon,0,0x4000, NC_PILEBUNKER,Pile Bunker
|
||||
2258,13,6,1,-1,0x2,1,3,1,no,0,0x40000,0,weapon,0,0x4000, NC_VULCANARM,Vulcan Arm
|
||||
2259,5,6,1,3,0,1,3,1,no,0,0,5,weapon,0,0x4000, NC_FLAMELAUNCHER,Flame Launcher
|
||||
2260,7,6,2,1,0x2,2:3:4,3,1,no,0,0x40000,0,weapon,0,0x4000, NC_COLDSLOWER,Cold Slower
|
||||
2261,9:11:13,6,1,-1,0x42,3:2:1,3,1,no,0,0,0,weapon,0,0x4000, NC_ARMSCANNON,Arm Cannon
|
||||
2262,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x4000, NC_ACCELERATION,Acceleration
|
||||
2263,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x4000, NC_HOVERING,Hovering
|
||||
2264,0,6,4,0,0x1,0,1,1,no,0,0,0,none,7,0x4000, NC_F_SIDESLIDE,Front-Side Slide
|
||||
2265,0,6,4,0,0x1,0,1,1,no,0,0,0,none,7,0x4000, NC_B_SIDESLIDE,Back-Side Slide
|
||||
2266,0,0,0,0,0,0,4,0,no,0,0,0,none,0,0x0, NC_MAINFRAME,Mainframe Restructure
|
||||
2267,0,6,4,0,0xCA,2:3:4,3,1,no,0,0x40000,0,weapon,5,0x0, NC_SELFDESTRUCTION,Self Destruction
|
||||
2268,0,6,4,0,0x1,0,4,1,yes,0,0,0,none,0,0x0, NC_SHAPESHIFT,Shape Shift
|
||||
2269,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0, NC_EMERGENCYCOOL,Emergency Cool
|
||||
2270,0,6,4,0,0x3,7,1,1,yes,0,0,0,none,0,0x0, NC_INFRAREDSCAN,Infrared Scan
|
||||
2271,9,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x0, NC_ANALYZE,Analyze
|
||||
2272,0,6,4,0,0x3,2,3,1,no,0,0,0,none,0,0x0, NC_MAGNETICFIELD,Magnetic Field
|
||||
2273,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x0, NC_NEUTRALBARRIER,Neutral Barrier
|
||||
2274,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x0, NC_STEALTHFIELD,Stealth Field
|
||||
2275,5:6:7:8:9,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0, NC_REPAIR,Repair
|
||||
2267,0,6,4,0,0xCA,2:3:4,3,1,no,0,0x40000,0,weapon,5,0x4000, NC_SELFDESTRUCTION,Self Destruction
|
||||
2268,0,6,4,0,0x1,0,4,1,yes,0,0,0,none,0,0x4000, NC_SHAPESHIFT,Shape Shift
|
||||
2269,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x4000, NC_EMERGENCYCOOL,Emergency Cool
|
||||
2270,0,6,4,0,0x3,7,1,1,yes,0,0,0,none,0,0x4000, NC_INFRAREDSCAN,Infrared Scan
|
||||
2271,9,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x4000, NC_ANALYZE,Analyze
|
||||
2272,0,6,4,0,0x3,2,3,1,no,0,0,0,none,0,0x4000, NC_MAGNETICFIELD,Magnetic Field
|
||||
2273,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x4000, NC_NEUTRALBARRIER,Neutral Barrier
|
||||
2274,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x4000, NC_STEALTHFIELD,Stealth Field
|
||||
2275,5:6:7:8:9,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x4000, NC_REPAIR,Repair
|
||||
2276,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, NC_TRAININGAXE,Axe Training
|
||||
2277,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0, NC_RESEARCHFE,Research Fire/Earth
|
||||
2278,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0,0,weapon,2:3:4:5:6,0x0, NC_AXEBOOMERANG,Axe Boomerang
|
||||
2279,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, NC_POWERSWING,Power Swing
|
||||
2280,0,8,4,-1,0x2,2:2:3:3:3,5,-6,no,0,0x40000,0,weapon,0,0x0, NC_AXETORNADO,Axe Tornado
|
||||
2281,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x0, NC_SILVERSNIPER,FAW - Silver Sniper
|
||||
2282,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x0, NC_MAGICDECOY,FAW - Magic Decoy
|
||||
2283,5,6,1,0,0x1,0,1,1,no,0,0,0,none,0,0x0, NC_DISJOINT,FAW Removal
|
||||
2278,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0,0,weapon,2:3:4:5:6,0x4000, NC_AXEBOOMERANG,Axe Boomerang
|
||||
2279,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x4000, NC_POWERSWING,Power Swing
|
||||
2280,0,8,4,-1,0x2,2:2:3:3:3,5,-6,no,0,0x40000,0,weapon,0,0x4000, NC_AXETORNADO,Axe Tornado
|
||||
2281,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x4000, NC_SILVERSNIPER,FAW - Silver Sniper
|
||||
2282,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x4000, NC_MAGICDECOY,FAW - Magic Decoy
|
||||
2283,5,6,1,0,0x1,0,1,1,no,0,0,0,none,0,0x4000, NC_DISJOINT,FAW Removal
|
||||
|
||||
//****
|
||||
// SC Shadow Chaser
|
||||
@ -1343,7 +1343,7 @@
|
||||
5003,7,6,1,-1,0x2,4:5:6:7:-1,5,1,no,0,0,0,weapon,0,0x0, GN_ILLUSIONDOPING,Illusion Doping
|
||||
5004,9,6,2,1,0x42,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0x40000,0,weapon,0,0x0, RK_DRAGONBREATH_WATER,Dragon Breath - Water
|
||||
5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0,0x0, RK_LUXANIMA,Lux Anima
|
||||
5006,1,6,2,3,0,0,5,1,no,0,0,3,misc,0,0x0, NC_MAGMA_ERUPTION,Magma Eruption
|
||||
5006,1,6,2,3,0,0,5,1,no,0,0,3,misc,0,0x4000, NC_MAGMA_ERUPTION,Magma Eruption
|
||||
5007,0,6,4,0,0x3,5:6:7:8:9,5,1,no,0,0,0,none,0,0x0, WM_FRIGG_SONG,Frigg's Song
|
||||
5008,0,6,4,0,0x3,11,5,1,no,0,0,0,none,0,0x0, SO_ELEMENTAL_SHIELD,Elemental Shield
|
||||
5009,1,6,1,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO,Flash Combo
|
||||
@ -1351,7 +1351,7 @@
|
||||
5011,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, AB_OFFERTORIUM,Offertorium
|
||||
5012,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, WL_TELEKINESIS_INTENSE,Intense Telekinesis
|
||||
5013,0,6,4,0,0x3,0,5,1,no,0,0,0,none,0,0x0, LG_KINGS_GRACE,King's Grace
|
||||
5014,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, ALL_FULL_THROTTLE,Full Throttle
|
||||
5014,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x4000, ALL_FULL_THROTTLE,Full Throttle
|
||||
|
||||
// Summoner - Placeholder
|
||||
5018,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_BASIC_SKILL,New Basic Skill
|
||||
|
||||
@ -11225,6 +11225,8 @@
|
||||
23193,Crimson_Rock_Scroll_1_5,Level 5 Crimson Rock,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_CRIMSONROCK",5; },{},{}
|
||||
23194,Sienna_Execrate_Scroll_1_5,Level 5 Sienna Execrate,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_SIENNAEXECRATE",5,true; },{},{}
|
||||
23196,Agust_Lucky_Scroll,Shining Blue Lucky Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Agust_Lucky_Scroll); },{},{}
|
||||
//
|
||||
23277,Mado_Box,Emergency Magic Gear,2,10000,,3000,,,,,0x00000400,56,2,,,100,,,{ setmadogear 1; },{},{}
|
||||
//===================================================================
|
||||
// Shadow Equipments
|
||||
//===================================================================
|
||||
|
||||
@ -93,3 +93,4 @@
|
||||
//12206,60000 //Luk_Dish10_
|
||||
//12207,60000 //Vit_Dish10_
|
||||
22508,1200000 //Para_Team_Mark_
|
||||
23277,180000 //Mado_Box
|
||||
|
||||
@ -68,7 +68,7 @@
|
||||
// 0x00800 - skill range affected by RA_RESEARCHTRAP
|
||||
// 0x01000 - skill that does not affect user that has NC_HOVERING active
|
||||
// 0x02000 - skill that can be using while riding warg
|
||||
// 0x04000 - skill that can't be used while in mado
|
||||
// 0x04000 - skill that can be used while on Madogear
|
||||
// 0x08000 - skill that can be used to target while under SC__MANHOLE effect
|
||||
// 0x10000 - skill that affects hidden targets
|
||||
// 0x20000 - skill that affects SC_GLOOMYDAY_SK
|
||||
@ -91,7 +91,7 @@
|
||||
//****
|
||||
// Mage
|
||||
9,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, MG_SRECOVERY,Increase SP Recovery
|
||||
10,0,6,4,3,0x3,3,1,1,yes,0,0,0,magic,0,0x4000, MG_SIGHT,Sight
|
||||
10,0,6,4,3,0x3,3,1,1,yes,0,0,0,magic,0,0x0, MG_SIGHT,Sight
|
||||
11,9,6,1,8,0x6,1,10,1,yes,0,0x42000,0,magic,0,0x0, MG_NAPALMBEAT,Napalm Beat
|
||||
12,9,8,2,8,0x1,0,10,1,yes,0,0,0,magic,0,0x0, MG_SAFETYWALL,Safety Wall
|
||||
13,9,8,1,8,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0x2000,0,magic,0,0x0, MG_SOULSTRIKE,Soul Strike
|
||||
@ -110,7 +110,7 @@
|
||||
23,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0, AL_DEMONBANE,Demon Bane
|
||||
24,0,6,4,6,0x3,2,1,1,yes,0,0x0,0,magic,0,0x0, AL_RUWACH,Ruwach
|
||||
25,9,6,2,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0, AL_PNEUMA,Pneuma
|
||||
26,0,6,4,0,0x1,0,2,1,yes,0,0,0,magic,0,0x40, AL_TELEPORT,Teleport
|
||||
26,0,6,4,0,0x1,0,2,1,yes,0,0,0,magic,0,0x4040, AL_TELEPORT,Teleport
|
||||
27,9,6,2,0,0x1,0,4,1,yes,0,0,3,magic,0,0x0, AL_WARP,Warp Portal
|
||||
28,9,6,16,6,0x21,0,10,1,yes,0,0x2000,0,magic,0,0x0, AL_HEAL,Heal
|
||||
29,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x0, AL_INCAGI,Increase AGI
|
||||
@ -144,7 +144,7 @@
|
||||
48,-1,8,0,-1,0,0,10,2,no,0,0,0,weapon,0,0x0, TF_DOUBLE,Double Attack
|
||||
49,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0, TF_MISS,Improve Dodge
|
||||
50,1,6,1,0,1,0,10,1,no,0,0,0,weapon,0,0x0, TF_STEAL,Steal
|
||||
51,1,6,4,0,1,0,10,1,no,0,0,0,none,0,0x84044, TF_HIDING,Hiding
|
||||
51,1,6,4,0,1,0,10,1,no,0,0,0,none,0,0x80044, TF_HIDING,Hiding
|
||||
52,-2,6,1,5,0,0,10,1,no,0,0,0,weapon,0,0x0, TF_POISON,Envenom
|
||||
53,9,6,16,5,0x1,0,1,1,no,0,0,0,weapon,0,0x0, TF_DETOXIFY,Detoxify
|
||||
//
|
||||
@ -213,13 +213,13 @@
|
||||
105,0,0,0,0,0,0,1,0,no,0,0,0,weapon,0,0x0, BS_HILTBINDING,Hilt Binding
|
||||
106,0,0,0,0,0,0,1,0,no,0,0,0,weapon,0,0x0, BS_FINDINGORE,Ore Discovery
|
||||
107,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0, BS_WEAPONRESEARCH,Weaponry Research
|
||||
108,2,6,16,0,0x1,0,1,1,yes,0,0,0,weapon,0,0x4000, BS_REPAIRWEAPON,Weapon Repair
|
||||
108,2,6,16,0,0x1,0,1,1,yes,0,0,0,weapon,0,0x0, BS_REPAIRWEAPON,Weapon Repair
|
||||
109,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,0x0, BS_SKINTEMPER,Skin Tempering
|
||||
110,1,6,2,0,0x3,2:2:2:2:2:12,5,1,no,0,0,0,weapon,0,0x4000, BS_HAMMERFALL,Hammer Fall
|
||||
111,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x4000, BS_ADRENALINE,Adrenaline Rush
|
||||
112,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x4000, BS_WEAPONPERFECT,Weapon Perfection
|
||||
113,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x4000, BS_OVERTHRUST,Power-Thrust
|
||||
114,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x4000, BS_MAXIMIZE,Maximize Power
|
||||
110,1,6,2,0,0x3,2:2:2:2:2:12,5,1,no,0,0,0,weapon,0,0x0, BS_HAMMERFALL,Hammer Fall
|
||||
111,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x0, BS_ADRENALINE,Adrenaline Rush
|
||||
112,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x0, BS_WEAPONPERFECT,Weapon Perfection
|
||||
113,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,0x0, BS_OVERTHRUST,Power-Thrust
|
||||
114,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0, BS_MAXIMIZE,Maximize Power
|
||||
|
||||
//****
|
||||
// Hunter
|
||||
@ -561,10 +561,10 @@
|
||||
|
||||
//****
|
||||
// Whitesmith
|
||||
384,0,0,4,0,0x1,0,10,1,yes,0,0,0,weapon,0,0x4000, WS_MELTDOWN,Shattering Strike
|
||||
384,0,0,4,0,0x1,0,10,1,yes,0,0,0,weapon,0,0x0, WS_MELTDOWN,Shattering Strike
|
||||
385,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0,0x0, WS_CREATECOIN,Create Coins
|
||||
386,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0,0x0, WS_CREATENUGGET,Create Nuggets
|
||||
387,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,0x4000, WS_CARTBOOST,Cart Boost
|
||||
387,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,0x0, WS_CARTBOOST,Cart Boost
|
||||
388,9,6,2,0,0x1,0,5,1,no,0,0,0,none,0,0x0, WS_SYSTEMCREATE,Auto Attack System
|
||||
|
||||
//****
|
||||
@ -678,7 +678,7 @@
|
||||
|
||||
//****
|
||||
// Blacksmith
|
||||
459,0,6,4,0,0x3,-1,1,1,no,0,0x8,0,weapon,0,0x4000, BS_ADRENALINE2,Advanced Adrenaline Rush
|
||||
459,0,6,4,0,0x3,-1,1,1,no,0,0x8,0,weapon,0,0x0, BS_ADRENALINE2,Advanced Adrenaline Rush
|
||||
|
||||
//****
|
||||
// Soul Linker
|
||||
@ -702,7 +702,7 @@
|
||||
474,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0,0x0, NPC_EMOTION_ON,Emotion ON
|
||||
475,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0,0x0, ST_PRESERVE,Preserve
|
||||
476,1,6,1,0,0x1,0,5,1,yes,0,0,0,weapon,0,0x0, ST_FULLSTRIP,Divest All
|
||||
477,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x4000, WS_WEAPONREFINE,Upgrade Weapon
|
||||
477,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0, WS_WEAPONREFINE,Upgrade Weapon
|
||||
478,3,6,2,0,0x3,3,10,1,no,0,0,0,none,0,0x0, CR_SLIMPITCHER,Aid Condensed Potion
|
||||
479,1,6,16,0,0x1,0,5,1,yes,0,0,0,weapon,0,0x0, CR_FULLPROTECTION,Full Protection
|
||||
480,5,8,1,-1,0,0,5,5,no,0,0,0,weapon,0,0x20000, PA_SHIELDCHAIN,Shield Chain
|
||||
@ -710,8 +710,8 @@
|
||||
482,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0, PF_DOUBLECASTING,Double Casting
|
||||
483,18,6,2,0,0x1,1:2:3:4:5,1,1,no,0,0,0,none,0,0x0, HW_GANBANTEIN,Ganbantein
|
||||
484,18,6,2,2,0xD1,0,5,1,yes,0,0x18000,0,misc,0,0x11010, HW_GRAVITATION,Gravitation Field
|
||||
485,-2,6,1,-1,0x0,0,10,1,no,0,0,0,weapon,0,0x4000, WS_CARTTERMINATION,Cart Termination
|
||||
486,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x4000, WS_OVERTHRUSTMAX,Maximum Power Thrust
|
||||
485,-2,6,1,-1,0x0,0,10,1,no,0,0,0,weapon,0,0x0, WS_CARTTERMINATION,Cart Termination
|
||||
486,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0, WS_OVERTHRUSTMAX,Maximum Power Thrust
|
||||
487,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x8, CG_LONGINGFREEDOM,Longing for Freedom
|
||||
488,0,6,4,0,0x1,1,5,1,no,0,0x20,0,misc,0,0x1, CG_HERMODE,Wand of Hermode
|
||||
489,9,6,1,0,0x41,0,5,1,no,0,0,0,misc,0,0x0, CG_TAROTCARD,Tarot Card of Fate
|
||||
@ -913,8 +913,8 @@
|
||||
1009,-9,6,1,-1,0,0,1,1,no,0,0x1,0,weapon,3,0x0, HT_PHANTASMIC,Phantasmic Arrow
|
||||
1010,9,6,1,0,0x1,0,1,0,no,0,0x1,0,misc,0,0x0, BA_PANGVOICE,Pang Voice
|
||||
1011,9,6,1,0,0x1,0,1,0,no,0,0x1,0,misc,0,0x0, DC_WINKCHARM,Wink of Charm
|
||||
1012,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0,0x4000, BS_UNFAIRLYTRICK,Unfair Trick
|
||||
1013,0,6,4,0,0x3,2,1,0,no,0,0x1,0,weapon,0,0x2000, BS_GREED,Greed
|
||||
1012,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0,0x0, BS_UNFAIRLYTRICK,Unfair Trick
|
||||
1013,0,6,4,0,0x3,2,1,0,no,0,0x1,0,weapon,0,0x6000, BS_GREED,Greed
|
||||
1014,0,6,4,6,0x3,14,1,0,yes,0,0x1,0,magic,0,0x0, PR_REDEMPTIO,Redemptio
|
||||
1015,9,6,16,0,0x1,0,1,1,no,0,0x401,0,weapon,0,0x0, MO_KITRANSLATION,Ki Translation
|
||||
1016,-1,6,1,-1,0x2,1,1,1,no,0,0x1,0,weapon,5,0x0, MO_BALKYOUNG,Ki Explosion
|
||||
@ -1054,34 +1054,34 @@
|
||||
//****
|
||||
// NC Mechanic
|
||||
2255,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0, NC_MADOLICENCE,Mado License
|
||||
2256,11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, NC_BOOSTKNUCKLE,Boost Knuckle
|
||||
2257,3,6,1,-1,0,0,3,1,no,0,0,0,weapon,0,0x0, NC_PILEBUNKER,Pile Bunker
|
||||
2258,13,6,1,-1,0x2,1,3,1,no,0,0x40000,0,weapon,0,0x0, NC_VULCANARM,Vulcan Arm
|
||||
2259,5,6,1,3,0,1,3,1,no,0,0,5,weapon,0,0x0, NC_FLAMELAUNCHER,Flame Launcher
|
||||
2260,7,6,2,1,0x2,2:3:4,3,1,no,0,0x40000,0,weapon,0,0x0, NC_COLDSLOWER,Cold Slower
|
||||
2261,9:11:13,6,1,-1,0x42,3:2:1,3,1,no,0,0,0,weapon,0,0x0, NC_ARMSCANNON,Arm Cannon
|
||||
2262,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x0, NC_ACCELERATION,Acceleration
|
||||
2263,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0, NC_HOVERING,Hovering
|
||||
2264,0,6,4,0,0x1,0,1,1,no,0,0,0,none,7,0x0, NC_F_SIDESLIDE,Front-Side Slide
|
||||
2265,0,6,4,0,0x1,0,1,1,no,0,0,0,none,7,0x0, NC_B_SIDESLIDE,Back-Side Slide
|
||||
2256,11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x4000, NC_BOOSTKNUCKLE,Boost Knuckle
|
||||
2257,3,6,1,-1,0,0,3,1,no,0,0,0,weapon,0,0x4000, NC_PILEBUNKER,Pile Bunker
|
||||
2258,13,6,1,-1,0x2,1,3,1,no,0,0x40000,0,weapon,0,0x4000, NC_VULCANARM,Vulcan Arm
|
||||
2259,5,6,1,3,0,1,3,1,no,0,0,5,weapon,0,0x4000, NC_FLAMELAUNCHER,Flame Launcher
|
||||
2260,7,6,2,1,0x2,2:3:4,3,1,no,0,0x40000,0,weapon,0,0x4000, NC_COLDSLOWER,Cold Slower
|
||||
2261,9:11:13,6,1,-1,0x42,3:2:1,3,1,no,0,0,0,weapon,0,0x4000, NC_ARMSCANNON,Arm Cannon
|
||||
2262,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x4000, NC_ACCELERATION,Acceleration
|
||||
2263,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x4000, NC_HOVERING,Hovering
|
||||
2264,0,6,4,0,0x1,0,1,1,no,0,0,0,none,7,0x4000, NC_F_SIDESLIDE,Front-Side Slide
|
||||
2265,0,6,4,0,0x1,0,1,1,no,0,0,0,none,7,0x4000, NC_B_SIDESLIDE,Back-Side Slide
|
||||
2266,0,0,0,0,0,0,4,0,no,0,0,0,none,0,0x0, NC_MAINFRAME,Mainframe Restructure
|
||||
2267,0,6,4,0,0xCA,2:3:4,3,1,no,0,0x40000,0,weapon,5,0x0, NC_SELFDESTRUCTION,Self Destruction
|
||||
2268,0,6,4,0,0x1,0,4,1,yes,0,0,0,none,0,0x0, NC_SHAPESHIFT,Shape Shift
|
||||
2269,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0, NC_EMERGENCYCOOL,Emergency Cool
|
||||
2270,0,6,4,0,0x3,7,1,1,yes,0,0,0,none,0,0x0, NC_INFRAREDSCAN,Infrared Scan
|
||||
2271,9,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x0, NC_ANALYZE,Analyze
|
||||
2272,0,6,4,0,0x3,2,3,1,no,0,0,0,none,0,0x0, NC_MAGNETICFIELD,Magnetic Field
|
||||
2273,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x0, NC_NEUTRALBARRIER,Neutral Barrier
|
||||
2274,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x0, NC_STEALTHFIELD,Stealth Field
|
||||
2275,5:6:7:8:9,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0, NC_REPAIR,Repair
|
||||
2267,0,6,4,0,0xCA,2:3:4,3,1,no,0,0x40000,0,weapon,5,0x4000, NC_SELFDESTRUCTION,Self Destruction
|
||||
2268,0,6,4,0,0x1,0,4,1,yes,0,0,0,none,0,0x4000, NC_SHAPESHIFT,Shape Shift
|
||||
2269,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x4000, NC_EMERGENCYCOOL,Emergency Cool
|
||||
2270,0,6,4,0,0x3,7,1,1,yes,0,0,0,none,0,0x4000, NC_INFRAREDSCAN,Infrared Scan
|
||||
2271,9,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x4000, NC_ANALYZE,Analyze
|
||||
2272,0,6,4,0,0x3,2,3,1,no,0,0,0,none,0,0x4000, NC_MAGNETICFIELD,Magnetic Field
|
||||
2273,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x4000, NC_NEUTRALBARRIER,Neutral Barrier
|
||||
2274,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x4000, NC_STEALTHFIELD,Stealth Field
|
||||
2275,5:6:7:8:9,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x4000, NC_REPAIR,Repair
|
||||
2276,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, NC_TRAININGAXE,Axe Training
|
||||
2277,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0, NC_RESEARCHFE,Research Fire/Earth
|
||||
2278,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0,0,weapon,2:3:4:5:6,0x0, NC_AXEBOOMERANG,Axe Boomerang
|
||||
2279,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, NC_POWERSWING,Power Swing
|
||||
2280,0,8,4,-1,0x2,2:2:3:3:3,5,-6,no,0,0x40000,0,weapon,0,0x0, NC_AXETORNADO,Axe Tornado
|
||||
2281,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x0, NC_SILVERSNIPER,FAW - Silver Sniper
|
||||
2282,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x0, NC_MAGICDECOY,FAW - Magic Decoy
|
||||
2283,5,6,1,0,0x1,0,1,1,no,0,0,0,none,0,0x0, NC_DISJOINT,FAW Removal
|
||||
2278,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0,0,weapon,2:3:4:5:6,0x4000, NC_AXEBOOMERANG,Axe Boomerang
|
||||
2279,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x4000, NC_POWERSWING,Power Swing
|
||||
2280,0,8,4,-1,0x2,2:2:3:3:3,5,-6,no,0,0x40000,0,weapon,0,0x4000, NC_AXETORNADO,Axe Tornado
|
||||
2281,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x4000, NC_SILVERSNIPER,FAW - Silver Sniper
|
||||
2282,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x4000, NC_MAGICDECOY,FAW - Magic Decoy
|
||||
2283,5,6,1,0,0x1,0,1,1,no,0,0,0,none,0,0x4000, NC_DISJOINT,FAW Removal
|
||||
|
||||
//****
|
||||
// SC Shadow Chaser
|
||||
@ -1396,7 +1396,7 @@
|
||||
5003,7,6,1,-1,0x2,4:5:6:7:-1,5,1,no,0,0,0,weapon,0,0x0, GN_ILLUSIONDOPING,Illusion Doping
|
||||
5004,9,6,2,1,0x42,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0x40000,0,weapon,0,0x0, RK_DRAGONBREATH_WATER,Dragon Breath - Water
|
||||
5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0,0x0, RK_LUXANIMA,Lux Anima
|
||||
5006,1,6,2,3,0x2,3,5,1,no,0,0,3,misc,0,0x0, NC_MAGMA_ERUPTION,Magma Eruption
|
||||
5006,1,6,2,3,0x2,3,5,1,no,0,0,3,misc,0,0x4000, NC_MAGMA_ERUPTION,Magma Eruption
|
||||
5007,0,6,4,0,0x3,5:6:7:8:9,5,1,no,0,0,0,none,0,0x0, WM_FRIGG_SONG,Frigg's Song
|
||||
5008,0,6,4,0,0x3,11,5,1,no,0,0,0,none,0,0x0, SO_ELEMENTAL_SHIELD,Elemental Shield
|
||||
5009,1,6,1,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO,Flash Combo
|
||||
@ -1404,7 +1404,7 @@
|
||||
5011,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, AB_OFFERTORIUM,Offertorium
|
||||
5012,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, WL_TELEKINESIS_INTENSE,Intense Telekinesis
|
||||
5013,0,6,4,0,0x3,0,5,1,no,0,0,0,none,0,0x0, LG_KINGS_GRACE,King's Grace
|
||||
5014,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, ALL_FULL_THROTTLE,Full Throttle
|
||||
5014,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x4000, ALL_FULL_THROTTLE,Full Throttle
|
||||
|
||||
// Summoner
|
||||
5018,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_BASIC_SKILL,New Basic Skill
|
||||
|
||||
@ -691,11 +691,11 @@
|
||||
|
||||
2267,0,0,200,0,0,0,99,0,0,mado,0,0,6146,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2802 //NC_SELFDESTRUCTION
|
||||
2268,0,0,100,0,0,0,99,0,0,mado,0,0,6360,3,6363,3,6362,3,6361,3,6146,2,0,0,0,0,0,0,0,0,0,0,2803 //NC_SHAPESHIFT
|
||||
2269,0,0,20,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2804 //NC_EMERGENCYCOOL
|
||||
2269,0,0,20,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2804:2809:2810 //NC_EMERGENCYCOOL
|
||||
2270,0,0,45,0,0,0,99,0,0,mado,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_INFRAREDSCAN
|
||||
2271,0,0,30,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_ANALYZE
|
||||
2272,0,0,60:70:80,0,0,0,99,0,0,mado,0,0,6146,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2805 //NC_MAGNETICFIELD
|
||||
2273,0,0,80:90:100,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2806 //NC_NEUTRALBARRIER
|
||||
2272,0,0,60:70:80,0,0,0,99,0,0,mado,0,0,6146,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2805 //NC_MAGNETICFIELD
|
||||
2273,0,0,80:90:100,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2806 //NC_NEUTRALBARRIER
|
||||
2274,0,0,80:100:120,0,0,0,99,0,0,mado,0,0,6146,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2808 //NC_STEALTHFIELD
|
||||
2275,0,0,25:30:35:40:45,0,0,0,99,0,0,mado,0,0,12392,1,12392,1,12393,1,12393,1,12394,1,0,0,0,0,0,0,0,0,0,0,2807 //NC_REPAIR
|
||||
|
||||
|
||||
@ -162,7 +162,7 @@ prontera,125,208,5 script Peco Peco Remover 105,{
|
||||
mes "Would you like to rent a Pushcart or";
|
||||
mes "ride a Magic Gear?";
|
||||
next;
|
||||
switch(select("Rent a Pushcart:Ride a Magic Gear:Cancel")) {
|
||||
switch(select("Rent a Pushcart:Ride a Magic Gear:Buy Emergency Magic Gear:Upgrade Cooling Device:Cancel")) {
|
||||
case 1:
|
||||
if (checkcart()) {
|
||||
mes "[Magic Gear Master]";
|
||||
@ -196,6 +196,70 @@ prontera,125,208,5 script Peco Peco Remover 105,{
|
||||
mes "Have fun, and please come again!";
|
||||
close;
|
||||
case 3:
|
||||
mes "[Magic Gear Master]";
|
||||
mes "Emergency Magic Gear is really useful for emergency situations and it is sold at 1,000,000 Zeny.";
|
||||
next;
|
||||
if (select("Purchase:Cancel") == 2) {
|
||||
mes "[Magic Gear Master]";
|
||||
mes "I see. Please feel free to ask me";
|
||||
mes "if you change your mind.";
|
||||
close;
|
||||
}
|
||||
if (countitem(23277) > 0) {
|
||||
mes "[Magic Gear Master]";
|
||||
mes "I'm sorry, but you already have an Emergency Magic Gear.";
|
||||
close;
|
||||
}
|
||||
if (Zeny < 1000000) {
|
||||
mes "[Magic Gear Master]";
|
||||
mes "I'm sorry, but you don't have enough Zeny to purchase the Emergency Magic Gear.";
|
||||
close;
|
||||
}
|
||||
Zeny -= 1000000;
|
||||
getitem 23277,1; //Mado_Box
|
||||
mes "[Magic Gear Master]";
|
||||
mes "There you go!";
|
||||
close;
|
||||
case 4:
|
||||
mes "[Magic Gear Master]";
|
||||
mes "Which device do you want to upgrade?";
|
||||
next;
|
||||
if (select("Cooling Device:High Quality Cooler") == 1) {
|
||||
mes "[Magic Gear Master]";
|
||||
mes "Upgrading Cooling Device to High Quality Cooler needs 1 Cooling Device and 2,000,000 Zeny.";
|
||||
next;
|
||||
.@itemid = 2804;
|
||||
.@cost = 2000000;
|
||||
} else {
|
||||
mes "[Magic Gear Master]";
|
||||
mes "Upgrading High Quality Cooler to Special Cooler needs 1 High Quality Cooler and 4,000,000 Zeny.";
|
||||
next;
|
||||
.@itemid = 2809;
|
||||
.@cost = 4000000;
|
||||
}
|
||||
if (select("Upgrade:Cancel") == 2) {
|
||||
mes "[Magic Gear Master]";
|
||||
mes "I see. Please feel free to ask me";
|
||||
mes "if you change your mind.";
|
||||
close;
|
||||
}
|
||||
if (!countitem(.@itemid)) {
|
||||
mes "[Magic Gear Master]";
|
||||
mes "I'm sorry, but you don't have the " + getitemname(.@itemid) + ".";
|
||||
close;
|
||||
}
|
||||
if (Zeny < .@cost) {
|
||||
mes "[Magic Gear Master]";
|
||||
mes "I'm sorry, but you don't have enough Zeny to upgrade the device.";
|
||||
close;
|
||||
}
|
||||
Zeny -= .@cost;
|
||||
delitem .@itemid,1;
|
||||
getitem (.@itemid == 2804 ? 2809 : 2810),1; //High_Quality_Cooler,Special_Cooler
|
||||
mes "[Magic Gear Master]";
|
||||
mes "Here you are! Your very own " + getitemname(.@itemid) + ".";
|
||||
close;
|
||||
case 5:
|
||||
close;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1566,23 +1566,21 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
|
||||
if (skill_id)
|
||||
mobskill_event((TBL_MOB*)bl,src,gettick(),MSC_SKILLUSED|(skill_id<<16));
|
||||
}
|
||||
if( sd ) {
|
||||
if( pc_ismadogear(sd) && rnd()%100 < 50 ) {
|
||||
short element = skill_get_ele(skill_id, skill_lv);
|
||||
if( !skill_id || element == -1 ) { //Take weapon's element
|
||||
struct status_data *sstatus = NULL;
|
||||
if( src->type == BL_PC && ((TBL_PC*)src)->bonus.arrow_ele )
|
||||
element = ((TBL_PC*)src)->bonus.arrow_ele;
|
||||
else if( (sstatus = status_get_status_data(src)) ) {
|
||||
element = sstatus->rhw.ele;
|
||||
}
|
||||
} else if( element == -2 ) //Use enchantment's element
|
||||
element = status_get_attack_sc_element(src,status_get_sc(src));
|
||||
else if( element == -3 ) //Use random element
|
||||
element = rnd()%ELE_ALL;
|
||||
if( element == ELE_FIRE || element == ELE_WATER )
|
||||
pc_overheat(sd,element == ELE_FIRE ? 1 : -1);
|
||||
}
|
||||
if (sd && pc_ismadogear(sd)) {
|
||||
short element = skill_get_ele(skill_id, skill_lv);
|
||||
|
||||
if( !skill_id || element == -1 ) { //Take weapon's element
|
||||
struct status_data *sstatus = NULL;
|
||||
if( src->type == BL_PC && ((TBL_PC*)src)->bonus.arrow_ele )
|
||||
element = ((TBL_PC*)src)->bonus.arrow_ele;
|
||||
else if( (sstatus = status_get_status_data(src)) ) {
|
||||
element = sstatus->rhw.ele;
|
||||
}
|
||||
} else if( element == -2 ) //Use enchantment's element
|
||||
element = status_get_attack_sc_element(src,status_get_sc(src));
|
||||
else if( element == -3 ) //Use random element
|
||||
element = rnd()%ELE_ALL;
|
||||
pc_overheat(sd, (element == ELE_FIRE ? 3 : 1));
|
||||
}
|
||||
|
||||
return damage;
|
||||
|
||||
@ -10617,28 +10617,27 @@ bool pc_setstand(struct map_session_data *sd, bool force){
|
||||
}
|
||||
|
||||
/**
|
||||
* Mechanic (MADO GEAR)
|
||||
* Calculate Overheat value
|
||||
* @param sd: Player data
|
||||
* @param heat: Amount of Heat to adjust
|
||||
**/
|
||||
void pc_overheat(struct map_session_data *sd, int val) {
|
||||
int heat = val, skill,
|
||||
limit[] = { 10, 20, 28, 46, 66 };
|
||||
void pc_overheat(struct map_session_data *sd, int16 heat) {
|
||||
struct status_change_entry *sce = NULL;
|
||||
int16 limit[] = { 150, 200, 280, 360, 450 };
|
||||
uint16 skill_lv;
|
||||
|
||||
if( !pc_ismadogear(sd) || sd->sc.data[SC_OVERHEAT] )
|
||||
return; // already burning
|
||||
nullpo_retv(sd);
|
||||
|
||||
skill = cap_value(pc_checkskill(sd,NC_MAINFRAME),0,4);
|
||||
if( sd->sc.data[SC_OVERHEAT_LIMITPOINT] ) {
|
||||
heat += sd->sc.data[SC_OVERHEAT_LIMITPOINT]->val1;
|
||||
status_change_end(&sd->bl,SC_OVERHEAT_LIMITPOINT,INVALID_TIMER);
|
||||
}
|
||||
|
||||
heat = max(0,heat); // Avoid negative HEAT
|
||||
if( heat >= limit[skill] )
|
||||
sc_start(&sd->bl,&sd->bl,SC_OVERHEAT,100,0,1000);
|
||||
else
|
||||
sc_start(&sd->bl,&sd->bl,SC_OVERHEAT_LIMITPOINT,100,heat,30000);
|
||||
|
||||
return;
|
||||
skill_lv = cap_value(pc_checkskill(sd, NC_MAINFRAME), 0, 4);
|
||||
if ((sce = sd->sc.data[SC_OVERHEAT_LIMITPOINT])) {
|
||||
sce->val1 += heat;
|
||||
sce->val1 = cap_value(sce->val1, 0, 1000);
|
||||
if (sd->sc.data[SC_OVERHEAT])
|
||||
status_change_end(&sd->bl, SC_OVERHEAT, INVALID_TIMER);
|
||||
if (sce->val1 > limit[skill_lv])
|
||||
sc_start(&sd->bl, &sd->bl, SC_OVERHEAT, 100, sce->val1, 1000);
|
||||
} else if (heat > 0)
|
||||
sc_start(&sd->bl, &sd->bl, SC_OVERHEAT_LIMITPOINT, 100, heat, 1000);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -1276,7 +1276,7 @@ int pc_read_motd(void); // [Valaris]
|
||||
int pc_disguise(struct map_session_data *sd, int class_);
|
||||
bool pc_isautolooting(struct map_session_data *sd, unsigned short nameid);
|
||||
|
||||
void pc_overheat(struct map_session_data *sd, int val);
|
||||
void pc_overheat(struct map_session_data *sd, int16 heat);
|
||||
|
||||
int pc_banding(struct map_session_data *sd, uint16 skill_lv);
|
||||
|
||||
|
||||
@ -4656,6 +4656,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
|
||||
case RK_SONICWAVE:
|
||||
case AB_DUPLELIGHT_MELEE:
|
||||
case RA_AIMEDBOLT:
|
||||
case NC_BOOSTKNUCKLE:
|
||||
case NC_PILEBUNKER:
|
||||
case NC_AXEBOOMERANG:
|
||||
case NC_POWERSWING:
|
||||
case NC_MAGMA_ERUPTION:
|
||||
@ -4685,11 +4687,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
|
||||
skill_attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag);
|
||||
break;
|
||||
|
||||
case NC_BOOSTKNUCKLE:
|
||||
case NC_PILEBUNKER:
|
||||
case NC_COLDSLOWER:
|
||||
if (sd)
|
||||
pc_overheat(sd, 1);
|
||||
case MO_TRIPLEATTACK:
|
||||
case RK_WINDCUTTER:
|
||||
skill_attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag|SD_ANIMATION);
|
||||
@ -4752,7 +4749,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
|
||||
break;
|
||||
|
||||
case NC_FLAMELAUNCHER:
|
||||
if (sd) pc_overheat(sd,1);
|
||||
case LG_CANNONSPEAR:
|
||||
if(skill_id == LG_CANNONSPEAR)
|
||||
clif_skill_damage(src, bl, tick, status_get_amotion(src), 0, -30000, 1, skill_id, skill_lv, DMG_SKILL);
|
||||
@ -4925,6 +4921,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
|
||||
case RA_ARROWSTORM:
|
||||
case RA_WUGDASH:
|
||||
case NC_VULCANARM:
|
||||
case NC_COLDSLOWER:
|
||||
case NC_SELFDESTRUCTION:
|
||||
case NC_AXETORNADO:
|
||||
case GC_ROLLINGCUTTER:
|
||||
@ -5003,6 +5000,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
|
||||
break;
|
||||
case WM_REVERBERATION_MELEE:
|
||||
case WM_REVERBERATION_MAGIC:
|
||||
case NC_ARMSCANNON:
|
||||
skill_area_temp[1] = 0;
|
||||
starget = splash_target(src);
|
||||
break;
|
||||
@ -5010,12 +5008,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
|
||||
skill_area_temp[4] = bl->x;
|
||||
skill_area_temp[5] = bl->y;
|
||||
break;
|
||||
case NC_ARMSCANNON:
|
||||
starget = splash_target(src);
|
||||
case NC_VULCANARM:
|
||||
if (sd)
|
||||
pc_overheat(sd, 1);
|
||||
break;
|
||||
}
|
||||
|
||||
// if skill damage should be split among targets, count them
|
||||
@ -5690,9 +5682,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
|
||||
status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER);
|
||||
sc_start(src,bl, SC_INFRAREDSCAN, 10000, skill_lv, skill_get_time(skill_id, skill_lv));
|
||||
} else {
|
||||
clif_skill_damage(src,bl,tick, status_get_amotion(src), 0, -30000, 1, skill_id, skill_lv, DMG_SKILL);
|
||||
map_foreachinallrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), splash_target(src), src, skill_id, skill_lv, tick, flag|BCT_ENEMY|SD_SPLASH|1, skill_castend_damage_id);
|
||||
clif_skill_damage(src,src,tick, status_get_amotion(src), 0, -30000, 1, skill_id, skill_lv, DMG_SKILL);
|
||||
if( sd ) pc_overheat(sd,1);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -7059,11 +7050,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
||||
}
|
||||
break;
|
||||
|
||||
case NC_EMERGENCYCOOL:
|
||||
clif_skill_nodamage(src,bl,skill_id,skill_lv,1);
|
||||
status_change_end(src,SC_OVERHEAT_LIMITPOINT,INVALID_TIMER);
|
||||
status_change_end(src,SC_OVERHEAT,INVALID_TIMER);
|
||||
break;
|
||||
case SR_WINDMILL:
|
||||
case GN_CART_TORNADO:
|
||||
clif_skill_nodamage(src,bl,skill_id,skill_lv,1);
|
||||
@ -7241,11 +7227,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
||||
clif_skill_nodamage(src,bl,skill_id,-1,status_change_end(bl, type, INVALID_TIMER)); //Hide skill-scream animation.
|
||||
map_freeblock_unlock();
|
||||
return 0;
|
||||
} else if( tsc && tsc->option&OPTION_MADOGEAR ) {
|
||||
//Mado Gear cannot hide
|
||||
if( sd ) clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
|
||||
map_freeblock_unlock();
|
||||
return 0;
|
||||
}
|
||||
clif_skill_nodamage(src,bl,skill_id,-1,sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));
|
||||
break;
|
||||
@ -9658,11 +9639,24 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
||||
}
|
||||
break;
|
||||
|
||||
case NC_EMERGENCYCOOL:
|
||||
clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
|
||||
if (sd) {
|
||||
struct skill_condition req = skill_get_requirement(sd, skill_id, skill_lv);
|
||||
int16 limit[] = { -45, -75, -105 };
|
||||
uint8 i;
|
||||
|
||||
for (i = 0; i < req.eqItem_count; i++) {
|
||||
if (pc_search_inventory(sd, req.eqItem[i]) != -1)
|
||||
break;
|
||||
}
|
||||
pc_overheat(sd, limit[i]);
|
||||
}
|
||||
break;
|
||||
|
||||
case NC_ANALYZE:
|
||||
clif_skill_damage(src, bl, tick, status_get_amotion(src), 0, -30000, 1, skill_id, skill_lv, DMG_SKILL);
|
||||
clif_skill_nodamage(src, bl, skill_id, skill_lv,
|
||||
sc_start(src,bl,type, 30 + 12 * skill_lv,skill_lv,skill_get_time(skill_id,skill_lv)));
|
||||
if( sd ) pc_overheat(sd,1);
|
||||
sc_start(src,bl,type, 30 + 12 * skill_lv,skill_lv,skill_get_time(skill_id,skill_lv));
|
||||
break;
|
||||
|
||||
case NC_MAGNETICFIELD:
|
||||
@ -9670,8 +9664,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
||||
if (map_flag_vs(src->m)) // Doesn't affect the caster in non-PVP maps [exneval]
|
||||
sc_start2(src,bl,type,100,skill_lv,src->id,skill_get_time(skill_id,skill_lv));
|
||||
map_foreachinallrange(skill_area_sub,bl,skill_get_splash(skill_id,skill_lv),splash_target(src),src,skill_id,skill_lv,tick,flag|BCT_ENEMY|SD_SPLASH|1,skill_castend_damage_id);
|
||||
if (sd)
|
||||
pc_overheat(sd,1);
|
||||
break;
|
||||
|
||||
case NC_REPAIR:
|
||||
@ -12153,7 +12145,6 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
|
||||
skill_clear_unitgroup(src); // To remove previous skills - cannot used combined
|
||||
if( (sg = skill_unitsetting(src,skill_id,skill_lv,src->x,src->y,0)) != NULL ) {
|
||||
sc_start2(src,src,skill_id == NC_NEUTRALBARRIER ? SC_NEUTRALBARRIER_MASTER : SC_STEALTHFIELD_MASTER,100,skill_lv,sg->group_id,skill_get_time(skill_id,skill_lv));
|
||||
if( sd ) pc_overheat(sd,1);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -14941,10 +14932,9 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
|
||||
return false; // in official there is no message.
|
||||
}
|
||||
if( pc_ismadogear(sd) ) {
|
||||
//None Mado skills are unusable when Mado is equipped. [Jobbie]
|
||||
//Only Mechanic exlcusive skill can be used.
|
||||
if(inf3&INF3_DIS_MADO){
|
||||
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
|
||||
// Skills that are unusable when Mado is equipped. [Jobbie]
|
||||
if(!(inf3&INF3_USABLE_MADO)){
|
||||
clif_skill_fail(sd,skill_id,USESKILL_FAIL_MADOGEAR_RIDE,0);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -15538,12 +15528,6 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case RETURN_TO_ELDICASTES:
|
||||
if( pc_ismadogear(sd) ) { //Cannot be used if Mado is equipped.
|
||||
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case KO_JYUMONJIKIRI:
|
||||
if (sd->weapontype1 && (sd->weapontype2 || sd->status.shield))
|
||||
return true;
|
||||
@ -15701,6 +15685,22 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
case NC_ACCELERATION:
|
||||
case NC_SELFDESTRUCTION:
|
||||
case NC_SHAPESHIFT:
|
||||
case NC_EMERGENCYCOOL:
|
||||
case NC_MAGNETICFIELD:
|
||||
case NC_NEUTRALBARRIER:
|
||||
case NC_STEALTHFIELD:
|
||||
if (pc_search_inventory(sd, reqeqit) == -1) {
|
||||
count--;
|
||||
if (!count) {
|
||||
clif_skill_fail(sd, skill_id, USESKILL_FAIL_NEED_EQUIPMENT, require.eqItem[0]<<16);
|
||||
return false;
|
||||
} else
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if (!pc_checkequip2(sd,reqeqit,EQI_ACC_L,EQI_MAX)) {
|
||||
clif_skill_fail(sd,skill_id,USESKILL_FAIL_NEED_EQUIPMENT,reqeqit<<16);
|
||||
|
||||
@ -98,7 +98,7 @@ enum e_skill_inf3 {
|
||||
INF3_EFF_RESEARCHTRAP = 0x00800, // Skill range affected by RA_RESEARCHTRAP
|
||||
INF3_NO_EFF_HOVERING = 0x01000, // Skill that does not affect user that has SC_HOVERING active
|
||||
INF3_USABLE_WARG = 0x02000, // Skill that can be use while riding warg
|
||||
INF3_DIS_MADO = 0x04000, // Skill that can't be used while in mado
|
||||
INF3_USABLE_MADO = 0x04000, // Skill that can be used while on Madogear
|
||||
INF3_USABLE_MANHOLE = 0x08000, // Skill that can be used to target while under SC__MANHOLE effect
|
||||
INF3_HIT_HIDING = 0x10000, // Skill that affects hidden targets
|
||||
INF3_SC_GLOOMYDAY_SK = 0x20000, // Skill that affects SC_GLOOMYDAY_SK
|
||||
|
||||
@ -3263,6 +3263,8 @@ bool status_calc_weight(struct map_session_data *sd, enum e_status_calc_weight_o
|
||||
sd->max_weight += sd->max_weight * sc->data[SC_KNOWLEDGE]->val1 / 10;
|
||||
if ((skill = pc_checkskill(sd, ALL_INCCARRY)) > 0)
|
||||
sd->max_weight += 2000 * skill;
|
||||
if (pc_ismadogear(sd))
|
||||
sd->max_weight += 15000;
|
||||
}
|
||||
|
||||
// Update the client if the new weight calculations don't match
|
||||
@ -4060,7 +4062,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
|
||||
status_calc_weight(sd, CALCWT_MAXBONUS);
|
||||
status_calc_cart_weight(sd, CALCWT_MAXBONUS);
|
||||
|
||||
if (pc_checkskill(sd,SM_MOVINGRECOVERY)>0)
|
||||
if (pc_checkskill(sd, SM_MOVINGRECOVERY) > 0 || pc_ismadogear(sd))
|
||||
sd->regen.state.walk = 1;
|
||||
else
|
||||
sd->regen.state.walk = 0;
|
||||
@ -6662,6 +6664,20 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
|
||||
if (sc == NULL || (sd && sd->state.permanent_speed))
|
||||
return (unsigned short)cap_value(speed, MIN_WALK_SPEED, MAX_WALK_SPEED);
|
||||
|
||||
if (sd && pc_ismadogear(sd)) { // Mado speed is not affected by other statuses
|
||||
int val = 0;
|
||||
|
||||
if (pc_checkskill(sd, NC_MADOLICENCE) < 5)
|
||||
val = 50 - 10 * pc_checkskill(sd, NC_MADOLICENCE);
|
||||
else
|
||||
val -= 25;
|
||||
if (sc->data[SC_ACCELERATION])
|
||||
val -= 25;
|
||||
speed += speed * val / 100;
|
||||
|
||||
return (unsigned short)cap_value(speed, MIN_WALK_SPEED, MAX_WALK_SPEED);
|
||||
}
|
||||
|
||||
if( sd && sd->ud.skilltimer != INVALID_TIMER && (pc_checkskill(sd,SA_FREECAST) > 0 || sd->ud.skill_id == LG_EXEEDBREAK) ) {
|
||||
if( sd->ud.skill_id == LG_EXEEDBREAK )
|
||||
speed_rate = 160 - 10 * sd->ud.skill_lv;
|
||||
@ -6678,11 +6694,6 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
|
||||
val = 25; // Same bonus
|
||||
else if( pc_isridingwug(sd) )
|
||||
val = 15 + 5 * pc_checkskill(sd, RA_WUGRIDER);
|
||||
else if( pc_ismadogear(sd) ) {
|
||||
val = -(50 - 10 * pc_checkskill(sd,NC_MADOLICENCE));
|
||||
if( sc->data[SC_ACCELERATION] )
|
||||
val += 25;
|
||||
}
|
||||
else if( sc->data[SC_ALL_RIDING] )
|
||||
val = battle_config.rental_mount_speed_boost;
|
||||
}
|
||||
@ -10957,6 +10968,8 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
|
||||
val2 = 50; // -Hit
|
||||
break;
|
||||
|
||||
case SC_OVERHEAT:
|
||||
case SC_OVERHEAT_LIMITPOINT:
|
||||
case SC_STEALTHFIELD:
|
||||
tick_time = tick;
|
||||
tick = -1;
|
||||
@ -11206,6 +11219,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
|
||||
case SC_SPHERE_3:
|
||||
case SC_SPHERE_4:
|
||||
case SC_SPHERE_5:
|
||||
case SC_OVERHEAT:
|
||||
case SC_LIGHTNINGWALK:
|
||||
case SC_MONSTER_TRANSFORM:
|
||||
case SC_ACTIVE_MONSTER_TRANSFORM:
|
||||
@ -13361,21 +13375,31 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
|
||||
break;
|
||||
|
||||
case SC_OVERHEAT_LIMITPOINT:
|
||||
if( --(sce->val1) > 0 ) { // Cooling
|
||||
sc_timer_next(30000 + tick);
|
||||
if (--(sce->val1) >= 0) { // Cooling
|
||||
int16 limit[] = { 150, 200, 280, 360, 450 };
|
||||
uint16 skill_lv = (sd ? pc_checkskill(sd, NC_MAINFRAME) : 0);
|
||||
|
||||
if (sc && sc->data[SC_OVERHEAT])
|
||||
status_change_end(bl,SC_OVERHEAT,INVALID_TIMER);
|
||||
if (sce->val1 > limit[skill_lv])
|
||||
sc_start(bl, bl, SC_OVERHEAT, 100, sce->val1, 1000);
|
||||
sc_timer_next(1000 + tick);
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
|
||||
case SC_OVERHEAT:
|
||||
{
|
||||
case SC_OVERHEAT: {
|
||||
int damage = status->max_hp / 100; // Suggestion 1% each second
|
||||
if( damage >= status->hp ) damage = status->hp - 1; // Do not kill, just keep you with 1 hp minimum
|
||||
|
||||
if (damage >= status->hp)
|
||||
damage = status->hp - 1; // Do not kill, just keep you with 1 hp minimum
|
||||
map_freeblock_lock();
|
||||
status_fix_damage(NULL,bl,damage,clif_damage(bl,bl,tick,0,0,damage,0,DMG_NORMAL,0,false));
|
||||
if( sc->data[type] ) {
|
||||
status_fix_damage(NULL, bl, damage, clif_damage(bl, bl, tick, 0, 0, damage, 0, DMG_NORMAL, 0, false));
|
||||
if (sc->data[type]) {
|
||||
sc_timer_next(1000 + tick);
|
||||
}
|
||||
map_freeblock_unlock();
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user