Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179

Cleaned up Zeny manipulation in scripts.

- It is now finally safe to re-commit.
- Removed some unwanted parts of the original commit, that broke the
  character set in some scripts. [Haru]
- Corrected spacing in some edited lines. [Haru]

19 files changed, 45 insertions, 45 deletions

diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 0fb5ce2f2..232fb5da3 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -205,7 +205,7 @@ alberta,189,151,5	script	Fisk	4W_SAILOR,{
 				mes "Hey now, don't try to cheat me! I said 250 zeny!";
 				close;
 			}
-			set Zeny,Zeny - 250;
+			Zeny -= 250;
 			warp "alb2trea",43,53;
 			end;
 		case 2:
@@ -214,7 +214,7 @@ alberta,189,151,5	script	Fisk	4W_SAILOR,{
 				mes "Ain't no way yer getting there without the 500 zeny first!";
 				close;
 			}
-			set Zeny,Zeny - 500;
+			Zeny -= 500;
 			if(checkre(0))
 				warp "izlude",195,212;
 			else
@@ -262,7 +262,7 @@ alberta,195,151,2	script	Paul	4_M_04,{
 				mes "It seems you don't have the money, my friend. But please come back when you're able to pay.";
 				close;
 			} else {
-				set Zeny,Zeny - 200;
+				Zeny -= 200;
 				warp "alb2trea",62,69;
 				close;
 			}
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index cbd79a50b..1bc78f0fd 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -800,7 +800,7 @@ aldeba_in,84,166,4	script	Kafra Service#alde	4_F_KAFRA1,{
 					end;
 				}
 				delitem 1084,countitem(1084); //Kapra's_Pass
-				set Zeny,Zeny+.@kafrapassmoney;
+				Zeny += .@kafrapassmoney;
 				mes "[Kafra Pavianne]";
 				mes "Thank you.";
 			}
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index c86db8a67..18ae79bdc 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -96,7 +96,7 @@
 				mes "[Walter Moers]";
 				mes "Alright, I will start the engine!";
 				close2;
-				set Zeny, Zeny-10000;
+				Zeny -= 10000;
 				warp "amatsu",197,83;
 				end;
 			}
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index e04a00ee1..86b1f3e94 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -56,7 +56,7 @@
 				mes "Let us be off! Back to my";
 				mes "beautiful Ayotaya!";
 				close2;
-				set Zeny, Zeny-10000;
+				Zeny -= 10000;
 				warp "ayothaya",149,71;
 				end;
 			}
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index cb36c38c1..f8a3f967f 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -349,12 +349,12 @@ cmd_fild07,299,83,4	script	Zain#cmd	4W_SAILOR,{
 	switch(select("Alberta - 600 Zeny:Izlude - 800 Zeny:Cancel")) {
 	case 1:
 		if (Zeny < 600) break;
-		set Zeny, Zeny-600;
+		Zeny -= 600;
 		warp "alberta",192,169;
 		end;
 	case 2:
 		if (Zeny < 800) break;
-		set Zeny, Zeny-800;
+		Zeny -= 800;
 		if(checkre(0))
 			warp "izlude",195,212;
 		else
diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt
index e1395e701..d3d853846 100644
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -212,7 +212,7 @@ einbech,39,215,5	script	Train Station Staff#ein3	4_M_EIN_SOLDIER,{
 			mes "we hope you enjoy";
 			mes "the ride. All aboard!";
 			close2;
-			set Zeny, Zeny-200;
+			Zeny -= 200;
 			warp "einbroch",226,276;
 			end;
 		}
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index 9d1c1dcad..714b0bde6 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -128,7 +128,7 @@ function	script	EinTower	{
 			mes "using our services.";
 			mes "Let me guide you to";
 			mes "the tower right away.";
-			set Zeny, Zeny-10;
+			Zeny -= 10;
 			close2;
 			warp "einbroch",181,196;
 			end;
@@ -155,7 +155,7 @@ function	script	EinTower	{
 				mes "using our services.";
 				mes "Let me guide you to";
 				mes "the tower right away.";
-				set Zeny, Zeny-20;
+				Zeny -= 20;
 				getitem 512,1; //Apple
 				close2;
 				warp "einbroch",174,204;
@@ -203,7 +203,7 @@ einbroch,232,272,3	script	Train Station Staff#ein1::EinbrochTrain	4_M_EIN_SOLDIE
 			mes "Have a safe trip.";
 			mes "^333333*Ahem*^000000 All aboard!";
 			close2;
-			set Zeny, Zeny-200;
+			Zeny -= 200;
 			warp "einbech",43,215;
 			end;
 		}
@@ -834,7 +834,7 @@ ein_in01,206,224,3	script	Hotel Employee#ein	4_M_EINMAN,{
 				mes "Please enjoy";
 				mes "your rest~";
 				close2;
-				set Zeny, Zeny-5000;
+				Zeny -= 5000;
 				percentheal 100,100;
 				warp "ein_in01",272,167;
 				end;
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index d755af8b6..e19384997 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -286,7 +286,7 @@ OnTouch:
 			mes "^333333Now I gotta find some other sucker to dump this junk on!^000000 *Ahem* I mean, come again!";
 			close;
 		}
-		set Zeny, Zeny-.@Red_potion_hap;
+		Zeny -= .@Red_potion_hap;
 		getitem 501,.@input; //Red_Potion
 		break;
 	case 2:
@@ -351,7 +351,7 @@ OnTouch:
 			mes "When the greatest deal in your life is right before your eyes?! Tragic, truly tragic...";
 			close;
 		}
-		set Zeny, Zeny-.@Main_gauche_hap;
+		Zeny -= .@Main_gauche_hap;
 		getitem 1207,.@input; //Main_Gauche
 		break;
 	case 3:
@@ -403,7 +403,7 @@ OnTouch:
 			mes "Short on zeny, eh?";
 			close;
 		}
-		set Zeny, Zeny-.@Hood__hap;
+		Zeny -= .@Hood__hap;
 		getitem 2501,.@input; //Hood
 		break;
 	case 4:
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index 7aa0f5e70..9c51dcd48 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -100,7 +100,7 @@
 				mes "[Wa Bai Hu]";
 				mes "Thank you, let me guide you there immediately.";
 				close2;
-				set Zeny, Zeny-10000;
+				Zeny -= 10000;
 				warp "gon_fild01",258,82;
 				end;
 			}
diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index eb000b1ed..3302d640c 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -154,7 +154,7 @@ hu_in01,23,311,4	script	Party Supplies Shop	4_M_HUMAN_01,{
 				mes "enough money~";
 				close;
 			}
-			set Zeny,Zeny-500;
+			Zeny -= 500;
 			getitem 12018,5;	// Fire_Cracker
 			mes "[Shopkeeper]";
 			mes "Here you go!";
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index 000b0893e..5aaceb709 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -48,7 +48,7 @@
 			mes "Only 150 Zeny to ride!";
 			close;
 		}
-		set Zeny, Zeny - 150;
+		Zeny -= 150;
 		warp "izlu2dun",107,50;
 		end;
 	case 2:
@@ -58,7 +58,7 @@
 			mes "Only 500 Zeny to ride!";
 			close;
 		}
-		set Zeny, Zeny - 500;
+		Zeny -= 500;
 		warp "alberta",188,169;
 		end;
 	case 3:
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 501e0f336..1b3e5b12a 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -245,7 +245,7 @@ jawaii,141,200,3	script	Employee#sroom	4_M_NFMAN,{
 			mes "ffffor you. Thank y-you.";
 			mes "Ha-have a good time.";
 			close2;
-			set Zeny, Zeny-1000;
+			Zeny -= 1000;
 			warp "jawaii_in",116,64;
 			end;
 		}
@@ -294,7 +294,7 @@ jawaii,108,199,5	script	Employee#antroom	1_F_MERCHANT_02,{
 			mes "Make yourself";
 			mes "comfortable.";
 			close2;
-			set Zeny, Zeny-1000;
+			Zeny -= 1000;
 			warp "jawaii_in",129,110;
 			end;
 		}
@@ -325,7 +325,7 @@ jawaii,107,189,5	script	Employee#horoom	4_F_04,{
 			mes "Eh, alright.";
 			mes "Let's get going.";
 			close2;
-			set Zeny, Zeny-1000;
+			Zeny -= 1000;
 			warp "jawaii_in",86,117;
 			end;
 		}
@@ -368,7 +368,7 @@ jawaii,112,173,7	script	Employee#villroom	4_F_04,{
 			mes "Thank you~";
 			mes "Enjoy your stay.";
 			close2;
-			set Zeny, Zeny-1000;
+			Zeny -= 1000;
 			warp "jawaii_in",87,75;
 			end;
 		}
@@ -413,7 +413,7 @@ jawaii,214,168,5	script	Honeymoon Helper#Jawaii	1_F_LIBRARYGIRL,{
 	if (select("I shall buy it.:No, thanks.") == 1) {
 		mes "[Helper]";
 		if (Zeny > 49999) {
-			set Zeny, Zeny-50000;
+			Zeny -= 50000;
 			getitem 681,1; //Memory_Of_Wedding 
 			mes "Thank you very much~!";
 			mes "Please remember, you";
@@ -737,7 +737,7 @@ jawaii_in,15,104,0	script	Waitress#jawaii	1_F_PUBGIRL,{
 			if (select("Yes.:Wha--! It's too expensive!") == 1) {
 				mes "[Waitress]";
 				if (Zeny > 999) {
-					set Zeny, Zeny-1000;
+					Zeny -= 1000;
 					getitem 517,1; //Meat
 					mes "There you go~";
 					mes "Enjoy your meal~!";
@@ -763,7 +763,7 @@ jawaii_in,15,104,0	script	Waitress#jawaii	1_F_PUBGIRL,{
 			if (select("Yes.:Wha--! It's too expensive!") == 1) {
 				mes "[Waitress]";
 				if (Zeny > 999) {
-					set Zeny, Zeny-1000;
+					Zeny -= 1000;
 					getitem 503,1; //Yelow_Potion
 					mes "There you go~";
 					mes "Enjoy your meal~!";
@@ -895,7 +895,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	1_ETC_01,{
 				percentheal -100,0;
 				end;
 			}
-			if (Zeny > 99) set Zeny, Zeny-100;
+			if (Zeny > 99) Zeny -= 100;
 			switch(rand(4)) {
 			case 1:
 				mes "[Bartender]";
@@ -1105,7 +1105,7 @@ S_KillChar:
 		percentheal -100,0;
 		end;
 	}
-	if (Zeny > 99) set Zeny, Zeny-100;
+	if (Zeny > 99) Zeny -= 100;
 	set .@roof_jaw,.@roof_jaw+getarg(0);
 	mes "[Bartender]";
 	mes "There you go.";
@@ -1431,7 +1431,7 @@ prt_in,170,14,0	script	Customer#Bachewcca	4_M_ORIENT02,{
 			close;
 		}
 		else if (Zeny > 99999) {
-			set Zeny, Zeny-100000;
+			Zeny -= 100000;
 			mes "Bon Voyage...!!";
 			mes "Let me guide";
 			mes "you to 'Jawaii!'";
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index d4e66a334..e6824f048 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -563,7 +563,7 @@ lighthalzen,182,102,3	script	Lucius#zen5	4_M_LGTGRAND,{
 				mes "as much as you possibly can...";
 				close;
 			}
-			set Zeny, Zeny-.@input;
+			Zeny -= .@input;
 			set $donatedzeny,$donatedzeny + .@input;
 			mes "[Lucius]";
 			mes "So far, I've received";
@@ -1020,7 +1020,7 @@ OnTouch:
 		mes "[" + strcharinfo(0) + "]";
 		mes "Here you go,";
 		mes "take this.";
-		set Zeny, Zeny-50;
+		Zeny -= 50;
 		next;
 		mes "[Beggar]";
 		mes "Thank you so much.";
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index adb01b867..0b6bbb77c 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -70,7 +70,7 @@
 				mes "Ready!";
 				mes "Have fun!";
 				close2;
-				set Zeny, Zeny-10000;
+				Zeny -= 10000;
 				warp "lou_fild01",190,101;
 				end;
 			}
@@ -292,7 +292,7 @@ lou_in01,25,23,5	script	Friendly Looking Lady#lo	4_F_CHNDRESS3,{
 		mes "We are trying to provide you with the best of service. Please";
 		mes "come again.";
 		next;
-		set Zeny, Zeny-500;
+		Zeny -= 500;
 		warp "lou_in01",17,19;
 		end;
 	case 3:
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index d2afe9d8d..cb5b608e9 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -722,7 +722,7 @@ morocc_in,166,76,3	script	Bartender#02	1_ETC_01,{
 	switch(select("Tropical Sograt:Vemillion the Beach:Nothing.")) {
 	case 1:
 		if (Zeny >= 1000 ) {
-			set Zeny, Zeny-1000;
+			Zeny -= 1000;
 			getitem 12112,1;
 			mes "[Bartender]";
 			mes "Here you go.";
@@ -733,7 +733,7 @@ morocc_in,166,76,3	script	Bartender#02	1_ETC_01,{
 		break;
 	case 2:
 		if (Zeny >= 1000 ) {
-			set Zeny, Zeny-1000;
+			Zeny -= 1000;
 			getitem 12113,1;
 			mes "[Bartender]";
 			mes "Here you go.";
diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt
index 4872f94e0..ac6ef0bb4 100644
--- a/npc/cities/moscovia.txt
+++ b/npc/cities/moscovia.txt
@@ -77,7 +77,7 @@
 				mes "[Moscovia P.R. Officer]";
 				mes "Ok then, we're leaving now.";
 				close2;
-				set Zeny,Zeny - 10000;
+				Zeny -= 10000;
 				warp "moscovia",163,55;
 				end;
 			}
diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt
index 5a4bb811d..3bbe52908 100644
--- a/npc/cities/payon.txt
+++ b/npc/cities/payon.txt
@@ -253,7 +253,7 @@ payon,210,110,1	script	Drunkard#payon	2_M_PHARMACIST,{
 	next;
 	switch(select("Alright, but only one drink.:No thanks, pal.:Oh my God! Hell no!")) {
 	case 1:
-		set Zeny, (Zeny < 100)?0:(Zeny - 100);
+		Zeny = (Zeny < 100) ? 0 : (Zeny - 100);
 		mes "[Drunkard]";
 		mes "Thanks...!";
 		mes "..Brother!";
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index 88bbcb36f..6436f3521 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -76,7 +76,7 @@ comodo,171,137,1	script	Haith#um	4_F_03,{
 	next;
 	if (select("Pay 1,000 zeny:Refuse to pay") == 1) {
 		if (Zeny > 999) {
-			set Zeny, Zeny-1000;
+			Zeny -= 1000;
 			mes "[Haith]";
 			mes "Hahahaha! You the man!";
 			next;
@@ -273,7 +273,7 @@ umbala,70,106,3	script	Utan Kid#um	4_F_UMGIRL,{
 			mes "You the man~!";
 			mes "Thank you so much, yay~!";
 			if (Zeny > 1000) {
-				set Zeny, Zeny-1000;
+				Zeny -= 1000;
 				if (checkweight(517,1)) {
 					getitem 517,1; //Meat
 				}
@@ -334,7 +334,7 @@ umbala,70,106,3	script	Utan Kid#um	4_F_UMGIRL,{
 			mes "Um~bahumbah~ Um~baumbah~";
 			mes "Um~baumbah~ um~baumbah~";
 			if (Zeny > 1000) {
-				set Zeny, Zeny-1000;
+				Zeny -= 1000;
 				if (checkweight(517,1)) {
 					getitem 517,1; //Meat
 				}
diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index c1432c4c2..8ecc4910b 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -76,7 +76,7 @@ yuno,337,227,4	script	Juno Granny#juno	8_F_GRANDMOTHER,{
 				mes "[Granny]";
 				mes "*Giggle*";
 				mes "There you go~";
-				set Zeny, Zeny-1000;
+				Zeny -= 1000;
 				getitem 529,1; //Candy
 				next;
 				mes "[Granny]";
@@ -167,7 +167,7 @@ yuno,165,111,4	script	Juno Sage#juno	2_F_MAGICMASTER,,{
 			if (select("Choose ^FF3355Red Herb^000000:Choose ^3355FFBlue Herb^000000.") == 1) {
 				mes "[Le Morpheus]";
 				mes "As you have chosen, you will forget everything, and remain in this virtual reality.";
-				set Zeny, Zeny-5000;
+				Zeny -= 5000;
 				getitem 507,1; //Red_Herb
 				close2;
 				warp "prontera",182,206;
@@ -175,7 +175,7 @@ yuno,165,111,4	script	Juno Sage#juno	2_F_MAGICMASTER,,{
 			}
 			mes "[Le Morpheus]";
 			mes "You will see the truth.";
-			set Zeny, Zeny-5000;
+			Zeny -= 5000;
 			getitem 510,1; //Blue_Herb
 			close2;
 			warp "pay_dun03",200,222;
@@ -378,7 +378,7 @@ yuno,142,183,5	script	Airship Representative	4W_SAILOR,{
 
 S_Warp:
 	if (Zeny >= 1800) {
-		set Zeny, Zeny-1800;
+		Zeny -= 1800;
 		warp getarg(0),getarg(1),getarg(2);
 		end;
 	}