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

3 files changed, 96 insertions, 96 deletions

diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt
index edb2f3c91..5daa6429f 100644
--- a/npc/battleground/tierra/tierra01.txt
+++ b/npc/battleground/tierra/tierra01.txt
@@ -20,7 +20,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,57,227,5	script	Lieutenant Kalos	418,{
+bat_room,57,227,5	script	Lieutenant Kalos	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,58,204,1	script	Lieutenant Eyor	414,{
+bat_room,58,204,1	script	Lieutenant Eyor	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -44,7 +44,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,1,151,3	script	#bat_a01_timer	844,{
+bat_room,1,151,3	script	#bat_a01_timer	CLEAR_NPC,{
 	end;
 
 OnInit:
@@ -92,7 +92,7 @@ bat_room,57,211,0	warp	back_bgrooma01b	1,1,bat_room,154,150
 
 // Tierra Gorge Battleground Engine
 //============================================================
-bat_a01,15,15,3	script	start#bat_a01	844,{
+bat_a01,15,15,3	script	start#bat_a01	CLEAR_NPC,{
 OnInit:
 	mapwarp "bat_a01","bat_room",154,150;
 	end;
@@ -150,7 +150,7 @@ OnTimer10000:
 	end;
 }
 
-bat_a01,15,16,3	script	OBJ#bat_a01_a	844,{
+bat_a01,15,16,3	script	OBJ#bat_a01_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG1_id1,"bat_a01",177,345,"Food Storage",1909,"OBJ#bat_a01_a::OnMyMobDead";
 	end;
@@ -173,7 +173,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,17,3	script	OBJ#bat_a01_b	844,{
+bat_a01,15,17,3	script	OBJ#bat_a01_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG1_id2,"bat_a01",167,50,"Food Depot",1910,"OBJ#bat_a01_b::OnMyMobDead";
 	end;
@@ -196,7 +196,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,18,3	script	barricade#bat_a01_a	844,{
+bat_a01,15,18,3	script	barricade#bat_a01_a	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,185; .@i < 202; set .@i,.@i+1 )
 		bg_monster $@TierraBG1_id1,"bat_a01",.@i,266,"Barricade",1906,"barricade#bat_a01_a::OnMyMobDead";
@@ -218,7 +218,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,19,3	script	barricade#bat_a01_b	844,{
+bat_a01,15,19,3	script	barricade#bat_a01_b	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,169; .@i < 186; set .@i,.@i+1 )
 		bg_monster $@TierraBG1_id2,"bat_a01",.@i,129,"Barricade",1906,"barricade#bat_a01_b::OnMyMobDead";
@@ -240,7 +240,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,20,3	script	OBJ#bat_a01_n	844,{
+bat_a01,15,20,3	script	OBJ#bat_a01_n	CLEAR_NPC,{
 OnEnable:
 	monster "bat_a01",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a01_n::OnMyMobDead";
 	end;
@@ -264,7 +264,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,21,3	script	NOBJ_mob#bat_a01_a	844,{
+bat_a01,15,21,3	script	NOBJ_mob#bat_a01_a	CLEAR_NPC,{
 OnEnable:
 	donpcevent "NOBJ_mob#bat_a01_b::OnKill";
 	bg_monster $@TierraBG1_id1,"bat_a01",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
@@ -280,7 +280,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,22,3	script	NOBJ_mob#bat_a01_b	844,{
+bat_a01,15,22,3	script	NOBJ_mob#bat_a01_b	CLEAR_NPC,{
 OnEnable:
 	donpcevent "NOBJ_mob#bat_a01_a::OnKill";
 	bg_monster $@TierraBG1_id2,"bat_a01",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
@@ -296,7 +296,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,185,270,1	script	Guillaume Blacksmith#a01	851,{
+bat_a01,185,270,1	script	Guillaume Blacksmith#a01	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG1_id1) {
 		mes "[Guillaume Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -380,7 +380,7 @@ OnInit:
 	end;
 }
 
-bat_a01,170,121,5	script	Croix Blacksmith#bat_a01	851,{
+bat_a01,170,121,5	script	Croix Blacksmith#bat_a01	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG1_id2) {
 		mes "[Croix Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -464,7 +464,7 @@ OnInit:
 	end;
 }
 
-bat_a01,53,377,3	script	Battle Therapist#a01_a	95,{
+bat_a01,53,377,3	script	Battle Therapist#a01_a	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -514,7 +514,7 @@ OnTouch_:
 	end;
 }
 
-bat_a01,45,19,3	script	Battle Therapist#a01_b	95,{
+bat_a01,45,19,3	script	Battle Therapist#a01_b	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -564,7 +564,7 @@ OnTouch:
 	end;
 }
 
-bat_a01,60,216,3	script	Valley Ghost#bat_a01_n	950,{
+bat_a01,60,216,3	script	Valley Ghost#bat_a01_n	4_GHOSTRING,{
 	specialeffect2 EF_HEAL;
 	mes "[Valley Ghost]";
 	mes "Boo...Boo...";
@@ -648,39 +648,39 @@ OnTouch:
 	end;
 }
 
-bat_a01,169,227,0	script	underladd#bat_a01_1	45,1,1,{
+bat_a01,169,227,0	script	underladd#bat_a01_1	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a01",178,228;
 	end;
 }
 
-bat_a01,208,164,0	script	underladd#bat_a01_2	45,1,1,{
+bat_a01,208,164,0	script	underladd#bat_a01_2	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a01",200,171;
 	end;
 }
 
-bat_a01,171,309,3	script	Guillaume Camp#flag1	973,{ end; }
-bat_a01,149,310,3	script	Guillaume Camp#flag2	973,{ end; }
-bat_a01,119,336,3	script	Guillaume Camp#flag3	973,{ end; }
-bat_a01,118,357,3	script	Guillaume Camp#flag4	973,{ end; }
-bat_a01,150,380,3	script	Guillaume Camp#flag5	973,{ end; }
-bat_a01,173,380,3	script	Guillaume Camp#flag6	973,{ end; }
-bat_a01,210,344,3	script	Guillaume Camp#flag7	973,{ end; }
-bat_a01,350,325,3	script	Guillaume Camp#flag8	973,{ end; }
-bat_a01,358,325,3	script	Guillaume Camp#flag9	973,{ end; }
-
-bat_a01,138,12,3	script	Croix Camp#flag1	974,{ end; }
-bat_a01,108,36,3	script	Croix Camp#flag2	974,{ end; }
-bat_a01,108,63,3	script	Croix Camp#flag3	974,{ end; }
-bat_a01,136,87,3	script	Croix Camp#flag4	974,{ end; }
-bat_a01,167,86,3	script	Croix Camp#flag5	974,{ end; }
-bat_a01,199,49,3	script	Croix Camp#flag6	974,{ end; }
-bat_a01,168,16,3	script	Croix Camp#flag7	974,{ end; }
-bat_a01,357,74,3	script	Croix Camp#flag8	974,{ end; }
-bat_a01,348,74,3	script	Croix Camp#flag9	974,{ end; }
-
-bat_a01,53,377,3	script	Guillaume Vintenar#a01_a	419,{
+bat_a01,171,309,3	script	Guillaume Camp#flag1	1_FLAG_LION,{ end; }
+bat_a01,149,310,3	script	Guillaume Camp#flag2	1_FLAG_LION,{ end; }
+bat_a01,119,336,3	script	Guillaume Camp#flag3	1_FLAG_LION,{ end; }
+bat_a01,118,357,3	script	Guillaume Camp#flag4	1_FLAG_LION,{ end; }
+bat_a01,150,380,3	script	Guillaume Camp#flag5	1_FLAG_LION,{ end; }
+bat_a01,173,380,3	script	Guillaume Camp#flag6	1_FLAG_LION,{ end; }
+bat_a01,210,344,3	script	Guillaume Camp#flag7	1_FLAG_LION,{ end; }
+bat_a01,350,325,3	script	Guillaume Camp#flag8	1_FLAG_LION,{ end; }
+bat_a01,358,325,3	script	Guillaume Camp#flag9	1_FLAG_LION,{ end; }
+
+bat_a01,138,12,3	script	Croix Camp#flag1	1_FLAG_EAGLE,{ end; }
+bat_a01,108,36,3	script	Croix Camp#flag2	1_FLAG_EAGLE,{ end; }
+bat_a01,108,63,3	script	Croix Camp#flag3	1_FLAG_EAGLE,{ end; }
+bat_a01,136,87,3	script	Croix Camp#flag4	1_FLAG_EAGLE,{ end; }
+bat_a01,167,86,3	script	Croix Camp#flag5	1_FLAG_EAGLE,{ end; }
+bat_a01,199,49,3	script	Croix Camp#flag6	1_FLAG_EAGLE,{ end; }
+bat_a01,168,16,3	script	Croix Camp#flag7	1_FLAG_EAGLE,{ end; }
+bat_a01,357,74,3	script	Croix Camp#flag8	1_FLAG_EAGLE,{ end; }
+bat_a01,348,74,3	script	Croix Camp#flag9	1_FLAG_EAGLE,{ end; }
+
+bat_a01,53,377,3	script	Guillaume Vintenar#a01_a	4_M_KY_HEAD,{
 	if (getcharid(4) == $@TierraBG1_id1) {
 		if ($@TierraBG1_Victory == 1) {
 			set .@your_medal,countitem(7828);
@@ -774,7 +774,7 @@ OnInit:
 	end;
 }
 
-bat_a01,45,19,3	script	Croix Vintenar#a01_b	415,{
+bat_a01,45,19,3	script	Croix Vintenar#a01_b	4_M_CRU_HEAD,{
 	if (getcharid(4) == $@TierraBG1_id2) {
 		if ($@TierraBG1_Victory == 2) {
 			set .@your_medal,countitem(7828);
@@ -868,7 +868,7 @@ OnInit:
 	end;
 }
 
-bat_a01,1,5,3	script	countdown#bat_a01	844,{
+bat_a01,1,5,3	script	countdown#bat_a01	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -912,18 +912,18 @@ OnTimer1830000:
 }
 
 /*
-bat_a01,351,75,3	script	Croix Camp Soldier#bat_a01_guide	934,{
+bat_a01,351,75,3	script	Croix Camp Soldier#bat_a01_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 
-bat_a01,356,326,3	script	Guillaume Camp Soldier#bat_a01_guide	934,{
+bat_a01,356,326,3	script	Guillaume Camp Soldier#bat_a01_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 */
 
-bat_a01,1,1,3	script	Release all#a01	81,{
+bat_a01,1,1,3	script	Release all#a01	4_DOG01,{
 	set .@i, callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "Cancelled.";
diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt
index 008944955..05c6eaa0d 100644
--- a/npc/battleground/tierra/tierra02.txt
+++ b/npc/battleground/tierra/tierra02.txt
@@ -19,7 +19,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,114,227,5	script	Lieutenant Rundel	418,{
+bat_room,114,227,5	script	Lieutenant Rundel	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -31,7 +31,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,114,204,1	script	Lieutenant Guerrit	414,{
+bat_room,114,204,1	script	Lieutenant Guerrit	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -43,7 +43,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,1,151,3	script	#bat_a02_timer	844,{
+bat_room,1,151,3	script	#bat_a02_timer	CLEAR_NPC,{
 	end;
 
 OnInit:
@@ -91,7 +91,7 @@ bat_room,113,211,0	warp	back_bgrooma02b	1,1,bat_room,154,150
 
 // Tierra Gorge Battleground Engine
 //============================================================
-bat_a02,15,15,3	script	start#bat_a02	844,{
+bat_a02,15,15,3	script	start#bat_a02	CLEAR_NPC,{
 OnInit:
 	mapwarp "bat_a02","bat_room",154,150;
 	end;
@@ -149,7 +149,7 @@ OnTimer10000:
 	end;
 }
 
-bat_a02,15,16,3	script	OBJ#bat_a02_a	844,{
+bat_a02,15,16,3	script	OBJ#bat_a02_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG2_id1,"bat_a02",177,345,"Food Storage",1909,"OBJ#bat_a02_a::OnMyMobDead";
 	end;
@@ -172,7 +172,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,17,3	script	OBJ#bat_a02_b	844,{
+bat_a02,15,17,3	script	OBJ#bat_a02_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG2_id2,"bat_a02",167,50,"Food Depot",1910,"OBJ#bat_a02_b::OnMyMobDead";
 	end;
@@ -195,7 +195,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,18,3	script	barricade#bat_a02_a	844,{
+bat_a02,15,18,3	script	barricade#bat_a02_a	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,185; .@i < 202; set .@i,.@i+1 )
 		bg_monster $@TierraBG2_id1,"bat_a02",.@i,266,"Barricade",1906,"barricade#bat_a02_a::OnMyMobDead";
@@ -217,7 +217,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,19,3	script	barricade#bat_a02_b	844,{
+bat_a02,15,19,3	script	barricade#bat_a02_b	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,169; .@i < 186; set .@i,.@i+1 )
 		bg_monster $@TierraBG2_id2,"bat_a02",.@i,129,"Barricade",1906,"barricade#bat_a02_b::OnMyMobDead";
@@ -239,7 +239,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,20,3	script	OBJ#bat_a02_n	844,{
+bat_a02,15,20,3	script	OBJ#bat_a02_n	CLEAR_NPC,{
 OnEnable:
 	monster "bat_a02",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a02_n::OnMyMobDead";
 	end;
@@ -263,7 +263,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,21,3	script	NOBJ_mob#bat_a02_a	844,{
+bat_a02,15,21,3	script	NOBJ_mob#bat_a02_a	CLEAR_NPC,{
 OnEnable:
 	donpcevent "NOBJ_mob#bat_a02_b::OnKill";
 	bg_monster $@TierraBG2_id1,"bat_a02",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
@@ -279,7 +279,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,22,3	script	NOBJ_mob#bat_a02_b	844,{
+bat_a02,15,22,3	script	NOBJ_mob#bat_a02_b	CLEAR_NPC,{
 OnEnable:
 	donpcevent "NOBJ_mob#bat_a02_a::OnKill";
 	bg_monster $@TierraBG2_id2,"bat_a02",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
@@ -295,7 +295,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,185,270,1	script	Guillaume Blacksmith#a02	851,{
+bat_a02,185,270,1	script	Guillaume Blacksmith#a02	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG2_id1) {
 		mes "[Guillaume Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -379,7 +379,7 @@ OnInit:
 	end;
 }
 
-bat_a02,170,121,5	script	Croix Blacksmith#bat_a02	851,{
+bat_a02,170,121,5	script	Croix Blacksmith#bat_a02	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG2_id2) {
 		mes "[Croix Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -463,7 +463,7 @@ OnInit:
 	end;
 }
 
-bat_a02,53,377,3	script	Battle Therapist#a02_a	95,{
+bat_a02,53,377,3	script	Battle Therapist#a02_a	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -513,7 +513,7 @@ OnTouch_:
 	end;
 }
 
-bat_a02,45,19,3	script	Battle Therapist#a02_b	95,{
+bat_a02,45,19,3	script	Battle Therapist#a02_b	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -563,7 +563,7 @@ OnTouch:
 	end;
 }
 
-bat_a02,60,216,3	script	Valley Ghost#bat_a02_n	950,{
+bat_a02,60,216,3	script	Valley Ghost#bat_a02_n	4_GHOSTRING,{
 	specialeffect2 EF_HEAL;
 	mes "[Valley Ghost]";
 	mes "Boo...Boo...";
@@ -647,39 +647,39 @@ OnTouch:
 	end;
 }
 
-bat_a02,169,227,0	script	underladd#bat_a02_1	45,1,1,{
+bat_a02,169,227,0	script	underladd#bat_a02_1	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a02",178,228;
 	end;
 }
 
-bat_a02,208,164,0	script	underladd#bat_a02_2	45,1,1,{
+bat_a02,208,164,0	script	underladd#bat_a02_2	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a02",200,171;
 	end;
 }
 
-bat_a02,171,309,3	script	Guillaume Camp#flag11	973,{ end; }
-bat_a02,149,310,3	script	Guillaume Camp#flag12	973,{ end; }
-bat_a02,119,336,3	script	Guillaume Camp#flag13	973,{ end; }
-bat_a02,118,357,3	script	Guillaume Camp#flag14	973,{ end; }
-bat_a02,150,380,3	script	Guillaume Camp#flag15	973,{ end; }
-bat_a02,173,380,3	script	Guillaume Camp#flag16	973,{ end; }
-bat_a02,210,344,3	script	Guillaume Camp#flag17	973,{ end; }
-bat_a02,350,325,3	script	Guillaume Camp#flag18	973,{ end; }
-bat_a02,358,325,3	script	Guillaume Camp#flag19	973,{ end; }
-
-bat_a02,138,12,3	script	Croix Camp#flag11	974,{ end; }
-bat_a02,108,36,3	script	Croix Camp#flag12	974,{ end; }
-bat_a02,108,63,3	script	Croix Camp#flag13	974,{ end; }
-bat_a02,136,87,3	script	Croix Camp#flag14	974,{ end; }
-bat_a02,167,86,3	script	Croix Camp#flag15	974,{ end; }
-bat_a02,199,49,3	script	Croix Camp#flag16	974,{ end; }
-bat_a02,168,16,3	script	Croix Camp#flag17	974,{ end; }
-bat_a02,357,74,3	script	Croix Camp#flag18	974,{ end; }
-bat_a02,348,74,3	script	Croix Camp#flag19	974,{ end; }
-
-bat_a02,53,377,3	script	Guillaume Vintenar#a02_a	419,{
+bat_a02,171,309,3	script	Guillaume Camp#flag11	1_FLAG_LION,{ end; }
+bat_a02,149,310,3	script	Guillaume Camp#flag12	1_FLAG_LION,{ end; }
+bat_a02,119,336,3	script	Guillaume Camp#flag13	1_FLAG_LION,{ end; }
+bat_a02,118,357,3	script	Guillaume Camp#flag14	1_FLAG_LION,{ end; }
+bat_a02,150,380,3	script	Guillaume Camp#flag15	1_FLAG_LION,{ end; }
+bat_a02,173,380,3	script	Guillaume Camp#flag16	1_FLAG_LION,{ end; }
+bat_a02,210,344,3	script	Guillaume Camp#flag17	1_FLAG_LION,{ end; }
+bat_a02,350,325,3	script	Guillaume Camp#flag18	1_FLAG_LION,{ end; }
+bat_a02,358,325,3	script	Guillaume Camp#flag19	1_FLAG_LION,{ end; }
+
+bat_a02,138,12,3	script	Croix Camp#flag11	1_FLAG_EAGLE,{ end; }
+bat_a02,108,36,3	script	Croix Camp#flag12	1_FLAG_EAGLE,{ end; }
+bat_a02,108,63,3	script	Croix Camp#flag13	1_FLAG_EAGLE,{ end; }
+bat_a02,136,87,3	script	Croix Camp#flag14	1_FLAG_EAGLE,{ end; }
+bat_a02,167,86,3	script	Croix Camp#flag15	1_FLAG_EAGLE,{ end; }
+bat_a02,199,49,3	script	Croix Camp#flag16	1_FLAG_EAGLE,{ end; }
+bat_a02,168,16,3	script	Croix Camp#flag17	1_FLAG_EAGLE,{ end; }
+bat_a02,357,74,3	script	Croix Camp#flag18	1_FLAG_EAGLE,{ end; }
+bat_a02,348,74,3	script	Croix Camp#flag19	1_FLAG_EAGLE,{ end; }
+
+bat_a02,53,377,3	script	Guillaume Vintenar#a02_a	4_M_KY_HEAD,{
 	if (getcharid(4) == $@TierraBG2_id1) {
 		if ($@TierraBG2_Victory == 1) {
 			set .@your_medal,countitem(7828);
@@ -773,7 +773,7 @@ OnInit:
 	end;
 }
 
-bat_a02,45,19,3	script	Croix Vintenar#a02_b	415,{
+bat_a02,45,19,3	script	Croix Vintenar#a02_b	4_M_CRU_HEAD,{
 	if (getcharid(4) == $@TierraBG2_id2) {
 		if ($@TierraBG2_Victory == 2) {
 			set .@your_medal,countitem(7828);
@@ -867,7 +867,7 @@ OnInit:
 	end;
 }
 
-bat_a02,1,5,3	script	countdown#bat_a02	844,{
+bat_a02,1,5,3	script	countdown#bat_a02	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -911,18 +911,18 @@ OnTimer1830000:
 }
 
 /*
-bat_a02,351,75,3	script	Croix Camp Soldier#bat_a02_guide	934,{
+bat_a02,351,75,3	script	Croix Camp Soldier#bat_a02_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 
-bat_a02,356,326,3	script	Guillaume Camp Soldier#bat_a02_guide	934,{
+bat_a02,356,326,3	script	Guillaume Camp Soldier#bat_a02_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 */
 
-bat_a02,1,1,3	script	Release all#a02	81,{
+bat_a02,1,1,3	script	Release all#a02	4_DOG01,{
 	set .@i, callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "Cancelled.";
diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt
index 0262f9fcd..9089017a0 100644
--- a/npc/battleground/tierra/tierra_enter.txt
+++ b/npc/battleground/tierra/tierra_enter.txt
@@ -14,7 +14,7 @@
 
 // First Tierra Gorge Officers - Guillaume
 //============================================================
-bat_room,124,178,5	script	Tierra Gorge Officer#01a	418,{
+bat_room,124,178,5	script	Tierra Gorge Officer#01a	4_M_KY_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -81,7 +81,7 @@ bat_room,124,178,5	script	Tierra Gorge Officer#01a	418,{
 	close;
 }
 
-bat_room,140,178,5	script	Tierra Gorge Officer#02a	418,{
+bat_room,140,178,5	script	Tierra Gorge Officer#02a	4_M_KY_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -148,7 +148,7 @@ bat_room,140,178,5	script	Tierra Gorge Officer#02a	418,{
 	close;
 }
 
-bat_room,127,178,5	script	Guillaume Knight#1	417,{
+bat_room,127,178,5	script	Guillaume Knight#1	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -172,7 +172,7 @@ bat_room,127,178,5	script	Guillaume Knight#1	417,{
 	close;
 }
 
-bat_room,143,178,5	script	Guillaume Knight#2	417,{
+bat_room,143,178,5	script	Guillaume Knight#2	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -196,7 +196,7 @@ bat_room,143,178,5	script	Guillaume Knight#2	417,{
 	close;
 }
 
-bat_room,127,121,1	script	Croix Knight#1	413,{
+bat_room,127,121,1	script	Croix Knight#1	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -220,7 +220,7 @@ bat_room,127,121,1	script	Croix Knight#1	413,{
 	close;
 }
 
-bat_room,143,121,1	script	Croix Knight#2	413,{
+bat_room,143,121,1	script	Croix Knight#2	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -246,7 +246,7 @@ bat_room,143,121,1	script	Croix Knight#2	413,{
 
 // Second Tierra Gorge Officers - Croix
 //============================================================
-bat_room,125,121,1	script	Tierra Gorge Officer#01b	414,{
+bat_room,125,121,1	script	Tierra Gorge Officer#01b	4_M_CRU_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -313,7 +313,7 @@ bat_room,125,121,1	script	Tierra Gorge Officer#01b	414,{
 	close;
 }
 
-bat_room,140,121,1	script	Tierra Gorge Officer#02b	414,{
+bat_room,140,121,1	script	Tierra Gorge Officer#02b	4_M_CRU_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";