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

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

1 files changed, 104 insertions, 104 deletions

diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt
index dc799a21f..527bebce4 100644
--- a/npc/guild/agit_main.txt
+++ b/npc/guild/agit_main.txt
@@ -98,21 +98,21 @@ OnStartArena:
 
 // The Emperium has been broken.
 OnAgitBreak:
-	set .@GID,getcharid(2);
+	.@GID = getcharid(2);
 	// Show and log error if an unguilded player breaks the Emperium. (Should NEVER happen)
 	if (.@GID <= 0) {
-		set .@notice$,"Character "+strcharinfo(0)+" ("+getcharid(0)+") broke the Emperium in Castle: "+strnpcinfo(2)+" while guildless. No data will be saved and Emperium respawned.";
+		.@notice$ = "Character "+strcharinfo(0)+" ("+getcharid(0)+") broke the Emperium in Castle: "+strnpcinfo(2)+" while guildless. No data will be saved and Emperium respawned.";
  		logmes .@notice$; debugmes .@notice$;
 		donpcevent "Agit#"+strnpcinfo(2)+"::OnStartArena";
 		end;
 	}
 	// Adjust Economy Invest Level for Castle
-	set .@Economy,getcastledata(strnpcinfo(2),2) - 5;
-	if (.@Economy < 0) set .@Economy, 0;
+	.@Economy = getcastledata(strnpcinfo(2),2) - 5;
+	if (.@Economy < 0) .@Economy = 0;
 	setcastledata strnpcinfo(2), 2, .@Economy;
 	// Adjust Defense Invest Level for Castle
-	set .@defence,getcastledata(strnpcinfo(2),3) - 5;
-	if (.@defence < 0) set .@defence, 0;
+	.@defence = getcastledata(strnpcinfo(2),3) - 5;
+	if (.@defence < 0) .@defence = 0;
 	setcastledata strnpcinfo(2), 3, .@defence;
 
 	// Set new Castle Occupant
@@ -125,12 +125,12 @@ OnAgitBreak:
 	// Refresh castle data, disable Kafra and reset Invest information.
 	donpcevent strnpcinfo(0)+"::OnRecvCastle";
 	disablenpc "Kafra Staff#"+strnpcinfo(2);
-	for( set .@i, 4; .@i <= 9; set .@i, .@i+1 ) {
+	for (.@i = 4; .@i <= 9; ++.@i) {
 		setcastledata strnpcinfo(2), .@i, 0;
 	}
 	// Erase Guardian Database information if the new owners do not have Guardian Research.
 	if( getgdskilllv(.@GID,10002) == 0 ) {
-		for( set .@i, 10; .@i <= 17; set .@i, .@i+1 ) {
+		for (.@i = 10; .@i <= 17; ++.@i) {
 			setcastledata strnpcinfo(2), .@i, 0;
 		}
 	}
@@ -169,7 +169,7 @@ OnAgitInit:
 OnRecvCastle:
 	if (strnpcinfo(0) == "Gld_Agit_Manager") end;
 	// Spawn Monsters if the castle is empty.
-	set .@GID, getcastledata(strnpcinfo(2),1);
+	.@GID = getcastledata(strnpcinfo(2),1);
 	if (.@GID == 0) {
 		killmonsterall strnpcinfo(2);
 		if (compare(strnpcinfo(2),"aldeg")) {
@@ -316,7 +316,7 @@ OnRecvCastle:
 //============================================================
 -	script	Kafra Staff#woe::guildkafra	-1,{
 
-	set .@GID,getcastledata(strnpcinfo(2),1);
+	.@GID = getcastledata(strnpcinfo(2),1);
 
 	if (compare(strnpcinfo(2),"aldeg")) {
 		setarray .@destination$[0],"Al De Baran","aldebaran";
@@ -384,7 +384,7 @@ OnRecvCastle:
 					end;
 				}
 				Zeny -= 200;
-				set RESRVPTS,RESRVPTS+2;
+				RESRVPTS += 2;
 				close2;
 				warp .@destination$[1],.@coordinates[0],.@coordinates[1];
 				end;
@@ -434,7 +434,7 @@ OnRecvCastle:
 					cutin "",255;
 					end;
 				}
-				set RESRVPTS,RESRVPTS+8;
+				RESRVPTS += 8;
 				Zeny -= 800;
 				setcart;
 				close2;
@@ -465,7 +465,7 @@ OnRecvCastle:
 //============================================================
 -	script	Castle Manager#cm::cm	-1,{
 
-	set .@GID,getcastledata(strnpcinfo(2),1);
+	.@GID = getcastledata(strnpcinfo(2),1);
 
 	// .@guardiantype = Defines the types of guardians per castle basis.
 	// 1 - Soldier Guardian, 2 - Archer Guardian, 3 - Knight Guardian
@@ -634,30 +634,30 @@ OnRecvCastle:
 		mes "That's all I have to report, Master.";
 		close;
 	case 2:
-		set .@Economy,getcastledata(strnpcinfo(2),2);
-		if (.@Economy < 6) { set .@eco_invest,5000; }
-		else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; }
-		else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; }
-		else if ((.@Economy >= 16) && (.@Economy <= 20)) { set .@eco_invest,35000; }
-		else if ((.@Economy >= 21) && (.@Economy <= 25)) { set .@eco_invest,55000; }
-		else if ((.@Economy >= 26) && (.@Economy <= 30)) { set .@eco_invest,80000; }
-		else if ((.@Economy >= 31) && (.@Economy <= 35)) { set .@eco_invest,110000; }
-		else if ((.@Economy >= 36) && (.@Economy <= 40)) { set .@eco_invest,145000; }
-		else if ((.@Economy >= 41) && (.@Economy <= 45)) { set .@eco_invest,185000; }
-		else if ((.@Economy >= 46) && (.@Economy <= 50)) { set .@eco_invest,230000; }
-		else if ((.@Economy >= 51) && (.@Economy <= 55)) { set .@eco_invest,280000; }
-		else if ((.@Economy >= 56) && (.@Economy <= 60)) { set .@eco_invest,335000; }
-		else if ((.@Economy >= 61) && (.@Economy <= 65)) { set .@eco_invest,395000; }
-		else if ((.@Economy >= 66) && (.@Economy <= 70)) { set .@eco_invest,460000; }
-		else if ((.@Economy >= 71) && (.@Economy <= 75)) { set .@eco_invest,530000; }
-		else if ((.@Economy >= 76) && (.@Economy <= 80)) { set .@eco_invest,605000; }
-		else if ((.@Economy >= 81) && (.@Economy <= 85)) { set .@eco_invest,685000; }
-		else if ((.@Economy >= 86) && (.@Economy <= 90)) { set .@eco_invest,770000; }
-		else if ((.@Economy >= 91) && (.@Economy <= 95)) { set .@eco_invest,860000; }
-		else if ((.@Economy >= 96) && (.@Economy <= 100)) { set .@eco_invest,955000; }
+		.@Economy = getcastledata(strnpcinfo(2),2);
+		if (.@Economy < 6) { .@eco_invest = 5000; }
+		else if ((.@Economy >= 6) && (.@Economy <= 10)) { .@eco_invest = 10000; }
+		else if ((.@Economy >= 11) && (.@Economy <= 15)) { .@eco_invest = 20000; }
+		else if ((.@Economy >= 16) && (.@Economy <= 20)) { .@eco_invest = 35000; }
+		else if ((.@Economy >= 21) && (.@Economy <= 25)) { .@eco_invest = 55000; }
+		else if ((.@Economy >= 26) && (.@Economy <= 30)) { .@eco_invest = 80000; }
+		else if ((.@Economy >= 31) && (.@Economy <= 35)) { .@eco_invest = 110000; }
+		else if ((.@Economy >= 36) && (.@Economy <= 40)) { .@eco_invest = 145000; }
+		else if ((.@Economy >= 41) && (.@Economy <= 45)) { .@eco_invest = 185000; }
+		else if ((.@Economy >= 46) && (.@Economy <= 50)) { .@eco_invest = 230000; }
+		else if ((.@Economy >= 51) && (.@Economy <= 55)) { .@eco_invest = 280000; }
+		else if ((.@Economy >= 56) && (.@Economy <= 60)) { .@eco_invest = 335000; }
+		else if ((.@Economy >= 61) && (.@Economy <= 65)) { .@eco_invest = 395000; }
+		else if ((.@Economy >= 66) && (.@Economy <= 70)) { .@eco_invest = 460000; }
+		else if ((.@Economy >= 71) && (.@Economy <= 75)) { .@eco_invest = 530000; }
+		else if ((.@Economy >= 76) && (.@Economy <= 80)) { .@eco_invest = 605000; }
+		else if ((.@Economy >= 81) && (.@Economy <= 85)) { .@eco_invest = 685000; }
+		else if ((.@Economy >= 86) && (.@Economy <= 90)) { .@eco_invest = 770000; }
+		else if ((.@Economy >= 91) && (.@Economy <= 95)) { .@eco_invest = 860000; }
+		else if ((.@Economy >= 96) && (.@Economy <= 100)) { .@eco_invest = 955000; }
 		//Quadruple the cost of investing if you've already invested once.
 		if (getcastledata(strnpcinfo(2),4)) {
-			set .@eco_invest,.@eco_invest*4;
+			.@eco_invest *= 4;
 		}
 		mes "["+strnpcinfo(1)+"]";
 		mes "If you invest in commercial growth, the quantity of goods made by the guild will increase. Therfore, if you consider our future, investments will be a necessity.";
@@ -700,30 +700,30 @@ OnRecvCastle:
 			close;
 		}
 	case 3:
-		set .@defence,getcastledata(strnpcinfo(2),3);
-		if (.@defence < 6) { set .@def_invest,10000; }
-		else if ((.@defence >= 6) && (.@defence <= 10)) { set .@def_invest,20000; }
-		else if ((.@defence >= 11) && (.@defence <= 15)) { set .@def_invest,40000; }
-		else if ((.@defence >= 16) && (.@defence <= 20)) { set .@def_invest,70000; }
-		else if ((.@defence >= 21) && (.@defence <= 25)) { set .@def_invest,110000; }
-		else if ((.@defence >= 26) && (.@defence <= 30)) { set .@def_invest,160000; }
-		else if ((.@defence >= 31) && (.@defence <= 35)) { set .@def_invest,220000; }
-		else if ((.@defence >= 36) && (.@defence <= 40)) { set .@def_invest,290000; }
-		else if ((.@defence >= 41) && (.@defence <= 45)) { set .@def_invest,370000; }
-		else if ((.@defence >= 46) && (.@defence <= 50)) { set .@def_invest,460000; }
-		else if ((.@defence >= 51) && (.@defence <= 55)) { set .@def_invest,560000; }
-		else if ((.@defence >= 56) && (.@defence <= 60)) { set .@def_invest,670000; }
-		else if ((.@defence >= 61) && (.@defence <= 65)) { set .@def_invest,790000; }
-		else if ((.@defence >= 66) && (.@defence <= 70)) { set .@def_invest,920000; }
-		else if ((.@defence >= 71) && (.@defence <= 75)) { set .@def_invest,1060000; }
-		else if ((.@defence >= 76) && (.@defence <= 80)) { set .@def_invest,1210000; }
-		else if ((.@defence >= 81) && (.@defence <= 85)) { set .@def_invest,1370000; }
-		else if ((.@defence >= 86) && (.@defence <= 90)) { set .@def_invest,1540000; }
-		else if ((.@defence >= 91) && (.@defence <= 95)) { set .@def_invest,1720000; }
-		else if ((.@defence >= 96) && (.@defence <= 100)) { set .@def_invest,1910000; }
+		.@defence = getcastledata(strnpcinfo(2),3);
+		if (.@defence < 6) { .@def_invest = 10000; }
+		else if ((.@defence >= 6) && (.@defence <= 10)) { .@def_invest = 20000; }
+		else if ((.@defence >= 11) && (.@defence <= 15)) { .@def_invest = 40000; }
+		else if ((.@defence >= 16) && (.@defence <= 20)) { .@def_invest = 70000; }
+		else if ((.@defence >= 21) && (.@defence <= 25)) { .@def_invest = 110000; }
+		else if ((.@defence >= 26) && (.@defence <= 30)) { .@def_invest = 160000; }
+		else if ((.@defence >= 31) && (.@defence <= 35)) { .@def_invest = 220000; }
+		else if ((.@defence >= 36) && (.@defence <= 40)) { .@def_invest = 290000; }
+		else if ((.@defence >= 41) && (.@defence <= 45)) { .@def_invest = 370000; }
+		else if ((.@defence >= 46) && (.@defence <= 50)) { .@def_invest = 460000; }
+		else if ((.@defence >= 51) && (.@defence <= 55)) { .@def_invest = 560000; }
+		else if ((.@defence >= 56) && (.@defence <= 60)) { .@def_invest = 670000; }
+		else if ((.@defence >= 61) && (.@defence <= 65)) { .@def_invest = 790000; }
+		else if ((.@defence >= 66) && (.@defence <= 70)) { .@def_invest = 920000; }
+		else if ((.@defence >= 71) && (.@defence <= 75)) { .@def_invest = 1060000; }
+		else if ((.@defence >= 76) && (.@defence <= 80)) { .@def_invest = 1210000; }
+		else if ((.@defence >= 81) && (.@defence <= 85)) { .@def_invest = 1370000; }
+		else if ((.@defence >= 86) && (.@defence <= 90)) { .@def_invest = 1540000; }
+		else if ((.@defence >= 91) && (.@defence <= 95)) { .@def_invest = 1720000; }
+		else if ((.@defence >= 96) && (.@defence <= 100)) { .@def_invest = 1910000; }
 		//Quadruple the cost of investing if you've already invested once.
 		if (getcastledata(strnpcinfo(2),5)) {
-			set .@def_invest,.@def_invest*4;
+			.@def_invest *= 4;
 		}
 		mes "["+strnpcinfo(1)+"]";
 		mes "If you raise Castle Defenses, the durability of Guardians and the Emperium will increase. Therefore, if you consider our coming battles, some investment in this area will be required.";
@@ -770,10 +770,10 @@ OnRecvCastle:
 		mes "Will you summon a Guardian? It'll be a protector to defend us loyally.";
 		mes "Please select a guardian to defend us.";
 		next;
-		for( set .@i, 0; .@i <= 7 ; set .@i, .@i+1 ) {
-			if (.@guardiantype[.@i] == 1) { set .@type$,"Guardian Soldier"; }
-			else if (.@guardiantype[.@i] == 2) { set .@type$,"Guardian Archer"; }
-			else { set .@type$,"Guardian Knight"; }
+		for (.@i = 0; .@i <= 7; ++.@i) {
+			if (.@guardiantype[.@i] == 1) { .@type$ = "Guardian Soldier"; }
+			else if (.@guardiantype[.@i] == 2) { .@type$ = "Guardian Archer"; }
+			else { .@type$ = "Guardian Knight"; }
 			if (guardianinfo(strnpcinfo(2),.@i,0)) {
 				setarray .@gname$[.@i], .@type$ + " - Implemented (" + guardianinfo(strnpcinfo(2),.@i,2) + "/" + guardianinfo(strnpcinfo(2),.@i,1) + ")";
 			}
@@ -781,8 +781,8 @@ OnRecvCastle:
 				setarray .@gname$[.@i], .@type$ + " - Not Implemented";
 			}
 		}
-		set .@menu$,.@gname$[0]+":"+.@gname$[1]+":"+.@gname$[2]+":"+.@gname$[3]+":"+.@gname$[4]+":"+.@gname$[5]+":"+.@gname$[6]+":"+.@gname$[7];
-		set .@GDnum,select(.@menu$)+9;
+		.@menu$ = .@gname$[0]+":"+.@gname$[1]+":"+.@gname$[2]+":"+.@gname$[3]+":"+.@gname$[4]+":"+.@gname$[5]+":"+.@gname$[6]+":"+.@gname$[7];
+		.@GDnum = select(.@menu$)+9;
 		mes "["+strnpcinfo(1)+"]";
 		mes "Will you summon the chosen guardian? 10,000 zeny are required to summon a Guardian.";
 		next;
@@ -805,10 +805,10 @@ OnRecvCastle:
 			}
 			Zeny -= 10000;
 			setcastledata strnpcinfo(2),.@GDnum,1; // mark as 'installed'
-			set .@UseGID,.@GDnum - 10;
-			if (.@guardiantype[.@UseGID] == 1) { set .@type,1287; }
-			else if (.@guardiantype[.@UseGID] == 2) { set .@type,1285; }
-			else { set .@type,1286; }
+			.@UseGID = .@GDnum - 10;
+			if (.@guardiantype[.@UseGID] == 1) { .@type = 1287; }
+			else if (.@guardiantype[.@UseGID] == 2) { .@type = 1285; }
+			else { .@type = 1286; }
 			guardian strnpcinfo(2),.@guardianposx[.@UseGID],.@guardianposy[.@UseGID],strmobinfo(2,.@type),.@type,"Guardian#"+strnpcinfo(2)+"::OnGuardianDied",.@UseGID;
 			mes "["+strnpcinfo(1)+"]";
 			mes "We completed the summoning of the Guardian. Our defenses are now increased with it in place.";
@@ -917,7 +917,7 @@ OnRecvCastle:
 //============================================================
 -	script	Lever#gd::gdlever	-1,{
 
-	set .@GID,getcastledata(strnpcinfo(2),1);
+	.@GID = getcastledata(strnpcinfo(2),1);
 
 	if (.@GID == 0) {
 		mes "[Ringing Voice]";
@@ -926,7 +926,7 @@ OnRecvCastle:
 	}
 
 	if (compare(strnpcinfo(2),"aldeg")) {
-		set .@destination$,"gld_dun02";
+		.@destination$ = "gld_dun02";
 		if (compare(strnpcinfo(2),"cas01")) setarray .@coordinates[0],32,122;
 		else if (compare(strnpcinfo(2),"cas02")) setarray .@coordinates[0],79,30;
 		else if (compare(strnpcinfo(2),"cas03")) setarray .@coordinates[0],165,38;
@@ -934,7 +934,7 @@ OnRecvCastle:
 		else if (compare(strnpcinfo(2),"cas05")) setarray .@coordinates[0],103,169;
 	}
 	else if (compare(strnpcinfo(2),"gefg")) {
-		set .@destination$,"gld_dun04";
+		.@destination$ = "gld_dun04";
 		if (compare(strnpcinfo(2),"cas01")) setarray .@coordinates[0],39,258;
 		else if (compare(strnpcinfo(2),"cas02")) setarray .@coordinates[0],125,270;
 		else if (compare(strnpcinfo(2),"cas03")) setarray .@coordinates[0],268,251;
@@ -942,7 +942,7 @@ OnRecvCastle:
 		else if (compare(strnpcinfo(2),"cas05")) setarray .@coordinates[0],230,35;
 	}
 	else if (compare(strnpcinfo(2),"payg")) {
-		set .@destination$,"gld_dun01";
+		.@destination$ = "gld_dun01";
 		if (compare(strnpcinfo(2),"cas01")) setarray .@coordinates[0],186,165;
 		else if (compare(strnpcinfo(2),"cas02")) setarray .@coordinates[0],54,165;
 		else if (compare(strnpcinfo(2),"cas03")) setarray .@coordinates[0],54,39;
@@ -950,7 +950,7 @@ OnRecvCastle:
 		else if (compare(strnpcinfo(2),"cas05")) setarray .@coordinates[0],223,202;
 	}
 	else if (compare(strnpcinfo(2),"prtg")) {
-		set .@destination$,"gld_dun03";
+		.@destination$ = "gld_dun03";
 		if (compare(strnpcinfo(2),"cas01")) setarray .@coordinates[0],28,251;
 		else if (compare(strnpcinfo(2),"cas02")) setarray .@coordinates[0],164,268;
 		else if (compare(strnpcinfo(2),"cas03")) setarray .@coordinates[0],164,179;
@@ -1107,11 +1107,11 @@ OnSpawnGuardians:
 	// This should prevent duplicating Guardians when char Server disconnects.
 	killmonster strnpcinfo(2),strnpcinfo(0)+"::OnGuardianDied";
 
-	for( set .@i, 0; .@i <= 7 ; set .@i, .@i+1 ) {
-		set .@UseGID,.@i + 10;
-		if (.@guardiantype[.@i] == 1) { set .@type,1287; }
-		else if (.@guardiantype[.@i] == 2) { set .@type,1285; }
-		else { set .@type,1286; }
+	for (.@i = 0; .@i <= 7; ++.@i) {
+		.@UseGID = .@i + 10;
+		if (.@guardiantype[.@i] == 1) { .@type = 1287; }
+		else if (.@guardiantype[.@i] == 2) { .@type = 1285; }
+		else { .@type = 1286; }
 		if (getcastledata(strnpcinfo(2),.@UseGID)) {
 			guardian strnpcinfo(2),.@guardianposx[.@i],.@guardianposy[.@i],strmobinfo(2,.@type),.@type,"Guardian#"+strnpcinfo(2)+"::OnGuardianDied",.@i;
 		}
@@ -1131,112 +1131,112 @@ OnClock0001:
 	// Do nothing if this script is the template.
 	if (strnpcinfo(1) == "Gld_Trea_Spawn") end;
 	
-	set .@GID, getcastledata(strnpcinfo(2),1);
+	.@GID = getcastledata(strnpcinfo(2),1);
 	
 	// If there is no owner, do nothing.
 	if (!.@GID) end;
 
 	// Is there Economy in this castle?
-	set .@Treasure,getcastledata(strnpcinfo(2),2)/5+4;
+	.@Treasure = getcastledata(strnpcinfo(2),2)/5+4;
 
 	// Set information
 	if (strnpcinfo(2) == "aldeg_cas01") {
-		set .@treasurebox,1324;
+		.@treasurebox = 1324;
 		setarray .@treasurex[0],115,122,115,122,116,117,118,119,120,121,121,121,121,121,121,120,119,118,117,116,116,116,116,116;
 		setarray .@treasurey[0],226,226,219,219,225,225,225,225,225,225,224,223,222,221,220,220,220,220,220,220,221,222,223,224;
 	}
 	else if (strnpcinfo(2) == "aldeg_cas02") {
-		set .@treasurebox,1326;
+		.@treasurebox = 1326;
 		setarray .@treasurex[0],134,135,135,134,132,133,134,135,136,137,137,137,137,137,137,136,135,134,133,132,132,132,132,132;
 		setarray .@treasurey[0],231,231,230,230,233,233,233,233,233,233,232,231,230,229,228,228,228,228,228,228,229,230,231,232;
 	}
 	else if (strnpcinfo(2) == "aldeg_cas03") {
-		set .@treasurebox,1328;
+		.@treasurebox = 1328;
 		setarray .@treasurex[0],224,225,225,224,222,223,224,225,226,227,227,227,227,227,227,226,225,224,223,222,222,222,222,222;
 		setarray .@treasurey[0],269,269,268,268,271,271,271,271,271,271,270,269,268,267,266,266,266,266,266,266,267,268,269,270;
 	}
 	else if (strnpcinfo(2) == "aldeg_cas04") {
-		set .@treasurebox,1330;
+		.@treasurebox = 1330;
 		setarray .@treasurex[0],84,85,85,84,82,83,84,85,86,87,87,87,87,87,87,86,85,84,83,82,82,82,82,82;
 		setarray .@treasurey[0],13,13,12,12,15,15,15,15,15,15,14,13,12,11,10,10,10,10,10,10,11,12,13,14;
 	}
 	else if (strnpcinfo(2) == "aldeg_cas05") {
-		set .@treasurebox,1332;
+		.@treasurebox = 1332;
 		setarray .@treasurex[0],61,62,62,61,59,60,61,62,63,64,64,64,64,64,64,63,62,61,60,59,59,59,59,59;
 		setarray .@treasurey[0],12,12,11,11,14,14,14,14,14,14,13,12,11,10,9,9,9,9,9,9,10,11,12,13;
 	}
 	else if (strnpcinfo(2) == "gefg_cas01") {
-		set .@treasurebox,1334;
+		.@treasurebox = 1334;
 		setarray .@treasurex[0],153,154,154,153,151,152,153,154,155,156,156,156,156,156,156,155,154,153,152,151,151,151,151,151;
 		setarray .@treasurey[0],113,113,112,112,115,115,115,115,115,115,114,113,112,111,110,110,110,110,110,110,111,112,113,114;
 	}
 	else if (strnpcinfo(2) == "gefg_cas02") {
-		set .@treasurebox,1336;
+		.@treasurebox = 1336;
 		setarray .@treasurex[0],139,140,140,139,137,138,139,140,141,142,142,142,142,142,142,141,140,139,138,137,137,137,137,137;
 		setarray .@treasurey[0],115,115,114,114,117,117,117,117,117,117,116,115,114,113,112,112,112,112,112,112,113,114,115,116;
 	}
 	else if (strnpcinfo(2) == "gefg_cas03") {
-		set .@treasurebox,1338;
+		.@treasurebox = 1338;
 		setarray .@treasurex[0],269,270,270,269,267,268,269,270,271,272,272,272,272,272,272,271,270,269,268,267,267,267,267,267;
 		setarray .@treasurey[0],291,291,290,290,293,293,293,293,293,293,292,291,290,289,288,288,288,288,288,288,289,290,291,292;
 	}
 	else if (strnpcinfo(2) == "gefg_cas04") {
-		set .@treasurebox,1340;
+		.@treasurebox = 1340;
 		setarray .@treasurex[0],115,116,116,115,113,114,115,116,117,118,118,118,118,118,118,117,116,115,114,113,113,113,113,113;
 		setarray .@treasurey[0],119,119,118,118,121,121,121,121,121,121,120,119,118,117,116,116,116,116,116,116,117,118,119,120;
 	}
 	else if (strnpcinfo(2) == "gefg_cas05") {
-		set .@treasurebox,1342;
+		.@treasurebox = 1342;
 		setarray .@treasurex[0],143,144,144,143,141,142,143,144,145,146,146,146,146,146,146,145,144,143,142,141,141,141,141,141;
 		setarray .@treasurey[0],110,110,109,109,112,112,112,112,112,112,111,110,109,108,107,107,107,107,107,107,108,109,110,111;
 	}
 	else if (strnpcinfo(2) == "payg_cas01") {
-		set .@treasurebox,1344;
+		.@treasurebox = 1344;
 		setarray .@treasurex[0],289,292,292,289,288,289,290,291,292,293,293,293,293,293,293,292,291,290,289,288,288,288,288,288;
 		setarray .@treasurey[0],10,10,7,7,11,11,11,11,11,11,10,9,8,7,6,6,6,6,6,6,7,8,9,10;
 	}
 	else if (strnpcinfo(2) == "payg_cas02") {
-		set .@treasurebox,1346;
+		.@treasurebox = 1346;
 		setarray .@treasurex[0],143,146,146,143,142,143,144,145,146,147,147,147,147,147,147,146,145,144,143,142,142,142,142,142;
 		setarray .@treasurey[0],146,146,143,143,147,147,147,147,147,147,146,145,144,143,142,142,142,142,142,142,143,144,145,146;
 	}
 	else if (strnpcinfo(2) == "payg_cas03") {
-		set .@treasurebox,1348;
+		.@treasurebox = 1348;
 		setarray .@treasurex[0],158,159,159,158,156,157,158,159,160,161,161,161,161,161,161,160,159,158,157,156,156,156,156,156;
 		setarray .@treasurey[0],169,169,168,168,171,171,171,171,171,171,170,169,168,167,166,166,166,166,166,166,167,168,169,170;
 	}
 	else if (strnpcinfo(2) == "payg_cas04") {
-		set .@treasurebox,1350;
+		.@treasurebox = 1350;
 		setarray .@treasurex[0],146,147,147,146,144,145,146,147,148,149,149,149,149,149,149,148,147,146,145,144,144,144,144,144;
 		setarray .@treasurey[0],48,48,47,47,50,50,50,50,50,50,49,48,47,46,45,45,45,45,45,45,46,47,48,49;
 	}
 	else if (strnpcinfo(2) == "payg_cas05") {
-		set .@treasurebox,1352;
+		.@treasurebox = 1352;
 		setarray .@treasurex[0],155,158,158,155,154,155,156,157,158,159,159,159,159,159,159,158,157,156,155,154,154,154,154,154;
 		setarray .@treasurey[0],134,134,131,131,135,135,135,135,135,135,134,133,132,131,130,130,130,130,130,130,131,132,133,134;
 	}
 	else if (strnpcinfo(2) == "prtg_cas01") {
-		set .@treasurebox,1354;
+		.@treasurebox = 1354;
 		setarray .@treasurex[0],10,11,11,10,8,9,10,11,12,13,13,13,13,13,13,12,11,10,9,8,8,8,8,8;
 		setarray .@treasurey[0],209,209,208,208,211,211,211,211,211,211,210,209,208,207,206,206,206,206,206,206,207,208,209,210;
 	}
 	else if (strnpcinfo(2) == "prtg_cas02") {
-		set .@treasurebox,1356;
+		.@treasurebox = 1356;
 		setarray .@treasurex[0],201,202,202,201,199,200,201,202,203,204,204,204,204,204,204,203,202,201,200,199,199,199,199,199;
 		setarray .@treasurey[0],228,228,227,227,230,230,230,230,230,230,229,228,227,226,225,225,225,225,225,225,226,227,228,229;
 	}
 	else if (strnpcinfo(2) == "prtg_cas03") {
-		set .@treasurebox,1358;
+		.@treasurebox = 1358;
 		setarray .@treasurex[0],187,188,188,187,185,186,187,188,189,190,190,190,190,190,190,189,188,187,186,185,185,185,185,185;
 		setarray .@treasurey[0],132,132,131,131,134,134,134,134,134,134,133,132,131,130,129,129,129,129,129,129,130,131,132,133;
 	}
 	else if (strnpcinfo(2) == "prtg_cas04") {
-		set .@treasurebox,1360;
+		.@treasurebox = 1360;
 		setarray .@treasurex[0],269,270,270,269,267,268,269,270,271,272,272,272,272,272,272,271,270,269,268,267,267,267,267,267;
 		setarray .@treasurey[0],162,162,161,161,164,164,164,164,164,164,163,162,161,160,159,159,159,159,159,159,160,161,162,163;
 	}
 	else if (strnpcinfo(2) == "prtg_cas05") {
-		set .@treasurebox,1362;
+		.@treasurebox = 1362;
 		setarray .@treasurex[0],275,276,276,275,273,274,275,276,277,278,278,278,278,278,278,277,276,275,274,273,273,273,273,273;
 		setarray .@treasurey[0],178,178,177,177,180,180,180,180,180,180,179,178,177,176,175,175,175,175,175,175,176,177,178,179;
 	}
@@ -1248,12 +1248,12 @@ OnClock0001:
 	// Apply investment to Eco. and Def. Only happens if there were investments made.
 	// Permanent Development can only happen once per day.
 	if (getcastledata(strnpcinfo(2),4)) {
-		set .@Economy,getcastledata(strnpcinfo(2),2);
+		.@Economy = getcastledata(strnpcinfo(2),2);
 		setcastledata strnpcinfo(2),2,.@Economy + getcastledata(strnpcinfo(2),4) + (rand(2) && getgdskilllv(.@GID,10014));
 		if (getcastledata(strnpcinfo(2),2) > 100) setcastledata strnpcinfo(2),2,100;
 	}
 	if (getcastledata(strnpcinfo(2),5)) {
-		set .@defence,getcastledata(strnpcinfo(2),3);
+		.@defence = getcastledata(strnpcinfo(2),3);
 		setcastledata strnpcinfo(2),3,.@defence + getcastledata(strnpcinfo(2),5);
 		if (getcastledata(strnpcinfo(2),3) > 100) setcastledata strnpcinfo(2),3,100;
 	}
@@ -1262,10 +1262,10 @@ OnClock0001:
 	setcastledata strnpcinfo(2),5,0;
 
 	// Spawn boxes in proper order.
-	for (set .@i,0; .@i < .@Treasure ; set .@i,.@i+1) {
+	for (.@i = 0; .@i < .@Treasure ; ++.@i) {
 		// set treasure box ID
-		set .@boxid, .@treasurebox + (.@i+2) % 2;
-		set .@box,1 << .@i;
+		.@boxid = .@treasurebox + (.@i+2) % 2;
+		.@box = 1 << .@i;
 		// Spawn or do not spawn chests if one already exists.
 		if ((getd("$@"+strnpcinfo(2)+"_treasure") & .@box) == 0) {
 			monster strnpcinfo(2),.@treasurex[.@i],.@treasurey[.@i],"Treasure Chest",.@boxid,1,"Treasure#"+strnpcinfo(2)+"::OnTreasureDied"+.@i;