Browse Source

Migrated all eAthena job constants to source exports

Lemongrass3110 9 năm trước cách đây
mục cha
commit
e68ad2bef5
2 tập tin đã thay đổi với 135 bổ sung134 xóa
  1. 0 134
      db/const.txt
  2. 135 0
      src/map/script_constants.h

+ 0 - 134
db/const.txt

@@ -14,140 +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).
 
-EAJL_2_1	0x100
-EAJL_2_2	0x200
-EAJL_2	0x300
-EAJL_UPPER	0x1000
-EAJL_BABY	0x2000
-EAJL_THIRD	0x4000
-
-EAJ_BASEMASK	0x00ff
-EAJ_UPPERMASK	0x0fff
-EAJ_THIRDMASK	0x4fff
-
-EAJ_NOVICE	0x00
-EAJ_SWORDMAN	0x01
-EAJ_MAGE	0x02
-EAJ_ARCHER	0x03
-EAJ_ACOLYTE	0x04
-EAJ_MERCHANT	0x05
-EAJ_THIEF	0x06
-EAJ_TAEKWON	0x07
-EAJ_GUNSLINGER	0x09
-EAJ_NINJA	0x0A
-EAJ_GANGSI	0x0E
-
-EAJ_KNIGHT	0x101
-EAJ_WIZARD	0x102
-EAJ_HUNTER	0x103
-EAJ_PRIEST	0x104
-EAJ_BLACKSMITH	0x105
-EAJ_ASSASSIN	0x106
-EAJ_STAR_GLADIATOR	0x107
-EAJ_REBELLION	0x109
-EAJ_KAGEROUOBORO	0x10A
-EAJ_DEATH_KNIGHT	0x10E
-
-EAJ_CRUSADER	0x201
-EAJ_SAGE	0x202
-EAJ_BARDDANCER	0x203
-EAJ_MONK	0x204
-EAJ_ALCHEMIST	0x205
-EAJ_ROGUE	0x206
-EAJ_SOUL_LINKER	0x207
-EAJ_DARK_COLLECTOR	0x20E
-
-EAJ_NOVICE_HIGH	0x1000
-EAJ_SWORDMAN_HIGH	0x1001
-EAJ_MAGE_HIGH	0x1002
-EAJ_ARCHER_HIGH	0x1003
-EAJ_ACOLYTE_HIGH	0x1004
-EAJ_MERCHANT_HIGH	0x1005
-EAJ_THIEF_HIGH	0x1006
-
-EAJ_LORD_KNIGHT	0x1101
-EAJ_HIGH_WIZARD	0x1102
-EAJ_SNIPER	0x1103
-EAJ_HIGH_PRIEST	0x1104
-EAJ_WHITESMITH	0x1105
-EAJ_ASSASSIN_CROSS	0x1106
-
-EAJ_PALADIN	0x1201
-EAJ_PROFESSOR	0x1202
-EAJ_CLOWNGYPSY	0x1203
-EAJ_CHAMPION	0x1204
-EAJ_CREATOR	0x1205
-EAJ_STALKER	0x1206
-
-EAJ_BABY	0x2000
-EAJ_BABY_SWORDMAN	0x2001
-EAJ_BABY_MAGE	0x2002
-EAJ_BABY_ARCHER	0x2003
-EAJ_BABY_ACOLYTE	0x2004
-EAJ_BABY_MERCHANT	0x2005
-EAJ_BABY_THIEF	0x2006
-
-EAJ_BABY_KNIGHT	0x2101
-EAJ_BABY_WIZARD	0x2102
-EAJ_BABY_HUNTER	0x2103
-EAJ_BABY_PRIEST	0x2104
-EAJ_BABY_BLACKSMITH	0x2105
-EAJ_BABY_ASSASSIN	0x2106
-
-EAJ_BABY_CRUSADER	0x2201
-EAJ_BABY_SAGE	0x2202
-EAJ_BABY_BARDDANCER	0x2203
-EAJ_BABY_MONK	0x2204
-EAJ_BABY_ALCHEMIST	0x2205
-EAJ_BABY_ROGUE	0x2206
-
-EAJ_RUNE_KNIGHT	0x4101
-EAJ_WARLOCK	0x4102
-EAJ_RANGER	0x4103
-EAJ_ARCH_BISHOP	0x4104
-EAJ_MECHANIC	0x4105
-EAJ_GUILLOTINE_CROSS	0x4106
-
-EAJ_ROYAL_GUARD	0x4201
-EAJ_SORCERER	0x4202
-EAJ_MINSTRELWANDERER	0x4203
-EAJ_SURA	0x4204
-EAJ_GENETIC	0x4205
-EAJ_SHADOW_CHASER	0x4206
-
-EAJ_RUNE_KNIGHT_T	0x5101
-EAJ_WARLOCK_T	0x5102
-EAJ_RANGER_T	0x5103
-EAJ_ARCH_BISHOP_T	0x5104
-EAJ_MECHANIC_T	0x5105
-EAJ_GUILLOTINE_CROSS_T	0x5106
-
-EAJ_ROYAL_GUARD_T	0x5201
-EAJ_SORCERER_T	0x5202
-EAJ_MINSTRELWANDERER_T	0x5203
-EAJ_SURA_T	0x5204
-EAJ_GENETIC_T	0x5205
-EAJ_SHADOW_CHASER_T	0x5206
-
-EAJ_BABY_RUNE		0x6101
-EAJ_BABY_WARLOCK	0x6102
-EAJ_BABY_RANGER		0x6103
-EAJ_BABY_BISHOP		0x6104
-EAJ_BABY_MECHANIC	0x6105
-EAJ_BABY_CROSS		0x6106
-
-EAJ_BABY_GUARD		0x6201
-EAJ_BABY_SORCERER	0x6202
-EAJ_BABY_MINSTRELWANDERER	0x6203
-EAJ_BABY_SURA		0x6204
-EAJ_BABY_GENETIC	0x6205
-EAJ_BABY_CHASER		0x6206
-
-EAJ_SUPER_NOVICE	0x100
-EAJ_SUPER_BABY	0x2100
-EAJ_SUPER_NOVICE_E	0x4100
-EAJ_SUPER_BABY_E	0x6100
-
 bc_all	0
 bc_map	1
 bc_area	2

+ 135 - 0
src/map/script_constants.h

@@ -182,6 +182,141 @@
 
 	export_constant(JOB_REBELLION);
 
+	/* EA jobs */
+	script_set_constant("EAJL_2_1",JOBL_2_1,false);
+	script_set_constant("EAJL_2_2",JOBL_2_2,false);
+	script_set_constant("EAJL_2",JOBL_2,false);
+	script_set_constant("EAJL_UPPER",JOBL_UPPER,false);
+	script_set_constant("EAJL_BABY",JOBL_BABY,false);
+	script_set_constant("EAJL_THIRD",JOBL_THIRD,false);
+
+	script_set_constant("EAJ_BASEMASK",MAPID_BASEMASK,false);
+	script_set_constant("EAJ_UPPERMASK",MAPID_UPPERMASK,false);
+	script_set_constant("EAJ_THIRDMASK",MAPID_THIRDMASK,false);
+
+	script_set_constant("EAJ_NOVICE",MAPID_NOVICE,false);
+	script_set_constant("EAJ_SWORDMAN",MAPID_SWORDMAN,false);
+	script_set_constant("EAJ_MAGE",MAPID_MAGE,false);
+	script_set_constant("EAJ_ARCHER",MAPID_ARCHER,false);
+	script_set_constant("EAJ_ACOLYTE",MAPID_ACOLYTE,false);
+	script_set_constant("EAJ_MERCHANT",MAPID_MERCHANT,false);
+	script_set_constant("EAJ_THIEF",MAPID_THIEF,false);
+	script_set_constant("EAJ_TAEKWON",MAPID_TAEKWON,false);
+	script_set_constant("EAJ_GUNSLINGER",MAPID_GUNSLINGER,false);
+	script_set_constant("EAJ_NINJA",MAPID_NINJA,false);
+	script_set_constant("EAJ_GANGSI",MAPID_GANGSI,false);
+
+	script_set_constant("EAJ_KNIGHT",MAPID_KNIGHT,false);
+	script_set_constant("EAJ_WIZARD",MAPID_WIZARD,false);
+	script_set_constant("EAJ_HUNTER",MAPID_HUNTER,false);
+	script_set_constant("EAJ_PRIEST",MAPID_PRIEST,false);
+	script_set_constant("EAJ_BLACKSMITH",MAPID_BLACKSMITH,false);
+	script_set_constant("EAJ_ASSASSIN",MAPID_ASSASSIN,false);
+	script_set_constant("EAJ_STAR_GLADIATOR",MAPID_STAR_GLADIATOR,false);
+	script_set_constant("EAJ_REBELLION",MAPID_REBELLION,false);
+	script_set_constant("EAJ_KAGEROUOBORO",MAPID_KAGEROUOBORO,false);
+	script_set_constant("EAJ_DEATH_KNIGHT",MAPID_DEATH_KNIGHT,false);
+
+	script_set_constant("EAJ_CRUSADER",MAPID_CRUSADER,false);
+	script_set_constant("EAJ_SAGE",MAPID_SAGE,false);
+	script_set_constant("EAJ_BARDDANCER",MAPID_BARDDANCER,false);
+	script_set_constant("EAJ_MONK",MAPID_MONK,false);
+	script_set_constant("EAJ_ALCHEMIST",MAPID_ALCHEMIST,false);
+	script_set_constant("EAJ_ROGUE",MAPID_ROGUE,false);
+	script_set_constant("EAJ_SOUL_LINKER",MAPID_SOUL_LINKER,false);
+	script_set_constant("EAJ_DARK_COLLECTOR",MAPID_DARK_COLLECTOR,false);
+
+	script_set_constant("EAJ_NOVICE_HIGH",MAPID_NOVICE_HIGH,false);
+	script_set_constant("EAJ_SWORDMAN_HIGH",MAPID_SWORDMAN_HIGH,false);
+	script_set_constant("EAJ_MAGE_HIGH",MAPID_MAGE_HIGH,false);
+	script_set_constant("EAJ_ARCHER_HIGH",MAPID_ARCHER_HIGH,false);
+	script_set_constant("EAJ_ACOLYTE_HIGH",MAPID_ACOLYTE_HIGH,false);
+	script_set_constant("EAJ_MERCHANT_HIGH",MAPID_MERCHANT_HIGH,false);
+	script_set_constant("EAJ_THIEF_HIGH",MAPID_THIEF_HIGH,false);
+
+	script_set_constant("EAJ_LORD_KNIGHT",MAPID_LORD_KNIGHT,false);
+	script_set_constant("EAJ_HIGH_WIZARD",MAPID_HIGH_WIZARD,false);
+	script_set_constant("EAJ_SNIPER",MAPID_SNIPER,false);
+	script_set_constant("EAJ_HIGH_PRIEST",MAPID_HIGH_PRIEST,false);
+	script_set_constant("EAJ_WHITESMITH",MAPID_WHITESMITH,false);
+	script_set_constant("EAJ_ASSASSIN_CROSS",MAPID_ASSASSIN_CROSS,false);
+
+	script_set_constant("EAJ_PALADIN",MAPID_PALADIN,false);
+	script_set_constant("EAJ_PROFESSOR",MAPID_PROFESSOR,false);
+	script_set_constant("EAJ_CLOWNGYPSY",MAPID_CLOWNGYPSY,false);
+	script_set_constant("EAJ_CHAMPION",MAPID_CHAMPION,false);
+	script_set_constant("EAJ_CREATOR",MAPID_CREATOR,false);
+	script_set_constant("EAJ_STALKER",MAPID_STALKER,false);
+
+	script_set_constant("EAJ_BABY",MAPID_BABY,false);
+	script_set_constant("EAJ_BABY_SWORDMAN",MAPID_BABY_SWORDMAN,false);
+	script_set_constant("EAJ_BABY_MAGE",MAPID_BABY_MAGE,false);
+	script_set_constant("EAJ_BABY_ARCHER",MAPID_BABY_ARCHER,false);
+	script_set_constant("EAJ_BABY_ACOLYTE",MAPID_BABY_ACOLYTE,false);
+	script_set_constant("EAJ_BABY_MERCHANT",MAPID_BABY_MERCHANT,false);
+	script_set_constant("EAJ_BABY_THIEF",MAPID_BABY_THIEF,false);
+
+	script_set_constant("EAJ_BABY_KNIGHT",MAPID_BABY_KNIGHT,false);
+	script_set_constant("EAJ_BABY_WIZARD",MAPID_BABY_WIZARD,false);
+	script_set_constant("EAJ_BABY_HUNTER",MAPID_BABY_HUNTER,false);
+	script_set_constant("EAJ_BABY_PRIEST",MAPID_BABY_PRIEST,false);
+	script_set_constant("EAJ_BABY_BLACKSMITH",MAPID_BABY_BLACKSMITH,false);
+	script_set_constant("EAJ_BABY_ASSASSIN",MAPID_BABY_ASSASSIN,false);
+
+	script_set_constant("EAJ_BABY_CRUSADER",MAPID_BABY_CRUSADER,false);
+	script_set_constant("EAJ_BABY_SAGE",MAPID_BABY_SAGE,false);
+	script_set_constant("EAJ_BABY_BARDDANCER",MAPID_BABY_BARDDANCER,false);
+	script_set_constant("EAJ_BABY_MONK",MAPID_BABY_MONK,false);
+	script_set_constant("EAJ_BABY_ALCHEMIST",MAPID_BABY_ALCHEMIST,false);
+	script_set_constant("EAJ_BABY_ROGUE",MAPID_BABY_ROGUE,false);
+
+	script_set_constant("EAJ_RUNE_KNIGHT",MAPID_RUNE_KNIGHT,false);
+	script_set_constant("EAJ_WARLOCK",MAPID_WARLOCK,false);
+	script_set_constant("EAJ_RANGER",MAPID_RANGER,false);
+	script_set_constant("EAJ_ARCH_BISHOP",MAPID_ARCH_BISHOP,false);
+	script_set_constant("EAJ_MECHANIC",MAPID_MECHANIC,false);
+	script_set_constant("EAJ_GUILLOTINE_CROSS",MAPID_GUILLOTINE_CROSS,false);
+
+	script_set_constant("EAJ_ROYAL_GUARD",MAPID_ROYAL_GUARD,false);
+	script_set_constant("EAJ_SORCERER",MAPID_SORCERER,false);
+	script_set_constant("EAJ_MINSTRELWANDERER",MAPID_MINSTRELWANDERER,false);
+	script_set_constant("EAJ_SURA",MAPID_SURA,false);
+	script_set_constant("EAJ_GENETIC",MAPID_GENETIC,false);
+	script_set_constant("EAJ_SHADOW_CHASER",MAPID_SHADOW_CHASER,false);
+
+	script_set_constant("EAJ_RUNE_KNIGHT_T",MAPID_RUNE_KNIGHT_T,false);
+	script_set_constant("EAJ_WARLOCK_T",MAPID_WARLOCK_T,false);
+	script_set_constant("EAJ_RANGER_T",MAPID_RANGER_T,false);
+	script_set_constant("EAJ_ARCH_BISHOP_T",MAPID_ARCH_BISHOP_T,false);
+	script_set_constant("EAJ_MECHANIC_T",MAPID_MECHANIC_T,false);
+	script_set_constant("EAJ_GUILLOTINE_CROSS_T",MAPID_GUILLOTINE_CROSS_T,false);
+
+	script_set_constant("EAJ_ROYAL_GUARD_T",MAPID_ROYAL_GUARD_T,false);
+	script_set_constant("EAJ_SORCERER_T",MAPID_SORCERER_T,false);
+	script_set_constant("EAJ_MINSTRELWANDERER_T",MAPID_MINSTRELWANDERER_T,false);
+	script_set_constant("EAJ_SURA_T",MAPID_SURA_T,false);
+	script_set_constant("EAJ_GENETIC_T",MAPID_GENETIC_T,false);
+	script_set_constant("EAJ_SHADOW_CHASER_T",MAPID_SHADOW_CHASER_T,false);
+
+	script_set_constant("EAJ_BABY_RUNE",MAPID_BABY_RUNE,false);
+	script_set_constant("EAJ_BABY_WARLOCK",MAPID_BABY_WARLOCK,false);
+	script_set_constant("EAJ_BABY_RANGER",MAPID_BABY_RANGER,false);
+	script_set_constant("EAJ_BABY_BISHOP",MAPID_BABY_BISHOP,false);
+	script_set_constant("EAJ_BABY_MECHANIC",MAPID_BABY_MECHANIC,false);
+	script_set_constant("EAJ_BABY_CROSS",MAPID_BABY_CROSS,false);
+
+	script_set_constant("EAJ_BABY_GUARD",MAPID_BABY_GUARD,false);
+	script_set_constant("EAJ_BABY_SORCERER",MAPID_BABY_SORCERER,false);
+	script_set_constant("EAJ_BABY_MINSTRELWANDERER",MAPID_BABY_MINSTRELWANDERER,false);
+	script_set_constant("EAJ_BABY_SURA",MAPID_BABY_SURA,false);
+	script_set_constant("EAJ_BABY_GENETIC",MAPID_BABY_GENETIC,false);
+	script_set_constant("EAJ_BABY_CHASER",MAPID_BABY_CHASER,false);
+
+	script_set_constant("EAJ_SUPER_NOVICE",MAPID_SUPER_NOVICE,false);
+	script_set_constant("EAJ_SUPER_BABY",MAPID_SUPER_BABY,false);
+	script_set_constant("EAJ_SUPER_NOVICE_E",MAPID_SUPER_NOVICE_E,false);
+	script_set_constant("EAJ_SUPER_BABY_E",MAPID_SUPER_BABY_E,false);
+
 	/* status options */
 	export_constant(OPTION_NOTHING);
 	export_constant(OPTION_SIGHT);