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]

13 files changed, 25 insertions, 25 deletions

diff --git a/npc/other/acolyte_warp.txt b/npc/other/acolyte_warp.txt
index 2b6e102cb..10cd72124 100644
--- a/npc/other/acolyte_warp.txt
+++ b/npc/other/acolyte_warp.txt
@@ -59,7 +59,7 @@ prontera,98,121,4	script	Acolyte#Prtclear	4_F_01,{
 		specialeffect2 EF_TELEPORTATION;
 		specialeffect2 EF_PORTAL;
 		next;
-		set Zeny, Zeny - .@cost[.@i];
+		Zeny -= .@cost[.@i];
 		switch(.@i) {
 			case 0: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; break;
 			case 1: warp "geffen",120,39; break;
@@ -122,7 +122,7 @@ yuno,142,184,6	script	Acolyte#Junoclear	4_F_01,{
 		specialeffect2 EF_TELEPORTATION;
 		specialeffect2 EF_PORTAL;
 		next;
-		set Zeny, Zeny - .@cost[.@i];
+		Zeny -= .@cost[.@i];
 		switch(.@i) {
 			case 0: warp "einbroch",67,195; break;
 			case 1: warp "lighthalzen",159,90; break;
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index 2be12b02e..0f4e53ca5 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -93,7 +93,7 @@ OnTouch:
 	if(Zeny < 1000)
 		warp "arena_room",100,75;
 	else {
-		set Zeny,Zeny -1000;
+		Zeny -= 1000;
 		set $arn_partywait,0;
 		donpcevent "toout#party::OnStop";
 		warp "force_1-2",99,26;
diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt
index 548e1e68d..f8048e23a 100644
--- a/npc/other/comodo_gambling.txt
+++ b/npc/other/comodo_gambling.txt
@@ -8,7 +8,7 @@
 //= Comodo Gambling: Win random Items with 3 Carat Diamonds.
 //===== Additional Comments: =================================
 //= 0.1- so far just a basic setup, and working on the function
-//= 0.2- fixed some spelling errors and set zeny,zeny - (@amount * 55000)[Cypress]
+//= 0.2- fixed some spelling errors and Zeny -= (@amount * 55000)[Cypress]
 //= 0.3- Revised the gambling NPC using the official Aegis script [MasterOfMuppets]
 //=      for information. Thanks to Zefris for doing it for me.
 //= 0.4- Fixed an exploit. thanks to reddozen [MasterOfMuppets]
@@ -474,7 +474,7 @@ comodo,210,154,2	script	Suspicious Guy#cmd	2_M_THIEFMASTER,{
 			next;
 			mes "[Cain]";
 			mes "I guess it can't hurt to gather some Diamonds there and try to exchange them for whatever the old lady's got. Take care, pal~";
-			set Zeny,Zeny-500;
+			Zeny -= 500;
 			close;
 		}
 		mes "[Cain]";
@@ -554,7 +554,7 @@ mjolnir_02,85,362,3	script	Blacksmith Miner	4_F_JOB_BLACKSMITH,{
 			mes "I don't think give you anything if there's no room in your inventory. Why don't you put some of your stuff into Kafra Storage?";
 			close;
 		}
-		set Zeny,Zeny - .@cost;
+		Zeny -= .@cost;
 		getitem 732,.@amount;
 		mes "[Dwayne]";
 		mes "Thank you for";
diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt
index ef10f9734..ce497018b 100644
--- a/npc/other/divorce.txt
+++ b/npc/other/divorce.txt
@@ -194,7 +194,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	4_DEVIRUCHI,{
 		specialeffect EF_MAGICROD;
 		specialeffect2 EF_DEVIL;
 		set wedding_sign,0;
-		set Zeny, Zeny-2500000;
+		Zeny -= 2500000;
 		percentheal -100,-100;
 		divorce;
 		mes "[Deviruchi]";
diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt
index b0274f620..b622c1fac 100644
--- a/npc/other/fortune.txt
+++ b/npc/other/fortune.txt
@@ -45,7 +45,7 @@ payon_in03,117,128,5	script	Fortune Teller	4_M_BIBI,{
 			else {
 				mes "[Lhimetorra]";
 				mes "I accept your heart and your devotion with my gratitude. Thoughts are more important than the amount when paying a fortune teller.";
-				set Zeny, Zeny-.@input;
+				Zeny -= .@input;
 			}
 			next;
 			mes "[Lhimetorra]";
@@ -2753,7 +2753,7 @@ payon_in03,75,129,5	script	Poring Fortune Teller	4_M_BIBI,{
 				mes "Nope!";
 				close;
 			}
-			set Zeny, Zeny-1000;
+			Zeny -= 1000;
 			mes "[Chocarle]";
 			mes " Thank you~! Then we shall look into your fortune! ";
 			mes " First, clear your mind! Just like washing when you wash dishes! ";
diff --git a/npc/other/mail.txt b/npc/other/mail.txt
index 658337a98..bc7825e6e 100644
--- a/npc/other/mail.txt
+++ b/npc/other/mail.txt
@@ -38,7 +38,7 @@
 			close;
 		}
 		mes "Thank you, please come again.";
-		set Zeny, Zeny - 130;
+		Zeny -= 130;
 		close2;
 		openmail;
 		end;
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index 0cfc8c8a6..5cb1946d6 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -351,7 +351,7 @@ prt_church,97,100,4	script	Wedding Staff#w	1_F_LIBRARYGIRL,{
 				mes "finished, it will be your";
 				mes "bride's turn to speak to";
 				mes "Bishop Vomars.";
-				set Zeny, Zeny-1300000;
+				Zeny -= 1300000;
 				delitem 7170,1; //Tuxedo
 			}
 			else {
@@ -361,7 +361,7 @@ prt_church,97,100,4	script	Wedding Staff#w	1_F_LIBRARYGIRL,{
 				mes "Vomars first. When he's";
 				mes "finished, it'll be your turn";
 				mes "to speak to Bishop Vomars.";
-				set Zeny, Zeny-1200000;
+				Zeny -= 1200000;
 				delitem 2338,1; //Wedding_Dress
 			}
 			delitem 2613,1; //Diamond_Ring
diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt
index ac1a532f5..7b2a47d0a 100644
--- a/npc/other/mercenary_rent.txt
+++ b/npc/other/mercenary_rent.txt
@@ -94,7 +94,7 @@
 				mes "Summoned Mercenaries will";
 				mes "offer their support to you for";
 				mes "30 minutes. Take care now.";
-				set Zeny, Zeny - (.@ZenyCost * 1000);
+				Zeny -= (.@ZenyCost * 1000);
 				getitem .@item[.@type] - 10 + .@Grade, 1;
 			}
 			close;
@@ -280,7 +280,7 @@ pay_arche,99,167,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Bow	4_M_J
 	mes "Thank you, and please come";
 	mes "again when you need more";
 	mes "potions for your Mercenaries.";
-	set Zeny, Zeny - .@total_po;
+	Zeny -= .@total_po;
 	getitem .@item[.@m], .@input;
 	close;
 }
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index 950656b6e..3b2dd618b 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -657,7 +657,7 @@ hugel,58,72,6	script	Eckar Ellebird#single	4_M_NFMAN,{
 			mes "that you enjoy the race~";
 			mes "Let me guide you inside";
 			mes "the Monster Race Arena now.";
-			set Zeny, Zeny-2000;
+			Zeny -= 2000;
 			set monster_race_1,0;
 			close2;
 			warp "p_track01",75,41;
@@ -678,7 +678,7 @@ hugel,58,72,6	script	Eckar Ellebird#single	4_M_NFMAN,{
 			mes "you enjoy this race.";
 			mes "Let me guide you now";
 			mes "to the Monster Race Arena.";
-			set Zeny, Zeny-2000;
+			Zeny -= 2000;
 			set monster_race_1,0;
 			close2;
 			warp "p_track01",75,41;
@@ -715,7 +715,7 @@ hugel,58,72,6	script	Eckar Ellebird#single	4_M_NFMAN,{
 			mes "Thank you~";
 			mes "I hope you enjoy";
 			mes "watching this race!";
-			set Zeny, Zeny-500;
+			Zeny -= 500;
 			set monster_race_1,0;
 			close2;
 			warp "p_track01",75,41;
@@ -1281,7 +1281,7 @@ hugel,62,69,1	script	Eckar Erenes#double	4_M_NFMAN,{
 			mes "that you enjoy the race~";
 			mes "Let me guide you inside";
 			mes "the Monster Race Arena now.";
-			set Zeny, Zeny-2000;
+			Zeny -= 2000;
 			set monster_race_2_1,0;
 			set monster_race_2_2,0;
 			close2;
@@ -1304,7 +1304,7 @@ hugel,62,69,1	script	Eckar Erenes#double	4_M_NFMAN,{
 			mes "you enjoy this race.";
 			mes "Let me guide you now";
 			mes "to the Monster Race Arena.";
-			set Zeny, Zeny-2000;
+			Zeny -= 2000;
 			set monster_race_2_1,0;
 			set monster_race_2_2,0;
 			close2;
@@ -1342,7 +1342,7 @@ hugel,62,69,1	script	Eckar Erenes#double	4_M_NFMAN,{
 			mes "Thank you~";
 			mes "I hope you enjoy";
 			mes "watching this race!";
-			set Zeny, Zeny-500;
+			Zeny -= 500;
 			set monster_race_2_1,0;
 			set monster_race_2_2,0;
 			close2;
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt
index 3cd36dbfe..38eac1de1 100644
--- a/npc/other/poring_war.txt
+++ b/npc/other/poring_war.txt
@@ -41,7 +41,7 @@ prt_fild08,159,371,3	script	Poring War Recruiter#wop	4_PORING,{
 			mes "Oh, and there's an entrance fee of 500 zeny, ring.";
 			mes "Have a good time, ring.";
 			delitem 7773,countitem(7773);
-			set Zeny,Zeny-500;
+			Zeny -= 500;
 			close2;
 			warp "poring_w01",112,138;
 			end;
diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt
index 0428eca36..33c6980dd 100644
--- a/npc/other/powernpc.txt
+++ b/npc/other/powernpc.txt
@@ -137,7 +137,7 @@ gon_test,50,14,4	script	Administrator#gnp	8_M_TWSOLDIER,{
 		mes "I'm sorry but you don't have enough zeny.";
 		close;
 	}
-	set Zeny,Zeny - 500;
+	Zeny -= 500;
 	set in_battle,1;
 	warp "gon_test",42,86;
 	set $@in_battle,1;
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index bf98fb55a..779f332ae 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -198,7 +198,7 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	4_M_02
 			switch(select("Move:Cancel")) {
 			case 1:
 				if ((Zeny > 499) && (BaseLevel > 30)) {
-					set Zeny, Zeny - 500;
+					Zeny -= 500;
 					callsub L_Warp,"pvp_y_room";
 				}
 				else {
@@ -237,7 +237,7 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	4_M_02
 			}
 			mes "[Gate Keeper]";
 			mes "Yes, thank you for participating. Have fun!";
-			if (Zeny >= 500) set Zeny, Zeny - 500;
+			if (Zeny >= 500) Zeny -= 500;
 			callsub L_Warp,"pvp_room";
 			break;
 		case 4:
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index dea910aa3..21aaa24d7 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -4777,7 +4777,7 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 						if (countitem(7310) > 0)
 							delitem 7310,1; //Free_Peco_Ticket
 						else
-							set Zeny, Zeny-.@zeny;
+							Zeny -= .@zeny;
 					}
 				}
 				switch(.@i) {