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

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

Conflicts:
	src/map/battle.c

1 files changed, 36 insertions, 36 deletions

diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index 854b0a26a..6a60f40c9 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -63,7 +63,7 @@ prt_church,179,15,1	script	Priest Praupin	4_M_MINISTER,{
 			mes "[Priest Praupin]";
 			mes "I look forward to seeing you";
 			mes "become a better Acolyte after learning from Sister Asthe's instructions. If you like, I can send you to the convent.";
-			set tu_acolyte01, 1;
+			tu_acolyte01 = 1;
 			next;
 			if(select("Go to the convent.:Do not go.")==1){
 				mes "[Priest Praupin]";
@@ -120,12 +120,12 @@ prt_church,179,15,1	script	Priest Praupin	4_M_MINISTER,{
 			switch(select("Wand:Flail")) {
 			case 1:
 				delitem 7181,1; //Receipt_01
-				set tu_acolyte01,23;
+				tu_acolyte01 = 23;
 				getitem 1604,1; //Wand
 				break;
 			case 2:
 				delitem 7181,1; //Receipt_01
-				set tu_acolyte01,23;
+				tu_acolyte01 = 23;
 				getitem 1510,1; //Flail
 				break;
 			}
@@ -201,7 +201,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 			mes "why don't you rest";
 			mes "for a little bit? You must be tired after traveling all the way here. When you're ready, just come";
 			mes "see me, okay?";
-			set tu_acolyte01, 2;
+			tu_acolyte01 = 2;
 			close;
 		}
 		break;
@@ -292,7 +292,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		mes "[Asthe]";
 		mes "HEAL !!";
 		npcskill "AL_HEAL",11,99,60;
-		set tu_acolyte01, 3;
+		tu_acolyte01 = 3;
 		if(getskilllv("AL_HEAL") == 0){
 			getexp 0,100;
 			specialeffect2 EF_CONE;
@@ -330,7 +330,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 			mes "Well then,";
 			mes "I hope you";
 			mes "have a safe trip.";
-			set tu_acolyte01,4;
+			tu_acolyte01 = 4;
 			getitem 1504,1; //Mace
 			getitem 602,1; //Wing_Of_Butterfly
 			savepoint "prt_monk",30,250;
@@ -348,7 +348,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 			mes "ready for me to discuss";
 			mes "the next subject. Now,";
 			mes "let's see... Hmm...";
-			set tu_acolyte01, 5;
+			tu_acolyte01 = 5;
 			close;
 		}
 		break;
@@ -380,7 +380,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 				mes "Thank you so much.";
 				mes "You have returned the Mace.";
 				emotion e_heh;
-				set tu_acolyte01, 5;
+				tu_acolyte01 = 5;
 				delitem 1504, 1; //Mace
 				if(Class == Job_Acolyte_High) {
 					getexp 2000,1000;
@@ -433,7 +433,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		mes "[Asthe]";
 		mes "Did you undertand all that?";
 		mes "Ho ho ho~ No need to try to remember everything right now. You'll get the hang of it.";
-		set tu_acolyte01, 6;
+		tu_acolyte01 = 6;
 		close;
 	case 6:
 		mes ""+strcharinfo(0)+",";
@@ -444,7 +444,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		mes "[Asthe]";
 		mes "However, I'm a little busy with";
 		mes "my work right now, so would you deliver this to Priest Gardron in the next building for me?";
-		set tu_acolyte01,7;
+		tu_acolyte01 = 7;
 		getitem 7148,1; //Mother_Letter
 		close;
 	case 7:
@@ -492,7 +492,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		next;
 		mes "^3355FFSister Asthe gives";
 		mes "you some dog food.^000000";
-		set tu_acolyte01, 10;
+		tu_acolyte01 = 10;
 		close;
 	case 11:
 	case 12:
@@ -513,7 +513,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		mes "know the answer.";
 		mes "Think carefully";
 		mes "and it will come.";
-		set tu_acolyte01, 12;
+		tu_acolyte01 = 12;
 		close;
 	case 13:
 		mes "You remember that";
@@ -542,7 +542,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		mes "Let's take a break before";
 		mes "we proceed to the next lesson,";
 		mes "alright? I'll be right here.";
-		set tu_acolyte01, 14;
+		tu_acolyte01 = 14;
 		close;
 	case 14:
 		mes "Now it's time";
@@ -564,7 +564,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		mes "[Asthe]";
 		mes "Try it for";
 		mes "yourself, okay?";
-		set tu_acolyte01, 15;
+		tu_acolyte01 = 15;
 		npcskill "AL_INCAGI",10,0,0;
 		close;
 	case 15:
@@ -575,7 +575,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		next;
 		mes "[Asthe]";
 		mes "Like you'd expect, Decrease AGI slows down enemies, reducing their agility, Movement Speed, Dodge Rate and Attack Speed. Its effect is the exact reverse of Increase AGI.";
-		set tu_acolyte01, 15;
+		tu_acolyte01 = 15;
 		next;
 		mes "[Asthe]";
 		mes "The last skill in the Heal skill tree is ^3131FFCure^000000. You can learn Cure after learning Level 2 Heal.";
@@ -591,7 +591,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		mes "For now, don't forget that the Increase AGI, Decrease AGI and";
 		mes "Cure skills can only be learned";
 		mes "by learning the Heal skill.";
-		set tu_acolyte01, 16;
+		tu_acolyte01 = 16;
 		close;
 	case 16:
 		mes "You've been learning";
@@ -658,7 +658,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 			mes "[Asthe]";
 			mes "Ho ho!";
 			mes "What a smart Acolyte~";
-			set tu_acolyte01, 17;
+			tu_acolyte01 = 17;
 		}
 		close;
 	case 17:
@@ -691,7 +691,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 			mes "to carry everything.";
 			mes "Why don't you put some of your things in Kafra Storage first?";
 		} else {
-			set tu_acolyte01, 18;
+			tu_acolyte01 = 18;
 			getitem 7183,1; //Sister_Letter
 			getitem 7181,1; //Receipt_01
 			getitem 1081,2; //Merchant_Box_1
@@ -741,7 +741,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		mes "the next time we";
 		mes "meet, I will give";
 		mes "you my final lesson.";
-		set tu_acolyte01, 24;
+		tu_acolyte01 = 24;
 		close;
 	case 24:
 		mes "The last skill";
@@ -775,7 +775,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		next;
 		mes "[Asthe]";
 		mes "Well, please don't forget what I've taught you. I hope you look back with fondness at our time together amongst these beautiful flowers. May God bless you~";
-		set tu_acolyte01, 25;
+		tu_acolyte01 = 25;
 		if (checkre(3))
 			getexp 1000,1000;
 		else
@@ -818,7 +818,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	4_M_MINISTER,{
 			mes "she is getting old now, but I'm relieved to hear that her health";
 			mes "is good. We are truly blessed...";
 			delitem 7148,1; //Mother_Letter
-			set tu_acolyte01,8;
+			tu_acolyte01 = 8;
 			close;
 		} else {
 			mes "Hmm...?";
@@ -853,7 +853,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	4_M_MINISTER,{
 			mes "should return to Sister";
 			mes "Asthe to continue your";
 			mes "Acolyte training.";
-			set tu_acolyte01, 9;
+			tu_acolyte01 = 9;
 			percentheal 100,100;
 			if (checkre(3))
 				getexp 1000,1000;
@@ -961,7 +961,7 @@ prt_monk,235,245,5	script	Dog#tu	4_DOG01,{
 		while(1) {
 			switch(select("Give a treat.:Pet the dog.:End actions.")){
 			case 1:
-				set .@dog_food, .@dog_food + 1;
+				++.@dog_food;
 				if(.@dog_food > 4){
 					mes "[Dog]";
 					mes "^CDB79EGrrrrrr...!^000000";
@@ -1085,7 +1085,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	4_F_04,{
 		mes "["+strcharinfo(0)+"]";
 		mes "I'll cure you...";
 		mes "For sure.";
-		set tu_acolyte01, 11;
+		tu_acolyte01 = 11;
 		close;
 	} else if(tu_acolyte01 == 11){
 		next;
@@ -1129,7 +1129,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	4_F_04,{
 					mes "practice your abilities!";
 					mes "It seemed that this good";
 					mes "deed has improved your skills.^000000";
-					set tu_acolyte01, 13;
+					tu_acolyte01 = 13;
 					if (checkre(3))
 						getexp 0,500;
 					else
@@ -1236,7 +1236,7 @@ prt_monk,197,228,3	script	Veiner	4_M_ORIENT02,{
 		mes "Oh right!";
 		mes "Thank you very much for delivering this to me. Sorry, but I'm always excited to hear from my cutie pie~";
 		emotion e_thx;
-		set tu_acolyte01,19;
+		tu_acolyte01 = 19;
 		delitem 1081,1; //Merchant_Box_1
 		close;
 	} else if(tu_acolyte01 > 18){
@@ -1285,7 +1285,7 @@ prt_monk,28,260,5	script	Hedrick	1_M_04,{
 	mes "you have one of the";
 	mes "cookies she sent me?";
 	delitem 7148,1; //Mother_Letter
-	set tu_acolyte01,20;
+	tu_acolyte01 = 20;
 	getitem 538,1; //Well_Baked_Cookie
 	close;
 }
@@ -1304,7 +1304,7 @@ OnTouch:
 	mes "Oh, and come here if";
 	mes "you need anything, okay?";
 	delitem 1081,1; //Merchant_Box_1
-	set tu_acolyte01,21;
+	tu_acolyte01 = 21;
 	close;
 }
 
@@ -1315,7 +1315,7 @@ monk_in,103,176,7	script	Karven	1_M_PASTOR,{
 	mes "May you rest";
 	if(tu_acolyte01 == 21 && countitem(7183)){
 		delitem 7183, 1;
-		set tu_acolyte01, 22;
+		tu_acolyte01 = 22;
 		mes "in peace forever...";
 		next;
 		mes "[Karven]";
@@ -1785,23 +1785,23 @@ sec_in02,17,156,3	script	1st Job Quest Reset	4_F_JOB_BLACKSMITH,{
 	next;
 	switch(select("Swordsman:Merchant:Archer:Acolyte:Thief:Mage")) {
 	case 1:
-		set tu_swordman,0;
+		tu_swordman = 0;
 		break;
 	case 2:
-		set tu_merchant,0;
+		tu_merchant = 0;
 		break;
 	case 3:
-		set tu_archer01,0;
-		set tu_archer02,0;
+		tu_archer01 = 0;
+		tu_archer02 = 0;
 		break;
 	case 4:
-		set tu_acolyte01,0;
+		tu_acolyte01 = 0;
 		break;
 	case 5:
-		set tu_thief01,0;
+		tu_thief01 = 0;
 		break;
 	case 6:
-		set tu_magician01,0;
+		tu_magician01 = 0;
 		break;
 	}
 	mes "Completed.";