Update to last rAthena npc.

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

1 files changed, 35 insertions, 44 deletions

diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index f09437058..d64281100 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -1,24 +1,24 @@
 //===== Hercules Script ======================================
 //= Bard Skill Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Official quest for the Bard skill "Pang Voice"
 //= Prerequisite: Geffen Bard Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
-//= 	Somehow eA engine doesn't let you keep learn't skill
+//=     Somehow eA engine doesn't let you keep learn't skill
 //= 1.2 Added to correct locations, correct NPC's, fixed [Reddozen]
-//= 	some of the items required and made them into real
-//= 	quests.
+//=     some of the items required and made them into real
+//=     quests.
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a Tixed an item ID typo. Thanks, 2Spiritual Kid
 //= 1.3b Split into different files [DracoRPG]
-//= 1.4	Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.4a Checks the proper variable now. (bard_q -> gef_bard_q) [L0ne_W0lf]
 //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.6 Added missing checkweights. [L0ne_W0lf]
@@ -27,7 +27,7 @@
 
 prontera,174,328,3	script	Young Man#bard_q1	89,3,3,{
 	if (BaseJob == Job_Bard) {
-		Emotion e_omg;
+		emotion e_omg;
 		mes "[Timid Young Man]";
 		mes "Eh? Wwwaaaah--!";
 		mes "Y-you're--it's-it's--";
@@ -372,7 +372,7 @@ prontera,174,328,3	script	Young Man#bard_q1	89,3,3,{
 
 OnTouch:
 	if (BaseJob == Job_Bard) {
-		Emotion e_omg;
+		emotion e_omg;
 	}
 	end;
 }
@@ -652,7 +652,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 			mes "[Riott]";
 			mes "Hmmrmpf!";
 			mes "Eh heh heh heh!";
-			Emotion e_gg;
+			emotion e_gg;
 			next;
 			mes "[" + strcharinfo(0) + "]";
 			mes "Um...";
@@ -837,7 +837,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 		mes "[Riott]";
 		mes "Hmmrmpf!";
 		mes "Eh heh heh heh!";
-		Emotion e_gg;
+		emotion e_gg;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Um...";
@@ -896,15 +896,15 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 	}
 
 OnTouch:
-	Emotion e_gg;
+	emotion e_gg;
 	end;
 }
 
 // Yhelle the Chicken
-//============================================================ 
+//============================================================
 niflheim,239,70,1	script	Yhelle#bard_chick1	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -936,8 +936,8 @@ OnTouch:
 }
 
 niflheim,185,205,3	script	Yhelle#bard_chick2	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -962,8 +962,8 @@ OnTouch:
 }
 
 niflheim,85,203,5	script	Yhelle#bard_chick3	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -988,8 +988,8 @@ OnTouch:
 }
 
 niflheim,149,81,7	script	Yhelle#bard_chick4	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -1014,8 +1014,8 @@ OnTouch:
 }
 
 niflheim,209,144,3	script	Yhelle#bard_chick5	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -1040,7 +1040,7 @@ OnTouch:
 }
 
 // Drunken Men
-//============================================================ 
+//============================================================
 morocc_in,178,73,3	script	Customer#bard_skill01	54,{
 	mes "[Little Bit Drunken Guy]";
 	mes "What do you think";
@@ -1162,7 +1162,7 @@ morocc_in,175,70,7	script	Customer#bard_skill02	50,{
 }
 
 // Bartender
-//============================================================ 
+//============================================================
 morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFHold it right there!";
@@ -1175,8 +1175,7 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 	next;
 	switch(select("Tropical Sograt:Vermilion on the Beach:Nothing, thanks.")) {
 	case 1:
-		set .@now_weight,maxWeight-Weight;
-		if (.@now_weight < 2000) {
+		if (MaxWeight - Weight < 2000) {
 			mes "[Bartender]";
 			mes "You sure you can carry";
 			mes "any more stuff with you?";
@@ -1203,13 +1202,12 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 		mes "mild, but if you're not";
 		mes "careful, you'll pass out";
 		mes "in no time flat. Take it easy.";
-		set zeny,zeny-1000;
+		set Zeny, Zeny-1000;
 		getitem 12112,1; //Tropical_Sograt
 		close;
 
 	case 2:
-		set .@now_weight,maxWeight-Weight;
-		if (.@now_weight < 2000) {
+		if (MaxWeight - Weight < 2000) {
 			mes "[Bartender]";
 			mes "You sure you can carry";
 			mes "any more stuff with you?";
@@ -1234,7 +1232,7 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 		mes "Be sure that you";
 		mes "enjoy your drinking";
 		mes "without going crazy.";
-		set zeny,zeny-1000;
+		set Zeny, Zeny-1000;
 		getitem 12113,1; //Vermilion_The_Beach
 		close;
 
@@ -1247,22 +1245,15 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 }
 
 // Function
-//============================================================ 
+//============================================================
 function	script	F_BardSkillYhelle	{
-	//set max_max_c,1201;
-	//if (max_max_c == 1) {
-	//	mes "^3355FFHold it right there!";
-	//	mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
 		close;
 	}
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";