Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4

- Consolidated case in remaining variables, labels, constants.

Signed-off-by: Haru <haru@dotalux.com>

8 files changed, 56 insertions, 56 deletions

diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt
index f24e1e5a8..895191961 100644
--- a/npc/custom/battleground/bg_common.txt
+++ b/npc/custom/battleground/bg_common.txt
@@ -136,14 +136,14 @@ bat_room,160,140,3	script	Prince Croix	4_M_CRU_CRUA,{
 // Time calculation Function
 // *********************************************************************
 function	script	Time2Str	{
-	set .@Time_Left, getarg(0) - gettimetick(2);
+	set .@time_left, getarg(0) - gettimetick(2);
 	
-	set .@Days, .@Time_Left / 86400;
-	set .@Time_Left, .@Time_Left - (.@Days * 86400);
-	set .@Hours, .@Time_Left / 3600;
-	set .@Time_Left, .@Time_Left - (.@Hours * 3600);
-	set .@Minutes, .@Time_Left / 60;
-	set .@Time_Left, .@Time_Left - (.@Minutes * 60);
+	set .@Days, .@time_left / 86400;
+	set .@time_left, .@time_left - (.@Days * 86400);
+	set .@Hours, .@time_left / 3600;
+	set .@time_left, .@time_left - (.@Hours * 3600);
+	set .@Minutes, .@time_left / 60;
+	set .@time_left, .@time_left - (.@Minutes * 60);
 	
 	set .@Time$, "";
 	if( .@Days > 1 )
@@ -161,10 +161,10 @@ function	script	Time2Str	{
 	else if( .@Minutes > 0 )
 		set .@Time$, .@Time$ + .@Minutes + " minute, ";
 
-	if( .@Time_Left > 1 || .@Time_Left == 0 )
-		set .@Time$, .@Time$ + .@Time_Left + " seconds.";
-	else if( .@Time_Left == 1 )
-		set .@Time$, .@Time$ + .@Time_Left + " second.";
+	if( .@time_left > 1 || .@time_left == 0 )
+		set .@Time$, .@Time$ + .@time_left + " seconds.";
+	else if( .@time_left == 1 )
+		set .@Time$, .@Time$ + .@time_left + " second.";
 	
 	return .@Time$;
 }
@@ -1292,12 +1292,12 @@ bat_room,160,150,3	script	Erundek	4_M_MANAGER,{
 	mes "If you are not sure, check the catalog.";
 	next;
 
-	set .@Menu$, "";
+	set .@menu$, "";
 	set .@count, getarraysize(.@Item_DB);
 	for( set .@i, 0; .@i < .@count; set .@i, .@i + 1 )
-		set .@Menu$, .@Menu$ + getitemname(.@Item_DB[.@i]) + ":";
+		set .@menu$, .@menu$ + getitemname(.@Item_DB[.@i]) + ":";
 
-	set .@Item_ID, .@Item_DB[select(.@Menu$) - 1];
+	set .@Item_ID, .@Item_DB[select(.@menu$) - 1];
 
 	mes "[Erundek]";
 	mes "Would you like to exchange ^FF0000" + .@Value + " " + getitemname(.@Badge) + "^000000 for a ^0000FF" + getitemname(.@Item_ID) + "^000000?";
diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt
index 0d2ee8a7e..5a78a7002 100644
--- a/npc/custom/battleground/bg_flavius_01.txt
+++ b/npc/custom/battleground/bg_flavius_01.txt
@@ -278,7 +278,7 @@ bat_b01,390,13,5	script	Guillaume Vintenar#fl1	4_M_KY_HEAD,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
+			set .@reward, 9;
 		}
 		else
 		{ // 
@@ -287,11 +287,11 @@ bat_b01,390,13,5	script	Guillaume Vintenar#fl1	4_M_KY_HEAD,{
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
 			mes "Just take this defeat a lesson, and later you would definitely learn.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -309,7 +309,7 @@ bat_b01,10,293,5	script	Croix Vintenar#fl1	4_M_CRU_HEAD,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
+			set .@reward, 9;
 		}
 		else
 		{ // 
@@ -318,11 +318,11 @@ bat_b01,10,293,5	script	Croix Vintenar#fl1	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 can win the next.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt
index 3e5215faa..1a66d39c5 100644
--- a/npc/custom/battleground/bg_flavius_02.txt
+++ b/npc/custom/battleground/bg_flavius_02.txt
@@ -278,7 +278,7 @@ bat_b02,390,13,5	script	Guillaume Vintenar#fl2	4_M_KY_HEAD,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
+			set .@reward, 9;
 		}
 		else
 		{ // 
@@ -287,11 +287,11 @@ bat_b02,390,13,5	script	Guillaume Vintenar#fl2	4_M_KY_HEAD,{
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
 			mes "Just take this defeat a lesson, and later you would definitely learn.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -309,7 +309,7 @@ bat_b02,10,293,5	script	Croix Vintenar#fl2	4_M_CRU_HEAD,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
+			set .@reward, 9;
 		}
 		else
 		{ // 
@@ -318,11 +318,11 @@ bat_b02,10,293,5	script	Croix Vintenar#fl2	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 can win the next.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt
index ed8e0ad76..cfa2f01d7 100644
--- a/npc/custom/battleground/bg_kvm01.txt
+++ b/npc/custom/battleground/bg_kvm01.txt
@@ -313,7 +313,7 @@ bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	4_M_KY_HEAD,{
 		}
 		else if( $@KvM01BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 5;
+			set .@reward, 5;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
@@ -322,7 +322,7 @@ bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	4_M_KY_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -331,7 +331,7 @@ bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	4_M_KY_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -351,7 +351,7 @@ bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	4_M_CRU_HEAD,{
 		}
 		else if( $@KvM01BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 5;
+			set .@reward, 5;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
@@ -360,7 +360,7 @@ bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	4_M_CRU_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -369,7 +369,7 @@ bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	4_M_CRU_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt
index 919b7a583..f759e2b9a 100644
--- a/npc/custom/battleground/bg_kvm02.txt
+++ b/npc/custom/battleground/bg_kvm02.txt
@@ -313,7 +313,7 @@ bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	4_M_KY_HEAD,{
 		}
 		else if( $@KvM02BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
@@ -322,7 +322,7 @@ bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	4_M_KY_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -331,7 +331,7 @@ bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	4_M_KY_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -351,7 +351,7 @@ bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	4_M_CRU_HEAD,{
 		}
 		else if( $@KvM02BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
@@ -360,7 +360,7 @@ bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	4_M_CRU_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -369,7 +369,7 @@ bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	4_M_CRU_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt
index b13624067..dde4d8147 100644
--- a/npc/custom/battleground/bg_kvm03.txt
+++ b/npc/custom/battleground/bg_kvm03.txt
@@ -313,7 +313,7 @@ bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	4_M_KY_HEAD,{
 		}
 		else if( $@KvM03BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
@@ -322,7 +322,7 @@ bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	4_M_KY_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 0;
+			set .@reward, 0;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -331,7 +331,7 @@ bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	4_M_KY_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -351,7 +351,7 @@ bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	4_M_CRU_HEAD,{
 		}
 		else if( $@KvM03BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
@@ -360,7 +360,7 @@ bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	4_M_CRU_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 0;
+			set .@reward, 0;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -369,7 +369,7 @@ bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	4_M_CRU_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt
index c6a6c3b36..819fa9158 100644
--- a/npc/custom/battleground/bg_tierra_01.txt
+++ b/npc/custom/battleground/bg_tierra_01.txt
@@ -322,7 +322,7 @@ bat_a01,45,19,3	script	Croix Vintenar#tv1	4_M_CRU_HEAD,{
 	{
 		if( $@TierraBG1_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
@@ -331,7 +331,7 @@ bat_a01,45,19,3	script	Croix Vintenar#tv1	4_M_CRU_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -340,7 +340,7 @@ bat_a01,45,19,3	script	Croix Vintenar#tv1	4_M_CRU_HEAD,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -353,7 +353,7 @@ bat_a01,53,377,3	script	Guillaume Vintenar#tv1	4_M_KY_HEAD,{
 	{
 		if( $@TierraBG1_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
@@ -362,7 +362,7 @@ bat_a01,53,377,3	script	Guillaume Vintenar#tv1	4_M_KY_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -371,7 +371,7 @@ bat_a01,53,377,3	script	Guillaume Vintenar#tv1	4_M_KY_HEAD,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt
index 23b58dffd..25796c4bc 100644
--- a/npc/custom/battleground/bg_tierra_02.txt
+++ b/npc/custom/battleground/bg_tierra_02.txt
@@ -322,7 +322,7 @@ bat_a02,45,19,3	script	Croix Vintenar#tv2	4_M_CRU_HEAD,{
 	{
 		if( $@TierraBG2_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
@@ -331,7 +331,7 @@ bat_a02,45,19,3	script	Croix Vintenar#tv2	4_M_CRU_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -340,7 +340,7 @@ bat_a02,45,19,3	script	Croix Vintenar#tv2	4_M_CRU_HEAD,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -353,7 +353,7 @@ bat_a02,53,377,3	script	Guillaume Vintenar#tv2	4_M_KY_HEAD,{
 	{
 		if( $@TierraBG2_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
@@ -362,7 +362,7 @@ bat_a02,53,377,3	script	Guillaume Vintenar#tv2	4_M_KY_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -371,7 +371,7 @@ bat_a02,53,377,3	script	Guillaume Vintenar#tv2	4_M_KY_HEAD,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;