diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 25 | ||||
| -rw-r--r-- | src/map/battle.c | 8 | ||||
| -rw-r--r-- | src/map/battle.h | 4 | ||||
| -rw-r--r-- | src/map/charcommand.c | 22 | ||||
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 233 | ||||
| -rw-r--r-- | src/map/pc.h | 3 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
8 files changed, 127 insertions, 172 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 6d2d3cc2b..36ca4cfc3 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2676,12 +2676,12 @@ int atcommand_baselevelup( }
if (level > 0) {
- if (sd->status.base_level == battle_config.max_base_level) { /* check for max level by Valaris */
+ if (sd->status.base_level == pc_maxbaselv(sd)) { /* check for max level by Valaris */
clif_displaymessage(fd, msg_table[47]); /* Base level can't go any higher. */
return -1;
} /* End Addition */
- if ((unsigned int)level > battle_config.max_base_level || (unsigned int)level > (battle_config.max_base_level - sd->status.base_level)) // fix positiv overflow
- level = battle_config.max_base_level - sd->status.base_level;
+ if (level > pc_maxbaselv(sd) || level > (pc_maxbaselv(sd) - sd->status.base_level)) // fix positiv overflow
+ level = pc_maxbaselv(sd) - sd->status.base_level;
for (i = 1; i <= level; i++)
sd->status.status_point += (sd->status.base_level + i + 14) / 5;
sd->status.base_level += level;
@@ -2697,7 +2697,7 @@ int atcommand_baselevelup( clif_displaymessage(fd, msg_table[158]); /* Base level can't go any lower. */
return -1;
}
- if (level < -(int)battle_config.max_base_level || level < (1 - (int)sd->status.base_level)) /* fix negativ overflow */
+ if (level < -(int)pc_maxbaselv(sd) || level < (1 - (int)sd->status.base_level)) /* fix negativ overflow */
level = 1 - sd->status.base_level;
if (sd->status.status_point > 0) {
for (i = 0; i > level; i--)
@@ -2725,7 +2725,6 @@ int atcommand_joblevelup( const int fd, struct map_session_data* sd,
const char* command, const char* message)
{
- unsigned int up_level = battle_config.max_job_level;
int level=0;
nullpo_retr(-1, sd);
@@ -2735,21 +2734,13 @@ int atcommand_joblevelup( clif_displaymessage(fd, "Please, enter a level adjustement (usage: @joblvup/@jlevel/@joblvlup <number of levels>).");
return -1;
}
-
- if ((sd->class_&MAPID_UPPERMASK) == MAPID_NOVICE) //Novice
- up_level = 10;
- else if ((sd->class_&MAPID_BASEMASK) == MAPID_NOVICE) //S. Novice
- up_level = battle_config.max_sn_level;
- else if (sd->class_&JOBL_UPPER && sd->class_&JOBL_2)
- up_level = battle_config.max_adv_level; //2nd Adv Class
-
if (level > 0) {
- if (sd->status.job_level == up_level) {
+ if (sd->status.job_level == pc_maxjoblv(sd)) {
clif_displaymessage(fd, msg_table[23]); // Job level can't go any higher.
return -1;
}
- if ((unsigned int)level > up_level || (unsigned int)level > (up_level - sd->status.job_level)) // fix positiv overflow
- level = up_level - sd->status.job_level;
+ if (level > pc_maxjoblv(sd) || level > (pc_maxjoblv(sd) - sd->status.job_level)) // fix positiv overflow
+ level = pc_maxjoblv(sd) - sd->status.job_level;
sd->status.job_level += level;
clif_updatestatus(sd, SP_JOBLEVEL);
clif_updatestatus(sd, SP_NEXTJOBEXP);
@@ -2763,7 +2754,7 @@ int atcommand_joblevelup( clif_displaymessage(fd, msg_table[159]); // Job level can't go any lower.
return -1;
}
- if (level < -(int)up_level || level < (1 - (int)sd->status.job_level)) // fix negativ overflow
+ if (level < -(int)pc_maxjoblv(sd) || level < (1 - (int)sd->status.job_level)) // fix negativ overflow
level = 1 - sd->status.job_level;
sd->status.job_level += level;
clif_updatestatus(sd, SP_JOBLEVEL);
diff --git a/src/map/battle.c b/src/map/battle.c index e46fdf8ca..4bfee43f0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3708,10 +3708,6 @@ static const struct battle_data_short { { "item_drop_treasure_max", &battle_config.item_drop_treasure_max },
{ "prevent_logout", &battle_config.prevent_logout }, // Added by RoVeRT
{ "alchemist_summon_reward", &battle_config.alchemist_summon_reward }, // [Valaris]
- { "max_base_level", &battle_config.max_base_level }, // [Valaris]
- { "max_job_level", &battle_config.max_job_level },
- { "max_advanced_job_level", &battle_config.max_adv_level },
- { "max_super_novice_level", &battle_config.max_sn_level },
{ "drops_by_luk", &battle_config.drops_by_luk }, // [Valaris]
{ "drops_by_luk2", &battle_config.drops_by_luk2 }, // [Skotlex]
{ "equip_natural_break_rate", &battle_config.equip_natural_break_rate },
@@ -4097,10 +4093,6 @@ void battle_set_defaults() { battle_config.item_drop_treasure_min=1;
battle_config.item_drop_treasure_max=10000;
battle_config.prevent_logout = 10000; // Added by RoVeRT
- battle_config.max_base_level = 255; // Added by Valaris
- battle_config.max_job_level = 50;
- battle_config.max_adv_level = 70;
- battle_config.max_sn_level = 99;
battle_config.drops_by_luk = 0; // [Valaris]
battle_config.drops_by_luk2 = 0;
battle_config.equip_natural_break_rate = 1;
diff --git a/src/map/battle.h b/src/map/battle.h index 175aa49c4..947b59a82 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -292,10 +292,6 @@ extern struct Battle_Config { unsigned short prevent_logout; // Added by RoVeRT
unsigned short alchemist_summon_reward; // [Valaris]
- unsigned short max_base_level; //Max Base Level [Valaris]
- unsigned short max_job_level; //Max job level (normal classes) [Skotlex]
- unsigned short max_sn_level; //Max job level (super novice) [Skotlex]
- unsigned short max_adv_level; //Max job level (advanced classes) [Skotlex]
unsigned short drops_by_luk;
unsigned short drops_by_luk2;
unsigned short equip_natural_break_rate; //Base Natural break rate for attacks.
diff --git a/src/map/charcommand.c b/src/map/charcommand.c index e2c97b15f..216a6f450 100644 --- a/src/map/charcommand.c +++ b/src/map/charcommand.c @@ -1258,12 +1258,12 @@ int charcommand_baselevel( if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can change base level only lower or same gm level
if (level > 0) {
- if (pl_sd->status.base_level == battle_config.max_base_level) { // check for max level by Valaris
+ if (pl_sd->status.base_level == pc_maxbaselv(sd)) { // check for max level by Valaris
clif_displaymessage(fd, msg_table[91]); // Character's base level can't go any higher.
return 0;
} // End Addition
- if ((unsigned int)level > battle_config.max_base_level || (unsigned int)level > (battle_config.max_base_level - pl_sd->status.base_level)) // fix positiv overflow
- level = battle_config.max_base_level - pl_sd->status.base_level;
+ if (level > pc_maxbaselv(pl_sd) || level > (pc_maxbaselv(pl_sd)- pl_sd->status.base_level)) // fix positiv overflow
+ level = pc_maxbaselv(pl_sd) - pl_sd->status.base_level;
for (i = 1; i <= level; i++)
pl_sd->status.status_point += (pl_sd->status.base_level + i + 14) / 5;
pl_sd->status.base_level += level;
@@ -1279,7 +1279,7 @@ int charcommand_baselevel( clif_displaymessage(fd, msg_table[193]); // Character's base level can't go any lower.
return -1;
}
- if (level < -(int)battle_config.max_base_level || level < (1 - (int)pl_sd->status.base_level)) // fix negativ overflow
+ if (level < -(int)pc_maxbaselv(pl_sd) || level < (1 - (int)pl_sd->status.base_level)) // fix negativ overflow
level = 1 - pl_sd->status.base_level;
if (pl_sd->status.status_point > 0) {
for (i = 0; i > level; i--)
@@ -1316,7 +1316,6 @@ int charcommand_joblevel( const char* command, const char* message)
{
struct map_session_data *pl_sd;
- unsigned int max_level = battle_config.max_job_level;
char player[NAME_LENGTH];
int level = 0;
//転生や養子の場合の元の職業を算出する
@@ -1329,20 +1328,13 @@ int charcommand_joblevel( if ((pl_sd = map_nick2sd(player)) != NULL) {
if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can change job level only lower or same gm level
- if ((pl_sd->class_&MAPID_UPPERMASK) == MAPID_NOVICE)
- max_level = 10; //Novice
- else if ((pl_sd->class_&MAPID_BASEMASK) == MAPID_NOVICE)
- max_level = battle_config.max_sn_level; //S. Novice
- else if (pl_sd->class_&JOBL_UPPER && pl_sd->class_&JOBL_2)
- max_level = battle_config.max_adv_level; //Adv. Class
-
if (level > 0) {
- if (pl_sd->status.job_level == max_level) {
+ if (pl_sd->status.job_level == pc_maxjoblv(pl_sd)) {
clif_displaymessage(fd, msg_table[67]); // Character's job level can't go any higher.
return -1;
}
- if (pl_sd->status.job_level + level > max_level)
- level = max_level - pl_sd->status.job_level;
+ if (pl_sd->status.job_level + level > pc_maxjoblv(pl_sd))
+ level = pc_maxjoblv(pl_sd) - pl_sd->status.job_level;
pl_sd->status.job_level += level;
clif_updatestatus(pl_sd, SP_JOBLEVEL);
clif_updatestatus(pl_sd, SP_NEXTJOBEXP);
diff --git a/src/map/clif.c b/src/map/clif.c index d8195fb0a..7aafe9311 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8814,7 +8814,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) pc_checkskill(sd,SG_STAR_COMFORT))
status_calc_pc(sd,0);
- if (pc_checkskill(sd, SG_DEVIL) && sd->status.job_level >= battle_config.max_job_level)
+ if (pc_checkskill(sd, SG_DEVIL) && !pc_nextjobafter(sd))
clif_status_load(&sd->bl, SI_DEVIL, 1); //blindness [Komurka]
map_foreachinarea(clif_getareachar,sd->bl.m,sd->bl.x-AREA_SIZE,sd->bl.y-AREA_SIZE,sd->bl.x+AREA_SIZE,sd->bl.y+AREA_SIZE,BL_ALL,sd);
diff --git a/src/map/pc.c b/src/map/pc.c index afafbe4c8..3f0181118 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -41,7 +41,8 @@ #endif
#define PVP_CALCRANK_INTERVAL 1000 // PVP順位計算の間隔
-static int exp_table[14][MAX_LEVEL];
+static int exp_table[MAX_PC_CLASS][2][MAX_LEVEL];
+static int max_level[MAX_PC_CLASS][2];
static short statp[MAX_LEVEL];
// h-files are for declarations, not for implementations... [Shinomori]
@@ -4642,7 +4643,7 @@ int pc_checkjoblevelup(struct map_session_data *sd) status_calc_pc(sd,0);
clif_misceffect(&sd->bl,1);
- if (pc_checkskill(sd, SG_DEVIL) && sd->status.job_level >= battle_config.max_job_level)
+ if (pc_checkskill(sd, SG_DEVIL) && !pc_nextjobafter(sd))
clif_status_change(&sd->bl,SI_DEVIL, 1); //Permanent blind effect from SG_DEVIL.
if (script_config.event_script_type == 0) {
@@ -4728,28 +4729,30 @@ int pc_gainexp(struct map_session_data *sd,int base_exp,int job_exp) }
/*==========================================
+ * Returns max level for this character.
+ *------------------------------------------
+ */
+
+int pc_maxbaselv(struct map_session_data *sd) {
+ return max_level[sd->status.class_][0];
+};
+
+int pc_maxjoblv(struct map_session_data *sd) {
+ return max_level[sd->status.class_][1];
+};
+
+/*==========================================
* base level側必要??値計算
*------------------------------------------
*/
int pc_nextbaseexp(struct map_session_data *sd)
{
- int i =0;
-
nullpo_retr(0, sd);
- if(sd->status.base_level>=MAX_LEVEL || sd->status.base_level<=0)
+ if(sd->status.base_level>=pc_maxbaselv(sd) || sd->status.base_level<=0)
return 0;
- i = (sd->class_&JOBL_UPPER)?4:0; //4 is the base for upper, 0 for normal/baby ones.
-
- if ((sd->class_&MAPID_UPPERMASK) == MAPID_NOVICE)
- ; //Add 0, it's novice.
- else if ((sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE)
- i = 3; //Super Novice/Super Baby
- else
- i+= (sd->class_&JOBL_2)?2:1; //Add 2 for second classes, add 1 for first classes.
-
- return exp_table[i][sd->status.base_level-1];
+ return exp_table[sd->status.class_][0][sd->status.base_level-1];
}
/*==========================================
@@ -4758,27 +4761,11 @@ int pc_nextbaseexp(struct map_session_data *sd) */
int pc_nextjobexp(struct map_session_data *sd)
{
- int i;
-
nullpo_retr(0, sd);
- if(sd->status.job_level>=MAX_LEVEL || sd->status.job_level<=0)
+ if(sd->status.job_level>=pc_maxjoblv(sd) || sd->status.job_level<=0)
return 0;
-
- i = (sd->class_&JOBL_UPPER)?11:7; //11 is the base for upper, 7 for normal/baby ones.
-
- if ((sd->class_&MAPID_UPPERMASK) == MAPID_NOVICE)
- ; //Add 0, it's novice.
- else if ((sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE)
- i = 10; //Super Novice/Super Baby
- else if ((sd->class_&MAPID_UPPERMASK) == MAPID_STAR_GLADIATOR) {
- i = 13; //Star Gladiator - slow JExp (as for 2nd class)
- if (sd->status.job_level >= battle_config.max_job_level)
- return 0; //Since SG aren't really an advanced class... [Skotlex]
- } else
- i+= (sd->class_&JOBL_2)?2:1; //Add 2 for second classes, add 1 for first classes.
-
- return exp_table[i][sd->status.job_level-1];
+ return exp_table[sd->status.class_][1][sd->status.job_level-1];
}
/*==========================================
@@ -4787,23 +4774,12 @@ int pc_nextjobexp(struct map_session_data *sd) */
int pc_nextbaseafter(struct map_session_data *sd)
{
- int i;
-
nullpo_retr(0, sd);
- if(sd->status.base_level>=MAX_LEVEL || sd->status.base_level<=0)
+ if(sd->status.base_level>=pc_maxbaselv(sd) || sd->status.base_level<=0)
return 0;
- i = (sd->class_&JOBL_UPPER)?4:0; //4 is the base for upper, 0 for normal/baby ones.
-
- if ((sd->class_&MAPID_UPPERMASK) == MAPID_NOVICE)
- ; //Add 0, it's novice.
- else if ((sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE)
- i = 3; //Super Novice/Super Baby
- else
- i+= (sd->class_&JOBL_2)?2:1; //Add 2 for second classes, add 1 for first classes.
-
- return exp_table[i][sd->status.base_level];
+ return exp_table[sd->status.class_][0][sd->status.base_level];
}
/*==========================================
@@ -4812,27 +4788,12 @@ int pc_nextbaseafter(struct map_session_data *sd) */
int pc_nextjobafter(struct map_session_data *sd)
{
- int i;
-
nullpo_retr(0, sd);
- if(sd->status.job_level>=MAX_LEVEL || sd->status.job_level<=0)
+ if(sd->status.job_level>=pc_maxjoblv(sd) || sd->status.job_level<=0)
return 0;
- i = (sd->class_&JOBL_UPPER)?11:7; //11 is the base for upper, 7 for normal/baby ones.
-
- if ((sd->class_&MAPID_UPPERMASK) == MAPID_NOVICE)
- ; //Add 0, it's novice.
- else if ((sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE)
- i = 10; //Super Novice/Super Baby
- else if ((sd->class_&MAPID_UPPERMASK) == MAPID_STAR_GLADIATOR) {
- i = 13; //Star Gladiator - slow JExp (as for 2nd class)
- if (sd->status.job_level >= battle_config.max_job_level)
- return 0; //Since SG aren't really an advanced class... [Skotlex]
- } else
- i+= (sd->class_&JOBL_2)?2:1; //Add 2 for second classes, add 1 for first classes.
-
- return exp_table[i][sd->status.job_level];
+ return exp_table[sd->status.class_][1][sd->status.job_level];
}
/*==========================================
@@ -5236,7 +5197,7 @@ int pc_resetskill(struct map_session_data* sd) int i, skill, inf2;
nullpo_retr(0, sd);
- if (pc_checkskill(sd, SG_DEVIL) && sd->status.job_level >= battle_config.max_job_level)
+ if (pc_checkskill(sd, SG_DEVIL) && !pc_nextjobafter(sd))
clif_status_load(&sd->bl, SI_DEVIL, 0); //Remove perma blindness due to skill-reset. [Skotlex]
for (i = 1; i < MAX_SKILL; i++) {
@@ -5553,7 +5514,8 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) mob_changestate(md,MS_WALK,0);
}
if(battle_config.mobs_level_up && md && md->state.state!=MS_DEAD &&
- md->level < battle_config.max_base_level && !md->guardian_data // Guardians should not level. [Skotlex]
+ md->level < pc_maxbaselv(sd) &&
+ !md->guardian_data // Guardians should not level. [Skotlex]
) { // monster level up [Valaris]
clif_misceffect(&md->bl,0);
md->level++;
@@ -5786,14 +5748,14 @@ int pc_readparam(struct map_session_data *sd,int type) */
int pc_setparam(struct map_session_data *sd,int type,int val)
{
- int i = 0,up_level = battle_config.max_job_level;
+ int i = 0;
nullpo_retr(0, sd);
switch(type){
case SP_BASELEVEL:
- if ((val+ sd->status.base_level) > battle_config.max_base_level) //Capping to max
- val = battle_config.max_base_level - sd->status.base_level;
+ if ((val+ sd->status.base_level) > pc_maxbaselv(sd)) //Capping to max
+ val = pc_maxbaselv(sd) - sd->status.base_level;
if (val > (int)sd->status.base_level) {
for (i = 1; i <= (val - (int)sd->status.base_level); i++)
sd->status.status_point += (sd->status.base_level + i + 14) / 5 ;
@@ -5808,14 +5770,8 @@ int pc_setparam(struct map_session_data *sd,int type,int val) pc_heal(sd, sd->status.max_hp, sd->status.max_sp);
break;
case SP_JOBLEVEL:
- if ((sd->class_&MAPID_UPPERMASK) == MAPID_NOVICE)
- up_level = 10; //Novice & Baby Novice have 10 Job Levels only
- else if ((sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE) //Super Novice & Super Baby can go up to 99
- up_level = battle_config.max_sn_level;
- else if (sd->class_&JOBL_UPPER && sd->class_&JOBL_2) //3rd Job has 70 Job Levels
- up_level = battle_config.max_adv_level;
if (val >= (int)sd->status.job_level) {
- if (val > up_level) val = up_level;
+ if (val > pc_maxjoblv(sd)) val = pc_maxjoblv(sd);
sd->status.skill_point += (val-sd->status.job_level);
sd->status.job_level = val;
sd->status.job_exp = 0;
@@ -8049,6 +8005,35 @@ void pc_setstand(struct map_session_data *sd){ sd->state.dead_sit = 0;
}
+int pc_split_str(char *str,char **val,int num)
+{
+ int i;
+
+ for (i=0; i<num && str; i++){
+ val[i] = str;
+ str = strchr(str,',');
+ if (str && i<num-1) //Do not remove a trailing comma.
+ *str++=0;
+ }
+ return i;
+}
+
+int pc_split_atoi(char *str,int *val, char sep, int max)
+{
+ int i,j;
+ for (i=0; i<max; i++) {
+ if (!str) break;
+ val[i] = atoi(str);
+ str = strchr(str,sep);
+ if (str)
+ *str++=0;
+ }
+ //Zero up the remaining.
+ for(j=i; j < max; j++)
+ val[j] = 0;
+ return i;
+}
+
//
// 初期化物
//
@@ -8067,70 +8052,66 @@ int pc_readdb(void) {
int i,j,k;
FILE *fp;
- char line[1024],*p;
+ char line[16000],*p;
// 必要??値?み?み
memset(exp_table,0,sizeof(exp_table));
+ memset(max_level,0,sizeof(max_level));
sprintf(line, "%s/exp.txt", db_path);
fp=fopen(line, "r");
if(fp==NULL){
ShowError("can't read %s\n", line);
return 1;
}
- i=0;
while(fgets(line, sizeof(line)-1, fp)){
- int bn,b1,b2,b3,b4,b5,b6,jn,j1,j2,j3,j4,j5,j6;
+ int jobs[MAX_PC_CLASS], job_count, job;
+ int type, max;
+ char *split[3];
if(line[0]=='/' && line[1]=='/')
continue;
- if(sscanf(line,"%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",&bn,&b1,&b2,&b3,&b4,&b5,&b6,&jn,&j1,&j2,&j3,&j4,&j5,&j6)!=14)
+ if (pc_split_str(line,split,4) < 4)
continue;
- exp_table[0][i]=bn;
- exp_table[1][i]=b1;
- exp_table[2][i]=b2;
- exp_table[3][i]=b3;
- exp_table[4][i]=b4;
- exp_table[5][i]=b5;
- exp_table[6][i]=b6;
- exp_table[7][i]=jn;
- exp_table[8][i]=j1;
- exp_table[9][i]=j2;
- exp_table[10][i]=j3;
- exp_table[11][i]=j4;
- exp_table[12][i]=j5;
- exp_table[13][i]=j6;
- i++;
- }
- if (i > battle_config.max_base_level)
- { //Empty Base level columns
- for (j = battle_config.max_base_level-1; j < i && exp_table[0][j]>0; j++)
- {
- exp_table[0][j]=0;
- exp_table[1][j]=0;
- exp_table[2][j]=0;
- exp_table[3][j]=0;
- exp_table[4][j]=0;
- exp_table[5][j]=0;
- exp_table[6][j]=0;
- }
- }
- if (i > battle_config.max_sn_level)
- { //Empty SN job exp columns
- for (j = battle_config.max_sn_level-1; j < i && exp_table[10][j]>0; j++)
- exp_table[10][j]=0;
- }
- if (i > battle_config.max_adv_level)
- { //Empty Adv Jobs columns
- for (j = battle_config.max_adv_level-1; j < i && exp_table[13][j]>0; j++)
- exp_table[13][j]=0;
- }
- if (i > battle_config.max_job_level)
- { //Empty normal Job columns
- for (j = battle_config.max_job_level-1; j < i &&
- (exp_table[8][j]>0 || exp_table[9][j]>0 || exp_table[12][j]>0); j++)
- {
- exp_table[8][j]=0; //1st Job
- exp_table[9][j]=0; //2nd Job
- exp_table[12][j]=0; //Adv 1st Job
+
+ job_count = pc_split_atoi(split[1],jobs,':',MAX_PC_CLASS);
+ if (job_count < 1)
+ continue;
+ job = jobs[0];
+ if (!pcdb_checkid(job)) {
+ ShowError("pc_readdb: Invalid job ID %d.\n", job);
+ continue;
+ }
+ type = atoi(split[2]);
+ if (type < 0 || type > 1) {
+ ShowError("pc_readdb: Invalid type %d (must be 0 for base levels, 1 for job levels).\n", type);
+ continue;
+ }
+ max = atoi(split[0]);
+ if (max > MAX_LEVEL) {
+ ShowWarning("pc_readdb: Specified max level %d for job %d is beyond server's limit (%d).\n ", max, job, MAX_LEVEL);
+ max = MAX_LEVEL;
+ }
+ //We send one less and then one more because the last entry in the exp array should hold 0.
+ max_level[job][type] = pc_split_atoi(split[3], exp_table[job][type],',',max-1)+1;
+ //Reverse check in case the array has a bunch of trailing zeros... [Skotlex]
+ //The reasoning behind the -2 is this... if the max level is 5, then the array
+ //should look like this:
+ //0: x, 1: x, 2: x: 3: x 4: 0 <- last valid value is at 3.
+ while ((i = max_level[job][type]-2) >= 0 && exp_table[job][type][i] <= 0)
+ max_level[job][type]--;
+
+ if (max_level[job][type] < max) {
+ ShowError("pc_readdb: Specified max %d for job %d, but that job's exp table only goes up to level %d.\n", max, job, max_level[job][type]);
+ }
+// ShowDebug("%s - Class %d: %d\n", type?"Job":"Base", job, max_level[job][type]);
+ for (i = 1; i < job_count; i++) {
+ job = jobs[i];
+ if (!pcdb_checkid(job)) {
+ ShowError("pc_readdb: Invalid job ID %d.\n", job);
+ continue;
+ }
+ memcpy(exp_table[job][type], exp_table[jobs[0]][type], sizeof(exp_table[0][0]));
+ max_level[job][type] = max_level[jobs[0]][type];
+// ShowDebug("%s - Class %d: %d\n", type?"Job":"Base", job, max_level[job][type]);
}
}
fclose(fp);
diff --git a/src/map/pc.h b/src/map/pc.h index e7a9c85c5..b05323100 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -116,6 +116,9 @@ int pc_stopattack(struct map_session_data*); int pc_follow(struct map_session_data*, int); // [MouseJstr]
int pc_stop_following(struct map_session_data*);
+
+int pc_maxbaselv(struct map_session_data *sd);
+int pc_maxjoblv(struct map_session_data *sd);
int pc_checkbaselevelup(struct map_session_data *sd);
int pc_checkjoblevelup(struct map_session_data *sd);
int pc_gainexp(struct map_session_data*,int,int);
diff --git a/src/map/status.c b/src/map/status.c index 53e6009e9..88e13fedf 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1624,7 +1624,7 @@ int status_calc_pc(struct map_session_data* sd,int first) // Relative modifiers from passive skills
if((skill=pc_checkskill(sd,SA_ADVANCEDBOOK))>0)
sd->aspd_rate -= (skill/2);
- if((skill = pc_checkskill(sd,SG_DEVIL)) > 0 && sd->status.job_level >= battle_config.max_job_level)
+ if((skill = pc_checkskill(sd,SG_DEVIL)) > 0 && !pc_nextjobafter(sd))
sd->aspd_rate -= (skill*3);
if(pc_isriding(sd))
|