Merge branch 'master' of github.com:HerculesWS/Hercules

Signed-off-by: shennetsind <ind@henn.et>

Conflicts:
	src/map/battle.c

3 files changed, 16 insertions, 16 deletions

diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index aafe2d0c4..ff98b30e7 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -86,7 +86,7 @@ que_ng,152,167,3	script	Master Miller	4_M_HUOLDARMY,{
 			mes "Horn in Payon. He's a shaman";
 			mes "that will judge whether or not";
 			mes "you qualify to be a Gunslinger.";
-			set GUNS_Q,1;
+			GUNS_Q = 1;
 			setquest 6020;
 			close;
 		}
@@ -179,7 +179,7 @@ que_ng,152,167,3	script	Master Miller	4_M_HUOLDARMY,{
 			mes "power of the earth protect";
 			mes "you in all of your adventures~";
 			callfunc "Job_Change",Job_Gunslinger;
-			set GUNS_Q,6;
+			GUNS_Q = 6;
 			completequest 6024;
 			if (rand(1,2) == 1) {
 				getitem 13100,1; // Six_Shooter
@@ -260,7 +260,7 @@ payon,184,65,3	script	Wise Bull Horn	4_M_LGTGRAND,{
 		mes "will help you achieve";
 		mes "your goal of becoming";
 		mes "a Gunslinger.";
-		set GUNS_Q,2;
+		GUNS_Q = 2;
 		changequest 6020,6021;
 		close;
 	}
@@ -297,7 +297,7 @@ payon,184,65,3	script	Wise Bull Horn	4_M_LGTGRAND,{
 		delitem 935,10; // Shell
 		delitem 511,3; // Green_Herb
 		delitem 1013,3; // Colorful_Shell
-		set GUNS_Q,3;
+		GUNS_Q = 3;
 		changequest 6021,6022;
 		mes "[Wise Bull Horn]";
 		mes "Ah, you've returned";
@@ -344,7 +344,7 @@ payon,184,65,3	script	Wise Bull Horn	4_M_LGTGRAND,{
 		mes "I'm thirsty, and would like";
 		mes "a cold glass of Milk. Would";
 		mes "you please bring me some?";
-		set GUNS_Q,4;
+		GUNS_Q = 4;
 		changequest 6022,6023;
 		close;
 	}
@@ -359,7 +359,7 @@ payon,184,65,3	script	Wise Bull Horn	4_M_LGTGRAND,{
 			close;
 		}
 		delitem 519,1; // Milk
-		set GUNS_Q,5;
+		GUNS_Q = 5;
 		changequest 6023,6024;
 		mes "[Wise Bull Horn]";
 		mes "Oh, thank you for your!";
diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt
index 90cc08edc..be8753834 100644
--- a/npc/jobs/1-1e/ninja.txt
+++ b/npc/jobs/1-1e/ninja.txt
@@ -186,7 +186,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "Anyway, after you give him";
 			mes "the letter, come back and";
 			mes "let me know his answer.";
-			set NINJ_Q,1;
+			NINJ_Q = 1;
 			setquest 6015;
 			close;
 		}
@@ -253,7 +253,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "I should have thought about";
 			mes "that earlier! Well, it's too";
 			mes "late now. Just h-hurry it up!";
-			set NINJ_Q,4;
+			NINJ_Q = 4;
 			changequest 6017,6018;
 			close;
 		}
@@ -331,7 +331,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "agile as the wind, and as";
 			mes "quiet as the falling shadows.";
 			callfunc "Job_Change",Job_Ninja;
-			set NINJ_Q,5;
+			NINJ_Q = 5;
 			delitem 7053,5; // Cyfar
 			delitem 1010,1; // Phracon
 			getitem 13010,1;	// Asura
@@ -430,7 +430,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 		mes "help me find";
 		mes "^3355FF5 Cyfars^000000 and";
 		mes "^3355FF1 Phracon^000000.";
-		set NINJ_Q,2;
+		NINJ_Q = 2;
 		changequest 6015,6016;
 		close;
 	}
@@ -524,7 +524,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 		mes "me send you there directly...";
 		delitem 1010,1;	// Phracon
 		delitem 7053,5;	// Cyfar
-		set NINJ_Q,3;
+		NINJ_Q = 3;
 		changequest 6016,6017;
 		close2;
 		warp "amatsu",113,127;
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 6403c2648..dd088790d 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -102,7 +102,7 @@ payon,157,141,5	script	Phoenix#TKJobChange	4_M_MONK,{
 				mes "training as a Novice. Very good. Then let us prepare for your";
 				mes "spiritual training. Take a deep";
 				mes "breath, speak to me when ready.";
-				set TK_Q, 2;
+				TK_Q = 2;
 				setquest 6001;
 				close;
 			}
@@ -112,8 +112,8 @@ payon,157,141,5	script	Phoenix#TKJobChange	4_M_MONK,{
 			mes "true potential without integrating mind and body. Go, gain ^FF00001 more";
 			mes "Base Level^000000, and then return.";
 			next;
-			set TAEK_Q, BaseLevel;
-			set TK_Q, 1;
+			TAEK_Q = BaseLevel;
+			TK_Q = 1;
 			setquest 6000;
 			mes "[Phoenix]";
 			mes "I understand this is not an";
@@ -136,7 +136,7 @@ payon,157,141,5	script	Phoenix#TKJobChange	4_M_MONK,{
 	switch(TK_Q) {
 	case 1:
 		if(BaseLevel > TAEK_Q) {
-			set TK_Q, 2;
+			TK_Q = 2;
 			changequest 6000,6001;
 			mes "[Phoenix]";
 			mes "Good. I sense that you";
@@ -331,7 +331,7 @@ payon,157,141,5	script	Phoenix#TKJobChange	4_M_MONK,{
 		mes "we have discussed for a little";
 		mes "while. When your mind is calm,";
 		mes "come and speak to me.";
-		set TK_Q, 3;
+		TK_Q = 3;
 		changequest 6001,6002;
 		close;
 	case 3: