diff --git a/db/const.txt b/db/const.txt index 5d661df7f8..4c94f83409 100644 --- a/db/const.txt +++ b/db/const.txt @@ -14,161 +14,6 @@ // in field Value. Depending on the implementation values assigned by scripts to parameters will affect // runtime values, such as Zeny, as well (see pc_readparam/pc_setparam). -Job_Novice 0 -Job_Swordman 1 -Job_Mage 2 -Job_Archer 3 -Job_Acolyte 4 -Job_Merchant 5 -Job_Thief 6 -Job_Knight 7 -Job_Priest 8 -Job_Wizard 9 -Job_Blacksmith 10 -Job_Hunter 11 -Job_Assassin 12 -Job_Knight2 13 -Job_Crusader 14 -Job_Monk 15 -Job_Sage 16 -Job_Rogue 17 -Job_Alchem 18 -Job_Alchemist 18 -Job_Bard 19 -Job_Dancer 20 -Job_Crusader2 21 -Job_Wedding 22 -Job_SuperNovice 23 -Job_Gunslinger 24 -Job_Ninja 25 -Job_Xmas 26 -Job_Summer 27 -Job_Hanbok 28 -Job_Oktoberfest 29 - -Job_Novice_High 4001 -Job_Swordman_High 4002 -Job_Mage_High 4003 -Job_Archer_High 4004 -Job_Acolyte_High 4005 -Job_Merchant_High 4006 -Job_Thief_High 4007 -Job_Lord_Knight 4008 -Job_High_Priest 4009 -Job_High_Wizard 4010 -Job_Whitesmith 4011 -Job_Sniper 4012 -Job_Assassin_Cross 4013 -Job_Lord_Knight2 4014 -Job_Paladin 4015 -Job_Champion 4016 -Job_Professor 4017 -Job_Stalker 4018 -Job_Creator 4019 -Job_Clown 4020 -Job_Gypsy 4021 -Job_Paladin2 4022 - -Job_Baby 4023 -Job_Baby_Swordman 4024 -Job_Baby_Mage 4025 -Job_Baby_Archer 4026 -Job_Baby_Acolyte 4027 -Job_Baby_Merchant 4028 -Job_Baby_Thief 4029 -Job_Baby_Knight 4030 -Job_Baby_Priest 4031 -Job_Baby_Wizard 4032 -Job_Baby_Blacksmith 4033 -Job_Baby_Hunter 4034 -Job_Baby_Assassin 4035 -Job_Baby_Knight2 4036 -Job_Baby_Crusader 4037 -Job_Baby_Monk 4038 -Job_Baby_Sage 4039 -Job_Baby_Rogue 4040 -Job_Baby_Alchem 4041 -Job_Baby_Alchemist 4041 -Job_Baby_Bard 4042 -Job_Baby_Dancer 4043 -Job_Baby_Crusader2 4044 -Job_Super_Baby 4045 - -Job_Taekwon 4046 -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 -Job_Arch_Bishop 4057 -Job_Mechanic 4058 -Job_Guillotine_Cross 4059 - -Job_Rune_Knight_T 4060 -Job_Warlock_T 4061 -Job_Ranger_T 4062 -Job_Arch_Bishop_T 4063 -Job_Mechanic_T 4064 -Job_Guillotine_Cross_T 4065 - -Job_Royal_Guard 4066 -Job_Sorcerer 4067 -Job_Minstrel 4068 -Job_Wanderer 4069 -Job_Sura 4070 -Job_Genetic 4071 -Job_Shadow_Chaser 4072 - -Job_Royal_Guard_T 4073 -Job_Sorcerer_T 4074 -Job_Minstrel_T 4075 -Job_Wanderer_T 4076 -Job_Sura_T 4077 -Job_Genetic_T 4078 -Job_Shadow_Chaser_T 4079 - -Job_Rune_Knight2 4080 -Job_Rune_Knight_T2 4081 -Job_Royal_Guard2 4082 -Job_Royal_Guard_T2 4083 -Job_Ranger2 4084 -Job_Ranger_T2 4085 -Job_Mechanic2 4086 -Job_Mechanic_T2 4087 - -Job_Baby_Rune 4096 -Job_Baby_Warlock 4097 -Job_Baby_Ranger 4098 -Job_Baby_Bishop 4099 -Job_Baby_Mechanic 4100 -Job_Baby_Cross 4101 -Job_Baby_Guard 4102 -Job_Baby_Sorcerer 4103 -Job_Baby_Minstrel 4104 -Job_Baby_Wanderer 4105 -Job_Baby_Sura 4106 -Job_Baby_Genetic 4107 -Job_Baby_Chaser 4108 - -Job_Baby_Rune2 4109 -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 - -Job_Rebellion 4215 - EAJL_2_1 0x100 EAJL_2_2 0x200 EAJL_2 0x300 diff --git a/src/map/script_constants.h b/src/map/script_constants.h index d47caa0d20..e431a880a8 100644 --- a/src/map/script_constants.h +++ b/src/map/script_constants.h @@ -22,6 +22,166 @@ export_constant(VIP_SCRIPT); export_constant(MIN_STORAGE); + /* jobs */ + export_constant(JOB_NOVICE); + export_constant(JOB_SWORDMAN); + export_constant(JOB_MAGE); + export_constant(JOB_ARCHER); + export_constant(JOB_ACOLYTE); + export_constant(JOB_MERCHANT); + export_constant(JOB_THIEF); + export_constant(JOB_KNIGHT); + export_constant(JOB_PRIEST); + export_constant(JOB_WIZARD); + export_constant(JOB_BLACKSMITH); + export_constant(JOB_HUNTER); + export_constant(JOB_ASSASSIN); + export_constant(JOB_KNIGHT2); + export_constant(JOB_CRUSADER); + export_constant(JOB_MONK); + export_constant(JOB_SAGE); + export_constant(JOB_ROGUE); + export_constant(JOB_ALCHEMIST); + // For backwards compatability + script_set_constant("Job_Alchem",JOB_ALCHEMIST,false); // TODO: Check if this is used anywhere and remove if possible + export_constant(JOB_BARD); + export_constant(JOB_DANCER); + export_constant(JOB_CRUSADER2); + export_constant(JOB_WEDDING); + export_constant(JOB_SUPER_NOVICE); + // For backwards compatability + script_set_constant("Job_SuperNovice",JOB_SUPER_NOVICE,false); // TODO: Refactor NPCs to use the new constant + export_constant(JOB_GUNSLINGER); + export_constant(JOB_NINJA); + export_constant(JOB_XMAS); + export_constant(JOB_SUMMER); + export_constant(JOB_HANBOK); + export_constant(JOB_OKTOBERFEST); + + export_constant(JOB_NOVICE_HIGH); + export_constant(JOB_SWORDMAN_HIGH); + export_constant(JOB_MAGE_HIGH); + export_constant(JOB_ARCHER_HIGH); + export_constant(JOB_ACOLYTE_HIGH); + export_constant(JOB_MERCHANT_HIGH); + export_constant(JOB_THIEF_HIGH); + export_constant(JOB_LORD_KNIGHT); + export_constant(JOB_HIGH_PRIEST); + export_constant(JOB_HIGH_WIZARD); + export_constant(JOB_WHITESMITH); + export_constant(JOB_SNIPER); + export_constant(JOB_ASSASSIN_CROSS); + export_constant(JOB_LORD_KNIGHT2); + export_constant(JOB_PALADIN); + export_constant(JOB_CHAMPION); + export_constant(JOB_PROFESSOR); + export_constant(JOB_STALKER); + export_constant(JOB_CREATOR); + export_constant(JOB_CLOWN); + export_constant(JOB_GYPSY); + export_constant(JOB_PALADIN2); + + export_constant(JOB_BABY); + export_constant(JOB_BABY_SWORDMAN); + export_constant(JOB_BABY_MAGE); + export_constant(JOB_BABY_ARCHER); + export_constant(JOB_BABY_ACOLYTE); + export_constant(JOB_BABY_MERCHANT); + export_constant(JOB_BABY_THIEF); + export_constant(JOB_BABY_KNIGHT); + export_constant(JOB_BABY_PRIEST); + export_constant(JOB_BABY_WIZARD); + export_constant(JOB_BABY_BLACKSMITH); + export_constant(JOB_BABY_HUNTER); + export_constant(JOB_BABY_ASSASSIN); + export_constant(JOB_BABY_KNIGHT2); + export_constant(JOB_BABY_CRUSADER); + export_constant(JOB_BABY_MONK); + export_constant(JOB_BABY_SAGE); + export_constant(JOB_BABY_ROGUE); + export_constant(JOB_BABY_ALCHEMIST); + // For backwards compatability + script_set_constant("Job_Baby_Alchem",JOB_BABY_ALCHEMIST,false); // TODO: Check if this is used anywhere and remove if possible + export_constant(JOB_BABY_BARD); + export_constant(JOB_BABY_DANCER); + export_constant(JOB_BABY_CRUSADER2); + export_constant(JOB_SUPER_BABY); + + export_constant(JOB_TAEKWON); + export_constant(JOB_STAR_GLADIATOR); + export_constant(JOB_STAR_GLADIATOR2); + export_constant(JOB_SOUL_LINKER); + + export_constant(JOB_GANGSI); + export_constant(JOB_DEATH_KNIGHT); + export_constant(JOB_DARK_COLLECTOR); + + export_constant(JOB_RUNE_KNIGHT); + export_constant(JOB_WARLOCK); + export_constant(JOB_RANGER); + export_constant(JOB_ARCH_BISHOP); + export_constant(JOB_MECHANIC); + export_constant(JOB_GUILLOTINE_CROSS); + + export_constant(JOB_RUNE_KNIGHT_T); + export_constant(JOB_WARLOCK_T); + export_constant(JOB_RANGER_T); + export_constant(JOB_ARCH_BISHOP_T); + export_constant(JOB_MECHANIC_T); + export_constant(JOB_GUILLOTINE_CROSS_T); + + export_constant(JOB_ROYAL_GUARD); + export_constant(JOB_SORCERER); + export_constant(JOB_MINSTREL); + export_constant(JOB_WANDERER); + export_constant(JOB_SURA); + export_constant(JOB_GENETIC); + export_constant(JOB_SHADOW_CHASER); + + export_constant(JOB_ROYAL_GUARD_T); + export_constant(JOB_SORCERER_T); + export_constant(JOB_MINSTREL_T); + export_constant(JOB_WANDERER_T); + export_constant(JOB_SURA_T); + export_constant(JOB_GENETIC_T); + export_constant(JOB_SHADOW_CHASER_T); + + export_constant(JOB_RUNE_KNIGHT2); + export_constant(JOB_RUNE_KNIGHT_T2); + export_constant(JOB_ROYAL_GUARD2); + export_constant(JOB_ROYAL_GUARD_T2); + export_constant(JOB_RANGER2); + export_constant(JOB_RANGER_T2); + export_constant(JOB_MECHANIC2); + export_constant(JOB_MECHANIC_T2); + + export_constant(JOB_BABY_RUNE); + export_constant(JOB_BABY_WARLOCK); + export_constant(JOB_BABY_RANGER); + export_constant(JOB_BABY_BISHOP); + export_constant(JOB_BABY_MECHANIC); + export_constant(JOB_BABY_CROSS); + export_constant(JOB_BABY_GUARD); + export_constant(JOB_BABY_SORCERER); + export_constant(JOB_BABY_MINSTREL); + export_constant(JOB_BABY_WANDERER); + export_constant(JOB_BABY_SURA); + export_constant(JOB_BABY_GENETIC); + export_constant(JOB_BABY_CHASER); + + export_constant(JOB_BABY_RUNE2); + export_constant(JOB_BABY_GUARD2); + export_constant(JOB_BABY_RANGER2); + export_constant(JOB_BABY_MECHANIC2); + + export_constant(JOB_SUPER_NOVICE_E); + export_constant(JOB_SUPER_BABY_E); + + export_constant(JOB_KAGEROU); + export_constant(JOB_OBORO); + + export_constant(JOB_REBELLION); + /* status options */ export_constant(OPTION_NOTHING); export_constant(OPTION_SIGHT);