Update to last rAthena npc.

Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt

3 files changed, 57 insertions, 63 deletions

diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index 4b768a58a..a34a8252a 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -1,32 +1,30 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Gunslinger Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= erKURITA, RockmanEXE, Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Gunslinger Job Change Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Made the NPC [erKURITA]
 //= 1.5 Couple fixes to the npc, aswell as adding the missing
-//=	  3 green herbs. [erKURITA]
+//=     3 green herbs. [erKURITA]
 //= 1.6 job number->const, commonized variable name,
-//= 	optimized [Lupus]
+//=     optimized [Lupus]
 //= 1.7 Now uses only ONE variable GUNS_Q [Lupus]
 //= 1.7a Grammar fixes, few spelling fixes, etc [CBMaster]
 //= 1.7b Parenthesis fixes [KarLaeda]
 //= 1.8 Fixed the reward you can get [Playtester]
 //= 1.9 Removed some 'clever' script constructs [ultramage]
 //= 2.0 Updated to official version - Thanks to Omega for
-//= his first try [SinSloth] 1.10b - removed .GATs [Lupus]
+//=     his first try [SinSloth] 1.10b - removed .GATs [Lupus]
 //= 2.1 Wise Bull Horn now deletes all items. Thanks to yyCC. [L0ne_W0lf]
 //= 2.1a Corrected a Typo error ";;". [Samuray22]
 //= 2.1b Corrected some typos errors. (bugreport:1549) [Samuray22]
 //= 2.1c Fixed some missing/messed up item checks. (bugreport:2693) [Kisuka]
 //= 2.2 Updated to match AEGIS script and Added Quest Log commands. [Kisuka]
-//============================================================ 
+//============================================================
 
 que_ng,152,167,3	script	Master Miller	901,{
 	if (Upper == 2) {
@@ -92,7 +90,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			setquest 6020;
 			close;
 		}
-		else if(GUNS_Q == 1) {
+		else if (GUNS_Q == 1) {
 			mes "[Master Miller]";
 			mes "Take that letter of";
 			mes "introduction I've written";
@@ -102,7 +100,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "Gunslinger material.";
 			close;
 		}
-		else if(GUNS_Q == 2) {
+		else if (GUNS_Q == 2) {
 			mes "[Master Miller]";
 			mes "Hmm... Wise Bull Horn";
 			mes "asked you to collect the";
@@ -111,7 +109,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "part of his qualification test.";
 			close;
 		}
-		else if(GUNS_Q == 3) {
+		else if (GUNS_Q == 3) {
 			mes "[Master Miller]";
 			mes "Wise Bull Horn asked";
 			mes "you to bring him some";
@@ -120,7 +118,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "for favors. Good luck, friend.";
 			close;
 		}
-		else if(GUNS_Q == 4) {
+		else if (GUNS_Q == 4) {
 			mes "[Master Miller]";
 			mes "I expect to hear good";
 			mes "news from you soon. You";
@@ -128,8 +126,8 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "you'll become a Gunslinger.";
 			close;
 		}
-		else if(GUNS_Q == 5) {
-			if (Skillpoint != 0) {
+		else if (GUNS_Q == 5) {
+			if (SkillPoint != 0) {
 				mes "[Master Miller]";
 				mes "Hey, you have leftover";
 				mes "Skill Points. You better";
@@ -184,13 +182,13 @@ que_ng,152,167,3	script	Master Miller	901,{
 			set GUNS_Q,6;
 			completequest 6024;
 			if (rand(1,2) == 1) {
-				getitem 13100,1;	// Six_Shooter
-			}else{
-				getitem 13150,1;	// Branch
+				getitem 13100,1; // Six_Shooter
+			} else {
+				getitem 13150,1; // Branch
 			}
 			close;
 		}
-	}else{
+	} else {
 		if (Class == Job_Gunslinger) {
 			mes "[Master Miller]";
 			mes "Oh! Long time, no see,";
@@ -200,7 +198,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "Take care of it, and it'll take";
 			mes "care of you. Remember it.";
 			close;
-		}else{
+		} else {
 			mes "[Master Miller]";
 			mes "If you don't have";
 			mes "any business with me,";
@@ -266,7 +264,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		changequest 6020,6021;
 		close;
 	}
-	else if(GUNS_Q == 2) {
+	else if (GUNS_Q == 2) {
 		if (countitem(912) < 3 || countitem(914) < 3 || countitem(1019) < 1 || countitem(935) < 10 || countitem(511) < 3 || countitem(1013) < 3) {
 			mes "[Wise Bull Horn]";
 			mes "I can make a voucher that";
@@ -293,12 +291,12 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 			mes "a Gunslinger.";
 			close;
 		}
-		delitem 912,3;	// Zargon
-		delitem 914,3;	// Fluff
-		delitem 1019,1;	// Wooden_Block
-		delitem 935,10;	// Shell
-		delitem 511,3;	// Green_Herb
-		delitem 1013,3;	// Colorful_Shell
+		delitem 912,3; // Zargon
+		delitem 914,3; // Fluff
+		delitem 1019,1; // Wooden_Block
+		delitem 935,10; // Shell
+		delitem 511,3; // Green_Herb
+		delitem 1013,3; // Colorful_Shell
 		set GUNS_Q,3;
 		changequest 6021,6022;
 		mes "[Wise Bull Horn]";
@@ -310,7 +308,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		mes "I should be finished with it.";
 		close;
 	}
-	else if(GUNS_Q == 3) {
+	else if (GUNS_Q == 3) {
 		mes "[Wise Bull Horn]";
 		mes "Oh, you've arrived just";
 		mes "in time. It's been a while";
@@ -350,7 +348,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		changequest 6022,6023;
 		close;
 	}
-	else if(GUNS_Q == 4) {
+	else if (GUNS_Q == 4) {
 		if (countitem(519) < 1) {
 			mes "[Wise Bull Horn]";
 			mes "I'm an old man that will";
@@ -360,7 +358,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 			mes "a cold glass of Milk, please?";
 			close;
 		}
-		delitem 519,1;	// Milk
+		delitem 519,1; // Milk
 		set GUNS_Q,5;
 		changequest 6023,6024;
 		mes "[Wise Bull Horn]";
@@ -390,7 +388,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		mes "Yippee Yippee Yai Yocaiyay~";
 		close;
 	}
-	else if(GUNS_Q == 5) {
+	else if (GUNS_Q == 5) {
 		mes "[Wise Bull Horn]";
 		mes "Please take this voucher";
 		mes "to Miller, the Black Fox, with";
@@ -406,7 +404,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		mes "Yippee Yippee Yai Yocaiyay~";
 		close;
 	}
-	else if(GUNS_Q == 6) {
+	else if (GUNS_Q == 6) {
 		mes "[Wise Bull Horn]";
 		mes "AAh, long time no see.";
 		mes "I hope that you become";
diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt
index dcd9a851a..d74ed85d6 100644
--- a/npc/jobs/1-1e/ninja.txt
+++ b/npc/jobs/1-1e/ninja.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Ninja Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Legionaire, Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Ninja Job Change Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Optimized, updated, checked [Lupus]
 //= 1.2 Added Akagi [Playtester]
 //= 1.3 Updated dialogs to official ones and optimized [SinSloth]
 //= 1.4 Fixed a minor bug [SinSloth]
 //= 1.5 Updated to match AEGIS script and Added Quest Log commands. [Kisuka]
 //= 1.6 Fixed AEGIS amatsu warp typo. [Kisuka]
-//============================================================ 
+//============================================================
 
 alberta,30,65,3	script	Akagi	730,{
 	if (Class == Job_Novice) {
@@ -53,7 +51,7 @@ alberta,30,65,3	script	Akagi	730,{
 					warp "amatsu",178,176;
 					end;
 			}
-		}else{
+		} else {
 			mes "[Akagi]";
 			mes "Hm? I cannot be";
 			mes "of any service to";
@@ -61,7 +59,7 @@ alberta,30,65,3	script	Akagi	730,{
 			mes "a little stronger...";
 			close;
 		}
-	}else{
+	} else {
 		mes "[Akagi]";
 		mes "Hmm...";
 		mes "You and I...";
@@ -192,7 +190,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			setquest 6015;
 			close;
 		}
-		else if(NINJ_Q == 1) {
+		else if (NINJ_Q == 1) {
 			mes "[Cougar]";
 			mes "Even if this task";
 			mes "isn't that urgent,";
@@ -201,7 +199,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "my letter to Wildcat Joe.";
 			close;
 		}
-		else if(NINJ_Q == 2) {
+		else if (NINJ_Q == 2) {
 			mes "[Cougar]";
 			mes "Did you deliver that";
 			mes "letter to Wildcat Joe?";
@@ -211,7 +209,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "if you can needle him for it.";
 			close;
 		}
-		else if(NINJ_Q == 3) {
+		else if (NINJ_Q == 3) {
 			mes "[Cougar]";
 			mes "Ah, you've returned.";
 			mes "So did Wildcat Joe send";
@@ -259,7 +257,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			changequest 6017,6018;
 			close;
 		}
-		else if(NINJ_Q == 4) {
+		else if (NINJ_Q == 4) {
 			if (countitem(7053) < 5 || countitem(1010) < 1) {
 				mes "[Cougar]";
 				mes "Hurry and bring";
@@ -270,7 +268,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 				mes "against Wildcat Joe!";
 				close;
 			}
-			if (Skillpoint != 0) {
+			if (SkillPoint != 0) {
 				mes "[Cougar]";
 				mes "Whoa, whoa...";
 				mes "You still have some";
@@ -350,7 +348,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "the respect of any Ninja~";
 			close;
 		}
-	}else{
+	} else {
 		if (Class == Job_Ninja) {
 			mes "[Cougar]";
 			mes "How have you been?";
@@ -360,7 +358,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "can do that, you'll get";
 			mes "the respect of any Ninja~";
 			close;
-		}else{
+		} else {
 			mes "[Cougar]";
 			mes "What...?";
 			mes "How were you able";
@@ -436,7 +434,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		changequest 6015,6016;
 		close;
 	}
-	else if(NINJ_Q == 2) {
+	else if (NINJ_Q == 2) {
 		if (countitem(7053) < 5 || countitem(1010) < 1) {
 			mes "[Suspicious Man]";
 			mes "Please bring";
@@ -532,7 +530,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		warp "amatsu",113,127;
 		end;
 	}
-	else if(NINJ_Q == 3) {
+	else if (NINJ_Q == 3) {
 		mes "[Red Leopard Joe]";
 		mes "Eh? I'm not sure what";
 		mes "happened, but it seems";
@@ -555,7 +553,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		warp "amatsu",113,127;
 		end;
 	}
-	else if(NINJ_Q == 4) {
+	else if (NINJ_Q == 4) {
 		mes "[Red Leopard Joe]";
 		mes "Cougar asked you to";
 		mes "gather some materials";
@@ -565,7 +563,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		mes "to beat him in a fair fight~";
 		close;
 	}
-	else if(NINJ_Q == 5 && Class == Job_Ninja) {
+	else if (NINJ_Q == 5 && Class == Job_Ninja) {
 		mes "[Red Leopard Joe]";
 		mes "Oh, you're a Ninja~";
 		mes "I hope you continue to";
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 6d748530f..dffae4639 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Taekwon Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Tsuyuki & Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena/Freya
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Official iRO TaeKwon Job Change Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Replaced previous TK Job Quest with this one [Tsuyuki]
 //= 1.1 Rewrote to the Aegis Standars. [Samuray22]
 //= 1.2 Fixed position the npc is facing. [Kisuka]
 //= 1.3 Added Quest Log commands. [Kisuka]
 //= 1.4 Removed use of 'goto', and fixed some indentation. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 payon,157,141,5	script	Phoenix#TKJobChange	753,{
 	if(Upper == 2) {