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

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

8 files changed, 275 insertions, 270 deletions

diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index cc0b4b640..65ed3c6e3 100644
--- a/npc/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
@@ -113,7 +113,7 @@ OnReset_09:
 -	script	Trocco#aco1	-1,{
 OnEnable:
 	initnpctimer;
-	set $@arn_1,gettimetick(2);
+	$@arn_1 = gettimetick(2);
 	end;
 
 OnTimer2000:
@@ -302,7 +302,7 @@ OnMyMobDead:
 
 force_5-1,25,69,0	script	force_02start#aco	-1,1,1,{
 OnTouch:
-	set $@drop_gate,0;
+	$@drop_gate = 0;
 	donpcevent "force_02mob#aco::OnEnable";
 	disablenpc "force_02start#aco";
 	end;
@@ -320,7 +320,7 @@ OnReset:
 
 OnMyMobDead:
 	if ((mobcount("force_5-1","force_02mob#aco::OnMyMobDead") < 11) && ($@drop_gate == 0)) {
-		set $@drop_gate,1;
+		$@drop_gate = 1;
 		donpcevent "Trocco#aco1::On02_End";
 		donpcevent "arena_aco1::OnReset_02";
 	}
@@ -482,7 +482,7 @@ OnReset:
 OnMyMobDead:
 	if (mobcount("force_5-1","force_09mob#aco::OnMyMobDead") < 1) {
 		donpcevent "Trocco#aco1::On09_End";
-		set $@arn_2,gettimetick(2);
+		$@arn_2 = gettimetick(2);
 		donpcevent "arena_aco1::OnReset_09";
 	}
 	end;
@@ -541,7 +541,7 @@ OnReset_09:
 -	script	Trocco#aco2	-1,{
 OnEnable:
 	initnpctimer;
-	set $@arn_1,gettimetick(2);
+	$@arn_1 = gettimetick(2);
 	end;
 
 OnTimer2000:
@@ -1018,7 +1018,7 @@ OnReset:
 OnMyMobDead:
 	if (mobcount("force_5-1","force_09mob#pri::OnMyMobDead") < 1) {
 		donpcevent "Trocco#aco2::On09_End";
-		set $@arn_2,gettimetick(2);
+		$@arn_2 = gettimetick(2);
 		donpcevent "arena_aco2::OnReset_09";
 	}
 	end;
@@ -1062,7 +1062,7 @@ prt_are_in,181,83,3	script	Staff#aco-1	1_F_02,{
 		next;
 	}
 	else {
-		set arena_point,arena_point+1;
+		++arena_point;
 	}
 	mes "[Staff]";
 	mes "Well, let me guide";
@@ -1076,23 +1076,23 @@ prt_are_in,181,83,3	script	Staff#aco-1	1_F_02,{
 }
 
 prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
-	set .@start_timeaco, $@arn_1;
-	set .@hour_startaco, .@start_timeaco / 10000;
-	set .@min_startaco, ((.@start_timeaco % 10000) / 100);
-	set .@sec_startaco, .@start_timeaco % 100;
-	set .@end_timeaco, $@arn_2;
-	set .@hour_endaco, .@end_timeaco / 10000;
-	set .@min_endaco, ((.@end_timeaco % 10000) / 100);
-	set .@sec_endaco, .@end_timeaco % 100;
+	.@start_timeaco = $@arn_1;
+	.@hour_startaco = .@start_timeaco / 10000;
+	.@min_startaco = ((.@start_timeaco % 10000) / 100);
+	.@sec_startaco = .@start_timeaco % 100;
+	.@end_timeaco = $@arn_2;
+	.@hour_endaco = .@end_timeaco / 10000;
+	.@min_endaco = ((.@end_timeaco % 10000) / 100);
+	.@sec_endaco = .@end_timeaco % 100;
 	if ((.@hour_startaco == 23) && (.@hour_endaco == 0)) {
-		set .@hour_endaco,24;
+		.@hour_endaco = 24;
 	}
-	set .@st_to_secaco, ((.@hour_startaco * 3600) + (.@min_startaco * 60) + (.@sec_startaco));
-	set .@et_to_secaco, ((.@hour_endaco * 3600) + (.@min_endaco * 60) + (.@sec_endaco));
-	set .@record_timeaco, (.@et_to_secaco - .@st_to_secaco);
-	set .@record_houraco, .@record_timeaco / 3600;
-	set .@record_minaco, ((.@record_timeaco % 3600) / 60);
-	set .@record_secaco, .@record_timeaco % 60;
+	.@st_to_secaco = ((.@hour_startaco * 3600) + (.@min_startaco * 60) + (.@sec_startaco));
+	.@et_to_secaco = ((.@hour_endaco * 3600) + (.@min_endaco * 60) + (.@sec_endaco));
+	.@record_timeaco = (.@et_to_secaco - .@st_to_secaco);
+	.@record_houraco = .@record_timeaco / 3600;
+	.@record_minaco = ((.@record_timeaco % 3600) / 60);
+	.@record_secaco = .@record_timeaco % 60;
 	if ((.@record_timeaco < 0 ) || (.@record_houraco < 0) || (.@record_minaco < 0 ) || (.@record_secaco < 0)) {
 		emotion e_omg;
 		mes "[Staff]";
@@ -1126,7 +1126,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 		mes "your time in the Arena~";
 		close2;
 		if (arena_point < 29981) {
-			set arena_point,arena_point+20;
+			arena_point += 20;
 			warp "arena_room",100,75;
 			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "Acolyte Waiting Room::OnStart";
@@ -1140,30 +1140,30 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 	}
 	else {
 		if (BaseJob == Job_Acolyte) {
-			set .@acotop_t,$arn_acotop;
-			set .@acotop_n$,$arn_acotopn$;
+			.@acotop_t = $arn_acotop;
+			.@acotop_n$ = $arn_acotopn$;
 		}
 		else {
 			if (BaseLevel < 70) {
-				set .@acotop_t,$arn_pritop60;
-				set .@acotop_n$,$arn_pritopn60$;
+				.@acotop_t = $arn_pritop60;
+				.@acotop_n$ = $arn_pritopn60$;
 			}
 			else if (BaseLevel < 80) {
-				set .@acotop_t,$arn_pritop70;
-				set .@acotop_n$,$arn_pritopn70$;
+				.@acotop_t = $arn_pritop70;
+				.@acotop_n$ = $arn_pritopn70$;
 			}
 			else if (BaseLevel < 90) {
-				set .@acotop_t,$arn_pritop80;
-				set .@acotop_n$,$arn_pritopn80$;
+				.@acotop_t = $arn_pritop80;
+				.@acotop_n$ = $arn_pritopn80$;
 			}
 			else {
-				set .@acotop_t,$arn_pritop90;
-				set .@acotop_n$,$arn_pritopn90$;
+				.@acotop_t = $arn_pritop90;
+				.@acotop_n$ = $arn_pritopn90$;
 			}
 		}
-		set .@topbunaco, ((.@acotop_t % 3600) / 60);
-		set .@topchoaco, .@acotop_t % 60;
-		set .@gapaco, .@acotop_t - .@record_timeaco;
+		.@topbunaco = ((.@acotop_t % 3600) / 60);
+		.@topchoaco = .@acotop_t % 60;
+		.@gapaco = .@acotop_t - .@record_timeaco;
 		mes "[Staff]";
 		mes "^3131FF"+strcharinfo(0)+"^000000, right?";
 		mes "Hey, you did great! You";
@@ -1196,26 +1196,26 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 			mes "under the Time Force Battle";
 			mes "Arena - Acolyte Class Record!";
 			if (BaseJob == Job_Acolyte) {
-				set $arn_acotop,.@record_timeaco;
-				set $arn_acotopn$, strcharinfo(0);
+				$arn_acotop = .@record_timeaco;
+				$arn_acotopn$ = strcharinfo(0);
 				donpcevent "Vendigos::OnLineRec_aco";
 			}
 			else {
 				if (BaseLevel < 70) {
-					set $arn_pritop60,.@record_timeaco;
-					set $arn_pritopn60$, strcharinfo(0);
+					$arn_pritop60 = .@record_timeaco;
+					$arn_pritopn60$ = strcharinfo(0);
 				}
 				else if (BaseLevel < 80) {
-					set $arn_pritop70,.@record_timeaco;
-					set $arn_pritopn70$, strcharinfo(0);
+					$arn_pritop70 = .@record_timeaco;
+					$arn_pritopn70$ = strcharinfo(0);
 				}
 				else if (BaseLevel < 90) {
-					set $arn_pritop80,.@record_timeaco;
-					set $arn_pritopn80$, strcharinfo(0);
+					$arn_pritop80 = .@record_timeaco;
+					$arn_pritopn80$ = strcharinfo(0);
 				}
 				else {
-					set $arn_pritop90,.@record_timeaco;
-					set $arn_pritopn90$, strcharinfo(0);
+					$arn_pritop90 = .@record_timeaco;
+					$arn_pritopn90$ = strcharinfo(0);
 				}
 				donpcevent "Vendigos::OnLineRec_pri";
 			}
@@ -1251,7 +1251,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 				mes "Now let me guide you";
 				mes "back to the Arena Lobby...";
 				close2;
-				set arena_point,30000;
+				arena_point = 30000;
 			}
 			else {
 				mes "[Staff]";
@@ -1268,7 +1268,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 				mes "Now let me guide you";
 				mes "back to the Arena Lobby...";
 				close2;
-				set arena_point,arena_point+50;
+				arena_point += 50;
 			}
 			specialeffect2 EF_EXIT;
 			warp "arena_room",100,75;
@@ -1315,7 +1315,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 				mes "Now let me guide you";
 				mes "back to the Arena Lobby...";
 				close2;
-				set arena_point,30000;
+				arena_point = 30000;
 			}
 			else {
 				mes "[Staff]";
@@ -1332,7 +1332,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 				mes "Now let me guide you";
 				mes "back to the Arena Lobby...";
 				close2;
-				set arena_point,arena_point+20;
+				arena_point += 20;
 			}
 			specialeffect2 EF_EXIT;
 			warp "arena_room",100,75;
@@ -1355,29 +1355,29 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 			mes "Acolyte Class Records.";
 			mes "Congratulations~";
 			if (BaseJob == Job_Acolyte) {
-				set $arn_acotop,.@record_timeaco;
-				set $arn_acotopn$, strcharinfo(0);
+				$arn_acotop = .@record_timeaco;
+				$arn_acotopn$ = strcharinfo(0);
 				donpcevent "#Vendigos::OnLineRec_aco";
 			}
 			else {
 				if (BaseLevel < 70) {
-					set $arn_pritop60,.@record_timeaco;
-					set $arn_pritopn60$, strcharinfo(0);
+					$arn_pritop60 = .@record_timeaco;
+					$arn_pritopn60$ = strcharinfo(0);
 					donpcevent "#Vendigos::OnLineRec_pri60";
 				}
 				else if (BaseLevel < 80) {
-					set $arn_pritop70,.@record_timeaco;
-					set $arn_pritopn70$, strcharinfo(0);
+					$arn_pritop70 = .@record_timeaco;
+					$arn_pritopn70$ = strcharinfo(0);
 					donpcevent "#Vendigos::OnLineRec_pri70";
 				}
 				else if (BaseLevel < 90) {
-					set $arn_pritop80,.@record_timeaco;
-					set $arn_pritopn80$, strcharinfo(0);
+					$arn_pritop80 = .@record_timeaco;
+					$arn_pritopn80$ = strcharinfo(0);
 					donpcevent "#Vendigos::OnLineRec_pri80";
 				}
 				else {
-					set $arn_pritop90,.@record_timeaco;
-					set $arn_pritopn90$, strcharinfo(0);
+					$arn_pritop90 = .@record_timeaco;
+					$arn_pritopn90$ = strcharinfo(0);
 					donpcevent "#Vendigos::OnLineRec_pri90";
 				}
 			}
@@ -1413,7 +1413,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 				mes "Now let me guide you";
 				mes "back to the Arena Lobby...";
 				close2;
-				set arena_point,30000;
+				arena_point = 30000;
 			}
 			else {
 				mes "[Staff]";
@@ -1430,7 +1430,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 				mes "Now let me guide you";
 				mes "back to the Arena Lobby...";
 				close2;
-				set arena_point,arena_point+20;
+				arena_point += 20;
 			}
 			specialeffect2 EF_EXIT;
 			warp "arena_room",100,75;
@@ -1570,10 +1570,10 @@ arena_room,94,82,7	script	Arena Record Staff#aco	1_F_PRIEST,{
 	next;
 	switch(select("Acolyte Mode:Priest - Level 70 or lower:Priest - Level 80 or lower:Priest - Level 90 or lower:Priest - Level 91 ~ "+(checkre(0)?"160":"99"))) {
 	case 1:
-		set .@acotop_t,$arn_acotop;
-		set .@acotop_n$,$arn_acotopn$;
-		set .@acotopbun, ((.@acotop_t % 3600) / 60 );
-		set .@acotopcho, (.@acotop_t % 60);
+		.@acotop_t = $arn_acotop;
+		.@acotop_n$ = $arn_acotopn$;
+		.@acotopbun = ((.@acotop_t % 3600) / 60 );
+		.@acotopcho = (.@acotop_t % 60);
 		mes "[Mathea]";
 		mes "^3131FF"+.@acotop_n$+"^000000";
 		mes "is the top player of the";
@@ -1583,24 +1583,24 @@ arena_room,94,82,7	script	Arena Record Staff#aco	1_F_PRIEST,{
 		mes "for participating in the Arena.";
 		close;
 	case 2:
-		set .@pritop_t,$arn_pritop60;
-		set .@pritop_n$,$arn_pritopn60$;
+		.@pritop_t = $arn_pritop60;
+		.@pritop_n$ = $arn_pritopn60$;
 		break;
 	case 3:
-		set .@pritop_t,$arn_pritop70;
-		set .@pritop_n$,$arn_pritopn70$;
+		.@pritop_t = $arn_pritop70;
+		.@pritop_n$ = $arn_pritopn70$;
 		break;
 	case 4:
-		set .@pritop_t,$arn_pritop80;
-		set .@pritop_n$,$arn_pritopn80$;
+		.@pritop_t = $arn_pritop80;
+		.@pritop_n$ = $arn_pritopn80$;
 		break;
 	case 5:
-		set .@pritop_t,$arn_pritop90;
-		set .@pritop_n$,$arn_pritopn90$;
+		.@pritop_t = $arn_pritop90;
+		.@pritop_n$ = $arn_pritopn90$;
 		break;
 	}
-	set .@pritopbun, ((.@pritop_t % 3600) / 60 );
-	set .@pritopcho, (.@pritop_t % 60);
+	.@pritopbun = ((.@pritop_t % 3600) / 60 );
+	.@pritopcho = (.@pritop_t % 60);
 	mes "[Mathea]";
 	mes "^3131FF"+.@pritop_n$+"^000000";
 	mes "is the top player of this";
@@ -1612,16 +1612,16 @@ arena_room,94,82,7	script	Arena Record Staff#aco	1_F_PRIEST,{
 
 OnInit:
 	if ($arn_acotopn$ == "") {
-		set $arn_pritop60, 480;
-		set $arn_pritop70, 480;
-		set $arn_pritop80, 480;
-		set $arn_pritop90, 480;
-		set $arn_acotop, 480;
-		set $arn_pritopn60$, "Default";
-		set $arn_pritopn70$, "Default";
-		set $arn_pritopn80$, "Default";
-		set $arn_pritopn90$, "Default";
-		set $arn_acotopn$, "Default";
+		$arn_pritop60 = 480;
+		$arn_pritop70 = 480;
+		$arn_pritop80 = 480;
+		$arn_pritop90 = 480;
+		$arn_acotop = 480;
+		$arn_pritopn60$ = "Default";
+		$arn_pritopn70$ = "Default";
+		$arn_pritopn80$ = "Default";
+		$arn_pritopn90$ = "Default";
+		$arn_acotopn$ = "Default";
 	}
 	end;
 }
@@ -1709,7 +1709,7 @@ arena_room,140,136,3	script	Guide Alias	4_F_NOVICE,{
 }
 
 arena_room,195,5,3	script	log-on-aco#arena	4_NFWISP,{
-	set .@i, callfunc("F_GM_NPC",1357,0);
+	.@i = callfunc("F_GM_NPC",1357,0);
 	if (.@i == -1) {
 		mes "^3355FFIncorrect Password.^000000";
 		close;
@@ -1728,24 +1728,24 @@ arena_room,195,5,3	script	log-on-aco#arena	4_NFWISP,{
 			mes "been canceled.^000000";
 			close;
 		case 2:
-			set $arn_acotop, 480;
-			set $arn_acotopn$, "Default";
+			$arn_acotop = 480;
+			$arn_acotopn$ = "Default";
 			break;
 		case 3:
-			set $arn_pritop60, 480;
-			set $arn_pritopn60$, "Default";
+			$arn_pritop60 = 480;
+			$arn_pritopn60$ = "Default";
 			break;
 		case 4:
-			set $arn_pritop70, 480;
-			set $arn_pritopn70$, "Default";
+			$arn_pritop70 = 480;
+			$arn_pritopn70$ = "Default";
 			break;
 		case 5:
-			set $arn_pritop80, 480;
-			set $arn_pritopn80$, "Default";
+			$arn_pritop80 = 480;
+			$arn_pritopn80$ = "Default";
 			break;
 		case 6:
-			set $arn_pritop90, 480;
-			set $arn_pritopn90$, "Default";
+			$arn_pritop90 = 480;
+			$arn_pritopn90$ = "Default";
 			break;
 		}
 		close;
@@ -1753,7 +1753,7 @@ arena_room,195,5,3	script	log-on-aco#arena	4_NFWISP,{
 }
 
 arena_room,195,10,3	script	acolink#arena	4_NFWISP,{
-	set .@i, callfunc("F_GM_NPC",1357,0);
+	.@i = callfunc("F_GM_NPC",1357,0);
 	if (.@i == -1) {
 		mes "Command has";
 		mes "been canceled.";
diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index e1e98d3b2..9c91c684c 100644
--- a/npc/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
@@ -37,8 +37,8 @@ force_1-1,99,20,4	script	Heel and Toe#arena	4_F_TELEPORTER,{
 
 OnStart:
 	initnpctimer;
-	set $arena_min50st,gettime(2);
-	set $arena_sec50st,gettime(1);
+	$arena_min50st = gettime(2);
+	$arena_sec50st = gettime(1);
 	end;
 
 OnTimer3000:
@@ -774,8 +774,8 @@ OnMyMobDead:
 		donpcevent "Heel and Toe#arena::On09_End";
 		donpcevent "arena#50::OnReset_09";
 		donpcevent "arena#50::OnReset_All";
-		set $arena_min50end,gettime(2);
-		set $arena_sec50end,gettime(1);
+		$arena_min50end = gettime(2);
+		$arena_sec50end = gettime(1);
 	}
 	end;
 }
@@ -791,8 +791,9 @@ prt_are_in,129,188,3	script	Staff#50-1	1_F_02,{
 		mes "You already have enough arena points.";
 		mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward.";
 		next;
+	} else {
+		++arena_point;
 	}
-	else set arena_point, arena_point + 1;
 	mes "[Staff]";
 	mes "Let me guide you outside. I hope you had a good time.";
 	close2;
@@ -804,22 +805,22 @@ prt_are_in,129,188,3	script	Staff#50-1	1_F_02,{
 prt_are_in,25,188,3	script	Staff#50-2	1_F_02,{
 	if($arena_min50end < $arena_min50st) {
 		if($arena_sec50end < $arena_sec50st) {
-			set @record_min50,60 - $arena_min50st + $arena_min50end -1;
-			set @record_sec50,60 - $arena_sec50st + $arena_sec50end;
+			@record_min50 = 60 - $arena_min50st + $arena_min50end -1;
+			@record_sec50 = 60 - $arena_sec50st + $arena_sec50end;
 		} else {
-			set @record_min50,60 - $arena_min50st + $arena_min50end;
-			set @record_sec50,$arena_sec50end - $arena_sec50st;
+			@record_min50 = 60 - $arena_min50st + $arena_min50end;
+			@record_sec50 = $arena_sec50end - $arena_sec50st;
 		}
 	} else {
 		if($arena_sec50end < $arena_sec50st) {
-			set @record_min50,$arena_min50end - $arena_min50st -1;
-			set @record_sec50,60 - $arena_sec50st + $arena_sec50end;
+			@record_min50 = $arena_min50end - $arena_min50st -1;
+			@record_sec50 = 60 - $arena_sec50st + $arena_sec50end;
 		} else {
-			set @record_min50,$arena_min50end - $arena_min50st;
-			set @record_sec50,$arena_sec50end - $arena_sec50st;
+			@record_min50 = $arena_min50end - $arena_min50st;
+			@record_sec50 = $arena_sec50end - $arena_sec50st;
 		}
 	}
-	set @gap50,(60 * $top_50min + $top_50sec) - (60 * @record_min50 + @record_sec50);
+	@gap50 = (60 * $top_50min + $top_50sec) - (60 * @record_min50 + @record_sec50);
 	mes "[Staff]";
 	mes "Wow, you did a good job~ ";
 	mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?";
@@ -852,7 +853,7 @@ prt_are_in,25,188,3	script	Staff#50-2	1_F_02,{
 			mes "Thank you.";
 			close2;
 		} else {
-			set arena_point, arena_point + 20;
+			arena_point += 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
 			mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance.";
@@ -877,9 +878,9 @@ prt_are_in,25,188,3	script	Staff#50-2	1_F_02,{
 		next;
 		mes "[Staff]";
 		mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 50s^000000, ^3131FF"+strcharinfo(0)+"^000000.";
-		set $top_50min, @record_min50;
-		set $top_50sec, @record_sec50;
-		set $arena_50topn$,strcharinfo(0);
+		$top_50min = @record_min50;
+		$top_50sec = @record_sec50;
+		$arena_50topn$ = strcharinfo(0);
 		donpcevent "Vendigos::OnLineRec_50";
 		next;
 		if (arena_point > 29950) {
@@ -899,7 +900,7 @@ prt_are_in,25,188,3	script	Staff#50-2	1_F_02,{
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
 			next;
-			set arena_point, arena_point + 50;
+			arena_point += 50;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
 			mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance.";
@@ -1007,6 +1008,6 @@ OnEnable:
 	end;
 
 OnInit:
-	if(!$top_50min && !$top_50sec) set $top_50min,5;
+	if(!$top_50min && !$top_50sec) $top_50min = 5;
 	end;
 }
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index c3d33f333..51c29def1 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -38,8 +38,8 @@ force_2-1,99,20,4	script	Minilover#arena	4_F_TELEPORTER,{
 
 OnStart:
 	initnpctimer;
-	set $arena_min60st,gettime(2);
-	set $arena_sec60st,gettime(1);
+	$arena_min60st = gettime(2);
+	$arena_sec60st = gettime(1);
 	end;
 
 OnTimer3000:
@@ -784,8 +784,8 @@ OnMyMobDead:
 		donpcevent "Minilover#arena::On09_End";
 		donpcevent "arena#60::OnReset_09";
 		donpcevent "arena#60::OnReset_All";
-		set $arena_min60end,gettime(2);
-		set $arena_sec60end,gettime(1);
+		$arena_min60end = gettime(2);
+		$arena_sec60end = gettime(1);
 	}
 	end;
 }
@@ -801,8 +801,9 @@ prt_are_in,129,135,3	script	Staff#60-1	1_F_02,{
 		mes "You already have enough arena points.";
 		mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward.";
 		next;
+	} else {
+		++arena_point;
 	}
-	else set arena_point, arena_point + 1;
 	mes "[Staff]";
 	mes "Let me guide you outside. I hope you had a good time.";
 	close2;
@@ -814,22 +815,22 @@ prt_are_in,129,135,3	script	Staff#60-1	1_F_02,{
 prt_are_in,25,135,3	script	Staff#60-2	1_F_02,{
 	if($arena_min60end < $arena_min60st) {
 		if($arena_sec60end < $arena_sec60st) {
-			set @record_min60,60 - $arena_min60st + $arena_min60end -1;
-			set @record_sec60,60 - $arena_sec60st + $arena_sec60end;
+			@record_min60 = 60 - $arena_min60st + $arena_min60end -1;
+			@record_sec60 = 60 - $arena_sec60st + $arena_sec60end;
 		} else {
-			set @record_min60,60 - $arena_min60st + $arena_min60end;
-			set @record_sec60,$arena_sec60end - $arena_sec60st;
+			@record_min60 = 60 - $arena_min60st + $arena_min60end;
+			@record_sec60 = $arena_sec60end - $arena_sec60st;
 		}
 	} else {
 		if($arena_sec60end < $arena_sec60st) {
-			set @record_min60,$arena_min60end - $arena_min60st -1;
-			set @record_sec60,60 - $arena_sec60st + $arena_sec60end;
+			@record_min60 = $arena_min60end - $arena_min60st -1;
+			@record_sec60 = 60 - $arena_sec60st + $arena_sec60end;
 		} else {
-			set @record_min60,$arena_min60end - $arena_min60st;
-			set @record_sec60,$arena_sec60end - $arena_sec60st;
+			@record_min60 = $arena_min60end - $arena_min60st;
+			@record_sec60 = $arena_sec60end - $arena_sec60st;
 		}
 	}
-	set @gap60,(60 * $top_60min + $top_60sec) - (60 * @record_min60 + @record_sec60);
+	@gap60 = (60 * $top_60min + $top_60sec) - (60 * @record_min60 + @record_sec60);
 	mes "[Staff]";
 	mes "Wow, you did a good job~ ";
 	mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?";
@@ -862,7 +863,7 @@ prt_are_in,25,135,3	script	Staff#60-2	1_F_02,{
 			mes "Thank you.";
 			close2;
 		} else {
-			set arena_point, arena_point + 20;
+			arena_point += 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
 			mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance.";
@@ -887,9 +888,9 @@ prt_are_in,25,135,3	script	Staff#60-2	1_F_02,{
 		next;
 		mes "[Staff]";
 		mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 60s^000000, ^3131FF"+strcharinfo(0)+"^000000.";
-		set $top_60min, @record_min60;
-		set $top_60sec, @record_sec60;
-		set $arena_60topn$,strcharinfo(0);
+		$top_60min = @record_min60;
+		$top_60sec = @record_sec60;
+		$arena_60topn$ = strcharinfo(0);
 		donpcevent "Vendigos::OnLineRec_60";
 		next;
 		if (arena_point > 29950) {
@@ -909,7 +910,7 @@ prt_are_in,25,135,3	script	Staff#60-2	1_F_02,{
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
 			next;
-			set arena_point, arena_point + 50;
+			arena_point += 50;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
 			mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance.";
@@ -1020,6 +1021,6 @@ OnEnable:
 	end;
 
 OnInit:
-	if(!$top_60min && !$top_60sec) set $top_60min,6;
+	if(!$top_60min && !$top_60sec) $top_60min = 6;
 	end;
 }
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index e50113e74..68805437f 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -37,8 +37,8 @@ force_3-1,99,20,4	script	Cadillac#arena	4_F_TELEPORTER,{
 
 OnStart:
 	initnpctimer;
-	set $arena_min70st,gettime(2);
-	set $arena_sec70st,gettime(1);
+	$arena_min70st = gettime(2);
+	$arena_sec70st = gettime(1);
 	end;
 
 OnTimer3000:
@@ -749,8 +749,8 @@ OnMyMobDead:
 		donpcevent "Cadillac#arena::On09_End";
 		donpcevent "arena#70::OnReset_09";
 		donpcevent "arena#70::OnReset_All";
-		set $arena_min70end,gettime(2);
-		set $arena_sec70end,gettime(1);
+		$arena_min70end = gettime(2);
+		$arena_sec70end = gettime(1);
 	}
 	end;
 }
@@ -766,8 +766,9 @@ prt_are_in,129,83,3	script	Staff#70-1	1_F_02,{
 		mes "You already have enough arena points.";
 		mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward.";
 		next;
+	} else {
+		++arena_point;
 	}
-	else set arena_point, arena_point + 1;
 	mes "[Staff]";
 	mes "Let me guide you outside. I hope you had a good time.";
 	close2;
@@ -779,22 +780,22 @@ prt_are_in,129,83,3	script	Staff#70-1	1_F_02,{
 prt_are_in,25,84,3	script	Staff#70-2	1_F_02,{
 	if($arena_min70end < $arena_min70st) {
 		if($arena_sec70end < $arena_sec70st) {
-			set @record_min70,60 - $arena_min70st + $arena_min70end -1;
-			set @record_sec70,60 - $arena_sec70st + $arena_sec70end;
+			@record_min70 = 60 - $arena_min70st + $arena_min70end -1;
+			@record_sec70 = 60 - $arena_sec70st + $arena_sec70end;
 		} else {
-			set @record_min70,60 - $arena_min70st + $arena_min70end;
-			set @record_sec70,$arena_sec70end - $arena_sec70st;
+			@record_min70 = 60 - $arena_min70st + $arena_min70end;
+			@record_sec70 = $arena_sec70end - $arena_sec70st;
 		}
 	} else {
 		if($arena_sec70end < $arena_sec70st) {
-			set @record_min70,$arena_min70end - $arena_min70st -1;
-			set @record_sec70,60 - $arena_sec70st + $arena_sec70end;
+			@record_min70 = $arena_min70end - $arena_min70st -1;
+			@record_sec70 = 60 - $arena_sec70st + $arena_sec70end;
 		} else {
-			set @record_min70,$arena_min70end - $arena_min70st;
-			set @record_sec70,$arena_sec70end - $arena_sec70st;
+			@record_min70 = $arena_min70end - $arena_min70st;
+			@record_sec70 = $arena_sec70end - $arena_sec70st;
 		}
 	}
-	set @gap70,(60 * $top_70min + $top_70sec) - (60 * @record_min70 + @record_sec70);
+	@gap70 = (60 * $top_70min + $top_70sec) - (60 * @record_min70 + @record_sec70);
 	mes "[Staff]";
 	mes "Wow, you did a good job~ ";
 	mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?";
@@ -827,7 +828,7 @@ prt_are_in,25,84,3	script	Staff#70-2	1_F_02,{
 			mes "Thank you.";
 			close2;
 		} else {
-			set arena_point, arena_point + 20;
+			arena_point += 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
 			mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance.";
@@ -852,9 +853,9 @@ prt_are_in,25,84,3	script	Staff#70-2	1_F_02,{
 		next;
 		mes "[Staff]";
 		mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 70s^000000, ^3131FF"+strcharinfo(0)+"^000000.";
-		set $top_70min, @record_min70;
-		set $top_70sec, @record_sec70;
-		set $arena_70topn$,strcharinfo(0);
+		$top_70min = @record_min70;
+		$top_70sec = @record_sec70;
+		$arena_70topn$ = strcharinfo(0);
 		donpcevent "Vendigos::OnLineRec_70";
 		next;
 		if (arena_point > 29970) {
@@ -874,7 +875,7 @@ prt_are_in,25,84,3	script	Staff#70-2	1_F_02,{
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
 			next;
-			set arena_point, arena_point + 50;
+			arena_point += 50;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
 			mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance.";
@@ -984,6 +985,6 @@ OnEnable:
 	end;
 
 OnInit:
-	if(!$top_70min && !$top_70sec) set $top_70min,7;
+	if(!$top_70min && !$top_70sec) $top_70min = 7;
 	end;
 }
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index 773175a11..f610619b7 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -37,8 +37,8 @@ force_4-1,99,20,4	script	Octus#arena	4_F_TELEPORTER,{
 
 OnStart:
 	initnpctimer;
-	set $arena_min80st,gettime(2);
-	set $arena_sec80st,gettime(1);
+	$arena_min80st = gettime(2);
+	$arena_sec80st = gettime(1);
 	end;
 
 OnTimer3000:
@@ -730,8 +730,8 @@ OnMyMobDead:
 		donpcevent "Octus#arena::On09_End";
 		donpcevent "arena#80::OnReset_09";
 		donpcevent "arena#80::OnReset_All";
-		set $arena_min80end,gettime(2);
-		set $arena_sec80end,gettime(1);
+		$arena_min80end = gettime(2);
+		$arena_sec80end = gettime(1);
 	}
 	end;
 }
@@ -747,8 +747,9 @@ prt_are_in,181,188,3	script	Staff#80-1	1_F_02,{
 		mes "You already have enough arena points.";
 		mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward.";
 		next;
+	} else {
+		++arena_point;
 	}
-	else set arena_point, arena_point + 1;
 	mes "[Staff]";
 	mes "Let me guide you outside. I hope you had a good time.";
 	close2;
@@ -760,22 +761,22 @@ prt_are_in,181,188,3	script	Staff#80-1	1_F_02,{
 prt_are_in,77,187,3	script	Staff#80-2	1_F_02,{
 	if($arena_min80end < $arena_min80st) {
 		if($arena_sec80end < $arena_sec80st) {
-			set @record_min80,60 - $arena_min80st + $arena_min80end -1;
-			set @record_sec80,60 - $arena_sec80st + $arena_sec80end;
+			@record_min80 = 60 - $arena_min80st + $arena_min80end -1;
+			@record_sec80 = 60 - $arena_sec80st + $arena_sec80end;
 		} else {
-			set @record_min80,60 - $arena_min80st + $arena_min80end;
-			set @record_sec80,$arena_sec80end - $arena_sec80st;
+			@record_min80 = 60 - $arena_min80st + $arena_min80end;
+			@record_sec80 = $arena_sec80end - $arena_sec80st;
 		}
 	} else {
 		if($arena_sec80end < $arena_sec80st) {
-			set @record_min80,$arena_min80end - $arena_min80st -1;
-			set @record_sec80,60 - $arena_sec80st + $arena_sec80end;
+			@record_min80 = $arena_min80end - $arena_min80st -1;
+			@record_sec80 = 60 - $arena_sec80st + $arena_sec80end;
 		} else {
-			set @record_min80,$arena_min80end - $arena_min80st;
-			set @record_sec80,$arena_sec80end - $arena_sec80st;
+			@record_min80 = $arena_min80end - $arena_min80st;
+			@record_sec80 = $arena_sec80end - $arena_sec80st;
 		}
 	}
-	set @gap80,(60 * $top_80min + $top_80sec) - (60 * @record_min80 + @record_sec80);
+	@gap80 = (60 * $top_80min + $top_80sec) - (60 * @record_min80 + @record_sec80);
 	mes "[Staff]";
 	mes "Wow, you did a good job~ ";
 	mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?";
@@ -808,7 +809,7 @@ prt_are_in,77,187,3	script	Staff#80-2	1_F_02,{
 			mes "Thank you.";
 			close2;
 		} else {
-			set arena_point, arena_point + 20;
+			arena_point += 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
 			mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance.";
@@ -833,9 +834,9 @@ prt_are_in,77,187,3	script	Staff#80-2	1_F_02,{
 		next;
 		mes "[Staff]";
 		mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 80s^000000, ^3131FF"+strcharinfo(0)+"^000000.";
-		set $top_80min, @record_min80;
-		set $top_80sec, @record_sec80;
-		set $arena_80topn$,strcharinfo(0);
+		$top_80min = @record_min80;
+		$top_80sec = @record_sec80;
+		$arena_80topn$ = strcharinfo(0);
 		donpcevent "Vendigos::OnLineRec_80";
 		next;
 		if (arena_point > 29980) {
@@ -855,7 +856,7 @@ prt_are_in,77,187,3	script	Staff#80-2	1_F_02,{
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
 			next;
-			set arena_point, arena_point + 50;
+			arena_point += 50;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
 			mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance.";
@@ -963,6 +964,6 @@ OnEnable:
 	end;
 
 OnInit:
-	if(!$top_80min && !$top_80sec) set $top_80min,8;
+	if(!$top_80min && !$top_80sec) $top_80min = 8;
 	end;
 }
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index 218a6de90..ca4b74388 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -40,7 +40,7 @@ OnStart:
 
 prt_are_in,76,87,3	script	Helper#party	 67,4,4,{
 	if($arn_partywait == 0) {
-		set $arn_partywait,1;
+		$arn_partywait = 1;
 		emotion e_gasp,0;
 		mes "[Helper Iriff]";
 		mes "Good day, challengers!";
@@ -52,7 +52,7 @@ prt_are_in,76,87,3	script	Helper#party	 67,4,4,{
 		next;
 		switch( select( "No","Yes" ) ) {
 		case 1:
-			set $arn_partywait,0;
+			$arn_partywait = 0;
 			mes "[Helper Iriff]";
 			mes "I see.";
 			mes "However, please remember you have only a limited amount of time.";
@@ -80,7 +80,7 @@ OnStop:
 	end;
 
 OnInit:
-	set $arn_partywait,0;
+	$arn_partywait = 0;
 	end;
 }
 
@@ -94,7 +94,7 @@ OnTouch:
 		warp "arena_room",100,75;
 	else {
 		Zeny -= 1000;
-		set $arn_partywait,0;
+		$arn_partywait = 0;
 		donpcevent "toout#party::OnStop";
 		warp "force_1-2",99,26;
 	}
@@ -114,7 +114,7 @@ OnTimer:
 	end;
 
 OnTimer60000:
-	set $arn_partywait,0;
+	$arn_partywait = 0;
 	enablenpc "toout#party";
 	end;
 
@@ -124,7 +124,7 @@ OnTimer70000:
 	disablenpc "toout#party";
 
 OnTouch:
-	set $arn_partywait,0;
+	$arn_partywait = 0;
 	warp "arena_room",100,75;
 
 OnEnter:
@@ -139,7 +139,7 @@ OnStop:
 
 prt_are_in,73,74,0	script	arena_out	-1,1,1,{
 OnTouch:
-	set $arn_partywait,0;
+	$arn_partywait = 0;
 	warp "arena_room",100,75;
 	end;
 }
@@ -147,8 +147,8 @@ OnTouch:
 force_1-2,99,31,4	script	Slipslowrun#party	4_F_TELEPORTER,{
 OnStart:
 	initnpctimer;
-	set $arena_minptst,gettime(2);
-	set $arena_secptst,gettime(1);
+	$arena_minptst = gettime(2);
+	$arena_secptst = gettime(1);
 	end;
 
 OnTimer2000:
@@ -354,8 +354,8 @@ OnStart:
 	donpcevent "force_10mob-2#party::OnReset";
 	donpcevent "force_exitmob#party::OnReset";
 	donpcevent "Slipslowrun#party::OnStart";
-	set $arn_partyc,0;
-	set $arn_partywait,0;
+	$arn_partyc = 0;
+	$arn_partywait = 0;
 	end;
 
 On04_Start:
@@ -412,8 +412,8 @@ OnReset:
 
 force_1-2,95,187,0	script	force_09_exit	WARPNPC,1,1,{
 OnTouch:
-	set $arena_minptend,gettime(2);
-	set $arena_secptend,gettime(1);
+	$arena_minptend = gettime(2);
+	$arena_secptend = gettime(1);
 	warp "prt_are_in",73,139;
 	donpcevent "#arn_timer_pt::OnEnter";
 	donpcevent "arena_p::OnReset";
@@ -466,7 +466,7 @@ OnMyMobDead:
 	if (mobcount("force_1-2","force_01mob#party::OnMyMobDead") < 1) {
 		enablenpc "force_01_00";
 		donpcevent "Slipslowrun#party::On01_End";
-		set $arn_partyc,$arn_partyc +1;
+		++$arn_partyc;
 		if($arn_partyc == 3) {
 			donpcevent "Slipslowrun#party::On04_Start";
 			enablenpc "force_03_04";
@@ -525,7 +525,7 @@ OnMyMobDead:
 	if (mobcount("force_1-2","force_02mob#party::OnMyMobDead") < 1) {
 		enablenpc "force_02_00";
 		donpcevent "Slipslowrun#party::On02_End";
-		set $arn_partyc,$arn_partyc +1;
+		++$arn_partyc;
 		if($arn_partyc == 3) {
 			donpcevent "Slipslowrun#party::On04_Start";
 			enablenpc "force_03_04";
@@ -580,7 +580,7 @@ OnMyMobDead:
 	if (mobcount("force_1-2","force_03mob#party::OnMyMobDead") < 1) {
 		enablenpc "force_03_00";
 		donpcevent "Slipslowrun#party::On03_End";
-		set $arn_partyc,$arn_partyc +1;
+		++$arn_partyc;
 		if($arn_partyc == 3) {
 			donpcevent "Slipslowrun#party::On04_Start";
 			enablenpc "force_03_04";
@@ -725,7 +725,7 @@ OnMyMobDead:
 	if (mobcount("force_1-2","force_06mob#party::OnMyMobDead") < 1) {
 		donpcevent "arena_p::On07_Start";
 		donpcevent "Slipslowrun#party::On06_End";
-		set $arn_partyc,$arn_partyc +1;
+		++$arn_partyc;
 	}
 	end;
 }
@@ -761,7 +761,7 @@ OnMyMobDead:
 	if (mobcount("force_1-2","force_07mob#party::OnMyMobDead") < 1) {
 		donpcevent "arena_p::On08_Start";
 		donpcevent "Slipslowrun#party::On07_End";
-		set $arn_partyc,$arn_partyc +1;
+		++$arn_partyc;
 	}
 	end;
 }
@@ -778,20 +778,20 @@ OnEnable:
 	monster "force_1-2",172,154,"Khalitzburg",1438,1,"force_08mob#party::OnMyMobDead";
 	monster "force_1-2",174,145,"Ghostring",1576,1,"force_08mob#party::OnMyMobDead";
 	monster "force_1-2",174,145,"Chimera",1456,1,"force_08mob#party::OnMyMobDead";
-	for(set .@i,0; .@i<5; set .@i,.@i+1) {
+	for(.@i = 0; .@i<5; ++.@i) {
 		monster "force_1-2",rand(162,184),rand(122,185),"Injustice",1446,1,"force_08mob#party::OnMyMobDead";
 	}
 	monster "force_1-2",rand(162,184),rand(122,185),"Raydric Archer",1453,1,"force_08mob#party::OnMyMobDead";
-	for(set .@i,0; .@i<5; set .@i,.@i+1) {
+	for(.@i = 0; .@i<5; ++.@i) {
 		monster "force_1-2",rand(162,184),rand(122,185),"Nightmare Terror",1554,1,"force_08mob#party::OnMyMobDead";
 	}
-	for(set .@i,0; .@i<6; set .@i,.@i+1) {
+	for(.@i = 0; .@i<6; ++.@i) {
 		monster "force_1-2",rand(162,184),rand(122,185),"Ancient Mummy",1522,1,"force_08mob#party::OnMyMobDead";
 	}
-	for(set .@i,0; .@i<10; set .@i,.@i+1) {
+	for(.@i = 0; .@i<10; ++.@i) {
 		monster "force_1-2",rand(162,184),rand(122,185),"Skel Prisoner",1479,1,"force_08mob#party::OnMyMobDead";
 	}
-	for(set .@i,0; .@i<5; set .@i,.@i+1) {
+	for(.@i = 0; .@i<5; ++.@i) {
 		monster "force_1-2",rand(162,184),rand(122,185),"Hunter Fly",1422,1,"force_08mob#party::OnMyMobDead";
 	}
 	end;
@@ -804,7 +804,7 @@ OnMyMobDead:
 	if (mobcount("force_1-2","force_08mob#party::OnMyMobDead") < 1) {
 		donpcevent "arena_p::On09_Start";
 		donpcevent "Slipslowrun#party::On08_End";
-		set $arn_partyc,$arn_partyc +1;
+		++$arn_partyc;
 	}
 	end;
 }
@@ -833,7 +833,7 @@ OnEnable:
 	monster "force_1-2",122,178,"Anolian",1488,1,"force_09mob#party::OnMyMobDead";
 	monster "force_1-2",121,177,"Anolian",1488,1,"force_09mob#party::OnMyMobDead";
 	monster "force_1-2",122,177,"Anolian",1488,1,"force_09mob#party::OnMyMobDead";
-	set $force_09_pt,15;
+	$force_09_pt = 15;
 	end;
 
 OnReset:
@@ -844,7 +844,7 @@ OnMyMobDead:
 	if (mobcount("force_1-2","force_09mob#party::OnMyMobDead") < 1) {
 		donpcevent "arena_p::On10_Start";
 		donpcevent "Slipslowrun#party::On09_End";
-		set $arn_partyc,$arn_partyc +1;
+		++$arn_partyc;
 	}
 	end;
 }
@@ -896,7 +896,7 @@ OnMyMobDead:
 	if (mobcount("force_1-2","force_10mob-2#party::OnMyMobDead") < 1) {
 		donpcevent "arena_p::OnExit";
 		donpcevent "Slipslowrun#party::On10_End";
-		set $arn_partyc,0;
+		$arn_partyc = 0;
 	}
 	end;
 }
@@ -960,8 +960,9 @@ prt_are_in,181,135,3	script	Staff#party-1	1_F_02,{
 		mes "You already have enough arena points.";
 		mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward.";
 		next;
+	} else {
+		++arena_point;
 	}
-	else set arena_point, arena_point + 1;
 	mes "[Staff]";
 	mes "Let me guide you outside. I hope you had a good time.";
 	close2;
@@ -973,22 +974,22 @@ prt_are_in,181,135,3	script	Staff#party-1	1_F_02,{
 prt_are_in,77,135,3	script	Staff#party-2	1_F_02,{
 	if($arena_minptend < $arena_minptst) {
 		if($arena_secptend < $arena_secptst) {
-			set @record_minpt,60 - $arena_minptst + $arena_minptend -1;
-			set @record_secpt,60 - $arena_secptst + $arena_secptend;
+			@record_minpt = 60 - $arena_minptst + $arena_minptend -1;
+			@record_secpt = 60 - $arena_secptst + $arena_secptend;
 		} else {
-			set @record_minpt,60 - $arena_minptst + $arena_minptend;
-			set @record_secpt,$arena_secptend - $arena_secptst;
+			@record_minpt = 60 - $arena_minptst + $arena_minptend;
+			@record_secpt = $arena_secptend - $arena_secptst;
 		}
 	} else {
 		if($arena_secptend < $arena_secptst) {
-			set @record_minpt,$arena_minptend - $arena_minptst -1;
-			set @record_secpt,60 - $arena_secptst + $arena_secptend;
+			@record_minpt = $arena_minptend - $arena_minptst -1;
+			@record_secpt = 60 - $arena_secptst + $arena_secptend;
 		} else {
-			set @record_minpt,$arena_minptend - $arena_minptst;
-			set @record_secpt,$arena_secptend - $arena_secptst;
+			@record_minpt = $arena_minptend - $arena_minptst;
+			@record_secpt = $arena_secptend - $arena_secptst;
 		}
 	}
-	set @gappt,(60 * $top_ptmin + $top_ptsec) - (60 * @record_minpt + @record_secpt);
+	@gappt = (60 * $top_ptmin + $top_ptsec) - (60 * @record_minpt + @record_secpt);
 	mes "[Staff]";
 	mes "Wow, you did a good job~ ";
 	mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?";
@@ -1004,7 +1005,7 @@ prt_are_in,77,135,3	script	Staff#party-2	1_F_02,{
 	mes "[Staff]";
 	mes "^3131FF"+$arena_pttopn$+"^000000's running time was ^3131FF"+$top_ptmin+"^000000minutes ^3131FF"+$top_ptsec+"^000000seconds.";
 	next;
-	set .arn_party,getcharid(1);
+	.arn_party = getcharid(1);
 	if (@gappt < 0) {
 		mes "[Staff]";
 		mes "Although you failed to make a new record, I hope you will succeed next time.";
@@ -1022,7 +1023,7 @@ prt_are_in,77,135,3	script	Staff#party-2	1_F_02,{
 			mes "Thank you.";
 			close2;
 		} else {
-			set arena_point, arena_point + 40;
+			arena_point += 40;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
 			mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance.";
@@ -1063,9 +1064,9 @@ prt_are_in,77,135,3	script	Staff#party-2	1_F_02,{
 				next;
 				switch( select( "Yes","No" ) ) {
 				case 1:
-					set $top_ptmin, @record_minpt;
-					set $top_ptsec, @record_secpt;
-					set $arena_pttopn$,.@arnparty$;
+					$top_ptmin = @record_minpt;
+					$top_ptsec = @record_secpt;
+					$arena_pttopn$ = .@arnparty$;
 					donpcevent "Vendigos::OnLineRec_pt";
 					mes "[Staff]";
 					mes "Your record has been entered.";
@@ -1100,7 +1101,7 @@ prt_are_in,77,135,3	script	Staff#party-2	1_F_02,{
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
 			next;
-			set arena_point, arena_point + 100;
+			arena_point += 100;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
 			mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance.";
@@ -1230,14 +1231,14 @@ OnEnable:
 	donpcevent "Slipslowrun#party::OnTimerOff";
 	disablenpc "Slipslowrun#party";
 	disablenpc "arn_warp_pt";
-	set $arn_partywait,0;
-	set $arn_partyc,0;
+	$arn_partywait = 0;
+	$arn_partyc = 0;
 	donpcevent "#arn_timer_pt::OnStop";
 	enablenpc "Slipslowrun#party";
 	enablenpc "arena_p";
 	end;
 
 OnInit:
-	if(!$top_ptmin && !$top_ptsec) set $top_ptmin,10;
+	if(!$top_ptmin && !$top_ptsec) $top_ptmin = 10;
 	end;
 }
diff --git a/npc/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt
index 3b49596c0..e61db7f78 100644
--- a/npc/other/arena/arena_point.txt
+++ b/npc/other/arena/arena_point.txt
@@ -75,10 +75,10 @@ prt_are_in,103,11,3	script	Arena Point Manager	4_M_JOB_HUNTER,{
 				close;
 			}
 			else {
-				set .@want_point1,10 * .@input;
-				set .@want_point,5 * .@input;
-				set .@my_arena_all,arena_point + .@want_point;
-				set .@my_turbo_all,tt_point - .@want_point1;
+				.@want_point1 = 10 * .@input;
+				.@want_point = 5 * .@input;
+				.@my_arena_all = arena_point + .@want_point;
+				.@my_turbo_all = tt_point - .@want_point1;
 				if (.@my_arena_all > 28999) {
 					mes "[Arena Point Manager]";
 					mes "You will exceed the";
@@ -111,8 +111,8 @@ prt_are_in,103,11,3	script	Arena Point Manager	4_M_JOB_HUNTER,{
 					mes "into 5 Arena Points " + .@input + " times.";
 					mes "A total of " + .@want_point1 + " Turbo Track Points were converted into";
 					mes "" + .@want_point +" Arena Points.";
-					set tt_point,tt_point - .@want_point1;
-					set arena_point,arena_point+.@want_point;
+					tt_point -= .@want_point1;
+					arena_point += .@want_point;
 					next;
 					mes "[Arena Point Manager]";
 					mes "" + strcharinfo(0) + ",";
@@ -158,8 +158,8 @@ S_ExchangePoints:
 		mes "" + strcharinfo(0) + ",";
 		mes "you've converted "+getarg(1)+" Track";
 		mes "Points into "+getarg(2)+" Arena Point.";
-		set tt_point,tt_point-getarg(1);
-		set arena_point,arena_point+getarg(2);
+		tt_point -= getarg(1);
+		arena_point += getarg(2);
 		next;
 		mes "[Arena Point Manager]";
 		mes "" + strcharinfo(0) + ",";
diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index 9330fcf6a..c06aef63d 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -392,7 +392,7 @@ arena_room,158,82,1	script	Helper Lonik	4_M_ROGUE,{
 }
 
 sec_in02,72,180,3	script	Arena Manager#arena	4_NFWISP,{
-	set .@i, callfunc("F_GM_NPC",1357,0);
+	.@i = callfunc("F_GM_NPC",1357,0);
 	if (.@i == -1) {
 		mes "[Arena Manager]";
 		mes "Command has been canceled.";
@@ -408,16 +408,16 @@ sec_in02,72,180,3	script	Arena Manager#arena	4_NFWISP,{
 		case 1:
 			switch(select("Lv 50:Lv 60:Lv 70:Lv 80:Party Mode")) {
 			case 1:
-				set .@arena,50;
+				.@arena = 50;
 				break;
 			case 2:
-				set .@arena,60;
+				.@arena = 60;
 				break;
 			case 3:
-				set .@arena,70;
+				.@arena = 70;
 				break;
 			case 4:
-				set .@arena,80;
+				.@arena = 80;
 				break;
 			case 5:
 				mes "[Arena Manager]";
@@ -470,29 +470,29 @@ sec_in02,72,180,3	script	Arena Manager#arena	4_NFWISP,{
 			case 2:
 				switch(select("Lv 50:Lv 60:Lv 70:Lv 80:Party Mode")) {
 				case 1:
-					set .@min$,"$top50min";
-					set .@sec$,"$top50sec";
-					set .@mode$,"Lv 50";
+					.@min$ = "$top50min";
+					.@sec$ = "$top50sec";
+					.@mode$ = "Lv 50";
 					break;
 				case 2:
-					set .@min$,"$top60min";
-					set .@sec$,"$top60sec";
-					set .@mode$,"Lv 60";
+					.@min$ = "$top60min";
+					.@sec$ = "$top60sec";
+					.@mode$ = "Lv 60";
 					break;
 				case 3:
-					set .@min$,"$top70min";
-					set .@sec$,"$top70sec";
-					set .@mode$,"Lv 70";
+					.@min$ = "$top70min";
+					.@sec$ = "$top70sec";
+					.@mode$ = "Lv 70";
 					break;
 				case 4:
-					set .@min$,"$top80min";
-					set .@sec$,"$top80sec";
-					set .@mode$,"Lv 80";
+					.@min$ = "$top80min";
+					.@sec$ = "$top80sec";
+					.@mode$ = "Lv 80";
 					break;
 				case 5:
-					set .@min$,"$top_ptmin";
-					set .@sec$,"$top_ptsec";
-					set .@mode$,"party";
+					.@min$ = "$top_ptmin";
+					.@sec$ = "$top_ptsec";
+					.@mode$ = "party";
 					break;
 				}
 				mes "[Arena Manager]";
@@ -514,7 +514,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	4_NFWISP,{
 }
 
 sec_in02,79,171,3	script	Reward Manager#arena	4_NFWISP,{
-	set .@i, callfunc("F_GM_NPC",1357,0);
+	.@i = callfunc("F_GM_NPC",1357,0);
 	if (.@i == -1) {
 		mes "[Reward Manager]";
 		mes "Command has been canceled.";
@@ -616,7 +616,7 @@ prt_are_in,98,14,3	script	Givu#arena	4_F_JOB_KNIGHT,{
 				mes "Please check the total amount of arena points you have.";
 				close;
 			}
-			set arena_point, arena_point-40;
+			arena_point -= 40;
 			if (checkre(3)) {
 				if (BaseLevel < 70) getexp 300,0;
 				else if (BaseLevel < 80) getexp 900,0;
@@ -661,16 +661,16 @@ prt_are_in,98,14,3	script	Givu#arena	4_F_JOB_KNIGHT,{
 			mes "The NPC will appear for 1 minute and this service requires 10 arena points.";
 			next;
 			switch(select("Baphomet:Dark Lord:Doppelganger:Eddga:Dracula:Samurai:Stormy Knight:Phreeoni:Girl:Valkyrie")) {
-				case 1: set $@arena_picture_id,1039; break;
-				case 2: set $@arena_picture_id,1272; break;
-				case 3: set $@arena_picture_id,1046; break;
-				case 4: set $@arena_picture_id,1115; break;
-				case 5: set $@arena_picture_id,1389; break;
-				case 6: set $@arena_picture_id,1492; break;
-				case 7: set $@arena_picture_id,1251; break;
-				case 8: set $@arena_picture_id,1159; break;
-				case 9: set $@arena_picture_id,6969; break;
-				case 10: set $@arena_picture_id,7777; break;
+				case 1: $@arena_picture_id = 1039; break;
+				case 2: $@arena_picture_id = 1272; break;
+				case 3: $@arena_picture_id = 1046; break;
+				case 4: $@arena_picture_id = 1115; break;
+				case 5: $@arena_picture_id = 1389; break;
+				case 6: $@arena_picture_id = 1492; break;
+				case 7: $@arena_picture_id = 1251; break;
+				case 8: $@arena_picture_id = 1159; break;
+				case 9: $@arena_picture_id = 6969; break;
+				case 10: $@arena_picture_id = 7777; break;
 			}
 			if (arena_point < 10) {
 				mes "[Givu]";
@@ -688,8 +688,8 @@ prt_are_in,98,14,3	script	Givu#arena	4_F_JOB_KNIGHT,{
 			next;
 			switch(select("Yes:No")) {
 			case 1:
-				set arena_point, arena_point-10;
-				set $@arena_picture,1;
+				arena_point -= 10;
+				$@arena_picture = 1;
 				enablenpc "#arena_"+$@arena_picture_id+"";
 				movenpc "#arena_"+$@arena_picture_id+"",96,28;
 				if ($@arena_picture_id == 6969) {
@@ -941,13 +941,13 @@ OnTimer62000:
 	mapannounce "prt_are_in","Time is over. Thank you for using my services.",1,0xFFCE00;
 	movenpc "#arena_"+$@arena_picture_id+"",1,1;
 	donpcevent "#arena_1039::OnInit";
-	set $@arena_picture,0;
+	$@arena_picture = 0;
 	stopnpctimer;
 	end;
 }
 
 sec_in02,72,171,3	script	Picture Manager#arena	4_NFWISP,{
-	set .@i, callfunc("F_GM_NPC",1357,0);
+	.@i = callfunc("F_GM_NPC",1357,0);
 	if (.@i == -1) {
 		mes "[Picture Manager]";
 		mes "Command has been canceled.";
@@ -968,7 +968,7 @@ sec_in02,72,171,3	script	Picture Manager#arena	4_NFWISP,{
 		case 2:
 			mes "[Picture Manager]";
 			mes "Picture rewarding reseted.";
-			set $@arena_picture,0;
+			$@arena_picture = 0;
 			close;
 		}
 	}
@@ -1008,7 +1008,7 @@ function	script	Func_Are_Rew	{
 		mes "Please check the total amount of arena points you have.";
 		close;
 	}
-	set arena_point, arena_point - (.@reward * getarg(2));
+	arena_point -= (.@reward * getarg(2));
 	getitem getarg(0),.@reward * getarg(1);
 	mes "[Givu]";
 	mes "Thank you, please come again.";