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

6 files changed, 9 insertions, 9 deletions

diff --git a/npc/pre-re/other/bulletin_boards.txt b/npc/pre-re/other/bulletin_boards.txt
index d4a50491f..ed2b210c0 100644
--- a/npc/pre-re/other/bulletin_boards.txt
+++ b/npc/pre-re/other/bulletin_boards.txt
@@ -10,7 +10,7 @@
 //= 1.0 Moved Izlude NPCs to Pre-RE/RE paths.
 //============================================================
 
-izlude,131,116,4	script	Bulletin Board#5	837,{
+izlude,131,116,4	script	Bulletin Board#5	2_BULLETIN_BOARD,{
 	mes "[Izlude: The Satellite City]";
 	mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accommodate its burgeoning population.";
 	next;
diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt
index 938c3dfa7..5c382a0e0 100644
--- a/npc/pre-re/other/mercenary_rent.txt
+++ b/npc/pre-re/other/mercenary_rent.txt
@@ -11,5 +11,5 @@
 //= 1.0 First version. [Daegaladh]
 //============================================================
 
-izlude,47,139,5	duplicate(Mercenary Manager#main)	Mercenary Manager#Sword	734
-izlude,56,139,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
+izlude,47,139,5	duplicate(Mercenary Manager#main)	Mercenary Manager#Sword	4_M_JOB_KNIGHT2
+izlude,56,139,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	4_F_HUGRANMA
diff --git a/npc/pre-re/other/msg_boards.txt b/npc/pre-re/other/msg_boards.txt
index 01c10e265..60c7133f0 100644
--- a/npc/pre-re/other/msg_boards.txt
+++ b/npc/pre-re/other/msg_boards.txt
@@ -13,13 +13,13 @@
 
 // Izlude
 //============================================================
-izlude,54,139,1	script	Sign#Iz1	111,{
+izlude,54,139,1	script	Sign#Iz1	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome to the Swordsman Academy.";
 	close;
 }
 
-izlude,144,148,1	script	Sign#Iz2	111,{
+izlude,144,148,1	script	Sign#Iz2	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome.";
 	close;
diff --git a/npc/pre-re/other/pvp.txt b/npc/pre-re/other/pvp.txt
index de49cfdc3..55d6bae79 100644
--- a/npc/pre-re/other/pvp.txt
+++ b/npc/pre-re/other/pvp.txt
@@ -13,7 +13,7 @@
 
 // PVP Warpers
 //============================================================
-pvp_y_room,86,85,4	script	Fight Square Reception#8	105,{
+pvp_y_room,86,85,4	script	Fight Square Reception#8	8W_SOLDIER,{
 	callfunc "F_PVP_FSRS";
 	end;
 
@@ -22,7 +22,7 @@ OnInit:
 	end;
 }
 
-pvp_n_room,30,85,4	script	Fight Square Reception#n	105,{
+pvp_n_room,30,85,4	script	Fight Square Reception#n	8W_SOLDIER,{
 	callfunc "F_PVP_FSRS";
 	end;
 
diff --git a/npc/pre-re/other/resetskill.txt b/npc/pre-re/other/resetskill.txt
index 698b89e51..b7af66906 100644
--- a/npc/pre-re/other/resetskill.txt
+++ b/npc/pre-re/other/resetskill.txt
@@ -13,7 +13,7 @@
 //= 1.0 First version. [L0ne_W0lf]
 //============================================================
 
-prontera,146,232,4	script	Hypnotist#2	124,{
+prontera,146,232,4	script	Hypnotist#2	4_F_TELEPORTER,{
 	mes "[Hypnotist]";
 	mes "Greetings, adventurer.";
 	mes "I'm a member of the Hypnotist";
diff --git a/npc/pre-re/other/turbo_track.txt b/npc/pre-re/other/turbo_track.txt
index 24ebea721..ec670fbad 100644
--- a/npc/pre-re/other/turbo_track.txt
+++ b/npc/pre-re/other/turbo_track.txt
@@ -11,4 +11,4 @@
 //= 1.0 Split Peco Peco Manager NPC.
 //============================================================
 
-alde_gld,181,199,5	duplicate(MountManager_turbo)	Peco Peco Manager	845
+alde_gld,181,199,5	duplicate(MountManager_turbo)	Peco Peco Manager	4_F_RACING