Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4

- Consolidated case in variables, labels, constants.

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

8 files changed, 31 insertions, 31 deletions

diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt
index ddc261e4f..ae746e7d2 100644
--- a/npc/re/cities/malaya.txt
+++ b/npc/re/cities/malaya.txt
@@ -686,7 +686,7 @@ malaya,63,185,4	script	Woman#ma08	4_F_MALAYA,{
 // Jeepneys
 //============================================================
 function	script	F_Malaya_Jeepney	{
-	.@mapName$        = getarg(0);
+	.@mapname$        = getarg(0);
 	.@passengers      = getarg(1);
 
 	// set the other messages of varying amount)
@@ -707,9 +707,9 @@ function	script	F_Malaya_Jeepney	{
 		mes getarg(4);
 		next;
 	}
-	switch(select("Board [Passenger " + getmapusers(.@mapName$) + "/" + .@passengers +"]:Jeepney?:Are there any other Jeepneys?:Ah... Yes...")) {
+	switch(select("Board [Passenger " + getmapusers(.@mapname$) + "/" + .@passengers +"]:Jeepney?:Are there any other Jeepneys?:Ah... Yes...")) {
 	case 1:
-		if (getmapusers(.@mapName$) >= .@passengers) {
+		if (getmapusers(.@mapname$) >= .@passengers) {
 			mes "[Jeepney Driver]";
 			mes "I'm afraid the Jeepney is full.";
 			mes "I'm sorry but how about some other Jeepney?";
@@ -718,7 +718,7 @@ function	script	F_Malaya_Jeepney	{
 			mes "[Jeepney Driver]";
 			mes "Have a nice day.";
 			close2;
-			warp .@mapName$,29,24;
+			warp .@mapname$,29,24;
 			end;
 		}
 	case 2:
@@ -929,4 +929,4 @@ malaya,257,58,6	script	Jeepney Driver#09	4_M_MALAYA,{
 		"Since everybody have different tastes, you can see those with cool and elaborate decorations.",
 		"Of course you don't need to drive them yourselves, but you can ride them so please feel free to do so."
 	);
-}
\ No newline at end of file
+}
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 47e9e8000..18fdfa4e3 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -433,10 +433,10 @@ OnTalk4:
 OnTalk5:
 	npctalk "Not coveting the king's throne, you're such a stupid man, only waiting for his return. Your innocence is true, I love it.";
 	end;
-Ontalk6:
+OnTalk6:
 	npctalk "You make me wish we hadn't met in this situation. Too bad we did.";
 	end;
-Ontalk7:
+OnTalk7:
 	npctalk "Well~ Today, with such a busy commandant, I won't be able to talk as much as I'd love for you to contemplate my explanation~";
 	end;
 OnTalk8:
diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt
index 71df65889..c18d60c5c 100644
--- a/npc/re/jobs/1-1/archer.txt
+++ b/npc/re/jobs/1-1/archer.txt
@@ -39,7 +39,7 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	4_M_03,{
 			mes "I know you'll make a great Archer...";
 			next;
 			skill 143,0,0;
-			jobchange Job_Archer_high;
+			jobchange Job_Archer_High;
 			skill 147,1,0;
 			skill 148,1,0;
 			mes "[Archer Guildsman]";
diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt
index c42888a66..4b04f9efa 100644
--- a/npc/re/jobs/1-1/thief.txt
+++ b/npc/re/jobs/1-1/thief.txt
@@ -40,7 +40,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	1_F_04,{
 				close;
 			}else{
 				mes "[Thief Guide]";
-				if (sex)
+				if (Sex)
 					mes "Hey, dude.";
 				else
 					mes "Hey, baby~";
@@ -48,7 +48,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	1_F_04,{
 			}
 		}else{
 			mes "[Thief Guide]";
-			if (sex)
+			if (Sex)
 				mes "Hey, dude.";
 			else
 				mes "Hey, baby.";
diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt
index 201a7fb4f..772570cca 100644
--- a/npc/re/jobs/3-2/shadow_chaser.txt
+++ b/npc/re/jobs/3-2/shadow_chaser.txt
@@ -1996,7 +1996,7 @@ job3_sha01,25,28,0	script	????#keybox02	CLEAR_NPC,{
 		close;
 	}
 	setarray .@Words$[0],"SEED","FOOT","COLD";
-	setarray .@Numbers[0],24,25,20;
+	setarray .@numbers[0],24,25,20;
 	set .@i,job_sha-14;
 	if (job_sha > 13 && job_sha < 17) {
 		mes "There are lots of boxes.";
@@ -2023,8 +2023,8 @@ job3_sha01,25,28,0	script	????#keybox02	CLEAR_NPC,{
 		switch(select("Input the answer.:I can't get it.")) {
 		case 1:
 			input .@input;
-			if (.@input == .@Numbers[.@i]) {
-				mes "You put 2 and "+(.@Numbers[.@i]-20)+".";
+			if (.@input == .@numbers[.@i]) {
+				mes "You put 2 and "+(.@numbers[.@i]-20)+".";
 				mes "The box opens and you get one key.";
 				next;
 				mes "You got the Key of Illusion.";
@@ -2501,4 +2501,4 @@ OnTouch:
 //============================================================
 tur_dun03,0,0,0,0	monster	Shadow of Deception	2076,1,1000,0,0
 ice_dun02,0,0,0,0	monster	Shadow of Illusion	2077,1,1000,0,0
-niflheim,0,0,0,0	monster	Shadow of Pleasure	2078,1,1000,0,0
\ No newline at end of file
+niflheim,0,0,0,0	monster	Shadow of Pleasure	2078,1,1000,0,0
diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt
index 45c5ee876..eb1c22e42 100644
--- a/npc/re/quests/eden/41-55.txt
+++ b/npc/re/quests/eden/41-55.txt
@@ -54,7 +54,7 @@ moc_para01,40,38,3	script	Mission [41 - 55]	4_BOARD3,{
 		}
 		end;
 	}
-	setarray .@Exp[0],9600,7200,15750,7875,11100,8550,17100,9000,12300,9900,20250,10350,13800,11025,22500,11250;
+	setarray .@exp[0],9600,7200,15750,7875,11100,8550,17100,9000,12300,9900,20250,10350,13800,11025,22500,11250;
 	for(set .@i,0; .@i<16; set .@i,.@i+1)
 		if (checkquest(12072+.@i,HUNTING) == 2) {
 			mes "[Mission Board]";
@@ -63,7 +63,7 @@ moc_para01,40,38,3	script	Mission [41 - 55]	4_BOARD3,{
 			erasequest 12088;
 			erasequest 12072+.@i;
 			specialeffect2 EF_STEAL;
-			getexp .@Exp[.@i],0;
+			getexp .@exp[.@i],0;
 			close;
 		}
 	if ((checkquest(12072,HUNTING) == 0) && (checkquest(12073,HUNTING) == 0) && (checkquest(12074,HUNTING) == 0) && (checkquest(12075,HUNTING) == 0) && (checkquest(12076,HUNTING) == 0) && (checkquest(12077,HUNTING) == 0) && (checkquest(12078,HUNTING) == 0) && (checkquest(12079,HUNTING) == 0) && (checkquest(12080,HUNTING) == 0) && (checkquest(12081,HUNTING) == 0) && (checkquest(12082,HUNTING) == 0) && (checkquest(12083,HUNTING) == 0) && (checkquest(12084,HUNTING) == 0) && (checkquest(12085,HUNTING) == 0) && (checkquest(12086,HUNTING) == 0) && (checkquest(12087,HUNTING) == 0)) {
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index bdd6eb4c2..c96d5a049 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -4560,12 +4560,12 @@ moc_para01,111,83,3	script	Toren	2_M_OLDBLSMITH,{
 			close;
 		}
 		if (para_suv02 == 14) {
-			setarray .@Check[0],18514,2571,2473,15031;
-			setarray .@Item$[0],"Hat","Mantle","Boots","Uniform";
+			setarray .@check[0],18514,2571,2473,15031;
+			setarray .@item$[0],"Hat","Mantle","Boots","Uniform";
 			for(set .@i,0; .@i<4; set .@i,.@i+1) 
-				if (countitem(.@Check[.@i]) < 1) {
+				if (countitem(.@check[.@i]) < 1) {
 					mes "[Toren]";
-					mes "Where is the Paradise "+.@Item$[.@i]+" I gave you?";
+					mes "Where is the Paradise "+.@item$[.@i]+" I gave you?";
 					next;
 					mes "[Toren]";
 					mes "...Fine, I will sell you another one for ^FF0000250,000 Zeny^000000. Don't lose it this time.";
@@ -4581,7 +4581,7 @@ moc_para01,111,83,3	script	Toren	2_M_OLDBLSMITH,{
 						close;
 					}
 					set Zeny, Zeny - 250000;
-					getitem .@Check[.@i],1;
+					getitem .@check[.@i],1;
 					mes "[Toren]";
 					mes "These advanced gears are not easy to make, please take better care of this one.";
 					close;
@@ -4659,14 +4659,14 @@ moc_para01,111,83,3	script	Toren	2_M_OLDBLSMITH,{
 			mes "[Toren]";
 			mes "Now pick which gear you would like me to enchant.";
 			next;
-			setarray .@Item[0],2571,2473,15031;
+			setarray .@item[0],2571,2473,15031;
 			set .@i, select("Paradise Mantle II.:Paradise Boots IV.:Paradise Uniform IV.")-1;
-			if (countitem(.@Item[.@i]) < 1) {
+			if (countitem(.@item[.@i]) < 1) {
 				mes "[Toren]";
 				mes "Bring one and I'll enchant it.";
 				close;
 			}
-			set .@paragearcount, .@Item[.@i];
+			set .@paragearcount, .@item[.@i];
 			mes "[Toren]";
 			mes "Here we go!";
 			close2;
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index 62b356c23..dbf405542 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -5434,7 +5434,7 @@ malangdo,212,204,0	script	Beginning Compass#nya_02	CLEAR_NPC,{
 L_Viewpoint:
 	switch(getarg(0)) {
 	case 1: // Order 1: Red, Blue, Yellow, Green, White
-		setarray .@Colors$[1],"^FF0000","^0000FF","^FFFF00","^00FF00","^cccccc";
+		setarray .@colors$[1],"^FF0000","^0000FF","^FFFF00","^00FF00","^cccccc";
 		setarray .@Text$[1],"Red","Blue","Yellow","Green","White";
 		if (getarg(1) <= 1)
 			viewpoint 1,213,89,0,0xFF0000;
@@ -5447,7 +5447,7 @@ L_Viewpoint:
 		viewpoint 1,111,178,4,0xcccccc;
 		break;
 	case 2: // Order 2: Yellow, Blue, White, Green, Red
-		setarray .@Colors$[1],"^FFFF00","^0000FF","^cccccc","^00FF00","^FF0000";
+		setarray .@colors$[1],"^FFFF00","^0000FF","^cccccc","^00FF00","^FF0000";
 		setarray .@Text$[1],"Yellow","Blue","White","Green","Red";
 		if (getarg(1) <= 1)
 			viewpoint 1,73,253,0,0xFFFF00;
@@ -5461,7 +5461,7 @@ L_Viewpoint:
 		break;
 	}
 	for(set .@i,1; .@i<=5; set .@i,.@i+1)
-		set .@str$, .@str$+((.@i >= getarg(1))?.@Colors$[.@i]:"")+.@Text$[.@i]+" ";
+		set .@str$, .@str$+((.@i >= getarg(1))?.@colors$[.@i]:"")+.@Text$[.@i]+" ";
 	if (getarg(1) > 1)
 		mes "After inserting the card and pressing the red button, the path to the destination lit up.";
 	mes "The order will be "+.@str$+"^000000.";
@@ -6226,12 +6226,12 @@ L_ShowLights:
 	mes "In that order.";
 	next;
 	mes "Luminous";
-	setarray .@Color$[0],"Red","Blue","Yellow","Green";
+	setarray .@color$[0],"Red","Blue","Yellow","Green";
 	setarray .@Cutin$[0],"nya_red","nya_blue","nya_yellow","nya_green";
 	for(set .@i,0; .@i<getarg(0); set .@i,.@i+1) {
 		set .@rand, rand(4);
 		set .@Lamp[.@i],.@rand;
-		mes .@Color$[.@rand];
+		mes .@color$[.@rand];
 		if (.@i+1 == getarg(0))
 			mes "Shines according to this order.";
 		cutin .@Cutin$[.@rand],4;
@@ -6242,9 +6242,9 @@ L_ShowLights:
 	mes "Stop the machine by pressing the right button within time.";
 	next;
 	set .@pass,0;
-	setarray .@Count$[0],"first","second","third","fourth","fifth","sixth","seventh","eighth";
+	setarray .@count$[0],"first","second","third","fourth","fifth","sixth","seventh","eighth";
 	for(set .@i,0; .@i<getarg(0); set .@i,.@i+1) {
-		mes "Which color button do you want to press "+.@Count$[.@i]+"?";
+		mes "Which color button do you want to press "+.@count$[.@i]+"?";
 		next;
 		// Red <-> Green, Blue <-> Yellow
 		set .@j, select("Red:Blue:Yellow:Green");