summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/char/char.c5
-rw-r--r--src/common/mmo.h14
-rw-r--r--src/map/atcommand.c80
-rw-r--r--src/map/map.h16
-rw-r--r--src/map/pc.c46
-rw-r--r--src/map/pc.h14
6 files changed, 90 insertions, 85 deletions
diff --git a/src/char/char.c b/src/char/char.c
index a34ffe167..a26f81174 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2057,7 +2057,8 @@ int parse_fromlogin(int fd)
class_[i] == JOB_BABY_BARD || class_[i] == JOB_BABY_DANCER ||
class_[i] == JOB_MINSTREL || class_[i] == JOB_WANDERER ||
class_[i] == JOB_MINSTREL_T || class_[i] == JOB_WANDERER_T ||
- class_[i] == JOB_BABY_MINSTREL || class_[i] == JOB_BABY_WANDERER )
+ class_[i] == JOB_BABY_MINSTREL || class_[i] == JOB_BABY_WANDERER ||
+ class_[i] == JOB_KAGEROU || class_[i] == JOB_OBORO )
{
// job modification
if( class_[i] == JOB_BARD || class_[i] == JOB_DANCER )
@@ -2072,6 +2073,8 @@ int parse_fromlogin(int fd)
class_[i] = (sex ? JOB_MINSTREL_T : JOB_WANDERER_T);
else if( class_[i] == JOB_BABY_MINSTREL || class_[i] == JOB_BABY_WANDERER )
class_[i] = (sex ? JOB_BABY_MINSTREL : JOB_BABY_WANDERER);
+ else if( class_[i] == JOB_KAGEROU || class_[i] == JOB_OBORO )
+ class_[i] = (sex ? JOB_KAGEROU : JOB_OBORO);
}
// to avoid any problem with equipment and invalid sex, equipment is unequiped.
if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `equip` = '0' WHERE `char_id` = '%d'", inventory_db, char_id[i]) )
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 4ac9280e7..6643eb1dd 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -640,9 +640,9 @@ enum {
JOB_STAR_GLADIATOR2,
JOB_SOUL_LINKER,
- //JOB_GANGSI,
- //JOB_DEATH_KNIGHT,
- //JOB_DARK_COLLECTOR,
+ JOB_GANGSI,
+ JOB_DEATH_KNIGHT,
+ JOB_DARK_COLLECTOR,
JOB_RUNE_KNIGHT = 4054,
JOB_WARLOCK,
@@ -703,11 +703,11 @@ enum {
JOB_BABY_RANGER2,
JOB_BABY_MECHANIC2,
- //JOB_SUPER_NOVICE_E = 4190,
- //JOB_SUPER_BABY_E,
+ JOB_SUPER_NOVICE_E = 4190,
+ JOB_SUPER_BABY_E,
- //JOB_KAGEROU = 4211,
- //JOB_OBORO,
+ JOB_KAGEROU = 4211,
+ JOB_OBORO,
JOB_MAX,
};
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 83f3811a3..8a918633a 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1018,11 +1018,11 @@ ACMD_FUNC(jobchange)
{ "taekwon girl", 4046 },
{ "star gladiator", 4047 },
{ "soul linker", 4049 },
- //{ "gangsi", 4050 },
- //{ "bongun", 4050 },
- //{ "munak", 4050 },
- //{ "death knight", 4051 },
- //{ "dark collector", 4052 },
+ { "gangsi", 4050 },
+ { "bongun", 4050 },
+ { "munak", 4050 },
+ { "death knight", 4051 },
+ { "dark collector", 4052 },
{ "rune knight", 4054 },
{ "warlock", 4055 },
{ "ranger", 4056 },
@@ -1062,10 +1062,10 @@ ACMD_FUNC(jobchange)
{ "baby sura", 4106 },
{ "baby genetic", 4107 },
{ "baby chaser", 4108 },
- //{ "super novice e", 4190 },
- //{ "super baby e", 4191 },
- //{ "kagerou", 4211 },
- //{ "oboro", 4212 },
+ { "super novice e", 4190 },
+ { "super baby e", 4191 },
+ { "kagerou", 4211 },
+ { "oboro", 4212 },
};
for (i=0; i < ARRAYLENGTH(jobs); i++) {
@@ -1095,36 +1095,36 @@ ACMD_FUNC(jobchange)
clif_displaymessage(fd, "4012 Sniper 4013 Assassin Cross 4015 Paladin 4016 Champion");
clif_displaymessage(fd, "4017 Professor 4018 Stalker 4019 Creator 4020 Clown");
clif_displaymessage(fd, "4021 Gypsy");
- clif_displaymessage(fd, "----- 3rd Class (Regular to 3rd) -----");
+ clif_displaymessage(fd, "----- 3rd Class (Regular) -----");
clif_displaymessage(fd, "4054 Rune Knight 4055 Warlock 4056 Ranger 4057 Arch Bishop");
clif_displaymessage(fd, "4058 Mechanic 4059 Guillotine Cross 4066 Royal Guard 4067 Sorcerer");
clif_displaymessage(fd, "4068 Minstrel 4069 Wanderer 4070 Sura 4071 Genetic");
clif_displaymessage(fd, "4072 Shadow Chaser");
- clif_displaymessage(fd, "----- 3rd Class (Transcendent to 3rd) -----");
+ clif_displaymessage(fd, "----- 3rd Class (Transcendent) -----");
clif_displaymessage(fd, "4060 Rune Knight 4061 Warlock 4062 Ranger 4063 Arch Bishop");
clif_displaymessage(fd, "4064 Mechanic 4065 Guillotine Cross 4073 Royal Guard 4074 Sorcerer");
clif_displaymessage(fd, "4075 Minstrel 4076 Wanderer 4077 Sura 4078 Genetic");
clif_displaymessage(fd, "4079 Shadow Chaser");
clif_displaymessage(fd, "----- Expanded Class -----");
- clif_displaymessage(fd, " 23 Super Novice 24 Gunslinger 25 Ninja 4046 Taekwon");
- clif_displaymessage(fd, "4047 Star Gladiator 4049 Soul Linker");
- //clif_displaymessage(fd, "4047 Star Gladiator 4049 Soul Linker 4050 Gangsi 4051 Death Knight");
- //clif_displaymessage(fd, "4052 Dark Collector 4190 Ex. Super Novice 4191 Ex. Super Baby");
- //clif_displaymessage(fd, "4211 Kagerou 4212 Oboro");
- clif_displaymessage(fd, "---- 1st And 2nd Baby Class ----");
+ clif_displaymessage(fd, " 23 Super Novice 24 Gunslinger 25 Ninja 4045 Super Baby");
+ clif_displaymessage(fd, "4046 Taekwon 4047 Star Gladiator 4049 Soul Linker 4050 Gangsi");
+ clif_displaymessage(fd, "4051 Death Knight 4052 Dark Collector 4190 Ex. Super Novice 4191 Ex. Super Baby");
+ clif_displaymessage(fd, "4211 Kagerou 4212 Oboro");
+ clif_displaymessage(fd, "----- Baby Novice And Baby 1st Class -----");
clif_displaymessage(fd, "4023 Baby Novice 4024 Baby Swordman 4025 Baby Magician 4026 Baby Archer");
- clif_displaymessage(fd, "4027 Baby Acolyte 4028 Baby Merchant 4029 Baby Thief 4030 Baby Knight");
- clif_displaymessage(fd, "4031 Baby Priest 4032 Baby Wizard 4033 Baby Blacksmith 4034 Baby Hunter");
- clif_displaymessage(fd, "4035 Baby Assassin 4037 Baby Crusader 4038 Baby Monk 4039 Baby Sage");
- clif_displaymessage(fd, "4040 Baby Rogue 4041 Baby Alchemist 4042 Baby Bard 4043 Baby Dancer");
- clif_displaymessage(fd, "4045 Super Baby");
- clif_displaymessage(fd, "---- 3rd Baby Class ----");
+ clif_displaymessage(fd, "4027 Baby Acolyte 4028 Baby Merchant 4029 Baby Thief");
+ clif_displaymessage(fd, "---- Baby 2nd Class ----");
+ clif_displaymessage(fd, "4030 Baby Knight 4031 Baby Priest 4032 Baby Wizard 4033 Baby Blacksmith");
+ clif_displaymessage(fd, "4034 Baby Hunter 4035 Baby Assassin 4037 Baby Crusader 4038 Baby Monk");
+ clif_displaymessage(fd, "4039 Baby Sage 4040 Baby Rogue 4041 Baby Alchemist 4042 Baby Bard");
+ clif_displaymessage(fd, "4043 Baby Dancer");
+ clif_displaymessage(fd, "---- Baby 3rd Class ----");
clif_displaymessage(fd, "4096 Baby Rune Knight 4097 Baby Warlock 4098 Baby Ranger 4099 Baby Arch Bishop");
clif_displaymessage(fd, "4100 Baby Mechanic 4101 Baby Glt. Cross 4102 Baby Royal Guard 4103 Baby Sorcerer");
clif_displaymessage(fd, "4104 Baby Minstrel 4105 Baby Wanderer 4106 Baby Sura 4107 Baby Genetic");
clif_displaymessage(fd, "4108 Baby Shadow Chaser");
//clif_displaymessage(fd, "---- Modes And Others ----");
- //clif_displaymessage(fd, " 22 Wedding 26 Christmas 27 Summer 4048 Star Gladiator (Union)");
+ //clif_displaymessage(fd, " 22 Wedding 26 Christmas 27 Summer 4048 Star Gladiator (Union)");
return -1;
}
}
@@ -1144,7 +1144,7 @@ ACMD_FUNC(jobchange)
return -1;
}
} else {
- clif_displaymessage(fd, "Please enter a valid job ID (usage: @job/@jobchange <job name/ID>).");
+ clif_displaymessage(fd, "Please enter a valid job ID (usage: @job/@jobchange <job name/ID>).");
clif_displaymessage(fd, "----- Novice / 1st Class -----");
clif_displaymessage(fd, " 0 Novice 1 Swordman 2 Magician 3 Archer");
clif_displaymessage(fd, " 4 Acolyte 5 Merchant 6 Thief");
@@ -1161,36 +1161,36 @@ ACMD_FUNC(jobchange)
clif_displaymessage(fd, "4012 Sniper 4013 Assassin Cross 4015 Paladin 4016 Champion");
clif_displaymessage(fd, "4017 Professor 4018 Stalker 4019 Creator 4020 Clown");
clif_displaymessage(fd, "4021 Gypsy");
- clif_displaymessage(fd, "----- 3rd Class (Regular to 3rd) -----");
+ clif_displaymessage(fd, "----- 3rd Class (Regular) -----");
clif_displaymessage(fd, "4054 Rune Knight 4055 Warlock 4056 Ranger 4057 Arch Bishop");
clif_displaymessage(fd, "4058 Mechanic 4059 Guillotine Cross 4066 Royal Guard 4067 Sorcerer");
clif_displaymessage(fd, "4068 Minstrel 4069 Wanderer 4070 Sura 4071 Genetic");
clif_displaymessage(fd, "4072 Shadow Chaser");
- clif_displaymessage(fd, "----- 3rd Class (Transcendent to 3rd) -----");
+ clif_displaymessage(fd, "----- 3rd Class (Transcendent) -----");
clif_displaymessage(fd, "4060 Rune Knight 4061 Warlock 4062 Ranger 4063 Arch Bishop");
clif_displaymessage(fd, "4064 Mechanic 4065 Guillotine Cross 4073 Royal Guard 4074 Sorcerer");
clif_displaymessage(fd, "4075 Minstrel 4076 Wanderer 4077 Sura 4078 Genetic");
clif_displaymessage(fd, "4079 Shadow Chaser");
clif_displaymessage(fd, "----- Expanded Class -----");
- clif_displaymessage(fd, " 23 Super Novice 24 Gunslinger 25 Ninja 4046 Taekwon");
- clif_displaymessage(fd, "4047 Star Gladiator 4049 Soul Linker");
- //clif_displaymessage(fd, "4047 Star Gladiator 4049 Soul Linker 4050 Gangsi 4051 Death Knight");
- //clif_displaymessage(fd, "4052 Dark Collector 4190 Ex. Super Novice 4191 Ex. Super Baby");
- //clif_displaymessage(fd, "4211 Kagerou 4212 Oboro");
- clif_displaymessage(fd, "---- 1st And 2nd Baby Class ----");
+ clif_displaymessage(fd, " 23 Super Novice 24 Gunslinger 25 Ninja 4045 Super Baby");
+ clif_displaymessage(fd, "4046 Taekwon 4047 Star Gladiator 4049 Soul Linker 4050 Gangsi");
+ clif_displaymessage(fd, "4051 Death Knight 4052 Dark Collector 4190 Ex. Super Novice 4191 Ex. Super Baby");
+ clif_displaymessage(fd, "4211 Kagerou 4212 Oboro");
+ clif_displaymessage(fd, "----- Baby Novice And Baby 1st Class -----");
clif_displaymessage(fd, "4023 Baby Novice 4024 Baby Swordman 4025 Baby Magician 4026 Baby Archer");
- clif_displaymessage(fd, "4027 Baby Acolyte 4028 Baby Merchant 4029 Baby Thief 4030 Baby Knight");
- clif_displaymessage(fd, "4031 Baby Priest 4032 Baby Wizard 4033 Baby Blacksmith 4034 Baby Hunter");
- clif_displaymessage(fd, "4035 Baby Assassin 4037 Baby Crusader 4038 Baby Monk 4039 Baby Sage");
- clif_displaymessage(fd, "4040 Baby Rogue 4041 Baby Alchemist 4042 Baby Bard 4043 Baby Dancer");
- clif_displaymessage(fd, "4045 Super Baby");
- clif_displaymessage(fd, "---- 3rd Baby Class ----");
+ clif_displaymessage(fd, "4027 Baby Acolyte 4028 Baby Merchant 4029 Baby Thief");
+ clif_displaymessage(fd, "---- Baby 2nd Class ----");
+ clif_displaymessage(fd, "4030 Baby Knight 4031 Baby Priest 4032 Baby Wizard 4033 Baby Blacksmith");
+ clif_displaymessage(fd, "4034 Baby Hunter 4035 Baby Assassin 4037 Baby Crusader 4038 Baby Monk");
+ clif_displaymessage(fd, "4039 Baby Sage 4040 Baby Rogue 4041 Baby Alchemist 4042 Baby Bard");
+ clif_displaymessage(fd, "4043 Baby Dancer");
+ clif_displaymessage(fd, "---- Baby 3rd Class ----");
clif_displaymessage(fd, "4096 Baby Rune Knight 4097 Baby Warlock 4098 Baby Ranger 4099 Baby Arch Bishop");
clif_displaymessage(fd, "4100 Baby Mechanic 4101 Baby Glt. Cross 4102 Baby Royal Guard 4103 Baby Sorcerer");
clif_displaymessage(fd, "4104 Baby Minstrel 4105 Baby Wanderer 4106 Baby Sura 4107 Baby Genetic");
clif_displaymessage(fd, "4108 Baby Shadow Chaser");
//clif_displaymessage(fd, "---- Modes And Others ----");
- //clif_displaymessage(fd, " 22 Wedding 26 Christmas 27 Summer 4048 Star Gladiator (Union)");
+ //clif_displaymessage(fd, " 22 Wedding 26 Christmas 27 Summer 4048 Star Gladiator (Union)");
return -1;
}
diff --git a/src/map/map.h b/src/map/map.h
index 1c749babe..660174055 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -85,7 +85,7 @@ enum {
MAPID_NINJA,
MAPID_XMAS,
MAPID_SUMMER,
- //MAPID_GANGSI,
+ MAPID_GANGSI,
//2-1 Jobs
MAPID_SUPER_NOVICE = JOBL_2_1|0x0,
MAPID_KNIGHT,
@@ -95,8 +95,8 @@ enum {
MAPID_BLACKSMITH,
MAPID_ASSASSIN,
MAPID_STAR_GLADIATOR,
- //MAPID_KAGEROUOBORO = JOBL_2_1|0x0A,
- //MAPID_DEATH_KNIGHT = JOBL_2_1|0x0D,
+ MAPID_KAGEROUOBORO = JOBL_2_1|0x0A,
+ MAPID_DEATH_KNIGHT = JOBL_2_1|0x0D,
//2-2 Jobs
MAPID_CRUSADER = JOBL_2_2|0x1,
MAPID_SAGE,
@@ -105,7 +105,7 @@ enum {
MAPID_ALCHEMIST,
MAPID_ROGUE,
MAPID_SOUL_LINKER,
- //MAPID_DARK_COLLECTOR = JOBL_2_2|0x0D,
+ MAPID_DARK_COLLECTOR = JOBL_2_2|0x0D,
//Trans Novice And Trans 1-1 Jobs
MAPID_NOVICE_HIGH = JOBL_UPPER|0x0,
MAPID_SWORDMAN_HIGH,
@@ -152,8 +152,8 @@ enum {
MAPID_BABY_ALCHEMIST,
MAPID_BABY_ROGUE,
//3-1 Jobs
- //MAPID_SUPER_NOVICE_E = JOBL_THIRD|JOBL_2_1|0x0,
- MAPID_RUNE_KNIGHT = JOBL_THIRD|JOBL_2_1|0x1,
+ MAPID_SUPER_NOVICE_E = JOBL_THIRD|JOBL_2_1|0x0,
+ MAPID_RUNE_KNIGHT,
MAPID_WARLOCK,
MAPID_RANGER,
MAPID_ARCH_BISHOP,
@@ -181,8 +181,8 @@ enum {
MAPID_GENETIC_T,
MAPID_SHADOW_CHASER_T,
//Baby 3-1 Jobs
- //MAPID_SUPER_BABY_E = JOBL_THIRD|JOBL_BABY|JOBL_2_1|0x0,
- MAPID_BABY_RUNE = JOBL_THIRD|JOBL_BABY|JOBL_2_1|0x1,
+ MAPID_SUPER_BABY_E = JOBL_THIRD|JOBL_BABY|JOBL_2_1|0x0,
+ MAPID_BABY_RUNE,
MAPID_BABY_WARLOCK,
MAPID_BABY_RANGER,
MAPID_BABY_BISHOP,
diff --git a/src/map/pc.c b/src/map/pc.c
index 5645cf4b2..8041fd79c 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4726,7 +4726,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_GANGSI: return MAPID_GANGSI;
+ case JOB_GANGSI: return MAPID_GANGSI;
//2-1 Jobs
case JOB_SUPER_NOVICE: return MAPID_SUPER_NOVICE;
case JOB_KNIGHT: return MAPID_KNIGHT;
@@ -4736,9 +4736,9 @@ int pc_jobid2mapid(unsigned short b_class)
case JOB_BLACKSMITH: return MAPID_BLACKSMITH;
case JOB_ASSASSIN: return MAPID_ASSASSIN;
case JOB_STAR_GLADIATOR: return MAPID_STAR_GLADIATOR;
- //case JOB_KAGEROU:
- //case JOB_OBORO: return MAPID_KAGEROUOBORO;
- //case JOB_DEATHKNIGHT: return MAPID_DEATHKNIGHT;
+ case JOB_KAGEROU:
+ case JOB_OBORO: return MAPID_KAGEROUOBORO;
+ case JOB_DEATH_KNIGHT: return MAPID_DEATH_KNIGHT;
//2-2 Jobs
case JOB_CRUSADER: return MAPID_CRUSADER;
case JOB_SAGE: return MAPID_SAGE;
@@ -4748,7 +4748,7 @@ int pc_jobid2mapid(unsigned short b_class)
case JOB_ALCHEMIST: return MAPID_ALCHEMIST;
case JOB_ROGUE: return MAPID_ROGUE;
case JOB_SOUL_LINKER: return MAPID_SOUL_LINKER;
- //case JOB_DARKCOLLECTOR: return MAPID_DARKCOLLECTOR;
+ case JOB_DARK_COLLECTOR: return MAPID_DARK_COLLECTOR;
//Trans Novice And Trans 1-1 Jobs
case JOB_NOVICE_HIGH: return MAPID_NOVICE_HIGH;
case JOB_SWORDMAN_HIGH: return MAPID_SWORDMAN_HIGH;
@@ -4797,7 +4797,7 @@ int pc_jobid2mapid(unsigned short b_class)
case JOB_BABY_ALCHEMIST: return MAPID_BABY_ALCHEMIST;
case JOB_BABY_ROGUE: return MAPID_BABY_ROGUE;
//3-1 Jobs
- //case JOB_SUPER_NOVICE_E: return MAPID_SUPER_NOVICE_E;
+ case JOB_SUPER_NOVICE_E: return MAPID_SUPER_NOVICE_E;
case JOB_RUNE_KNIGHT: return MAPID_RUNE_KNIGHT;
case JOB_WARLOCK: return MAPID_WARLOCK;
case JOB_RANGER: return MAPID_RANGER;
@@ -4828,7 +4828,7 @@ int pc_jobid2mapid(unsigned short b_class)
case JOB_GENETIC_T: return MAPID_GENETIC_T;
case JOB_SHADOW_CHASER_T: return MAPID_SHADOW_CHASER_T;
//Baby 3-1 Jobs
- //case JOB_SUPER_BABY_E: return MAPID_SUPER_BABY_E;
+ case JOB_SUPER_BABY_E: return MAPID_SUPER_BABY_E;
case JOB_BABY_RUNE: return MAPID_BABY_RUNE;
case JOB_BABY_WARLOCK: return MAPID_BABY_WARLOCK;
case JOB_BABY_RANGER: return MAPID_BABY_RANGER;
@@ -4867,7 +4867,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_GANGSI: return JOB_GANGSI;
+ case MAPID_GANGSI: return JOB_GANGSI;
//2-1 Jobs
case MAPID_SUPER_NOVICE: return JOB_SUPER_NOVICE;
case MAPID_KNIGHT: return JOB_KNIGHT;
@@ -4877,8 +4877,8 @@ int pc_mapid2jobid(unsigned short class_, int sex)
case MAPID_BLACKSMITH: return JOB_BLACKSMITH;
case MAPID_ASSASSIN: return JOB_ASSASSIN;
case MAPID_STAR_GLADIATOR: return JOB_STAR_GLADIATOR;
- //case MAPID_KAGEROUOBORO: return sex?JOB_KAGEROU:JOB_OBORO;
- //case MAPID_DEATHKNIGHT: return JOB_DEATHKNIGHT;
+ case MAPID_KAGEROUOBORO: return sex?JOB_KAGEROU:JOB_OBORO;
+ case MAPID_DEATH_KNIGHT: return JOB_DEATH_KNIGHT;
//2-2 Jobs
case MAPID_CRUSADER: return JOB_CRUSADER;
case MAPID_SAGE: return JOB_SAGE;
@@ -4887,7 +4887,7 @@ int pc_mapid2jobid(unsigned short class_, int sex)
case MAPID_ALCHEMIST: return JOB_ALCHEMIST;
case MAPID_ROGUE: return JOB_ROGUE;
case MAPID_SOUL_LINKER: return JOB_SOUL_LINKER;
- //case MAPID_DARKCOLLECTOR: return JOB_DARKCOLLECTOR;
+ case MAPID_DARK_COLLECTOR: return JOB_DARK_COLLECTOR;
//Trans Novice And Trans 2-1 Jobs
case MAPID_NOVICE_HIGH: return JOB_NOVICE_HIGH;
case MAPID_SWORDMAN_HIGH: return JOB_SWORDMAN_HIGH;
@@ -4934,7 +4934,7 @@ int pc_mapid2jobid(unsigned short class_, int sex)
case MAPID_BABY_ALCHEMIST: return JOB_BABY_ALCHEMIST;
case MAPID_BABY_ROGUE: return JOB_BABY_ROGUE;
//3-1 Jobs
- //case MAPID_SUPER_NOVICE_E: return JOB_SUPER_NOVICE_E;
+ case MAPID_SUPER_NOVICE_E: return JOB_SUPER_NOVICE_E;
case MAPID_RUNE_KNIGHT: return JOB_RUNE_KNIGHT;
case MAPID_WARLOCK: return JOB_WARLOCK;
case MAPID_RANGER: return JOB_RANGER;
@@ -4963,7 +4963,7 @@ int pc_mapid2jobid(unsigned short class_, int sex)
case MAPID_GENETIC_T: return JOB_GENETIC_T;
case MAPID_SHADOW_CHASER_T: return JOB_SHADOW_CHASER_T;
//Baby 3-1 Jobs
- //case MAPID_SUPER_BABY_E: return JOB_SUPER_BABY_E;
+ case MAPID_SUPER_BABY_E: return JOB_SUPER_BABY_E;
case MAPID_BABY_RUNE: return JOB_BABY_RUNE;
case MAPID_BABY_WARLOCK: return JOB_BABY_WARLOCK;
case MAPID_BABY_RANGER: return JOB_BABY_RANGER;
@@ -5105,10 +5105,10 @@ const char* job_name(int class_)
case JOB_SOUL_LINKER:
return msg_txt(618);
- //case JOB_GANGSI:
- //case JOB_DEATH_KNIGHT:
- //case JOB_DARK_COLLECTOR:
- // return msg_txt(622 - JOB_GANGSI+class_);
+ case JOB_GANGSI:
+ case JOB_DEATH_KNIGHT:
+ case JOB_DARK_COLLECTOR:
+ return msg_txt(622 - JOB_GANGSI+class_);
case JOB_RUNE_KNIGHT:
case JOB_WARLOCK:
@@ -5187,13 +5187,13 @@ const char* job_name(int class_)
case JOB_BABY_MECHANIC2:
return msg_txt(642);
- //case JOB_SUPER_NOVICE_E:
- //case JOB_SUPER_BABY_E:
- // return msg_txt(651 - JOB_SUPER_NOVICE_E+class_);
+ case JOB_SUPER_NOVICE_E:
+ case JOB_SUPER_BABY_E:
+ return msg_txt(651 - JOB_SUPER_NOVICE_E+class_);
- //case JOB_KAGEROU:
- //case JOB_OBORO:
- // return msg_txt(653 - JOB_KAGEROU+class_);
+ case JOB_KAGEROU:
+ case JOB_OBORO:
+ return msg_txt(653 - JOB_KAGEROU+class_);
default:
return msg_txt(655);
diff --git a/src/map/pc.h b/src/map/pc.h
index 9cd6f9525..ed6695a4f 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -474,8 +474,8 @@ struct map_session_data {
};
//Update this max as necessary. 55 is the value needed for Super Baby currently
-//Raised to 75 due to 3rds
-#define MAX_SKILL_TREE 75
+//Raised to 84 since Expanded Super Novice needs it.
+#define MAX_SKILL_TREE 84
//Total number of classes (for data storage)
#define CLASS_COUNT (JOB_MAX - JOB_NOVICE_HIGH + JOB_MAX_BASIC)
@@ -647,10 +647,12 @@ enum e_pc_permission {
//Checks if the given class value corresponds to a player class. [Skotlex]
#define pcdb_checkid(class_) \
( \
- ( (class_) >= JOB_NOVICE && (class_) < JOB_MAX_BASIC ) \
-|| ( (class_) >= JOB_NOVICE_HIGH && (class_) <= JOB_SOUL_LINKER ) \
-|| ( (class_) >= JOB_RUNE_KNIGHT && (class_) <= JOB_MECHANIC_T2 ) \
-|| ( (class_) >= JOB_BABY_RUNE && (class_) < JOB_MAX ) \
+ ( (class_) >= JOB_NOVICE && (class_) < JOB_MAX_BASIC ) \
+|| ( (class_) >= JOB_NOVICE_HIGH && (class_) <= JOB_DARK_COLLECTOR ) \
+|| ( (class_) >= JOB_RUNE_KNIGHT && (class_) <= JOB_MECHANIC_T2 ) \
+|| ( (class_) >= JOB_BABY_RUNE && (class_) <= JOB_BABY_MECHANIC2 ) \
+|| ( (class_) >= JOB_SUPER_NOVICE_E && (class_) <= JOB_SUPER_BABY_E ) \
+|| ( (class_) >= JOB_KAGEROU && (class_) < JOB_MAX ) \
)
// clientside atk display macros (values to the left/right of the "+")
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-02 06:57:32 +0000