Merge branch 'dastgir-ScriptCleanup2' into hercules

Closes #920 as merged

3 files changed, 64 insertions, 64 deletions

diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt
index bed6e8115..8b02b0469 100644
--- a/npc/battleground/flavius/flavius01.txt
+++ b/npc/battleground/flavius/flavius01.txt
@@ -407,7 +407,7 @@ OnTouch:
 bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 	if ($@FlaviusBG1_id1 == getcharid(4)) {
 		if ($@FlaviusBG1_Victory == 1) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Axl Rose]";
@@ -415,7 +415,7 @@ bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -423,11 +423,11 @@ bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
@@ -435,7 +435,7 @@ bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -443,7 +443,7 @@ bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
@@ -459,7 +459,7 @@ OnInit:
 bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 	if ($@FlaviusBG1_id2 == getcharid(4)) {
 		if ($@FlaviusBG1_Victory == 2) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Swandery]";
@@ -467,7 +467,7 @@ bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Swandery]";
@@ -475,11 +475,11 @@ bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
@@ -487,7 +487,7 @@ bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Swandery]";
@@ -495,7 +495,7 @@ bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
@@ -592,7 +592,7 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 	.@A_B_gap = $@Guill_ScoreBG1 - $@Croix_ScoreBG1;
 	if ($@FlaviusBG1_id1 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Axl Rose]";
@@ -600,7 +600,7 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -608,11 +608,11 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else if (.@A_B_gap == 0) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
@@ -620,7 +620,7 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -628,11 +628,11 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
@@ -640,7 +640,7 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -648,7 +648,7 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
@@ -670,7 +670,7 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 	.@A_B_gap = $@Guill_ScoreBG1 - $@Croix_ScoreBG1;
 	if ($@FlaviusBG1_id2 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
@@ -678,7 +678,7 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Swandery]";
@@ -686,11 +686,11 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else if (.@A_B_gap == 0) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
@@ -698,7 +698,7 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Swandery]";
@@ -706,11 +706,11 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Swandery]";
@@ -718,7 +718,7 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Swandery]";
@@ -726,7 +726,7 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt
index 182a067c1..3d474cff5 100644
--- a/npc/battleground/flavius/flavius02.txt
+++ b/npc/battleground/flavius/flavius02.txt
@@ -407,7 +407,7 @@ OnTouch:
 bat_b02,10,294,3	script	Guillaume Vintenar#b02_a	4_M_RASWORD,{
 	if ($@FlaviusBG2_id1 == getcharid(4)) {
 		if ($@FlaviusBG2_Victory == 1) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Axl Rose]";
@@ -415,7 +415,7 @@ bat_b02,10,294,3	script	Guillaume Vintenar#b02_a	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -423,11 +423,11 @@ bat_b02,10,294,3	script	Guillaume Vintenar#b02_a	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
@@ -435,7 +435,7 @@ bat_b02,10,294,3	script	Guillaume Vintenar#b02_a	4_M_RASWORD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -443,7 +443,7 @@ bat_b02,10,294,3	script	Guillaume Vintenar#b02_a	4_M_RASWORD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
@@ -459,7 +459,7 @@ OnInit:
 bat_b02,389,14,3	script	Croix Vintenar#b02_b	4_M_RASWORD,{
 	if ($@FlaviusBG2_id2 == getcharid(4)) {
 		if ($@FlaviusBG2_Victory == 2) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Swandery]";
@@ -467,7 +467,7 @@ bat_b02,389,14,3	script	Croix Vintenar#b02_b	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Swandery]";
@@ -475,11 +475,11 @@ bat_b02,389,14,3	script	Croix Vintenar#b02_b	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
@@ -487,7 +487,7 @@ bat_b02,389,14,3	script	Croix Vintenar#b02_b	4_M_RASWORD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Swandery]";
@@ -495,7 +495,7 @@ bat_b02,389,14,3	script	Croix Vintenar#b02_b	4_M_RASWORD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
@@ -592,7 +592,7 @@ bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
 	.@A_B_gap = $@Guill_ScoreBG2 - $@Croix_ScoreBG2;
 	if ($@FlaviusBG2_id1 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Axl Rose]";
@@ -600,7 +600,7 @@ bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -608,11 +608,11 @@ bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else if (.@A_B_gap == 0) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
@@ -620,7 +620,7 @@ bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -628,11 +628,11 @@ bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
@@ -640,7 +640,7 @@ bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -648,7 +648,7 @@ bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
@@ -670,7 +670,7 @@ bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
 	.@A_B_gap = $@Guill_ScoreBG2 - $@Croix_ScoreBG2;
 	if ($@FlaviusBG2_id2 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
@@ -678,7 +678,7 @@ bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Swandery]";
@@ -686,11 +686,11 @@ bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else if (.@A_B_gap == 0) {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
@@ -698,7 +698,7 @@ bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Swandery]";
@@ -706,11 +706,11 @@ bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			.@your_medal = countitem(7829);
+			.@your_medal = countitem(BF_Badge2);
 			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Swandery]";
@@ -718,7 +718,7 @@ bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Swandery]";
@@ -726,7 +726,7 @@ bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
diff --git a/npc/battleground/flavius/flavius_enter.txt b/npc/battleground/flavius/flavius_enter.txt
index 243203d6e..392746ff3 100644
--- a/npc/battleground/flavius/flavius_enter.txt
+++ b/npc/battleground/flavius/flavius_enter.txt
@@ -34,7 +34,7 @@
 
 //== Flavius Officer - Guillaume ===========================
 bat_room,133,178,5	script	Flavius Officer#01a	4_M_KY_KNT,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -94,7 +94,7 @@ bat_room,133,178,5	script	Flavius Officer#01a	4_M_KY_KNT,{
 }
 
 bat_room,133,121,1	script	Flavius Officer#01b	4_M_CRU_KNT,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -243,7 +243,7 @@ bat_room,151,121,1	script	Croix Knight#4	4_M_CRU_SOLD,{
 
 //== Flavius Officer - Croix ===============================
 bat_room,148,178,5	script	Flavius Officer#02a	4_M_KY_KNT,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -303,7 +303,7 @@ bat_room,148,178,5	script	Flavius Officer#02a	4_M_KY_KNT,{
 }
 
 bat_room,148,121,1	script	Flavius Officer#02b	4_M_CRU_KNT,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";