diff options
-rw-r--r-- | db/const.txt | 71 | ||||
-rw-r--r-- | npc/custom/jobs/jobmaster.txt | 8 | ||||
-rw-r--r-- | src/common/mmo.h | 2 | ||||
-rw-r--r-- | src/map/pc.c | 2 | ||||
-rw-r--r-- | src/map/skill.c | 4 | ||||
-rw-r--r-- | src/map/skill.h | 193 | ||||
-rw-r--r-- | src/map/status.h | 99 |
7 files changed, 362 insertions, 17 deletions
diff --git a/db/const.txt b/db/const.txt index f8c8f74cb..69a45a59e 100644 --- a/db/const.txt +++ b/db/const.txt @@ -42,6 +42,7 @@ Job_SuperNovice 23 Job_Gunslinger 24 Job_Ninja 25 Job_Xmas 26 +Job_Summer 27 Job_Novice_High 4001 Job_Swordman_High 4002 @@ -96,6 +97,10 @@ Job_Star_Gladiator 4047 Job_Star_Gladiator2 4048 Job_Soul_Linker 4049 +Job_Gangsi 4050 +Job_Death_Knight 4051 +Job_Dark_Collector 4052 + Job_Rune_Knight 4054 Job_Warlock 4055 Job_Ranger 4056 @@ -154,14 +159,21 @@ Job_Baby_Guard2 4110 Job_Baby_Ranger2 4111 Job_Baby_Mechanic2 4112 +Job_Super_Novice_E 4190 +Job_Super_Baby_E 4191 + +Job_Kagerou 4211 +Job_Oboro 4212 + EAJL_2_1 0x100 EAJL_2_2 0x200 EAJL_2 0x300 EAJL_UPPER 0x1000 EAJL_BABY 0x2000 -EAJ_THIRD 0x4000 -EAJ_UPPERMASK 0x0fff +EAJL_THIRD 0x4000 + EAJ_BASEMASK 0x00ff +EAJ_UPPERMASK 0x0fff EAJ_THIRDMASK 0x4fff EAJ_NOVICE 0x0 @@ -174,6 +186,7 @@ EAJ_THIEF 0x6 EAJ_TAEKWON 0x7 EAJ_GUNSLINGER 0x9 EAJ_NINJA 0x0A +EAJ_GANGSI 0x0D EAJ_SUPER_NOVICE 0x100 EAJ_KNIGHT 0x101 @@ -183,6 +196,8 @@ EAJ_PRIEST 0x104 EAJ_BLACKSMITH 0x105 EAJ_ASSASSIN 0x106 EAJ_STAR_GLADIATOR 0x107 +EAJ_KAGEROUOBORO 0x10A +EAJ_DEATH_KNIGHT 0x10D EAJ_CRUSADER 0x201 EAJ_SAGE 0x202 @@ -191,6 +206,7 @@ EAJ_MONK 0x204 EAJ_ALCHEMIST 0x205 EAJ_ROGUE 0x206 EAJ_SOUL_LINKER 0x207 +EAJ_DARK_COLLECTOR 0x20D EAJ_NOVICE_HIGH 0x1000 EAJ_SWORDMAN_HIGH 0x1001 @@ -222,6 +238,7 @@ EAJ_BABY_ACOLYTE 0x2004 EAJ_BABY_MERCHANT 0x2005 EAJ_BABY_THIEF 0x2006 EAJ_BABY_TAEKWON 0x2007 +EAJ_BABY_GANGSI 0x200D EAJ_SUPER_BABY 0x2100 EAJ_BABY_KNIGHT 0x2101 @@ -231,6 +248,7 @@ EAJ_BABY_PRIEST 0x2104 EAJ_BABY_BLACKSMITH 0x2105 EAJ_BABY_ASSASSIN 0x2106 EAJ_BABY_STAR_GLADIATOR 0x2107 +EAJ_BABY_DEATH_KNIGHT 0x210D EAJ_BABY_CRUSADER 0x2201 EAJ_BABY_SAGE 0x2202 @@ -239,7 +257,9 @@ EAJ_BABY_MONK 0x2204 EAJ_BABY_ALCHEMIST 0x2205 EAJ_BABY_ROGUE 0x2206 EAJ_BABY_SOUL_LINKER 0x2207 +EAJ_BABY_DARK_COLLECTOR 0x220D +EAJ_SUPER_NOVICE_E 0x4100 EAJ_RUNE_KNIGHT 0x4101 EAJ_WARLOCK 0x4102 EAJ_RANGER 0x4103 @@ -268,6 +288,7 @@ EAJ_SURA_T 0x5204 EAJ_GENETIC_T 0x5205 EAJ_SHADOW_CHASER_T 0x5206 +EAJ_SUPER_BABY_E 0x6100 EAJ_BABY_RUNE 0x6101 EAJ_BABY_WARLOCK 0x6102 EAJ_BABY_RANGER 0x6103 @@ -1817,7 +1838,9 @@ HIDDEN_NPC 111 2_F_MAGICMASTER 123 4_F_TELEPORTER 124 4_M_TELEPORTER 125 +// Free ID's 126 - 138 HIDDEN_WARP_NPC 139 +// Free ID's 140 - 400 4_M_MUT2 401 4_M_SCIENCE 402 4_F_VALKYRIE2 403 @@ -2021,7 +2044,49 @@ MOB_TOMB 565 4_F_JP_CYNTHIA 601 4_M_JP_GUSTON 602 4_M_JP_BERKUT 603 -//Free Ids +4_F_JP_DARK_ADELAIDE 604 +4_M_JP_DARK_DARIUS 605 +4_M_JP_JESTER 606 +XMAS_SMOKEY_B 607 +XMAS_SMOKEY_R 608 +XMAS_SMOKEY_Y 609 +4_F_CLOCKDOLL 610 +4_F_FAIRY2 611 +4_F_PINKWOMAN 612 +4_FAIRYDEADLEAF 613 +4_FROG 614 +4_M_BLACKMAN 615 +4_M_BLUEMAN 616 +4_M_FAIRYANG 617 +4_M_FAIRYAVANT 618 +4_M_FAIRYFREAK 619 +4_M_FAIRYKID6 620 +4_M_FAIRYSCHOLAR 621 +4_M_FAIRYSCHOLAR_DIRTY 622 +4_M_FARIY_HISIE 623 +4_M_FARIYKING 624 +4_M_NEWOZ 625 +4_M_OLIVER 626 +4_M_PROFESSORWORM 627 +4_M_REDMAN 628 +4_F_GELKA 629 +4_M_ROTERT 630 +4_BLACKDRAGON 631 +4_M_GUNSLINGER 632 +4_F_GUNSLINGER 633 +4_M_ARCHER 634 +4_M_SWORDMAN 635 +4_M_NINJA_RED 636 +4_M_NINJA_BLUE 637 +4_M_THIEF_RUMIN 638 +4_M_NOV_RUMIN 639 +4_F_MAYSEL 640 +4_F_ACOLYTE 641 +4_M_NOV_HUNT 642 +4_F_GENETIC 643 +4_F_TAEKWON 644 +4_F_SWORDMAN 645 +//Free Ids 646 - 699 8_F_GIRL 700 4_F_GODEMOM 701 4_F_GON 702 diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt index c67d6eb59..ad23f2037 100644 --- a/npc/custom/jobs/jobmaster.txt +++ b/npc/custom/jobs/jobmaster.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena Dev Team [Ori:LunatikBunnie] //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= rAthena SVN; 15624+ //===== Description: ========================================= @@ -18,6 +18,8 @@ //= 1.5a fixed Baby -> Super Baby change. Switched to JobName() [Lupus] //= 1.6 Added support for both branches of 3rd classes, //= unified response order, fixed minor quirk. +//= 1.7 Corrected typo on EAJ_THIRD to EAJL_THIRD and fixed job +//= level requirement to change to 3rd. [Rytech] //===== TODO: ================================================ //= Add baby 3rd classes //= Could be restructured some more using eajobs @@ -208,7 +210,7 @@ prontera,153,193,6 script Job Master 123,{ } if (Class >= Job_Lord_Knight && Class <= Job_Paladin2) { - if(JobLevel < 70) goto L_cantCh; + if(JobLevel < 50) goto L_cantCh; goto L_Third; } } @@ -216,7 +218,7 @@ prontera,153,193,6 script Job Master 123,{ close; L_Third: - set @target_job, roclass(eaclass() | EAJ_THIRD); + set @target_job, roclass(eaclass() | EAJL_THIRD); mes "Are you sure you want to change to " + JobName(@target_job) + "?"; if(select("Yes", "No")==1){ callfunc "Job_Change", @target_job; diff --git a/src/common/mmo.h b/src/common/mmo.h index 7268982d7..543757e5e 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -79,7 +79,7 @@ #define MAX_ZENY 1000000000 #define MAX_FAME 1000000000 #define MAX_CART 100 -#define MAX_SKILL 2540 +#define MAX_SKILL 3040 #define GLOBAL_REG_NUM 256 #define ACCOUNT_REG_NUM 64 #define ACCOUNT_REG2_NUM 16 diff --git a/src/map/pc.c b/src/map/pc.c index 5d47f13cf..8c815c37e 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -6120,7 +6120,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) /* e.g. not killed thru pc_damage */ if( pc_issit(sd) ) { - clif_status_load(&sd->bl,SI_SITTING,0); + clif_status_load(&sd->bl,SI_SIT,0); } pc_setdead(sd); diff --git a/src/map/skill.c b/src/map/skill.c index 317ec007e..c646a9f09 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -12712,9 +12712,9 @@ int skill_sit (struct map_session_data *sd, int type) } if( type ) { - clif_status_load(&sd->bl,SI_SITTING,1); + clif_status_load(&sd->bl,SI_SIT,1); } else { - clif_status_load(&sd->bl,SI_SITTING,0); + clif_status_load(&sd->bl,SI_SIT,0); } if (!flag) return 0; diff --git a/src/map/skill.h b/src/map/skill.h index b78b1d54c..8dc9da1cc 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -847,6 +847,7 @@ enum e_skill { TK_POWER, TK_SEVENWIND, TK_HIGHJUMP, + SG_FEEL, SG_SUN_WARM, SG_MOON_WARM, @@ -865,6 +866,7 @@ enum e_skill { SG_FRIEND, SG_KNOWLEDGE, SG_FUSION, + SL_ALCHEMIST, AM_BERSERKPITCHER, SL_MONK, @@ -921,6 +923,7 @@ enum e_skill { AM_TWILIGHT2, AM_TWILIGHT3, HT_POWER, + GS_GLITTERING, GS_FLING, GS_TRIPLEACTION, @@ -943,6 +946,7 @@ enum e_skill { GS_FULLBUSTER, GS_SPREADATTACK, GS_GROUNDDRIFT, + NJ_TOBIDOUGU, NJ_SYURIKEN, NJ_KUNAI, @@ -967,7 +971,119 @@ enum e_skill { NJ_NEN, NJ_ISSEN, - NPC_EARTHQUAKE = 653, + MB_FIGHTING, + MB_NEUTRAL, + MB_TAIMING_PUTI, + MB_WHITEPOTION, + MB_MENTAL, + MB_CARDPITCHER, + MB_PETPITCHER, + MB_BODYSTUDY, + MB_BODYALTER, + MB_PETMEMORY, + MB_M_TELEPORT, + MB_B_GAIN, + MB_M_GAIN, + MB_MISSION, + MB_MUNAKKNOWLEDGE, + MB_MUNAKBALL, + MB_SCROLL, + MB_B_GATHERING, + MB_M_GATHERING, + MB_B_EXCLUDE, + MB_B_DRIFT, + MB_B_WALLRUSH, + MB_M_WALLRUSH, + MB_B_WALLSHIFT, + MB_M_WALLCRASH, + MB_M_REINCARNATION, + MB_B_EQUIP, + + SL_DEATHKNIGHT, + SL_COLLECTOR, + SL_NINJA, + SL_GUNNER, + AM_TWILIGHT4, + DA_RESET, + DE_BERSERKAIZER, + DA_DARKPOWER, + + DE_PASSIVE, + DE_PATTACK, + DE_PSPEED, + DE_PDEFENSE, + DE_PCRITICAL, + DE_PHP, + DE_PSP, + DE_RESET, + DE_RANKING, + DE_PTRIPLE, + DE_ENERGY, + DE_NIGHTMARE, + DE_SLASH, + DE_COIL, + DE_WAVE, + DE_REBIRTH, + DE_AURA, + DE_FREEZER, + DE_CHANGEATTACK, + DE_PUNISH, + DE_POISON, + DE_INSTANT, + DE_WARNING, + DE_RANKEDKNIFE, + DE_RANKEDGRADIUS, + DE_GAUGE, + DE_GTIME, + DE_GPAIN, + DE_GSKILL, + DE_GKILL, + DE_ACCEL, + DE_BLOCKDOUBLE, + DE_BLOCKMELEE, + DE_BLOCKFAR, + DE_FRONTATTACK, + DE_DANGERATTACK, + DE_TWINATTACK, + DE_WINDATTACK, + DE_WATERATTACK, + + DA_ENERGY, + DA_CLOUD, + DA_FIRSTSLOT, + DA_HEADDEF, + DA_SPACE, + DA_TRANSFORM, + DA_EXPLOSION, + DA_REWARD, + DA_CRUSH, + DA_ITEMREBUILD, + DA_ILLUSION, + DA_NUETRALIZE, + DA_RUNNER, + DA_TRANSFER, + DA_WALL, + DA_ZENY, + DA_REVENGE, + DA_EARPLUG, + DA_CONTRACT, + DA_BLACK, + DA_DREAM, + DA_MAGICCART, + DA_COPY, + DA_CRYSTAL, + DA_EXP, + DA_CARTSWING, + DA_REBUILD, + DA_JOBCHANGE, + DA_EDARKNESS, + DA_EGUARDIAN, + DA_TIMEOUT, + ALL_TIMEIN, + DA_ZENYRANK, + DA_ACCESSORYMIX, + + NPC_EARTHQUAKE, NPC_FIREBREATH, NPC_ICEBREATH, NPC_THUNDERBREATH, @@ -1251,9 +1367,11 @@ enum e_skill { WA_SWING_DANCE = 2350, WA_SYMPHONY_OF_LOVER, WA_MOONLIT_SERENADE, + MI_RUSH_WINDMILL = 2381, MI_ECHOSONG, MI_HARMONIZE, + WM_LESSON = 2412, WM_METALICSOUND, WM_REVERBERATION, @@ -1331,7 +1449,7 @@ enum e_skill { GN_S_PHARMACY, GN_SLINGITEM_RANGEMELEEATK, - AB_SECRAMENT=2515, + AB_SECRAMENT = 2515, WM_SEVERE_RAINSTORM_MELEE, SR_HOWLINGOFLION, SR_RIDEINLIGHTNING, @@ -1344,6 +1462,42 @@ enum e_skill { ALL_GUARDIAN_RECALL, ALL_ODINS_POWER, + KO_YAMIKUMO = 3001, + KO_RIGHT, + KO_LEFT, + KO_JYUMONJIKIRI, + KO_SETSUDAN, + KO_BAKURETSU, + KO_HAPPOKUNAI, + KO_MUCHANAGE, + KO_HUUMARANKA, + KO_MAKIBISHI, + KO_MEIKYOUSISUI, + KO_ZANZOU, + KO_KYOUGAKU, + KO_JYUSATSU, + KO_KAHU_ENTEN, + KO_HYOUHU_HUBUKI, + KO_KAZEHU_SEIRAN, + KO_DOHU_KOUKAI, + KO_KAIHOU, + KO_ZENKAI, + KO_GENWAKU, + KO_IZAYOI, + KG_KAGEHUMI, + KG_KYOMU, + KG_KAGEMUSYA, + OB_ZANGETSU, + OB_OBOROGENSOU, + OB_OBOROGENSOU_TRANSITION_ATK, + OB_AKAITSUKI, + + ECL_SNOWFLIP = 3031, + ECL_PEONYMAMY, + ECL_SADAGUI, + ECL_SEQUOIADUST, + ECLAGE_RECALL, + HLIF_HEAL = 8001, HLIF_AVOID, HLIF_BRAIN, @@ -1360,6 +1514,33 @@ enum e_skill { HVAN_CHAOTIC, HVAN_INSTRUCT, HVAN_EXPLOSION, + MUTATION_BASEJOB, + MH_SUMMON_LEGION, + MH_NEEDLE_OF_PARALYZE, + MH_POISON_MIST, + MH_PAIN_KILLER, + MH_LIGHT_OF_REGENE, + MH_OVERED_BOOST, + MH_ERASER_CUTTER, + MH_XENO_SLASHER, + MH_SILENT_BREEZE, + MH_STYLE_CHANGE, + MH_SONIC_CRAW, + MH_SILVERVEIN_RUSH, + MH_MIDNIGHT_FRENZY, + MH_STAHL_HORN, + MH_GOLDENE_FERSE, + MH_STEINWAND, + MH_HEILIGE_STANGE, + MH_ANGRIFFS_MODUS, + MH_TINDER_BREAKER, + MH_CBC, + MH_EQC, + MH_MAGMA_FLOW, + MH_GRANITIC_ARMOR, + MH_LAVA_SLIDE, + MH_PYROCLASTIC, + MH_VOLCANIC_ASH, MS_BASH = 8201, MS_MAGNUM, @@ -1567,6 +1748,14 @@ enum { UNT_WATER_INSIGNIA, //TODO UNT_WIND_INSIGNIA, //TODO UNT_EARTH_INSIGNIA, //TODO + UNT_POISON_MIST, + UNT_LAVA_SLIDE, + UNT_VOLCANIC_ASH, + UNT_ZENKAI_WATER, + UNT_ZENKAI_GROUND, + UNT_ZENKAI_FIRE, + UNT_ZENKAI_WIND, + UNT_MAKIBISHI, /** * Guild Auras diff --git a/src/map/status.h b/src/map/status.h index 7ebe9627b..61854ffb5 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -913,7 +913,6 @@ enum si_type { SI_CASH_PLUSONLYJOBEXP = 312, // SI_PARTYFLEE = 313, // SI_ANGEL_PROTECT = 314, - SI_ENDURE_MDEF = 315, SI_ENCHANTBLADE = 316, SI_DEATHBOUND = 317, @@ -980,7 +979,6 @@ enum si_type { SI_NEUTRALBARRIER_MASTER = 378, SI_STEALTHFIELD = 379, SI_STEALTHFIELD_MASTER = 380, - SI_MANU_ATK = 381, SI_MANU_DEF = 382, SI_SPL_ATK = 383, @@ -988,7 +986,6 @@ enum si_type { SI_REPRODUCE = 385, SI_MANU_MATK = 386, SI_SPL_MATK = 387, - SI_STR_SCROLL = 388, SI_INT_SCROLL = 389, SI_LG_REFLECTDAMAGE = 390, @@ -1173,9 +1170,101 @@ enum si_type { SI_WIND_INSIGNIA = 569, SI_EARTH_INSIGNIA = 570, SI_EQUIPED_FLOOR = 571, + SI_GUARDIAN_RECALL = 572, + SI_MORA_BUFF = 573, + SI_REUSE_LIMIT_G = 574, + SI_REUSE_LIMIT_H = 575, + SI_NEEDLE_OF_PARALYZE = 576, + SI_PAIN_KILLER = 577, + SI_G_LIFEPOTION = 578, + SI_VITALIZE_POTION = 579, + SI_LIGHT_OF_REGENE = 580, + SI_OVERED_BOOST = 581, + SI_SILENT_BREEZE = 582, SI_ODINS_POWER = 583, - SI_ALL_RIDING = 613,//awesome 571-613 gap, we're missing quite a few stuff here. - SI_SITTING = 622, + SI_STYLE_CHANGE = 584, + SI_SONIC_CLAW_POSTDELAY = 585, + // ID's 586 - 595 Currently Unused + SI_SILVERVEIN_RUSH_POSTDELAY = 596, + SI_MIDNIGHT_FRENZY_POSTDELAY = 597, + SI_GOLDENE_FERSE = 598, + SI_ANGRIFFS_MODUS = 599, + SI_TINDER_BREAKER = 600, + SI_TINDER_BREAKER_POSTDELAY = 601, + SI_CBC = 602, + SI_CBC_POSTDELAY = 603, + SI_EQC = 604, + SI_MAGMA_FLOW = 605, + SI_GRANITIC_ARMOR = 606, + SI_PYROCLASTIC = 607, + SI_VOLCANIC_ASH = 608, + SI_SPIRITS_SAVEINFO1 = 609, + SI_SPIRITS_SAVEINFO2 = 610, + SI_MAGIC_CANDY = 611, + SI_SEARCH_STORE_INFO = 612, + SI_ALL_RIDING = 613, + SI_ALL_RIDING_REUSE_LIMIT = 614, + SI_MACRO = 615, + SI_MACRO_POSTDELAY = 616, + SI_BEER_BOTTLE_CAP = 617, + SI_OVERLAPEXPUP = 618, + SI_PC_IZ_DUN05 = 619, + SI_CRUSHSTRIKE = 620, + SI_MONSTER_TRANSFORM = 621, + SI_SIT = 622, + SI_ONAIR = 623, + SI_MTF_ASPD = 624, + SI_MTF_RANGEATK = 625, + SI_MTF_MATK = 626, + SI_MTF_MLEATKED = 627, + SI_MTF_CRIDAMAGE = 628, + SI_REUSE_LIMIT_MTF = 629, + SI_MACRO_PERMIT = 630, + SI_MACRO_PLAY = 631, + SI_SKF_CAST = 632, + SI_SKF_ASPD = 633, + SI_SKF_ATK = 634, + SI_SKF_MATK = 635, + SI_REWARD_PLUSONLYJOBEXP = 636, + SI_HANDICAPSTATE_NORECOVER = 637, + SI_SET_NUM_DEF = 638, + SI_SET_NUM_MDEF = 639, + SI_SET_PER_DEF = 640, + SI_SET_PER_MDEF = 641, + SI_PARTYBOOKING_SEARCH_DEALY = 642, + SI_PARTYBOOKING_REGISTER_DEALY = 643, + SI_PERIOD_TIME_CHECK_DETECT_SKILL = 644, + SI_KO_JYUMONJIKIRI = 645, + SI_MEIKYOUSISUI = 646, + SI_ATTHASTE_CASH = 647, + SI_EQUIPPED_DIVINE_ARMOR = 648, + SI_EQUIPPED_HOLY_ARMOR = 649, + SI_2011RWC = 650, + SI_KYOUGAKU = 651, + SI_IZAYOI = 652, + SI_ZENKAI = 653, + SI_KG_KAGEHUMI = 654, + SI_KYOMU = 655, + SI_KAGEMUSYA = 656, + SI_ZANGETSU = 657, + SI_PHI_DEMON = 658, + SI_GENSOU = 659, + SI_AKAITSUKI = 660, + SI_TETANY = 661, + SI_GM_BATTLE = 662, + SI_GM_BATTLE2 = 663, + SI_2011RWC_SCROLL = 664, + SI_ACTIVE_MONSTER_TRANSFORM = 665, + SI_MYSTICPOWDER = 666, + SI_ECLAGE_RECALL = 667, + SI_ENTRY_QUEUE_APPLY_DELAY = 668, + SI_REUSE_LIMIT_ECL = 669, + SI_M_LIFEPOTION = 670, + SI_ENTRY_QUEUE_NOTIFY_ADMISSION_TIME_OUT = 671, + SI_UNKNOWN_NAME = 672, + SI_ON_PUSH_CART = 673, + SI_HAT_EFFECT = 674, + SI_FLOWER_LEAF = 675, SI_MAX, }; |