diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-28 02:52:04 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-28 02:52:04 +0000 |
| commit | d6ae72f50152bf2a7df68ea0936aab1243d73bf8 (patch) | |
| tree | f3df918175d82854c98bfc57f76a119d62b9e456 /src/map/pc.c | |
| parent | 5f3c3eb78ea2995449f78709768976775ca7f3d6 (diff) | |
| download | hercules-d6ae72f50152bf2a7df68ea0936aab1243d73bf8.tar.gz hercules-d6ae72f50152bf2a7df68ea0936aab1243d73bf8.tar.bz2 hercules-d6ae72f50152bf2a7df68ea0936aab1243d73bf8.tar.xz hercules-d6ae72f50152bf2a7df68ea0936aab1243d73bf8.zip | |
* Implemented Summer Outfit care of Zephyrus_CR.
- Increased MAX_GUILDCASTLE in mmo.h to 29 for future implementation of the 12.1 Guild Castles.
* Added constants for Summer Outfit and updated the Summer_Event_Suit item script.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11321 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index aafc2260b..7a60b7232 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3777,6 +3777,9 @@ int pc_jobid2mapid(unsigned short b_class) case JOB_XMAS: class_ = MAPID_XMAS; break; + case JOB_SUMMER: + class_ = MAPID_SUMMER; + break; default: return -1; } @@ -3799,6 +3802,7 @@ int pc_mapid2jobid(unsigned short class_, int sex) case MAPID_GUNSLINGER: return JOB_GUNSLINGER; case MAPID_NINJA: return JOB_NINJA; case MAPID_XMAS: return JOB_XMAS; + case MAPID_SUMMER: return JOB_SUMMER; //2_1 classes case MAPID_SUPER_NOVICE: return JOB_SUPER_NOVICE; case MAPID_KNIGHT: return JOB_KNIGHT; @@ -3909,7 +3913,10 @@ char* job_name(int class_) case JOB_XMAS: return msg_txt(570 - JOB_WEDDING+class_); - + + case JOB_SUMMER: + return msg_txt(621); + case JOB_NOVICE_HIGH: case JOB_SWORDMAN_HIGH: case JOB_MAGE_HIGH: @@ -5758,6 +5765,11 @@ int pc_setoption(struct map_session_data *sd,int type) else if (!(type&OPTION_XMAS) && p_type&OPTION_XMAS) new_look = -1; + if (type&OPTION_SUMMER && !(p_type&OPTION_SUMMER)) + new_look = JOB_SUMMER; + else if (!(type&OPTION_SUMMER) && p_type&OPTION_SUMMER) + new_look = -1; + if (new_look < 0) { //Restore normal look. status_set_viewdata(&sd->bl, sd->status.class_); new_look = sd->vd.class_; @@ -7349,7 +7361,7 @@ int pc_readdb(void) fclose(fp); for (i = 0; i < MAX_PC_CLASS; i++) { if (!pcdb_checkid(i)) continue; - if (i == JOB_WEDDING || i == JOB_XMAS) + if (i == JOB_WEDDING || i == JOB_XMAS || i == JOB_SUMMER) continue; //Classes that do not need exp tables. if (!max_level[i][0]) ShowWarning("Class %s (%d) does not has a base exp table.\n", job_name(i), i); |