diff options
| author | shennetsind <ind@henn.et> | 2013-09-28 12:49:51 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-28 12:49:51 -0300 |
| commit | 8bed1531de1deceae20e09bc2d59470f586a94f6 (patch) | |
| tree | 5909c98606ebb26a70c15e16b6a26c8cac081088 /src/map/pc.c | |
| parent | e4b0f270ad0fabab869c1a803fa8e4a73f198760 (diff) | |
| parent | f8f073bc7ebd1bc5cf19e8ea9b72a54bba7fab8b (diff) | |
| download | hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.gz hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.bz2 hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.xz hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index e89ecb80a..1a5efe48a 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5207,6 +5207,7 @@ int pc_jobid2mapid(unsigned short b_class) case JOB_STAR_GLADIATOR: return MAPID_STAR_GLADIATOR; case JOB_KAGEROU: case JOB_OBORO: return MAPID_KAGEROUOBORO; + case JOB_REBELLION: return MAPID_REBELLION; case JOB_DEATH_KNIGHT: return MAPID_DEATH_KNIGHT; //2-2 Jobs case JOB_CRUSADER: return MAPID_CRUSADER; @@ -5347,6 +5348,7 @@ int pc_mapid2jobid(unsigned short class_, int sex) 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_REBELLION: return JOB_REBELLION; case MAPID_DEATH_KNIGHT: return JOB_DEATH_KNIGHT; //2-2 Jobs case MAPID_CRUSADER: return JOB_CRUSADER; @@ -5663,6 +5665,8 @@ const char* job_name(int class_) case JOB_KAGEROU: case JOB_OBORO: return msg_txt(653 - JOB_KAGEROU+class_); + case JOB_REBELLION: + return msg_txt(694); default: return msg_txt(655); @@ -9711,6 +9715,7 @@ void pc_read_skill_tree(void) { { "Expanded_Super_Baby", JOB_SUPER_BABY_E }, { "Kagerou", JOB_KAGEROU }, { "Oboro", JOB_OBORO }, + { "Rebellion", JOB_REBELLION }, }; if (conf_read_file(&skill_tree_conf, config_filename)) { |