Merge remote-tracking branch 'upstream/master'

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

Conflicts:
	sql-files/main.sql
	sql-files/upgrades/index.txt
	src/common/mmo.h

1 files changed, 18 insertions, 18 deletions

diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index bcac70d9d..adb01b867 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -95,7 +95,7 @@
 	}
 }
 
-lou_fild01,190,100,7	script	Girl#1lou	815,{
+lou_fild01,190,100,7	script	Girl#1lou	4_F_CHNDRESS1,{
 	mes "[Girl]";
 	mes "Would you";
 	mes "like to go back";
@@ -135,7 +135,7 @@ lou_fild01,190,100,7	script	Girl#1lou	815,{
 
 // Generic Louyang NPCs
 //============================================================
-louyang,297,167,2	script	Muscular Woman#lou	815,{
+louyang,297,167,2	script	Muscular Woman#lou	4_F_CHNDRESS1,{
 	if (!Sex) {
 		mes "[Zhi Ching Li]";
 		mes "All the members of the Maiden Palace, including myself and our master, are all female.";
@@ -158,7 +158,7 @@ louyang,297,167,2	script	Muscular Woman#lou	815,{
 	close;
 }
 
-louyang,274,136,4	script	Powerful-looking guy#lou	819,{
+louyang,274,136,4	script	Powerful-looking guy#lou	4_M_CHN8GUEK,{
 	mes "[Akiira]";
 	mes "I am practicing my 'Claw of Dragon.' I not only need to use the power of my fists, I must also condition myself spiritually.";
 	next;
@@ -180,7 +180,7 @@ louyang,274,136,4	script	Powerful-looking guy#lou	819,{
 	close;
 }
 
-louyang,276,136,4	script	Fist master#lou	819,{
+louyang,276,136,4	script	Fist master#lou	4_M_CHN8GUEK,{
 	mes "[Zhiang Xiau Ji]";
 	mes "Finally...";
 	mes "I have mastered";
@@ -205,7 +205,7 @@ louyang,276,136,4	script	Fist master#lou	819,{
 	close;
 }
 
-louyang,276,133,0	script	Trainee#1lou::LouTrainee	819,{
+louyang,276,133,0	script	Trainee#1lou::LouTrainee	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Yeeeyap~!";
 	mes "Taaaaaah~~!!";
@@ -213,7 +213,7 @@ louyang,276,133,0	script	Trainee#1lou::LouTrainee	819,{
 	close;
 }
 
-louyang,276,131,0	script	Trainee#2lou	819,{
+louyang,276,131,0	script	Trainee#2lou	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Tah Tah Tah!";
 	mes "Taaaaaah~~!!";
@@ -221,14 +221,14 @@ louyang,276,131,0	script	Trainee#2lou	819,{
 	close;
 }
 
-louyang,276,129,0	script	Trainee#3lou	819,{
+louyang,276,129,0	script	Trainee#3lou	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Si!";
 	mes "Ayah!!";
 	close;
 }
 
-louyang,274,133,0	script	Trainee#4lou	819,{
+louyang,274,133,0	script	Trainee#4lou	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Dergh!";
 	mes "Dergh!";
@@ -236,7 +236,7 @@ louyang,274,133,0	script	Trainee#4lou	819,{
 	close;
 }
 
-louyang,274,131,0	script	Trainee#5lou	819,{
+louyang,274,131,0	script	Trainee#5lou	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Yah Yah Yah!";
 	mes "Taaaaaah~~!!";
@@ -244,7 +244,7 @@ louyang,274,131,0	script	Trainee#5lou	819,{
 	close;
 }
 
-louyang,274,129,0	script	Trainee#6lou	819,{
+louyang,274,129,0	script	Trainee#6lou	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Yeeeyap~!";
 	mes "Taaaaaah~~!!";
@@ -252,16 +252,16 @@ louyang,274,129,0	script	Trainee#6lou	819,{
 	close;
 }
 
-louyang,278,133,0	duplicate(LouTrainee)	Trainee#7lou	819
-louyang,278,131,0	duplicate(LouTrainee)	Trainee#8lou	819
-louyang,278,129,0	duplicate(LouTrainee)	Trainee#9lou	819
-louyang,272,133,0	duplicate(LouTrainee)	Trainee#10lou	819
-louyang,272,131,0	duplicate(LouTrainee)	Trainee#11lou	819
-louyang,272,129,0	duplicate(LouTrainee)	Trainee#12lou	819
+louyang,278,133,0	duplicate(LouTrainee)	Trainee#7lou	4_M_CHN8GUEK
+louyang,278,131,0	duplicate(LouTrainee)	Trainee#8lou	4_M_CHN8GUEK
+louyang,278,129,0	duplicate(LouTrainee)	Trainee#9lou	4_M_CHN8GUEK
+louyang,272,133,0	duplicate(LouTrainee)	Trainee#10lou	4_M_CHN8GUEK
+louyang,272,131,0	duplicate(LouTrainee)	Trainee#11lou	4_M_CHN8GUEK
+louyang,272,129,0	duplicate(LouTrainee)	Trainee#12lou	4_M_CHN8GUEK
 
 // Louyang Viewing Tower
 //============================================================
-lou_in01,25,23,5	script	Friendly Looking Lady#lo	817,{
+lou_in01,25,23,5	script	Friendly Looking Lady#lo	4_F_CHNDRESS3,{
 	mes "[Hong Miao]";
 	mes "Welcome.";
 	next;
@@ -304,7 +304,7 @@ lou_in01,25,23,5	script	Friendly Looking Lady#lo	817,{
 	}
 }
 
-louyang,84,254,0	script	Exit#lou	111,{
+louyang,84,254,0	script	Exit#lou	HIDDEN_NPC,{
 	mes "^3355FFThere is some sort";
 	mes "of descent apparatus.";
 	mes "Would you like to use it?^000000";