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

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

9 files changed, 277 insertions, 283 deletions

diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt
index 81d41513e..abed7c5a0 100644
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -245,21 +245,21 @@ bat_room,148,150,5	script	Teleporter#Battlefield	4_F_TELEPORTER,{
 		close2;
 		getmapxy(.@mapname$,.@x,.@y,1);
 		if (.@mapname$ == "prontera")
-			set bat_return,1;
+			bat_return = 1;
 		else if (.@mapname$ == "moc_ruins")
-			set bat_return,2;
+			bat_return = 2;
 		else if (.@mapname$ == "aldebaran")
-			set bat_return,3;
+			bat_return = 3;
 		else if (.@mapname$ == "geffen")
-			set bat_return,4;
+			bat_return = 4;
 		else if (.@mapname$ == "payon")
-			set bat_return,5;
+			bat_return = 5;
 		else if (.@mapname$ == "lighthalzen")
-			set bat_return,6;
+			bat_return = 6;
 		else if (.@mapname$ == "rachel")
-			set bat_return,7;
+			bat_return = 7;
 		else
-			set bat_return,1;
+			bat_return = 1;
 		warp "bat_room",154,150;
 		break;
 	case 2:
@@ -324,7 +324,7 @@ bat_room,138,144,4	script	Repairman#bg	4_M_04,{
 // GM Management NPC
 //============================================================
 bat_room,1,151,3	script	Switch#batgnd	4_DOG01,{
-	set .@i, callfunc("F_GM_NPC",1854,0);
+	.@i = callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "The command has been cancelled.";
 		close;
@@ -432,11 +432,11 @@ bat_room,160,150,3	script	Erundek	4_M_MANAGER,{
 				setarray .@Weapons[0],13108,7828,13171,7829,13172,7828,13173,7829,13174,7829;
 				break;
 			}
-			set .@menu$,"";
-			for(set .@i,0; .@i<getarraysize(.@Weapons); set .@i,.@i+2)
-				set .@menu$, .@menu$+getitemname(.@Weapons[.@i])+((.@Weapons[.@i+1]==7828)?"(BB)":"(VB)")+":";
-			set .@i, (select(.@menu$)-1)*2;
-			set .@type$, ((.@Weapons[.@i+1]==7828)?"(BB)":"(VB)");
+			.@menu$ = "";
+			for (.@i = 0; .@i < getarraysize(.@Weapons); .@i += 2)
+				.@menu$ += getitemname(.@Weapons[.@i])+((.@Weapons[.@i+1]==7828)?"(BB)":"(VB)")+":";
+			.@i = (select(.@menu$)-1)*2;
+			.@type$ = ((.@Weapons[.@i+1]==7828)?"(BB)":"(VB)");
 			mes "[Erundek]";
 			mes "You chose ^3131FF"+getitemname(.@Weapons[.@i])+.@type$+"^000000.";
 			mes "You can exchange for this item with ^FF0000100 "+getitemname(.@Weapons[.@i+1])+"^000000.";
@@ -490,7 +490,7 @@ bat_room,160,150,3	script	Erundek	4_M_MANAGER,{
 			mes "You can exchange the Medal of Honors with your Badges according to the job classes, as follows:";
 			next;
 			setarray .@items[0],2733,500,2720,500,2721,500,2722,500,2723,500,2724,500,2725,500;
-			set .@menu1$,"Gunslinger:Swordman/Taekwon Master:Thief:Acolyte:Magician:Archer:Merchant";
+			.@menu1$ = "Gunslinger:Swordman/Taekwon Master:Thief:Acolyte:Magician:Archer:Merchant";
 			break;
 		case 4:
 			mes "[Erundek]";
@@ -508,11 +508,11 @@ bat_room,160,150,3	script	Erundek	4_M_MANAGER,{
 		readbook 11010,1;
 		end;
 	}
-	set .@menu$,"";
-	if (.@menu1$ != "") set .@menu$, .@menu1$;
-	else for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+2)
-		set .@menu$, .@menu$+getitemname(.@items[.@i])+":";
-	set .@i, (select(.@menu$)-1)*2;
+	.@menu$ = "";
+	if (.@menu1$ != "") .@menu$ = .@menu1$;
+	else for (.@i = 0; .@i < getarraysize(.@items); .@i += 2)
+		.@menu$ += getitemname(.@items[.@i])+":";
+	.@i = (select(.@menu$)-1)*2;
 	mes "[Erundek]";
 	mes "You chose ^3131FF"+getitemname(.@items[.@i])+"^000000.";
 	switch(.@items[.@i]) {
@@ -543,13 +543,13 @@ bat_room,160,150,3	script	Erundek	4_M_MANAGER,{
 			mes "Remember, Battleground Reward Items are ^FF0000Character Bound^000000. Are you sure you want this item?";
 			next;
 		}
-		set .@j, select("Bravery Badge:Valor Badge:Cancel");
+		.@j = select("Bravery Badge:Valor Badge:Cancel");
 		mes "[Erundek]";
 		if (.@j == 3) {
 			mes "You cancelled the exchange.";
 			break;
 		}
-		set .@cost, ((.@j==1)?7828:7829);
+		.@cost = ((.@j==1)?7828:7829);
 		if (countitem(.@cost) >= .@items[.@i+1]) {
 			mes "Thank you for exchanging.";
 			delitem .@cost, .@items[.@i+1];
diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt
index a02752d52..5fc1de8f5 100644
--- a/npc/battleground/flavius/flavius01.txt
+++ b/npc/battleground/flavius/flavius01.txt
@@ -26,7 +26,7 @@ OnInit:
 	waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
 	end;
 OnEnterBG:
-	set $@FlaviusBG1_id1, waitingroom2bg("bat_b01",10,290,"start#bat_b01::OnGuillaumeQuit","");
+	$@FlaviusBG1_id1 = waitingroom2bg("bat_b01",10,290,"start#bat_b01::OnGuillaumeQuit","");
 	end;
 }
 
@@ -36,7 +36,7 @@ OnInit:
 	waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
 	end;
 OnEnterBG:
-	set $@FlaviusBG1_id2, waitingroom2bg("bat_b01",390,10,"start#bat_b01::OnCroixQuit","");
+	$@FlaviusBG1_id2 = waitingroom2bg("bat_b01",390,10,"start#bat_b01::OnCroixQuit","");
 	end;
 }
 
@@ -58,11 +58,11 @@ OnStop:
 OnTimer1000:
 	stopnpctimer;
 	initnpctimer;
-	set .@chk_bat_a01,getmapusers("bat_b01");
+	.@chk_bat_a01 = getmapusers("bat_b01");
 	if (.@chk_bat_a01 < 1) {
-		set $@FlaviusBG1, 0;
-		if( $@FlaviusBG1_id1 ) { bg_destroy $@FlaviusBG1_id1; set $@FlaviusBG1_id1, 0; }
-		if( $@FlaviusBG1_id2 ) { bg_destroy $@FlaviusBG1_id2; set $@FlaviusBG1_id2, 0; }
+		$@FlaviusBG1 = 0;
+		if( $@FlaviusBG1_id1 ) { bg_destroy $@FlaviusBG1_id1; $@FlaviusBG1_id1 = 0; }
+		if( $@FlaviusBG1_id2 ) { bg_destroy $@FlaviusBG1_id2; $@FlaviusBG1_id2 = 0; }
 		donpcevent "start#bat_b01::OnReadyCheck";
 	}
 	end;
@@ -79,18 +79,18 @@ OnInit:
 OnReadyCheck:
 	if( $@FlaviusBG1 )
 		end;
-	set .@Guillaume, getwaitingroomstate(0,"Lieutenant Ator");
-	set .@Croix, getwaitingroomstate(0,"Lieutenant Thelokus");
+	.@Guillaume = getwaitingroomstate(0,"Lieutenant Ator");
+	.@Croix = getwaitingroomstate(0,"Lieutenant Thelokus");
 	if( !.@Guillaume && !.@Croix ) {
 		donpcevent "#bat_b01_timer::OnStop";
 		end;
 	}
 	if( .@Guillaume < 10 || .@Croix < 10 )
 		end;
-	set $@FlaviusBG1, 1;
-	set $@FlaviusBG1_Victory, 0;
-	set $@Croix_ScoreBG1, 0;
-	set $@Guill_ScoreBG1, 0;
+	$@FlaviusBG1 = 1;
+	$@FlaviusBG1_Victory = 0;
+	$@Croix_ScoreBG1 = 0;
+	$@Guill_ScoreBG1 = 0;
 	bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1;
 
 	donpcevent "Lieutenant Ator::OnEnterBG";
@@ -160,14 +160,14 @@ OnMyMobDead:
 	if (mobcount("bat_b01","OBJ#bat_b01_a::OnMyMobDead") < 1) {
 		mapannounce "bat_b01", "Guillaume's Crystal has been destroyed.",bc_map,"0xFFCE00";
 		if ($@Croix_ScoreBG1 > 0) {
-			set $@FlaviusBG1_Victory,2;
-			set $@Croix_ScoreBG1,$@Croix_ScoreBG1+1;
+			$@FlaviusBG1_Victory = 2;
+			++$@Croix_ScoreBG1;
 			enablenpc "Guillaume Vintenar#b01_a";
 			enablenpc "Croix Vintenar#b01_b";
 			donpcevent "time#bat_b01::OnStop";
 		}
 		else {
-			set $@Croix_ScoreBG1,1;
+			$@Croix_ScoreBG1 = 1;
 			donpcevent "time#bat_b01::OnEnable";
 			donpcevent "start#bat_b01::OnReset";
 		}
@@ -193,14 +193,14 @@ OnMyMobDead:
 	if (mobcount("bat_b01","OBJ#bat_b01_b::OnMyMobDead") < 1) {
 		mapannounce "bat_b01", "Croix's Crystal has been destroyed.",bc_map,"0xFFCE00";
 		if ($@Guill_ScoreBG1 > 0) {
-			set $@FlaviusBG1_Victory,1;
-			set $@Guill_ScoreBG1,$@Guill_ScoreBG1+1;
+			$@FlaviusBG1_Victory = 1;
+			++$@Guill_ScoreBG1;
 			enablenpc "Guillaume Vintenar#b01_a";
 			enablenpc "Croix Vintenar#b01_b";
 			donpcevent "time#bat_b01::OnStop";
 		}
 		else {
-			set $@Guill_ScoreBG1,1;
+			$@Guill_ScoreBG1 = 1;
 			donpcevent "time#bat_b01::OnEnable";
 			donpcevent "start#bat_b01::OnReset";
 		}
@@ -392,8 +392,8 @@ OnTouch:
 bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 	if ($@FlaviusBG1_id1 == getcharid(4)) {
 		if ($@FlaviusBG1_Victory == 1) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Axl Rose]";
 				mes "Blessed Guillaume!";
@@ -412,8 +412,8 @@ bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
 				mes "You lost, but you're dedicated to this battle.";
@@ -444,8 +444,8 @@ OnInit:
 bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 	if ($@FlaviusBG1_id2 == getcharid(4)) {
 		if ($@FlaviusBG1_Victory == 2) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Swandery]";
 				mes "Blessed Croix!";
@@ -464,8 +464,8 @@ bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
 				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
@@ -574,11 +574,11 @@ bat_b01,336,139,3	script	Croix Camp#flag30	1_FLAG_EAGLE,{ end; }
 bat_b01,389,16,3	script	Croix Camp#flag31	1_FLAG_EAGLE,{ end; }
 
 bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
-	set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
+	.@A_B_gap = $@Guill_ScoreBG1 - $@Croix_ScoreBG1;
 	if ($@FlaviusBG1_id1 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Axl Rose]";
 				mes "Blessed Guillaume!";
@@ -597,8 +597,8 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 			}
 		}
 		else if (.@A_B_gap == 0) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
 				mes "You lost, but you're dedicated to this battle.";
@@ -617,8 +617,8 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
 				mes "You lost, but you're dedicated to this battle.";
@@ -652,11 +652,11 @@ OnInit:
 }
 
 bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
-	set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
+	.@A_B_gap = $@Guill_ScoreBG1 - $@Croix_ScoreBG1;
 	if ($@FlaviusBG1_id2 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
 				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
@@ -675,8 +675,8 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 			}
 		}
 		else if (.@A_B_gap == 0) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
 				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
@@ -695,8 +695,8 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Swandery]";
 				mes "Blessed Croix!";
@@ -730,7 +730,7 @@ OnInit:
 }
 
 bat_b01,1,10,3	script	Release all#b01	4_DOG01,{
-	set .@i, callfunc("F_GM_NPC",1854,0);
+	.@i = callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "Cancelled.";
 		close;
diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt
index 79b7b5168..42a0abc42 100644
--- a/npc/battleground/flavius/flavius02.txt
+++ b/npc/battleground/flavius/flavius02.txt
@@ -27,7 +27,7 @@ OnInit:
 	waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
 	end;
 OnEnterBG:
-	set $@FlaviusBG2_id1, waitingroom2bg("bat_b02",10,290,"start#bat_b02::OnGuillaumeQuit","");
+	$@FlaviusBG2_id1 = waitingroom2bg("bat_b02",10,290,"start#bat_b02::OnGuillaumeQuit","");
 	end;
 }
 
@@ -37,7 +37,7 @@ OnInit:
 	waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
 	end;
 OnEnterBG:
-	set $@FlaviusBG2_id2, waitingroom2bg("bat_b02",390,10,"start#bat_b02::OnCroixQuit","");
+	$@FlaviusBG2_id2 = waitingroom2bg("bat_b02",390,10,"start#bat_b02::OnCroixQuit","");
 	end;
 }
 
@@ -59,11 +59,11 @@ OnStop:
 OnTimer1000:
 	stopnpctimer;
 	initnpctimer;
-	set .@chk_bat_a01,getmapusers("bat_b02");
+	.@chk_bat_a01 = getmapusers("bat_b02");
 	if (.@chk_bat_a01 < 1) {
-		set $@FlaviusBG2, 0;
-		if( $@FlaviusBG2_id1 ) { bg_destroy $@FlaviusBG2_id1; set $@FlaviusBG2_id1, 0; }
-		if( $@FlaviusBG2_id2 ) { bg_destroy $@FlaviusBG2_id2; set $@FlaviusBG2_id2, 0; }
+		$@FlaviusBG2 = 0;
+		if( $@FlaviusBG2_id1 ) { bg_destroy $@FlaviusBG2_id1; $@FlaviusBG2_id1 = 0; }
+		if( $@FlaviusBG2_id2 ) { bg_destroy $@FlaviusBG2_id2; $@FlaviusBG2_id2 = 0; }
 		donpcevent "start#bat_b02::OnReadyCheck";
 	}
 	end;
@@ -80,18 +80,18 @@ OnInit:
 OnReadyCheck:
 	if( $@FlaviusBG2 )
 		end;
-	set .@Guillaume, getwaitingroomstate(0,"Lieutenant Huvas");
-	set .@Croix, getwaitingroomstate(0,"Lieutenant Yukon");
+	.@Guillaume = getwaitingroomstate(0,"Lieutenant Huvas");
+	.@Croix = getwaitingroomstate(0,"Lieutenant Yukon");
 	if( !.@Guillaume && !.@Croix ) {
 		donpcevent "#bat_b02_timer::OnStop";
 		end;
 	}
 	if( .@Guillaume < 10 || .@Croix < 10 )
 		end;
-	set $@FlaviusBG2, 1;
-	set $@FlaviusBG2_Victory, 0;
-	set $@Croix_ScoreBG2, 0;
-	set $@Guill_ScoreBG2, 0;
+	$@FlaviusBG2 = 1;
+	$@FlaviusBG2_Victory = 0;
+	$@Croix_ScoreBG2 = 0;
+	$@Guill_ScoreBG2 = 0;
 
 	bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
 	donpcevent "Lieutenant Huvas::OnEnterBG";
@@ -161,14 +161,14 @@ OnMyMobDead:
 	if (mobcount("bat_b02","OBJ#bat_b02_a::OnMyMobDead") < 1) {
 		mapannounce "bat_b02", "Guillaume's Crystal has been destroyed.",bc_map,"0xFFCE00";
 		if ($@Croix_ScoreBG2 > 0) {
-			set $@FlaviusBG2_Victory,2;
-			set $@Croix_ScoreBG2,$@Croix_ScoreBG2+1;
+			$@FlaviusBG2_Victory = 2;
+			$@Croix_ScoreBG2 = $@Croix_ScoreBG2+1;
 			enablenpc "Guillaume Vintenar#b02_a";
 			enablenpc "Croix Vintenar#b02_b";
 			donpcevent "time#bat_b02::OnStop";
 		}
 		else {
-			set $@Croix_ScoreBG2,1;
+			$@Croix_ScoreBG2 = 1;
 			donpcevent "time#bat_b02::OnEnable";
 			donpcevent "start#bat_b02::OnReset";
 		}
@@ -194,14 +194,14 @@ OnMyMobDead:
 	if (mobcount("bat_b02","OBJ#bat_b02_b::OnMyMobDead") < 1) {
 		mapannounce "bat_b02", "Croix's Crystal has been destroyed.",bc_map,"0xFFCE00";
 		if ($@Guill_ScoreBG2 > 0) {
-			set $@FlaviusBG2_Victory,1;
-			set $@Guill_ScoreBG2,$@Guill_ScoreBG2+1;
+			$@FlaviusBG2_Victory = 1;
+			++$@Guill_ScoreBG2;
 			enablenpc "Guillaume Vintenar#b02_a";
 			enablenpc "Croix Vintenar#b02_b";
 			donpcevent "time#bat_b02::OnStop";
 		}
 		else {
-			set $@Guill_ScoreBG2,1;
+			$@Guill_ScoreBG2 = 1;
 			donpcevent "time#bat_b02::OnEnable";
 			donpcevent "start#bat_b02::OnReset";
 		}
@@ -393,8 +393,8 @@ OnTouch:
 bat_b02,10,294,3	script	Guillaume Vintenar#b02_a	4_M_RASWORD,{
 	if ($@FlaviusBG2_id1 == getcharid(4)) {
 		if ($@FlaviusBG2_Victory == 1) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Axl Rose]";
 				mes "Blessed Guillaume!";
@@ -413,8 +413,8 @@ bat_b02,10,294,3	script	Guillaume Vintenar#b02_a	4_M_RASWORD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
 				mes "You lost, but you're dedicated to this battle.";
@@ -445,8 +445,8 @@ OnInit:
 bat_b02,389,14,3	script	Croix Vintenar#b02_b	4_M_RASWORD,{
 	if ($@FlaviusBG2_id2 == getcharid(4)) {
 		if ($@FlaviusBG2_Victory == 2) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Swandery]";
 				mes "Blessed Croix!";
@@ -465,8 +465,8 @@ bat_b02,389,14,3	script	Croix Vintenar#b02_b	4_M_RASWORD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
 				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
@@ -575,11 +575,11 @@ bat_b02,336,139,3	script	Croix Camp#flag41	1_FLAG_EAGLE,{ end; }
 bat_b02,389,16,3	script	Croix Camp#flag42	1_FLAG_EAGLE,{ end; }
 
 bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
-	set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2;
+	.@A_B_gap = $@Guill_ScoreBG2 - $@Croix_ScoreBG2;
 	if ($@FlaviusBG2_id1 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Axl Rose]";
 				mes "Blessed Guillaume!";
@@ -598,8 +598,8 @@ bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
 			}
 		}
 		else if (.@A_B_gap == 0) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
 				mes "You lost, but you're dedicated to this battle.";
@@ -618,8 +618,8 @@ bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
 				mes "You lost, but you're dedicated to this battle.";
@@ -653,11 +653,11 @@ OnInit:
 }
 
 bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
-	set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2;
+	.@A_B_gap = $@Guill_ScoreBG2 - $@Croix_ScoreBG2;
 	if ($@FlaviusBG2_id2 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
 				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
@@ -676,8 +676,8 @@ bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
 			}
 		}
 		else if (.@A_B_gap == 0) {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
 				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
@@ -696,8 +696,8 @@ bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
-			set .@medal_gap,500 - .@your_medal;
+			.@your_medal = countitem(7829);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Swandery]";
 				mes "Blessed Croix!";
@@ -731,7 +731,7 @@ OnInit:
 }
 
 bat_b02,1,10,3	script	Release all#b02	4_DOG01,{
-	set .@i, callfunc("F_GM_NPC",1854,0);
+	.@i = callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "Cancelled.";
 		close;
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))+".";
diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt
index 2a6d5991a..20f0fe096 100644
--- a/npc/battleground/tierra/tierra01.txt
+++ b/npc/battleground/tierra/tierra01.txt
@@ -28,7 +28,7 @@ OnInit:
 	end;
 
 OnEnterBG:
-	set $@TierraBG1_id1, waitingroom2bg("bat_a01",50,374,"start#bat_a01::OnGuillaumeQuit","");
+	$@TierraBG1_id1 = waitingroom2bg("bat_a01",50,374,"start#bat_a01::OnGuillaumeQuit","");
 	end;
 }
 
@@ -40,7 +40,7 @@ OnInit:
 	end;
 
 OnEnterBG:
-	set $@TierraBG1_id2, waitingroom2bg("bat_a01",42,16,"start#bat_a01::OnCroixQuit","");
+	$@TierraBG1_id2 = waitingroom2bg("bat_a01",42,16,"start#bat_a01::OnCroixQuit","");
 	end;
 }
 
@@ -59,11 +59,11 @@ OnStop:
 OnTimer1000:
 	stopnpctimer;
 	initnpctimer;
-	set .@chk_bat_a01,getmapusers("bat_a01");
+	.@chk_bat_a01 = getmapusers("bat_a01");
 	if (.@chk_bat_a01 < 1) {
-		set $@TierraBG1,0; set $@TierraBG1_Victory, 0;
-		if( $@TierraBG1_id1 ) { bg_destroy $@TierraBG1_id1; set $@TierraBG1_id1, 0; }
-		if( $@TierraBG1_id2 ) { bg_destroy $@TierraBG1_id2; set $@TierraBG1_id2, 0; }
+		$@TierraBG1 = 0; $@TierraBG1_Victory = 0;
+		if( $@TierraBG1_id1 ) { bg_destroy $@TierraBG1_id1; $@TierraBG1_id1 = 0; }
+		if( $@TierraBG1_id2 ) { bg_destroy $@TierraBG1_id2; $@TierraBG1_id2 = 0; }
 		donpcevent "start#bat_a01::OnReadyCheck";
 	}
 	end;
@@ -127,15 +127,15 @@ OnCroixQuit:
 OnReadyCheck:
 	if( $@TierraBG1 )
 		end;
-	set .@Guillaume, getwaitingroomstate(0,"Lieutenant Kalos");
-	set .@Croix, getwaitingroomstate(0,"Lieutenant Eyor");
+	.@Guillaume = getwaitingroomstate(0,"Lieutenant Kalos");
+	.@Croix = getwaitingroomstate(0,"Lieutenant Eyor");
 	if( !.@Guillaume && !.@Croix ) {
 		donpcevent "#bat_a01_timer::OnStop";
 		end;
 	}
 	else if( .@Guillaume < 10 || .@Croix < 10 )
 		end;
-	set $@TierraBG1,1;
+	$@TierraBG1 = 1;
 	donpcevent "Lieutenant Kalos::OnEnterBG";
 	donpcevent "Lieutenant Eyor::OnEnterBG";
 	donpcevent "start#bat_a01::OnEnable";
@@ -163,7 +163,7 @@ OnMyMobDead:
 	if (mobcount("bat_a01","OBJ#bat_a01_a::OnMyMobDead") < 1) {
 		donpcevent "Battle Therapist#a01_a::OnStop";
 		donpcevent "Battle Therapist#a01_b::OnStop";
-		set $@TierraBG1_Victory, 2;
+		$@TierraBG1_Victory = 2;
 		enablenpc "Guillaume Vintenar#a01_a";
 		enablenpc "Croix Vintenar#a01_b";
 		mapannounce "bat_a01", "Croix Vintenar Swandery: We destroyed Guillaume's Food Storage. We won that! Wow!",bc_map,"0xFFCE00";
@@ -186,7 +186,7 @@ OnMyMobDead:
 	if (mobcount("bat_a01","OBJ#bat_a01_b::OnMyMobDead") < 1) {
 		donpcevent "Battle Therapist#a01_a::OnStop";
 		donpcevent "Battle Therapist#a01_b::OnStop";
-		set $@TierraBG1_Victory, 1;
+		$@TierraBG1_Victory = 1;
 		enablenpc "Guillaume Vintenar#a01_a";
 		enablenpc "Croix Vintenar#a01_b";
 		mapannounce "bat_a01", "Guillaume Vintenar Axl Rose : We destroyed Croix's Food Storage. We won that! Wow!",bc_map,"0xFFCE00";
@@ -198,7 +198,7 @@ OnMyMobDead:
 
 bat_a01,15,18,3	script	barricade#bat_a01_a	CLEAR_NPC,{
 OnEnable:
-	for( set .@i,185; .@i < 202; set .@i,.@i+1 )
+	for (.@i = 185; .@i < 202; ++.@i)
 		bg_monster $@TierraBG1_id1,"bat_a01",.@i,266,"Barricade",1906,"barricade#bat_a01_a::OnMyMobDead";
 	setwall "bat_a01",186,266,16,6,1,"bat_a01_c1";
 	end;
@@ -220,7 +220,7 @@ OnMyMobDead:
 
 bat_a01,15,19,3	script	barricade#bat_a01_b	CLEAR_NPC,{
 OnEnable:
-	for( set .@i,169; .@i < 186; set .@i,.@i+1 )
+	for (.@i = 169; .@i < 186; ++.@i)
 		bg_monster $@TierraBG1_id2,"bat_a01",.@i,129,"Barricade",1906,"barricade#bat_a01_b::OnMyMobDead";
 	setwall "bat_a01",170,129,16,6,1,"bat_a01_g1";
 	end;
@@ -681,8 +681,8 @@ 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);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
 				mes "Blessed Guillaume!";
@@ -701,8 +701,8 @@ bat_a01,53,377,3	script	Guillaume Vintenar#a01_a	4_M_KY_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 0) {
 				mes "[Axl Rose]";
 				mes "You lost, but you're dedicated to this battle.";
@@ -723,8 +723,8 @@ bat_a01,53,377,3	script	Guillaume Vintenar#a01_a	4_M_KY_HEAD,{
 	}
 	else {
 		if ($@TierraBG1_Victory == 2) {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 0) {
 				mes "[Axl Rose]";
 				mes "You lost, but you're dedicated to this battle.";
@@ -743,8 +743,8 @@ bat_a01,53,377,3	script	Guillaume Vintenar#a01_a	4_M_KY_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
 				mes "Blessed Guillaume!";
@@ -775,8 +775,8 @@ OnInit:
 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);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
 				mes "Blessed Croix!";
@@ -795,8 +795,8 @@ bat_a01,45,19,3	script	Croix Vintenar#a01_b	4_M_CRU_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 0) {
 				mes "[Swandery]";
 				mes "Oh, "+strcharinfo(0)+" Don't be sad.";
@@ -817,8 +817,8 @@ bat_a01,45,19,3	script	Croix Vintenar#a01_b	4_M_CRU_HEAD,{
 	}
 	else {
 		if ($@TierraBG1_Victory == 1) {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 0) {
 				mes "[Swandery]";
 				mes "Oh, "+strcharinfo(0)+" Don't be sad.";
@@ -837,8 +837,8 @@ bat_a01,45,19,3	script	Croix Vintenar#a01_b	4_M_CRU_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
 				mes "Blessed Croix!";
@@ -922,7 +922,7 @@ bat_a01,356,326,3	script	Guillaume Camp Soldier#bat_a01_guide	4_M_RASWORD,{
 */
 
 bat_a01,1,1,3	script	Release all#a01	4_DOG01,{
-	set .@i, callfunc("F_GM_NPC",1854,0);
+	.@i = callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "Cancelled.";
 		close;
diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt
index 129d0ee3e..c79b20845 100644
--- a/npc/battleground/tierra/tierra02.txt
+++ b/npc/battleground/tierra/tierra02.txt
@@ -27,7 +27,7 @@ OnInit:
 	end;
 
 OnEnterBG:
-	set $@TierraBG2_id1, waitingroom2bg("bat_a02",50,374,"start#bat_a02::OnGuillaumeQuit","");
+	$@TierraBG2_id1 = waitingroom2bg("bat_a02",50,374,"start#bat_a02::OnGuillaumeQuit","");
 	end;
 }
 
@@ -39,7 +39,7 @@ OnInit:
 	end;
 
 OnEnterBG:
-	set $@TierraBG2_id2, waitingroom2bg("bat_a02",42,16,"start#bat_a02::OnCroixQuit","");
+	$@TierraBG2_id2 = waitingroom2bg("bat_a02",42,16,"start#bat_a02::OnCroixQuit","");
 	end;
 }
 
@@ -58,11 +58,11 @@ OnStop:
 OnTimer1000:
 	stopnpctimer;
 	initnpctimer;
-	set .@chk_bat_a02,getmapusers("bat_a02");
+	.@chk_bat_a02 = getmapusers("bat_a02");
 	if (.@chk_bat_a02 < 1) {
-		set $@TierraBG2,0; set $@TierraBG2_Victory, 0;
-		if( $@TierraBG2_id1 ) { bg_destroy $@TierraBG2_id1; set $@TierraBG2_id1, 0; }
-		if( $@TierraBG2_id2 ) { bg_destroy $@TierraBG2_id2; set $@TierraBG2_id2, 0; }
+		$@TierraBG2 = 0; $@TierraBG2_Victory = 0;
+		if( $@TierraBG2_id1 ) { bg_destroy $@TierraBG2_id1; $@TierraBG2_id1 = 0; }
+		if( $@TierraBG2_id2 ) { bg_destroy $@TierraBG2_id2; $@TierraBG2_id2 = 0; }
 		donpcevent "start#bat_a02::OnReadyCheck";
 	}
 	end;
@@ -126,15 +126,15 @@ OnCroixQuit:
 OnReadyCheck:
 	if( $@TierraBG2 )
 		end;
-	set .@Guillaume, getwaitingroomstate(0,"Lieutenant Rundel");
-	set .@Croix, getwaitingroomstate(0,"Lieutenant Guerrit");
+	.@Guillaume = getwaitingroomstate(0,"Lieutenant Rundel");
+	.@Croix = getwaitingroomstate(0,"Lieutenant Guerrit");
 	if( !.@Guillaume && !.@Croix ) {
 		donpcevent "#bat_a02_timer::OnStop";
 		end;
 	}
 	else if( .@Guillaume < 10 || .@Croix < 10 )
 		end;
-	set $@TierraBG2,1;
+	$@TierraBG2 = 1;
 	donpcevent "Lieutenant Rundel::OnEnterBG";
 	donpcevent "Lieutenant Guerrit::OnEnterBG";
 	donpcevent "start#bat_a02::OnEnable";
@@ -162,7 +162,7 @@ OnMyMobDead:
 	if (mobcount("bat_a02","OBJ#bat_a02_a::OnMyMobDead") < 1) {
 		donpcevent "Battle Therapist#a02_a::OnStop";
 		donpcevent "Battle Therapist#a02_b::OnStop";
-		set $@TierraBG2_Victory, 2;
+		$@TierraBG2_Victory = 2;
 		enablenpc "Guillaume Vintenar#a02_a";
 		enablenpc "Croix Vintenar#a02_b";
 		mapannounce "bat_a02", "Croix Vintenar Swandery: We destroyed Guillaume's Food Storage. We won that! Wow!",bc_map,"0xFFCE00";
@@ -185,7 +185,7 @@ OnMyMobDead:
 	if (mobcount("bat_a02","OBJ#bat_a02_b::OnMyMobDead") < 1) {
 		donpcevent "Battle Therapist#a02_a::OnStop";
 		donpcevent "Battle Therapist#a02_b::OnStop";
-		set $@TierraBG2_Victory, 1;
+		$@TierraBG2_Victory = 1;
 		enablenpc "Guillaume Vintenar#a02_a";
 		enablenpc "Croix Vintenar#a02_b";
 		mapannounce "bat_a02", "Guillaume Vintenar Axl Rose : We destroyed Croix's Food Storage. We won that! Wow!",bc_map,"0xFFCE00";
@@ -197,7 +197,7 @@ OnMyMobDead:
 
 bat_a02,15,18,3	script	barricade#bat_a02_a	CLEAR_NPC,{
 OnEnable:
-	for( set .@i,185; .@i < 202; set .@i,.@i+1 )
+	for (.@i = 185; .@i < 202; ++.@i)
 		bg_monster $@TierraBG2_id1,"bat_a02",.@i,266,"Barricade",1906,"barricade#bat_a02_a::OnMyMobDead";
 	setwall "bat_a02",186,266,16,6,1,"bat_a02_c1";
 	end;
@@ -219,7 +219,7 @@ OnMyMobDead:
 
 bat_a02,15,19,3	script	barricade#bat_a02_b	CLEAR_NPC,{
 OnEnable:
-	for( set .@i,169; .@i < 186; set .@i,.@i+1 )
+	for (.@i = 169; .@i < 186; ++.@i)
 		bg_monster $@TierraBG2_id2,"bat_a02",.@i,129,"Barricade",1906,"barricade#bat_a02_b::OnMyMobDead";
 	setwall "bat_a02",170,129,16,6,1,"bat_a02_g1";
 	end;
@@ -680,8 +680,8 @@ 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);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
 				mes "Blessed Guillaume!";
@@ -700,8 +700,8 @@ bat_a02,53,377,3	script	Guillaume Vintenar#a02_a	4_M_KY_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 0) {
 				mes "[Axl Rose]";
 				mes "You lost, but you're dedicated to this battle.";
@@ -722,8 +722,8 @@ bat_a02,53,377,3	script	Guillaume Vintenar#a02_a	4_M_KY_HEAD,{
 	}
 	else {
 		if ($@TierraBG2_Victory == 2) {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 0) {
 				mes "[Axl Rose]";
 				mes "You lost, but you're dedicated to this battle.";
@@ -742,8 +742,8 @@ bat_a02,53,377,3	script	Guillaume Vintenar#a02_a	4_M_KY_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
 				mes "Blessed Guillaume!";
@@ -774,8 +774,8 @@ OnInit:
 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);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
 				mes "Blessed Croix!";
@@ -794,8 +794,8 @@ bat_a02,45,19,3	script	Croix Vintenar#a02_b	4_M_CRU_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 0) {
 				mes "[Swandery]";
 				mes "Oh, "+strcharinfo(0)+" Don't be sad.";
@@ -816,8 +816,8 @@ bat_a02,45,19,3	script	Croix Vintenar#a02_b	4_M_CRU_HEAD,{
 	}
 	else {
 		if ($@TierraBG2_Victory == 1) {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 0) {
 				mes "[Swandery]";
 				mes "Oh, "+strcharinfo(0)+" Don't be sad.";
@@ -836,8 +836,8 @@ bat_a02,45,19,3	script	Croix Vintenar#a02_b	4_M_CRU_HEAD,{
 			}
 		}
 		else {
-			set .@your_medal,countitem(7828);
-			set .@medal_gap, 500 - .@your_medal;
+			.@your_medal = countitem(7828);
+			.@medal_gap = 500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
 				mes "Blessed Croix!";
@@ -921,7 +921,7 @@ bat_a02,356,326,3	script	Guillaume Camp Soldier#bat_a02_guide	4_M_RASWORD,{
 */
 
 bat_a02,1,1,3	script	Release all#a02	4_DOG01,{
-	set .@i, callfunc("F_GM_NPC",1854,0);
+	.@i = callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "Cancelled.";
 		close;