* Fixed job level issues on remaining first class Platinum Skill quests, incl. bugreport:6374 (quests\skills\)

* Some optimization of Ranger job quest (re\jobs\3-1\ranger.txt)

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

5 files changed, 32 insertions, 28 deletions

diff --git a/npc/re/quests/skills/acolyte_skills.txt b/npc/re/quests/skills/acolyte_skills.txt
index c6dd68f4e..2d797d714 100644
--- a/npc/re/quests/skills/acolyte_skills.txt
+++ b/npc/re/quests/skills/acolyte_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Fixed a typo in job check. (Bugreport:1531) [L0ne_W0lf]
 //= 1.7 Updated to latest available official file. [Masao]
+//= 1.8 Fixed JobLevel requirements. [Euphy]
 //============================================================
 
 prt_church,173,23,4	script	Cleric	79,{
@@ -67,7 +68,7 @@ prt_church,173,23,4	script	Cleric	79,{
 			mes "this skill for the work of good . .";
 			close;
 		}
-		if ((countitem(727) > 0) && (countitem(991) > 0) && (countitem(2608) > 0) && (JobLevel > 29) && (BaseClass == Job_Acolyte)) {
+		if ((countitem(727) > 0) && (countitem(991) > 0) && (countitem(2608) > 0) && (JobLevel > 29 || (BaseJob == Job_Priest || BaseJob == Job_Monk)) && (BaseClass == Job_Acolyte)) {
 			mes "[Acolyte Klift]";
 			mes "Your faith has proven worthy";
 			mes "for you to gain the ' Holy Light ' skill.";
diff --git a/npc/re/quests/skills/archer_skills.txt b/npc/re/quests/skills/archer_skills.txt
index dd1233e56..0fbb4d270 100644
--- a/npc/re/quests/skills/archer_skills.txt
+++ b/npc/re/quests/skills/archer_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena dev team
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Updated to latest available official file.
 //= also fixed Item issue [bugreport:5607]. [Masao]
+//= 1.7 Fixed JobLevel requirements. [Euphy]
 //============================================================
 
 moc_ruins,118,99,5	script	Roberto	88,{
@@ -33,7 +34,7 @@ moc_ruins,118,99,5	script	Roberto	88,{
 			mes "Then byebye~";
 			close;
 		}
-		else if ((BaseClass == Job_Archer) && (JobLevel >= 30)) {
+		else if (JobLevel >= 30 || (BaseJob == Job_Hunter || BaseJob == Job_Bard || BaseJob == Job_Dancer)) {
 			mes "[Roberto]";
 			mes "Eh!";
 			mes " ";
@@ -130,10 +131,9 @@ moc_ruins,118,99,5	script	Roberto	88,{
 			}
 		}
 		mes "[Roberto]";
-		mes "Hmm... Do you?";
-		mes "Have something to say?";
-		mes "I,";
-		mes "have nothing.";
+		mes "Hmm... Do you";
+		mes "have something to say?";
+		mes "I have nothing.";
 		mes "Difference in levels";
 		mes "cuts off conversations.";
 		close;
@@ -158,7 +158,7 @@ payon,103,63,3	script	Jason	88,3,3,{
 			mes "Ehhhh... don't come any more ehh...";
 			close;
 		}
-		else if (JobLevel >= 35) {
+		else if (JobLevel >= 35 || (BaseJob == Job_Hunter || BaseJob == Job_Bard || BaseJob == Job_Dancer)) {
 			mes "[Jason]";
 			mes "Darn... my wound isn't healing.";
 			mes "Bleh.. I was too careless... ";
diff --git a/npc/re/quests/skills/mage_skills.txt b/npc/re/quests/skills/mage_skills.txt
index cb141443d..2f9d124fa 100644
--- a/npc/re/quests/skills/mage_skills.txt
+++ b/npc/re/quests/skills/mage_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Fixed a typo in job check. (Bugreport:1531) [L0ne_W0lf]
 //= 1.7 Updated to latest available official file. [Masao]
+//= 1.8 Fixed JobLevel requirements. [Euphy]
 //============================================================
 
 geffen_in,151,119,4	script	Great Wizard	64,{
@@ -21,7 +22,7 @@ geffen_in,151,119,4	script	Great Wizard	64,{
 	mes "Look into yourself to discover";
 	mes "your hidden abilities !";
 	next;
-	switch (select(" About mage's hidden ability :About skill ^3355FF' Energy Coat '^000000 :End conversation")) {
+	switch (select("About mage's hidden ability :About skill ^3355FF' Energy Coat '^000000 :End conversation")) {
 	case 1:
 		mes "[BLIZZARDRISS]";
 		mes "For many years";
@@ -92,7 +93,7 @@ geffen_in,151,119,4	script	Great Wizard	64,{
 			mes "I have nothing more to teach you ...";
 			close;
 		}
-		if ((countitem(746) > 2) && (countitem(730) > 0) && (countitem(935) > 4) && (countitem(943) > 0) && (JobLevel > 34) && (BaseClass == Job_Mage)) {
+		if ((countitem(746) > 2) && (countitem(730) > 0) && (countitem(935) > 4) && (countitem(943) > 0) && (JobLevel > 34 || (BaseJob == Job_Wizard || BaseJob == Job_Sage)) && (BaseClass == Job_Mage)) {
 			mes "[BLIZZARDRISS]";
 			mes "Okay, I have received your request.";
 			mes "I will now awaken your hidden energies . .";
@@ -138,7 +139,7 @@ geffen_in,151,119,4	script	Great Wizard	64,{
 		mes "Didn't you listen to my explanation ? !";
 		mes "You have not prepared fully";
 		mes "for me to assist you.";
-		mes "Check that you have me all the requirements";
+		mes "Check that you have all the requirements.";
 		next;
 		mes "[BLIZZARDRISS]";
 		mes "If you need me to explain";
diff --git a/npc/re/quests/skills/merchant_skills.txt b/npc/re/quests/skills/merchant_skills.txt
index 1fb202072..def5ec6aa 100644
--- a/npc/re/quests/skills/merchant_skills.txt
+++ b/npc/re/quests/skills/merchant_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Updated to latest available official file. [Masao]
+//= 1.7 Fixed JobLevel requirements. [Euphy]
 //============================================================
 
 alberta,83,96,5	script	Necko	98,7,7,{
@@ -61,7 +62,7 @@ alberta,83,96,5	script	Necko	98,7,7,{
 			mes "Kyukwakakakakakakakakakaka!";
 			close;
 		}
-		else if ((countitem(722) > 6) && (countitem(532) > 0) && (countitem(921) > 49) && (JobLevel >= 15)) {
+		else if ((countitem(722) > 6) && (countitem(532) > 0) && (countitem(921) > 49) && (JobLevel >= 15 || (BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist))) {
 			mes "[Necko]";
 			mes "Oh! You!";
 			mes "You are qualified to learn how to shout!";
@@ -200,7 +201,7 @@ alberta,119,221,6	script	Charlron	107,{
 			mes "Be healthy~";
 			close;
 		}
-		else if (JobLevel >= 30) {
+		else if (JobLevel >= 30|| (BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist)) {
 			mes "[Charlron]";
 			mes "Nice to see you fellow merchant";
 			mes "If I remember correctly,";
@@ -347,7 +348,7 @@ alberta,232,103,6	script	Gershaun	57,{
 			mes "Here! Hurry!";
 			close;
 		}
-		else if ((BaseClass == Job_Merchant) && (JobLevel >= 35)) {
+		else if (JobLevel >= 35 || (BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist)) {
 			mes "[Gershaun]";
 			mes "Ooh. You have a firm body";
 			mes "for a merchant. You must be";
diff --git a/npc/re/quests/skills/swordman_skills.txt b/npc/re/quests/skills/swordman_skills.txt
index 31853bc8c..295291a16 100644
--- a/npc/re/quests/skills/swordman_skills.txt
+++ b/npc/re/quests/skills/swordman_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //===== Additional Comments: =================================
 //= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.7 Updated to latest available official file. [Masao]
+//= 1.8 Fixed JobLevel requirements. [Euphy]
 //============================================================
 
 izlude_in,175,130,2	script	Knight De Thomas	98,4,4,{
@@ -90,13 +91,13 @@ izlude_in,175,130,2	script	Knight De Thomas	98,4,4,{
 		next;
 		switch (select("Yes.:No, I'm not ready yet.")) {
 		case 1:
-			if ((JobLevel > 34) && (countitem(713) > 199) && (countitem(1058) > 0)) {
+			if ((JobLevel > 34 || (BaseJob == Job_Knight || BaseJob == Job_Crusader)) && (countitem(713) > 199) && (countitem(1058) > 0)) {
 				mes "[De Thomas]";
 				mes "Let's see.....";
 				next;
 				mes "[De Thomas]";
 				mes "Ok! I shall now teach you...";
-				mes "..The Body Movin' skill!";
+				mes "...The Body Movin' skill!";
 				next;
 				delitem 713,200; //Empty_Bottle
 				delitem 1058,1; //Wing_Of_Moth
@@ -110,12 +111,12 @@ izlude_in,175,130,2	script	Knight De Thomas	98,4,4,{
 				mes "[De Thomas]";
 				mes "Oh yeah, I won't be needing your";
 				mes "armor so you can keep it.";
-				mes "..Good luck now!";
+				mes "Good luck now!";
 				close;
 			}
-			else if (JobLevel < 35) {
+			else if (JobLevel < 35 && (BaseJob != Job_Knight && BaseJob != Job_Crusader)) {
 				mes "[De Thomas]";
-				mes "Wait a second your Job level isn't above ^00880035^000000!";
+				mes "Wait a second, your Job level isn't above ^00880035^000000!";
 				mes "Come back when it is.";
 				close;
 			}
@@ -150,7 +151,7 @@ izlude_in,175,130,2	script	Knight De Thomas	98,4,4,{
 
 prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
 
-	if ((BaseClass == Job_Swordman) && (JobLevel >= 25)) {
+	if ((BaseClass == Job_Swordman) && (JobLevel >= 25 || (BaseJob == Job_Knight || BaseJob == Job_Crusader))) {
 		if (getskilllv("SM_FATALBLOW") == 1) {
 			mes "[Leon]";
 			mes "Eh?";
@@ -313,7 +314,7 @@ prt_in,94,57,3	script	Juan	85,4,4,{
 			mes "You can do it.";
 			close;
 		}
-		else if (JobLevel < 10) {
+		else if (JobLevel < 10 && (BaseJob != Job_Knight && BaseJob != Job_Crusader)) {
 			mes "[?]";
 			mes "What are you?";
 			mes "Eh, still a beginner.";
@@ -321,13 +322,13 @@ prt_in,94,57,3	script	Juan	85,4,4,{
 			mes "before coming back.";
 			close;
 		}
-		else if ((JobLevel > 10) && (JobLevel < 30)) {
+		else if (JobLevel < 30 && (BaseJob != Job_Knight && BaseJob != Job_Crusader)) {
 			mes "[Juan]";
 			mes "Oh, nice to meet you.";
 			mes "You can be on your way. (smiley~)";
 			close;
 		}
-		else if ((countitem(924) > 34) && (countitem(958) > 9) && (countitem(957) > 9) && (countitem(518) > 9) && (JobLevel >= 30)) {
+		else if ((countitem(924) > 34) && (countitem(958) > 9) && (countitem(957) > 9) && (countitem(518) > 9)) {
 			mes "[Juan]";
 			mes "Ooh. Young swordsman!";
 			mes "You are ready to learn the";
@@ -336,7 +337,7 @@ prt_in,94,57,3	script	Juan	85,4,4,{
 			switch (select("Hoho, I would like to learn it now.:What is that?")) {
 			case 1:
 				mes "[Juan]";
-				mes "Ok. Then..";
+				mes "Ok. Then...";
 				next;
 				delitem 924,35; //Powder_Of_Butterfly
 				delitem 958,10; //Horrendous_Mouth