* Fixed north prontera kafra having an empty warp list

* Removed junk ЎA text from the 2004 headgears
* Changed deprecated Job_Alchem to Job_Alchemist (see r10904)
* Fixed a typo in a geffen city npc (Job_Merhcant)
* Fixed a typo in the Jobmaster custom script (Job_Gunsliger)
* Fixed one old eAAC Quest Warper bug (warp to nonwalkable coords)

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

3 files changed, 12 insertions, 12 deletions

diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index 34b5686d3..cf1b18f8a 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -882,12 +882,12 @@ yuno,241,52,3	script	Old Blacksmith	813,{
 			mes "Oh yes,";
 			mes "I need to tell you the details about the materials.";
 			mes "Angel Wing Ears requires ^4d4dffAngel Wings^000000 and";
-			mes "^4d4dffElven Ears^000000 ЎAand the cost for other materials is";
+			mes "^4d4dffElven Ears^000000 and the cost for other materials is";
 			mes "approximatedly ^4d4dff20000 zeny^000000";
 			next;
 			mes "[Habir Moah]";
 			mes "Devil Wing Ears requires ^4d4dffEvil Wing^000000 and";
-			mes "^4d4dffElven Ears^000000 ЎAwhile the cost for other materials is";
+			mes "^4d4dffElven Ears^000000 while the cost for other materials is";
 			mes "approximately ^4d4dff20000 zeny";
 			next;
 			mes "[Habir Moah]";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index bf7f2ca95..9470f7d22 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -919,7 +919,7 @@ alberta,129,59,3	script	Guildsman	49,3,3,{
 			getitem 7416,1;
 			close;
 		}
-		else if((Class == Job_Alchem) || (Class == Job_Creator))
+		else if((Class == Job_Alchemist) || (Class == Job_Creator))
 		{
 			mes "[Guildsman]";
 			mes "Hey, " + strcharinfo(0) + "?";
@@ -1015,7 +1015,7 @@ alberta,129,59,3	script	Guildsman	49,3,3,{
 			mes "inside Morroc. Good luck~";
 			close;
 		}
-		else if((Class == Job_Alchem) || (Class == Job_Creator))
+		else if((Class == Job_Alchemist) || (Class == Job_Creator))
 		{
 			mes "[Guildsman]";
 			mes "Ah, I almost forgot to";
@@ -1067,7 +1067,7 @@ alberta,129,59,3	script	Guildsman	49,3,3,{
 			mes "influences behind all of this... ";
 			close;
 		}
-		else if((Class == Job_Alchem) || (Class == Job_Creator))
+		else if((Class == Job_Alchemist) || (Class == Job_Creator))
 		{
 			mes "[Guildsman]";
 			mes "I'm glad to hear that";
@@ -1110,7 +1110,7 @@ alberta,129,59,3	script	Guildsman	49,3,3,{
 			mes "may happen soon, you know?";
 			close;
 		}
-		else if((Class == Job_Alchem) || (Class == Job_Creator))
+		else if((Class == Job_Alchemist) || (Class == Job_Creator))
 		{
 			mes "[Guildsman]";
 			mes "Ah, it's a nice day...";
@@ -1259,7 +1259,7 @@ OnTouch:
 				getitem 7416,1;
 				close;
 			}
-			else if((Class == Job_Alchem) || (Class == Job_Creator))
+			else if((Class == Job_Alchemist) || (Class == Job_Creator))
 			{
 				mes "[Guildsman]";
 				mes "Hey, " + strcharinfo(0) + "?";
diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index bb4474914..caa1cc315 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -31,8 +31,8 @@
 // ALCHEMIST - ELEMENTAL POTION CREATION
 //============================================================
 yuno_in04,33,108,6	script	Pisruik Quv	883,{
-	if (Class == Job_Alchem || Class == Job_Creator) {
-		if (JobLevel < 40 && Class == Job_Alchem) {
+	if (Class == Job_Alchemist || Class == Job_Creator) {
+		if (JobLevel < 40 && Class == Job_Alchemist) {
 			mes "[Pisruik]";
 			mes "Achoo!";
 			mes "Sigh";
@@ -964,7 +964,7 @@ lhz_in01,224,140,8	script	Kellasus	57,{
 		mes "[Kellasus]";
 		mes "I already taught you";
 		mes "skills of the homunculus...";
-		if(getskilllv(238) == 0 && BaseJob == Job_Alchem) skill 238,1,0;
+		if(getskilllv(238) == 0 && BaseJob == Job_Alchemist) skill 238,1,0;
 		close;
 	}
 	switch(bioeth){
@@ -1061,7 +1061,7 @@ lhz_in01,224,140,8	script	Kellasus	57,{
 		mes "He wants me to get back? Okay, well...";
 		mes "I guess you've deserved it.";
 		mes "Here you are, secrets of homunculus are yours now~";
-		if(BaseJob == Job_Alchem) skill 238,1,0;
+		if(BaseJob == Job_Alchemist) skill 238,1,0;
 		set MISC_QUEST,MISC_QUEST|64;
 		set bioeth,0;
 		close;
@@ -1105,7 +1105,7 @@ lhz_in01,224,140,8	script	Kellasus	57,{
 		mes "meant to be known and what";
 		mes "secrets were never intended";
 		mes "for mankind to understand?";
-		if(BaseJob == Job_Alchem) set @keltalk,1;
+		if(BaseJob == Job_Alchemist) set @keltalk,1;
 		close;
 		break;
 	}