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

21 files changed, 43 insertions, 43 deletions

diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt
index 6cdcc77ab..ebdc144e9 100644
--- a/npc/pre-re/guides/guides_alberta.txt
+++ b/npc/pre-re/guides/guides_alberta.txt
@@ -19,7 +19,7 @@
 //	-Thanks to $ephiroth.
 //============================================================
 
-alberta,23,238,4	script	Guide#alb::AlbGuide	105,{
+alberta,23,238,4	script	Guide#alb::AlbGuide	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Alberta Guide]";
 	mes "Welcome to Alberta,";
@@ -154,4 +154,4 @@ alberta,23,238,4	script	Guide#alb::AlbGuide	105,{
 	end;
 }
 
-alberta,120,60,3	duplicate(AlbGuide)	Guide#2alb	105
\ No newline at end of file
+alberta,120,60,3	duplicate(AlbGuide)	Guide#2alb	8W_SOLDIER
\ No newline at end of file
diff --git a/npc/pre-re/guides/guides_aldebaran.txt b/npc/pre-re/guides/guides_aldebaran.txt
index 8c68f6b7a..6abac6474 100644
--- a/npc/pre-re/guides/guides_aldebaran.txt
+++ b/npc/pre-re/guides/guides_aldebaran.txt
@@ -19,7 +19,7 @@
 //= 1.7 Fixed viewpoint coordinates [Playtester]
 //============================================================
 
-aldebaran,139,63,4	script	Soldier#alde	105,{
+aldebaran,139,63,4	script	Soldier#alde	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Al De Baran Guard]";
 	mes "I'm just an ordinary guard";
@@ -54,7 +54,7 @@ aldebaran,139,63,4	script	Soldier#alde	105,{
 	end;
 }
 
-aldebaran,133,108,4	script	Soldier#2alde	105,{
+aldebaran,133,108,4	script	Soldier#2alde	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Al De Baran Guard]";
 	mes "I'm just an";
diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt
index 15129e4ad..85bd79047 100644
--- a/npc/pre-re/guides/guides_amatsu.txt
+++ b/npc/pre-re/guides/guides_amatsu.txt
@@ -13,7 +13,7 @@
 //= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-amatsu,207,89,3	script	Amatsu Guide#ama	758,{
+amatsu,207,89,3	script	Amatsu Guide#ama	4_F_JPN,{
 	mes "[Amachang]";
 	mes "Welcome to Amatsu,";
 	mes "the town of kind towners";
@@ -67,7 +67,7 @@ amatsu,207,89,3	script	Amatsu Guide#ama	758,{
 	}
 }
 	
-amatsu,251,283,4	script	Guide Man#2ama	767,{
+amatsu,251,283,4	script	Guide Man#2ama	8_M_JPNSOLDIER,{
 	mes "[Guide Man]";
 	mes "Welcome, tourist from Rune-Midgard.";
 	mes "I'm the guide of";
diff --git a/npc/pre-re/guides/guides_ayothaya.txt b/npc/pre-re/guides/guides_ayothaya.txt
index b8220873c..d13aa93e9 100644
--- a/npc/pre-re/guides/guides_ayothaya.txt
+++ b/npc/pre-re/guides/guides_ayothaya.txt
@@ -11,7 +11,7 @@
 //= 1.0 First version [L0ne_W0lf]
 //============================================================
 
-ayothaya,203,169,3	script	Noi#ayo	839,{
+ayothaya,203,169,3	script	Noi#ayo	4_F_THAIGIRL,{
 	mes "[Noi]";
 	mes "Welcome to Ayotaya.";
 	mes "Our beautiful village is built";
diff --git a/npc/pre-re/guides/guides_comodo.txt b/npc/pre-re/guides/guides_comodo.txt
index f9e068dec..de803a9c5 100644
--- a/npc/pre-re/guides/guides_comodo.txt
+++ b/npc/pre-re/guides/guides_comodo.txt
@@ -17,15 +17,15 @@
 //= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-comodo,322,178,4	script	Comodo Guide#cmd::CmdGuide	700,{
+comodo,322,178,4	script	Comodo Guide#cmd::CmdGuide	8_F_GIRL,{
 	callfunc "F_CmdGuide","Native Kokomo";
 }
 
-comodo,176,350,4	script	Comodo Guide#2cmd	700,{
+comodo,176,350,4	script	Comodo Guide#2cmd	8_F_GIRL,{
 	callfunc "F_CmdGuide","Native Nutcoco";
 }
 
-comodo,37,219,4	script	Guide#2cmd	700,{
+comodo,37,219,4	script	Guide#2cmd	8_F_GIRL,{
 	callfunc "F_CmdGuide","Native Papaya";
 }
 
diff --git a/npc/pre-re/guides/guides_einbroch.txt b/npc/pre-re/guides/guides_einbroch.txt
index bd4ec75f6..9eefe2535 100644
--- a/npc/pre-re/guides/guides_einbroch.txt
+++ b/npc/pre-re/guides/guides_einbroch.txt
@@ -16,7 +16,7 @@
 //= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-einbroch,72,202,4	script	Guide#ein::EinGuide	852,{
+einbroch,72,202,4	script	Guide#ein::EinGuide	4_M_EIN_SOLDIER,{
 	cutin "ein_soldier",2;
 	mes "[Einbroch Guide]";
 	mes "Welcome";
@@ -201,10 +201,10 @@ einbroch,72,202,4	script	Guide#ein::EinGuide	852,{
 	end;
 }
 
-einbroch,155,43,4	duplicate(EinGuide)	Guide#2ein	852
-einbroch,162,317,4	duplicate(EinGuide)	Guide#3ein	852
+einbroch,155,43,4	duplicate(EinGuide)	Guide#2ein	4_M_EIN_SOLDIER
+einbroch,162,317,4	duplicate(EinGuide)	Guide#3ein	4_M_EIN_SOLDIER
 
-einbech,67,37,4	script	Guide#4ein::EinGuide2	852,{
+einbech,67,37,4	script	Guide#4ein::EinGuide2	4_M_EIN_SOLDIER,{
 	cutin "ein_soldier",2;
 	mes "[Einbech Guide]";
 	mes "Welcome to Einbech,";
@@ -346,4 +346,4 @@ einbech,67,37,4	script	Guide#4ein::EinGuide2	852,{
 	end;
 }
 
-einbech,48,214,4	duplicate(EinGuide2)	Guide#5ein	852
+einbech,48,214,4	duplicate(EinGuide2)	Guide#5ein	4_M_EIN_SOLDIER
diff --git a/npc/pre-re/guides/guides_geffen.txt b/npc/pre-re/guides/guides_geffen.txt
index e691f9e53..46d7e9007 100644
--- a/npc/pre-re/guides/guides_geffen.txt
+++ b/npc/pre-re/guides/guides_geffen.txt
@@ -18,7 +18,7 @@
 //=     Thanks to $ephiroth.
 //============================================================
 
-geffen,203,116,0	script	Guide#gef::GefGuide	705,{
+geffen,203,116,0	script	Guide#gef::GefGuide	4_M_GEF_SOLDIER,{
 	cutin "gef_soldier",2;
 	mes "[Geffen Guide]";
 	mes "Welcome to Geffen,";
@@ -169,4 +169,4 @@ geffen,203,116,0	script	Guide#gef::GefGuide	705,{
 	end;
 }
 
-geffen,118,62,0	duplicate(GefGuide)	Guide#2gef	705
+geffen,118,62,0	duplicate(GefGuide)	Guide#2gef	4_M_GEF_SOLDIER
diff --git a/npc/pre-re/guides/guides_gonryun.txt b/npc/pre-re/guides/guides_gonryun.txt
index 3c8c3ac83..de9b2d599 100644
--- a/npc/pre-re/guides/guides_gonryun.txt
+++ b/npc/pre-re/guides/guides_gonryun.txt
@@ -11,7 +11,7 @@
 //= 1.0 First version [L0ne_W0lf]
 //============================================================
 
-gonryun,163,60,4	script	Kunlun Guide#gon	780,{
+gonryun,163,60,4	script	Kunlun Guide#gon	8_M_TWSOLDIER,{
 	mes "[He Yuen Zhe]";
 	mes "Ni Hao!";
 	mes "Welcome to Kunlun~";
diff --git a/npc/pre-re/guides/guides_hugel.txt b/npc/pre-re/guides/guides_hugel.txt
index b1d64970f..b8a9711b1 100644
--- a/npc/pre-re/guides/guides_hugel.txt
+++ b/npc/pre-re/guides/guides_hugel.txt
@@ -13,7 +13,7 @@
 //= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-hugel,98,56,3	script	Hugel Guide Granny#huge	863,0,0,{
+hugel,98,56,3	script	Hugel Guide Granny#huge	4_F_LGTGRAND,0,0,{
 	mes "[Hugel Guide Granny]";
 	mes "Oh, hello~ you are one energetic adventurer.";
 	mes "Welcome to Hugel. I was honored to guide you to this beautiful village.";
diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt
index 241d5ce40..ef84be488 100644
--- a/npc/pre-re/guides/guides_izlude.txt
+++ b/npc/pre-re/guides/guides_izlude.txt
@@ -17,7 +17,7 @@
 //	-Thanks to $ephiroth.
 //============================================================
 
-izlude,121,87,6	script	Guide#iz	105,{
+izlude,121,87,6	script	Guide#iz	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Izlude Guide]";
 	mes "Welcome to Izlude,";
diff --git a/npc/pre-re/guides/guides_juno.txt b/npc/pre-re/guides/guides_juno.txt
index 9475cb0e2..c1a847717 100644
--- a/npc/pre-re/guides/guides_juno.txt
+++ b/npc/pre-re/guides/guides_juno.txt
@@ -19,7 +19,7 @@
 //= 1.7 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-yuno,153,47,4	script	Juno Guide#yuno	700,{
+yuno,153,47,4	script	Juno Guide#yuno	8_F_GIRL,{
 	mes "[Ms. Yoon]";
 	mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";
 	mes "the city of Juno!";
diff --git a/npc/pre-re/guides/guides_lighthalzen.txt b/npc/pre-re/guides/guides_lighthalzen.txt
index 1d57d5b10..b194c546c 100644
--- a/npc/pre-re/guides/guides_lighthalzen.txt
+++ b/npc/pre-re/guides/guides_lighthalzen.txt
@@ -13,7 +13,7 @@
 //= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-lighthalzen,207,310,5	script	Guide#lhz::LhzGuide	852,{
+lighthalzen,207,310,5	script	Guide#lhz::LhzGuide	4_M_EIN_SOLDIER,{
 	cutin "ein_soldier",2;
 	mes "[Lighthalzen Guide]";
 	mes "Welcome to Lighthalzen,";
@@ -218,8 +218,8 @@ lighthalzen,207,310,5	script	Guide#lhz::LhzGuide	852,{
 	end;
 }
 
-lighthalzen,220,311,3	duplicate(LhzGuide)	Guide#2lhz	852
+lighthalzen,220,311,3	duplicate(LhzGuide)	Guide#2lhz	4_M_EIN_SOLDIER
 
-lighthalzen,154,100,5	duplicate(LhzGuide)	Guide#3lhz	852
+lighthalzen,154,100,5	duplicate(LhzGuide)	Guide#3lhz	4_M_EIN_SOLDIER
 
-lighthalzen,307,224,3	duplicate(LhzGuide)	Guide#4lhz	852
+lighthalzen,307,224,3	duplicate(LhzGuide)	Guide#4lhz	4_M_EIN_SOLDIER
diff --git a/npc/pre-re/guides/guides_louyang.txt b/npc/pre-re/guides/guides_louyang.txt
index 52e83c4ed..8b5b14c8b 100644
--- a/npc/pre-re/guides/guides_louyang.txt
+++ b/npc/pre-re/guides/guides_louyang.txt
@@ -13,7 +13,7 @@
 //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
-louyang,213,213,3	script	Soldier#BA::LouGuide	825,{
+louyang,213,213,3	script	Soldier#BA::LouGuide	4_M_CHNSOLDIER,{
 	mes "[Soldier]";
 	mes "Welcome to Louyang,";
 	mes "a city with a long";
@@ -123,9 +123,9 @@ louyang,213,213,3	script	Soldier#BA::LouGuide	825,{
 	close;
 }
 
-louyang,160,175,3	duplicate(LouGuide)	Soldier#BB	825
+louyang,160,175,3	duplicate(LouGuide)	Soldier#BB	4_M_CHNSOLDIER
 
-louyang,224,104,3	script	Representative#lou	818,{
+louyang,224,104,3	script	Representative#lou	4_F_CHNWOMAN,{
 	mes "[Representative]";
 	mes "Welcome to Louyang,";
 	mes "an ancient land with";
diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt
index 52dd77cac..d4b136094 100644
--- a/npc/pre-re/guides/guides_morroc.txt
+++ b/npc/pre-re/guides/guides_morroc.txt
@@ -16,7 +16,7 @@
 //	-Thanks to $ephiroth.
 //============================================================
 
-morocc,153,286,6	script	Guide#moc::MocGuide	707,{
+morocc,153,286,6	script	Guide#moc::MocGuide	4_M_MOC_SOLDIER,{
 	cutin "moc_soldier",2;
 	mes "[Morroc Guide]";
 	mes "Welcome to Morroc,";
@@ -159,4 +159,4 @@ morocc,153,286,6	script	Guide#moc::MocGuide	707,{
 	end;
 }
 
-morocc,54,97,0	duplicate(MocGuide)	Guide#2moc	707
+morocc,54,97,0	duplicate(MocGuide)	Guide#2moc	4_M_MOC_SOLDIER
diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt
index a06e1d8fa..b71f35006 100644
--- a/npc/pre-re/guides/guides_moscovia.txt
+++ b/npc/pre-re/guides/guides_moscovia.txt
@@ -11,7 +11,7 @@
 //= 1.0 First Version. [Kisuka]
 //============================================================
 
-moscovia,161,76,4	script	Moscovia Guide#mosk	959,{
+moscovia,161,76,4	script	Moscovia Guide#mosk	4_F_RUSWOMAN1,{
 	mes "[Moscovia Guide]";
 	mes "Welcome to Moscovia";
 	mes "Here is the paradise spreading on";
diff --git a/npc/pre-re/guides/guides_niflheim.txt b/npc/pre-re/guides/guides_niflheim.txt
index 4eb165199..4c7a9b586 100644
--- a/npc/pre-re/guides/guides_niflheim.txt
+++ b/npc/pre-re/guides/guides_niflheim.txt
@@ -13,7 +13,7 @@
 //= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-niflheim,107,156,6	script	Roaming Man#nif	798,{
+niflheim,107,156,6	script	Roaming Man#nif	4_M_NFMAN,{
 	mes "[Ricael]";
 	mes "You must be lost...";
 	mes "Why would anyone come";
diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt
index 5244fb3b7..4efc96737 100644
--- a/npc/pre-re/guides/guides_payon.txt
+++ b/npc/pre-re/guides/guides_payon.txt
@@ -19,7 +19,7 @@
 //= 1.6 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-payon,162,67,4	script	Guide#pay	708,{
+payon,162,67,4	script	Guide#pay	4_M_PAY_SOLDIER,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
 	mes "Welcome to the";
@@ -188,7 +188,7 @@ payon,162,67,4	script	Guide#pay	708,{
 	end;
 }
 
-pay_arche,85,30,2	script	Guide#2pay	708,{
+pay_arche,85,30,2	script	Guide#2pay	4_M_PAY_SOLDIER,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
 	mes "Welcome to the";
diff --git a/npc/pre-re/guides/guides_prontera.txt b/npc/pre-re/guides/guides_prontera.txt
index 68be56b2e..7a97a764c 100644
--- a/npc/pre-re/guides/guides_prontera.txt
+++ b/npc/pre-re/guides/guides_prontera.txt
@@ -21,7 +21,7 @@
 //	-Thanks to Brainstorm.
 //============================================================
 
-prontera,154,187,4	script	Guide#prt::PrtGuide	105,{
+prontera,154,187,4	script	Guide#prt::PrtGuide	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Prontera Guide]";
 	mes "Welcome to Prontera,";
@@ -231,10 +231,10 @@ prontera,154,187,4	script	Guide#prt::PrtGuide	105,{
 	end;
 }
 
-prontera,282,208,2	duplicate(PrtGuide)	East Gate-Guide	105
+prontera,282,208,2	duplicate(PrtGuide)	East Gate-Guide	8W_SOLDIER
 
-prontera,29,200,6	duplicate(PrtGuide)	West Gate-Guide	105
+prontera,29,200,6	duplicate(PrtGuide)	West Gate-Guide	8W_SOLDIER
 
-prontera,160,29,0	duplicate(PrtGuide)	South Gate-Guide	105
+prontera,160,29,0	duplicate(PrtGuide)	South Gate-Guide	8W_SOLDIER
 
-prontera,151,330,4	duplicate(PrtGuide)	North Gate-Guide	105
+prontera,151,330,4	duplicate(PrtGuide)	North Gate-Guide	8W_SOLDIER
diff --git a/npc/pre-re/guides/guides_rachel.txt b/npc/pre-re/guides/guides_rachel.txt
index c78068071..2380a465a 100644
--- a/npc/pre-re/guides/guides_rachel.txt
+++ b/npc/pre-re/guides/guides_rachel.txt
@@ -17,7 +17,7 @@
 //= 1.2b Deleted a unnecessary "end". [Samuray22]
 //============================================================
 
-rachel,138,146,5	script	Rachel Guide	934,{
+rachel,138,146,5	script	Rachel Guide	4_M_RASWORD,{
 	mes "[Rachel Guide]";
 	mes "Welcome to the capital of";
 	mes "Arunafeltz, Rachel where a warm";
diff --git a/npc/pre-re/guides/guides_umbala.txt b/npc/pre-re/guides/guides_umbala.txt
index dee3cf27a..23ce98c29 100644
--- a/npc/pre-re/guides/guides_umbala.txt
+++ b/npc/pre-re/guides/guides_umbala.txt
@@ -15,7 +15,7 @@
 //= 1.6 Corrected activating ontouch. [L0ne_W0lf]
 //============================================================
 
-umbala,128,94,4	script	Adventurer#um	702,{
+umbala,128,94,4	script	Adventurer#um	4_F_GON,{
 	mes "[Adventurer]";
 	mes "This is a very strange place...";
 	mes "It's underdeveloped, and there";
diff --git a/npc/pre-re/guides/guides_veins.txt b/npc/pre-re/guides/guides_veins.txt
index 5d448c635..99df4106e 100644
--- a/npc/pre-re/guides/guides_veins.txt
+++ b/npc/pre-re/guides/guides_veins.txt
@@ -13,7 +13,7 @@
 //= 1.2 Fixed a few small typos. [L0ne_W0lf]
 //============================================================
 
-veins,210,345,5	script	Veins Guide#1::ve_guide	934,{
+veins,210,345,5	script	Veins Guide#1::ve_guide	4_M_RASWORD,{
 	mes "[Veins Guide]";
 	mes "Desert City Veins welcomes adventurers seeking shelter from harsh sandstorms.";
 	mes "If this is the first time for you to use the guide services, why don't you check the...";
@@ -124,4 +124,4 @@ veins,210,345,5	script	Veins Guide#1::ve_guide	934,{
 	close;
 }
 
-veins,189,101,5	duplicate(ve_guide)	Veins Guide#2	934
+veins,189,101,5	duplicate(ve_guide)	Veins Guide#2	4_M_RASWORD