=General
*Updated a bunch of enum tables and other things. -New NPC's, skill tags, status tags, equip masks, etc. are added with this update. -Equip masks for costume robe and floor, will remain disabled until support for them is added. -Shadow equips will require a newer client before they can be coded in. -Hanbok costume job is added but is currently unusable since not all the coding to handle -them is in. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17188 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
technote24
parent
e59e1d99d3
commit
402a955b63
@ -643,6 +643,7 @@
|
||||
691: Sura T
|
||||
692: Genetic T
|
||||
693: Shadow Chaser T
|
||||
694: Hanbok
|
||||
|
||||
|
||||
//------------------------------------
|
||||
|
||||
49
db/const.txt
49
db/const.txt
@ -43,6 +43,7 @@ Job_Gunslinger 24
|
||||
Job_Ninja 25
|
||||
Job_Xmas 26
|
||||
Job_Summer 27
|
||||
Job_Hanbok 28
|
||||
|
||||
Job_Novice_High 4001
|
||||
Job_Swordman_High 4002
|
||||
@ -186,7 +187,7 @@ EAJ_THIEF 0x6
|
||||
EAJ_TAEKWON 0x7
|
||||
EAJ_GUNSLINGER 0x9
|
||||
EAJ_NINJA 0x0A
|
||||
EAJ_GANGSI 0x0D
|
||||
EAJ_GANGSI 0x0E
|
||||
|
||||
EAJ_SUPER_NOVICE 0x100
|
||||
EAJ_KNIGHT 0x101
|
||||
@ -197,7 +198,7 @@ EAJ_BLACKSMITH 0x105
|
||||
EAJ_ASSASSIN 0x106
|
||||
EAJ_STAR_GLADIATOR 0x107
|
||||
EAJ_KAGEROUOBORO 0x10A
|
||||
EAJ_DEATH_KNIGHT 0x10D
|
||||
EAJ_DEATH_KNIGHT 0x10E
|
||||
|
||||
EAJ_CRUSADER 0x201
|
||||
EAJ_SAGE 0x202
|
||||
@ -206,7 +207,7 @@ EAJ_MONK 0x204
|
||||
EAJ_ALCHEMIST 0x205
|
||||
EAJ_ROGUE 0x206
|
||||
EAJ_SOUL_LINKER 0x207
|
||||
EAJ_DARK_COLLECTOR 0x20D
|
||||
EAJ_DARK_COLLECTOR 0x20E
|
||||
|
||||
EAJ_NOVICE_HIGH 0x1000
|
||||
EAJ_SWORDMAN_HIGH 0x1001
|
||||
@ -302,6 +303,7 @@ Option_Xmas 0x10000
|
||||
Option_Summer 0x40000
|
||||
Option_Wug 0x100000
|
||||
Option_Wugrider 0x200000
|
||||
Option_Hanbok 0x8000000
|
||||
|
||||
bc_all 0
|
||||
bc_map 1
|
||||
@ -614,7 +616,7 @@ LOOK_CLOTHES_COLOR 7
|
||||
LOOK_SHIELD 8
|
||||
LOOK_SHOES 9
|
||||
LOOK_BODY 10
|
||||
LOOK_FLOOR 11
|
||||
LOOK_RESET_COSTUMES 11
|
||||
LOOK_ROBE 12
|
||||
|
||||
Eff_Stone 0
|
||||
@ -628,6 +630,7 @@ Eff_Confusion 7
|
||||
Eff_Blind 8
|
||||
Eff_Bleeding 9
|
||||
Eff_DPoison 10
|
||||
Eff_Fear 11
|
||||
|
||||
Ele_Neutral 0
|
||||
Ele_Water 1
|
||||
@ -1362,6 +1365,13 @@ e_spit 77
|
||||
e_ene 78
|
||||
e_panic 79
|
||||
e_whisp 80
|
||||
e_yut 81
|
||||
e_yut2 82
|
||||
e_yut3 83
|
||||
e_yut4 84
|
||||
e_yut5 85
|
||||
e_yut6 86
|
||||
e_yut7 87
|
||||
|
||||
PET_CLASS 1
|
||||
PET_NAME 2
|
||||
@ -2555,7 +2565,7 @@ HIDDEN_NPC 111
|
||||
4_F_TELEPORTER 124
|
||||
4_M_TELEPORTER 125
|
||||
// Free ID's 126 - 138
|
||||
HIDDEN_WARP_NPC 139
|
||||
//HIDDEN_WARP_NPC 139
|
||||
// Free ID's 140 - 400
|
||||
4_M_MUT2 401
|
||||
4_M_SCIENCE 402
|
||||
@ -3156,6 +3166,7 @@ CLEAR_NPC 844
|
||||
4_M_MOCASS1 997
|
||||
4_M_MOCASS2 998
|
||||
4_M_MUT1 999
|
||||
//New NPC ID Range Start
|
||||
4_TOWER_14 10001
|
||||
4_TOWER_15 10002
|
||||
4_TOWER_16 10003
|
||||
@ -3165,6 +3176,34 @@ ACADEMY_MASTER 10006
|
||||
PORTAL 10007
|
||||
THANATOS_BATTLE 10008
|
||||
THANATOS_KEEP 10009
|
||||
4_F_LYDIA 10010
|
||||
4_LUDE 10011
|
||||
4_ALIZA 10012
|
||||
4_ALICE 10013
|
||||
4_ARCHER_SKEL 10014
|
||||
4_JACK 10015
|
||||
4_SOLDIER_SKEL 10016
|
||||
4_LOLI_RURI 10017
|
||||
4_M_SAKRAY_TIED 10018
|
||||
4_M_ANTONIO 10019
|
||||
4_M_COOKIE 10020
|
||||
4_M_BELIEVER01 10021
|
||||
4_F_BELIEVER01 10022
|
||||
4_M_BELIEVER02 10023
|
||||
4_ROPEPILE 10024
|
||||
4_BRICKPILE 10025
|
||||
4_WOODPILE 10026
|
||||
4_M_TAMARIN 10027
|
||||
4_M_DEATH 10028
|
||||
4_GHOST_STAND 10029
|
||||
4_GHOST_COLLAPSE 10030
|
||||
4_COOKIEHOUSE 10031
|
||||
4_F_SKULL06GIRL 10032
|
||||
4_NONMYSTCASE 10033
|
||||
4_F_KIMI 10034
|
||||
4_M_FROZEN_GC 10035
|
||||
4_M_FROZEN_KN 10036
|
||||
4_SNAKE_LORD 10037
|
||||
|
||||
HAVEQUEST 0
|
||||
PLAYTIME 1
|
||||
|
||||
@ -654,6 +654,18 @@
|
||||
//706,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_VENOMFOG,Venom Fog
|
||||
//707,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_MILLENNIUMSHIELD,Millenium Shield 2
|
||||
//708,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_COMET,Comet 2
|
||||
//709,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_ICEMINE,Ice Mine
|
||||
//710,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_ICEEXPLO,Ice Explosion
|
||||
//711,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_FLAMECROSS,Flame Cross
|
||||
//712,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_PULSESTRIKE2,Pulse Strike 2
|
||||
//713,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DANCINGBLADE,Dancing Blade
|
||||
//714,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DANCINGBLADE_ATK,Dancing Blade Attack
|
||||
//715,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DARKPIERCING,Dark Piercing
|
||||
//716,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_MAXPAIN,Max Pain
|
||||
//717,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_MAXPAIN_ATK,Max Pain Attack
|
||||
//718,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DEATHSUMMON,Death Summon
|
||||
//719,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_HELLBURNING,Hell Burning
|
||||
//720,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_JACKFROST,Jack Frost 2
|
||||
|
||||
1001,9,6,1,-1,0,0,1,1,no,0,0x1,0,weapon,0, KN_CHARGEATK,Charge Attack
|
||||
1002,0,6,4,0,0x1,0,1,0,no,0,0x1,0,weapon,2, CR_SHRINK,Shrink
|
||||
@ -1019,12 +1031,16 @@
|
||||
2536,0,0,4,0,0x1,0,1,0,no,0,0,0,none,0, ALL_GUARDIAN_RECALL,Guardian's Recall
|
||||
2537,9,6,16,0,0x1,0,2,1,yes,0,0,0,magic,0, ALL_ODINS_POWER,Odin's Power
|
||||
//2538,0,0,0,0,0,0,??,0,no,0,0,0,none,0, BEER_BOTTLE_CAP,Beer Bottle Cap
|
||||
//2539,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_ASSASSINCROSS,Assassin Cross of Sunset 2
|
||||
//2540,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DISSONANCE,Dissonance 2
|
||||
//2541,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_UGLYDANCE,Ugly Dance 2
|
||||
//2539,0,6,4,0,0x1,0,10,1,no,0,0x2,0,none,0, NPC_ASSASSINCROSS,Assassin Cross of Sunset 2
|
||||
//2540,0,6,4,0,0x1,0,5,1,no,0,0x2,0,none,0, NPC_DISSONANCE,Dissonance 2
|
||||
//2541,0,6,4,0,0x1,0,5,1,no,0,0x2,0,none,0, NPC_UGLYDANCE,Ugly Dance 2
|
||||
//2542,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_TETANY,Tetany
|
||||
//2543,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_RAY_OF_PROTECTION,Ray of Protection
|
||||
//2543,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, ALL_RAY_OF_PROTECTION,Ray of Protection
|
||||
//2544,0,0,0,0,0,0,??,0,no,0,0,0,none,0, MC_CARTDECORATE,Decorate Cart
|
||||
//2545,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, GM_ITEM_ATKMAX,Maximize Attack
|
||||
//2546,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, GM_ITEM_ATKMIN,Minimize Attack
|
||||
//2547,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, GM_ITEM_MATKMAX,Maximize Magic Attack
|
||||
//2548,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, GM_ITEM_MATKMIN,Minimize Magic Attack
|
||||
|
||||
//****
|
||||
// Kagerou & Oboro
|
||||
@ -1055,9 +1071,36 @@
|
||||
3025,7,6,16,0,0x1,0,5,1,no,0,0,0,none,0, KG_KAGEMUSYA,Kagemusha
|
||||
3026,7,6,16,0,0x1,0,5,1,no,0,0,0,none,0, OB_ZANGETSU,Zangetsu
|
||||
3027,7,6,16,0,0x1,0,5,1,no,0,0,0,none,0, OB_OBOROGENSOU,Oboro Gensou
|
||||
3028,1,6,4,0,0x2,3,1,1,no,0,0,0,weapon,0, OB_OBOROGENSOU_TRANSITION_ATK,
|
||||
3028,1,6,4,0,0x2,3,1,1,no,0,0,0,weapon,0, OB_OBOROGENSOU_TRANSITION_ATK,Hazy Moonlight Illusion Transition Attack
|
||||
3029,7,6,1,0,0x1,0,5,0,no,0,0,0,none,0, OB_AKAITSUKI,Akaitsuki
|
||||
|
||||
// Eclage Skills
|
||||
3031,7,6,16,0,0x1,0,1,1,no,0,0,0,none,0, ECL_SNOWFLIP,Snow Flip
|
||||
3032,7,6,16,0,0x1,0,1,1,no,0,0,0,none,0, ECL_PEONYMAMY,Peony Mamy
|
||||
3033,7,6,16,0,0x1,0,1,1,no,0,0,0,none,0, ECL_SADAGUI,Sadagui
|
||||
3034,7,6,16,0,0x1,0,1,1,no,0,0,0,none,0, ECL_SEQUOIADUST,Sequoia Dust
|
||||
3035,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, ECLAGE_RECALL,Return To Eclage
|
||||
|
||||
// EP 14.3 Part 2 3rd Job Skills
|
||||
//5001,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, GC_DARKCROW,Dark Claw
|
||||
//5002,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, RA_UNLIMIT,Unlimited
|
||||
//5003,7,6,1,-1,0x2,4:5:6:7:8,5,1,no,0,0,0,weapon,0,GN_ILLUSIONDOPING,Illusion Doping
|
||||
//5004,9,6,2,1,0x2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,weapon,0, RK_DRAGONBREATH_WATER,Dragon Breath - Water
|
||||
//5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0, RK_LUXANIMA,Lux Anima
|
||||
//5006,1,6,2,3,0,0,5,1,no,0,0,3,misc,0, NC_MAGMA_ERUPTION,Magma Eruption
|
||||
//5007,0,6,4,0,0x3,5:6:7:8:9,5,1,no,0,0,0,none,0, WM_FRIGG_SONG,Frigg's Song
|
||||
//5008,0,6,4,0,0x3,15,5,1,no,0,0,0,none,0, SO_ELEMENTAL_SHIELD,Elemental Shield
|
||||
//5009,1,6,1,0,0x1,0,5,1,no,0,0,0,none,0, SR_FLASHCOMBO,Flash Combo//I can mark this as a no damage skill right?
|
||||
//5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, SC_ESCAPE,Emergency Escape//Said places a ankle snare trap. Must confirm before I remove the no damage thing.
|
||||
//5011,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, AB_OFFERTORIUM,Offertorium
|
||||
//5012,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, WL_TELEKINESIS_INTENSE,Intense Telekinesis
|
||||
//5013,0,6,4,0,0x3,5,5,1,no,0,0,0,none,0, LG_KINGS_GRACE,King's Grace//Need to know the splash AoE
|
||||
//5014,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, ALL_FULL_THROTTLE,Full Throttle
|
||||
//5015,-2,8,4,-1,0,0,10,-2,no,0,0x200,0,weapon,0, SR_FLASHCOMBO_ATK_STEP1,Flash Combo Attack Step 1//Dragon Combo
|
||||
//5016,-2,8,4,-1,0,0,5,-2,no,0,0x200,0,weapon,0, SR_FLASHCOMBO_ATK_STEP2,Flash Combo Attack Step 2//Fallen Empire
|
||||
//5017,-2,6,4,-1,0x42,1:1:1:1:1:2:2:2:2:2,10,1,no,0,0x200,0,weapon,0, SR_FLASHCOMBO_ATK_STEP3,Flash Combo Attack Step 3//Tiger Cannon
|
||||
//5018,0,8,4,-1,0x2,2,5,-3,no,0,0,0,weapon,0, SR_FLASHCOMBO_ATK_STEP4,Flash Combo Attack Step 4//Skynet Blow
|
||||
|
||||
8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0, HLIF_HEAL,Healing Touch
|
||||
8002,0,6,4,0,0x3,-1,5,1,no,0,0,0,none,0, HLIF_AVOID,Avoid
|
||||
8003,0,0,0,0,0,1,5,0,no,0,0,0,none,0, HLIF_BRAIN,Brain Surgery
|
||||
@ -1143,6 +1186,7 @@
|
||||
8238,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0, MER_KYRIE,Kyrie Eleison
|
||||
8239,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0, MER_BLESSING,Blessing
|
||||
8240,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0, MER_INCAGI,Increase Agility
|
||||
//8241,2,6,2,0,0,0,1,1,no,0,0,0,none,0, MER_INVINCIBLEOFF2,Mind Blaster
|
||||
|
||||
// Elemental Spirits Skills
|
||||
8401,0,6,4,3,0,0,1,1,no,0,0,0,weapon,2, EL_CIRCLE_OF_FIRE,Circle of Fire
|
||||
|
||||
@ -798,6 +798,10 @@
|
||||
//2542,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_TETANY#Tentay#
|
||||
//2543,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_RAY_OF_PROTECTION#Ray of Protection#
|
||||
//2544,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
|
||||
//2545,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_ATKMAX#Maximum Attack#
|
||||
//2546,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_ATKMIN#Minimal Attack#
|
||||
//2547,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_MATKMAX#Maximum Magic Attack#
|
||||
//2548,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_MATKMIN#Minimal Magic Attack#
|
||||
|
||||
//****
|
||||
// Kagerou/Oboro
|
||||
@ -828,10 +832,32 @@
|
||||
3027,0,0,55:60:65:70:75 ,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //OB_OBOROGENSOU#Oboro Gensou#
|
||||
3029,0,0,20:30:40:50:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //OB_AKAITSUKI#Akaitsuki#
|
||||
|
||||
10010,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GD_BATTLEORDER##
|
||||
10011,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GD_REGENERATION##
|
||||
10012,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GD_RESTORE##
|
||||
10013,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GD_EMERGENCYCALL##
|
||||
// Eclage Skills
|
||||
3031,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ECL_SNOWFLIP#Snow Flip#
|
||||
3032,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ECL_PEONYMAMY#Peony Mamy#
|
||||
3033,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ECL_SADAGUI#Sadagui#
|
||||
3034,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ECL_SEQUOIADUST#Sequoia Dust#
|
||||
3035,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ECLAGE_RECALL#Return To Eclage#
|
||||
|
||||
// EP 14.3 Part 2 3rd Job Skills
|
||||
//5001,0,0,22:34:46:58:70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_DARKCROW#Dark Claw#
|
||||
//5002,0,0,100:120:140:160:180,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_UNLIMIT#Unlimited#
|
||||
//5003,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOPING#Illusion Doping#
|
||||
//5004,0,0,30:35:40:45:50:55:60:65:70:75,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_DRAGONBREATH_WATER#Dragon Breath - Water#
|
||||
//5005,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_LUXANIMA#Lux Anima#
|
||||
//5006,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
|
||||
//5007,0,0,200:230:260:290:320,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#Frigg's Song#
|
||||
//5008,0,0,120:120:120:120:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_ELEMENTAL_SHIELD#Elemental Shield#
|
||||
//5009,0,0,75:65:55:45:35,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO#Flash Combo#
|
||||
//5010,0,0,30:26:22:18:14,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape#
|
||||
//5011,0,0,30:60:90:120:150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_OFFERTORIUM#Offertorium#
|
||||
//5012,0,0,100:150:200:250:300,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WL_TELEKINESIS_INTENSE#Intense Telekinesis#
|
||||
//5013,0,0,200:180:160:140:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace#
|
||||
//5014,0,0,1:1:1:1:1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
|
||||
//5015,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO_ATK_STEP1#Flash Combo Attack Step 1#//All 4 steps are using temp req SP values for now.
|
||||
//5016,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO_ATK_STEP2#Flash Combo Attack Step 2#
|
||||
//5017,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO_ATK_STEP3#Flash Combo Attack Step 3#
|
||||
//5018,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO_ATK_STEP4#Flash Combo Attack Step 4#
|
||||
|
||||
8001,0,0,13:16:19:22:25,0,0,0,99,0,0,none,0,545,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL
|
||||
8002,0,0,20:25:30:35:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_AVOID
|
||||
@ -913,6 +939,7 @@
|
||||
8238,0,0,20:20:20:25:25:25:30:30:30:35,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MER_KYRIE
|
||||
8239,0,0,28:32:36:40:44:48:52:56:60:64,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MER_BLESSING
|
||||
8240,15,0,18:21:24:27:30:33:36:39:42:45,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MER_INCAGI
|
||||
//8241,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MER_INVINCIBLEOFF2#Mind Blaster#
|
||||
|
||||
// Elemental Spirits Skills
|
||||
8401,0,0,40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //EL_CIRCLE_OF_FIRE#Circle of Fire#
|
||||
@ -957,3 +984,8 @@
|
||||
8440,0,0,60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //EL_ROCK_CRUSHER#Rock Launcher#
|
||||
8441,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //EL_ROCK_CRUSHER_ATK#Rock Launcher Attack#
|
||||
8442,0,0,80,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //EL_STONE_RAIN#Stone Rain#
|
||||
|
||||
10010,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GD_BATTLEORDER##
|
||||
10011,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GD_REGENERATION##
|
||||
10012,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GD_RESTORE##
|
||||
10013,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GD_EMERGENCYCALL##
|
||||
|
||||
@ -610,6 +610,7 @@ enum {
|
||||
JOB_NINJA,
|
||||
JOB_XMAS,
|
||||
JOB_SUMMER,
|
||||
JOB_HANBOK,
|
||||
JOB_MAX_BASIC,
|
||||
|
||||
JOB_NOVICE_HIGH = 4001,
|
||||
@ -713,7 +714,6 @@ enum {
|
||||
JOB_BABY_BISHOP,
|
||||
JOB_BABY_MECHANIC,
|
||||
JOB_BABY_CROSS,
|
||||
|
||||
JOB_BABY_GUARD,
|
||||
JOB_BABY_SORCERER,
|
||||
JOB_BABY_MINSTREL,
|
||||
|
||||
@ -104,6 +104,7 @@ enum {
|
||||
MAPID_NINJA,
|
||||
MAPID_XMAS,
|
||||
MAPID_SUMMER,
|
||||
MAPID_HANBOK,
|
||||
MAPID_GANGSI,
|
||||
//2-1 Jobs
|
||||
MAPID_SUPER_NOVICE = JOBL_2_1|0x0,
|
||||
@ -115,7 +116,7 @@ enum {
|
||||
MAPID_ASSASSIN,
|
||||
MAPID_STAR_GLADIATOR,
|
||||
MAPID_KAGEROUOBORO = JOBL_2_1|0x0A,
|
||||
MAPID_DEATH_KNIGHT = JOBL_2_1|0x0D,
|
||||
MAPID_DEATH_KNIGHT = JOBL_2_1|0x0E,
|
||||
//2-2 Jobs
|
||||
MAPID_CRUSADER = JOBL_2_2|0x1,
|
||||
MAPID_SAGE,
|
||||
@ -124,7 +125,7 @@ enum {
|
||||
MAPID_ALCHEMIST,
|
||||
MAPID_ROGUE,
|
||||
MAPID_SOUL_LINKER,
|
||||
MAPID_DARK_COLLECTOR = JOBL_2_2|0x0D,
|
||||
MAPID_DARK_COLLECTOR = JOBL_2_2|0x0E,
|
||||
//Trans Novice And Trans 1-1 Jobs
|
||||
MAPID_NOVICE_HIGH = JOBL_UPPER|0x0,
|
||||
MAPID_SWORDMAN_HIGH,
|
||||
@ -428,9 +429,9 @@ enum _look {
|
||||
LOOK_CLOTHES_COLOR,
|
||||
LOOK_SHIELD,
|
||||
LOOK_SHOES,
|
||||
LOOK_BODY,
|
||||
LOOK_FLOOR,
|
||||
LOOK_ROBE,
|
||||
LOOK_BODY, //Purpose Unknown. Doesen't appear to do anything.
|
||||
LOOK_RESET_COSTUMES,//Makes all headgear sprites on player vanish when activated.
|
||||
LOOK_ROBE
|
||||
};
|
||||
|
||||
// used by map_setcell()
|
||||
|
||||
@ -5039,6 +5039,7 @@ int pc_jobid2mapid(unsigned short b_class)
|
||||
case JOB_NINJA: return MAPID_NINJA;
|
||||
case JOB_XMAS: return MAPID_XMAS;
|
||||
case JOB_SUMMER: return MAPID_SUMMER;
|
||||
case JOB_HANBOK: return MAPID_HANBOK;
|
||||
case JOB_GANGSI: return MAPID_GANGSI;
|
||||
//2-1 Jobs
|
||||
case JOB_SUPER_NOVICE: return MAPID_SUPER_NOVICE;
|
||||
@ -5180,6 +5181,7 @@ int pc_mapid2jobid(unsigned short class_, int sex)
|
||||
case MAPID_NINJA: return JOB_NINJA;
|
||||
case MAPID_XMAS: return JOB_XMAS;
|
||||
case MAPID_SUMMER: return JOB_SUMMER;
|
||||
case MAPID_HANBOK: return JOB_HANBOK;
|
||||
case MAPID_GANGSI: return JOB_GANGSI;
|
||||
//2-1 Jobs
|
||||
case MAPID_SUPER_NOVICE: return JOB_SUPER_NOVICE;
|
||||
@ -5343,6 +5345,9 @@ const char* job_name(int class_)
|
||||
case JOB_SUMMER:
|
||||
return msg_txt(621);
|
||||
|
||||
case JOB_HANBOK:
|
||||
return msg_txt(694);
|
||||
|
||||
case JOB_NOVICE_HIGH:
|
||||
case JOB_SWORDMAN_HIGH:
|
||||
case JOB_MAGE_HIGH:
|
||||
|
||||
15
src/map/pc.h
15
src/map/pc.h
@ -546,10 +546,18 @@ enum equip_pos {
|
||||
EQP_GARMENT = 0x0004,
|
||||
EQP_ACC_L = 0x0008,
|
||||
EQP_ACC_R = 0x0080, //128
|
||||
EQP_COSTUME_HEAD_TOP = 0x0400,
|
||||
EQP_COSTUME_HEAD_MID = 0x0800,
|
||||
EQP_COSTUME_HEAD_LOW = 0x1000,
|
||||
EQP_AMMO = 0x8000, //32768
|
||||
EQP_COSTUME_HEAD_LOW = 0x1000,
|
||||
EQP_COSTUME_HEAD_MID = 0x0800,
|
||||
EQP_COSTUME_HEAD_TOP = 0x0400,
|
||||
//EQP_COSTUME_GARMENT = 0x2000,
|
||||
//EQP_COSTUME_FLOOR = 0x4000,
|
||||
//EQP_SHADOW_ARMOR = 0x10000,//Shadow equip slots will be left disabled until client's supporting them are usable. [Rytech]
|
||||
//EQP_SHADOW_WEAPON = 0x20000,
|
||||
//EQP_SHADOW_SHIELD = 0x40000,
|
||||
//EQP_SHADOW_SHOES = 0x80000,
|
||||
//EQP_SHADOW_ACC_R = 0x100000,
|
||||
//EQP_SHADOW_ACC_L = 0x200000,
|
||||
};
|
||||
|
||||
#define EQP_WEAPON EQP_HAND_R
|
||||
@ -558,6 +566,7 @@ enum equip_pos {
|
||||
#define EQP_HELM (EQP_HEAD_LOW|EQP_HEAD_MID|EQP_HEAD_TOP)
|
||||
#define EQP_ACC (EQP_ACC_L|EQP_ACC_R)
|
||||
#define EQP_COSTUME (EQP_COSTUME_HEAD_TOP|EQP_COSTUME_HEAD_MID|EQP_COSTUME_HEAD_LOW)
|
||||
//#define EQP_SHADOW_GEAR (EQP_SHADOW_ARMOR|EQP_SHADOW_WEAPON|EQP_SHADOW_SHIELD|EQP_SHADOW_SHOES|EQP_SHADOW_ACC_R|EQP_SHADOW_ACC_L)
|
||||
|
||||
/// Equip positions that use a visible sprite
|
||||
#if PACKETVER < 20110111
|
||||
|
||||
@ -1154,6 +1154,18 @@ enum e_skill {
|
||||
NPC_VENOMFOG,
|
||||
NPC_MILLENNIUMSHIELD,
|
||||
NPC_COMET,
|
||||
NPC_ICEMINE,
|
||||
NPC_ICEEXPLO,
|
||||
NPC_FLAMECROSS,
|
||||
NPC_PULSESTRIKE2,
|
||||
NPC_DANCINGBLADE,
|
||||
NPC_DANCINGBLADE_ATK,
|
||||
NPC_DARKPIERCING,
|
||||
NPC_MAXPAIN,
|
||||
NPC_MAXPAIN_ATK,
|
||||
NPC_DEATHSUMMON,
|
||||
NPC_HELLBURNING,
|
||||
NPC_JACKFROST,
|
||||
|
||||
KN_CHARGEATK = 1001,
|
||||
CR_SHRINK,
|
||||
@ -1491,6 +1503,10 @@ enum e_skill {
|
||||
ALL_TETANY,
|
||||
ALL_RAY_OF_PROTECTION,
|
||||
MC_CARTDECORATE,
|
||||
GM_ITEM_ATKMAX,
|
||||
GM_ITEM_ATKMIN,
|
||||
GM_ITEM_MATKMAX,
|
||||
GM_ITEM_MATKMIN,
|
||||
|
||||
KO_YAMIKUMO = 3001,
|
||||
KO_RIGHT,
|
||||
@ -1528,6 +1544,25 @@ enum e_skill {
|
||||
ECL_SEQUOIADUST,
|
||||
ECLAGE_RECALL,
|
||||
|
||||
GC_DARKCROW = 5001,
|
||||
RA_UNLIMIT,
|
||||
GN_ILLUSIONDOPING,
|
||||
RK_DRAGONBREATH_WATER,
|
||||
RK_LUXANIMA,
|
||||
NC_MAGMA_ERUPTION,
|
||||
WM_FRIGG_SONG,
|
||||
SO_ELEMENTAL_SHIELD,
|
||||
SR_FLASHCOMBO,
|
||||
SC_ESCAPE,
|
||||
AB_OFFERTORIUM,
|
||||
WL_TELEKINESIS_INTENSE,
|
||||
LG_KINGS_GRACE,
|
||||
ALL_FULL_THROTTLE,
|
||||
SR_FLASHCOMBO_ATK_STEP1,
|
||||
SR_FLASHCOMBO_ATK_STEP2,
|
||||
SR_FLASHCOMBO_ATK_STEP3,
|
||||
SR_FLASHCOMBO_ATK_STEP4,
|
||||
|
||||
HLIF_HEAL = 8001,
|
||||
HLIF_AVOID,
|
||||
HLIF_BRAIN,
|
||||
@ -1612,6 +1647,7 @@ enum e_skill {
|
||||
MER_KYRIE,
|
||||
MER_BLESSING,
|
||||
MER_INCAGI,
|
||||
MER_INVINCIBLEOFF2,
|
||||
|
||||
EL_CIRCLE_OF_FIRE = 8401,
|
||||
EL_FIRE_CLOAK,
|
||||
@ -1787,6 +1823,10 @@ enum {
|
||||
UNT_ZENKAI_WIND,
|
||||
UNT_MAKIBISHI,
|
||||
UNT_VENOMFOG,
|
||||
UNT_ICEMINE,
|
||||
UNT_FLAMECROSS,
|
||||
UNT_HELLBURNING,
|
||||
UNT_MAGMA_ERUPTION,
|
||||
|
||||
/**
|
||||
* Guild Auras
|
||||
|
||||
@ -1361,6 +1361,34 @@ enum si_type {
|
||||
SI_QUEST_BUFF3 = 707,
|
||||
SI_REUSE_LIMIT_RECALL = 708,
|
||||
SI_SAVEPOSITION = 709,
|
||||
SI_HANDICAPSTATE_ICEEXPLO = 710,
|
||||
SI_FENRIR_CARD = 711,
|
||||
SI_REUSE_LIMIT_ASPD_POTION = 712,
|
||||
SI_MAXPAIN = 713,
|
||||
SI_PC_STOP = 714,
|
||||
SI_FRIGG_SONG = 715,
|
||||
SI_OFFERTORIUM = 716,
|
||||
SI_TELEKINESIS_INTENSE = 717,
|
||||
SI_MOONSTAR = 718,
|
||||
SI_STRANGELIGHTS = 719,
|
||||
SI_FULL_THROTTLE = 720,
|
||||
SI_REBOUND = 721,
|
||||
SI_UNLIMIT = 722,
|
||||
SI_KINGS_GRACE = 723,
|
||||
SI_ITEM_ATKMAX = 724,
|
||||
SI_ITEM_ATKMIN = 725,
|
||||
SI_ITEM_MATKMAX = 726,
|
||||
SI_ITEM_MATKMIN = 727,
|
||||
SI_SUPER_STAR = 728,
|
||||
SI_HIGH_RANKER = 729,
|
||||
SI_DARKCROW = 730,
|
||||
SI_2013_VALENTINE1 = 731,
|
||||
SI_2013_VALENTINE2 = 732,
|
||||
SI_2013_VALENTINE3 = 733,
|
||||
// SI_ = 734,
|
||||
// SI_ = 735,
|
||||
SI_CHILL = 736,
|
||||
SI_BURNT = 737,
|
||||
SI_MAX,
|
||||
};
|
||||
|
||||
@ -1476,7 +1504,7 @@ enum {
|
||||
OPTION_DRAGON3 = 0x01000000,
|
||||
OPTION_DRAGON4 = 0x02000000,
|
||||
OPTION_DRAGON5 = 0x04000000,
|
||||
OPTION_MOUNTING = 0x08000000,
|
||||
OPTION_HANBOK = 0x08000000,
|
||||
|
||||
#ifndef NEW_CARTS
|
||||
OPTION_CART1 = 0x00000008,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user