- Added missing 10.3 dialog to tu_archer.

- Removed 'Arpesto' and added to hunter_skills with its script (Official Phantasmic Arrow Quest).

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

2 files changed, 376 insertions, 87 deletions

diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index f7bd0f2c8..832a670ad 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
@@ -17,6 +17,7 @@
 //= 1.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Fixed infinate loop. (bugreport:2393) [L0ne_W0lf]
+//= 1.7 Added 10.3 dialog and moved Arpesto to hunter skill quest. [Kisuka]
 //============================================================ 
 
 
@@ -213,11 +214,11 @@ payon_in02,47,13,3	script	Master Kavaruk	55,{
 			close;
 
 		} else if(Class == Job_Hunter || Class == Job_Sniper || Class == Job_Baby_Hunter){	//CHECK
-			mes "In fact, there are a few members in our guild who handle Falcons and Arrows, just like you.";
-			next;
 			mes "[Master Kavaruk]";
-			mes "...But I don't seem to see any of them around here right now. They're always out exploring, I suppose. I'm sure that you'll be able to meet one of your colleagues";
-			mes "here sometime, though.";
+			mes "Arpesto is waiting";
+			mes "outside. Since he's a";
+			mes "veteran hunter, he can";
+			mes "be of great help to you.";
 			close;
 
 		} else if(Class == Job_Dancer || Class == Job_Gypsy || Class == Job_Baby_Dancer){	//CHECK
@@ -336,6 +337,13 @@ payon_in02,47,13,3	script	Master Kavaruk	55,{
 
 			} else if(BaseClass == Job_Archer){
 				mes "Although I can't deny that you're an expert, I suppose it is a good idea to review the basics of archery from time to time. Would you like to try some refresher training?";
+			} else if(Class == Job_Hunter || Class == Job_Sniper){	//CHECK
+				mes "[Master Kavaruk]";
+				mes "Arpesto is waiting";
+				mes "outside. Since he's a";
+				mes "veteran hunter, he can";
+				mes "be of great help to you.";
+				close;
 
 			} else if(Class == Job_Archer || Class == Job_Baby_Archer){
 				mes "As an Archer, I can see that you'd want to make sure that you have a strong grasp on the fundamentals";
@@ -1107,7 +1115,6 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 	mes "this offer still lasts!";
 	next;
 	emotion e_pif;
-	
 	mes "[Arpesto]";
 	mes "Raiden...";
 	mes "Stop messing around.";
@@ -1128,26 +1135,19 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 	mes "But I'll still date all of";
 	mes "those cute girls...";
 	close;
-}
 
-//=================================================Arepesto====================================================
-pay_arche,109,169,3	script	Arpesto	712,{
-	mes "[Arpesto]";
-	mes "The sky still looks clear, but recently the winds that have been blowing through the land seem to carry with them an air of misfortune.";
-	next;
-	emotion e_pif;
-	mes "[Raiden Karus]";
-	mes "So...";
-	mes "Danger's coming?";
-	mes "Heh! Chill, gramps~";
-	mes "I got it covered!";
-	next;
-	emotion e_swt2;
-	mes "[Arpesto]";
-	mes "Ho ho...";
-	mes "Energetic, but";
-	mes "cocky. Kids nowadays...";
-	close;
+	OnKik:
+		emotion 29;
+	OnSwt:
+		emotion 4;
+	OnIc:
+		emotion 5;
+	OnOmg:
+		emotion 23;
+	OnThink:
+		emotion 9;
+	OnHng:
+		emotion 32;
 }
 
 //=================================================Seisner====================================================
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index d9a137a52..fe69243ac 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -1,9 +1,9 @@
 //===== eAthena Script ======================================= 
 //= Hunter Skills Quests
 //===== By: ================================================== 
-//= Lupus, Reddozen
+//= Lupus, Reddozen, Kisuka
 //===== Current Version: ===================================== 
-//= 1.3d
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena Revision 3800+
 //===== Description: ========================================= 
@@ -20,70 +20,359 @@
 //= 1.3b Splitted into different files [DracoRPG]
 //= 1.3c Fixed some typos [IVBela]
 //= 1.3d Changed NPC Name to the official [Lupus]
+//= 1.4	Moved Arpesto from tu_archer and added his script. [Kisuka]
 //============================================================
 
 
 //============================================================
 // HUNTER SKILL - PHANTASMIC ARROW
 //============================================================
-payon_in02,54,13,7	script	Albest	55,{
-	mes "[Albest]";
-	if(BaseJob!=Job_Hunter) goto L_hunterno;
-	if(getskilllv("HT_PHANTASMIC")) goto L_alreadyhave;
-	if(JobLevel<40) goto L_nojob;
-
-	mes "I can teach you a secret";
-	mes "technique passed down through";
-	mes "my family for generations. My";
-	mes "family has guarded this secret";
-	mes "for years, but I could teach";
-	mes "for a few supplies.";
-	next;
-	mes "[Albest]";
-	mes "I am running low on on a few";
-	mes "things. Here is my list:";
-	mes "5 Cursed Rubys";
-	mes "5 Harpy's Feathers";
-	mes "30 Pet Food";
-	next;
-	
-	mes "[Albest]";
-	mes "Let me check your items.";
-	next;
-	
-	if(countitem(724)<5 || countitem(7115)<5 || countitem(537)<30) goto L_noitems;//Items: Cursed_Ruby, Harpy_Feather, Pet_Food,
-	delitem 724, 5;//Items: Cursed_Ruby,
-	delitem 7115, 5;//Items: Harpy_Feather,
-	delitem 537, 30;//Items: Pet_Food,
-	
-	mes "[Albest]";
-	mes "I see you have what you need,";
-	mes "so I'll teach you my talent.";
-	skill "HT_PHANTASMIC",1,0;
-	close;
-
-L_noitems:
-	mes "[Albest]";
-	mes "You don't have enough items.";
-	mes "Come back when you have all";
-	mes "the required items for me.";
-	close;
-		
-L_nojob:
-	mes "Come back when you've Learned";
-	mes "more about being a Hunter.";
-	mes "You need to have at least 40";
-	mes "levels as a hunter first.";
-	close;
-
-L_alreadyhave:
-	mes "Ahh, my apprentice, you";
-	mes "came to visit me...";
-	close;
-	
-L_hunterno:
-	mes "Is there something I can";
-	mes "help you with? I believe";
-	mes "you have the wrong old man.";
-	close;
+pay_arche,109,169,3	script	Arpesto	712,{
+	if (Class == Job_Hunter || Class == Job_Sniper) {
+		if (qskill_hunter == 100) {
+			if (getskilllv("HT_PHANTASMIC")) {
+				mes "[Arpesto]";
+				mes "Hm, I'm sorry if I made";
+				mes "a big scene when you grazed";
+				mes "me with that attack accidentally. It's just that I was training so";
+				mes "diligently and blood sugar was incredibly low and the fatigue...";
+				next;
+				mes "[Raiden Karus]";
+				mes "Hah! Admit it,";
+				mes "old man! You were";
+				mes "just scared! Me, on";
+				mes "the other hand...";
+				donpcevent "Raiden Karus#tu::OnKik";
+				next;
+				mes "[Arpesto]";
+				mes "You little";
+				mes "whippersnapper!";
+				mes "I don't know what";
+				mes "you're talking about!";
+				close;
+			}else{
+				mes "[Arpesto]";
+				mes "I recognize you";
+				mes "from somewhere,";
+				mes "I think. Reidin, do you";
+				mes "remember this guy?";
+				next;
+				mes "[Raiden Karus]";
+				mes "Oh come on, we see";
+				mes "hundreds of Archers and";
+				mes "Hunters and Snipers and...";
+				mes "I can't remember them all.";
+				mes "But I guess this guy's up";
+				mes "to snuff. Trust me on this!";
+				next;
+				mes "[Arpesto]";
+				mes "Alright, alright.";
+				mes "If Reidin thinks you're";
+				mes "worthy, then you're probably";
+				mes "are. In that case, I'd like to";
+				mes "offer to teach you my secret";
+				mes "skill, ''Phantasmic Arrow.''";
+				next;
+				mes "[Raiden Karus]";
+				mes "Wait, wait. This guy";
+				mes "only needs a refresher.";
+				mes "Yeah, I'm pretty sure you";
+				mes "were here to learn this";
+				mes "skill before. Yeah, I've";
+				mes "got a gut feeling about it.";
+				next;
+				mes "[Arpesto]";
+				mes "Damn. Only a refresher?";
+				mes "That means you'll learn";
+				mes "this free of charge. Alright...";
+				mes "You should be able to use the";
+				mes "Phantasmic Arrow skill now.";
+				mes "Travel safely now, you hear?";
+				skill 1009,1,0;
+				close;
+			}
+		}
+		else if (qskill_hunter == 1) {
+			if (countitem(724) > 4 && countitem(7115) > 4 && countitem(537) > 29) {
+				mes "[Arpesto]";
+				mes "Hm? You're back?";
+				mes "Oh, did you bring";
+				mes "everything? Ah, you did.";
+				mes "Good! Now I shall reveal";
+				mes "my super secret skill...";
+				mes "The 1st Arpesto Form!";
+				next;
+				mes "[Raiden Karus]";
+				mes "Wait! Wait...";
+				mes "Didn't you call it";
+				mes "Arpesto's 3rd Form";
+				mes "or something at first?";
+				donpcevent "Raiden Karus#tu::OnSwt";
+				next;
+				mes "[Arpesto]";
+				mes "Er, yes, Arpesto's";
+				mes "3rd Form, that's right.";
+				mes "It's just there's just so";
+				mes "many of them, that... ";
+				mes "Anyway, let me teach you";
+				mes "the ''Emergency Arrow'' skill.";
+				next;
+				mes "[Raiden Karus]";
+				mes "Whoa, hold on!";
+				mes "''Emergency Arrow?!''";
+				mes "That's the old name you";
+				mes "gave that skill, right?";
+				mes "Didn't you change it?";
+				emotion 23;
+				next;
+				emotion 23;
+				mes "[Arpesto]";
+				mes "What the hell";
+				mes "are you talkin--";
+				next;
+				mes "[Arpesto]";
+				mes "Oh, you're right.";
+				mes "We agreed that name";
+				mes "was too cheesy. What";
+				mes "did we call it now? Um...";
+				mes "''Phantasmic Arrow?''";
+				emotion 9;
+				next;
+				mes "[Arpesto]";
+				mes "...";
+				mes "......";
+				emotion 28;
+				next;
+				mes "[Raiden Karus]";
+				mes "Umm....";
+				mes "Ummm........";
+				next;
+				mes "[Raiden Karus]";
+				mes "Yeah, that was the one!";
+				mes "''^3131FFPhantasmic Arrow^000000'' sounds";
+				mes "soooo much cooler than that";
+				mes "other name you came up with!";
+				donpcevent "Raiden Karus#tu::OnIc";
+				next;
+				mes "[Arpesto]";
+				mes "You can be pretty handy";
+				mes "sometimes, Reidin. Now,";
+				mes "back to the matter at hand.";
+				mes "I shall teach you my awesome";
+				mes "skill, Phantasmic Arrow. Now...";
+				mes "Ready your mind and body!";
+				next;
+				mes "[Arpesto]";
+				mes "Phan-!";
+				mes "Ta-!";
+				mes "Ssssss-!";
+				mes "Mic-!";
+				next;
+				mes "[Arpesto]";
+				mes "ARRRRRRRROOOOOOW~!";
+				specialeffect 99;
+				specialeffect2 99;
+				next;
+				mes "[Arpesto]";
+				mes "^333333*Pant Pant*^000000";
+				mes "Alright, I used a special";
+				mes "technique to teach you the";
+				mes "skill-- directly into your brain. You should be able to use it";
+				mes "now. Why don't give it a try?";
+				next;
+				mes "^3355FF*Swwwwwww!*";
+				mes "*Bang!*^000000";
+				specialeffect 1;
+				emotion 23;
+				emotion 23,1;
+				next;
+				mes "[Arpesto]";
+				mes "^333333*Pant Pant*";
+				mes "*Cough Cough*";
+				mes "*Cough Cough*^000000";
+				next;
+				mes "[Arpesto]";
+				mes "WHHHHHHHY MEEEEE?!";
+				donpcevent "Raiden Karus#tu::OnOmg";
+				next;
+				mes "^3355FF*Thump*^000000";
+				next;
+				mes "[Raiden Karus]";
+				mes "Ar-Arpesto, no!";
+				mes "...........................";
+				mes "";
+				mes "Oh. Oh, come on! The arrow";
+				mes "just glanced you! You'll be";
+				mes "alright. Quit being a baby.";
+				next;
+				mes "[Raiden Karus]";
+				mes "Eh, don't worry about";
+				mes "Arpesto. He's just being";
+				mes "a crazy old man. I'll take";
+				mes "care of him, so just make";
+				mes "sure you make good use";
+				mes "of that new skill. Take care~";
+				delitem 724,5;
+				delitem 7115,5;
+				delitem 537,30;
+				set qskill_hunter,100;
+				skill 1009,1,0;
+				close;
+			}else{
+				mes "[Arpesto]";
+				mes "Hurry up and bring";
+				mes "^3131FF5 Cursed Rubies^000000,";
+				mes "^3131FF30 Pet Foods^000000 and";
+				mes "^3131FF5 Harpy Feathers^000000.";
+				mes "Then, I can teach you";
+				mes "the Emergency Arrow skill.";
+				close;
+			}
+		}
+		else {
+			if (getskilllv("HT_PHANTASMIC")) {
+				mes "[Arpesto]";
+				mes "Ah, very nice.";
+				mes "Um, as you demonstrated";
+				mes "earlier, my teaching technique";
+				mes "was perfect. But next time, use";
+				mes "the skill on foes that deserve";
+				mes "to be beaten, alright? Good.";
+				set qskill_hunter,100;
+				close;
+			}
+			if (JobLevel < 40) {
+				mes "[Arpesto]";
+				mes "Did the master send you";
+				mes "to me? Hmm... You're still";
+				mes "pretty green from the looks";
+				mes "of it. Yeah, I don't think there's anything I can teach quite yet.";
+				next;
+				mes "[Arpesto]";
+				mes "Train a little more and get";
+				mes "some more experience in";
+				mes "your job. When you become";
+				mes "more adept at hunting, you'll";
+				mes "be able to grasp what I've been";
+				mes "teaching Hunters and Snipers.";
+				close;
+			}else{
+				mes "[Arpesto]";
+				mes "Has the master sent you?";
+				mes "Ah, you definitely have the";
+				mes "keen, vulture like eyes of a";
+				mes "true Hunter. You should be";
+				mes "capable of learning my secret";
+				mes "skill, the 3rd Arpesto Form...";
+				next;
+				mes "[Arpesto]";
+				mes "It's a handy skill that";
+				mes "I developed while battling";
+				mes "Medusas and running out";
+				mes "of arrows. I simply call it,";
+				mes "''^3131FFEmergency Arrow^000000.'' Would you";
+				mes "be interested in learning it?";
+				next;
+				if(select("Yes, please!:Ummm...") == 1) {
+					mes "[Arpesto]";
+					mes "Great, great. Of course,";
+					mes "you can't resist this offer";
+					mes "if you recognize this skill's";
+					mes "value. However, I'd like to";
+					mes "ask for a little tuition in return for me teaching this to you.";
+					next;
+					mes "[Arpesto]";
+					mes "Although I feel guilt at";
+					mes "asking for payment from";
+					mes "a fellow Hunter, creating";
+					mes "this skill required much";
+					mes "sacrifice and unimaginable";
+					mes "bloodshed on my part...";
+					next;
+					mes "[Raiden Karus]";
+					mes "Hey! You liar!";
+					mes "I was there when you";
+					mes "accidently made up that";
+					mes "skill when you were bored";
+					mes "and just messing around";
+					mes "with one of the Bows!";
+					donpcevent "Raiden Karus#tu::OnKik";
+					next;
+					emotion 23;
+					mes "[Arpesto]";
+					mes "^333333*Ahem*^000000 Please Reidin,";
+					mes "don't entertain unfounded";
+					mes "rumors. It was only after";
+					mes "countless battles with Eddga";
+					mes "that I managed to invent and";
+					mes "perfect Emergency Arrow.";
+					next;
+					mes "[Raiden Karus]";
+					mes "^333333*Tsk tsk*^000000 Huh.";
+					mes "I thought you said";
+					mes "you developed it while";
+					mes "you were fighting Medusas.";
+					next;
+					mes "[Arpesto]";
+					mes "A-anyway, please bring";
+					mes "me the following items";
+					mes "as tuition in exchange for";
+					mes "me teaching you this skill.";
+					next;
+					mes "[Arpesto]";
+					mes "Please bring me";
+					mes "^3131FF5 Cursed Rubies^000000,";
+					mes "^3131FF30 Pet Foods^000000 and";
+					mes "^3131FF5 Harpy Feathers^000000.";
+					mes "Then I can teach";
+					mes "you this skill.";
+					next;
+					mes "[Raiden Karus]";
+					mes "30 Pet Foods?";
+					mes "What the heck do";
+					mes "you need all that for?";
+					next;
+					mes "[Arpesto]";
+					mes "I...";
+					mes "I'm going to";
+					mes "use it to feed";
+					mes "my pet Falcon.";
+					next;
+					mes "[Raiden Karus]";
+					mes "...";
+					mes "......";
+					mes ".........";
+					mes "......Riiiight.";
+					donpcevent "Raiden Karus#tu::OnThink";
+					set qskill_hunter,1;
+					close;
+				}
+				mes "[Arpesto]";
+				mes "Alright, it's your";
+				mes "decision. However, I'm";
+				mes "sure that you may have";
+				mes "great need of my skill";
+				mes "sooner or later, so return";
+				mes "to me if you change your mind.";
+				close;
+			}
+		}
+	}else{
+		mes "[Arpesto]";
+		mes "The sky still looks clear, but recently the winds that have been blowing through the land seem to carry with them an air of misfortune.";
+		next;
+		donpcevent "Raiden Karus#tu::OnHng";
+		mes "[Raiden Karus]";
+		mes "So...";
+		mes "Danger's coming?";
+		mes "Heh! Chill, gramps~";
+		mes "I got it covered!";
+		next;
+		emotion 19;
+		mes "[Arpesto]";
+		mes "Ho ho...";
+		mes "Energetic, but";
+		mes "cocky. Kids nowadays...";
+		close;
+	}
 }