Update to last rAthena npc.

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

1 files changed, 44 insertions, 48 deletions

diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index e9256047f..00b1f21b9 100644
--- a/npc/re/quests/quests_brasilis.txt
+++ b/npc/re/quests/quests_brasilis.txt
@@ -1,13 +1,11 @@
 //===== Hercules Script ======================================
-//= Brasilis Qiests
+//= Brasilis Quests
 //===== By ===================================================
 //= L0ne_W0lf
 //===== Version ==============================================
-//= 1.2
-//===== Compatible With ======================================
-//= Hercules
+//= 1.2a
 //===== Description ==========================================
-//= [Translated from the Official]
+//= [Official Conversion]
 //= Lost Puppies (Repeatable, 24 hours.)
 //= Suspicious Beach (Repeatable, 24 hours. iRO/cRO version.)
 //= Guarana Candy Quest
@@ -18,9 +16,11 @@
 //= 1.0 First version.
 //= 1.1 Hydra Ball (12408)
 //= 1.2 Optimization. [Euphy]
+//= 1.2a Added 'consumeitem' command. [Euphy]
+//= 1.2b Updated RE EXP. [Michieru]
 //============================================================
 
-// Lost Puppies, Original file: dogdog.sc
+// Lost Puppies :: dogdog.sc
 //============================================================
 brasilis,297,307,5	script	Angelo#br	50,{
 	if (BaseLevel < 40) {
@@ -49,11 +49,12 @@ brasilis,297,307,5	script	Angelo#br	50,{
 		mes "Oh, thank you. You found all of 3 puppies.";
 		mes "Thanks a lot.";
 		mes "I hope this is useful to you. hoho.";
-		getexp 50000,0;
+		set .@randexp,rand(50000,112500);
+		getexp .@randexp,0;
 		erasequest 9031;
 		setquest 9032;
 		specialeffect2 EF_ASSUMPTIO;
-		percentheal 100,100;
+		consumeitem 607; //Yggdrasilberry
 		set .@rand,rand(1,10);
 		if (.@rand > 4 && .@rand < 9) getitem 504,2; //White_Potion
 		else if (.@rand > 8) getitem 608,1; //Seed_Of_Yggdrasil
@@ -142,7 +143,7 @@ bra_fild01,234,101,3	duplicate(Puppy#bra)	Puppy#d1	81
 bra_fild01,200,84,3	duplicate(Puppy#bra)	Puppy#d2	81
 bra_fild01,176,63,5	duplicate(Puppy#bra)	Puppy#d3	81
 
-// Suspicious Beach, original file: Suspicious_Beach.sc
+// Suspicious Beach :: Suspicious_Beach.sc
 //============================================================
 brasilis,192,133,6	script	Lucia#brasilis	478,{
 	/* -------------- Hydra Ball -------------------------
@@ -168,7 +169,7 @@ brasilis,192,133,6	script	Lucia#brasilis	478,{
 	else {
 		set .@nQState1,checkquest(9028);
 		set .@nQState2,checkquest(9029);
-		if (.@nQState1 == 0) {
+		if (.@nQState1 == -1) {
 			mes "[Lucia]";
 			mes "Hello.";
 			mes "Have you come here to hunt ^FF0000Strange Hydra^000000s?";
@@ -226,10 +227,10 @@ brasilis,192,133,6	script	Lucia#brasilis	478,{
 					//recall_completequest 9029;
 					if (.@nQState2 > -1) erasequest 9029;
 					setquest 9029;
-					percentheal 100,100;
-					sc_start SC_FOOD_LUK, 1200000, 5; percentheal 5,2;
-					sc_start SC_FOOD_VIT, 1200000, 5; percentheal 10,0;
-					sc_start SC_FOOD_DEX, 1200000, 5; percentheal 5,5;
+					consumeitem 607; //Yggdrasilberry
+					consumeitem 12070; //Luk_Dish05
+					consumeitem 12055; //Vit_Dish05
+					consumeitem 12065; //Dex_Dish05
 					getitem 11502,3; //Light_Blue_Pot
 					close;
 				}
@@ -354,7 +355,7 @@ OnTimer7000:
 	end;
 }
 
-// Guarana Quest, Original file: brazil_tre.sc
+// Guarana Quest :: brazil_tre.sc
 //============================================================
 brasilis,187,162,5	script	Candy Maker	476,{
 	if (!checkweight(1201,1)) {
@@ -450,7 +451,7 @@ brasilis,187,162,5	script	Candy Maker	476,{
 		set brazil_gua,11;
 		completequest 2200;
 		getitem 12414,1; //Guarana_Candy
-		getexp 700000,100000;
+		getexp 70000,10000;
 		close;
 	}
 	else if (brazil_gua == 11) {
@@ -470,7 +471,7 @@ brasilis,187,162,5	script	Candy Maker	476,{
 			if (Zeny > 3999) {
 				mes "[Candy Maker]";
 				mes "Here is a delicious guarana candy.";
-				set zeny,zeny-4000;
+				set Zeny, Zeny-4000;
 				getitem 12414,1; //Guarana_Candy
 				close;
 			}
@@ -971,7 +972,7 @@ OnTouch_:
 		set brazil_gua,8;
 		changequest 2197,2198;
 		close2;
-		sc_start SC_MOVHASTE_INFINITY,5000,0;
+		consumeitem 12016; //Speed_Up_Potion
 		end;
 	}
 	else {
@@ -1032,7 +1033,7 @@ bra_fild01,245,52,3	script	Monkey#bra	111,{
 	}
 }
 
-// Water Lily Quest, Original file: brazil_tre.sc
+// Water Lily Quest :: brazil_tre.sc
 //============================================================
 brasilis,203,286,3	script	Botanist Karmen#bra	893,{
 	if (brazil_regia == 0) {
@@ -1088,7 +1089,7 @@ brasilis,203,286,3	script	Botanist Karmen#bra	893,{
 		mes "The water lily must truly be a lucky flower. hahaha";
 		set brazil_regia,10;
 		completequest 2207;
-		getexp 500000,100000;
+		getexp 50000,10000;
 		close;
 	}
 	else {
@@ -1929,7 +1930,7 @@ bra_dun02,71,200,3	script	Water lily#bra	111,{
 	}
 }
 
-// Dungeon Access Quest, Original file: brazil_tre.sc
+// Dungeon Access Quest :: brazil_tre.sc
 //============================================================
 brasilis,185,246,5	script	Pedro#bra	62,{
 	if (brazil_ghost == 0) {
@@ -2796,7 +2797,7 @@ bra_in01,206,188,1	script	Open Manhole#todunbra	844,{
 		set brazil_ghost,8;
 		//completequest 2208;
 		completequest 60355;
-		getexp 900000,0;
+		getexp 90000,0;
 		disablenpc "Ghost#bra_end";
 		close;
 	}
@@ -2839,7 +2840,7 @@ OnInit:
 	end;
 }
 
-// Iara, Original file: iara.sc
+// Iara :: iara.sc
 //============================================================
 brasilis,315,334,5	script	Shaman#nk	474,{
 	set .@iara_re,checkquest(4135,PLAYTIME);
@@ -2962,22 +2963,19 @@ brasilis,315,334,5	script	Shaman#nk	474,{
 				mes "Could you listen to my stories for a moment.";
 				mes "There's an emergency in our tribe.";
 				next;
-				switch(select("No.:Okay.")) {
-				case 1:
+				if(select("No.:Okay.") == 1) {
 					mes "[Anori]";
 					mes "You are a heartless person...";
 					mes "You don't seem the helpful type.";
 					mes "Just keep on going your way.";
 					close;
-				case 2:
-					mes "[Anori]";
-					mes "Thank you, I met a kind person.";
-					mes "It's a secret of our tribe that";
-					mes "you cannot tell anyone.";
-					next;
-					break;
 				}
 				mes "[Anori]";
+				mes "Thank you, I met a kind person.";
+				mes "It's a secret of our tribe that";
+				mes "you cannot tell anyone.";
+				next;
+				mes "[Anori]";
 				mes "Lately young men from";
 				mes "the tribe are disappearing.";
 				mes "Our entire tribe is being threatened.";
@@ -3072,12 +3070,12 @@ bra_dun02,157,74,5	script	Iara#nk	478,2,2,{
 			percentheal 100,100;
 			sc_start SC_INCFLEE,3600000,20;
 			sc_start SC_CRITICALPERCENT,3600000,10;
-			sc_start SC_FOOD_STR,1200000,3;
-			sc_start SC_FOOD_DEX,1200000,3;
-			sc_start SC_FOOD_AGI,1200000,3;
-			sc_start SC_FOOD_VIT,1200000,3;
-			sc_start SC_FOOD_INT,1200000,3;
-			sc_start SC_FOOD_LUK,1200000,3; 
+			consumeitem 12043; //Str_Dish03
+			consumeitem 12063; //Dex_Dish03
+			consumeitem 12058; //Agi_Dish03
+			consumeitem 12053; //Vit_Dish03
+			consumeitem 12048; //Int_Dish03
+			consumeitem 12068; //Luk_Dish03
 			next;
 			mes "[Iara]";
 			mes "Ahhh~...";
@@ -3098,11 +3096,10 @@ bra_dun02,157,74,5	script	Iara#nk	478,2,2,{
 		mes "Aaaaaaaaaaaaaaaaaaaaaah.";
 		mes "Eeeeeeeeeeeeeeeeeeeh.";
 		mes "Oooooooooooooooooh.";
-		set .@get_de,rand(1,2);
-		if (.@get_de == 1)
-			sc_start Sc_Curse,60000,0;
+		if (rand(1,2) == 1)
+			sc_start SC_CURSE,60000,0;
 		else
-			sc_start Sc_Confusion,60000,0;
+			sc_start SC_CONFUSION,60000,0;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Ugh! What's this strange voice?";
@@ -3116,11 +3113,10 @@ OnTouch:
 		mes "Aaaaaaaaaaaaaaaaaaaaaah.";
 		mes "Eeeeeeeeeeeeeeeeeeeh.";
 		mes "Oooooooooooooooooh.";
-		set .@get_de,rand(1,2);
-		if (.@get_de == 1)
-			sc_start Sc_Curse,60000,0;
+		if (rand(1,2) == 1)
+			sc_start SC_CURSE,60000,0;
 		else
-			sc_start Sc_Confusion,60000,0;
+			sc_start SC_CONFUSION,60000,0;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Ugh! What's this strange voice?";
@@ -3131,7 +3127,7 @@ OnTouch:
 
 bra_fild01,188,301,5	script	Native Warrior#nk	472,{
 	mes "[Native Warrior]";
-	mes "Ah...the face I would never forget even in my dreams.";
+	mes "Ah... the face I would never forget even in my dreams.";
 	next;
 	mes "[Native Warrior]";
 	mes "When will she come out of the waterfall again...?";
@@ -3143,7 +3139,7 @@ bra_fild01,188,301,5	script	Native Warrior#nk	472,{
 	else {
 		mes "[" + strcharinfo(0) + "]";
 		mes "(This guy will never";
-		mes "get ocer Iara's curse...)";
+		mes "get over Iara's curse...)";
 	}
 	close;
 }