diff options
| author | shennetsind <notind@gmail.com> | 2013-09-28 04:23:56 -0700 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-09-28 04:23:56 -0700 |
| commit | 71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce (patch) | |
| tree | 2c46f0a5ac28f67931433de0f3b18dd0aa6e7d73 /src/map/pc.c | |
| parent | 346ea5f138e5baee36cf1e986c12fff84277f4ca (diff) | |
| parent | 7d8f83d8ff360df4c2b960933c015117eb9d776b (diff) | |
| download | hercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.tar.gz hercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.tar.bz2 hercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.tar.xz hercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.zip | |
Merge pull request #161 from shenhuyong/master
Added full support for the Rebellion.
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 d11eb7e75..393caa627 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)) { |