- Here comes the big Job folder Update.

* Updated all 1-1, 2-1, 2-2 and the expanded files to the latest available official files and also added support for baby job change.
* There might be some optimizations still needed at some places and there maybe occur some errors as well or the job change isn't fully working anymore since I didn't test all the jobs through the end (Me = Lazy), if so then please fill out a bug report in our bug tracker: http://rathena.org/board/tracker/project-4-scripts/
* Ninja, Gunslinger and the other files will follow within the next days.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16579 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 944 insertions, 782 deletions

diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 6d9ffe14f..402f9e97d 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -1,29 +1,20 @@
 //===== rAthena Script ======================================= 
-//= Rogue Job Quest
+// Rogue Job change Quest
 //===== By: ================================================== 
-//= kobra_k88
+//= Masao
+//= Credits: Muad_Dib
 //===== Current Version: ===================================== 
-//= 2.9
+//= 1.0
 //===== Compatible With: ===================================== 
-//= rAthena SVN
+//= Any rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Job quest for Rogue classes
+//= [Translated from the Official]
+//= Job change Quest from Thief -> Rogue.
 //===== Additional Comments: ================================= 
-//= 2.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
-//= 2.4a Deleted unused variables. [Samuray22]
-//= 2.4b Changed a Problem with JobLevel what made 
-//=	impossible get a Gladius [3]. (bugreport:481) [Samuray22]
-//= 2.4c Corrected a Typo error ";;" and a typo error with "rouge". (bugreport:909) [Samuray22]
-//= 2.5 Added dummy "OnMyMobDead" labels. (bugreport:1100) [L0ne_W0lf]
-//= 2.6 Fixed a few bugs in the Rogue Guildsman. [L0ne_W0lf]
-//= 2.7 Fixed a bug on Markie question 5, bugreport:1600 [Brainstorm]
-//= 2.8 Moved "Thug" to Morroc Ruins. [L0ne_W0lf]
-//= 2.9 Added Quest Log commands. [Kisuka]
+//= 1.0 Updated to latest available official file. [Masao]
 //============================================================ 
 
-moc_ruins,86,103,1	script	Thug#rg	118,{
+morocc,100,104,1	script	Thug	118,{
 	mes "[Thug]";
 	mes "*Sigh...*";
 	mes "What is life?";
@@ -54,7 +45,7 @@ moc_ruins,86,103,1	script	Thug#rg	118,{
 	close;
 }
 
-in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
+in_rogue,363,122,4	script	Rogue Guildsman	747,{
 	if (Upper == 1) {
 		mes "[Markie]";
 		mes "Eh? You...you...?!";
@@ -72,8 +63,8 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 		mes "I never misunderstand people...oh well, be safe anyway!";
 		close;
 	}
-	if (BaseJob == Job_Thief) {
-		if (SkillPoint) {
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		if (SkillPoint != 0) {
 			mes "[Rogue Guildsman]";
 			mes "Yo, what are you doin'?!";
 			mes "You can't change your job if you got unused skill points, so use 'em all up. You bettah check yo-self before you wreck yo-self.";
@@ -84,15 +75,16 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 				mes "[Rogue Guildsman]";
 				mes "So what's a kid";
 				mes "like you doin' here?";
-				if (sex == 1) {
+				if (Sex == 1) {
 					mes "Oh, I get it now...";
 					mes "The widdle boy wants";
+					mes "to be a ^800000Rogue^000000.";
 				}
 				else {
 					mes "Oh, I see...";
 					mes "Lil' cutie wants ";
+					mes "to be a ^800000Rogue^000000.";
 				}
-				mes "to be a ^800000Rogue^000000.";
 				next;
 				mes "[Rogue Guildsman]";
 				mes "Eh, nice meetin' you, I guess. I'm Markie, and I do work for the Rogue Guild, a philanthro-- *ahem* a ^800000feelanthropist^000000 group, as you can see. So what's your name?";
@@ -108,7 +100,7 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 				mes "So why you wanna join up with the Rogues? I guess you gave me your real name, so you'd be an honest Rogue. Not many of those around, heh heh~";
 				next;
 				mes "[Markie]";
-				mes "Rule number 1 for Rogues...";
+				mes "Rule number 1 for Rouges...";
 				mes "Never give out your real identity to most people, most of the time. It's just a little backup measure we like to use.";
 				next;
 				mes "[Markie]";
@@ -119,14 +111,14 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 				mes "Let's get started!";
 				next;
 			}
-			else if (ROGUE_Q == 1) {
+			if (ROGUE_Q == 1) {
 				mes "[Markie]";
 				mes "You again?";
 				mes "Okay, you probably screwed up last time 'cuz you were way too nervous. So just chill and pass";
 				mes "this test, okay?";
 				next;
 			}
-			else if (ROGUE_Q == 2) {
+			if (ROGUE_Q == 2) {
 				mes "[Markie]";
 				mes "Go talk to Smith. His test might be pretty hard. He's one of the guys who makes sure that people pay up their debts to us. So yeah, he might be a bit of a hard case.";
 				next;
@@ -135,7 +127,7 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 				mes "That guy can be pretty anal, but we need a guy like him in our guild. Anyway, be careful. Lots of luck to you, pal.";
 				close;
 			}
-			else if (ROGUE_Q > 2 && ROGUE_Q < 16) {
+			if ((ROGUE_Q > 2) && (ROGUE_Q < 16)) {
 				mes "[Markie]";
 				mes "Hey yo...";
 				mes "Do your best.";
@@ -146,33 +138,58 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 				mes "a cinch to--Wait! Er, I wasn't talkin' about you! I meant the other fresh meat~";
 				close;
 			}
-			else if (ROGUE_Q == 16 || ROGUE_Q == 17) {
+			if (ROGUE_Q == 17) {
+				mes "[Markie]";
+				mes "Oh! It's you!";
+				mes "You were actually able to put up with that guy? Good stuff! Must've had a rough time collect all those items, eh?";
+				next;
+				mes "[Markie]";
+				mes "Hey hey~";
+				mes "Congrats!";
+				mes "You've been";
+				mes "doin' a great job~";
+				if(Class == Job_Baby_Thief){
+					jobchange Job_Baby_Rogue;
+				} else {
+					jobchange Job_Rogue;
+				}
+				set FJOB,Job_Shadow_Chaser;
 				changequest 2026,2027;
+				completequest 2027;
+				next;
+				mes "[Markie]";
+				mes "Now...";
+				mes "It's time";
+				mes "for me to make";
+				mes "a speech~ *Ahem*";
+				next;
 				mes "[Markie]";
-				if (ROGUE_Q == 16) {
-					mes "Oh hey, it's you!";
-					mes "You did a good job, guy.";
-					mes "Now, lemme change your";
-					mes "job to Rogue. You earned it!";
-					next;
-					mes "[Markie]";
-					mes "Congrats~!";
-					mes "You look";
-					mes "sooo dope!";
+				mes "Enjoy your freedom as a Rogue. Just remember that you gotta be free and responsible at the same time. So treat other guys the way you wanna be treated, kay? Alright, seeya round.";
+				if (JobLevel == 50) {
+					getitem 1220,1; //Gladius_
+				} else {
+					getitem 1219,1; //Gladius
 				}
-				else {
-					mes "Oh! It's you!";
-					mes "You were actually able to put up with that guy? Good stuff! Must've had a rough time collect all those items, eh?";
-					next;
-					mes "[Markie]";
-					mes "Hey hey~";
-					mes "Congrats!";
-					mes "You've been";
-					mes "doin' a great job~";
+				close;
+			}
+			if (ROGUE_Q == 16) {
+				mes "[Markie]";
+				mes "Oh hey, it's you!";
+				mes "You did a good job, guy.";
+				mes "Now, lemme change your";
+				mes "job to Rogue. You earned it!";
+				next;
+				mes "[Markie]";
+				mes "Congrats~!";
+				mes "You look";
+				mes "sooo dope!";
+				if(Class == Job_Baby_Thief){
+					jobchange Job_Baby_Rogue;
+				} else {
+					jobchange Job_Rogue;
 				}
-				set .@jlevel,JobLevel;
-				callfunc "Job_Change",Job_Rogue;
-				callfunc "F_ClearJobVar";
+				set FJOB,Job_Shadow_Chaser;
+				changequest 2026,2027;
 				completequest 2027;
 				next;
 				mes "[Markie]";
@@ -183,13 +200,12 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 				next;
 				mes "[Markie]";
 				mes "Enjoy your freedom as a Rogue. Just remember that you gotta be free and responsible at the same time. So treat other guys the way you wanna be treated, kay? Alright, seeya round.";
-				close2;
-				if (.@jlevel == 50) {
+				if (JobLevel == 50) {
 					getitem 1220,1; //Gladius_
 				} else {
 					getitem 1219,1; //Gladius
 				}
-				end;
+				close;
 			}
 			if (select("I'm ready.:Hold on, I need to get ready!") == 2) {
 				mes "[Markie]";
@@ -202,214 +218,214 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 				close;
 			}
 			next;
+			set .@assassin_quiz, rand(1,3);
+			set @assassin_t,0;
 			mes "[Markie]";
 			mes "Listen carefully, and";
 			mes "pick the right answer.";
 			mes "Capish? Now, lemme";
 			mes "read these questions...";
 			next;
-			switch(rand(1,3)) {
-			case 1:
+			if (.@assassin_quiz == 1) {
 				mes "[Markie]";
 				mes "1. Choose the skill necessary for learning ^880000Stalk^000000.";
 				next;
-				if (select("^880000Hiding^000000:^880000Steal^000000:^880000Improve Dodge^000000:^880000Bash^000000") == 1)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("^880000Hiding^000000:^880000Steal^000000:^880000Improve Dodge^000000:^880000Bash^000000") == 1) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "2. In comparison to the Merchant's Level 10 ^880000Discount^000000 skill, how much more of a discount, in terms of percent, can a Rogue get with Level 10 ^880000Haggle^000000 skill?";
 				next;
-				if (select("3 %:2 %:1 %:0 %") == 3)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("3 %:2 %:1 %:0 %") == 3) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "3. What is the correct description for the skill, ^880000Mug^000000?";
 				next;
-				if (select("Steal items from players:Steal items from monsters:Steal Zeny from monsters:Steal Zeny from players") == 3)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Steal items from players:Steal items from monsters:Steal Zeny from monsters:Steal Zeny from players") == 3) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "4. How many Rogues does it require to activate the skill, ^880000Slyness^000000?";
 				next;
-				if (select("1 Rogues + 2 Assassin:1 Thief + 2 Rogue:4 Thieves:2 Rogues") == 4)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("1 Rogues + 2 Assassin:1 Thief + 2 Rogue:4 Thieves:2 Rogues") == 4) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "5. Choose the skill that you can learn at Level 5 ^880000Divest Helm^000000.";
 				next;
-				if (select("^880000Envenom^000000:^880000Strip Tease^000000:^880000Venom Splasher^000000:^880000Divest Shield^000000") == 4)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("^880000Envenom^000000:^880000Strip Tease^000000:^880000Venom Splasher^000000:^880000Divest Shield^000000") == 4) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "6. Choose the skill which allows its user to move while hiding.";
 				next;
-				if (select("^880000Hiding^000000:^880000Back Slide^000000:^880000Stalk^000000:^880000Sand Attack^000000") == 3)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("^880000Hiding^000000:^880000Back Slide^000000:^880000Stalk^000000:^880000Sand Attack^000000") == 3) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "7. Choose the card that increases the accuracy rate of its owner.";
 				next;
-				if (select("Andre Card.:Familiar Card.:Mummy Card.:Marina Card.") == 3)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Andre Card.:Familiar Card.:Mummy Card.:Marina Card.") == 3) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "8. Choose the monster that receives more damage when it's attacked by a weapon with the Vadon card (20 % more damage on Fire property).";
 				next;
-				if (select("Vadon:Deviruchi:Elder Willow:Baphomet") == 3)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Vadon:Deviruchi:Elder Willow:Baphomet") == 3) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "9. How much SP does the skill ^880000Double Attack^000000 require when used with a Dagger?";
 				next;
-				if (select("15:Passive skill, no SP required.:Passive skill, 10 SP:54") == 2)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("15:Passive skill, no SP required.:Passive skill, 10 SP:54") == 2) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "10. Choose the most efficient dagger to use in the Byalan Dungeon.";
 				next;
-				if (select("Wind Main-Gauche:Ice Main-Gauche:Earth Main-Gauche:Fire Main-Gauche") == 1)
-					set .@assassin_t,.@assassin_t+10;
-				break;
-			case 2:
+				if (select("Wind Main-Gauche:Ice Main-Gauche:Earth Main-Gauche:Fire Main-Gauche") == 1) {
+					set @assassin_t,@assassin_t + 10;
+				}
+			}
+			if (.@assassin_quiz == 2) {
 				mes "[Markie]";
 				mes "1. Which monster drops a slotted Gladius?";
 				next;
-				if (select("Thief Bug:Peco Peco:Desert Wolf:Kobold") == 4)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Thief Bug:Peco Peco:Desert Wolf:Kobold") == 4) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "2. Which monster drops a slotted Main-Gauche?";
 				next;
-				if (select("Hornet:Desert Wolf:Marionette:Myst") == 1)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Hornet:Desert Wolf:Marionette:Myst") == 1) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "3. Choose the class that is able to create unique potions.";
 				next;
-				if (select("Merchant:Alchemist:Blacksmith:Priest") == 2)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Merchant:Alchemist:Blacksmith:Priest") == 2) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "4. Choose the weapon that Rogues aren't allowed to use.";
 				next;
-				if (select("Gakkung:Crossbow:Gladius:Katar") == 4)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Gakkung:Crossbow:Gladius:Katar") == 4) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "5. Choose the property that the monster Hode possesses.";
 				next;
-				if (select("Water:Fire:Wind:Earth") == 4)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Water:Fire:Wind:Earth") == 4) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "6. Choose the monster that is unable to be tamed for as a Cute Pet.";
 				next;
-				if (select("Poporing:Creamy:Orc:Poison Spore") == 2)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Poporing:Creamy:Orc:Poison Spore") == 2) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "7. Choose the monster that receives more damage from a Dagger with the Fire property.";
 				next;
-				if (select("Dagger Goblin:Mace Goblin:Morning Star Goblin:Hammer Goblin") == 4)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Dagger Goblin:Mace Goblin:Morning Star Goblin:Hammer Goblin") == 4) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "8. Choose the town that doesn't have any guild castles.";
 				next;
-				if (select("Prontera:Al De Baran:Alberta:Payon") == 3)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Prontera:Al De Baran:Alberta:Payon") == 3) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "9. Choose the plant that drops Blue Herbs.";
 				next;
-				switch(select("Green Plant:Yellow Plant:Blue Plant:Shining Plant")) {
-				default:
+				switch (select("Green Plant:Yellow Plant:Blue Plant:Shining Plant")) {
+				case 1:
+				case 2:
 					break;
 				case 3:
-					set .@assassin_t,.@assassin_t+10;
+					set @assassin_t,@assassin_t + 10;
 					break;
 				case 4:
-					set .@assassin_t,.@assassin_t+10;
+					set @assassin_t,@assassin_t + 10;
 					break;
 				}
 				mes "[Markie]";
 				mes "10. Choose the monster that does not have the Undead property.";
 				next;
-				if (select("Zombie:Megalodon:Familiar:Khalitzburg") == 3)
-					set .@assassin_t,.@assassin_t+10;
-				break;
-			case 3:
+				if (select("Zombie:Megalodon:Familiar:Khalitzburg") == 3) {
+					set @assassin_t,@assassin_t + 10;
+				}
+			}
+			else {
 				mes "[Markie]";
 				mes "1. By what percentage is the flee rate increased when a Thief masters the ^880000Improve Dodge^000000?";
 				next;
-				if (select("30:40:160:20") == 1)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("30:40:160:20") == 1) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "2. Choose the monster that detects a characters using the Hiding or Cloaking skill.";
 				next;
-				if (select("Worm Tail:Argos:Mummy:Soldier Skeleton") == 2)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Worm Tail:Argos:Mummy:Soldier Skeleton") == 2) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "3. Choose the location where Thieves can change their jobs to Rogues.";
 				next;
-				if (select("Comodo:Kokomo Beach:Paros Lighthouse:Morroc") == 3)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Comodo:Kokomo Beach:Paros Lighthouse:Morroc") == 3) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "4. In which town can Novices change their jobs to Thieves?";
 				next;
-				if (select("Comodo:Lutie:Alberta:Morroc") == 4)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Comodo:Lutie:Alberta:Morroc") == 4) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "5. Choose the card that does not affect the DEX stat.";
 				next;
-				if (select("Rocker Card:Mummy Card:Zerom Card:Drops Card") == 2)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Rocker Card:Mummy Card:Zerom Card:Drops Card") == 2) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "6. So what's cool about being a Rogue?";
 				next;
 				select("Being totally badass.:The clothes, the style.:Getting to call other people, 'foo'':Excellent attack strength");
-				set .@assassin_t,.@assassin_t+10;
-
+				set @assassin_t,@assassin_t + 10;
 				mes "[Markie]";
 				mes "7. When is it possible to change jobs from Thief to Rogue?";
 				next;
-				switch(select("At job Level 30:At job Level 35:At Job Level 40:At Job Level 50")) {
-				default:
+				switch (select("At job Level 30:At job Level 35:At Job Level 40:At Job Level 50")) {
+				case 1:
+				case 2:
 					break;
 				case 3:
-					set .@assassin_t,.@assassin_t+10;
+					set @assassin_t,@assassin_t + 10;
 					break;
 				case 4:
-					set .@assassin_t,.@assassin_t+10;
+					set @assassin_t,@assassin_t + 10;
 					break;
 				}
 				mes "[Markie]";
 				mes "8. You want to dye your hair blue. What town do you go to, and in which direction, with 12 o' clock being North.";
 				next;
-				if (select("Morroc, 7 o'clock:Prontera, 7 o'clock:Morroc, 5 o'clock:Prontera, 1 o'clock") == 2)
-					set .@assassin_t,.@assassin_t+10;
-
+				if (select("Morroc, 7 o'clock:Prontera, 7 o'clock:Morroc, 5 o'clock:Prontera, 1 o'clock") == 2) {
+					set @assassin_t,@assassin_t + 10;
+				}
 				mes "[Markie]";
 				mes "9. Choose the mushroom that is required on the Thief job change quest.";
 				next;
-				switch(select("Orange Gooey Mushroom:Red Hairy Mushroom:Orange Net Mushroom:Orange Sticky Mushroom")) {
-				default:
-					break;
-				case 1:
-				case 3:
-					set .@assassin_t,.@assassin_t+10;
-					break;
+				if (select("Orange Gooey Mushroom:Red Hairy Mushroom:Orange Net Mushroom:Orange Sticky Mushroom") == 3) {
+					set @assassin_t,@assassin_t + 10;
 				}
 				mes "[Markie]";
 				mes "10. Choose the card that least benefits the Rogue class.";
 				next;
-				if (select("Whisper Card:Elder Willow Card:Zerom Card:Matyr Card") == 2)
-					set .@assassin_t,.@assassin_t+10;
+				if (select("Whisper Card:Elder Willow Card:Zerom Card:Matyr Card") == 2) {
+					set @assassin_t,@assassin_t + 10;
+				}
 			}
 			mes "[Markie]";
 			mes "*Whew~*";
@@ -419,8 +435,8 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 			mes "[Markie]";
 			mes "Let's see.";
 			mes "You got...";
-			mes "" + .@assassin_t + " points.";
-			if (.@assassin_t > 80) {
+			mes "" + @assassin_t + " points.";
+			if (@assassin_t > 80) {
 				set ROGUE_Q,2;
 				setquest 2017;
 				mes "Good. You passed.";
@@ -435,28 +451,26 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 				mes "Go find Smith and finish up this test, yeah? Be careful though, Smith's a pretty anal guy.";
 				close;
 			}
-			else {
-				set ROGUE_Q,1;
-				mes "Aw crud... You failed!";
-				next;
-				mes "[Markie]";
-				mes "Man, you shoulda learned more when you had the chance. Thanks for wasting my time.";
-				next;
-				mes "[Markie]";
-				mes "*Sigh...* Lemme give you some tips, yeah? I'm supposed to tell you about some kind of ^990000iro.ragnarokonline.com^000000 to help you learn what you need to know.";
-				next;
-				mes "[Markie]";
-				mes "Of course, I don't know what the heck it means, but if you understand it, it'll probably help you out a lot.";
-				close;
-			}
+			set ROGUE_Q,1;
+			mes "Aw crud... You failed!";
+			next;
+			mes "[Markie]";
+			mes "Man, you shoulda learned more when you had the chance. Thanks for wasting my time.";
+			next;
+			mes "[Markie]";
+			mes "*Sigh...* Lemme give you some tips, yeah? I'm supposed to tell you about some kind of ^990000iro.ragnarokonline.com^000000 to help you learn what you need to know.";
+			next;
+			mes "[Markie]";
+			mes "Of course, I don't know what the heck it means, but if you understand it, it'll probably help you out a lot.";
+			close;
 		}
-		else if (JobLevel < 40) {
+		if (JobLevel < 40) {
 			mes "[Rogue Guildsman]";
 			mes "Whoa, slow down newbie. We only accept people who are at least Thief Job Level 40. I ain't risking myself by letting you in before you're ready. Got it?";
 			close;
 		}
 	}
-	else if (BaseJob == Job_Assassin) {
+	if (Class == Job_Assassin) {
 		mes "[Rogue Guildsman]";
 		mes "Huh...?";
 		mes "What's an Assassin doin' here? Uh, you haven't been assigned to kill someone in the Rogue Guild, are you?";
@@ -468,7 +482,7 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 		mes "Don't get it, huh? It's something I always used to say to Huey. If you're in the Assassin Guild, you oughta have met him...";
 		close;
 	}
-	else if (BaseJob == Job_Rogue) {
+	if (Class == ROGUE_Q) {
 		mes "[Markie]";
 		mes "Hey hey~";
 		mes "Long time no see.";
@@ -478,18 +492,16 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 		mes "check back again later.";
 		close;
 	}
-	else {
-		mes "[Rogue Guildsman]";
-		mes "Hey you...";
-		mes "Get your ugly";
-		mes "ass out of here";
-		mes "before I redecorate";
-		mes "that face of yours!";
-		close;
-	}
+	mes "[Rogue Guildsman]";
+	mes "Hey you...";
+	mes "Get your ugly";
+	mes "ass out of here";
+	mes "before I redecorate";
+	mes "that face of yours!";
+	close;
 }
 
-in_rogue,376,23,1	script	Mr. Smith#rg	57,{
+in_rogue,376,23,1	script	Mr. Smith	57,{
 	if (ROGUE_Q == 2) {
 		mes "[Mr. Smith]";
 		mes "Welcome to";
@@ -508,11 +520,98 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 		mes "[Mr. Smith]";
 		mes "What you have to understand is that the Rogue Guild does a lot of business, ^666666sometimes illegally^000000, that needs financial backup.";
 		next;
-		set .@item_need,rand(1,15);
-		if (.@item_need > 0 && .@item_need < 6) callsub S_Req,"10 Skel-bone","6 Blue Herb","10 Decayed Nail","10 Horrendous Mouth",3;
-		else if (.@item_need > 5 && .@item_need < 11) callsub S_Req,"10 Green Herb","10 Crab Shell","10 Snake Scale","10 Garlet",4;
-		else if (.@item_need > 10 && .@item_need < 15) callsub S_Req,"10 Yellow Herb","10 Shell","10 Grasshopper's Leg","10 Bear's Footskin",5;
-		else if (.@item_need == 15) {
+		set .@item_need, rand(1,15);
+		if ((.@item_need > 0) && (.@item_need < 6)) {
+			mes "[Mr. Smith]";
+			mes "First, the";
+			mes "application fee:";
+			mes "^FF000010,000 zeny^000000.";
+			next;
+			mes "[Mr. Smith]";
+			mes "We also need";
+			mes "you to bring";
+			mes "^FF000010 Skel-bone^000000,";
+			mes "^FF00006 Blue Herb^000000,";
+			mes "^FF000010 Decayed Nail^000000, and";
+			mes "^FF000010 Horrendous Mouth^000000.";
+			set ROGUE_Q,3;
+			changequest 2017,2018;
+			next;
+			mes "[Mr. Smith]";
+			mes "Hmm...?";
+			mes "What was that?";
+			mes "Did you just say that";
+			mes "you're willing to donate";
+			mes "more for the guild?";
+			next;
+			mes "[Mr. Smith]";
+			mes "That sounds sweet,";
+			mes "I appreciate that.";
+			mes "But come back when";
+			mes "you're ready.";
+			close;
+		}
+		if ((.@item_need > 5) && (.@item_need < 11)) {
+			mes "[Mr. Smith]";
+			mes "First, the";
+			mes "application fee:";
+			mes "^FF000010,000 zeny^000000.";
+			next;
+			mes "[Mr. Smith]";
+			mes "We also need";
+			mes "you to bring";
+			mes "^FF000010 Green Herb^000000,";
+			mes "^FF000010 Crab Shell^000000,";
+			mes "^FF000010 Snake Scale^000000 and";
+			mes "^FF000010 Garlet^000000.";
+			set ROGUE_Q,4;
+			changequest 2017,2019;
+			next;
+			mes "[Mr. Smith]";
+			mes "Hmm...?";
+			mes "What was that?";
+			mes "Did you just say that";
+			mes "you're willing to donate";
+			mes "more for the guild?";
+			next;
+			mes "[Mr. Smith]";
+			mes "That sounds sweet,";
+			mes "I appreciate that.";
+			mes "But come back when";
+			mes "you're ready.";
+			close;
+		}
+		if ((.@item_need > 10) && (.@item_need < 15)) {
+			mes "[Mr. Smith]";
+			mes "First, the";
+			mes "application fee:";
+			mes "^FF000010,000 zeny^000000.";
+			next;
+			mes "[Mr. Smith]";
+			mes "We also need";
+			mes "you to bring";
+			mes "^FF000010 Yellow Herb^000000,";
+			mes "^FF000010 Shell^000000,";
+			mes "^FF000010 Grasshopper's Leg^000000 and";
+			mes "^FF000010 Bear's Footskin^000000.";
+			set ROGUE_Q,5;
+			changequest 2017,2020;
+			next;
+			mes "[Mr. Smith]";
+			mes "Hmm...?";
+			mes "What was that?";
+			mes "Did you just say that";
+			mes "you're willing to donate";
+			mes "more for the guild?";
+			next;
+			mes "[Mr. Smith]";
+			mes "That sounds sweet,";
+			mes "I appreciate that.";
+			mes "But come back when";
+			mes "you're ready.";
+			close;
+		}
+		if (.@item_need == 15) {
 			mes "[Mr. Smith]";
 			mes "I will let you know...";
 			set ROGUE_Q,6;
@@ -632,7 +731,7 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 			close;
 		}
 	}
-	else if (ROGUE_Q < 2) {
+	if (ROGUE_Q < 2) {
 		mes "[Mr. Smith]";
 		mes "Three thousand, two hundred seventy two. Three thousand, two hundred seventy three. Three thousand, two hundred seventy four...";
 		next;
@@ -651,19 +750,121 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 		mes "I lost count!";
 		close;
 	}
-	else if (ROGUE_Q > 2) {
-		if (ROGUE_Q == 3) callsub S_CheckItems,510,6,932,10,957,10,958,10;
-		else if (ROGUE_Q == 4) callsub S_CheckItems,511,10,910,10,926,10,964,10;
-		else if (ROGUE_Q == 5) callsub S_CheckItems,508,10,948,10,935,10,940,10;
-		else if (ROGUE_Q == 6) {
-			if (zeny > 9999 && countitem(915) > 4 && countitem(713) > 4 && countitem(1002) > 4 &&
-			countitem(953) > 4 && countitem(507) > 4 && countitem(919) > 4 && countitem(715) > 4 &&
-			countitem(913) > 4 && countitem(904) > 4 && countitem(942) > 4 && countitem(528) > 4 &&
-			countitem(914) > 4 && countitem(705) > 4 && countitem(916) > 4 && countitem(917) > 4 &&
-			countitem(908) > 4 && countitem(945) > 4) {
+	if (ROGUE_Q > 2) {
+		if (ROGUE_Q == 3) {
+			if ((Zeny > 9999) && (countitem(932) > 9) && (countitem(510) > 5) && (countitem(957) > 9) && (countitem(958) > 9)) {
+				mes "[Mr. Smith]";
+				mes "Okay, we've got the application fee, ^FF000010,000 zeny^000000, 10 Skel-Bone, 6 Blue Herb, 10 Decayed Nail and 10 Horrendous Mouth...";
+				set Zeny, Zeny - 10000;
+				delitem 932,10; //Skel_Bone
+				delitem 510,6; //Blue_Herb
+				delitem 957,10; //Decayed_Nail
+				delitem 958,10; //Horrendous_Mouth
+				set ROGUE_Q,7;
+				next;
+				mes "[Mr. Smith]";
+				mes "Great, great...";
+				mes "I think you";
+				mes "brought everything.";
+				next;
+				mes "[Mr. Smith]";
+				mes "Alright, wait just a moment while";
+				mes "I prepare these things. Let's see... Your next test is...";
+				close;
+			}
+			mes "[Mr. Smith]";
+			mes "What the f$@k!? You didn't bring all the required items?! Are you telling me that you need to check the requirements again!?";
+			next;
+			mes "[Mr. Smith]";
+			mes "Now listen...!";
+			mes "Bring ^FF000010,000 zeny^000000,";
+			mes "and the following items...";
+			next;
+			mes "[Mr. Smith]";
+			mes "^FF000010 Skel-bone^000000,";
+			mes "^FF00006 Blue Herb^000000,";
+			mes "^FF000010 Decayed Nail^000000, and";
+			mes "^FF000010 Horrendous Mouth^000000.";
+			mes "You got it this time?";
+			close;
+		}
+		if (ROGUE_Q == 4) {
+			if ((Zeny > 9999) && (countitem(511) > 9) && (countitem(964) > 9) && (countitem(926) > 9) && (countitem(910) > 9)) {
+				mes "[Mr. Smith]";
+				mes "Okay, we've got the application fee, 10 Green Herb, 10 Crab Shell, 10 Snake Scale and 10 Garlet.";
+				set Zeny, Zeny - 10000;
+				delitem 511,10; //Green_Herb
+				delitem 964,10; //Crap_Shell
+				delitem 926,10; //Scale_Of_Snakes
+				delitem 910,10; //Garlet
+				set ROGUE_Q,7;
+				next;
+				mes "[Mr. Smith]";
+				mes "Great, great...";
+				mes "I think you";
+				mes "brought everything.";
+				next;
+				mes "[Mr. Smith]";
+				mes "Alright, wait just a moment while I prepare these things. Let's see... Your next test is...";
+				close;
+			}
+			mes "[Mr. Smith]";
+			mes "What the f$@k!? You didn't bring all the required items?! Are you telling me that you need to check the requirements again!?";
+			next;
+			mes "[Mr. Smith]";
+			mes "Now listen...!";
+			mes "Bring ^FF000010,000 zeny^000000,";
+			mes "and the following items...";
+			next;
+			mes "[Mr. Smith]";
+			mes "^FF000010 Green Herb^000000,";
+			mes "^FF000010 Crab Shell^000000,";
+			mes "^FF000010 Snake Scale^000000 and";
+			mes "^FF000010 Garlet^000000.";
+			mes "Don't forget this time!";
+			close;
+		}
+		if (ROGUE_Q == 5) {
+			if ((Zeny > 9999) && (countitem(508) > 9) && (countitem(935) > 9) && (countitem(940) > 9) && (countitem(948) > 9)) {
+				mes "[Mr. Smith]";
+				mes "Let's see, you've brought the application fee, 10 Yellow Herb, 10 Shell, 10 Grasshopper's Leg and 10 Bear's Footskin...";
+				set Zeny, Zeny - 10000;
+				delitem 508,10; //Yellow_Herb
+				delitem 935,10; //Shell
+				delitem 940,10; //Grasshopper's_Leg
+				delitem 948,10; //Bear's_Foot
+				set ROGUE_Q,7;
+				next;
+				mes "[Mr. Smith]";
+				mes "Great, great...";
+				mes "I think you";
+				mes "brought everything.";
+				next;
+				mes "[Mr. Smith]";
+				mes "Alright, wait just a moment while I prepare these things. Let's see... Your next test is...";
+				close;
+			}
+			mes "[Mr. Smith]";
+			mes "What the f$@k!? You didn't bring all the required items?! Are you telling me that you need to check the requirements again!?";
+			next;
+			mes "[Mr. Smith]";
+			mes "Now listen...!";
+			mes "Bring ^FF000010,000 zeny^000000,";
+			mes "and the following items...";
+			next;
+			mes "[Mr. Smith]";
+			mes "^FF000010 Yellow Herb^000000,";
+			mes "^FF000010 Shell^000000,";
+			mes "^FF000010 Grasshopper's Leg^000000 and";
+			mes "^FF000010 Bear's Footskin^000000.";
+			mes "Got it? Don't forget this time!";
+			close;
+		}
+		if (ROGUE_Q == 6) {
+			if ((Zeny > 9999) && (countitem(915) > 4) && (countitem(713) > 4) && (countitem(1002) > 4) && (countitem(953) > 4) && (countitem(507) > 4) && (countitem(919) > 4) && (countitem(715) > 4) && (countitem(913) > 4) && (countitem(904) > 4) && (countitem(942) > 4) && (countitem(528) > 4) && (countitem(914) > 4) && (countitem(705) > 4) && (countitem(916) > 4) && (countitem(917) > 4) && (countitem(908) > 4) && (countitem(945) > 4)) {
 				mes "[Mr. Smith]";
 				mes "Ummm...let's see...";
-				set zeny,zeny-10000;
+				set Zeny, Zeny - 10000;
 				delitem 915,5; //Chrysalis
 				delitem 713,5; //Empty_Bottle
 				delitem 1002,5; //Iron_Ore
@@ -688,8 +889,6 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 				next;
 				mes "^CCCCCC- Middle Finger -^000000'";
 				mes "*Grins*";
-				set ROGUE_Q,8;
-				changequest 2021,2025;
 				next;
 				mes "[Mr. Smith]";
 				mes "Since you showed such great effort, I'm going to write a recommendation letter for you. I usually don't do that, you know.";
@@ -751,23 +950,17 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 			mes "without them!";
 			close;
 		}
-		else if (ROGUE_Q == 7) {
-			mes "[Mr. Smith]";
-			mes "Let me see...";
-			mes "Who would should";
-			mes "I send you to...?";
-			switch(rand(1,3)) {
-			case 1:
+		if (ROGUE_Q == 7) {
+			set .@ro_q, rand(1,3);
+			if (.@ro_q == 1) {
+				mes "[Mr. Smith]";
+				mes "Let me see...";
+				mes "Who would should";
+				mes "I send you to...?";
 				set ROGUE_Q,9;
-				if(checkquest(2018) != -1) {
-					changequest 2018,2022;
-				}
-				else if(checkquest(2019) != -1) {
-					changequest 2019,2022;
-				}
-				else {
-					changequest 2020,2022;
-				}
+				changequest 2018,2022;
+				changequest 2019,2022;
+				changequest 2020,2022;
 				next;
 				mes "[Mr. Smith]";
 				mes "Right! I know";
@@ -794,17 +987,16 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 				mes "[Mr. Smith]";
 				mes "Well, I will wish you luck. His place isn't that far from here, so come back as soon as possible. Being swift... That is the spirit of the Rogue.";
 				close;
-			case 2:
+			}
+			if (.@ro_q == 2) {
+				mes "[Mr. Smith]";
+				mes "Let me see...";
+				mes "Who would should";
+				mes "I send you to...?";
 				set ROGUE_Q,10;
-				if(checkquest(2018) != -1) {
-					changequest 2018,2023;
-				}
-				else if(checkquest(2019) != -1) {
-					changequest 2019,2023;
-				}
-				else {
-					changequest 2020,2023;
-				}
+				changequest 2018,2023;
+				changequest 2019,2023;
+				changequest 2020,2023;
 				next;
 				mes "[Mr. Smith]";
 				mes "Hmm...";
@@ -830,52 +1022,50 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 				mes "[Mr. Smith]";
 				mes "Ah, you might want to remember the password to meet him in person. The password is ^0000FFAntonio doesn't enjoy destroying upgrade items^000000.";
 				close;
-			case 3:
-				set ROGUE_Q,11;
-				if(checkquest(2018) != -1) {
-					changequest 2018,2024;
-				}
-				else if(checkquest(2019) != -1) {
-					changequest 2019,2024;
-				}
-				else {
-					changequest 2020,2024;
-				}
-				next;
-				mes "[Mr. Smith]";
-				mes "Hmm...";
-				mes "This guy might be";
-				mes "good for you, but...";
-				mes "He's a little dangerous.";
-				next;
-				mes "[Mr. Smith]";
-				mes "His name is";
-				mes "Hollgrehenn Junior,";
-				mes "a genius at manipulation.";
-				next;
-				mes "[Mr. Smith]";
-				mes "However, because of something his father did long ago, people ahve been trying to kill him. Because of this, he is very high strung and will throw daggers at people he doesn't trust.";
-				next;
-				mes "[Mr. Smith]";
-				mes "Our leader has been able to get him to join our guild, and his brilliant mind has been an asset to us. Once you get to know him, he'll take care of your Rogue training really well.";
-				next;
-				mes "[Mr. Smith]";
-				mes "Ah, you might want to remember the password to meet him in person. The password is ^0000FFMy father never hoarded upgrade items^000000.";
-				close;
 			}
+			mes "[Mr. Smith]";
+			mes "Let me see...";
+			mes "Who would should";
+			mes "I send you to...?";
+			set ROGUE_Q,11;
+			changequest 2018,2024;
+			changequest 2019,2024;
+			changequest 2020,2024;
+			next;
+			mes "[Mr. Smith]";
+			mes "Hmm...";
+			mes "This guy might be";
+			mes "good for you, but...";
+			mes "He's a little dangerous.";
+			next;
+			mes "[Mr. Smith]";
+			mes "His name is";
+			mes "Hollgrehenn Junior,";
+			mes "a genius at manipulation.";
+			next;
+			mes "[Mr. Smith]";
+			mes "However, because of something his father did long ago, people have been trying to kill him. Because of this, he is very high strung and will throw daggers at people he doesn't trust.";
+			next;
+			mes "[Mr. Smith]";
+			mes "Our leader has been able to get him to join our guild, and his brilliant mind has been an asset to us. Once you get to know him, he'll take care of your Rogue training really well.";
+			next;
+			mes "[Mr. Smith]";
+			mes "Ah, you might want to remember the password to meet him in person. The password is ^0000FFMy father never hoarded upgrade items^000000.";
+			close;
 		}
-		else if (ROGUE_Q == 8) {
+		if (ROGUE_Q == 8) {
 			mes "[Mr. Smith]";
 			mes "Alright... Now that I've calmed down, I can inform you of your next destination. *Whew*";
 			next;
 			mes "[Mr. Smith]";
-			mes "Go and find Hermanthorn Junior, who is living near the ^0000FFthe checkpoint of Paros Lighthouse^000000, which is at the border between Morroc and Comodo.";
+			mes "Go and find Hermanthorn Junior, who is living near ^0000FFthe checkpoint of Paros Lighthouse^000000, which is at the border between Morroc and Comodo.";
 			next;
 			mes "[Mr. Smith]";
 			mes "Ah...almost forgot, keep in mind not to mention anything about upgrading items. This is very important.";
+			changequest 2021,2025;
 			close;
 		}
-		else if (ROGUE_Q == 9) {
+		if (ROGUE_Q == 9) {
 			mes "[Mr. Smith]";
 			mes "What...?";
 			mes "Did you just";
@@ -889,7 +1079,7 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 			mes "The password is ^0000FFAragham never hoarded upgrade items^000000.";
 			close;
 		}
-		else if (ROGUE_Q == 10) {
+		if (ROGUE_Q == 10) {
 			mes "[Mr. Smith]";
 			mes "What...?";
 			mes "Did you just";
@@ -907,7 +1097,7 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 			mes "The password is ^0000FF'Antonio doesn't enjoy destroying upgrade items'^000000.";
 			close;
 		}
-		else if (ROGUE_Q == 11) {
+		if (ROGUE_Q == 11) {
 			mes "[Mr. Smith]";
 			mes "What...?";
 			mes "Did you just";
@@ -921,7 +1111,7 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 			mes "The password is ^0000FFMy father never hoarded upgrade items^000000.";
 			close;
 		}
-		else if (ROGUE_Q > 11) {
+		if (ROGUE_Q > 11) {
 			mes "[Mr. Smith]";
 			mes "Hmmm...?";
 			mes "Don't you have";
@@ -931,94 +1121,23 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 			close;
 		}
 	}
-
-
-S_Req:
-	mes "[Mr. Smith]";
-	mes "First, the";
-	mes "application fee:";
-	mes "^FF000010,000 zeny^000000.";
-	next;
-	mes "[Mr. Smith]";
-	mes "We also need";
-	mes "you to bring";
-	mes "^FF0000"+getarg(0)+"^000000,";
-	mes "^FF0000"+getarg(1)+"^000000,";
-	mes "^FF0000"+getarg(2)+"^000000 and";
-	mes "^FF0000"+getarg(3)+"^000000.";
-	set ROGUE_Q,getarg(4);
-	if(getarg(4) == 3) {
-		changequest 2017,2018;
-	}
-	else if(getarg(4) == 4) {
-		changequest 2017,2019;
-	}
-	else {
-		changequest 2017,2020;
-	}
-	next;
-	mes "[Mr. Smith]";
-	mes "Hmm...?";
-	mes "What was that?";
-	mes "Did you just say that";
-	mes "you're willing to donate";
-	mes "more for the guild?";
-	next;
-	mes "[Mr. Smith]";
-	mes "That sounds sweet,";
-	mes "I appreciate that.";
-	mes "But come back when";
-	mes "you're ready.";
-	close;
-
-
-S_CheckItems:
-	if (Zeny > 9999 && countitem(getarg(0)) >= getarg(1) && countitem(getarg(2)) >= getarg(3) && countitem(getarg(4)) >= getarg(5) && countitem(getarg(6)) >= getarg(7)) {
-		mes "[Mr. Smith]";
-		mes "Okay, we've got the application fee, ^FF000010,000 zeny^000000, "+getarg(1)+" "+getitemname(getarg(0))+", "+getarg(3)+" "+getitemname(getarg(2))+", "+getarg(5)+" "+getitemname(getarg(4))+" and "+getarg(7)+" "+getitemname(getarg(6))+"...";
-		set zeny,zeny-10000;
-		delitem getarg(0),getarg(1);
-		delitem getarg(2),getarg(3);
-		delitem getarg(4),getarg(5);
-		delitem getarg(6),getarg(7);
-		set ROGUE_Q,7;
-		next;
-		mes "[Mr. Smith]";
-		mes "Great, great...";
-		mes "I think you";
-		mes "brought everything.";
-		set ROGUE_Q,7;
-		next;
-		mes "[Mr. Smith]";
-		mes "Alright, wait just a moment while";
-		mes "I prepare these things. Let's see... Your next test is...";
-		close;
-	}
-	mes "[Mr. Smith]";
-	mes "What the f$@k!? You didn't bring all the required items?! Are you telling me that you need to check the requirements again!?";
-	next;
-	mes "[Mr. Smith]";
-	mes "Now listen...!";
-	mes "Bring ^FF000010,000 zeny^000000,";
-	mes "and the following items...";
-	next;
-	mes "[Mr. Smith]";
-	mes "^FF0000 "+getarg(1)+" "+getitemname(getarg(0))+"^000000,";
-	mes "^FF0000 "+getarg(3)+" "+getitemname(getarg(2))+"^000000,";
-	mes "^FF0000 "+getarg(5)+" "+getitemname(getarg(4))+"^000000,";
-	mes "^FF0000 "+getarg(7)+" "+getitemname(getarg(6))+"^000000,";
-	mes "You got it this time?";
-	close;
 }
 
 cmd_fild09,106,195,0	script	Warp#1	45,1,1,{
+
 OnTouch:
+	if (ROGUE_Q < 8){
+		mes"The door is locked.";
+		mes "Do this later.";
+		close;
+	}
 	mes "[???]";
 	mes "Who's there?!";
 	mes "Who would dare";
 	mes "intrude my territory?";
 	next;
-	switch(select("My father:Aragham:Aragon:Legolas")) {
+	set @rogue_t,0;
+	switch (select("My father:Aragham:Aragon:Legolas")) {
 	case 1:
 		mes "[" + strcharinfo(0) + "]";
 		mes "My father";
@@ -1026,7 +1145,7 @@ OnTouch:
 	case 2:
 		mes "[" + strcharinfo(0) + "]";
 		mes "Aragham";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
 		break;
 	case 3:
 		mes "[" + strcharinfo(0) + "]";
@@ -1037,62 +1156,87 @@ OnTouch:
 		mes "Legolas";
 		break;
 	}
-	switch(select("did not:didn't:never:ever")) {
-	case 1: mes "did not"; break;
-	case 2: mes "didn't"; break;
+	switch (select("did not:didn't:never:ever")) {
+	case 1:
+		mes "did not";
+		break;
+	case 2:
+		mes "didn't";
+		break;
 	case 3:
 		mes "never";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
+		break;
+	case 4:
+		mes "ever";
 		break;
-	case 4: mes "ever"; break;
 	}
-	switch(select("hoard:hoarded:hide:took:take")) {
-	case 1: mes "hoard"; break;
+	switch (select("hoard:hoarded:hide:took:take")) {
+	case 1:
+		mes "hoard";
+		break;
 	case 2:
 		mes "hoarded";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
+		break;
+	case 3:
+		mes "hide";
+		break;
+	case 4:
+		mes "took";
+		break;
+	case 5:
+		mes "take";
 		break;
-	case 3: mes "hide"; break;
-	case 4: mes "took"; break;
-	case 5: mes "take"; break;
 	}
-	switch(select("upgrade items.:forging items.:refining item.:upgrade item.")) {
+	switch (select("upgrade items.:forging items.:refining item.:upgrade item.")) {
 	case 1:
 		mes "upgrade items.";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
+		break;
+	case 2:
+		mes "forging items.";
+		break;
+	case 3:
+		mes "refining item.";
+		break;
+	case 4:
+		mes "upgrade item.";
 		break;
-	case 2: mes "forging items."; break;
-	case 3: mes "refining item."; break;
-	case 4: mes "upgrade item."; break;
 	}
 	next;
-	if (.@rogue_t > 30) {
+	if (@rogue_t > 30) {
 		mes "^3355FF*Creeeeak*";
 		mes "The door slowly opens.^000000";
 		close2;
 		warp "in_rogue",246,25;
 		end;
 	}
-	else {
-		mes "[???]";
-		mes "What the...?";
-		mes "Get lost!";
-		close;
-	}
+	mes "[???]";
+	mes "What the...?";
+	mes "Get lost!";
+	close;
 }
 
 cmd_fild09,335,143,0	script	Warp#2	45,1,1,{
+
 OnTouch:
+	if (ROGUE_Q < 8){
+		mes"The door is locked.";
+		mes "Do this later.";
+		close;
+	}
 	mes "[???]";
 	mes "Who's there?!";
 	mes "Who would dare";
 	mes "intrude my territory?";
 	next;
-	switch(select("My father:Aragham:Aragon:Legolas")) {
+	set @rogue_t,0;
+	switch (select("My father:Aragham:Aragon:Legolas")) {
 	case 1:
 		mes "[" + strcharinfo(0) + "]";
 		mes "My father";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
 		break;
 	case 2:
 		mes "[" + strcharinfo(0) + "]";
@@ -1107,58 +1251,83 @@ OnTouch:
 		mes "Legolas";
 		break;
 	}
-	switch(select("did not:didn't:never:ever")) {
-	case 1: mes "did not"; break;
-	case 2: mes "didn't"; break;
+	switch (select("did not:didn't:never:ever")) {
+	case 1:
+		mes "did not";
+		break;
+	case 2:
+		mes "didn't";
+		break;
 	case 3:
 		mes "never";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
+		break;
+	case 4:
+		mes "ever";
 		break;
-	case 4: mes "ever"; break;
 	}
-	switch(select("hoard:takes:hide:took:hoarded")) {
-	case 1: mes "hoard"; break;
-	case 2: mes "takes"; break;
-	case 3: mes "hide"; break;
-	case 4: mes "took"; break;
+	switch (select("hoard:takes:hide:took:hoarded")) {
+	case 1:
+		mes "hoard";
+		break;
+	case 2:
+		mes "takes";
+		break;
+	case 3:
+		mes "hide";
+		break;
+	case 4:
+		mes "took";
+		break;
 	case 5:
 		mes "hoarded";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
 		break;
 	}
-	switch(select("upgrade items.:forging items.:refining item.:upgrade item.")) {
+	switch (select("upgrade items.:forging items.:refining item.:upgrade item.")) {
 	case 1:
 		mes "upgrade items.";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
+		break;
+	case 2:
+		mes "forging items.";
+		break;
+	case 3:
+		mes "refining item.";
+		break;
+	case 4:
+		mes "upgrade item.";
 		break;
-	case 2: mes "forging items."; break;
-	case 3: mes "refining item."; break;
-	case 4: mes "upgrade item."; break;
 	}
 	next;
-	if (.@rogue_t > 30) {
+	if (@rogue_t > 30) {
 		mes "^3355FF*Creeeeak*";
 		mes "The door slowly opens.^000000";
 		close2;
 		warp "in_rogue",169,34;
 		end;
 	}
-	else {
-		mes "[???]";
-		mes "What the...?";
-		mes "Get lost!";
-		close;
-	}
+	mes "[???]";
+	mes "What the...?";
+	mes "Get lost!";
+	close;
 }
 
 cmd_fild04,304,180,0	script	Warp#3	45,1,1,{
+
 OnTouch:
+	if (ROGUE_Q < 8){
+		mes"The door is locked.";
+		mes "Do this later.";
+		close;
+	}
 	mes "[???]";
 	mes "Who's there?!";
 	mes "Who would dare";
 	mes "intrude my territory?";
 	next;
-	switch(select("Anntonio:Aragham:Antonio:Hollgrehenn")) {
+	set @rogue_t,0;
+	switch (select("Anntonio:Aragham:Antonio:Hollgrehenn")) {
 	case 1:
 		mes "[" + strcharinfo(0) + "]";
 		mes "Anntonio";
@@ -1170,60 +1339,82 @@ OnTouch:
 	case 3:
 		mes "[" + strcharinfo(0) + "]";
 		mes "Antonio";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
 		break;
 	case 4:
 		mes "[" + strcharinfo(0) + "]";
-		mes "Hollgrehenn"; 
+		mes "Hollgrehenn";
 		break;
 	}
-	switch(select("enjoys:doesn't enjoy:likes:doesn't like")) {
-	case 1: mes "enjoys"; break;
+	switch (select("enjoys:doesn't enjoy:likes:doesn't like")) {
+	case 1:
+		mes "enjoys";
+		break;
 	case 2:
 		mes "doesn't enjoy";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
+		break;
+	case 3:
+		mes "likes";
+		break;
+	case 4:
+		mes "doesn't like";
 		break;
-	case 3: mes "likes"; break;
-	case 4: mes "doesn't like"; break;
 	}
-	switch(select("damaging:destroying:fixing:forging")) {
-	case 1: mes "damaging"; break;
+	switch (select("damaging:destroying:fixing:forging")) {
+	case 1:
+		mes "damaging";
+		break;
 	case 2:
 		mes "destroying";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
+		break;
+	case 3:
+		mes "fixing";
+		break;
+	case 4:
+		mes "forging";
 		break;
-	case 3: mes "fixing"; break;
-	case 4: mes "forging"; break;
 	}
-	switch(select("forging item.:refining items.:upgrade items.:refined items.:upgraded items.:forged items.")) {
-	case 1: mes "forging item."; break;
-	case 2: mes "refining items."; break;
+	switch (select("forging item.:refining items.:upgrade items.:refined items.:upgraded items.:forged items.")) {
+	case 1:
+		mes "forging item.";
+		break;
+	case 2:
+		mes "refining items.";
+		break;
 	case 3:
 		mes "upgrade items.";
-		set .@rogue_t,.@rogue_t+10;
+		set @rogue_t,@rogue_t + 10;
+		break;
+	case 4:
+		mes "refined items.";
+		break;
+	case 5:
+		mes "upgraded items.";
+		break;
+	case 6:
+		mes "forged items.";
 		break;
-	case 4: mes "refined items."; break;
-	case 5: mes "upgraded items."; break;
-	case 6: mes "forged items."; break;
 	}
 	next;
-	if (.@rogue_t > 30) {
+	if (@rogue_t > 30) {
 		mes "^3355FF*Creeeeak*";
 		mes "The door slowly opens.^000000";
 		close2;
 		warp "in_rogue",164,106;
 		end;
 	}
-	else {
-		mes "[???]";
-		mes ".....Get lost!";
-		close;
-	}
+	mes "[???]";
+	mes ".....Get lost!";
+	close;
 }
 
-in_rogue,272,135,1	script	Hermanthorn Jr#rg	85,{
+cmd_fild07,355,286,0	warp	warp_nervrogue	1,1,in_rogue,247,126
+
+in_rogue,272,135,1	script	Hermanthorn Jr	85,{
 	if (ROGUE_Q == 8) {
-		mes "[HermanthornJr.]";
+		mes "[Hermanthorn Jr.]";
 		mes "I see...";
 		mes "You must be from";
 		mes "the Rogue guild.";
@@ -1231,60 +1422,56 @@ in_rogue,272,135,1	script	Hermanthorn Jr#rg	85,{
 		mes "ones Mr. Smith wasn't";
 		mes "too happy with...";
 		next;
-		mes "[HermanthornJr.]";
+		mes "[Hermanthorn Jr.]";
 		mes "He threw a fit and you brought him all the items he asked for, didn't you? Well, I can see that you're still pretty naive. Hahaha~";
 		next;
-		mes "[HermanthornJr.]";
+		mes "[Hermanthorn Jr.]";
 		mes "I suppose he suckered you into gathering those items, and then passed you on to me. Sad, really.";
 		next;
-		mes "[HermanthornJr.]";
+		mes "[Hermanthorn Jr.]";
 		mes "Well, since you were tortured by him, I'll try to be especially generous to you. My test for you will be simple, so simple.";
 		next;
-		mes "[HermanthornJr.]";
+		mes "[Hermanthorn Jr.]";
 		mes "All you have to do is go through a underground tunnel, and walk all the way back to the Rogue Guild.";
 		next;
-		mes "[HermanthornJr.]";
+		mes "[Hermanthorn Jr.]";
 		mes "There is one thing I should tell you, though. You might want to be careful inside, alright?";
 		next;
-		mes "[HermanthornJr.]";
+		mes "[Hermanthorn Jr.]";
 		mes "A bunch of pricks have been throwing Dead Branches and casting Hocus Pocus all over the place...";
 		next;
-		mes "[HermanthornJr.]";
+		mes "[Hermanthorn Jr.]";
 		mes "Well...";
 		mes "Just make it back to the Rogue Guild alive. That's all you have to do!";
 		set ROGUE_Q,12;
 		changequest 2025,2026;
-		close;
+		close2;
 	}
-	else if (ROGUE_Q == 12) {
-		mes "[HermanthornJr.]";
+	if (ROGUE_Q == 12) {
+		mes "[Hermanthorn Jr.]";
 		mes "Oh right. This is really important. You need a password to enter the tunnel. To unlock the door, the four number combination is ^0000FF3019^000000.";
 		close;
 	}
-	else {
-		mes "[HermanthornJr.]";
-		mes "Huh...?";
-		mes "What the hell";
-		mes "are you doing here.";
-		mes "Scram, why don't you?";
-		close;
-	}
+	mes "[Hermanthorn Jr.]";
+	mes "Huh...?";
+	mes "What the hell";
+	mes "are you doing here.";
+	mes "Scram, why don't you?";
+	close;
 }
 
-in_rogue,270,130,0	script	he_to_rogue#rg	45,1,1,{
+in_rogue,270,130,0	script	he_to_rogue	45,1,1,{
+
 OnTouch:
-	mes "^3355FFThe door is locked. You'll need to enter the four number combination to open it.^000000";
-	next;
-	input .@input;
-	if (.@input < 1 || .@input > 10000) {
-		if (ROGUE_Q == 12)
+	if (ROGUE_Q == 12) {
+		mes "^3355FFThe door is locked. You'll need to enter the four number combination to open it.^000000";
+		next;
+		input .@input;
+		if (.@input < 1 || .@input > 10000) {
 			mes "^3355FFIt didn't work. Please re-enter the four number combination.^000000";
-		else 
-			mes "^3355FFPlease enter a combination of four numbers.^000000";
-		close;
-	}
-	else if (.@input == 3019) {
-		if (ROGUE_Q == 12) {
+			close;
+		}
+		if (.@input == 3019) {
 			mes "^3355FFThe door";
 			mes "has opened.^000000";
 			close2;
@@ -1292,99 +1479,100 @@ OnTouch:
 			set ROGUE_Q,12;
 			end;
 		}
-		else {
-			mes "[HermanthornJr.]";
-			mes "Well...";
-			mes "Didn't I tell you";
-			mes "that I changed the";
-			mes "password? *Wink Wink*";
-			close;
-		}
-	}
-	else {
 		mes "^3355FFThe door";
 		mes "is still locked.^000000";
 		close;
 	}
+	mes "^3355FFThe door is locked. It seems a four number combination is required to open it.^000000";
+	next;
+	input .@input;
+	if (.@input < 1 || .@input > 10000) {
+		mes "^3355FFPlease enter a combination of four numbers.^000000";
+		close;
+	}
+	if (.@input == 3019) {
+		mes "[Hermanthorn Jr.]";
+		mes "Well...";
+		mes "Didn't I tell you";
+		mes "that I changed the";
+		mes "password? *Wink Wink*";
+		close;
+	}
+	mes "^3355FFThe door";
+	mes "is still locked.^000000";
+	close;
 }
 
-in_rogue,200,389,0	script	gen_ro#1	-1,3,3,{
+in_rogue,200,389,0	script	gen_ro#1	139,3,3,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",200,389,"Zombie",1015,1,"gen_ro#1::OnMyMobDead";
-		monster "in_rogue",201,389,"Zombie",1015,1,"gen_ro#1::OnMyMobDead";
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",200,389,"Zombie",1015,1;
+		monster "in_rogue",201,389,"Zombie",1015,1;
 		donpcevent "gen_ro#2::OnDisable";
 		donpcevent "gen_ro#3::OnDisable";
 		donpcevent "gen_ro#4::OnDisable";
-	}
-	else
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
 OnDisable:
 	killmonster "in_rogue","gen_ro#1::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,100,389,0	script	gen_ro#2	-1,3,3,{
+in_rogue,100,389,0	script	gen_ro#2	139,3,3,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",100,389,"Mummy",1041,1,"gen_ro#2::OnMyMobDead";
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",100,389,"Mummy",1041,1;
 		donpcevent "gen_ro#1::OnDisable";
-	}
-	else
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
 OnDisable:
 	killmonster "in_rogue","gen_ro#2::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,150,389,0	script	gen_ro#3	-1,3,3,{
+in_rogue,150,389,0	script	gen_ro#3	139,3,3,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",145,389,"Zombie",1015,1,"gen_ro#3::OnMyMobDead";
-		monster "in_rogue",143,389,"Mummy",1041,1,"gen_ro#3::OnMyMobDead";
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",145,389,"Zombie",1015,1;
+		monster "in_rogue",143,389,"Mummy",1041,1;
 		donpcevent "gen_ro#2::OnDisable";
-	}
-	else
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
 OnDisable:
 	killmonster "in_rogue","gen_ro#3::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,250,389,0	script	gen_ro#4	-1,3,3,{
+in_rogue,250,389,0	script	gen_ro#4	139,3,3,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",200,389,"Abysmal Knight",1219,1,"gen_ro#4::OnMyMobDead";
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",200,389,"Abysmal Knight",1219,1;
 		donpcevent "gen_ro#3::OnDisable";
-	}
-	else
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
 OnDisable:
 	killmonster "in_rogue","gen_ro#4::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
 in_rogue,9,389,0	script	oneway_to_gu	45,1,1,{
+
 OnTouch:
 	donpcevent "gen_ro#4::OnDisable";
 	set ROGUE_Q,17;
@@ -1392,7 +1580,7 @@ OnTouch:
 	end;
 }
 
-in_rogue,244,39,1	script	Aragham Junior#rg	99,{
+in_rogue,244,39,1	script	Aragham Junior	99,{
 	if (ROGUE_Q == 9) {
 		mes "[Aragham Jr.]";
 		mes "Oh, you must be";
@@ -1420,13 +1608,13 @@ in_rogue,244,39,1	script	Aragham Junior#rg	99,{
 		mes "There will be a few monsters, but don't worry. I know you're strong. Alright, are you ready to go or what?";
 		next;
 		if (select("Yes, let's go.:Nah~") == 1) {
+			changequest 2022,2026;
 			mes "[Aragham Jr.]";
 			mes "Alright...";
 			mes "Good luck, then.";
 			close2;
 			warp "in_rogue",15,105;
 			set ROGUE_Q,13;
-			changequest 2022,2026;
 			end;
 		}
 		mes "[Aragham Jr.]";
@@ -1436,7 +1624,7 @@ in_rogue,244,39,1	script	Aragham Junior#rg	99,{
 		mes "when you're ready.";
 		close;
 	}
-	else if (ROGUE_Q == 13) {
+	if (ROGUE_Q == 13) {
 		mes "[Aragham Jr.]";
 		mes "Oh, you're back.";
 		mes "I think you'll do well this time. Another motto Rogues have is '^0000FFFailure teaches success^000000.' Well, then again...";
@@ -1455,7 +1643,7 @@ in_rogue,244,39,1	script	Aragham Junior#rg	99,{
 		mes "when you're ready.";
 		close;
 	}
-	else if (BaseJob != Job_Rogue) {
+	if (Class != ROGUE_Q) {
 		mes "[Aragham Jr.]";
 		mes "Huh...?";
 		mes "Who are you?!";
@@ -1466,19 +1654,19 @@ in_rogue,244,39,1	script	Aragham Junior#rg	99,{
 		mes "You've come here to kill me, haven't you? N-no! I'm can't die yet! Get lost! Otherwise, I'll kill you first!";
 		close;
 	}
-	else {
-		mes "[Aragham Jr.]";
-		mes "Hey...";
-		mes "what brings";
-		mes "you back here?";
-		mes "Why don't you";
-		mes "take a rest";
-		mes "before you leave?";
-		close;
-	}
+	mes "[Aragham Jr.]";
+	mes "Hey...";
+	mes "what brings";
+	mes "you back here?";
+	mes "Why don't you";
+	mes "take a rest";
+	mes "before you leave?";
+	close;
 }
 
-in_rogue,160,34,1	script	Hollgrehenn junior#rg	85,{
+in_rogue,244,21,0	warp	out#01	1,1,cmd_fild09,106,191
+
+in_rogue,160,34,1	script	Hollgrehenn Junior	85,{
 	if (ROGUE_Q == 11) {
 		mes "[Hollgrehenn Jr.]";
 		mes "Huh...";
@@ -1502,12 +1690,12 @@ in_rogue,160,34,1	script	Hollgrehenn junior#rg	85,{
 		mes "There are some monsters there, but that'll be part of your training. Now, are you ready to go or not?";
 		next;
 		if (select("Yes, I am.:Nah~") == 1) {
+			changequest 2024,2026;
 			mes "[Hollgrehenn Jr.]";
 			mes "Good luck.";
 			close2;
 			warp "in_rogue",15,105;
 			set ROGUE_Q,15;
-			changequest 2024,2026;
 			end;
 		}
 		mes "[Hollgrehenn Jr.]";
@@ -1516,7 +1704,7 @@ in_rogue,160,34,1	script	Hollgrehenn junior#rg	85,{
 		mes "when you're ready.";
 		close;
 	}
-	else if (ROGUE_Q == 15) {
+	if (ROGUE_Q == 15) {
 		mes "[Hollgrehenn Jr.]";
 		mes "Huh.";
 		mes "You failed.";
@@ -1535,7 +1723,7 @@ in_rogue,160,34,1	script	Hollgrehenn junior#rg	85,{
 		mes "when you're ready.";
 		close;
 	}
-	else if (BaseJob != Job_Rogue) {
+	if (Class != ROGUE_Q) {
 		mes "[Hollgrehenn Jr.]";
 		mes "Huh...?";
 		mes "You're not from";
@@ -1554,17 +1742,17 @@ in_rogue,160,34,1	script	Hollgrehenn junior#rg	85,{
 		mes "about killing you.";
 		close;
 	}
-	else {
-		mes "[Hollgrehenn Jr.]";
-		mes "Hey...";
-		mes "Come to visit?";
-		mes "We Rogues gotta";
-		mes "stick together, huh?";
-		close;
-	}
+	mes "[Hollgrehenn Jr.]";
+	mes "Hey...";
+	mes "Come to visit?";
+	mes "We Rogues gotta";
+	mes "stick together, huh?";
+	close;
 }
 
-in_rogue,177,109,1	script	Antonio junior#rg	88,{
+in_rogue,172,34,0	warp	out#02	1,1,cmd_fild09,341,143
+
+in_rogue,177,109,1	script	Antonio Junior	88,{
 	if (ROGUE_Q == 10) {
 		mes "[Antonio Jr.]";
 		mes "You're from";
@@ -1591,10 +1779,10 @@ in_rogue,177,109,1	script	Antonio junior#rg	88,{
 			mes "not fail this test";
 			mes "You can only become";
 			mes "a Rogue if you pass...";
+			changequest 2023,2026;
 			close2;
 			warp "in_rogue",15,105;
 			set ROGUE_Q,14;
-			changequest 2023,2026;
 			end;
 		}
 		mes "[Antonio Jr.]";
@@ -1605,14 +1793,15 @@ in_rogue,177,109,1	script	Antonio junior#rg	88,{
 		mes "the test.";
 		close;
 	}
-	else if (ROGUE_Q == 14) {
+	if (ROGUE_Q == 14) {
 		mes "[Antonio Jr.]";
 		mes "You failed...?";
 		mes "I guess that's life.";
 		mes "Are you gonna try";
 		mes "again or what?";
 		next;
-		if (select("Re-test:Cancel") == 1) {
+		switch (select("Re-test:Cancel")) {
+		case 1:
 			mes "[Antonio Jr.]";
 			mes "Remember, I'm doing";
 			mes "you a favor here...";
@@ -1621,16 +1810,17 @@ in_rogue,177,109,1	script	Antonio junior#rg	88,{
 			close2;
 			warp "in_rogue",15,105;
 			end;
+		case 2:
+			mes "[Antonio Jr.]";
+			mes "I don't have time";
+			mes "to fool around with";
+			mes "you. Hurry up, get";
+			mes "ready, then take";
+			mes "the test.";
+			close;
 		}
-		mes "[Antonio Jr.]";
-		mes "I don't have time";
-		mes "to fool around with";
-		mes "you. Hurry up, get";
-		mes "ready, then take";
-		mes "the test.";
-		close;
 	}
-	else if (BaseJob != Job_Rogue) {
+	if (Class != ROGUE_Q) {
 		mes "Huh...?";
 		mes "Who are you?!";
 		mes "You're not from";
@@ -1640,344 +1830,327 @@ in_rogue,177,109,1	script	Antonio junior#rg	88,{
 		mes "You've come here to kill me?! I won't let you!! Come on, give me your best shot! You can't fight if I rip out your eyes!";
 		close;
 	}
-	else {
-		mes "[Antonio Jr.]";
-		mes "Hey, how's it goin'?";
-		mes "Take it easy, and just";
-		mes "relax before you leave.";
-		close;
-	}
+	mes "[Antonio Jr.]";
+	mes "Hey, how's it goin'?";
+	mes "Take it easy, and just";
+	mes "relax before you leave.";
+	close;
 }
 
+in_rogue,161,103,0	warp	out#1	1,1,cmd_fild04,302,177
+
 in_rogue,370,320,0	script	quest_out	45,1,1,{
+
 OnTouch:
 	set ROGUE_Q,16;
+	changequest 2026,2027;
 	warp "in_rogue",378,113;
 	end;
 }
 
-in_rogue,15,184,0	script	mob_rogue#1	-1,8,1,{
+in_rogue,15,184,0	script	mob_rogue#1	139,8,1,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",14,187,"Zombie",1015,1,"mob_rogue#1::OnMyMobDead";
-		monster "in_rogue",15,188,"Zombie",1015,1,"mob_rogue#1::OnMyMobDead";
-		monster "in_rogue",16,189,"Zombie",1015,1,"mob_rogue#1::OnMyMobDead";
-		monster "in_rogue",17,187,"Zombie",1015,1,"mob_rogue#1::OnMyMobDead";
-		monster "in_rogue",18,188,"Zombie",1015,1,"mob_rogue#1::OnMyMobDead";
-		monster "in_rogue",19,189,"Zombie",1015,1,"mob_rogue#1::OnMyMobDead";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",14,187,"Zombie",1015,1;
+		monster "in_rogue",15,188,"Zombie",1015,1;
+		monster "in_rogue",16,189,"Zombie",1015,1;
+		monster "in_rogue",17,187,"Zombie",1015,1;
+		monster "in_rogue",18,188,"Zombie",1015,1;
+		monster "in_rogue",19,189,"Zombie",1015,1;
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#1::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,15,273,0	script	mob_rogue#2	-1,8,1,{
+in_rogue,15,273,0	script	mob_rogue#2	139,8,1,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",15,276,"Mummy",1041,1,"mob_rogue#2::OnMyMobDead";
-		monster "in_rogue",13,276,"Mummy",1041,1,"mob_rogue#2::OnMyMobDead";
-		monster "in_rogue",11,276,"Mummy",1041,1,"mob_rogue#2::OnMyMobDead";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",15,276,"Mummy",1041,1;
+		monster "in_rogue",13,276,"Mummy",1041,1;
+		monster "in_rogue",11,276,"Mummy",1041,1;
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#2::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,15,333,0	script	mob_rogue#3	-1,8,1,{
+in_rogue,15,333,0	script	mob_rogue#3	139,8,1,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",15,336,"Zombie",1015,1,"mob_rogue#3::OnMyMobDead";
-		monster "in_rogue",15,336,"Zombie",1015,1,"mob_rogue#3::OnMyMobDead";
-		monster "in_rogue",15,336,"Zombie",1015,1,"mob_rogue#3::OnMyMobDead";
-		monster "in_rogue",15,336,"Zombie",1015,1,"mob_rogue#3::OnMyMobDead";
-		donpcevent "mob_rogue#4::OnDisable";
-		donpcevent "mob_rogue#7::OnDisable";
-		donpcevent "mob_rogue#8::OnDisable";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",15,336,"Zombie",1015,1;
+		monster "in_rogue",15,336,"Zombie",1015,1;
+		monster "in_rogue",15,336,"Zombie",1015,1;
+		monster "in_rogue",15,336,"Zombie",1015,1;
+		donpcevent "mob_rogue#4::OnReset";
+		donpcevent "mob_rogue#7::OnReset";
+		donpcevent "mob_rogue#8::OnReset";
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
-	killmonster "in_rogue","mob_rogue#3::OnMyMObDead";
-	end;
-
-OnMyMobDead:
+OnReset:
+	killmonster "in_rogue","mob_rogue#3::OnMyMobDead";
 	end;
 }
 
-in_rogue,39,341,0	script	mob_rogue#4	-1,1,8,{
+in_rogue,39,341,0	script	mob_rogue#4	139,1,8,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",39,341,"Mummy",1041,1,"mob_rogue#4::OnMyMobDead";
-		monster "in_rogue",40,341,"Ghoul",1036,1,"mob_rogue#4::OnMyMobDead";
-		monster "in_rogue",41,341,"Abysmal Knight",1219,1,"mob_rogue#4::OnMyMobDead";
-		monster "in_rogue",42,341,"Mummy",1041,1,"mob_rogue#4::OnMyMobDead";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",39,341,"Mummy",1041,1;
+		monster "in_rogue",40,341,"Ghoul",1036,1;
+		monster "in_rogue",41,341,"Abysmal Knight",1219,1;
+		monster "in_rogue",42,341,"Mummy",1041,1;
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#4::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,102,334,0	script	mob_rogue#5	-1,1,4,{
+in_rogue,102,334,0	script	mob_rogue#5	139,1,4,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",92,334,"Khalitzburg",1132,1,"mob_rogue#5::OnMyMobDead";
-		donpcevent "mob_rogue#1::OnDisable";
-		donpcevent "mob_rogue#2::OnDisable";
-		donpcevent "mob_rogue#3::OnDisable";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",92,334,"Khalitzburg",1132,1;
+		donpcevent "mob_rogue#1::OnReset";
+		donpcevent "mob_rogue#2::OnReset";
+		donpcevent "mob_rogue#3::OnReset";
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#5::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,58,309,0	script	mob_rogue#6	-1,4,1,{
+in_rogue,58,309,0	script	mob_rogue#6	139,4,1,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",57,301,"Khalitzburg",1132,1,"mob_rogue#6::OnMyMobDead";
-		donpcevent "mob_rogue#1::OnDisable";
-		donpcevent "mob_rogue#2::OnDisable";
-		donpcevent "mob_rogue#3::OnDisable";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",57,301,"Khalitzburg",1132,1;
+		donpcevent "mob_rogue#1::OnReset";
+		donpcevent "mob_rogue#2::OnReset";
+		donpcevent "mob_rogue#3::OnReset";
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#6::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,101,264,0	script	mob_rogue#7	-1,5,5,{
+in_rogue,101,264,0	script	mob_rogue#7	139,5,5,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",101,264,"Abysmal Knight",1219,1,"mob_rogue#7::OnMyMobDead";
-		monster "in_rogue",102,264,"Abysmal Knight",1219,1,"mob_rogue#7::OnMyMobDead";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",101,264,"Abysmal Knight",1219,1;
+		monster "in_rogue",102,264,"Abysmal Knight",1219,1;
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#7::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,140,312,0	script	mob_rogue#8	-1,5,5,{
+in_rogue,140,312,0	script	mob_rogue#8	139,5,5,{
+
 OnTouch:
-	if (BaseJob == Job_Thief)
-		monster "in_rogue",140,312,"Abysmal Knight",1219,1,"mob_rogue#8::OnMyMobDead";
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",140,312,"Abysmal Knight",1219,1;
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#8::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,139,246,0	script	mob_rogue#9	-1,4,4,{
+in_rogue,139,246,0	script	mob_rogue#9	139,4,4,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",139,246,"Zombie",1015,1,"mob_rogue#9::OnMyMobDead";
-		monster "in_rogue",149,246,"Zombie",1015,1,"mob_rogue#9::OnMyMobDead";
-		monster "in_rogue",140,246,"Zombie",1015,1,"mob_rogue#9::OnMyMobDead";
-		monster "in_rogue",141,246,"Zombie",1015,1,"mob_rogue#9::OnMyMobDead";
-		monster "in_rogue",150,246,"Zombie",1015,1,"mob_rogue#9::OnMyMobDead";
-		monster "in_rogue",151,246,"Zombie",1015,1,"mob_rogue#9::OnMyMobDead";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",139,246,"Zombie",1015,1;
+		monster "in_rogue",149,246,"Zombie",1015,1;
+		monster "in_rogue",140,246,"Zombie",1015,1;
+		monster "in_rogue",141,246,"Zombie",1015,1;
+		monster "in_rogue",150,246,"Zombie",1015,1;
+		monster "in_rogue",151,246,"Zombie",1015,1;
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#9::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,197,249,0	script	mob_rogue#10	-1,1,8,{
+in_rogue,197,249,0	script	mob_rogue#10	139,1,8,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",176,211,"Ghoul",1036,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",176,212,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",176,213,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",177,214,"Abysmal Knight",1219,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",177,211,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",177,212,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",177,213,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",177,214,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",178,211,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",178,212,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",178,213,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",178,214,"Archer Skeleton",1016,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",179,211,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",179,212,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",179,213,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		monster "in_rogue",179,214,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
-		donpcevent "mob_rogue#4::OnDisable";
-		donpcevent "mob_rogue#5::OnDisable";
-		donpcevent "mob_rogue#6::OnDisable";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",176,211,"Ghoul",1036,1;
+		monster "in_rogue",176,212,"Zombie",1015,1;
+		monster "in_rogue",176,213,"Zombie",1015,1;
+		monster "in_rogue",177,214,"Abysmal Knight",1219,1;
+		monster "in_rogue",177,211,"Zombie",1015,1;
+		monster "in_rogue",177,212,"Zombie",1015,1;
+		monster "in_rogue",177,213,"Zombie",1015,1;
+		monster "in_rogue",177,214,"Zombie",1015,1;
+		monster "in_rogue",178,211,"Zombie",1015,1;
+		monster "in_rogue",178,212,"Zombie",1015,1;
+		monster "in_rogue",178,213,"Zombie",1015,1;
+		monster "in_rogue",178,214,"Archer Skeleton",1016,1;
+		monster "in_rogue",179,211,"Zombie",1015,1;
+		monster "in_rogue",179,212,"Zombie",1015,1;
+		monster "in_rogue",179,213,"Zombie",1015,1;
+		monster "in_rogue",179,214,"Zombie",1015,1;
+		donpcevent "mob_rogue#4::OnReset";
+		donpcevent "mob_rogue#5::OnReset";
+		donpcevent "mob_rogue#6::OnReset";
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#10::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,96,205,0	script	mob_rogue#11	-1,1,8,{
+in_rogue,96,205,0	script	mob_rogue#11	139,1,8,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		donpcevent "mob_rogue#7::OnDisable";
-		donpcevent "mob_rogue#8::OnDisable";
-		donpcevent "mob_rogue#9::OnDisable";
-		donpcevent "mob_rogue#10::OnDisable";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		donpcevent "mob_rogue#7::OnReset";
+		donpcevent "mob_rogue#8::OnReset";
+		donpcevent "mob_rogue#9::OnReset";
+		donpcevent "mob_rogue#10::OnReset";
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 }
 
-in_rogue,86,187,0	script	mob_rogue#12	-1,1,8,{
+in_rogue,86,187,0	script	mob_rogue#12	139,1,8,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",90,187,"Mummy",1041,1,"mob_rogue#12::OnMyMobDead";
-		monster "in_rogue",90,183,"Mummy",1041,1,"mob_rogue#12::OnMyMobDead";
-		monster "in_rogue",90,190,"Mummy",1041,1,"mob_rogue#12::OnMyMobDead";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",90,187,"Mummy",1041,1;
+		monster "in_rogue",90,183,"Mummy",1041,1;
+		monster "in_rogue",90,190,"Mummy",1041,1;
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
-
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#12::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,223,187,0	script	mob_rogue#13	-1,1,8,{
+in_rogue,223,187,0	script	mob_rogue#13	139,1,8,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",236,186,"Abysmal Knight",1219,1,"mob_rogue#13::OnMyMobDead";
-		monster "in_rogue",238,186,"Abysmal Knight",1219,1,"mob_rogue#13::OnMyMobDead";
-		monster "in_rogue",234,186,"Abysmal Knight",1219,1,"mob_rogue#13::OnMyMobDead";
-		donpcevent "mob_rogue#12::OnDisable";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",236,186,"Abysmal Knight",1219,1;
+		monster "in_rogue",238,186,"Abysmal Knight",1219,1;
+		monster "in_rogue",234,186,"Abysmal Knight",1219,1;
+		donpcevent "mob_rogue#12::OnReset";
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#13::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,233,207,0	script	mob_rogue#14	-1,8,3,{
+in_rogue,233,207,0	script	mob_rogue#14	139,8,3,{
+
 OnTouch:
-	if (BaseJob == Job_Thief)
-		donpcevent "mob_rogue#13::OnDisable";
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		donpcevent "mob_rogue#13::OnReset";
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 }
 
-in_rogue,244,319,0	script	mob_rogue#15	-1,1,8,{
+in_rogue,244,319,0	script	mob_rogue#15	139,1,8,{
+
 OnTouch:
-	if (BaseJob == Job_Thief) {
-		monster "in_rogue",240,319,"Mummy",1041,1,"mob_rogue#15::OnMyMobDead";
-		monster "in_rogue",259,319,"Archer Skeleton",1016,1,"mob_rogue#15::OnMyMobDead";
-		monster "in_rogue",259,320,"Ghoul",1036,1,"mob_rogue#15::OnMyMobDead";
-		monster "in_rogue",240,319,"Mummy",1041,1,"mob_rogue#15::OnMyMobDead";
-		monster "in_rogue",259,319,"Archer Skeleton",1016,1,"mob_rogue#15::OnMyMobDead";
-		monster "in_rogue",259,320,"Ghoul",1036,1,"mob_rogue#15::OnMyMobDead";
-	}
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		monster "in_rogue",240,319,"Mummy",1041,1;
+		monster "in_rogue",259,319,"Archer Skeleton",1016,1;
+		monster "in_rogue",259,320,"Ghoul",1036,1;
+		monster "in_rogue",240,319,"Mummy",1041,1;
+		monster "in_rogue",259,319,"Archer Skeleton",1016,1;
+		monster "in_rogue",259,320,"Ghoul",1036,1;
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 
-OnDisable:
+OnReset:
 	killmonster "in_rogue","mob_rogue#15::OnMyMobDead";
 	end;
-
-OnMyMobDead:
-	end;
 }
 
-in_rogue,334,319,0	script	mob_rogue#16	-1,8,8,{
+in_rogue,334,319,0	script	mob_rogue#16	139,8,8,{
+
 OnTouch:
-	if (BaseJob == Job_Thief)
-		donpcevent "mob_rogue#15::OnDisable";
-	else
+	if (Class == Job_Baby_Thief || Class == Job_Thief) {
+		donpcevent "mob_rogue#15::OnReset";
+	} else {
 		warp "mag_dun02",181,176;
+	}
 	end;
 }
 
-in_rogue,3,3,0	script	resetter#rogue	-1,{
+in_rogue,3,3,0	script	resetter#rogue	139,{
+	end;
+
 OnTimer500000:
-	donpcevent "mob_rogue#1::OnDisable";
-	donpcevent "mob_rogue#2::OnDisable";
-	donpcevent "mob_rogue#3::OnDisable";
-	donpcevent "mob_rogue#4::OnDisable";
-	donpcevent "mob_rogue#5::OnDisable";
-	donpcevent "mob_rogue#6::OnDisable";
-	donpcevent "mob_rogue#7::OnDisable";
-	donpcevent "mob_rogue#8::OnDisable";
-	donpcevent "mob_rogue#9::OnDisable";
-	donpcevent "mob_rogue#10::OnDisable";
-	donpcevent "mob_rogue#12::OnDisable";
-	donpcevent "mob_rogue#13::OnDisable";
-	donpcevent "mob_rogue#15::OnDisable";
+	donpcevent "mob_rogue#1::OnReset";
+	donpcevent "mob_rogue#2::OnReset";
+	donpcevent "mob_rogue#3::OnReset";
+	donpcevent "mob_rogue#4::OnReset";
+	donpcevent "mob_rogue#5::OnReset";
+	donpcevent "mob_rogue#6::OnReset";
+	donpcevent "mob_rogue#7::OnReset";
+	donpcevent "mob_rogue#8::OnReset";
+	donpcevent "mob_rogue#9::OnReset";
+	donpcevent "mob_rogue#10::OnReset";
+	donpcevent "mob_rogue#12::OnReset";
+	donpcevent "mob_rogue#13::OnReset";
+	donpcevent "mob_rogue#15::OnReset";
 	initnpctimer;
 	end;
 
@@ -1990,45 +2163,34 @@ OnInit:
 	end;
 }
 
-in_rogue,399,286,1	script	switch#rogreset	88,{
-	mes "^F08080Tah dah~";
-	mes "Monsters for the";
-	mes "Rogue Job Change";
-	mes "have been reset^000000.";
-	donpcevent "mob_rogue#1::OnDisable";
-	donpcevent "mob_rogue#2::OnDisable";
-	donpcevent "mob_rogue#3::OnDisable";
-	donpcevent "mob_rogue#4::OnDisable";
-	donpcevent "mob_rogue#5::OnDisable";
-	donpcevent "mob_rogue#6::OnDisable";
-	donpcevent "mob_rogue#7::OnDisable";
-	donpcevent "mob_rogue#8::OnDisable";
-	donpcevent "mob_rogue#9::OnDisable";
-	donpcevent "mob_rogue#10::OnDisable";
-	donpcevent "mob_rogue#12::OnDisable";
-	donpcevent "mob_rogue#13::OnDisable";
-	donpcevent "mob_rogue#15::OnDisable";
-	donpcevent "resetter#rogue::OnEnable";
-	close;
-}
+in_rogue,375,33,0	warp	warp_rogue#1	1,1,in_rogue,380,125
+in_rogue,375,125,0	warp	warp_rogue#2	1,1,in_rogue,379,33
+in_rogue,375,46,0	warp	warp_rogue#3	1,1,cmd_fild07,196,117
+cmd_fild07,193,117,0	warp	warp_rogue#4	1,1,in_rogue,379,46
+in_rogue,247,122,0	warp	cmd=fild07	1,1,cmd_fild07,349,285
 
-//============================================================ 
-// mapflag
-//============================================================ 
+in_rogue,399,286,1	script	switch#rogreset	88,{
 
-//============================================================ 
-// Old changelog
-//============================================================ 
-//= 1.1 fixed 3 wrong questions, added missing lines [Lupus]
-//= 1.3 Baby Class Support + 40/50 JobLevel Item fix [Lupus]
-//= 1.5 Fixed possible EXP abuse [Lupus]
-//= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
-//= 2.0 Changed numbers to constants. [Vicious]
-//= 2.1 Removed Duplicates [Silent]
-//= 2.2 Merged JFunc [Lupus]
-//= 2.3 Added a possibility for players doing Meginjyard quest
-//= to enter Rogue guild as there's a NPC inside [SinSloth]
-//= 2.3a fixed test4 person interaction, let BABY thieves pass
-//=	the test, too [Lupus]
+	if(getgmlevel() == 99){
+		mes "^F08080Tah dah~";
+		mes "Monsters for the";
+		mes "Rogue Job Change";
+		mes "have been reset^000000.";
+		donpcevent "mob_rogue#1::OnReset";
+		donpcevent "mob_rogue#2::OnReset";
+		donpcevent "mob_rogue#3::OnReset";
+		donpcevent "mob_rogue#4::OnReset";
+		donpcevent "mob_rogue#5::OnReset";
+		donpcevent "mob_rogue#6::OnReset";
+		donpcevent "mob_rogue#7::OnReset";
+		donpcevent "mob_rogue#8::OnReset";
+		donpcevent "mob_rogue#9::OnReset";
+		donpcevent "mob_rogue#10::OnReset";
+		donpcevent "mob_rogue#12::OnReset";
+		donpcevent "mob_rogue#13::OnReset";
+		donpcevent "mob_rogue#15::OnReset";
+		donpcevent "resetter#rogue::OnEnable";
+		close;
+	}
+	end;
+}
\ No newline at end of file