* Raised MAX_MERCENARY_CLASS to 44 for new mercenaries.

* Raised max_lv to allow values up to 150 in battle.conf.
* Raised MAX_SKILL_TREE 77 in prep for 3rd class skill trees.
* Upped max_lv and max_aura to 150, and max_aspd to 193.
* Added Brasilis database updates from trunk r14928.
* Added scripts and NPC Brasilis updates from trunk r14928.

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

1 files changed, 109 insertions, 38 deletions

diff --git a/npc/cities/brasilis.txt b/npc/cities/brasilis.txt
index 4d97694fc..45581fe6e 100644
--- a/npc/cities/brasilis.txt
+++ b/npc/cities/brasilis.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -12,79 +12,150 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First version. Transportation and Basic NPCs.
 //= 1.1 Fixed Zeny not being removed for payment. [Kisuka]
+//= 1.2 Updated dialog, added Ice Cream Maker. [L0ne_W0lf]
 //============================================================ 
 
-alberta,247,115,3	script	Brute Sailor#bra2	100,{
-	mes "[Brute Sailor]";
-	mes "Hey, have you heard of the place called Brasilis?";
-	mes "It's a place that's as hot as the Morroc desert, and as dense as the forests of Payon.";
+alberta,247,115,3	script	Crewman#bra2	100,{
+	mes "[Crewman]";
+	mes "Hey, have you heard of a place called Brasilis?";
+	mes "It's a tropical city that's hot like the desert but also rainy. It is a very mysterious place.";
 	next;
-	mes "[Brute Sailor]";
-	mes "I have a map to get there, if you want I can take you to Brasilis.";
-	mes "It will only cost you 10,000 zeny. What do you say?";
+	mes "[Crewman]";
+	mes "We recently found a new ocean route to get there easily.";
+	mes "It's just 10,000 zeny for a round trip! So do you want to go?";
 	next;
-	switch(select("Let's go to Brasilis!:Cancel.")) {
+	switch(select("Take me to Brasilis!:I'll stay here.")) {
 	case 1:
-		if (Zeny > 9999	) {
-			mes "[Brute Sailor]";
-			mes "Great! Let's Go!";
+		if (Zeny > 9999) {
+			mes "[Crewman]";
+			mes "Cool~!! Let's go~!";
+			set zeny,zeny-10000;
 			close2;
-			set Zeny,Zeny-10000;
 			warp "brasilis",314,60;
 			end;
 		}
 		else {
-			mes "[Brute Sailor]";
-			mes "I'm sorry but you don't have";
-			mes "enough zeny now";
-			mes "You need 10,000 zeny";
-			mes "to go to Brasilis";
-			mes "Thank you.";
+			mes "[Crewman]";
+			mes "I said 10,000 zeny.";
 			close;
 		}
 	case 2:
-		mes "[Brute Sailor]";
-		mes "Let me know if you change your mind.";
+		mes "[Crewman]";
+		mes "Well if you're ever interested, let me know and I can take you there.";
 		close;
 	}
 }
 
-brasilis,316,57,3	script	Brute Sailor#bra1	100,{
-	mes "[Brute Sailor]";
-	mes "My ship will be heading back to Alberta soon, would you like to go back?";
+brasilis,316,57,3	script	Crewman#bra1	100,{
+	mes "[Crewman]";
+	mes "My ship is going to back to Alberta, do you want to join us?";
 	next;
-	switch(select("Return to Alberta.:Cancel.")) {
+	switch(select("Go back to Alberta.:Not yet~.")) {
 	case 1:
-		mes "[Brute Sailor]";
-		mes "Alright, lets get going!";
+		mes "[Crewman]";
+		mes "I sure do miss home.";
 		close2;
 		warp "alberta",244,115;
 		end;
 	case 2:
-		mes "[Brute Sailor]";
-		mes "Let me know if you change your mind.";
+		mes "[Crewman]";
+		mes "Ok, suit yourself. We'll see you when we get back then.";
 		close;
 	}
 }
 
-brasilis,278,137,3	script	Bulletin Board#bra1	858,{
-	mes ":: Happy Toucan Inn ::";
+brasilis,155,165,3	script	Signpost#bra1	858,{
+	mes ":: Art Museum ::";
 	close;
 }
 
-brasilis,244,248,1	script	Bulletin Board#bra2	858,{
-	mes ":: Brasilis Market ::";
+brasilis,195,231,3	script	Signpost#bra2	858,{
+	mes ":: Verass Monument ::";
 	close;
 }
 
-brasilis,155,165,3	script	Bulletin Board#bra3	858,{
-	mes ":: Brasilis Art Museum ::";
+brasilis,240,247,3	script	Signpost#bra3	858,{
+	mes ":: Market ::";
+	mes " ";
+	mes "- For your Potions and Weaponry -";
 	close;
 }
 
-brasilis,303,309,3	script	Bulletin Board#bra4	858,{
+brasilis,303,309,3	script	Signpost#bra4	858,{
 	mes ":: Jungle Cable ::";
-	mes " ";
-	mes "- Not recommended for the faint hearted! -";
+	mes "";
+	mes "- Not for the faint of heart -";
+	close;
+}
+
+brasilis,278,137,3	script	Signpost#bra5	858,{
+	mes ":: Brasilis Hotel ::";
 	close;
 }
+
+brasilis,137,77,5	script	Ice-Cream Maker	85,{
+	mes "[Ice Cream Maker]";
+	mes "Come~come~";
+	mes "Ice cream is the perfect snack for a hot day~";
+	mes "It's just ^3355FF100 Zeny^000000~";
+	mes "Ice Cream~";
+	mes "Get 'yer Ice Cream!";
+	next;
+	switch(select("Give me one!:Ice Cream?:Cancel.")) {
+	case 1:
+		mes "[Ice Cream Maker]";
+		mes "Since there are so many people want to get a cool ice cream you can order only 5 at a time.";
+		mes "So how many d'ya want?";
+		next;
+		while(1) {
+			input .@input; //,1,5;
+			if (.@input == 0) {
+				mes "[Ice Cream Maker]";
+				mes "None?";
+				mes "Fine get outta the way, I have customers to serve.";
+				close;
+			}
+			else if ((.@input < 0) || (.@input > 5)) {
+				mes "[Ice Cream Maker]";
+				mes "Wow.";
+				mes "You ordered too much.";
+				mes "If you eat over 5 you might need to fight with a monster in your stomach. Calm down buddy.";
+				next;
+			}
+			else
+				break;
+		}
+		set .@icecream_hap,.@input*100;
+		if (Zeny < .@icecream_hap) {
+			mes "[Ice Cream Maker]";
+			mes "Dood~! You don't have enough money.";
+			mes "It's only ^3355FF100 Zeny^000000~ Seriously!";
+			close;
+		}
+		if (!checkweight(536,.@input)) {
+			mes "[Ice Cream Maker]";
+			mes "You seem to have too much stuff.";
+			mes "Lighten your pack before buying this.";
+			close;
+		}
+		set zeny,zeny-.@icecream_hap;
+		getitem 536,.@input; //Ice_Cream
+		close;
+	case 2:
+		mes "[Ice Cream Maker]";
+		mes "'Ice cream is...";
+		mes "Wait, don't you know";
+		mes "what Ice Cream is?";
+		mes "What rock have you";
+		mes "been living under?";
+		next;
+		mes "[Ice Cream Maker]";
+		mes "I'm not going to even start with how weird that sounds.";
+		mes "Anyway, get 'yer Ice Cream right here while it's nice and cold.";
+		close;
+	case 3:
+		mes "[Ice Cream Maker]";
+		mes "Don't miss your chance to eat the greatest Ice Cream in all the land~!";
+		close;
+	}
+}