diff options
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 66 |
1 files changed, 55 insertions, 11 deletions
diff --git a/src/map/map.h b/src/map/map.h index 3b1775e46..8c817387f 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -40,7 +40,7 @@ struct item_data; #define NATURAL_HEAL_INTERVAL 500 #define MIN_FLOORITEM 2 #define MAX_FLOORITEM START_ACCOUNT_NUM -#define MAX_LEVEL 99 +#define MAX_LEVEL 150 #define MAX_DROP_PER_MAP 48 #define MAX_IGNORE_LIST 20 // official is 14 #define MAX_VENDING 12 @@ -62,6 +62,7 @@ struct item_data; #define JOBL_UPPER 0x1000 //4096 #define JOBL_BABY 0x2000 //8192 +#define JOBL_3 0x4000 //16384 //for filtering and quick checking. #define MAPID_UPPERMASK 0x0fff @@ -71,6 +72,7 @@ struct item_data; //Super Novices are considered the 2-1 version of the novice! Novices are considered a first class type, too... enum { MAPID_NOVICE = 0x0, +//1st classes MAPID_SWORDMAN, MAPID_MAGE, MAPID_ARCHER, @@ -84,7 +86,7 @@ enum { MAPID_XMAS, MAPID_SUMMER, //2_1 classes - MAPID_SUPER_NOVICE = JOBL_2_1|0x0, + MAPID_SUPER_NOVICE = JOBL_2_1|MAPID_NOVICE, MAPID_KNIGHT, MAPID_WIZARD, MAPID_HUNTER, @@ -93,15 +95,29 @@ enum { MAPID_ASSASSIN, MAPID_STAR_GLADIATOR, //2_2 classes - MAPID_CRUSADER = JOBL_2_2|0x1, + MAPID_CRUSADER = JOBL_2_2|MAPID_SWORDMAN, MAPID_SAGE, MAPID_BARDDANCER, MAPID_MONK, MAPID_ALCHEMIST, MAPID_ROGUE, MAPID_SOUL_LINKER, -//1-1, advanced - MAPID_NOVICE_HIGH = JOBL_UPPER|0x0, +//3_1 classes + MAPID_RUNE_KNIGHT = JOBL_3|JOBL_2_1|MAPID_SWORDMAN, + MAPID_WARLOCK, + MAPID_RANGER, + MAPID_ARCHBISHOP, + MAPID_MECHANIC, + MAPID_GUILLOTINE_CROSS, +//3_2 classes + MAPID_ROYAL_GUARD = JOBL_3|JOBL_2_2|MAPID_SWORDMAN, + MAPID_SORCERER, + MAPID_MINSTRELWANDERER, + MAPID_SURA, + MAPID_GENETIC, + MAPID_SHADOW_CHASER, +//1st, advanced + MAPID_NOVICE_HIGH = JOBL_UPPER|MAPID_NOVICE, MAPID_SWORDMAN_HIGH, MAPID_MAGE_HIGH, MAPID_ARCHER_HIGH, @@ -109,21 +125,35 @@ enum { MAPID_MERCHANT_HIGH, MAPID_THIEF_HIGH, //2_1 advanced - MAPID_LORD_KNIGHT = JOBL_UPPER|JOBL_2_1|0x1, + MAPID_LORD_KNIGHT = JOBL_UPPER|JOBL_2_1|MAPID_SWORDMAN, MAPID_HIGH_WIZARD, MAPID_SNIPER, MAPID_HIGH_PRIEST, MAPID_WHITESMITH, MAPID_ASSASSIN_CROSS, //2_2 advanced - MAPID_PALADIN = JOBL_UPPER|JOBL_2_2|0x1, + MAPID_PALADIN = JOBL_UPPER|JOBL_2_2|MAPID_SWORDMAN, MAPID_PROFESSOR, MAPID_CLOWNGYPSY, MAPID_CHAMPION, MAPID_CREATOR, MAPID_STALKER, -//1-1 baby - MAPID_BABY = JOBL_BABY|0x0, +//3_1 advanced + MAPID_RUNE_KNIGHT_H = JOBL_3|JOBL_UPPER|JOBL_2_1|MAPID_SWORDMAN, + MAPID_WARLOCK_H, + MAPID_RANGER_H, + MAPID_ARCHBISHOP_H, + MAPID_MECHANIC_H, + MAPID_GUILLOTINE_CROSS_H, +//3_2 advanced + MAPID_ROYAL_GUARD_H = JOBL_3|JOBL_UPPER|JOBL_2_2|MAPID_SWORDMAN, + MAPID_SORCERER_H, + MAPID_MINSTRELWANDERER_H, + MAPID_SURA_H, + MAPID_GENETIC_H, + MAPID_SHADOW_CHASER_H, +//1st baby + MAPID_BABY = JOBL_BABY|MAPID_NOVICE, MAPID_BABY_SWORDMAN, MAPID_BABY_MAGE, MAPID_BABY_ARCHER, @@ -132,7 +162,7 @@ enum { MAPID_BABY_THIEF, MAPID_BABY_TAEKWON, //2_1 baby - MAPID_SUPER_BABY = JOBL_BABY|JOBL_2_1|0x0, + MAPID_SUPER_BABY = JOBL_BABY|JOBL_2_1|MAPID_NOVICE, MAPID_BABY_KNIGHT, MAPID_BABY_WIZARD, MAPID_BABY_HUNTER, @@ -141,13 +171,27 @@ enum { MAPID_BABY_ASSASSIN, MAPID_BABY_STAR_GLADIATOR, //2_2 baby - MAPID_BABY_CRUSADER = JOBL_BABY|JOBL_2_2|0x1, + MAPID_BABY_CRUSADER = JOBL_BABY|JOBL_2_2|MAPID_SWORDMAN, MAPID_BABY_SAGE, MAPID_BABY_BARDDANCER, MAPID_BABY_MONK, MAPID_BABY_ALCHEMIST, MAPID_BABY_ROGUE, MAPID_BABY_SOUL_LINKER, +//3_1 baby + MAPID_BABY_RUNE = JOBL_3|JOBL_BABY|JOBL_2_1|MAPID_SWORDMAN, + MAPID_BABY_WARLOCK, + MAPID_BABY_RANGER, + MAPID_BABY_BISHOP, + MAPID_BABY_MECHANIC, + MAPID_BABY_CROSS, +//3_2 baby + MAPID_BABY_GUARD = JOBL_3|JOBL_BABY|JOBL_2_2|MAPID_SWORDMAN, + MAPID_BABY_SORCERER, + MAPID_BABY_MINSTRELWANDERER, + MAPID_BABY_SURA, + MAPID_BABY_GENETIC, + MAPID_BABY_CHASER }; //Max size for inputs to Graffiti, Talkie Box and Vending text prompts |