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

diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index bb5991b1c..33982a2c5 100644
--- a/npc/battleground/kvm/kvm02.txt
+++ b/npc/battleground/kvm/kvm02.txt
@@ -21,7 +21,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,197,226,5	script	KVM Waiting Room#a2::KvM02R_Guillaume	418,{
+bat_room,197,226,5	script	KVM Waiting Room#a2::KvM02R_Guillaume	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -35,7 +35,7 @@ OnEnterBG:
 
 bat_room,197,220,0	warp	#kvm601	2,2,bat_room,154,150
 
-bat_room,197,205,3	script	KVM Waiting Room#b2::KvM02R_Croix	414,{
+bat_room,197,205,3	script	KVM Waiting Room#b2::KvM02R_Croix	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -63,23 +63,23 @@ OnKvM02Two:
 	end;
 }
 
-bat_c02,54,124,3	duplicate(CellEffect2)	#RedcellA1-2	139
-bat_c02,55,124,3	duplicate(CellEffect2)	#RedcellA2-2	139
-bat_c02,56,124,3	duplicate(CellEffect2)	#RedcellA3-2	139
-bat_c02,57,124,3	duplicate(CellEffect2)	#RedcellA4-2	139
-bat_c02,57,125,3	duplicate(CellEffect2)	#RedcellA5-2	139
-bat_c02,57,126,3	duplicate(CellEffect2)	#RedcellA6-2	139
-bat_c02,57,127,3	duplicate(CellEffect2)	#RedcellA7-2	139
+bat_c02,54,124,3	duplicate(CellEffect2)	#RedcellA1-2	HIDDEN_WARP_NPC
+bat_c02,55,124,3	duplicate(CellEffect2)	#RedcellA2-2	HIDDEN_WARP_NPC
+bat_c02,56,124,3	duplicate(CellEffect2)	#RedcellA3-2	HIDDEN_WARP_NPC
+bat_c02,57,124,3	duplicate(CellEffect2)	#RedcellA4-2	HIDDEN_WARP_NPC
+bat_c02,57,125,3	duplicate(CellEffect2)	#RedcellA5-2	HIDDEN_WARP_NPC
+bat_c02,57,126,3	duplicate(CellEffect2)	#RedcellA6-2	HIDDEN_WARP_NPC
+bat_c02,57,127,3	duplicate(CellEffect2)	#RedcellA7-2	HIDDEN_WARP_NPC
 
-bat_c02,145,59,3	duplicate(CellEffect2)	#RedcellB1-2	139
-bat_c02,144,59,3	duplicate(CellEffect2)	#RedcellB2-2	139
-bat_c02,143,59,3	duplicate(CellEffect2)	#RedcellB3-2	139
-bat_c02,142,59,3	duplicate(CellEffect2)	#RedcellB4-2	139
-bat_c02,142,56,3	duplicate(CellEffect2)	#RedcellB5-2	139
-bat_c02,142,57,3	duplicate(CellEffect2)	#RedcellB6-2	139
-bat_c02,142,58,3	duplicate(CellEffect2)	#RedcellB7-2	139
+bat_c02,145,59,3	duplicate(CellEffect2)	#RedcellB1-2	HIDDEN_WARP_NPC
+bat_c02,144,59,3	duplicate(CellEffect2)	#RedcellB2-2	HIDDEN_WARP_NPC
+bat_c02,143,59,3	duplicate(CellEffect2)	#RedcellB3-2	HIDDEN_WARP_NPC
+bat_c02,142,59,3	duplicate(CellEffect2)	#RedcellB4-2	HIDDEN_WARP_NPC
+bat_c02,142,56,3	duplicate(CellEffect2)	#RedcellB5-2	HIDDEN_WARP_NPC
+bat_c02,142,57,3	duplicate(CellEffect2)	#RedcellB6-2	HIDDEN_WARP_NPC
+bat_c02,142,58,3	duplicate(CellEffect2)	#RedcellB7-2	HIDDEN_WARP_NPC
 
-bat_c02,54,128,3	script	#A_camp_start02	139,4,4,{
+bat_c02,54,128,3	script	#A_camp_start02	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -100,7 +100,7 @@ OnTouch:
 	end;
 }
 
-bat_c02,146,56,3	script	#B_camp_start02	139,4,4,{
+bat_c02,146,56,3	script	#B_camp_start02	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -371,7 +371,7 @@ OnTimer60000:
 
 // Battleground rewards
 //============================================================
-bat_c02,51,130,5	script	KVM Officer#KVM02A	419,{
+bat_c02,51,130,5	script	KVM Officer#KVM02A	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM02BG_Victory == Bat_Team )
@@ -399,7 +399,7 @@ bat_c02,51,130,5	script	KVM Officer#KVM02A	419,{
 	end;
 }
 
-bat_c02,148,53,1	script	KVM Officer#KVM02B	415,{
+bat_c02,148,53,1	script	KVM Officer#KVM02B	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM02BG_Victory == Bat_Team )