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

diff --git a/npc/quests/first_class/tu_ma_th01.txt b/npc/quests/first_class/tu_ma_th01.txt
index 6bbe5c456..a80f424b0 100644
--- a/npc/quests/first_class/tu_ma_th01.txt
+++ b/npc/quests/first_class/tu_ma_th01.txt
@@ -16,7 +16,7 @@
 
 // Battle Traces 1
 //============================================================
-moc_fild12,166,369,0	script	Trace of Battle#1	844,{
+moc_fild12,166,369,0	script	Trace of Battle#1	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 5){
 			mes "^3355FFYou find traces of poison";
@@ -107,7 +107,7 @@ moc_fild12,166,369,0	script	Trace of Battle#1	844,{
 
 // Battle Traces 2
 //============================================================
-moc_fild12,173,215,0	script	Trace of Battle#2	844,{
+moc_fild12,173,215,0	script	Trace of Battle#2	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 9){
 			mes "^3355FFThere are signs";
@@ -157,7 +157,7 @@ moc_fild12,173,215,0	script	Trace of Battle#2	844,{
 
 // Battle Traces 3
 //============================================================
-moc_fild12,276,165,0	script	Trace of Battle#3	844,{
+moc_fild12,276,165,0	script	Trace of Battle#3	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 10){
 			mes "^3355FFThere are signs";
@@ -210,7 +210,7 @@ moc_fild12,276,165,0	script	Trace of Battle#3	844,{
 
 // Battle Traces 4
 //============================================================
-moc_fild11,39,163,0	script	Trace of Battle#4	844,{
+moc_fild11,39,163,0	script	Trace of Battle#4	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 11){
 			mes "^3355FFThere are signs";
@@ -270,7 +270,7 @@ moc_fild11,39,163,0	script	Trace of Battle#4	844,{
 
 // Battle Traces 5
 //============================================================
-moc_fild11,205,52,0	script	Trace of Battle#5	844,{
+moc_fild11,205,52,0	script	Trace of Battle#5	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 12){
 			mes "^3355FFThere are signs";
@@ -419,7 +419,7 @@ moc_fild11,205,52,0	script	Trace of Battle#5	844,{
 
 // Battle Traces 6
 //============================================================
-moc_fild11,226,235,0	script	Trace of Battle#6	844,{
+moc_fild11,226,235,0	script	Trace of Battle#6	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "^3355FFThere are signs";
@@ -462,7 +462,7 @@ moc_fild11,226,235,0	script	Trace of Battle#6	844,{
 
 // Battle Traces 7
 //============================================================
-moc_fild11,184,342,0	script	Trace of Battle#7	844,{
+moc_fild11,184,342,0	script	Trace of Battle#7	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "^3355FFThere are signs";
@@ -503,7 +503,7 @@ moc_fild11,184,342,0	script	Trace of Battle#7	844,{
 
 // Battle Traces 8
 //============================================================
-moc_fild17,213,358,0	script	Trace of Battle#8	844,{
+moc_fild17,213,358,0	script	Trace of Battle#8	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "^3355FFThere are two";
@@ -564,7 +564,7 @@ moc_fild17,213,358,0	script	Trace of Battle#8	844,{
 
 // Battle Traces 9
 //============================================================
-moc_fild17,228,274,0	script	Trace of Battle#9	844,{
+moc_fild17,228,274,0	script	Trace of Battle#9	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 14){
 			mes "^3355FFTraces of some";
@@ -659,7 +659,7 @@ moc_fild17,228,274,0	script	Trace of Battle#9	844,{
 
 // Battle Traces 10
 //============================================================
-moc_fild17,34,292,0	script	Trace of Battle#10	844,{
+moc_fild17,34,292,0	script	Trace of Battle#10	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 16){
 			mes "^3355FFThere are signs";
@@ -712,7 +712,7 @@ moc_fild17,34,292,0	script	Trace of Battle#10	844,{
 
 // Battle Traces 11
 //============================================================
-moc_fild18,346,296,0	script	Trace of Battle#11	844,{
+moc_fild18,346,296,0	script	Trace of Battle#11	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 17){
 			mes "^3355FFThere are signs";
@@ -769,7 +769,7 @@ moc_fild18,346,296,0	script	Trace of Battle#11	844,{
 
 // Battle Traces 12
 //============================================================
-moc_fild18,309,257,0	script	Trace of Battle#12	844,{
+moc_fild18,309,257,0	script	Trace of Battle#12	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 18){
 			mes "^3355FFThere are signs";
@@ -822,7 +822,7 @@ moc_fild18,309,257,0	script	Trace of Battle#12	844,{
 
 // Battle Traces 13
 //============================================================
-moc_fild18,177,333,0	script	Trace of Battle#13	844,{
+moc_fild18,177,333,0	script	Trace of Battle#13	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 19){
 			mes "^3355FFThere are signs";
@@ -876,7 +876,7 @@ moc_fild18,177,333,0	script	Trace of Battle#13	844,{
 
 // Battle Traces 14
 //============================================================
-moc_fild18,111,303,0	script	Trace of Battle#14	844,{
+moc_fild18,111,303,0	script	Trace of Battle#14	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 20){
 			mes "^3355FFThere are signs";
@@ -929,7 +929,7 @@ moc_fild18,111,303,0	script	Trace of Battle#14	844,{
 
 // Battle Traces 15
 //============================================================
-moc_fild18,109,197,0	script	Trace of Battle#15	844,{
+moc_fild18,109,197,0	script	Trace of Battle#15	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 21){
 			mes "^3355FFThere are signs";
@@ -1252,7 +1252,7 @@ moc_fild18,109,197,0	script	Trace of Battle#15	844,{
 
 // Battle Traces 16
 //============================================================
-moc_fild18,156,96,0	script	Trace of Battle#16	844,{
+moc_fild18,156,96,0	script	Trace of Battle#16	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 25){
 			mes "^3355FFThere are signs";