Merge branch 'master' of https://github.com/HerculesWS/Hercules

1 files changed, 202 insertions, 206 deletions

diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index e55ed80a6..0e114b97c 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= El Dicastes Quest NPCs
 //===== By: ==================================================
 //= Gennosuke Kouga, Muad_Dib
 //===== Current Version: =====================================
-//= 1.8a
-//===== Compatible With: =====================================
-//= rAthena SVN
+//= 1.9a
 //===== Description: =========================================
 //= Quest NPCs related to Dewata:
 //== Sapha's Visit, Doha's Secrect Order, Frede's Request,
@@ -25,6 +23,9 @@
 //= 1.7 Updated to match the official script. [Joseph]
 //= 1.8 Optimized and fixed invalid checkquest. [Joseph]
 //= 1.8a Disabled "Fish Tails" until Izlude RE coordinates are found. [Euphy]
+//= 1.8b Updated "Calyon" NPC and fixed a check. [Euphy]
+//= 1.9 Updated "Fish Tails" with RE coordinates.
+//= 1.9a Minor fix. [Joseph]
 //============================================================
 
 // Entrance
@@ -436,7 +437,7 @@ function	script	que_dic	{
 		delitem getarg(3), getarg(4); 
 	}
 	else if (getarg(0) == 2) {
-		for(.@i = 1; .@i < getargcount(); .@i++) {
+		for(set .@i,1; .@i<getargcount(); set .@i,.@i+1) {
 			if (checkquest(getarg(.@i)) >= 0)
 				erasequest getarg(.@i);
 		}
@@ -1027,7 +1028,7 @@ dic_in01,40,193,1	script	Papyrus#0001	453,{
 	else if (.@doc == 11) eldicastes_dp(12169,"Stem","There is nothing like Midgard plants in Manuk.","These plants are used for food and medicine and some are even poisonous.");
 	else if (.@doc == 12) eldicastes_dp(12170,"Pointed Scale","Stem from a bumpy life form. Research required as the usage is unknown.","");
 	else if (.@doc == 13) eldicastes_dp(12171,"Resin","Sap from an old tree collected and solidified. Very valuable in the human world.","");
-	//else if (.@doc == 14) eldicastes_dp(12174,"Fish Tail","Humans eat meat called fish.","Can be used as important food supply for foreign adventurers visiting in the city.");
+	else if (.@doc == 14) eldicastes_dp(12174,"Fish Tail","Humans eat meat called fish.","Can be used as important food supply for foreign adventurers visiting in the city.");
 	else if (.@doc == 15) eldicastes_dp(12175,"Worm Peeling","They say some Worm Peelings are valuable.","But this is based on the human's standard of value. Research required.");
 	else if (.@doc == 16) eldicastes_dp(12176,"Gill","There are Midgard creatures that live in the sea and breathe through gills.","Further research on their ecology will be useful.");
 	else if (.@doc == 17) eldicastes_dp(12177,"Tooth of Bat","Traces of a nocturnal creature unknown to Manuk. Not a strong creature from the size of its teeth.","");
@@ -1090,7 +1091,7 @@ dic_in01,25,187,0	duplicate(Document Package#main)	Document Package#0004	844
 
 function	script	unknown_d	{
 	if (checkquest(getarg(0)) == -1) {
-		mes "You see some traces of digging";
+		mes "You see some traces of digging.";
 		close;
 	}
 	specialeffect2 EF_SPRINKLESAND;
@@ -1115,7 +1116,7 @@ pay_fild02,105,113,0	script	Pointed Scales	844,{ unknown_d(12170,906); }
 pay_fild01,152,171,0	script	Resin	844,{ unknown_d(12171,907); }
 gef_fild01,104,111,0	script	Spawn	844,{ unknown_d(12172,908); }
 prt_fild08,299,332,0	script	Jellopy	844,{ unknown_d(12173,909); }
-//izlude,132,136,0	script	Fish Tails	844,{ unknown_d(12174,1023); }
+izlude,136,160,0	script	Fish Tails	844,{ unknown_d(12174,1023); }	// Pre-RE: izlude (132,136)
 prt_fild05,303,169,0	script	Worm Peelings	844,{ unknown_d(12175,955); }
 iz_dun03,155,165,0	script	Gills	844,{ unknown_d(12176,956); }
 mjo_dun01,222,226,0	script	Tooth of Bat	844,{ unknown_d(12177,913); }
@@ -2279,159 +2280,175 @@ dic_in01,158,188,3	script	Jarute HesLanta#ep133_2	451,{
 }
 
 dicastes01,223,190,1	script	Calyon#pa8029	453,{
+	if (checkweight(1201,1) == 0) {
+		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
+		close;
+	}
+	if (MaxWeight - Weight < 1000) {
+		mes "Cannot proceed because the weight of your items is too heavy. Let's try again after you get rid of some weight.";
+		close;
+	}
+	if (!isequipped(2782)) {
+		mes "¡õ¢£¡ô";
+		mes "¡ö¡ø¡ó ¢£ ¡ö¡ñ¡ï ¡ù ¡ð¢²¢£";
+		next;
+		mes "I don't feel confident in talking since you wouldn't understand anything.";
+		close;
+	}
+	if (ep13_3_invite < 6) {
+		mes "Sapha keeps a distance from you even when you try to talk. Looks like he called on Guard Galten. Time to go.";
+		close;
+	}
 	mes "[Calyon]";
-	if (isequipped(2782)) {
-		if (ep13_3_invite == 5) {
-			if (BaseLevel < 80) {
-				mes "Sorry, a minimum base level of 80 or higher is required to obtain my request.";
-				close; }
-			if (checkquest(12163,PLAYTIME) == 2) {
-				mes "Calculate your request activities with the ^800080Transport Dept. 1 Manager^000000 at Operations and then come back.";
-				close;
-			} else if (checkquest(12163,PLAYTIME) != -1) {
-				mes "We're done for the day. You can report back to the ^800080Transport Dept. 1 Manager^000000 at Operations. Good luck.";
-				close; }
-			mes "Welcome.";
-			mes "What brings you here?";
-			next;
-			if(select("Please explain the request to me.", "Please give me a request.")==1) {
-				mes "[Calyon]";
-				mes "The Transport Dept. 1 and 2 brings in rare items that are not available here.";
-				next;
-				mes "[Calyon]";
-				mes "It is one of the key departments that obtains the rich supplies mostly from the Midgard Continent.";
-				next;
-				mes "[Calyon]";
-				mes "Please see me any time once you are ready.";
-				close; 
-			}
-			set .@calyonrequest,rand(1,11);
-			mes "[Calyon]";
-			mes "Finally, I have a request for you. It is an important one so I need you to be focused.";
-			next;
-			mes "[Calyon]";
-			if (.@calyonrequest == 1) {
-				setquest 12139;
-				setquest 12163;
-				mes "The high minister is looking for the Midgard product, Witherless Roses these days.";
-				mes "Not sure if it's a good gift but some have seen him with it on his head and showing it off.";
-				next;
-				mes "[Calyon]";
-				mes "So... I know this is difficult to ask for but please bring me 1 Witherless Rose. This is just between you and me.";
-				next;
-				mes "You have received a request named ^800080Respect for Taste^000000.";
-			} else if (.@calyonrequest == 2) {
-				setquest 12137;
-				setquest 12163;
-				mes "The industrial research center researches ways of refining Bradium efficiently but they are always short on test materials.";
-				next;
-				mes "[Calyon]";
-				mes "I heard there is a merchant in the adventurer's city who sells Glass Tubes. I will need 4 of them.";
-				next;
-				mes "You have received a request named ^800080Tools for Experiment^000000.";
-			} else if (.@calyonrequest == 3) {
-				setquest 12138;
-				setquest 12163;
-				mes "The pub owner said he wants to give a gift to all his regular Sapha customers.";
-				next;
-				mes "[Calyon]";
-				mes "But doesn't know what to give. If you see any interesting gifts in Midgard, can bring back 5 of them?";
-				next;
-				mes "You have received a request named ^800080Fine Gift Samples^000000.";
-			} else if (.@calyonrequest == 4) {
-				setquest 12140;
-				setquest 12163;
-				mes "A request from the pub owner. He says he can't use disposable leaf plates for regular customers.";
-				next;
-				mes "[Calyon]";
-				mes "He is asking for 15 solid, white chinas from Midgard.";
-				next;
-				mes "You have received a request named ^800080Courtesy for Regular^000000.";
-			} else if (.@calyonrequest == 5) {
-				setquest 12141;
-				setquest 12163;
-				mes "I have a personal request. I heard there is a round transparent handicraft in Midgard.";
-				mes "I think they are called Glass Beads.";
-				next;
-				mes "[Calyon]";
-				mes "We have similar manufactured items here but nothing compared to the elaborate sphere there.";
-				mes "Please get me 10 of them.";
-				next;
-				mes "You have received a request named ^800080Special Package^000000.";
-			} else if (.@calyonrequest == 6) {
-				setquest 12142;
-				setquest 12163;
-				mes "Hmm... I don't know how to start. The high minister is requesting for puppets from Midgard.";
-				mes "I don't know what it is but since the high minister is asking for it, it must be used for a very important purpose.";
-				next;
-				mes "[Calyon]";
-				mes "Please bring 15 of them.";
-				next;
-				mes "You have received a request named ^800080Dangerous Request^000000.";
-			} else if (.@calyonrequest == 7) {
-				setquest 12143;
-				setquest 12163;
-				mes "I heard there is a trend among many of my colleagues here about a musical accessory made from a Bill of Birds from Midgard.";
-				next;
-				mes "[Calyon]";
-				mes "I'm thinking of distributing them within the Operations building.";
-				mes "Can you buy and bring back 50 of them?";
-				next;
-				mes "You have received a request named ^800080Strange Trend^000000.";
-			} else if (.@calyonrequest == 8) {
-				setquest 12144;
-				setquest 12163;
-				mes "The pub owner said he wanted to decorate the pub with something called Clam Shells.";
-				mes "Please bring back about 50 of them.";
-				next;
-				mes "[Calyon]";
-				mes "I have no idea how he will use them but I think he has a very unique taste after being acquainted with many adventurers.";
-				next;
-				mes "You have received a request named ^800080Unknown Usage^000000.";
-			} else if (.@calyonrequest == 9) {
-				setquest 12145;
-				setquest 12163;
-				mes "We don't have cuisine for ourselves but many adventurers seem to enjoy the art of eating.";
-				mes "So the pub owner needs a plate for his new cuisine.";
-				next;
-				mes "[Calyon]";
-				mes "He asked for 20 Crab Shells.";
-				mes "I have no idea where you can get them but... good luck.";
-				next;
-				mes "You have received a request named ^800080Other World Cuisine^000000.";
-			} else if (.@calyonrequest == 10) {
-				setquest 12146;
-				setquest 12163;
-				mes "I think the most useful Midgard item is Scells.";
-				next;
-				mes "[Calyon]";
-				mes "Use Scells to fill any crack or holes in a building and then mix and plaster grinded Garlet to it and the building is maintained quick and simple.";
-				mes "Can you bring back 30 of them?";
-				next;
-				mes "You have received a request named ^800080Filling in Cracks^000000.";
-			} else if (.@calyonrequest == 11) {
-				setquest 12147;
-				setquest 12163;
-				mes "Garlets are an element in building maintenance.";
-				mes "It is one of the most important materials in buildings.";
-				next;
-				mes "[Calyon]";
-				mes "Before Garlets were available, we crushed and used Zargons but they have become difficult to come by.";
-				mes "Please bring back 40 of them.";
-				next;
-				mes "You have received a request named ^800080Adhesive Material^000000."; }
-			mes "You can check details of the request and who to report back to by opening the ^800080Quest Window^000000.";
-			mes "You have 23 hours to complete this mission.";
-			close; 
-		}
-		mes "- The Sapha keeps a distance from you even when you try to talk.";
-		mes "It looks like he is calling for a Galten. Time to go. -";
-		close; 
+	if (BaseLevel < 80) {
+		mes "Ha ha, come back again after you are trained more. I have no request that fits you.";
+		close;
+	}
+	if (checkquest(12163,PLAYTIME) == 2) {
+		mes "Calculate your request activities with the ^800080Transport Dept. 1 Manager^000000 at Operations and then come back.";
+		close;
+	} else if (checkquest(12163,PLAYTIME) != -1) {
+		mes "We're done for the day. You can report back to the ^800080Transport Dept. 1 Manager^000000 at Operations. Good luck.";
+		close;
 	}
-	mes "¡õ¢£¡ô";
-	mes "¡ö¡ø¡ó ¢£ ¡ö¡ñ¡ï ¡ù ¡ð¢²¢£";
+	mes "Welcome.";
+	mes "What brings you here?";
 	next;
-	mes "- I can't understand him... -";
+	if(select("Please explain the request to me.", "Please give me a request.") == 1) {
+		mes "[Calyon]";
+		mes "The Transport Dept. 1 and 2";
+		mes "brings in rare items";
+		mes "that are not available";
+		mes "here.";
+		next;
+		mes "[Calyon]";
+		mes "It is one of the";
+		mes "key departments that";
+		mes "obtains the rich supplies";
+		mes "mostly from the Midgard Continent.";
+		next;
+		mes "[Calyon]";
+		mes "Please see me any time";
+		mes "once you are ready.";
+		close;
+	}
+	mes "[Calyon]";
+	mes "Finally, I have a request for you. It is an important one so I need you to be focused.";
+	next;
+	set .@calyonrequest,rand(1,11);
+	mes "[Calyon]";
+	if (.@calyonrequest == 1) {
+		setquest 12139;
+		setquest 12163;
+		mes "The high minister is looking for the Midgard product, Witherless Roses these days.";
+		mes "Not sure if it's a good gift but some have seen him with it on his head and showing it off.";
+		next;
+		mes "[Calyon]";
+		mes "So... I know this is difficult to ask for but please bring me 1 Witherless Rose. This is just between you and me.";
+		next;
+		mes "You have received a request named ^800080Respect for Taste^000000.";
+	} else if (.@calyonrequest == 2) {
+		setquest 12137;
+		setquest 12163;
+		mes "The industrial research center researches ways of refining Bradium efficiently but they are always short on test materials.";
+		next;
+		mes "[Calyon]";
+		mes "I heard there is a merchant in the adventurer's city who sells Glass Tubes. I will need 4 of them.";
+		next;
+		mes "You have received a request named ^800080Tools for Experiment^000000.";
+	} else if (.@calyonrequest == 3) {
+		setquest 12138;
+		setquest 12163;
+		mes "The pub owner said he wants to give a gift to all his regular Sapha customers.";
+		next;
+		mes "[Calyon]";
+		mes "But doesn't know what to give. If you see any interesting gifts in Midgard, can bring back 5 of them?";
+		next;
+		mes "You have received a request named ^800080Fine Gift Samples^000000.";
+	} else if (.@calyonrequest == 4) {
+		setquest 12140;
+		setquest 12163;
+		mes "A request from the pub owner. He says he can't use disposable leaf plates for regular customers.";
+		next;
+		mes "[Calyon]";
+		mes "He is asking for 15 solid, white chinas from Midgard.";
+		next;
+		mes "You have received a request named ^800080Courtesy for Regular^000000.";
+	} else if (.@calyonrequest == 5) {
+		setquest 12141;
+		setquest 12163;
+		mes "I have a personal request. I heard there is a round transparent handicraft in Midgard.";
+		mes "I think they are called Glass Beads.";
+		next;
+		mes "[Calyon]";
+		mes "We have similar manufactured items here but nothing compared to the elaborate sphere there.";
+		mes "Please get me 10 of them.";
+		next;
+		mes "You have received a request named ^800080Special Package^000000.";
+	} else if (.@calyonrequest == 6) {
+		setquest 12142;
+		setquest 12163;
+		mes "Hmm... I don't know how to start. The high minister is requesting for puppets from Midgard.";
+		mes "I don't know what it is but since the high minister is asking for it, it must be used for a very important purpose.";
+		next;
+		mes "[Calyon]";
+		mes "Please bring 15 of them.";
+		next;
+		mes "You have received a request named ^800080Dangerous Request^000000.";
+	} else if (.@calyonrequest == 7) {
+		setquest 12143;
+		setquest 12163;
+		mes "I heard there is a trend among many of my colleagues here about a musical accessory made from a Bill of Birds from Midgard.";
+		next;
+		mes "[Calyon]";
+		mes "I'm thinking of distributing them within the Operations building.";
+		mes "Can you buy and bring back 50 of them?";
+		next;
+		mes "You have received a request named ^800080Strange Trend^000000.";
+	} else if (.@calyonrequest == 8) {
+		setquest 12144;
+		setquest 12163;
+		mes "The pub owner said he wanted to decorate the pub with something called Clam Shells.";
+		mes "Please bring back about 50 of them.";
+		next;
+		mes "[Calyon]";
+		mes "I have no idea how he will use them but I think he has a very unique taste after being acquainted with many adventurers.";
+		next;
+		mes "You have received a request named ^800080Unknown Usage^000000.";
+	} else if (.@calyonrequest == 9) {
+		setquest 12145;
+		setquest 12163;
+		mes "We don't have cuisine for ourselves but many adventurers seem to enjoy the art of eating.";
+		mes "So the pub owner needs a plate for his new cuisine.";
+		next;
+		mes "[Calyon]";
+		mes "He asked for 20 Crab Shells.";
+		mes "I have no idea where you can get them but... good luck.";
+		next;
+		mes "You have received a request named ^800080Other World Cuisine^000000.";
+	} else if (.@calyonrequest == 10) {
+		setquest 12146;
+		setquest 12163;
+		mes "I think the most useful Midgard item is Scells.";
+		next;
+		mes "[Calyon]";
+		mes "Use Scells to fill any crack or holes in a building and then mix and plaster grinded Garlet to it and the building is maintained quick and simple.";
+		mes "Can you bring back 30 of them?";
+		next;
+		mes "You have received a request named ^800080Filling in Cracks^000000.";
+	} else if (.@calyonrequest == 11) {
+		setquest 12147;
+		setquest 12163;
+		mes "Garlets are an element in building maintenance.";
+		mes "It is one of the most important materials in buildings.";
+		next;
+		mes "[Calyon]";
+		mes "Before Garlets were available, we crushed and used Zargons but they have become difficult to come by.";
+		mes "Please bring back 40 of them.";
+		next;
+		mes "You have received a request named ^800080Adhesive Material^000000.";
+	}
+	mes "You can check details of the request and who to report back to by opening the ^800080Quest Window^000000.";
 	close;
 }
 
@@ -6669,7 +6686,7 @@ man_in01,315,52,3	script	Guard Captain Avalanche	450,{
 	}
 	else if (ep13_3_invite == 6) {
 		mes "[Avalanche]";
-		mes "Oh.. You have the Light of El Dicastes.";
+		mes "Oh... You have the Light of El Dicastes.";
 		mes "it would be helpful for your travel.";
 		next;
 		mes "[Avalanche]";
@@ -6687,7 +6704,8 @@ man_in01,315,52,3	script	Guard Captain Avalanche	450,{
 	next;
 	mes "[Avalanche]";
 	mes "Always take care of yourself at all times.";
-	mes "Haha.. but then you humans are very strong.";
+	mes "Haha... but then you humans are very strong.";
+	close;
 }
 
 dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
@@ -6941,7 +6959,7 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 			mes "But of course, since this is adding spells on top of its original magic, I cannot guarantee that you will get what you want on one try.";
 			close;
 		}
-		if (countitem(2844) < 1) { //Light of El Dicastes
+		if (countitem(2844) < 1) {
 			mes "[Kareka]";
 			mes "Either you are not wearing or don't have the equipment to upgrade on you.";
 			close;
@@ -7318,8 +7336,9 @@ dic_fild01,228,159,4	script	Jahbong#pa0829	496,{
 	mes "Why are you here?";
 	mes "Jahbong will exchange ^8000801 Sapha Certification^000000 for ^8000801 item^000000!";
 	next;
-	switch(select("Just came to see what you have.:I want the Feral Boots!:Give me the Feral Tail!:Give me the Golden Bell!:How much to buy you?")) {
-		case 1:
+	set .@i, select("Just came to see what you have.:I want the Feral Boots!:Give me the Feral Tail!:Give me the Golden Bell!:How much to buy you?")-1;
+	switch (.@i) {
+		case 0:
 			mes "[Jahbong]";
 			mes "Meow!";
 			next;
@@ -7335,47 +7354,8 @@ dic_fild01,228,159,4	script	Jahbong#pa0829	496,{
 			mes "[Jahbong]";
 			mes "There are some crazy adventurers asking if they can purchase me! Jahbong is not for sale! I'll just bite you if you ask!!";
 			close;
-		case 2:
-			mes "[Jahbong]";
-			mes "Are you really buying something?!";
-			next;
-			if(select("Nope:Give me!!!")==1) {
-				mes "[Jahbong]";
-				mes "Okay!";
-				close; }
-			mes "[Jahbong]";
-			mes "Here you go!";
-			delitem 6304,1;
-			getitem 2463,1;
-			close;
-		case 3:
-			mes "[Jahbong]";
-			mes "Are you really buying something?!";
-			next;
-			if(select("Nope:Give me!!!")==1) {
-				mes "[Jahbong]";
-				mes "Okay!";
-				close; }
-			mes "[Jahbong]";
-			mes "Here you go!";
-			delitem 6304,1;
-			getitem 2564,1;
-			close;
 		case 4:
 			mes "[Jahbong]";
-			mes "Are you really buying something?!";
-			next;
-			if(select("Nope:Give me!!!")==1) {
-				mes "[Jahbong]";
-				mes "Okay!";
-				close; }
-			mes "[Jahbong]";
-			mes "Here you go!";
-			delitem 6304,1;
-			getitem 2843,1;
-			close;
-		case 5:
-			mes "[Jahbong]";
 			mes "Meooooooooooow!!!!!!!!~~ Meooooooooow!!!!!";
 			next;
 			mes "- ^800080Jahbong goes wild^000000. -";
@@ -7385,7 +7365,23 @@ dic_fild01,228,159,4	script	Jahbong#pa0829	496,{
 			next;
 			mes "- He may react extremely, but Jahbong doesn't seem to be really angry. -";
 			close;
-		}
+		default:
+			break;
+	}
+	mes "[Jahbong]";
+	mes "Are you really buying something?!";
+	next;
+	if (select("Nope:Give me!!!") == 1) {
+		mes "[Jahbong]";
+		mes "Okay!";
+		close;
+	}
+	setarray .@items[1],2463,2564,2843;
+	mes "[Jahbong]";
+	mes "Here you go!";
+	delitem 6304,1;
+	getitem .@items[.@i],1;
+	close;
 }
 
 // Cat Hand Agent
@@ -7411,7 +7407,7 @@ moc_para01,44,19,3	script	Cat Hand Agent#gekk	496,{
 		mes "It breaks my heart to think my colleagues will be shivering in the blizzard. I hope I don't get into trouble since I can't do anything about it, right?";
 		next;
 		if (select ("Why don't you collect it yourself?:I'm sorry to hear that.") == 1) {
-				emotion ET_HUK;
+				emotion e_omg;
 				mes "[Cat Hand Agent]";
 				mes "Human!! You're a genius!!";
 				mes "How did you come up with that?";
@@ -7453,7 +7449,7 @@ moc_para01,44,19,3	script	Cat Hand Agent#gekk	496,{
 						next;
 						input .@inputstr$;
 						mes "[Agent Geck]";
-						mes "" + name + "? Human names are strange to me.";
+						mes "" + strcharinfo(0) + "? Human names are strange to me.";
 						next;
 						mes "[Agent Geck]";
 						mes "Now you are Geck's personal slav... sponsor.";
@@ -7538,7 +7534,7 @@ moc_fild20,368,197,3	script	Cat#to22	876,{
 		mes "The small body isn't as tall as your ankle and its small but thick paws look like little cushions. The ears that bent backwards when it looked at how big you were stirred up your protective instinct.";
 		next;
 		mes "You don't seem to have the nerve to step on the Cat Hand Agent.";
-		emotion ET_CRY;
+		emotion e_sob;
 		close;
 	}
 	mes "You look at the Cat Hand Agent's small back and climb over the wall as quick as possible so that it wouldn't notice your weight.";