Replaced 'set' with direct assignment where applicable (common folder)

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

4 files changed, 113 insertions, 119 deletions

diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt
index b4888be88..d5ecdfa31 100644
--- a/npc/battleground/kvm/kvm01.txt
+++ b/npc/battleground/kvm/kvm01.txt
@@ -27,7 +27,7 @@ OnInit:
 	end;
 	
 OnEnterBG:
-	set $@KvM01BG_id1, waitingroom2bg("bat_c01",52,129,"KvM01_BG::OnGuillaumeQuit","KvM01_BG::OnGuillaumeDie");
+	$@KvM01BG_id1 = waitingroom2bg("bat_c01",52,129,"KvM01_BG::OnGuillaumeQuit","KvM01_BG::OnGuillaumeDie");
 	end;
 }
 
@@ -41,7 +41,7 @@ OnInit:
 	end;
 
 OnEnterBG:
-	set $@KvM01BG_id2, waitingroom2bg("bat_c01",147,55,"KvM01_BG::OnCroixQuit","KvM01_BG::OnCroixDie");
+	$@KvM01BG_id2 = waitingroom2bg("bat_c01",147,55,"KvM01_BG::OnCroixQuit","KvM01_BG::OnCroixDie");
 	end;
 }
 
@@ -93,7 +93,7 @@ OnDisable:
 	end;
 
 OnTouch:
-	set Bat_Team,1;
+	Bat_Team = 1;
 	setquest 6025;
 	end;
 }
@@ -114,7 +114,7 @@ OnDisable:
 	end;
 
 OnTouch:
-	set Bat_Team,2;
+	Bat_Team = 2;
 	setquest 6025;
 	end;
 }
@@ -139,11 +139,10 @@ OnCroixJoin:
 	end;
 
 OnGuillaumeQuit:
-	//set BG_Delay_Tick, gettimetick(2) + 1200;
+	//BG_Delay_Tick = gettimetick(2) + 1200;
 OnGuillaumeDie:
-	if( $@KvM01BG == 2 )
-	{
-		set .Guillaume_Count, .Guillaume_Count - 1;
+	if ($@KvM01BG == 2) {
+		--.Guillaume_Count;
 		bg_updatescore "bat_c01",.Guillaume_Count,.Croix_Count;
 		if( .Guillaume_Count < 1 ) donpcevent "KvM01_BG::OnCroixWin";
 		else {
@@ -154,11 +153,10 @@ OnGuillaumeDie:
 	end;
 
 OnCroixQuit:
-	//set BG_Delay_Tick, gettimetick(2) + 1200;
+	//BG_Delay_Tick = gettimetick(2) + 1200;
 OnCroixDie:
-	if( $@KvM01BG == 2 )
-	{
-		set .Croix_Count, .Croix_Count - 1;
+	if ($@KvM01BG == 2) {
+		--.Croix_Count;
 		bg_updatescore "bat_c01",.Guillaume_Count,.Croix_Count;
 		if( .Croix_Count < 1 ) donpcevent "KvM01_BG::OnGuillaumeWin";
 		else {
@@ -171,13 +169,13 @@ OnCroixDie:
 OnReadyCheck:
 	if( $@KvM01BG )
 		end;
-	set .@Guillaume, getwaitingroomstate(0,"KvM01R_Guillaume");
-	set .@Croix, getwaitingroomstate(0,"KvM01R_Croix");
+	.@Guillaume = getwaitingroomstate(0,"KvM01R_Guillaume");
+	.@Croix = getwaitingroomstate(0,"KvM01R_Croix");
 
 	if( .@Guillaume < 5 || .@Croix < 5 )
 		end;
 
-	set $@KvM01BG, 1; // Starting
+	$@KvM01BG = 1; // Starting
 	donpcevent "KvM01R_Croix::OnEnterBG";
 	donpcevent "KvM01R_Guillaume::OnEnterBG";
 	donpcevent "KvM01_BG::OnStart";
@@ -186,7 +184,7 @@ OnReadyCheck:
 OnStart:
 	disablenpc "KVM Officer#KVM01A";
 	disablenpc "KVM Officer#KVM01B";
-	set $@KvM01BG_Victory, 0;
+	$@KvM01BG_Victory = 0;
 	// Warp Teams
 	bg_warp $@KvM01BG_id1,"bat_c01",53,128;
 	bg_warp $@KvM01BG_id2,"bat_c01",146,55;
@@ -239,18 +237,18 @@ OnTimer59000:
 
 OnTimer61000:
 	// Team Members
-	set .Guillaume_Count, bg_get_data($@KvM01BG_id1, 0);
-	set .Croix_Count, bg_get_data($@KvM01BG_id2, 0);
+	.Guillaume_Count = bg_get_data($@KvM01BG_id1, 0);
+	.Croix_Count = bg_get_data($@KvM01BG_id2, 0);
 	if( .Guillaume_Count < 5 || .Croix_Count < 5 )
 	{
-		set $@KvM01BG_Victory, 3;
-		set $@KvM01BG, 3;
+		$@KvM01BG_Victory = 3;
+		$@KvM01BG = 3;
 		mapannounce "bat_c01","There are not enough players to start the battle",1,0x696969;
 		stopnpctimer;
 		donpcevent "KvM01_BG::OnStop";
 		end;
 	}
-	set $@KvM01BG, 2; // Playing
+	$@KvM01BG = 2; // Playing
 	bg_warp $@KvM01BG_id1,"bat_c01",61,120;
 	bg_warp $@KvM01BG_id2,"bat_c01",138,63;
 	end;
@@ -283,8 +281,8 @@ OnTimer360000:
 		donpcevent "KvM01_BG::OnGuillaumeWin";
 	else
 	{ // Draw Game
-		set $@KvM01BG, 3;
-		set $@KvM01BG_Victory, 3;
+		$@KvM01BG = 3;
+		$@KvM01BG_Victory = 3;
 		mapannounce "bat_c01", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
 		mapannounce "bat_c01", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
 		mapannounce "bat_c01", "This battle has ended in a draw.",bc_map,"0x00ff00";
@@ -293,8 +291,8 @@ OnTimer360000:
 	end;
 
 OnGuillaumeWin:
-	set $@KvM01BG, 3;
-	set $@KvM01BG_Victory, 1;
+	$@KvM01BG = 3;
+	$@KvM01BG_Victory = 1;
 	mapannounce "bat_c01", "Guillaume wins!",bc_map,"0x00ff00";
 	mapannounce "bat_c01", "Congratulations to Guillaume members.",bc_map,"0x00ff00";
 	mapannounce "bat_c01", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
@@ -302,8 +300,8 @@ OnGuillaumeWin:
 	end;
 
 OnCroixWin:
-	set $@KvM01BG, 3;
-	set $@KvM01BG_Victory, 2;
+	$@KvM01BG = 3;
+	$@KvM01BG_Victory = 2;
 	mapannounce "bat_c01", "Croix wins!",bc_map,"0x00ff00";
 	mapannounce "bat_c01", "Congratulations to Croix members.",bc_map,"0x00ff00";
 	mapannounce "bat_c01", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
@@ -321,17 +319,17 @@ OnStop:
 	end;
 
 OnReset:
-	set .Croix_Count, 0;
-	set .Guillaume_Count, 0;
-	set $@KvM01BG_Victory, 0;
-	if( $@KvM01BG_id1 ) { bg_destroy $@KvM01BG_id1; set $@KvM01BG_id1, 0; }
-	if( $@KvM01BG_id2 ) { bg_destroy $@KvM01BG_id2; set $@KvM01BG_id2, 0; }
+	.Croix_Count = 0;
+	.Guillaume_Count = 0;
+	$@KvM01BG_Victory = 0;
+	if( $@KvM01BG_id1 ) { bg_destroy $@KvM01BG_id1; $@KvM01BG_id1 = 0; }
+	if( $@KvM01BG_id2 ) { bg_destroy $@KvM01BG_id2; $@KvM01BG_id2 = 0; }
 	disablenpc "KVM Officer#KVM01A";
 	disablenpc "KVM Officer#KVM01B";
 	mapwarp "bat_c01","bat_room",154,150;
 	maprespawnguildid "bat_c01",0,3; // Just in case someone else
 	bg_updatescore "bat_c01",5,5;
-	set $@KvM01BG, 0;
+	$@KvM01BG = 0;
 	donpcevent "KvM01_BG::OnReadyCheck"; // Maybe a game is ready to start
 	end;
 }
@@ -374,14 +372,14 @@ bat_c01,51,130,5	script	KVM Officer#KVM01A	4_M_KY_HEAD,{
 	{
 		if( $@KvM01BG_Victory == Bat_Team )
 		{ // Victory
-			set kvm_point,kvm_point + 5;
+			kvm_point += 5;
 			mes "[KVM Officer]";
 			mes "Good Game.";
 			mes "May the glory of KVM be with you.";
 			mes "You aquire the winning points: 5";
 			close2;
 		} else {
-			set kvm_point,kvm_point + 1;
+			++kvm_point;
 			mes "[KVM Officer]";
 			mes "I am so sorry.";
 			mes "I wish you better luck next time.";
@@ -389,7 +387,7 @@ bat_c01,51,130,5	script	KVM Officer#KVM01A	4_M_KY_HEAD,{
 			close2;
 		}
 		bg_leave;
-		set Bat_Team,0;
+		Bat_Team = 0;
 		warp "bat_room",154,150;
 		end;
 	}
@@ -401,14 +399,14 @@ bat_c01,148,53,1	script	KVM Officer#KVM01B	4_M_CRU_HEAD,{
 	{
 		if( $@KvM01BG_Victory == Bat_Team )
 		{ // Victory
-			set kvm_point,kvm_point + 5;
+			kvm_point += 5;
 			mes "[KVM Officer]";
 			mes "Good Game.";
 			mes "May the glory of KVM be with you.";
 			mes "You aquire the winning points: 5";
 			close2;
 		} else {
-			set kvm_point,kvm_point + 1;
+			++kvm_point;
 			mes "[KVM Officer]";
 			mes "I am so sorry.";
 			mes "I wish you better luck next time.";
@@ -416,7 +414,7 @@ bat_c01,148,53,1	script	KVM Officer#KVM01B	4_M_CRU_HEAD,{
 			close2;
 		}
 		bg_leave;
-		set Bat_Team,0;
+		Bat_Team = 0;
 		warp "bat_room",154,150;
 		end;
 	}
diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index 06f3a2dcf..bf41528cc 100644
--- a/npc/battleground/kvm/kvm02.txt
+++ b/npc/battleground/kvm/kvm02.txt
@@ -29,7 +29,7 @@ OnInit:
 	end;
 	
 OnEnterBG:
-	set $@KvM02BG_id1, waitingroom2bg("bat_c02",52,129,"KvM02_BG::OnGuillaumeQuit","KvM02_BG::OnGuillaumeDie");
+	$@KvM02BG_id1 = waitingroom2bg("bat_c02",52,129,"KvM02_BG::OnGuillaumeQuit","KvM02_BG::OnGuillaumeDie");
 	end;
 }
 
@@ -43,7 +43,7 @@ OnInit:
 	end;
 
 OnEnterBG:
-	set $@KvM02BG_id2, waitingroom2bg("bat_c02",147,55,"KvM02_BG::OnCroixQuit","KvM02_BG::OnCroixDie");
+	$@KvM02BG_id2 = waitingroom2bg("bat_c02",147,55,"KvM02_BG::OnCroixQuit","KvM02_BG::OnCroixDie");
 	end;
 }
 
@@ -95,7 +95,7 @@ OnDisable:
 	end;
 
 OnTouch:
-	set Bat_Team,1;
+	Bat_Team = 1;
 	setquest 6025;
 	end;
 }
@@ -116,7 +116,7 @@ OnDisable:
 	end;
 
 OnTouch:
-	set Bat_Team,2;
+	Bat_Team = 2;
 	setquest 6025;
 	end;
 }
@@ -141,11 +141,10 @@ OnCroixJoin:
 	end;
 
 OnGuillaumeQuit:
-	//set BG_Delay_Tick, gettimetick(2) + 1200;
+	//BG_Delay_Tick = gettimetick(2) + 1200;
 OnGuillaumeDie:
-	if( $@KvM02BG == 2 )
-	{
-		set .Guillaume_Count, .Guillaume_Count - 1;
+	if ($@KvM02BG == 2) {
+		--.Guillaume_Count;
 		bg_updatescore "bat_c02",.Guillaume_Count,.Croix_Count;
 		if( .Guillaume_Count < 1 ) donpcevent "KvM02_BG::OnCroixWin";
 		else {
@@ -156,11 +155,10 @@ OnGuillaumeDie:
 	end;
 
 OnCroixQuit:
-	//set BG_Delay_Tick, gettimetick(2) + 1200;
+	//BG_Delay_Tick = gettimetick(2) + 1200;
 OnCroixDie:
-	if( $@KvM02BG == 2 )
-	{
-		set .Croix_Count, .Croix_Count - 1;
+	if ($@KvM02BG == 2) {
+		--.Croix_Count;
 		bg_updatescore "bat_c02",.Guillaume_Count,.Croix_Count;
 		if( .Croix_Count < 1 ) donpcevent "KvM02_BG::OnGuillaumeWin";
 		else {
@@ -173,13 +171,13 @@ OnCroixDie:
 OnReadyCheck:
 	if( $@KvM02BG )
 		end;
-	set .@Guillaume, getwaitingroomstate(0,"KvM02R_Guillaume");
-	set .@Croix, getwaitingroomstate(0,"KvM02R_Croix");
+	.@Guillaume = getwaitingroomstate(0,"KvM02R_Guillaume");
+	.@Croix = getwaitingroomstate(0,"KvM02R_Croix");
 
 	if( .@Guillaume < 5 || .@Croix < 5 )
 		end;
 
-	set $@KvM02BG, 1; // Starting
+	$@KvM02BG = 1; // Starting
 	donpcevent "KvM02R_Croix::OnEnterBG";
 	donpcevent "KvM02R_Guillaume::OnEnterBG";
 	donpcevent "KvM02_BG::OnStart";
@@ -188,7 +186,7 @@ OnReadyCheck:
 OnStart:
 	disablenpc "KVM Officer#KVM02A";
 	disablenpc "KVM Officer#KVM02B";
-	set $@KvM02BG_Victory, 0;
+	$@KvM02BG_Victory = 0;
 	// Warp Teams
 	bg_warp $@KvM02BG_id1,"bat_c02",53,128;
 	bg_warp $@KvM02BG_id2,"bat_c02",146,55;
@@ -241,18 +239,18 @@ OnTimer59000:
 
 OnTimer61000:
 	// Team Members
-	set .Guillaume_Count, bg_get_data($@KvM02BG_id1, 0);
-	set .Croix_Count, bg_get_data($@KvM02BG_id2, 0);
+	.Guillaume_Count = bg_get_data($@KvM02BG_id1, 0);
+	.Croix_Count = bg_get_data($@KvM02BG_id2, 0);
 	if( .Guillaume_Count < 5 || .Croix_Count < 5 )
 	{
-		set $@KvM02BG_Victory, 3;
-		set $@KvM02BG, 3;
+		$@KvM02BG_Victory = 3;
+		$@KvM02BG = 3;
 		mapannounce "bat_c02","There are not enough players to start the battle",1,0x808080;
 		stopnpctimer;
 		donpcevent "KvM02_BG::OnStop";
 		end;
 	}
-	set $@KvM02BG, 2; // Playing
+	$@KvM02BG = 2; // Playing
 	bg_warp $@KvM02BG_id1,"bat_c02",62,119;
 	bg_warp $@KvM02BG_id2,"bat_c02",137,64;
 	end;
@@ -285,8 +283,8 @@ OnTimer360000:
 		donpcevent "KvM02_BG::OnGuillaumeWin";
 	else
 	{ // Draw Game
-		set $@KvM02BG, 3;
-		set $@KvM02BG_Victory, 3;
+		$@KvM02BG = 3;
+		$@KvM02BG_Victory = 3;
 		mapannounce "bat_c02", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
 		mapannounce "bat_c02", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
 		mapannounce "bat_c02", "This battle has ended in a draw.",bc_map,"0x00ff00";
@@ -295,8 +293,8 @@ OnTimer360000:
 	end;
 
 OnGuillaumeWin:
-	set $@KvM02BG, 3;
-	set $@KvM02BG_Victory, 1;
+	$@KvM02BG = 3;
+	$@KvM02BG_Victory = 1;
 	mapannounce "bat_c02", "Guillaume wins!",bc_map,"0x00ff00";
 	mapannounce "bat_c02", "Congratulations to Guillaume members.",bc_map,"0x00ff00";
 	mapannounce "bat_c02", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
@@ -304,8 +302,8 @@ OnGuillaumeWin:
 	end;
 
 OnCroixWin:
-	set $@KvM02BG, 3;
-	set $@KvM02BG_Victory, 2;
+	$@KvM02BG = 3;
+	$@KvM02BG_Victory = 2;
 	mapannounce "bat_c02", "Croix wins!",bc_map,"0x00ff00";
 	mapannounce "bat_c02", "Congratulations to Croix members.",bc_map,"0x00ff00";
 	mapannounce "bat_c02", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
@@ -323,17 +321,17 @@ OnStop:
 	end;
 
 OnReset:
-	set .Croix_Count, 0;
-	set .Guillaume_Count, 0;
-	set $@KvM02BG_Victory, 0;
-	if( $@KvM02BG_id1 ) { bg_destroy $@KvM02BG_id1; set $@KvM02BG_id1, 0; }
-	if( $@KvM02BG_id2 ) { bg_destroy $@KvM02BG_id2; set $@KvM02BG_id2, 0; }
+	.Croix_Count = 0;
+	.Guillaume_Count = 0;
+	$@KvM02BG_Victory = 0;
+	if( $@KvM02BG_id1 ) { bg_destroy $@KvM02BG_id1; $@KvM02BG_id1 = 0; }
+	if( $@KvM02BG_id2 ) { bg_destroy $@KvM02BG_id2; $@KvM02BG_id2 = 0; }
 	disablenpc "KVM Officer#KVM02A";
 	disablenpc "KVM Officer#KVM02B";
 	mapwarp "bat_c02","bat_room",154,150;
 	maprespawnguildid "bat_c02",0,3; // Just in case someone else
 	bg_updatescore "bat_c02",5,5;
-	set $@KvM02BG, 0;
+	$@KvM02BG = 0;
 	donpcevent "KvM02_BG::OnReadyCheck"; // Maybe a game is ready to start
 	end;
 }
@@ -376,7 +374,7 @@ bat_c02,51,130,5	script	KVM Officer#KVM02A	4_M_KY_HEAD,{
 	{
 		if( $@KvM02BG_Victory == Bat_Team )
 		{ // Victory
-			set kvm_point,kvm_point + 1;
+			++kvm_point;
 			mes "[KVM Officer]";
 			mes "Good Game.";
 			mes "May the glory of KVM be with you.";
@@ -390,7 +388,7 @@ bat_c02,51,130,5	script	KVM Officer#KVM02A	4_M_KY_HEAD,{
 			close2;
 		}
 		bg_leave;
-		set Bat_Team,0;
+		Bat_Team = 0;
 		warp "bat_room",154,150;
 		end;
 	}
@@ -402,7 +400,7 @@ bat_c02,148,53,1	script	KVM Officer#KVM02B	4_M_CRU_HEAD,{
 	{
 		if( $@KvM02BG_Victory == Bat_Team )
 		{ // Victory
-			set kvm_point,kvm_point + 1;
+			++kvm_point;
 			mes "[KVM Officer]";
 			mes "Good Game.";
 			mes "May the glory of KVM be with you.";
@@ -416,7 +414,7 @@ bat_c02,148,53,1	script	KVM Officer#KVM02B	4_M_CRU_HEAD,{
 			close2;
 		}
 		bg_leave;
-		set Bat_Team,0;
+		Bat_Team = 0;
 		warp "bat_room",154,150;
 		end;
 	}
diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt
index ea7dc3d47..f4bd49d4f 100644
--- a/npc/battleground/kvm/kvm03.txt
+++ b/npc/battleground/kvm/kvm03.txt
@@ -28,7 +28,7 @@ OnInit:
 	end;
 	
 OnEnterBG:
-	set $@KvM03BG_id1, waitingroom2bg("bat_c03",52,129,"KvM03_BG::OnGuillaumeQuit","KvM03_BG::OnGuillaumeDie");
+	$@KvM03BG_id1 = waitingroom2bg("bat_c03",52,129,"KvM03_BG::OnGuillaumeQuit","KvM03_BG::OnGuillaumeDie");
 	end;
 }
 
@@ -42,7 +42,7 @@ OnInit:
 	end;
 
 OnEnterBG:
-	set $@KvM03BG_id2, waitingroom2bg("bat_c03",147,55,"KvM03_BG::OnCroixQuit","KvM03_BG::OnCroixDie");
+	$@KvM03BG_id2 = waitingroom2bg("bat_c03",147,55,"KvM03_BG::OnCroixQuit","KvM03_BG::OnCroixDie");
 	end;
 }
 
@@ -94,7 +94,7 @@ OnDisable:
 	end;
 
 OnTouch:
-	set Bat_Team,1;
+	Bat_Team = 1;
 	setquest 6025;
 	end;
 }
@@ -115,7 +115,7 @@ OnDisable:
 	end;
 
 OnTouch:
-	set Bat_Team,2;
+	Bat_Team = 2;
 	setquest 6025;
 	end;
 }
@@ -140,11 +140,10 @@ OnCroixJoin:
 	end;
 
 OnGuillaumeQuit:
-	//set BG_Delay_Tick, gettimetick(2) + 1200;
+	//BG_Delay_Tick = gettimetick(2) + 1200;
 OnGuillaumeDie:
-	if( $@KvM03BG == 2 )
-	{
-		set .Guillaume_Count, .Guillaume_Count - 1;
+	if ($@KvM03BG == 2) {
+		--.Guillaume_Count;
 		bg_updatescore "bat_c03",.Guillaume_Count,.Croix_Count;
 		if( .Guillaume_Count < 1 ) donpcevent "KvM03_BG::OnCroixWin";
 		else {
@@ -155,11 +154,10 @@ OnGuillaumeDie:
 	end;
 
 OnCroixQuit:
-	//set BG_Delay_Tick, gettimetick(2) + 1200;
+	//BG_Delay_Tick = gettimetick(2) + 1200;
 OnCroixDie:
-	if( $@KvM03BG == 2 )
-	{
-		set .Croix_Count, .Croix_Count - 1;
+	if ($@KvM03BG == 2) {
+		--.Croix_Count;
 		bg_updatescore "bat_c03",.Guillaume_Count,.Croix_Count;
 		if( .Croix_Count < 1 ) donpcevent "KvM03_BG::OnGuillaumeWin";
 		else {
@@ -172,13 +170,13 @@ OnCroixDie:
 OnReadyCheck:
 	if( $@KvM03BG )
 		end;
-	set .@Guillaume, getwaitingroomstate(0,"KvM03R_Guillaume");
-	set .@Croix, getwaitingroomstate(0,"KvM03R_Croix");
+	.@Guillaume = getwaitingroomstate(0,"KvM03R_Guillaume");
+	.@Croix = getwaitingroomstate(0,"KvM03R_Croix");
 
 	if( .@Guillaume < 5 || .@Croix < 5 )
 		end;
 
-	set $@KvM03BG, 1; // Starting
+	$@KvM03BG = 1; // Starting
 	donpcevent "KvM03R_Croix::OnEnterBG";
 	donpcevent "KvM03R_Guillaume::OnEnterBG";
 	donpcevent "KvM03_BG::OnStart";
@@ -187,7 +185,7 @@ OnReadyCheck:
 OnStart:
 	disablenpc "KVM Officer#KVM03A";
 	disablenpc "KVM Officer#KVM03B";
-	set $@KvM01BG_Victory, 0;
+	$@KvM01BG_Victory = 0;
 	// Warp Teams
 	bg_warp $@KvM03BG_id1,"bat_c03",53,128;
 	bg_warp $@KvM03BG_id2,"bat_c03",146,55;
@@ -240,18 +238,18 @@ OnTimer59000:
 
 OnTimer61000:
 	// Team Members
-	set .Guillaume_Count, bg_get_data($@KvM03BG_id1, 0);
-	set .Croix_Count, bg_get_data($@KvM03BG_id2, 0);
+	.Guillaume_Count = bg_get_data($@KvM03BG_id1, 0);
+	.Croix_Count = bg_get_data($@KvM03BG_id2, 0);
 	if( .Guillaume_Count < 5 || .Croix_Count < 5 )
 	{
-		set $@KvM03BG_Victory, 3;
-		set $@KvM03BG, 3;
+		$@KvM03BG_Victory = 3;
+		$@KvM03BG = 3;
 		mapannounce "bat_c03","There are not enough players to start the battle",1,0xC0C0C0;
 		stopnpctimer;
 		donpcevent "KvM03_BG::OnStop";
 		end;
 	}
-	set $@KvM03BG, 2; // Playing
+	$@KvM03BG = 2; // Playing
 	bg_warp $@KvM03BG_id1,"bat_c03",62,119;
 	bg_warp $@KvM03BG_id2,"bat_c03",137,64;
 	end;
@@ -284,8 +282,8 @@ OnTimer360000:
 		donpcevent "KvM03_BG::OnGuillaumeWin";
 	else
 	{ // Draw Game
-		set $@KvM03BG, 3;
-		set $@KvM03BG_Victory, 3;
+		$@KvM03BG = 3;
+		$@KvM03BG_Victory = 3;
 		mapannounce "bat_c03", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
 		mapannounce "bat_c03", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
 		mapannounce "bat_c03", "This battle has ended in a draw.",bc_map,"0x00ff00";
@@ -294,8 +292,8 @@ OnTimer360000:
 	end;
 
 OnGuillaumeWin:
-	set $@KvM03BG, 3;
-	set $@KvM03BG_Victory, 1;
+	$@KvM03BG = 3;
+	$@KvM03BG_Victory = 1;
 	mapannounce "bat_c03", "Guillaume wins!",bc_map,"0x00ff00";
 	mapannounce "bat_c03", "Congratulations to Guillaume members.",bc_map,"0x00ff00";
 	mapannounce "bat_c03", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
@@ -303,8 +301,8 @@ OnGuillaumeWin:
 	end;
 
 OnCroixWin:
-	set $@KvM03BG, 3;
-	set $@KvM03BG_Victory, 2;
+	$@KvM03BG = 3;
+	$@KvM03BG_Victory = 2;
 	mapannounce "bat_c03", "Croix wins!",bc_map,"0x00ff00";
 	mapannounce "bat_c03", "Congratulations to Croix members.",bc_map,"0x00ff00";
 	mapannounce "bat_c03", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
@@ -322,17 +320,17 @@ OnStop:
 	end;
 
 OnReset:
-	set .Croix_Count, 0;
-	set .Guillaume_Count, 0;
-	set $@KvM03BG_Victory, 0;
-	if( $@KvM03BG_id1 ) { bg_destroy $@KvM03BG_id1; set $@KvM03BG_id1, 0; }
-	if( $@KvM03BG_id2 ) { bg_destroy $@KvM03BG_id2; set $@KvM03BG_id2, 0; }
+	.Croix_Count = 0;
+	.Guillaume_Count = 0;
+	$@KvM03BG_Victory = 0;
+	if( $@KvM03BG_id1 ) { bg_destroy $@KvM03BG_id1; $@KvM03BG_id1 = 0; }
+	if( $@KvM03BG_id2 ) { bg_destroy $@KvM03BG_id2; $@KvM03BG_id2 = 0; }
 	disablenpc "KVM Officer#KVM03A";
 	disablenpc "KVM Officer#KVM03B";
 	mapwarp "bat_c03","bat_room",154,150;
 	maprespawnguildid "bat_c03",0,3; // Just in case someone else
 	bg_updatescore "bat_c03",5,5;
-	set $@KvM03BG, 0;
+	$@KvM03BG = 0;
 	donpcevent "KvM03_BG::OnReadyCheck"; // Maybe a game is ready to start
 	end;
 }
@@ -375,14 +373,14 @@ bat_c03,51,130,5	script	KVM Officer#KVM03A	4_M_KY_HEAD,{
 	{
 		if( $@KvM03BG_Victory == Bat_Team )
 		{ // Victory
-			set kvm_point,kvm_point + 2;
+			kvm_point += 2;
 			mes "[KVM Officer]";
 			mes "Good Game.";
 			mes "May the glory of KVM be with you.";
 			mes "You aquire the winning points: 2";
 			close2;
 		} else {
-			set kvm_point,kvm_point + 1;
+			++kvm_point;
 			mes "[KVM Officer]";
 			mes "I am so sorry.";
 			mes "I wish you better luck next time.";
@@ -390,7 +388,7 @@ bat_c03,51,130,5	script	KVM Officer#KVM03A	4_M_KY_HEAD,{
 			close2;
 		}
 		bg_leave;
-		set Bat_Team,0;
+		Bat_Team = 0;
 		warp "bat_room",154,150;
 		end;
 	}
@@ -402,14 +400,14 @@ bat_c03,148,53,1	script	KVM Officer#KVM03B	4_M_CRU_HEAD,{
 	{
 		if( $@KvM03BG_Victory == Bat_Team )
 		{ // Victory
-			set kvm_point,kvm_point + 2;
+			kvm_point +=2;
 			mes "[KVM Officer]";
 			mes "Good Game.";
 			mes "May the glory of KVM be with you.";
 			mes "You aquire the winning points: 2";
 			close2;
 		} else {
-			set kvm_point,kvm_point + 1;
+			++kvm_point;
 			mes "[KVM Officer]";
 			mes "I am so sorry.";
 			mes "I wish you better luck next time.";
@@ -417,7 +415,7 @@ bat_c03,148,53,1	script	KVM Officer#KVM03B	4_M_CRU_HEAD,{
 			close2;
 		}
 		bg_leave;
-		set Bat_Team,0;
+		Bat_Team = 0;
 		warp "bat_room",154,150;
 		end;
 	}
diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt
index fa14455d6..ed6190690 100644
--- a/npc/battleground/kvm/kvm_item_pay.txt
+++ b/npc/battleground/kvm/kvm_item_pay.txt
@@ -18,9 +18,9 @@
 
 bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 	if (countitem(7773)) {
-		set .@pointstoadd,countitem(7773);
+		.@pointstoadd = countitem(7773);
 		delitem 7773,.@pointstoadd;
-		set kvm_point,kvm_point+.@pointstoadd;
+		kvm_point += .@pointstoadd;
 		mes "[Logistics]";
 		mes "Are those "+getitemname(7773)+"s I see?";
 		mes "We no longer accept that currency,";
@@ -45,7 +45,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 	mes "be reversed. Please be carefull.";
 	mes "Select the next step please.";
 	next;
-	set .@name$,strcharinfo(0);
+	.@name$ = strcharinfo(0);
 	switch(select("Read the KVM Catalogue.:Purchase KVM Items.:Confirm KVM Points.:Explanation of KVM Rewards.:Explanation of KVM Points.")) {
 	case 1:
 		mes "[Logistics]";
@@ -283,7 +283,7 @@ PurchaseItem:
 		break;
 	case 2:
 		if (kvm_point >= .@prices[getarg(1)]) {
-			set kvm_point,kvm_point-.@prices[getarg(1)];
+			kvm_point -= .@prices[getarg(1)];
 			getitem getarg(0),1;
 			mes "[Logistics]";
 			mes "You have purchased a "+getitemname(getarg(0))+".";