* Global_Functions fix. Jobmaster fix.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6687 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/Changelog.txt

@@ -30,6 +30,8 @@ Evera
 
 Date		Added
 ======
+05/22
+	* Global_Functions fix. Jobmaster fix. [Lance]
 05/19
 	* eAAC Update + Fix [erKURITA]
 	* Translated sample/gstorage_test.txt

npc/custom/jobs/jobmaster.txt

@@ -84,7 +84,7 @@ prontera.gat,153,193,6	script	Job Master	123,{
 							break;
 					}
 			}
-			mes "Are you sure?";
+			mes "Are you sure you want to change to " + callfunc("getJobName",@target_job) + "?";
 			if(select("No","Yes") == 2){
 				callfunc "Job_Change", @target_job;
 				if(@target_job == Job_Gunsliger || @target_job == Job_Ninja || @target_job == Job_Taekwon) {

npc/other/Global_Functions.txt

@@ -68,8 +68,10 @@ function	script	F_ClearJobVar	{
 //////////////////////////////////////////////////////////////////////////////////
 
 function	script	Job_Change	{
-	if (Upper==0) jobchange getarg(0); //Change Job For Common
-	if (Upper==2) jobchange getarg(0) + Job_Baby; //Change Job For Baby Class
+	if (Upper<2) 
+		jobchange getarg(0); // Common jobchange
+	else 
+		jobchange getarg(0) + Job_Baby; //Change Job For Baby Class
 	return;
 }
 

npc/scripts_custom.conf

@@ -36,7 +36,7 @@ npc: npc/custom/adoption.txt
 // -- Reset NPC
 //npc: npc/custom/jobs/reset.txt
 // -- Job Changer
-//npc: npc/custom/jobs/jobmaster.txt
+npc: npc/custom/jobs/jobmaster.txt
 // -- Healer(s)
 //npc: npc/custom/healers/heal.txt
 //npc: npc/custom/healers/heal_payment.txt