* Updated maximum levels for supernovice to 99

* Updated supernovice jobexp table
* Corrected maximum job level checking in @joblvup and @charjob

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@586 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog.txt

@@ -1,5 +1,8 @@
 Date	Added
 12/16
+        * Updated maximum levels for supernovice to 99 [celest]
+        * Updated supernovice jobexp table - should be same from 50 onwards [celest]
+        * Corrected maximum job level checking in @joblvup and @charjob [celest]
         * Added the new spell scrolls, thanks to Landarma [celest]
         * Corrected a few skills, thanks to orn [celest]
         * Corrected Extremity Fist to not require Explosion Spirits when being used

db/exp.txt

@@ -47,53 +47,53 @@
 69892,69892,69892,69892,118816,118816,118816,0,409795,1557657,409795,0,1024488,4672971
 75973,75973,75973,75973,129154,129154,129154,0,482092,1990632,482092,0,1205230,5971896
 102468,102468,102468,102468,174196,174196,174196,0,509596,2083386,509596,0,1273990,6250158
-115254,115254,115254,115254,213220,213220,213220,0,0,0,982092,0,0,6875174
-128692,128692,128692,128692,238080,238080,238080,0,0,0,992092,0,0,7562691
-142784,142784,142784,142784,264150,264150,264150,0,0,0,1002092,0,0,8318960
-157528,157528,157528,157528,291427,291427,291427,0,0,0,1012092,0,0,9150856
-178184,178184,178184,178184,329640,329640,329640,0,0,0,1022092,0,0,10065942
-196300,196300,196300,196300,363155,363155,363155,0,0,0,1032092,0,0,11877812
-215198,215198,215198,215198,398116,398116,398116,0,0,0,1042092,0,0,14015818
-234879,234879,234879,234879,434526,434526,434526,0,0,0,1052092,0,0,16538655
-255341,255341,255341,255341,472381,472381,472381,0,0,0,1062092,0,0,19515624
-330188,330188,330188,330188,610848,610848,610848,0,0,0,1072092,0,0,23028437
-365914,365914,365914,365914,731828,731828,731828,0,0,0,1082092,0,0,28094693
-403224,403224,403224,403224,806448,806448,806448,0,0,0,1092092,0,0,34275525
-442116,442116,442116,442116,884232,884232,884232,0,0,0,1102092,0,0,41816141
-482590,482590,482590,482590,965180,965180,965180,0,0,0,1112092,0,0,51015692
-536948,536948,536948,536948,1073896,1073896,1073896,0,0,0,1122092,0,0,62239144
-585191,585191,585191,585191,1170382,1170382,1170382,0,0,0,1132092,0,0,79666104
-635278,635278,635278,635278,1270556,1270556,1270556,0,0,0,1142092,0,0,101972614
-687211,687211,687211,687211,1374422,1374422,1374422,0,0,0,1152092,0,0,130524946
-740988,740988,740988,740988,1481976,1481976,1481976,0,0,0,1162092,0,0,167071930
-925400,925400,925400,925400,1850800,1850800,1850800,0,0,0,1172092,0,0,213852071
-1473746,1473746,1473746,1473746,3389616,3389616,3389616,0,0,0,0,0,0,0
-1594058,1594058,1594058,1594058,3666333,3666333,3666333,0,0,0,0,0,0,0
-1718928,1718928,1718928,1718928,3953534,3953534,3953534,0,0,0,0,0,0,0
-1848355,1848355,1848355,1848355,4251217,4251217,4251217,0,0,0,0,0,0,0
-1982340,1982340,1982340,1982340,4559382,4559382,4559382,0,0,0,0,0,0,0
-2230113,2230113,2230113,2230113,5129260,5129260,5129260,0,0,0,0,0,0,0
-2386162,2386162,2386162,2386162,5488173,5488173,5488173,0,0,0,0,0,0,0
-2547417,2547417,2547417,2547417,5859059,5859059,5859059,0,0,0,0,0,0,0
-2713878,2713878,2713878,2713878,6241919,6241919,6241919,0,0,0,0,0,0,0
-3206160,3206160,3206160,3206160,7374168,7374168,7374168,0,0,0,0,0,0,0
-3681024,3681024,3681024,3681024,9570662,9570662,9570662,0,0,0,0,0,0,0
-4022472,4022472,4022472,4022472,10458427,10458427,10458427,0,0,0,0,0,0,0
-4377024,4377024,4377024,4377024,11380262,11380262,11380262,0,0,0,0,0,0,0
-4744680,4744680,4744680,4744680,12336168,12336168,12336168,0,0,0,0,0,0,0
-5125440,5125440,5125440,5125440,13326144,13326144,13326144,0,0,0,0,0,0,0
-5767272,5767272,5767272,5767272,14994907,14994907,14994907,0,0,0,0,0,0,0
-6204000,6204000,6204000,6204000,16130400,16130400,16130400,0,0,0,0,0,0,0
-6655464,6655464,6655464,6655464,17304200,17304200,17304200,0,0,0,0,0,0,0
-7121664,7121664,7121664,7121664,18516326,18516326,18516326,0,0,0,0,0,0,0
-7602600,7602600,7602600,7602600,19766760,19766760,19766760,0,0,0,0,0,0,0
-9738720,9738720,9738720,9738720,29216160,29216160,29216160,0,0,0,0,0,0,0
-11649960,11649960,11649960,11649960,34949880,34949880,34949880,0,0,0,0,0,0,0
-13643520,13643520,13643520,13643520,40930560,40930560,40930560,0,0,0,0,0,0,0
-18339300,18339300,18339300,18339300,55017900,55017900,55017900,0,0,0,0,0,0,0
-23836800,23836800,23836800,23836800,71510400,71510400,71510400,0,0,0,0,0,0,0
-35658000,35658000,35658000,35658000,106974000,106974000,106974000,0,0,0,0,0,0,0
-48687000,48687000,48687000,48687000,146061000,146061000,146061000,0,0,0,0,0,0,0
-58135000,58135000,58135000,58135000,174405000,174405000,174405000,0,0,0,0,0,0,0
-99999999,99999999,99999999,99999999,343210000,343210000,343210000,0,0,0,0,0,0,0
+115254,115254,115254,115254,213220,213220,213220,0,0,0,509596,0,0,6875174
+128692,128692,128692,128692,238080,238080,238080,0,0,0,509596,0,0,7562691
+142784,142784,142784,142784,264150,264150,264150,0,0,0,509596,0,0,8318960
+157528,157528,157528,157528,291427,291427,291427,0,0,0,509596,0,0,9150856
+178184,178184,178184,178184,329640,329640,329640,0,0,0,509596,0,0,10065942
+196300,196300,196300,196300,363155,363155,363155,0,0,0,509596,0,0,11877812
+215198,215198,215198,215198,398116,398116,398116,0,0,0,509596,0,0,14015818
+234879,234879,234879,234879,434526,434526,434526,0,0,0,509596,0,0,16538655
+255341,255341,255341,255341,472381,472381,472381,0,0,0,509596,0,0,19515624
+330188,330188,330188,330188,610848,610848,610848,0,0,0,509596,0,0,23028437
+365914,365914,365914,365914,731828,731828,731828,0,0,0,509596,0,0,28094693
+403224,403224,403224,403224,806448,806448,806448,0,0,0,509596,0,0,34275525
+442116,442116,442116,442116,884232,884232,884232,0,0,0,509596,0,0,41816141
+482590,482590,482590,482590,965180,965180,965180,0,0,0,509596,0,0,51015692
+536948,536948,536948,536948,1073896,1073896,1073896,0,0,0,509596,0,0,62239144
+585191,585191,585191,585191,1170382,1170382,1170382,0,0,0,509596,0,0,79666104
+635278,635278,635278,635278,1270556,1270556,1270556,0,0,0,509596,0,0,101972614
+687211,687211,687211,687211,1374422,1374422,1374422,0,0,0,509596,0,0,130524946
+740988,740988,740988,740988,1481976,1481976,1481976,0,0,0,509596,0,0,167071930
+925400,925400,925400,925400,1850800,1850800,1850800,0,0,0,509596,0,0,213852071
+1473746,1473746,1473746,1473746,3389616,3389616,3389616,0,0,0,509596,0,0,0
+1594058,1594058,1594058,1594058,3666333,3666333,3666333,0,0,0,509596,0,0,0
+1718928,1718928,1718928,1718928,3953534,3953534,3953534,0,0,0,509596,0,0,0
+1848355,1848355,1848355,1848355,4251217,4251217,4251217,0,0,0,509596,0,0,0
+1982340,1982340,1982340,1982340,4559382,4559382,4559382,0,0,0,509596,0,0,0
+2230113,2230113,2230113,2230113,5129260,5129260,5129260,0,0,0,509596,0,0,0
+2386162,2386162,2386162,2386162,5488173,5488173,5488173,0,0,0,509596,0,0,0
+2547417,2547417,2547417,2547417,5859059,5859059,5859059,0,0,0,509596,0,0,0
+2713878,2713878,2713878,2713878,6241919,6241919,6241919,0,0,0,509596,0,0,0
+3206160,3206160,3206160,3206160,7374168,7374168,7374168,0,0,0,509596,0,0,0
+3681024,3681024,3681024,3681024,9570662,9570662,9570662,0,0,0,509596,0,0,0
+4022472,4022472,4022472,4022472,10458427,10458427,10458427,0,0,0,509596,0,0,0
+4377024,4377024,4377024,4377024,11380262,11380262,11380262,0,0,0,509596,0,0,0
+4744680,4744680,4744680,4744680,12336168,12336168,12336168,0,0,0,509596,0,0,0
+5125440,5125440,5125440,5125440,13326144,13326144,13326144,0,0,0,509596,0,0,0
+5767272,5767272,5767272,5767272,14994907,14994907,14994907,0,0,0,509596,0,0,0
+6204000,6204000,6204000,6204000,16130400,16130400,16130400,0,0,0,509596,0,0,0
+6655464,6655464,6655464,6655464,17304200,17304200,17304200,0,0,0,509596,0,0,0
+7121664,7121664,7121664,7121664,18516326,18516326,18516326,0,0,0,509596,0,0,0
+7602600,7602600,7602600,7602600,19766760,19766760,19766760,0,0,0,509596,0,0,0
+9738720,9738720,9738720,9738720,29216160,29216160,29216160,0,0,0,509596,0,0,0
+11649960,11649960,11649960,11649960,34949880,34949880,34949880,0,0,0,509596,0,0,0
+13643520,13643520,13643520,13643520,40930560,40930560,40930560,0,0,0,509596,0,0,0
+18339300,18339300,18339300,18339300,55017900,55017900,55017900,0,0,0,509596,0,0,0
+23836800,23836800,23836800,23836800,71510400,71510400,71510400,0,0,0,509596,0,0,0
+35658000,35658000,35658000,35658000,106974000,106974000,106974000,0,0,0,509596,0,0,0
+48687000,48687000,48687000,48687000,146061000,146061000,146061000,0,0,0,509596,0,0,0
+58135000,58135000,58135000,58135000,174405000,174405000,174405000,0,0,0,509596,0,0,0
+99999999,99999999,99999999,99999999,343210000,343210000,343210000,0,0,0,509596,0,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0

src/map/atcommand.c

@@ -2474,16 +2474,21 @@ int atcommand_joblevelup(
 	const char* command, const char* message)
 {
 	int up_level = 50, level;
+	struct pc_base_job s_class;
 	nullpo_retr(-1, sd);
+	s_class = pc_calc_base_job(sd->status.class);
 
 	if (!message || !*message || (level = atoi(message)) == 0) {
 		clif_displaymessage(fd, "Please, enter a level adjustement (usage: @joblvup/@jlevel/@joblvlup <number of levels>).");
 		return -1;
 	}
 
-	if (sd->status.class == 0 || sd->status.class == 4001)
+	if (s_class.job == 0)
 		up_level -= 40;
-	else if ((sd->status.class > 4007 && sd->status.class < 4024) || sd->status.class == 23)
+	// super novices can go up to 99 [celest]
+	else if (s_class.job == 23)
+		up_level += 49;
+	else if (sd->status.class > 4007 && sd->status.class < 4023)
 		up_level += 20;
 
 	if (level > 0) {
@@ -4711,8 +4716,10 @@ int atcommand_character_joblevel(
 		if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can change job level only lower or same gm level
 			if (pl_s_class.job == 0)
 				max_level -= 40;
-			if ((pl_s_class.job == 23) || (pl_s_class.upper == 1 && pl_s_class.type == 2)) //スパノビと転生職はJobレベルの最高が70
-			// To-do: super novices has max level 99 - celest
+			// super novices can go up to 99 [celest]
+			else if (pl_s_class.job == 23)
+				max_level += 49;
+			else if (pl_sd->status.class > 4007 && pl_sd->status.class < 4023)
 				max_level += 20;
 
 			if (level > 0) {

src/map/pc.c

@@ -5746,14 +5746,17 @@ 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->status.class == 0)
+		if (s_class.job == 0)
 			up_level -= 40;
-		if ((sd->status.class == 23) || (sd->status.class >= 4001 && sd->status.class <= 4022))
+		// super novices can go up to 99 [celest]
+		else if (s_class.job == 23)
+			up_level += 49;
+		else if (sd->status.class >= 4008 && sd->status.class <= 4022)
 			up_level += 20;
 		if (val >= sd->status.job_level) {
 			if (val > up_level)val = up_level;
 			sd->status.skill_point += (val-sd->status.job_level);
-		sd->status.job_level = val;
+			sd->status.job_level = val;
 			sd->status.job_exp = 0;
 			clif_updatestatus(sd, SP_JOBLEVEL);
 			clif_updatestatus(sd, SP_NEXTJOBEXP);