1 files changed, 26 insertions, 20 deletions

diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 71718fed2..a8f2848d1 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -959,6 +959,7 @@ yuno_in03,105,177,5	script	Written Test Professor	754,{
 			if (select("Odin:Loki:Thor:Venadin") == 1) {
 				set @sage_t,@sage_t + 5;
 			}
+			next;
 		}
 		if (.@sage_m2 == 2) {
 			mes "1. Choose the jewel that the Morroc Jewel Merchant does not sell.";
@@ -1061,6 +1062,7 @@ yuno_in03,105,177,5	script	Written Test Professor	754,{
 			if (select("Yggdrasil:Iggdrassil:Mastella:Dead Branch") == 1) {
 				set @sage_t,@sage_t + 5;
 			}
+			next;
 		}
 		else {
 			mes "1. Choose the item that the Magical Tool merchant in Geffen does not sell.";
@@ -1163,6 +1165,7 @@ yuno_in03,105,177,5	script	Written Test Professor	754,{
 			if (select("Empelium Gold:Emperium:Emperor:Phracon") == 2) {
 				set @sage_t,@sage_t + 5;
 			}
+			next;
 		}
 		mes "[Claytos Verdo]";
 		mes "Well, you answered all 20 of the questions.";
@@ -1318,6 +1321,7 @@ yuno_in03,105,177,5	script	Written Test Professor	754,{
 			if (select("Odin:Loki:Thor:Venadin") == 1) {
 				set @sage_t,@sage_t + 5;
 			}
+			next;
 		}
 		if (.@sage_m2 == 2) {
 			mes "1. Choose the jewel that the Morroc Jewel Merchant does not sell.";
@@ -1420,6 +1424,7 @@ yuno_in03,105,177,5	script	Written Test Professor	754,{
 			if (select("Yggdrasil:Iggdrassil:Mastella:Dead Branch") == 1) {
 				set @sage_t,@sage_t + 5;
 			}
+			next;
 		}
 		else {
 			mes "1. Choose the item that the Magical Tool merchant in Geffen does not sell.";
@@ -1522,6 +1527,7 @@ yuno_in03,105,177,5	script	Written Test Professor	754,{
 			if (select("Empelium Gold:Emperium:Emperor:Phracon") == 2) {
 				set @sage_t,@sage_t + 5;
 			}
+			next;
 		}
 		mes "[Claytos Verdo]";
 		mes "Well, we finished all 20 questions.";
@@ -3482,7 +3488,7 @@ job_sage,50,165,2	script	Waiting Room#sg	700,{
 	end;
 
 OnInit:
-	hideonnpc "Waiting Room#sg";
+	disablenpc "Waiting Room#sg";
 	waitingroom "Waiting Room",20,"Waiting Room#sg::OnStartArena",1;
 	enablewaitingroomevent;
 	end;
@@ -3502,11 +3508,11 @@ job_sage,1,2,1	script	Arena#1	66,{
 	end;
 
 OnInit:
-	hideonnpc "Arena#1";
+	disablenpc "Arena#1";
 	end;
 
 OnEnable:
-	hideoffnpc "Arena#1";
+	enablenpc "Arena#1";
 	monster "job_sage",111,102,"Grade F",1183,1,"Arena#1::OnMyMobDead";
 	monster "job_sage",120,102,"Grade F",1183,1,"Arena#1::OnMyMobDead";
 	monster "job_sage",111,93,"Grade F",1183,1,"Arena#1::OnMyMobDead";
@@ -3531,7 +3537,7 @@ OnReset:
 	end;
 
 OnDisable:
-	hideonnpc "Arena#1";
+	disablenpc "Arena#1";
 	end;
 
 OnMyMobDead:
@@ -3602,11 +3608,11 @@ job_sage,1,3,1	script	Arena#2	66,{
 	end;
 
 OnInit:
-	hideonnpc "Arena#2";
+	disablenpc "Arena#2";
 	end;
 
 OnEnable:
-	hideoffnpc "Arena#2";
+	enablenpc "Arena#2";
 	donpcevent "Arena#1::OnReset";
 	donpcevent "Arena#1::OnDisable";
 	monster "job_sage",111,102,"Numerical Value",1063,1,"Arena#2::OnMyMobDead";
@@ -3641,7 +3647,7 @@ OnReset:
 	end;
 
 OnDisable:
-	hideonnpc "Arena#2";
+	disablenpc "Arena#2";
 	end;
 
 OnMyMobDead:
@@ -3709,11 +3715,11 @@ job_sage,1,4,1	script	Arena#Doorkeeper	66,{
 	end;
 
 OnInit:
-	hideonnpc "Arena#Doorkeeper";
+	disablenpc "Arena#Doorkeeper";
 	end;
 
 OnEnable:
-	hideoffnpc "Arena#Doorkeeper";
+	enablenpc "Arena#Doorkeeper";
 	donpcevent "Arena#2::OnReset";
 	donpcevent "Arena#2::OnDisable";
 	monster "job_sage",116,97,"Academic Probation",1179,1,"Arena#Doorkeeper::OnMyMobDead";
@@ -3727,7 +3733,7 @@ OnReset:
 
 OnDisable:
 	donpcevent "Arena#3::OnDisable";
-	hideonnpc "Arena#Doorkeeper";
+	disablenpc "Arena#Doorkeeper";
 	end;
 
 OnMyMobDead:
@@ -3781,15 +3787,15 @@ OnTouch:
 	end;
 	
 OnInit:
-	hideonnpc "Arena#Fail";
+	disablenpc "Arena#Fail";
 	end;
 
 OnEnable:
-	hideoffnpc "Arena#Fail";
+	enablenpc "Arena#Fail";
 	end;
 
 OnDisable:
-	hideonnpc "Arena#Fail";
+	disablenpc "Arena#Fail";
 	end;
 }
 
@@ -3797,7 +3803,7 @@ job_sage,1,4,1	script	Arena#3	66,{
 	end;
 
 OnInit:
-	hideonnpc "Arena#3";
+	disablenpc "Arena#3";
 	end;
 
 OnEnable:
@@ -3812,7 +3818,7 @@ OnReset:
 	end;
 
 OnDisable:
-	hideonnpc "Arena#3";
+	disablenpc "Arena#3";
 	end;
 }
 
@@ -3823,15 +3829,15 @@ OnTouch:
 	end;
 
 OnInit:
-	hideonnpc "SageSucceeded";
+	disablenpc "SageSucceeded";
 	end;
 
 OnEnable:
-	hideoffnpc "SageSucceeded";
+	enablenpc "SageSucceeded";
 	end;
 
 OnDisable:
-	hideonnpc "SageSucceeded";
+	disablenpc "SageSucceeded";
 	end;
 }
 
@@ -3839,7 +3845,7 @@ job_sage,1,6,1	script	Test Helper#sg	66,{
 	end;
 
 OnInit:
-	hideonnpc "Test Helper#sg";
+	disablenpc "Test Helper#sg";
 	end;
 
 OnEnable:
@@ -3847,7 +3853,7 @@ OnEnable:
 	end;
 
 OnDisable:
-	hideonnpc "Test Helper#sg";
+	disablenpc "Test Helper#sg";
 	end;
 
 OnTimer2000: