Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4

- Consolidated case in variables, labels, constants.

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

8 files changed, 62 insertions, 62 deletions

diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt
index ebf626b98..a5796fccd 100644
--- a/npc/custom/etc/airplane.txt
+++ b/npc/custom/etc/airplane.txt
@@ -252,8 +252,8 @@ L_Nope:
 
 Notime:
 	mes "^FF0000[Porter]^000000";
-	if(sex==0) mes "Sorry, ma'am, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
-	if(sex==1) mes "Sorry, sir, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
+	if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
+	if(Sex==1) mes "Sorry, sir, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
 	next;
 	menu "Yes, please.",Itin,"No thanks.",L_Nope;
 	close;
@@ -363,8 +363,8 @@ Lnope:
 
 Notime:
 	mes "^FF0000[Airplane Attendant]^000000";
-	if(sex==0) mes "Sorry, ma'am, but the plane currently isn't docked.  Please wait.";
-	if(sex==1) mes "Sorry, sir, but the plane currently isn't docked.  Please wait.";
+	if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't docked.  Please wait.";
+	if(Sex==1) mes "Sorry, sir, but the plane currently isn't docked.  Please wait.";
 	close;
 
 Nowhere:
diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt
index e2020155f..48086abbd 100644
--- a/npc/custom/etc/bank_kafra.txt
+++ b/npc/custom/etc/bank_kafra.txt
@@ -47,8 +47,8 @@ L_NoIncomeToday:
 	if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT;
 
 	if(@kafrabank<1000) goto L_LESS_1000;
-	if(@kafrabank>zeny) goto L_NOT_ENOUGH;
-	set zeny,zeny-@kafrabank;
+	if(@kafrabank>Zeny) goto L_NOT_ENOUGH;
+	set Zeny,Zeny-@kafrabank;
 	set #kafrabank,#kafrabank+@kafrabank;
 	mes"[Maniss]";
 	mes "You've made a deposit of ^135445" + @kafrabank + "z^000000.";
@@ -67,7 +67,7 @@ M_WITHDRAW:
 	if(@kafrabank<1) goto B_EXIT2;
 	if(@kafrabank>#kafrabank) goto L_NOT_ENOUGH;
 	set #kafrabank,#kafrabank-@kafrabank;
-	set zeny,zeny+@kafrabank;
+	set Zeny,Zeny+@kafrabank;
 	mes"[Maniss]";
 	mes "Here is your ^135445" + @kafrabank + "z^000000, put your sign here...";
 	//we log these zeny operations into the log db
diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt
index ef169c190..26c4afa9f 100644
--- a/npc/custom/etc/lottery.txt
+++ b/npc/custom/etc/lottery.txt
@@ -106,8 +106,8 @@ L_Buy:
 	mes "The Jackpot is ^FF0000" + $L_Prize_Money + "z^000000.";
 	next;
 	menu "Buy Ticket",-,"Cancel",L_Cancel;
-	if (zeny < $L_TicketPrice) goto L_NoZeny;
-	set zeny,zeny-$L_TicketPrice;
+	if (Zeny < $L_TicketPrice) goto L_NoZeny;
+	set Zeny,Zeny-$L_TicketPrice;
 	mes "[Lottery]";
 	mes "Would you like your numbers hand picked or computer generated?";
 	next;
@@ -292,7 +292,7 @@ LWinBig:
 	mes "You have matched all six numbers!";
 	mes "Jackpot!";
 	mes "You've won ^0000FF" + $L_Prize_Money + "z^000000.";
-	set zeny,zeny+$L_Prize_Money;
+	set Zeny,Zeny+$L_Prize_Money;
 	announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8;
 	set #LID,0;
 	close;
@@ -302,7 +302,7 @@ LWinSmall:
 	mes "[Lottery]";
 	mes "You have matched at least 4 numbers!";
 	mes "You've won ^0000FF" + $L_Prize_Money_Small + "z^000000.";
-	set zeny,zeny+$L_Prize_Money_Small;
+	set Zeny,Zeny+$L_Prize_Money_Small;
 	announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8;
 	set #LID,0;
 	close;
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index 0549502cd..f0ec34f0a 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -392,19 +392,19 @@ OnTimer55000:
 
 //Subfunction: Checks that the groom/bride is still wearing their stuff.
 function SF_equip_check {
-	if (sex && getequipid(2) != 7170) {
+	if (Sex && getequipid(2) != 7170) {
 		mes "["+@name$+"]";
 		mes "Child, what did you do with your "+getitemname(7170)+"?";
 		emotion e_dots;
 		return 0;
 	}
-	if (sex == 0 && getequipid(2) != 2338) {
+	if (Sex == 0 && getequipid(2) != 2338) {
 		mes "["+@name$+"]";
 		mes "Child, you are supposed to wear a "+getitemname(2338)+" at all times during the ceremony...";
 		emotion e_dots;
 		return 0;
 	}
-	if (sex == 0 && $@wed_veil && getequipid(1) != 2206) {
+	if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) {
 		mes "["+@name$+"]";
 		mes "Child, you can't take off your "+getitemname(2206)+" yet....";
 		emotion e_dots;
@@ -487,7 +487,7 @@ function SF_Register {
 		mes "Very well, whom would you like to register as?";
 		next;
 		set @submenu, select("Groom","Bride","Cancel");
-	} else if (sex) { //Groom
+	} else if (Sex) { //Groom
 		mes "["+@name$+"]";
 		mes "Very well, will you register as the Groom?";
 		next;
@@ -547,7 +547,7 @@ function SF_WedProgress {
 			mes "Tell your groom to register, what is taking so long? Time is running out.";
 		close;
 	}
-	if (($wed_groom_progress == 0) && (sex == 1 || $@wed_allow == 1)) {
+	if (($wed_groom_progress == 0) && (Sex == 1 || $@wed_allow == 1)) {
 		mes "["+@name$+"]";
 		mes $wed_bride$+" is waiting for the groom to register. Are you the one who came to register as groom?";
 		next;
@@ -569,7 +569,7 @@ function SF_WedProgress {
 		}
 
 	}
-	if (($wed_bride_progress == 0) && (sex == 0 || $@wed_allow == 1)) {
+	if (($wed_bride_progress == 0) && (Sex == 0 || $@wed_allow == 1)) {
 		mes "["+@name$+"]";
 		mes $wed_groom$+" is waiting for the bride to register. Are you the one who came to register as the bride?";
 		next;
@@ -685,7 +685,7 @@ function SF_TryRegister {
 		emotion e_gasp;
 		close;
 	}
-	if (sex)
+	if (Sex)
 		set @item, 7170;
 	else
 		set @item, 2338;
@@ -695,7 +695,7 @@ function SF_TryRegister {
 		mes "You should be wearing a "+getitemname(@item)+" if you want to get married.";
 		close;
 	}
-	if (sex == 0 && $@wed_veil && getequipid(1) != 2206) {
+	if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) {
 		mes "["+@name$+"]";
 		mes "Where is your "+getitemname(2206)+"? It's a necessary complement to your dress.";
 		close;
@@ -717,17 +717,17 @@ function SF_TryRegister {
 		close;
 	}
 	set Zeny,Zeny-@cost;
-	sc_start SC_Wedding,3600000,1; //Start Wedding Effect (SC_WEDDING)
+	sc_start SC_WEDDING,3600000,1; //Start Wedding Effect (SC_WEDDING)
 	if (@bride) {
 		set $wed_bride_progress,1;
 		set $wed_bride$,strcharinfo(0);
-		set $wed_bride_sex, sex;
+		set $wed_bride_sex, Sex;
 		if ($@wedding_effect == 1) //Store account id for effect.
 			set $wedding_effect_id, getcharid(3);
 	} else {
 		set $wed_groom_progress,1;
 		set $wed_groom$,strcharinfo(0);
-		set $wed_groom_sex, sex;
+		set $wed_groom_sex, Sex;
 		if ($@wedding_effect == 2) //Store account id for effect.
 			set $wedding_effect_id, getcharid(3);
 	}
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 51304c1a0..90fd500f6 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -288,8 +288,8 @@ gon_test,52,103,6	script	Monster Trainer	4_M_BARBER,{
 	next;
 	menu "Yes",-,"No",L_Exit;
 
-	if (zeny < 1000) goto L_NoZeny;
-	set zeny,zeny-1000;
+	if (Zeny < 1000) goto L_NoZeny;
+	set Zeny,Zeny-1000;
 	set #monster,10;
 	mes "[Monster Trainer]";
 	mes "Congratulations!";
@@ -327,7 +327,7 @@ L_Sell:
 	if (@sellexp > #monpoints) goto L_NoExp;
 	set #monpoints,#monpoints-@sellexp;
 	set @sellearn,100*@sellexp; // Price of exp
-	set zeny,zeny+@sellearn;
+	set Zeny,Zeny+@sellearn;
 	mes "[Monster Trainer]";
 	mes "You earned ^0000FF" + @sellearn + "^000000z.";
 	close;
diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt
index 61dd80676..d86c9dc94 100644
--- a/npc/custom/etc/penal_servitude.txt
+++ b/npc/custom/etc/penal_servitude.txt
@@ -17,7 +17,7 @@
 sec_pri,36,58,1	script	Chief Warder	8W_SOLDIER,{ 
 	mes "[Saddeus]";
 	emotion 1;
-	if(sex) {
+	if(Sex) {
 		mes "Mr. Prisoner #"+BaseLevel+JobLevel+",";
 	} else {
 		mes "Ms. Prisoner #"+BaseLevel+JobLevel+",";
diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt
index 4a4f7338d..29b8384fe 100644
--- a/npc/custom/etc/shifty_assassin.txt
+++ b/npc/custom/etc/shifty_assassin.txt
@@ -48,14 +48,14 @@ M_Buy:
 	if ($ninja_avail < 1) goto NoNinjas;
 	if ($ninja_avail < @buy) goto NotEnoughNinjas;
 	set @price,@buy*$ninja_price;
-	if (zeny < @price ) goto NoZeny;
+	if (Zeny < @price ) goto NoZeny;
 
 	mes "[Shifty Assassin]";
 	mes "That will cost you ^0000FF" + @price + " zeny^000000.";
 	next;
 	menu "Continue",-,"Cancel",M_Exit;
 
-	set zeny,zeny-@price;
+	set Zeny,Zeny-@price;
 	set #ninjas,#ninjas+@buy;
 	set $ninja_avail,$ninja_avail-@buy;
 
diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt
index b805d7895..7cd284ef9 100644
--- a/npc/custom/etc/stock_market.txt
+++ b/npc/custom/etc/stock_market.txt
@@ -277,15 +277,15 @@ S_Sell:
 	set @sellamount,0;
 	input @sellamount;
 	if (@sellamount < 1) goto S_SellInv;
-	if (zeny < $S_Trans) goto S_NoZeny;
-	set zeny,zeny-$S_Trans;
+	if (Zeny < $S_Trans) goto S_NoZeny;
+	set Zeny,Zeny-$S_Trans;
 
 SELLS1:
 	if (@sellname$ != $S1N$) goto SELLS2;
 	if (@sellamount > #S1) goto S_SellTooHigh;
 	set @price,@sellamount*$S1;
 	set #S1,#S1-@sellamount;
-	set zeny,zeny+@price;
+	set Zeny,Zeny+@price;
 	next;
 	mes "Sold " + @sellamount + " " + $S1N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -297,7 +297,7 @@ SELLS2:
 	if (@sellamount > #S2) goto S_SellTooHigh;
 	set @price,@sellamount*$S2;
 	set #S2,#S2-@sellamount;
-	set zeny,zeny+@price;
+	set Zeny,Zeny+@price;
 	next;
 	mes "Sold " + @sellamount + " " + $S2N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -309,7 +309,7 @@ SELLS3:
 	if (@sellamount > #S3) goto S_SellTooHigh;
 	set @price,@sellamount*$S3;
 	set #S3,#S3-@sellamount;
-	set zeny,zeny+@price;
+	set Zeny,Zeny+@price;
 	next;
 	mes "Sold " + @sellamount + " " + $S3N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -321,7 +321,7 @@ SELLS4:
 	if (@sellamount > #S4) goto S_SellTooHigh;
 	set @price,@sellamount*$S4;
 	set #S4,#S4-@sellamount;
-	set zeny,zeny+@price;
+	set Zeny,Zeny+@price;
 	next;
 	mes "Sold " + @sellamount + " " + $S4N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -333,7 +333,7 @@ SELLS5:
 	if (@sellamount > #S5) goto S_SellTooHigh;
 	set @price,@sellamount*$S5;
 	set #S5,#S5-@sellamount;
-	set zeny,zeny+@price;
+	set Zeny,Zeny+@price;
 	next;
 	mes "Sold " + @sellamount + " " + $S5N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -345,7 +345,7 @@ SELLS6:
 	if (@sellamount > #S6) goto S_SellTooHigh;
 	set @price,@sellamount*$S6;
 	set #S6,#S6-@sellamount;
-	set zeny,zeny+@price;
+	set Zeny,Zeny+@price;
 	next;
 	mes "Sold " + @sellamount + " " + $S6N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -357,7 +357,7 @@ SELLS7:
 	if (@sellamount > #S7) goto S_SellTooHigh;
 	set @price,@sellamount*$S7;
 	set #S7,#S7-@sellamount;
-	set zeny,zeny+@price;
+	set Zeny,Zeny+@price;
 	next;
 	mes "Sold " + @sellamount + " " + $S7N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -369,7 +369,7 @@ SELLS8:
 	if (@sellamount > #S8) goto S_SellTooHigh;
 	set @price,@sellamount*$S8;
 	set #S8,#S8-@sellamount;
-	set zeny,zeny+@price;
+	set Zeny,Zeny+@price;
 	next;
 	mes "Sold " + @sellamount + " " + $S8N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -381,7 +381,7 @@ SELLS9:
 	if (@sellamount > #S9) goto S_SellTooHigh;
 	set @price,@sellamount*$S9;
 	set #S9,#S9-@sellamount;
-	set zeny,zeny+@price;
+	set Zeny,Zeny+@price;
 	next;
 	mes "Sold " + @sellamount + " " + $S9N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -393,7 +393,7 @@ SELLS10:
 	if (@sellamount > #S10) goto S_SellTooHigh;
 	set @price,@sellamount*$S10;
 	set #S10,#S10-@sellamount;
-	set zeny,zeny+@price;
+	set Zeny,Zeny+@price;
 	next;
 	mes "Sold " + @sellamount + " " + $S10N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -442,18 +442,18 @@ S_Buy:
 	// Checks valid number //
 	if (@buyamount < $S_BuyMin) goto S_TooLow;
 	if (@buyamount > $S_BuyMax) goto S_TooHigh;
-	if (zeny < $S_Trans) goto S_NoZeny;
-	set zeny,zeny-$S_Trans;
+	if (Zeny < $S_Trans) goto S_NoZeny;
+	set Zeny,Zeny-$S_Trans;
 
 	// Purchases the shares //
 
 PURS1:
 	if (@buyname$ != $S1N$) goto PURS2;
 	set @price,@buyamount*$S1;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S1,#S1+@buyamount;
 	set @price,@buyamount*$S1;
-	set zeny,zeny-@price;
+	set Zeny,Zeny-@price;
 	mes "Bought " + @buyamount + " " + $S1N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -462,9 +462,9 @@ PURS1:
 PURS2:
 	if (@buyname$ != $S2N$) goto PURS3;
 	set @price,@buyamount*$S2;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S2,#S2+@buyamount;
-	set zeny,zeny-@price;
+	set Zeny,Zeny-@price;
 	mes "Bought " + @buyamount + " " + $S2N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -473,9 +473,9 @@ PURS2:
 PURS3:
 	if (@buyname$ != $S3N$) goto PURS4;
 	set @price,@buyamount*$S3;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S3,#S3+@buyamount;
-	set zeny,zeny-@price;
+	set Zeny,Zeny-@price;
 	mes "Bought " + @buyamount + " " + $S3N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -484,9 +484,9 @@ PURS3:
 PURS4:
 	if (@buyname$ != $S4N$) goto PURS5;
 	set @price,@buyamount*$S4;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S4,#S4+@buyamount;
-	set zeny,zeny-@price;
+	set Zeny,Zeny-@price;
 	mes "Bought " + @buyamount + " " + $S4N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -495,9 +495,9 @@ PURS4:
 PURS5:
 	if (@buyname$ != $S5N$) goto PURS6;
 	set @price,@buyamount*$S5;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S5,#S5+@buyamount;
-	set zeny,zeny-@price;
+	set Zeny,Zeny-@price;
 	mes "Bought " + @buyamount + " " + $S5N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -506,9 +506,9 @@ PURS5:
 PURS6:
 	if (@buyname$ != $S6N$) goto PURS7;
 	set @price,@buyamount*$S6;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S6,#S6+@buyamount;
-	set zeny,zeny-@price;
+	set Zeny,Zeny-@price;
 	mes "Bought " + @buyamount + " " + $S6N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -517,9 +517,9 @@ PURS6:
 PURS7:
 	if (@buyname$ != $S7N$) goto PURS8;
 	set @price,@buyamount*$S7;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S7,#S7+@buyamount;
-	set zeny,zeny-@price;
+	set Zeny,Zeny-@price;
 	mes "Bought " + @buyamount + " " + $S7N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -528,9 +528,9 @@ PURS7:
 PURS8:
 	if (@buyname$ != $S8N$) goto PURS9;
 	set @price,@buyamount*$S8;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S8,#S8+@buyamount;
-	set zeny,zeny-@price;
+	set Zeny,Zeny-@price;
 	mes "Bought " + @buyamount + " " + $S8N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -539,9 +539,9 @@ PURS8:
 PURS9:
 	if (@buyname$ != $S9N$) goto PURS10;
 	set @price,@buyamount*$S9;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S9,#S9+@buyamount;
-	set zeny,zeny-@price;
+	set Zeny,Zeny-@price;
 	mes "Bought " + @buyamount + " " + $S9N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -550,9 +550,9 @@ PURS9:
 PURS10:
 	if (@buyname$ != $S10N$) goto PURS11;
 	set @price,@buyamount*$S10;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S10,#S10+@buyamount;
-	set zeny,zeny-@price;
+	set Zeny,Zeny-@price;
 	mes "Bought " + @buyamount + " " + $S10N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;