Changed Job_SuperNovice to Job_Super_Novice in scripts to match source-side constant.

npc/battleground/flavius/flavius_enter.txt

@@ -29,7 +29,7 @@ bat_room,133,178,5	script	Flavius Officer#01a	418,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -96,7 +96,7 @@ bat_room,133,121,1	script	Flavius Officer#01b	414,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -253,7 +253,7 @@ bat_room,148,178,5	script	Flavius Officer#02a	418,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -320,7 +320,7 @@ bat_room,148,121,1	script	Flavius Officer#02b	414,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}

npc/battleground/tierra/tierra_enter.txt

@@ -30,7 +30,7 @@ bat_room,124,178,5	script	Tierra Gorge Officer#01a	418,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -97,7 +97,7 @@ bat_room,140,178,5	script	Tierra Gorge Officer#02a	418,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -262,7 +262,7 @@ bat_room,125,121,1	script	Tierra Gorge Officer#01b	414,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -329,7 +329,7 @@ bat_room,140,121,1	script	Tierra Gorge Officer#02b	414,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}

npc/custom/jobmaster.txt

@@ -110,7 +110,7 @@ function Job_Menu;
 					Job_Acolyte,
 					Job_Merchant,
 					Job_Thief,
-					Job_SuperNovice,
+					Job_Super_Novice,
 					Job_Taekwon,
 					Job_Gunslinger,
 					Job_Ninja,
@@ -169,7 +169,7 @@ function Job_Menu {
 			.@i = getarg(select(.@menu$) - 1, 0);
 			if (!.@i)
 				close;
-			if ((.@i == Job_SuperNovice || .@i == Job_Super_Baby) && BaseLevel < .SNovice) {
+			if ((.@i == Job_Super_Novice || .@i == Job_Super_Baby) && BaseLevel < .SNovice) {
 				mes "[Job Master]";
 				mes "A base level of " + .SNovice + " is required to turn into a " + jobname(.@i) + ".";
 				close;
@@ -209,7 +209,7 @@ Get_Platinum:
 	skill "NV_FIRSTAID",1,SKILL_PERM;
 	switch (BaseClass) {
 	case Job_Novice:
-		if (Class != Job_SuperNovice)
+		if (Class != Job_Super_Novice)
 			skill "NV_TRICKDEAD",1,SKILL_PERM;
 		break;
 	case Job_Swordman:

npc/custom/platinum_skills.txt

@@ -33,7 +33,7 @@ prontera,128,200,6	script	Platinum Skill NPC	94,{
 	skill "NV_FIRSTAID",1,SKILL_PERM;
 	switch (BaseClass) {
 	case Job_Novice:
-		if (Class != Job_SuperNovice)
+		if (Class != Job_Super_Novice)
 			skill "NV_TRICKDEAD",1,SKILL_PERM;
 		break;
 	case Job_Swordman:

npc/jobs/novice/supernovice.txt

@@ -21,7 +21,7 @@
 //============================================================ 
 
 aldeba_in,223,167,3	script	Tzerero#sn	709,{
-	if (BaseJob == Job_SuperNovice) {
+	if (BaseJob == Job_Super_Novice) {
 		mes "[Tzerero]";
 		mes "I trust that you are enjoying";
 		mes "life as a Super Novice? Ah,";
@@ -59,7 +59,7 @@ aldeba_in,223,167,3	script	Tzerero#sn	709,{
 		completequest 6010;
 		callfunc "F_ClearJobVar";
 		getitem 2339,1; //G_Strings
-		if (Upper==0) jobchange Job_SuperNovice;
+		if (Upper==0) jobchange Job_Super_Novice;
 		if (Upper==2) jobchange Job_Super_Baby;
 		mes "[Tzerero]";
 		mes "Bwaha! I got you!";
@@ -275,7 +275,7 @@ aldeba_in,223,167,3	script	Tzerero#sn	709,{
 		}
 	}
 	else {
-		if (BaseJob == Job_SuperNovice) {
+		if (BaseJob == Job_Super_Novice) {
 			mes "[Tzerero]";
 			mes "How do you like living";
 			mes "life simply as a Super";
@@ -335,7 +335,7 @@ aldeba_in,216,169,5	script	Esseray#sn	86,{
 		mes "I knew you could pass the test~";
 		close;
 	}
-	if (BaseJob == Job_SuperNovice) {
+	if (BaseJob == Job_Super_Novice) {
 		if (checkre(0))
 			callfunc "Esseray_Ex";
 		mes "[Esseray]";
@@ -385,7 +385,7 @@ aldeba_in,216,169,5	script	Esseray#sn	86,{
 }
 
 aldebaran,54,238,5	script	Kafra Employee#sn	117,{
-	if (BaseJob == Job_SuperNovice) {
+	if (BaseJob == Job_Super_Novice) {
 		mes "[Kafra Employee]";
 		if (Sex )
 			mes "Hello, Mister Super Novice~";

npc/merchants/clothes_dyer.txt

@@ -105,7 +105,7 @@ function Dyes;
 			case Job_Assassin:
 			case Job_Rogue:
 				if (Sex) Dyes(6,1); else Dyes(4,1,8,2,7,3);
-			case Job_SuperNovice:
+			case Job_Super_Novice:
 				if (Sex) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4);
 			default: 
 				mes "Wow, I've never seen clothes like that before! I'm sorry, but I don't think I can paint it.";

npc/quests/dandelion_request.txt

@@ -26,7 +26,7 @@ izlude,103,106,3	script	Guildsman#1	48,3,3,{
 		mes "to store some of your items.^000000";
 		close;
 	}
-	if(!(BaseLevel > 59) || !(BaseJob == Job_Novice || BaseJob == Job_SuperNovice || BaseClass == Job_Swordman))
+	if(!(BaseLevel > 59) || !(BaseJob == Job_Novice || BaseJob == Job_Super_Novice || BaseClass == Job_Swordman))
 	{
 		mes "[Guildsman]";
 		mes "There are rumors";
@@ -45,7 +45,7 @@ izlude,103,106,3	script	Guildsman#1	48,3,3,{
 	}
 	if(!mao_request)
 	{
-		if ((BaseJob == Job_Novice) || (BaseJob == Job_SuperNovice))
+		if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice))
 		{
 			mes "[Guildsman]";
 			mes "Excuse me? "+strcharinfo(0)+"?";
@@ -195,7 +195,7 @@ izlude,103,106,3	script	Guildsman#1	48,3,3,{
 	}
 	else if(mao_request == 1)
 	{
-		if ((BaseJob == Job_Novice) || (BaseJob == Job_SuperNovice))
+		if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice))
 		{
 			mes "[Guildsman]";
 			mes "Ah, I forgot to tell you";
@@ -293,7 +293,7 @@ OnTouch:
 	{
 		if(!mao_request)
 		{
-			if ((BaseJob == Job_Novice) || (BaseJob == Job_SuperNovice))
+			if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice))
 			{
 				mes "[Guildsman]";
 				mes "Excuse me? "+strcharinfo(0)+"?";

npc/quests/newgears/2004_headgears.txt

@@ -1381,7 +1381,7 @@ geffen,83,189,5	script	Seth#1	716,{
 			mes "I'm done!";
 			mes "I did a good job, didn't I?";
 			next;
-			if (BaseJob == Job_Novice || BaseJob == Job_SuperNovice) {
+			if (BaseJob == Job_Novice || BaseJob == Job_Super_Novice) {
 				mes "[Seth]";
 				mes "Oh, here's the leftovers. Mommy says that we should always save things. Heh heh~";
 				getitem 935,1; //Shell

npc/quests/quests_nameless.txt

@@ -4779,7 +4779,7 @@ moc_ruins,152,147,5	script	Ibrahim	732,3,3,{
 					close;
 				}
 			case 2:
-				if ((BaseJob == Job_Novice) || (BaseJob == Job_SuperNovice)) {
+				if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice)) {
 					mes "[Ibrahim]";
 					mes "So it's true...";
 					mes "People say you're";

npc/quests/thana_quest.txt

@@ -2292,7 +2292,7 @@ tha_t04,81,36,0	warp	to 5th Floor	1,1,tha_t05,62,8
 tha_t06,119,120,0	script	to 7th Floor	45,1,1,{
 	end;
 OnTouch:
-	if (eaclass()&(EAJL_2|EAJL_UPPER) || eaclass()&EAJL_THIRD || ((Class == Job_SuperNovice || Class == Job_Taekwon || Class == Job_Star_Gladiator || Class == Job_Soul_Linker || BaseClass == Job_Ninja || Class == Job_Gunslinger) && BaseLevel > 94)) {
+	if (eaclass()&(EAJL_2|EAJL_UPPER) || eaclass()&EAJL_THIRD || ((Class == Job_Super_Novice || Class == Job_Taekwon || Class == Job_Star_Gladiator || Class == Job_Soul_Linker || BaseClass == Job_Ninja || Class == Job_Gunslinger) && BaseLevel > 94)) {
 		if (countitem(7425) > 0) {
 			mes "The shadow of a Black Key is gleaming in the center of the portal.";
 			mes "To pass this way, looks like I need something.";

npc/re/quests/eden/eden_quests.txt

@@ -1919,7 +1919,7 @@ moc_para01,112,96,5	script	Administrator Michael	4_M_RUSMAN1,{
 					13424,"Eden Saber II","One-handed sword","Attack 170","",///P_Sabre2
 					1193,"Eden Slayer II","Two-handed sword","Attack 185","";//P_Slayer2
 			}
-			if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Novice || Class == Job_Novice_High || Class == Job_SuperNovice || Class == Job_Soul_Linker || Class == Job_Ninja) {
+			if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Novice || Class == Job_Novice_High || Class == Job_Super_Novice || Class == Job_Soul_Linker || Class == Job_Ninja) {
 				callsub S_Select,"",
 					13051,"Eden Dagger II","Dagger","MATK+70, attack 158","";//P_Dagger2
 			}