Merge remote-tracking branch 'upstream/master'

1 files changed, 17 insertions, 22 deletions

diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index e6f9f9d41..5178d622f 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -1,34 +1,29 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Hunter Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen, Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena Revision 3800+
-//===== Description: ========================================= 
-//= Temp quests for new skills for 2nd classes
-//===== Additional Comments: ================================= 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Quests for skills: Phantasmic Arrow
+//===== Additional Comments: =================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
-//= Somehow eA engine doesn't let you keep learn't skill V_V'
+//=     Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
-//= some of the items required and made them into real
-//= quests. [Reddozen] 
+//=     some of the items required and made them into real
+//=     quests. [Reddozen] 
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 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]
+//= 1.4 Moved Arpesto from tu_archer and added his script. [Kisuka]
 //============================================================
 
-
-//============================================================
-// HUNTER SKILL - PHANTASMIC ARROW
-//============================================================
 pay_arche,109,169,3	script	Arpesto	712,{
-	if (Class == Job_Hunter || Class == Job_Sniper) {
+	if (BaseJob == Job_Hunter) {
 		if (qskill_hunter == 100) {
 			if (getskilllv("HT_PHANTASMIC")) {
 				mes "[Arpesto]";
@@ -50,7 +45,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				mes "I don't know what";
 				mes "you're talking about!";
 				close;
-			}else{
+			} else {
 				mes "[Arpesto]";
 				mes "I recognize you";
 				mes "from somewhere,";
@@ -218,7 +213,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				set qskill_hunter,100;
 				skill "HT_PHANTASMIC",1,0;
 				close;
-			}else{
+			} else {
 				mes "[Arpesto]";
 				mes "Hurry up and bring";
 				mes "^3131FF5 Cursed Rubies^000000,";
@@ -241,7 +236,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				set qskill_hunter,100;
 				close;
 			}
-			if (JobLevel < 40) {
+			if (BaseJob == Job_Hunter && JobLevel < 40) {
 				mes "[Arpesto]";
 				mes "Did the master send you";
 				mes "to me? Hmm... You're still";
@@ -256,7 +251,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				mes "be able to grasp what I've been";
 				mes "teaching Hunters and Snipers.";
 				close;
-			}else{
+			} else {
 				mes "[Arpesto]";
 				mes "Has the master sent you?";
 				mes "Ah, you definitely have the";
@@ -359,7 +354,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				}
 			}
 		}
-	}else{
+	} 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;