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, 51 insertions, 51 deletions

diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt
index a2e575a90..78b94c410 100644
--- a/npc/quests/quests_gonryun.txt
+++ b/npc/quests/quests_gonryun.txt
@@ -19,7 +19,7 @@
 
 // Broken Sword :: broken_sword
 //============================================================
-gon_in,17,93,5	script	Chief#gon	775,{
+gon_in,17,93,5	script	Chief#gon	4_M_TWMASKMAN,{
 	if (BaseLevel > 50) {
 		if (b_sword == 0) {
 			set b_sword,1;
@@ -415,7 +415,7 @@ gon_in,17,93,5	script	Chief#gon	775,{
 	close;
 }
 
-gon_in,152,35,4	script	Hostess#gon	702,{
+gon_in,152,35,4	script	Hostess#gon	4_F_GON,{
 	if (b_sword < 1) {
 		mes "[Mei Yen Fang]";
 		mes "Oh...you're new here, right?";
@@ -513,7 +513,7 @@ gon_in,152,35,4	script	Hostess#gon	702,{
 	close;
 }
 
-gon_in,165,16,4	script	Man in hangover#gon	748,{
+gon_in,165,16,4	script	Man in hangover#gon	4_M_ALCHE_A,{
 	if (b_sword < 4) {
 		mes "[Xue Bong]";
 		mes "Ahhh.. my stomach.. my head..";
@@ -793,7 +793,7 @@ OnCommandOn:
 	end;
 }
 
-gon_dun01,201,25,0	script	trace1-1#gnbs	139,1,1,{
+gon_dun01,201,25,0	script	trace1-1#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 7) donpcevent "timer1-1::OnCommandOn";
 	end;
 
@@ -839,7 +839,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun01,202,25,0	script	#getitem1-1	111,2,1,{
+gon_dun01,202,25,0	script	#getitem1-1	HIDDEN_NPC,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -861,7 +861,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun01,190,160,0	script	trace1-2#gnbs	139,1,1,{
+gon_dun01,190,160,0	script	trace1-2#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 7) donpcevent "timer1-2::OnCommandOn";
 	end;
 
@@ -907,7 +907,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun01,190,159,0	script	#getitem1-2	111,2,1,{
+gon_dun01,190,159,0	script	#getitem1-2	HIDDEN_NPC,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -929,7 +929,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun01,163,53,0	script	trace1-3#gnbs	139,1,1,{
+gon_dun01,163,53,0	script	trace1-3#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 7) donpcevent "timer1-3::OnCommandOn";
 	end;
 
@@ -975,7 +975,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun01,164,53,0	script	#getitem1-3	111,2,1,{
+gon_dun01,164,53,0	script	#getitem1-3	HIDDEN_NPC,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -997,7 +997,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun01,133,183,0	script	trace1-4#gnbs	139,1,1,{
+gon_dun01,133,183,0	script	trace1-4#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 7) donpcevent "timer1-4::OnCommandOn";
 	end;
 
@@ -1043,7 +1043,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun01,134,183,0	script	#getitem1-4	111,2,1,{
+gon_dun01,134,183,0	script	#getitem1-4	HIDDEN_NPC,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1065,7 +1065,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun01,139,257,0	script	trace1-5#gnbs	139,1,1,{
+gon_dun01,139,257,0	script	trace1-5#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 7) donpcevent "timer1-5::OnCommandOn";
 	end;
 
@@ -1111,7 +1111,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun01,140,257,0	script	#getitem1-5	111,2,1,{
+gon_dun01,140,257,0	script	#getitem1-5	HIDDEN_NPC,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1141,7 +1141,7 @@ OnCommandOn:
 	end;
 }
 
-gon_dun02,65,168,0	script	trace2-1#gnbs	139,1,1,{
+gon_dun02,65,168,0	script	trace2-1#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-1::OnCommandOn";
 	end;
 
@@ -1187,7 +1187,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun02,202,25,0	script	#getitem2-1	111,2,1,{
+gon_dun02,202,25,0	script	#getitem2-1	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1209,7 +1209,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun02,265,200,0	script	trace2-2#gnbs	139,1,1,{
+gon_dun02,265,200,0	script	trace2-2#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-2::OnCommandOn";
 	end;
 
@@ -1255,7 +1255,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun02,265,201,0	script	#getitem2-2	111,2,1,{
+gon_dun02,265,201,0	script	#getitem2-2	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1277,7 +1277,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun02,247,129,0	script	trace2-3#gnbs	139,1,1,{
+gon_dun02,247,129,0	script	trace2-3#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-3::OnCommandOn";
 	end;
 
@@ -1323,7 +1323,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun02,247,128,0	script	#getitem2-3	111,2,1,{
+gon_dun02,247,128,0	script	#getitem2-3	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1345,7 +1345,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun02,149,74,0	script	trace2-4#gnbs	139,1,1,{
+gon_dun02,149,74,0	script	trace2-4#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-4::OnCommandOn";
 	end;
 
@@ -1391,7 +1391,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun02,149,75,0	script	#getitem2-4	111,2,1,{
+gon_dun02,149,75,0	script	#getitem2-4	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1413,7 +1413,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun02,23,105,0	script	trace2-5#gnbs	139,1,1,{
+gon_dun02,23,105,0	script	trace2-5#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-5::OnCommandOn";
 	end;
 
@@ -1459,7 +1459,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun02,23,106,0	script	#getitem2-5	111,2,1,{
+gon_dun02,23,106,0	script	#getitem2-5	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1481,7 +1481,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun02,249,39,0	script	trace2-6#gnbs	139,1,1,{
+gon_dun02,249,39,0	script	trace2-6#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-6::OnCommandOn";
 	end;
 
@@ -1527,7 +1527,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun02,249,40,0	script	#getitem2-6	111,2,1,{
+gon_dun02,249,40,0	script	#getitem2-6	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1557,7 +1557,7 @@ OnCommandOn:
 	end;
 }
 
-gon_dun03,11,75,0	script	trace3-1#gnbs	139,1,1,{
+gon_dun03,11,75,0	script	trace3-1#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-1::OnCommandOn";
 	end;
 
@@ -1603,7 +1603,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun03,10,74,0	script	#getitem3-1	111,2,1,{
+gon_dun03,10,74,0	script	#getitem3-1	HIDDEN_NPC,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1629,7 +1629,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun03,199,103,0	script	trace3-2#gnbs	139,1,1,{
+gon_dun03,199,103,0	script	trace3-2#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-2::OnCommandOn";
 	end;
 
@@ -1675,7 +1675,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun03,199,102,0	script	#getitem3-2	111,2,1,{
+gon_dun03,199,102,0	script	#getitem3-2	HIDDEN_NPC,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1701,7 +1701,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun03,14,162,0	script	trace3-3#gnbs	139,1,1,{
+gon_dun03,14,162,0	script	trace3-3#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-3::OnCommandOn";
 	end;
 
@@ -1747,7 +1747,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun03,14,163,0	script	#getitem3-3	111,2,1,{
+gon_dun03,14,163,0	script	#getitem3-3	HIDDEN_NPC,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1773,7 +1773,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun03,155,263,0	script	trace3-4#gnbs	139,1,1,{
+gon_dun03,155,263,0	script	trace3-4#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-4::OnCommandOn";
 	end;
 
@@ -1819,7 +1819,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun03,156,263,0	script	#getitem3-4	111,2,1,{
+gon_dun03,156,263,0	script	#getitem3-4	HIDDEN_NPC,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1845,7 +1845,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun03,169,90,0	script	trace3-5#gnbs	139,1,1,{
+gon_dun03,169,90,0	script	trace3-5#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-5::OnCommandOn";
 	end;
 
@@ -1891,7 +1891,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun03,170,90,0	script	#getitem3-5	111,2,1,{
+gon_dun03,170,90,0	script	#getitem3-5	HIDDEN_NPC,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1917,7 +1917,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun03,162,40,0	script	trace3-6#gnbs	139,1,1,{
+gon_dun03,162,40,0	script	trace3-6#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-6::OnCommandOn";
 	end;
 
@@ -1963,7 +1963,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun03,68,39,0	script	#getitem3-6	111,1,2,{
+gon_dun03,68,39,0	script	#getitem3-6	HIDDEN_NPC,1,2,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1989,7 +1989,7 @@ OnCommandOff:
 	end;
 }
 
-gon_dun03,68,212,0	script	trace3-7#gnbs	139,1,1,{
+gon_dun03,68,212,0	script	trace3-7#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-7::OnCommandOn";
 	end;
 
@@ -2035,7 +2035,7 @@ OnTimer3000:
 	end;
 }
 
-gon_dun03,68,213,0	script	#getitem3-7	111,1,2,{
+gon_dun03,68,213,0	script	#getitem3-7	HIDDEN_NPC,1,2,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -2061,7 +2061,7 @@ OnCommandOff:
 	end;
 }
 
-gon_in,18,27,5	script	Madam#gnbs	771,{
+gon_in,18,27,5	script	Madam#gnbs	4_F_TWGRANDMOM,{
 	mes "[Shang Hua Yen]";
 	mes "Ho, ho, ho~";
 	mes "Who might this be?";
@@ -2090,7 +2090,7 @@ gon_in,18,27,5	script	Madam#gnbs	771,{
 	close;
 }
 
-gon_dun03,62,222,0	script	Strange dead body#gnbs	111,{
+gon_dun03,62,222,0	script	Strange dead body#gnbs	HIDDEN_NPC,{
 	if (b_sword < 7) {
 		mes "Here's a decomposing corpse.";
 		mes "It seems like monsters devoured it.";
@@ -2140,7 +2140,7 @@ gon_dun03,62,222,0	script	Strange dead body#gnbs	111,{
 	close;
 }
 
-gonryun,139,142,7	script	Girl##gnbs1	772,{
+gonryun,139,142,7	script	Girl##gnbs1	4_F_TWMASKGIRL,{
 	if (b_sword < 12) {
 		mes "[Shi Ying Xiao]";
 		mes "..........";
@@ -2176,7 +2176,7 @@ gonryun,139,142,7	script	Girl##gnbs1	772,{
 	close;
 }
 
-gonryun,100,241,0	script	Stranger#gnbs	733,{
+gonryun,100,241,0	script	Stranger#gnbs	4_M_JOB_KNIGHT1,{
 	if (b_sword < 14) {
 		mes "[Zuo Hei]";
 		mes "Hmm...";
@@ -2412,7 +2412,7 @@ gonryun,100,241,0	script	Stranger#gnbs	733,{
 	close;
 }
 
-geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
+geffen_in,71,112,2	script	Blacksmith#SaYumMoon	4_M_JOB_BLACKSMITH,{
 	if (b_sword < 17) {
 		mes "[Aumgarl]";
 		mes "*Sob*..*sob*....";
@@ -3000,7 +3000,7 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 	close;
 }
 
-geffen_in,106,106,7	script	Girl#gnbs2	716,{
+geffen_in,106,106,7	script	Girl#gnbs2	4_M_KID2,{
 	if (b_sword < 20) {
 		mes "[Lyroo]";
 		mes "Ah...Ah....";
@@ -3114,7 +3114,7 @@ geffen_in,106,106,7	script	Girl#gnbs2	716,{
 	close;
 }
 
-prontera,275,86,2	script	Young man#SaYumMoon	97,{
+prontera,275,86,2	script	Young man#SaYumMoon	4W_M_01,{
 	if (b_sword < 20) {
 		mes "[Neil]";
 		mes "Oh man, it feels so good";
@@ -3156,7 +3156,7 @@ prontera,275,86,2	script	Young man#SaYumMoon	97,{
 	close;
 }
 
-yuno,208,164,4	script	Active little girl#gnbs	101,{
+yuno,208,164,4	script	Active little girl#gnbs	4W_F_01,{
 	if (b_sword < 21) {
 		mes "[Hisa]";
 		mes ".....";
@@ -3198,7 +3198,7 @@ yuno,208,164,4	script	Active little girl#gnbs	101,{
 	close;
 }
 
-yuno_in01,99,101,4	script	Doctor#gnbs	744,{
+yuno_in01,99,101,4	script	Doctor#gnbs	4_F_ALCHE,{
 	if (b_sword < 23) {
 		mes "[??????]";
 		mes "I don't believe we've met";
@@ -3673,7 +3673,7 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 	close;
 }
 
-yuno_in01,104,94,0	script	go away#gnbs	139,2,1,{
+yuno_in01,104,94,0	script	go away#gnbs	HIDDEN_WARP_NPC,2,1,{
 OnTouch:
 	if (b_sword < 22) {
 		mes "[??????]";
@@ -3702,7 +3702,7 @@ OnTouch:
 
 // Lost Knife :: gon_npc
 //============================================================
-gonryun,237,226,3	script	Han Ran Jiao#gon	776,{
+gonryun,237,226,3	script	Han Ran Jiao#gon	4_M_TWMIDMAN,{
 	if (nakha == 0) {
 		mes "[Han Ran Jiao]";
 		mes "Oh no! What will I do?!";
@@ -3797,7 +3797,7 @@ gonryun,237,226,3	script	Han Ran Jiao#gon	776,{
 	}
 }
 
-gon_fild01,245,257,0	script	#gonknife	111,3,3,{
+gon_fild01,245,257,0	script	#gonknife	HIDDEN_NPC,3,3,{
 OnTouch:
 	if (nakha == 1) {
 		set nakha,2;