summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-26 21:42:04 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-26 21:42:04 +0000
commit19c0056b1af3fcc80e3f402e92ca605d4228873e (patch)
tree5e00d2ce197211063a0fb14ee5ad166447be5c0e /src
parent66b2cadb9bcb6ad125cb18cdbea903a63ad0d925 (diff)
downloadhercules-19c0056b1af3fcc80e3f402e92ca605d4228873e.tar.gz
hercules-19c0056b1af3fcc80e3f402e92ca605d4228873e.tar.bz2
hercules-19c0056b1af3fcc80e3f402e92ca605d4228873e.tar.xz
hercules-19c0056b1af3fcc80e3f402e92ca605d4228873e.zip
- Fixed the normalizing function not sending first classes back to novice if they do not have basic skill maxed.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9719 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/pc.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index f1dd19df4..9761ad811 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1081,14 +1081,17 @@ int pc_calc_skilltree_normalize_job(struct map_session_data *sd) {
int skill_point;
int c = sd->class_;
- if (!battle_config.skillup_limit || !(sd->class_&JOBL_2) || (sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE)
- return c; //Only Normalize non-first classes (and non-super novice)
+ if (!battle_config.skillup_limit)
+ return c;
skill_point = pc_calc_skillpoint(sd);
if(pc_checkskill(sd, NV_BASIC) < 9) //Consider Novice Tree when you don't have NV_BASIC maxed.
c = MAPID_NOVICE;
- else if (sd->status.skill_point >= (int)sd->status.job_level
- && ((sd->change_level > 0 && skill_point < sd->change_level+8) || skill_point < 58)) {
+ else
+ //Do not send S. Novices to first class (Novice)
+ if ((sd->class_&JOBL_2) && (sd->class_&MAPID_UPPERMASK) != MAPID_SUPER_NOVICE &&
+ sd->status.skill_point >= (int)sd->status.job_level &&
+ ((sd->change_level > 0 && skill_point < sd->change_level+8) || skill_point < 58)) {
//Send it to first class.
c &= MAPID_BASEMASK;
}