Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4

- Consolidated case in variables, labels, constants.

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

6 files changed, 37 insertions, 37 deletions

diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt
index 8827329d9..8a57d4f3e 100644
--- a/npc/custom/quests/berzebub.txt
+++ b/npc/custom/quests/berzebub.txt
@@ -13,7 +13,7 @@
 
 prontera,165,178,8	script	Old Woman	8_F_GRANDMOTHER,{
 
-	setarray .@Items[0],714,25,1061,100,1095,200,618,10,1551,2,1614,1,727,20;
+	setarray .@items[0],714,25,1061,100,1095,200,618,10,1551,2,1614,1,727,20;
 	set .@n$,"[Old Woman]";
 
 	mes .@n$;
@@ -37,9 +37,9 @@ prontera,165,178,8	script	Old Woman	8_F_GRANDMOTHER,{
 	next;
 	mes .@n$;
 	mes "I need all of the following items:";
-	for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+2) {
-		mes " ~ "+.@Items[.@i+1]+"x "+getitemname(.@Items[.@i]);
-		if (countitem(.@Items[.@i]) < .@Items[.@i+1]) set .@nr,1; }
+	for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+2) {
+		mes " ~ "+.@items[.@i+1]+"x "+getitemname(.@items[.@i]);
+		if (countitem(.@items[.@i]) < .@items[.@i+1]) set .@nr,1; }
 	next;
 	if(select("I have all of that!:I'll get those ASAP")==2) goto M_Leave;
 
@@ -47,8 +47,8 @@ prontera,165,178,8	script	Old Woman	8_F_GRANDMOTHER,{
 	if (.@nr) {
 		mes "You lie! Get out of here and get those items, you sorry excuse for a rock star.";
 		close; }
-	for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+2)
-		delitem .@Items[.@i], .@Items[.@i+1];
+	for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+2)
+		delitem .@items[.@i], .@items[.@i+1];
 	getitem 4145,1;
 	set BerzQuest, 1;
 	mes "Congratulations! You have all the items. Here is your ^FF0000Berzebub Card^000000, as promised.";
diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt
index ea1916e50..882728925 100644
--- a/npc/custom/quests/kahohorn.txt
+++ b/npc/custom/quests/kahohorn.txt
@@ -12,7 +12,7 @@
 
 geffen,115,107,5	script	Lord Kaho's Servant	1_M_PUBMASTER,{
 
-	setarray .@Items[0],7005, 968, 923, 734, 724,2268,7036,7020,5053,7018,741,742,743,750,751,752,753,754;
+	setarray .@items[0],7005, 968, 923, 734, 724,2268,7036,7020,5053,7018,741,742,743,750,751,752,753,754;
 	setarray .@Drops[0],1272,1087,1039,1260,1046,1115,1252,1147,1038,1059;
 	set .@n$, "[Lord Kaho's Servant]";
 
@@ -30,13 +30,13 @@ geffen,115,107,5	script	Lord Kaho's Servant	1_M_PUBMASTER,{
 	next;
 	mes .@n$;
 	for(set .@i,0; .@i<10; set .@i,.@i+1)
-		mes "1x ^0055FF"+getitemname(.@Items[.@i])+"^000000 (from "+strmobinfo(1,.@Drops[.@i])+")";
+		mes "1x ^0055FF"+getitemname(.@items[.@i])+"^000000 (from "+strmobinfo(1,.@Drops[.@i])+")";
 	next;
 	mes .@n$;
 	mes "We're not done yet, sweetie...";
 	mes "I'm a big fan of dolls, so you need to bring me these cuties!";
 	for(set .@i,10; .@i<18; set .@i,.@i+1)
-		mes "1x ^0055FF"+getitemname(.@Items[.@i])+"^000000";
+		mes "1x ^0055FF"+getitemname(.@items[.@i])+"^000000";
 	next;
 	mes .@n$;
 	mes "Finally, I've worked hard to make these horns for my master with all the items mentioned above...";
@@ -52,12 +52,12 @@ geffen,115,107,5	script	Lord Kaho's Servant	1_M_PUBMASTER,{
 		close; }
 	mes .@n$;
 	for(set .@i,0; .@i<18; set .@i,.@i+1)
-		if (!countitem(.@Items[.@i])) { set .@nr,1; break; }
+		if (!countitem(.@items[.@i])) { set .@nr,1; break; }
 	if (.@nr || countitem(714) < 3 || Zeny < 5000000) {
 		mes "I can't afford to make this if you don't bring all materials needed. Please understand this is to benefit heroes such as yourself!";
 		close; }
 	for(set .@i,0; .@i<18; set .@i,.@i+1)
-		delitem .@Items[.@i],1;
+		delitem .@items[.@i],1;
 	delitem 714,3;
 	set Zeny, Zeny-5000000;
 	mes "Wow! You are brave indeed!";
diff --git a/npc/custom/quests/kings_items.txt b/npc/custom/quests/kings_items.txt
index b8c7a5538..345f8b051 100644
--- a/npc/custom/quests/kings_items.txt
+++ b/npc/custom/quests/kings_items.txt
@@ -24,15 +24,15 @@ prt_castle,80,170,4	script	King of Prontera	1_M_PRON_KING,{
 	mes "If you get her these items I'm sure she'll calm down.";
 	mes "I'll give you my crown or my sword as a reward.";
 	next;
-	setarray .@Items1[0],5007,742,30,741,50,753,20,732,1,710,20,629,20;
-	setarray .@Items2[0],1137,2254,1,2282,1,714,1;
+	setarray .@items1[0],5007,742,30,741,50,753,20,732,1,710,20,629,20;
+	setarray .@items2[0],1137,2254,1,2282,1,714,1;
 	switch(select("What do you need?:I have the items!:Forget it.")) {
 		case 1:
 			for(set .@i,1; .@i<3; set .@i,.@i+1) {
 				mes "[King of Prontera]";
 				mes "If you could get me:";
-				for(set .@j,1; .@j<getarraysize(getd(".@Items"+.@i)); set .@j,.@j+2)
-					mes " ~ ^0055FF"+getd(".@Items"+.@i+"["+(.@j+1)+"]")+"^000000x "+getitemname(getd(".@Items"+.@i+"["+.@j+"]"));
+				for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2)
+					mes " ~ ^0055FF"+getd(".@items"+.@i+"["+(.@j+1)+"]")+"^000000x "+getitemname(getd(".@items"+.@i+"["+.@j+"]"));
 				mes "I'll give my "+((.@i)?"sword.":"crown.");
 				if (.@i==2) close;
 				next; }
@@ -41,16 +41,16 @@ prt_castle,80,170,4	script	King of Prontera	1_M_PRON_KING,{
 			mes "What item do you want?";
 			next;
 			set .@i, select("Crown:Sword");
-			for(set .@j,1; .@j<getarraysize(getd(".@Items"+.@i)); set .@j,.@j+2)
-				if (countitem(getd(".@Items"+.@i+"["+.@j+"]")) < getd(".@Items"+.@i+"["+(.@j+1)+"]")) set .@nr,1;
+			for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2)
+				if (countitem(getd(".@items"+.@i+"["+.@j+"]")) < getd(".@items"+.@i+"["+(.@j+1)+"]")) set .@nr,1;
 			mes "[King of Prontera]";
 			if (.@nr) { 
 				mes "You're missing something.";
 				mes "Come back after you get ALL the items.";
 				close; }
-			for(set .@j,1; .@j<getarraysize(getd(".@Items"+.@i)); set .@j,.@j+2)
-				delitem getd(".@Items"+.@i+"["+.@j+"]"), getd(".@Items"+.@i+"["+(.@j+1)+"]");
-			getitem getd(".@Items"+.@i+"[0]"),1;
+			for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2)
+				delitem getd(".@items"+.@i+"["+.@j+"]"), getd(".@items"+.@i+"["+(.@j+1)+"]");
+			getitem getd(".@items"+.@i+"[0]"),1;
 			mes "THANK YOU SOO MUCH!!";
 			mes "This will surely calm her down.";
 			mes "As promised, here is my "+((.@i==1)?"crown.":"sword.");
diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt
index a49c92ed3..3e0723781 100644
--- a/npc/custom/quests/thq/THQS_GuildNPC.txt
+++ b/npc/custom/quests/thq/THQS_GuildNPC.txt
@@ -25,7 +25,7 @@ yuno_in01,124,164,6	script	Guild Leader	1_M_PRON_KING,{
 	mes "Umm... Well that is all you need to do. Hahaha.";
 	next;
 	menu "Pay ^FF000025,000z^000000.",-,"Thats way to high!!",N_HighPrice;
-	if (zeny < 25000) goto N_NoZeny;
+	if (Zeny < 25000) goto N_NoZeny;
 	set Zeny,Zeny-25000;
 	//getitem 7950, 1;
 	//getitem 7951, 1;
diff --git a/npc/custom/quests/thq/THQS_TTShop.txt b/npc/custom/quests/thq/THQS_TTShop.txt
index c764de852..25e080a8e 100644
--- a/npc/custom/quests/thq/THQS_TTShop.txt
+++ b/npc/custom/quests/thq/THQS_TTShop.txt
@@ -51,7 +51,7 @@ N_Shop:
 	close;
 N_GetZeny1k:
 	set #Treasure_Token,#Treasure_Token-1;
-	set zeny,zeny+1000;
+	set Zeny,Zeny+1000;
 	close;
 N_10T:
 	if (#Treasure_Token > 9) goto N_GetZeny10k;
@@ -59,7 +59,7 @@ N_10T:
 	close;
 N_GetZeny10k:
 	set #Treasure_Token,#Treasure_Token-10;
-	set zeny,zeny+10000;
+	set Zeny,Zeny+10000;
 	close;
 N_100T:
 	if (#Treasure_Token > 99) goto N_GetZeny100k;
@@ -67,7 +67,7 @@ N_100T:
 	close;
 N_GetZeny100k:
 	set #Treasure_Token,#Treasure_Token-100;
-	set zeny,zeny+100000;
+	set Zeny,Zeny+100000;
 	close;
 
 N_BuyWeps:
diff --git a/npc/custom/quests/valhallen.txt b/npc/custom/quests/valhallen.txt
index bb84e73e5..c70de008b 100644
--- a/npc/custom/quests/valhallen.txt
+++ b/npc/custom/quests/valhallen.txt
@@ -21,46 +21,46 @@ prontera,147,171,5	script	Lenneth	4_F_VALKYRIE,{
 		case 1:
 			mes "[Lenneth]";
 			mes "^3355FFMjolnir^000000 is the mighty Hammer of Thor.";
-			setarray .@Items[0],1530,1531,2,984,20,985,5,969,40,7074,2,7075,4,7078,5,7087,5,7089,5;
+			setarray .@items[0],1530,1531,2,984,20,985,5,969,40,7074,2,7075,4,7078,5,7087,5,7089,5;
 			break;
 		case 2:
 			mes "[Lenneth]";
 			mes "^3355FFSleipnir^000000 are boots made after Odin's War Horse.";
-			setarray .@Items[0],2410,2406,2,984,1,969,20,985,10,7076,3,7079,5,7083,3,7086,3;
+			setarray .@items[0],2410,2406,2,984,1,969,20,985,10,7076,3,7079,5,7083,3,7086,3;
 			break;
 		case 3:
 			mes "[Lenneth]";
 			mes "^3355FFBrisingammen^000000 is the magical Necklace of Freyja, goddess of Beauty.";
-			setarray .@Items[0],2630,2603,1,726,2,722,3,727,10,723,5,969,20,7073,4,7077,4,7088,3,7090,3,7092,3;
+			setarray .@items[0],2630,2603,1,726,2,722,3,727,10,723,5,969,20,7073,4,7077,4,7088,3,7090,3,7092,3;
 			break;
 		case 4:
 			mes "[Lenneth]";
 			mes "The ^3355FFGleipnir^000000 is a light yet strong rope required to make ^3355FFMegingjard^000000";
-			setarray .@Items[0],7058,7080,4,7081,5,7082,4,7084,3,7085,3;
+			setarray .@items[0],7058,7080,4,7081,5,7082,4,7084,3,7085,3;
 			break;
 		case 5:
 			mes "[Lenneth]";
 			mes "The ^3355FFMegingjard^000000 is the powerful Belt of Thor.";
-			setarray .@Items[0],2629,7058,1,2627,1,969,10,726,10,984,5;
+			setarray .@items[0],2629,7058,1,2627,1,969,10,726,10,984,5;
 			break; }
 	mes "^FF0000The items I need are as follows:^000000";
-	for(set .@i,1; .@i<getarraysize(.@Items[0]); set .@i,.@i+2) {
-		mes " ~ "+.@Items[.@i+1]+"x ^3355FF"+getitemname(.@Items[.@i])+"^000000";
-		if (countitem(.@Items[.@i]) < .@Items[.@i+1]) set .@nr,1; }
+	for(set .@i,1; .@i<getarraysize(.@items[0]); set .@i,.@i+2) {
+		mes " ~ "+.@items[.@i+1]+"x ^3355FF"+getitemname(.@items[.@i])+"^000000";
+		if (countitem(.@items[.@i]) < .@items[.@i+1]) set .@nr,1; }
 	if (.@nr) close;
 	next;
 	mes "[Lenneth]";
-	mes "Do you desire ^3355FF"+getitemname(.@Items[0])+"^000000?";
+	mes "Do you desire ^3355FF"+getitemname(.@items[0])+"^000000?";
 	next;
 	if(select("Yes:No")==2) {
 		mes "[Lenneth]";
 		mes "Please return if you change your mind.";
 		close; }
 	mes "[Lenneth]";
-	mes "Here is your ^3355FF"+getitemname(.@Items[0])+"^000000.";
+	mes "Here is your ^3355FF"+getitemname(.@items[0])+"^000000.";
 	mes "May it serve you well.";
-	for(set .@i,1; .@i<getarraysize(.@Items); set .@i,.@i+2)
-		delitem .@Items[.@i], .@Items[.@i+1];
-	getitem .@Items[0],1;
+	for(set .@i,1; .@i<getarraysize(.@items); set .@i,.@i+2)
+		delitem .@items[.@i], .@items[.@i+1];
+	getitem .@items[0],1;
 	close;
 }