Update to last rAthena npc.

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

1 files changed, 150 insertions, 138 deletions

diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 3909d63b2..dff5abf61 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -1,12 +1,12 @@
 //===== Hercules Script ======================================
 //= Alberta Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= DZeroX
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Town-specific Alberta NPCs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Converted from Aegis 10.4 [DZeroX]
 //= 1.1 Optimized, missing next, REMOVED .GATs! again [Lupus]
 //= 1.2 Implemented progression fixes provided by $ephiroth. [L0ne_W0lf]
@@ -67,41 +67,45 @@ alberta,131,139,2	script	Drunken Old Man	54,{
 	mes "Wh-what are you";
 	mes "staring at? Get lost!!";
 	next;
-	if(select("Say nothing.","Leave him alone.") == 1) {
-		mes "[Deagle]";
-		mes "Hahahaha ^666666*hiccup*^000000... You've got some nerve. I may look worthless now, but I used to be a sailor on the 'Going Mary.'";
-		next;
-		if(select("Never heard of it.","Really? No kidding!") == 1) {
-			mes "[Deagle]";
-			mes "Never heard of it?! Everybody knows th'notorious pirate ship 'Going Mary!' ^666666*Hiccup~*^000000";
-			next;
+	switch(select("Say nothing.","Leave him alone.")) {
+		case 1:
 			mes "[Deagle]";
-			mes "Ah~ The ol'days. If only... If only we hadn't run into that STORM...^666666*hiccup*^000000";
+			mes "Hahahaha ^666666*hiccup*^000000... You've got some nerve. I may look worthless now, but I used to be a sailor on the 'Going Mary.'";
 			next;
+			switch(select("Never heard of it.","Really? No kidding!")) {
+				case 1:
+					mes "[Deagle]";
+					mes "Never heard of it?! Everybody knows th'notorious pirate ship 'Going Mary!' ^666666*Hiccup~*^000000";
+					next;
+					mes "[Deagle]";
+					mes "Ah~ The ol'days. If only... If only we hadn't run into that STORM...^666666*hiccup*^000000";
+					next;
+					mes "[Deagle]";
+					mes "AH~ Captain. I miss our cap'n more than anything... No foe survived before cap'n's sword.";
+					close;
+				case 2:
+					mes "[Deagle]";
+					mes "That's right! NOBODY meshes with the crew of the 'Going Mary!' And nobody can beat out cap'n in a sword fight!";
+					next;
+					mes "[Deagle]";
+					mes "CAPTAIN~!!! ^666666*HICCUP~*^000000 He would swing his sword like this, then... THEN!!";
+					next;
+					mes "[Deagle]";
+					mes "The bastard the captain was fighting, and anyone of his friends near him, were surrounded in flame!";
+					next;
+					mes "[Deagle]";
+					mes "Man, that sword must have had some sort of mysterious power, or the captain was just that good...!";
+					next;
+					mes "[Deagle]";
+					mes "Phew~~ ^666666*Sob* *Sob...*^000000 God, I miss everyone! Now I'm depressed! Please, go away now.";
+					close;
+			}
+		case 2:
 			mes "[Deagle]";
-			mes "AH~ Captain. I miss our cap'n more than anything... No foe survived before cap'n's sword.";
+			mes "That's right!";
+			mes "Go AWAY~";
 			close;
-		}
-		mes "[Deagle]";
-		mes "That's right! NOBODY meshes with the crew of the 'Going Mary!' And nobody can beat out cap'n in a sword fight!";
-		next;
-		mes "[Deagle]";
-		mes "CAPTAIN~!!! ^666666*HICCUP~*^000000 He would swing his sword like this, then... THEN!!";
-		next;
-		mes "[Deagle]";
-		mes "The bastard the captain was fighting, and anyone of his friends near him, were surrounded in flame!";
-		next;
-		mes "[Deagle]";
-		mes "Man, that sword must have had some sort of mysterious power, or the captain was just that good...!";
-		next;
-		mes "[Deagle]";
-		mes "Phew~~ ^666666*Sob* *Sob...*^000000 God, I miss everyone! Now I'm depressed! Please, go away now.";
-		close;
 	}
-	mes "[Deagle]";
-	mes "That's right!";
-	mes "Go AWAY~";
-	close;
 }
 
 alberta,58,80,2	script	Shakir	99,{
@@ -228,7 +232,7 @@ alb2trea,39,50,6	script	Fisk#a2t	100,{
 	mes "[Fisk]";
 	mes "So you wanna head back to the mainland in Alberta, eh?";
 	next;
-	if(select("Yes please.","I changed my mind.") == 1)
+	if(select("Yes please.","I changed my mind.")==1)
 		warp "alberta",192,169;
 	close;
 }
@@ -251,22 +255,25 @@ alberta,195,151,2	script	Paul	86,{
 	mes "fee is only";
 	mes "200 Zeny.";
 	next;
-	if(select("Sign me up!","Uh, no thanks.") == 1) {
-		if (Zeny < 200) {
+	switch(select("Sign me up!","Uh, no thanks.")) {
+		case 1:
+			if (Zeny < 200) {
+				mes "[Paul]";
+				mes "It seems you don't have the money, my friend. But please come back when you're able to pay.";
+				close;
+			} else {
+				set Zeny,Zeny - 200;
+				warp "alb2trea",62,69;
+				close;
+			}
+		case 2:
 			mes "[Paul]";
-			mes "It seems you don't have the money, my friend. But please come back when you're able to pay.";
+			mes "Alright, well...";
+			mes "I'll be around";
+			mes "if you change";
+			mes "your mind.";
 			close;
-		}
-		set Zeny,Zeny - 200;
-		warp "alb2trea",62,69;
-		close;
 	}
-	mes "[Paul]";
-	mes "Alright, well...";
-	mes "I'll be around";
-	mes "if you change";
-	mes "your mind.";
-	close;
 }
 
 alberta,190,173,4	script	Phelix	85,{
@@ -292,106 +299,111 @@ alberta,190,173,4	script	Phelix	85,{
 		mes "If you're interested in my offer, get me the stuff I mentioned.";
 		set @event_zelopy,1;
 		close;
-	}
-	mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?";
-	next;
-	if(select("Red Potions please.","Carrots please.") == 1) {
-		mes "[Phelix]";
-		mes "Alright...";
-		mes "Let's see";
-		mes "what'cha got...";
-		next;
-		mes "[Phelix]";
-		if (countitem(909) < 10) {
-			mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?";
-			close;
-		}
-		set .@max,countitem(909)/10;
-		mes "Hmm, not bad...";
-		mes "How many potions";
-		mes "do you want to get?";
+	} else {
+		mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?";
 		next;
-		switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
+		switch(select("Red Potions please.","Carrots please.")) {
 		case 1:
-			delitem 909,.@max*10;	// Jellopy
-			getitem 501,.@max;	// Red_Potion
-			break;
-		case 2:
 			mes "[Phelix]";
-			mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
-			mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?.";
-			input .@amount;
+			mes "Alright...";
+			mes "Let's see";
+			mes "what'cha got...";
 			next;
 			mes "[Phelix]";
-			if (.@amount <= 0) {
-				mes "Much obliged, come again anytime.";
+			if (countitem(909) < 10) {
+				mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?";
 				close;
-			}
-			if (.@amount > 100) {
-				mes "Hey, what'd I say? 100 at a time at most, you're trying to kill me aren't you!";
+			} else {
+				set .@max,countitem(909)/10;
+				mes "Hmm, not bad...";
+				mes "How many potions";
+				mes "do you want to get?";
+				next;
+				switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
+				case 1:
+					delitem 909,.@max*10;	// Jellopy
+					getitem 501,.@max;	// Red_Potion
+					break;
+				case 2:
+					mes "[Phelix]";
+					mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
+					mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?.";
+					input .@amount;
+					next;
+					mes "[Phelix]";
+					if (.@amount <= 0) {
+						mes "Much obliged, come again anytime.";
+						close;
+					}
+					if (.@amount > 100) {
+						mes "Hey, what'd I say? 100 at a time at most, you're trying to kill me aren't you!";
+						close;
+					}
+					if (countitem(909) < .@amount*10) {
+						mes "Hmm, it looks like you don't have enough. Go get more jellopies if you want anything else from me.";
+						close;
+					}
+					delitem 909,.@amount*10;	// Jellopy
+					getitem 501,.@amount;	// Red_Potion
+					break;
+				case 3:
+					mes "[Phelix]";
+					mes "No problem,";
+					mes "see you next time.";
+					close;
+				}
+				mes "[Phelix]";
+				mes "There you go! As I promised. Don't go suckin' them all down at once.";
 				close;
 			}
-			if (countitem(909) < .@amount*10) {
-				mes "Hmm, it looks like you don't have enough. Go get more jellopies if you want anything else from me.";
+		case 2:
+			mes "[Phelix]";
+			mes "Alright, let's see what ya got...";
+			next;
+			mes "[Phelix]";
+			if (countitem(909) < 3) {
+				mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?";
+				close;
+			} else {
+				set .@max,countitem(909)/3;
+				mes "Not too bad pansy...";
+				mes "How many do you want?";
+				next;
+				switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
+				case 1:
+					delitem 909,.@max*3;	// Jellopy
+					getitem 515,.@max;	// Carrot
+					break;
+				case 2:
+					mes "[Phelix]";
+					mes "Right I'm not giving you more then 100 at a time so don't bother, okay? If you don't want any, just say '0'.";
+					input .@amount;
+					next;
+					mes "[Phelix]";
+					if (.@amount == 0) {
+						mes "Alright then, see you next time.";
+						close;
+					}
+					if (.@amount > 100) {
+						mes "Hey pansy ass, I said 100 at most, no more then that! I'm not going to break my back for the likes of you!";
+						close;
+					}
+					if (countitem(909) < .@amount*10) {
+						mes "Seems you don't have enough. Go get some more if you want anything else.";
+						close;
+					}
+					delitem 909,.@amount*3;	// Jellopy
+					getitem 515,.@amount;	// Carrot
+					break;
+				case 3:
+					mes "[Phelix]";
+					mes "Catch'ya later.";
+					close;
+				}
+				mes "[Phelix]";
+				mes "There you go~! As I promised. Try not to stuff yer face.";
 				close;
 			}
-			delitem 909,.@amount*10;	// Jellopy
-			getitem 501,.@amount;	// Red_Potion
-			break;
-		case 3:
-			mes "[Phelix]";
-			mes "No problem,";
-			mes "see you next time.";
-			close;
 		}
-		mes "[Phelix]";
-		mes "There you go! As I promised. Don't go suckin' them all down at once.";
-		close;
-	}
-	mes "[Phelix]";
-	mes "Alright, let's see what ya got...";
-	next;
-	mes "[Phelix]";
-	if (countitem(909) < 3) {
-		mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?";
-		close;
 	}
-	set .@max,countitem(909)/3;
-	mes "Not too bad pansy...";
-	mes "How many do you want?";
-	next;
-	switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
-	case 1:
-		delitem 909,.@max*3;	// Jellopy
-		getitem 515,.@max;	// Carrot
-		break;
-	case 2:
-		mes "[Phelix]";
-		mes "Right I'm not giving you more then 100 at a time so don't bother, okay? If you don't want any, just say '0'.";
-		input .@amount;
-		next;
-		mes "[Phelix]";
-		if (.@amount == 0) {
-			mes "Alright then, see you next time.";
-			close;
-		}
-		if (.@amount > 100) {
-			mes "Hey pansy ass, I said 100 at most, no more then that! I'm not going to break my back for the likes of you!";
-			close;
-		}
-		if (countitem(909) < .@amount*10) {
-			mes "Seems you don't have enough. Go get some more if you want anything else.";
-			close;
-		}
-		delitem 909,.@amount*3;	// Jellopy
-		getitem 515,.@amount;	// Carrot
-		break;
-	case 3:
-		mes "[Phelix]";
-		mes "Catch'ya later.";
-		close;
-	}
-	mes "[Phelix]";
-	mes "There you go~! As I promised. Try not to stuff yer face.";
-	close;
 }