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

diff --git a/npc/custom/quests/tha_statues.txt b/npc/custom/quests/tha_statues.txt
index d072179f3..283615be9 100644
--- a/npc/custom/quests/tha_statues.txt
+++ b/npc/custom/quests/tha_statues.txt
@@ -13,7 +13,7 @@
 
 //Statue (NPC)(U: UP, D: DOWN, R: RIGHT, L: LEFT) :
 // Explain Npc
-tha_t08,69,106,4	script	Statue	111,{
+tha_t08,69,106,4	script	Statue	HIDDEN_NPC,{
 	mes "You can read on the back of the statue:";
 	mes "'By the spirit of olds, the walls are closed";
 	mes "Upper floors or foreign taboo";
@@ -28,7 +28,7 @@ tha_t08,69,106,4	script	Statue	111,{
 //(Mediane)(D,R)-->tha_t09,84,99,4
 //Script:
 
-tha_t09,17,158,4	script	Thalos	111,{
+tha_t09,17,158,4	script	Thalos	HIDDEN_NPC,{
 	if(TSQ_CHK == 1) goto done;
 	mes "[Thalos]";
 	mes "You must find the 2nd Statue now.";
@@ -41,7 +41,7 @@ done:
 	
 }
 
-tha_t09,84,99,4	script	Mediane	111,{
+tha_t09,84,99,4	script	Mediane	HIDDEN_NPC,{
 	if(TSQ_CHK != 1) goto nook;
 	mes "[Mediane]";
 	mes "Okay, i am warping you to the next floor now.";
@@ -61,7 +61,7 @@ nook:
 //(Veriaelle)(D,L)-->tha_t10,99,97,4
 //Script:
 
-tha_t10,130,159,4	script	Melkor	111,{
+tha_t10,130,159,4	script	Melkor	HIDDEN_NPC,{
 	if(TSQ_CHK == 1) goto done;
 	mes "[Melkor]";
 	mes "You must find the other Spirits now.";
@@ -74,7 +74,7 @@ done:
 	close;
 }
 
-tha_t10,160,98,4	script	Zebrus	111,{
+tha_t10,160,98,4	script	Zebrus	HIDDEN_NPC,{
 	if(TSQ_CHK != 1) goto nook;
 	mes "[Zebrus]";
 	mes "Keep on this way, There is one Spirit left";
@@ -88,7 +88,7 @@ nook:
 	close;
 }
 
-tha_t10,99,97,4	script	Veriaelle	111,{
+tha_t10,99,97,4	script	Veriaelle	HIDDEN_NPC,{
 	if(TSQ_CHK != 2) goto nook;
 	mes "[Veriaelle]";
 	mes "Okay, i am warping you to the next floor.";
@@ -111,7 +111,7 @@ nook:
 //(Seranes)(U,R)-->tha_t11,85,85,4
 //Script:
 
-tha_t11,16,85,4	script	Throtre	111,{
+tha_t11,16,85,4	script	Throtre	HIDDEN_NPC,{
 	if(TSQ_CHK == 1) goto done;
 	mes "[Throtre]";
 	mes "You got my authorization for the next floor";
@@ -124,7 +124,7 @@ done:
 	close;
 }
 
-tha_t11,85,16,4	script	Klermaz	111,{
+tha_t11,85,16,4	script	Klermaz	HIDDEN_NPC,{
 	if(TSQ_CHK != 1) goto nook;
 	mes "[Klermaz]";
 	mes "Hmm it seems that Throtre allowed you to pass.";
@@ -139,7 +139,7 @@ nook:
 	close;
 }
 
-tha_t11,16,16,4	script	Mihane	111,{
+tha_t11,16,16,4	script	Mihane	HIDDEN_NPC,{
 	if(TSQ_CHK != 2) goto nook;
 	mes "[Mihane]";
 	mes "Keep on this way, Only 1 Left.";
@@ -153,7 +153,7 @@ nook:
 	close;
 }
 
-tha_t11,85,85,4	script	Seranes	111,{
+tha_t11,85,85,4	script	Seranes	HIDDEN_NPC,{
 	if(TSQ_CHK != 3 ) goto nook;
 	mes "[Seranes]";
 	mes "Perfect, it seems that the other spirits grants you the access.";
@@ -178,7 +178,7 @@ nook:
 //(Sox)(U)-->tha_t12,128,88,4
 //Script:
 
-tha_t12,103,18,4	script	Nox	111,{
+tha_t12,103,18,4	script	Nox	HIDDEN_NPC,{
 	if(TSQ_CHK == 1 ) goto done;
 	mes "[Nox]";
 	mes "Fine, 4 Spirits left.";
@@ -190,7 +190,7 @@ done:
 	close;
 }
 
-tha_t12,162,58,4	script	Vox	111,{
+tha_t12,162,58,4	script	Vox	HIDDEN_NPC,{
 	if(TSQ_CHK != 1 ) goto nook;
 	mes "[Vox]";
 	mes "Keep on this way, 3 Spirits remaining !";
@@ -204,7 +204,7 @@ nook:
 	close;
 }
 
-tha_t12,96,57,4	script	Hox	111,{
+tha_t12,96,57,4	script	Hox	HIDDEN_NPC,{
 	if(TSQ_CHK != 2 ) goto nook;
 	mes "[Hox]";
 	mes "You are on the good way, 2 Spirits remaining !";
@@ -218,7 +218,7 @@ nook:
 	close;
 }
 
-tha_t12,153,17,4	script	Dox	111,{
+tha_t12,153,17,4	script	Dox	HIDDEN_NPC,{
 	if(TSQ_CHK != 3 ) goto nook;
 	mes "[Dox]";
 	mes "Perfect, 1 Spirit left.";
@@ -232,7 +232,7 @@ nook:
 	close;
 }
 
-tha_t12,128,88,4	script	Sox	111,{
+tha_t12,128,88,4	script	Sox	HIDDEN_NPC,{
 	if(TSQ_CHK != 4 ) goto nook;
 	mes "[Sox]";
 	mes "You have just passed the test successfully.";