Update to last rAthena npc.

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

1 files changed, 80 insertions, 51 deletions

diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 0e931aca7..921d00123 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -1,22 +1,23 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Amatsu
-//===== By: ================================================== 
-//= rAthena team & others? & MasterOfMuppets
-//===== Current Version: ===================================== 
-//= 1.4a
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== By: ==================================================
+//= rAthena Dev Team & MasterOfMuppets
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
 //= Momotaro Event
 //= Sushi Quest
 //= Dungeon Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
 //= 1.4 Added missing checkweight. [L0ne_W0lf]
 //= 1.4a Fixed typo in condition check [Gepard]
-//============================================================ 
+//= 1.5 Added questlog support. [Euphy]
+//============================================================
 
-// Momotaro Event
-//============================================================ 
+// Momotaro Event :: japan_momo_q
+//============================================================
 amatsu,223,236,3	script	Publisher#ama	763,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment!! -";
@@ -134,8 +135,12 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 		mes "This is your reward for you.";
 		mes "Please continue to enjoy stories~";
 		mes " ";
-		if (event_momo == 3) {
-			set event_momo,4;
+		set .@event_momo, event_momo;
+		set event_momo,4;
+		completequest 8128;
+		completequest 8129;
+		completequest 8130;
+		if (.@event_momo == 3) {
 			set .@gift_1,rand(1,10);
 			if (.@gift_1 == 1) {
 				getitem 659,1; //Heart_Of_Her
@@ -169,7 +174,6 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 			}
 		}
 		else {
-			set event_momo,4;
 			set .@gift_2,rand(1,10);
 			if (.@gift_2 == 1) {
 				getitem 622,1; //Rainbow_Carrot
@@ -205,7 +209,7 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 		close;
 	}
 }
-	
+
 ama_test,52,44,3	script	Assistant#ama	109,{
 	if (event_momo == 0) {
 		mes "[Satoshi]";
@@ -365,9 +369,9 @@ OnInit:
 
 OnStartArena:
 	disablenpc "Coach#ama";
-	donpcevent "Am Mut#ama::Onreset";
-	donpcevent "Dokebi#ez::Onreset";
-	donpcevent "Dokebi#hd::Onreset";
+	donpcevent "Am Mut#ama::OnReset";
+	donpcevent "Dokebi#ez::OnReset";
+	donpcevent "Dokebi#hd::OnReset";
 	enablenpc "Grandma#ama1";
 	enablenpc "Grandpa#ama";
 	warpwaitingpc "ama_test",50,83;
@@ -375,7 +379,7 @@ OnStartArena:
 	disablewaitingroomevent "Assistant#ama";
 	end;
 
-Onreset:
+OnReset:
 	enablewaitingroomevent "Assistant#ama";
 	end;
 }
@@ -396,7 +400,7 @@ OnTouch:
 	mes ".....or bl-ue toilet paper.... ";
 	close;
 }
-	
+
 ama_test,49,93,4	script	Grandpa#ama	766,{
 	end;
 
@@ -404,7 +408,7 @@ OnInit:
 	disablenpc "Grandpa#ama";
 	end;
 }
-	
+
 ama_test,50,93,4	script	Grandma#ama1	761,10,10,{
 	end;
 
@@ -422,6 +426,7 @@ OnTouch:
 	mes "[Grandpa]";
 	mes "Hmm. The Chief said Dokebi earned 20 million zeny by hacking others' accounts...";
 	next;
+	setquest 8127;
 	mes "[Grandma]";
 	mes "Dohhhhhhh!!!! ";
 	next;
@@ -460,7 +465,7 @@ OnTouch:
 	}
 	end;
 }
-	
+
 ama_test,34,15,0	script	Dokebi#ez	-1,{
 OnInit:
 	disablenpc "Dokebi#ez";
@@ -480,7 +485,7 @@ OnEnable:
 	monster "ama_test",49,91,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Dokebi#ez::OnMyMobDead";
 	end;
 
@@ -508,7 +513,7 @@ OnMyMobDead:
 	}
 	end;
 }
-	
+
 ama_test,34,16,0	script	Dokebi#hd	-1,{
 OnInit:
 	disablenpc "Dokebi#hd";
@@ -528,7 +533,7 @@ OnEnable:
 	monster "ama_test",49,91,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Dokebi#hd::OnMyMobDead";
 	end;
 
@@ -556,7 +561,7 @@ OnMyMobDead:
 	}
 	end;
 }
-	
+
 ama_test,50,100,3	script	Coach#ama	762,15,15,{
 	mes "[Coach]";
 	mes "Hoho~ Good.";
@@ -582,6 +587,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "...Don't give me that look.";
 		mes "I was just joking. Hmmhmm.";
 		next;
+		changequest 8127,8128;
 		mes "[Coach]";
 		mes "Now, the Momotaro story is over.";
 		mes "You can get your reward when you talk to the Publisher lady you saw first.";
@@ -593,7 +599,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		donpcevent "Timer#ama::OnDisable";
 		warp "amatsu",223,230;
 		disablenpc "Coach#ama";
-		donpcevent "Assistant#ama::Onreset";
+		donpcevent "Assistant#ama::OnReset";
 		end;
 	case 2:
 		mes "[Coach]";
@@ -603,6 +609,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "Alright, hot stuff.";
 		mes "Do you want to listen to my proposal?";
 		next;
+		changequest 8127,8129;
 		mes "[Coach]";
 		mes "At this point I'm supposed to send you back...BUT!";
 		mes "I really want to know";
@@ -616,6 +623,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "Also, this mission will be pretty hard.";
 		next;
 		if (select("Nah.. I'm good.:Bring it on, foo'!") == 1) {
+			erasequest 8129;
 			mes "[Coach]";
 			mes "Hoho~I understand...";
 			mes "You must be exhausted from the previous battle. It would have been a grand battle, though...";
@@ -630,10 +638,11 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 			mes "Don't lose your high self-esteem";
 			mes "in the future. Farewell.";
 			next;
+			setquest 8128;
 			warp "amatsu",223,230;
 			disablenpc "Coach#ama";
 			donpcevent "Timer#ama::OnDisable";
-			donpcevent "Assistant#ama::Onreset";
+			donpcevent "Assistant#ama::OnReset";
 			end;
 		}
 		mes "[Coach]";
@@ -657,7 +666,7 @@ OnTouch:
 	mes "Tada~~~ !";
 	close;
 }
-	
+
 ama_test,34,17,0	script	Am Mut#ama	-1,{
 OnInit:
 	disablenpc "Am Mut#ama";
@@ -671,7 +680,7 @@ OnEnable:
 	monster "ama_test",56,108,"Am Mut",1301,1,"Am Mut#ama::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Am Mut#ama::OnMyMobDead";
 	end;
 
@@ -694,7 +703,7 @@ OnMyMobDead:
 	}
 	end;
 }
-	
+
 ama_test,50,100,3	script	Coach#after	762,5,5,{
 	end;
 
@@ -718,13 +727,14 @@ OnTouch:
 	mes "Don't forget to get your reward~";
 	close2;
 	set event_momo,3;
+	changequest 8129,8130;
 	warp "amatsu",223,230;
 	disablenpc "Coach#after";
 	donpcevent "Timer#ama::OnDisable";
-	donpcevent "Assistant#ama::Onreset";
+	donpcevent "Assistant#ama::OnReset";
 	end;
 }
-	
+
 ama_test,34,18,0	script	Timer#ama	-1,{
 OnInit:
 	disablenpc "Timer#ama";
@@ -762,11 +772,11 @@ OnTimer362000:
 	end;
 
 OnTimer362500:
-	donpcevent "Assistant#ama::Onreset";
+	donpcevent "Assistant#ama::OnReset";
 	donpcevent "Timer#ama::OnDisable";
 	end;
 }
-	
+
 ama_test,50,100,0	script	backwarp#ama	-1,25,25,{
 OnInit:
 	disablenpc "backwarp#ama";
@@ -777,11 +787,10 @@ OnTouch:
 	end;
 }
 
-// Sushi Quest
-//============================================================ 
+// Sushi Quest :: japan_sushi
+//============================================================
 ama_in01,162,17,1	script	Sushi Master#ama	765,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 5000) {
+	if (MaxWeight - Weight < 5000) {
 		mes "[Magumagu]";
 		mes "Hey. You look really heavy.";
 		mes "Don't you have trouble walking?";
@@ -814,6 +823,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you my shop's special cuisine, Fish Slice, in return.";
 			next;
 			set fish_r,0;
+			erasequest 10036;
 			delitem 529,10; //Candy
 			getitem 544,15; //Fish_Slice
 			mes "[Magumagu]";
@@ -845,6 +855,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you two sets of Sushi in return.";
 			next;
 			set fish_r,0;
+			erasequest 10037;
 			delitem 964,10; //Crap_Shell
 			getitem 551,20; //Shusi
 			mes "[Magumagu]";
@@ -876,6 +887,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you several sets of Sushi in return.";
 			next;
 			set fish_r,0;
+			erasequest 10038;
 			delitem 961,10; //Conch
 			getitem 551,30; //Shusi
 			mes "[Magumagu]";
@@ -906,8 +918,9 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "Thanks. It is nothing but";
 			mes "I will give you a large amount of food in return.";
 			next;
-			delitem 1023,10; //Fish_Tail
 			set fish_r,0;
+			erasequest 10039;
+			delitem 1023,10; //Fish_Tail
 			getitem 544,20; //Fish_Slice
 			getitem 551,30; //Shusi
 			mes "[Magumagu]";
@@ -940,6 +953,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			next;
 			delitem 736,1; //White_Platter
 			set fish_r,0;
+			erasequest 10040;
 			getitem 551,20; //Shusi
 			mes "[Magumagu]";
 			mes "Share it with your friends";
@@ -998,6 +1012,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				next;
 				delitem 950,100; //Heart_Of_Mermaid
 				set ama_sushi,4;
+				completequest 10041;
 				getitem 1144,1; //Sasimi
 				mes "[Magumagu]";
 				mes "Here, take my knife.";
@@ -1061,6 +1076,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				next;
 				set ama_sushi,ama_sushi+1;
 				set fish_r,0;
+				erasequest 10041;
 				mes "[Magumagu]";
 				mes "Thanks a lot for today! Haha!";
 				mes "Come back again when you feel like helping. Take care...!!!";
@@ -1111,7 +1127,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "If you want to eat delicious fish slices, you better bring more money.";
 				close;
 			}
-			set zeny,zeny-700;
+			set Zeny, Zeny-700;
 			getitem 551,10; //Shusi
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1124,7 +1140,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "you better bring more money.";
 				close;
 			}
-			set zeny,zeny-74;
+			set Zeny, Zeny-74;
 			getitem 551,1; //Shusi
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1152,7 +1168,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "If you want to eat delicious fish slices, you better bring more money.";
 				close;
 			}
-			set zeny,zeny-350;
+			set Zeny, Zeny-350;
 			getitem 544,10; //Fish_Slice
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1165,7 +1181,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "";
 				close;
 			}
-			set zeny,zeny-37;
+			set Zeny, Zeny-37;
 			getitem 544,1; //Fish_Slice
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1198,6 +1214,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			set .@fish_m1,rand(1,10);
 			if (.@fish_m1 == 1 || .@fish_m1 == 2) {
 				set fish_r,1;
+				setquest 10036;
 				mes "[Magumagu]";
 				mes "I need some candies to make";
 				mes "a dessert for the customers.";
@@ -1207,6 +1224,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 3 || .@fish_m1 == 4) {
 				set fish_r,2;
+				setquest 10037;
 				mes "[Magumagu]";
 				mes "I need some crab shells to make";
 				mes "a sauce for my cuisine...";
@@ -1216,6 +1234,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 5 || .@fish_m1 == 6) {
 				set fish_r,3;
+				setquest 10038;
 				mes "[Magumagu]";
 				mes "I have used all of my conches.";
 				mes "I need it to make an appetizer...";
@@ -1225,6 +1244,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 7 || .@fish_m1 == 8) {
 				set fish_r,4;
+				setquest 10039;
 				mes "[Magumagu]";
 				mes "Decorative fish tails are out of";
 				mes "stock. This is urgent...";
@@ -1234,6 +1254,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 9) {
 				set fish_r,5;
+				setquest 10040;
 				mes "[Magumagu]";
 				mes "We are missing a platter to serve";
 				mes "fish slices to customers.";
@@ -1244,6 +1265,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			else {
 				if (rand(1,10) == 1) {
 					set fish_r,6;
+					setquest 10041;
 					mes "[Magumagu]";
 					mes "Don't ask me why...";
 					mes "But, I need something special...";
@@ -1257,6 +1279,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				}
 				else {
 					set fish_r,5;
+					setquest 10040;
 					mes "[Magumagu]";
 					mes "We are missing a platter to serve";
 					mes "fish slices to customers.";
@@ -1280,8 +1303,8 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 	}
 }
 
-// Dungeon Quest
-//============================================================ 
+// Dungeon Quest :: japan_mono
+//============================================================
 amatsu,112,164,4	script	Gate Soldier#ama1	767,{
 	mes "[Gate Soldier]";
 	mes "This is the great palace,";
@@ -1347,6 +1370,7 @@ amatsu,164,174,4	script	Gate Soldier#ama5	767,{
 		mes "The mother of our lord is resting in here. She needs her rest.";
 		next;
 		set event_amatsu,1;
+		setquest 8131;
 		mes "[Gate Soldier]";
 		mes "She has been sick for months.";
 		mes "That is why she is staying in here.";
@@ -1450,7 +1474,7 @@ ama_in02,170,62,4	script	Soldier#ama2	767,{
 			mes "to issue another Transit Permit.";
 			next;
 			if (select("Issue one:Talk to you later") == 1) {
-				set zeny,zeny-10000;
+				set Zeny, Zeny-10000;
 				getitem 7160,1; //Lord's_Passable_Ticket
 				mes "[Jiro]";
 				mes "There you go.";
@@ -1779,6 +1803,7 @@ ama_in02,200,176,4	script	Lord of Palace#ama	768,{
 			mes "may be able to cure my mother's disease. I will reward you well if you succeed...";
 			next;
 			set event_amatsu,2;
+			changequest 8131,8132;
 			mes "[Ishida Yoshinaga]";
 			mes "I beg you...Please.";
 			mes "My mother is living in a house outside of the palace.";
@@ -1836,6 +1861,7 @@ ama_in02,200,176,4	script	Lord of Palace#ama	768,{
 			mes "with this ticket.";
 			next;
 			set event_amatsu,6;
+			completequest 8135;
 			delitem 1022,1; //Fox_Tail
 			getitem 7160,1; //Lord's_Passable_Ticket
 			mes "[Ishida Yoshinaga]";
@@ -1921,6 +1947,7 @@ ama_in01,22,111,0	script	Grandma#ama2	761,{
 			monster "ama_in01",22,111,"Nine Tails",1180,1;
 			killmonsterall "ama_in01";
 			set event_amatsu,5;
+			changequest 8134,8135;
 			getitem 1022,1; //Fox_Tail
 			mes "[....]";
 			mes "^FF6060Everything that";
@@ -2049,6 +2076,7 @@ amatsu,189,166,5	script	Kouji#ama	764,{
 		mes "A fox is following me!";
 		mes "If he doesn't leave when I scream and shout!";
 		mes "The North Shrine Priest should help me out~";
+		changequest 8132,8133;
 	}
 	else if (event_amatsu == 4) {
 		mes "Priest, priest~";
@@ -2144,6 +2172,7 @@ ama_in01,180,173,3	script	Kitsune Mask#ama	762,{
 		mes "Good. Show that spiritual";
 		mes "energy to the fox several times.";
 		mes "Sooner or later, you'll be successful.";
+		changequest 8133,8134;
 		close;
 	}
 	else if (event_amatsu == 4) {
@@ -2169,12 +2198,12 @@ ama_in01,180,173,3	script	Kitsune Mask#ama	762,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Rewrote parts of other/momotaro.txt to make it work.
-//=	I'm sorry for the mess, I couldn't do much better with
-//=	the current code I had.
+//=     I'm sorry for the mess, I couldn't do much better with
+//=     the current code I had.
 //= 1.1 Added Sushi Quest and Amatsu Event from cities/ [Evera]
 //= 1.2 Fixed Momotaro Quest, thanks to .~Abism0~. [Lupus]
-//============================================================ 
+//============================================================