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]

12 files changed, 29 insertions, 29 deletions

diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index b4400854f..f7481d04d 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -63,7 +63,7 @@ moc_para01,14,32,5	script	Aperture#acolytewarp	4_F_01,{
 		specialeffect2 EF_TELEPORTATION;
 		specialeffect2 EF_PORTAL;
 		next;
-		set Zeny, Zeny - .@cost[.@i];
+		Zeny -= .@cost[.@i];
 		switch(.@i) {
 			case 0: warp "prontera",116,72; break;
 			case 1: warp "izlude",128,98; break;
@@ -585,7 +585,7 @@ moc_para01,174,33,3	script	Bathory#2012spirits	BATHORY,{
 		mes "[Bathory]";
 		mes "Alright, hold on tight!";
 		close2;
-		set Zeny, Zeny-1000;
+		Zeny -= 1000;
 		warp "niflheim",194,185;
 		end;
 	case 2:
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index c96d5a049..cebd70b87 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -3622,7 +3622,7 @@ moc_para01,179,44,3	script	Chef	4_M_CHNCOOK,{
 					next;
 					mes "- After eating the meal, You feel a little bit full.";
 					mes "You've recovered some HP and SP. -";
-					set Zeny, Zeny - 2700;
+					Zeny -= 2700;
 					percentheal 50,0;
 					percentheal 0,50;
 					close;
@@ -3639,7 +3639,7 @@ moc_para01,179,44,3	script	Chef	4_M_CHNCOOK,{
 				next;
 				mes "- After eating the meal, You feel a little bit full.";
 				mes "You've recovered some HP and SP. -";
-				set Zeny, Zeny - 3000;
+				Zeny -= 3000;
 				percentheal 50,0;
 				percentheal 0,50;
 				close;
@@ -3661,7 +3661,7 @@ moc_para01,179,44,3	script	Chef	4_M_CHNCOOK,{
 					next;
 					mes "- After eating the meal, You feel a little bit full.";
 					mes "You've recovered some HP and SP. -";
-					set Zeny, Zeny - 3600;
+					Zeny -= 3600;
 					percentheal 75,0;
 					percentheal 0,75;
 					close;
@@ -3678,7 +3678,7 @@ moc_para01,179,44,3	script	Chef	4_M_CHNCOOK,{
 				next;
 				mes "- After eating the meal, You feel a little bit full.";
 				mes "You've recovered some HP and SP. -";
-				set Zeny, Zeny - 4000;
+				Zeny -= 4000;
 				percentheal 75,0;
 				percentheal 0,75;
 				close;
@@ -3697,7 +3697,7 @@ moc_para01,179,44,3	script	Chef	4_M_CHNCOOK,{
 					mes "- The Rib Eye Roll is grilled on the oak.";
 					mes "- After eating the meal, You feel a little bit full.";
 					mes "You've recovered your HP and SP. -";
-					set Zeny, Zeny - 4500;
+					Zeny -= 4500;
 					percentheal 100,0;
 					percentheal 0,100;
 					close;
@@ -3716,7 +3716,7 @@ moc_para01,179,44,3	script	Chef	4_M_CHNCOOK,{
 				mes "- The Rib Eye Roll is grilled on the oak.";
 				mes "- After eating the meal, You feel a little bit full.";
 				mes "You've recovered your HP and SP. -";
-				set Zeny, Zeny - 5000;
+				Zeny -= 5000;
 				percentheal 100,0;
 				percentheal 0,100;
 				close;
@@ -4580,7 +4580,7 @@ moc_para01,111,83,3	script	Toren	2_M_OLDBLSMITH,{
 						mes "You dont have enough zeny.";
 						close;
 					}
-					set Zeny, Zeny - 250000;
+					Zeny -= 250000;
 					getitem .@check[.@i],1;
 					mes "[Toren]";
 					mes "These advanced gears are not easy to make, please take better care of this one.";
@@ -4764,7 +4764,7 @@ moc_para01,112,79,3	script	Weapons Expert	4_M_REPAIR,{
 					mes "Wait... Your Class doesn't have a weapon.";
 					close;
 				}
-				set Zeny, Zeny - 250000;
+				Zeny -= 250000;
 				if (BaseClass == Job_Swordman) {
 					mes "Swordman Class gets a choice of weapons, would you like to have a sword or a spear?";
 					callsub L_Select,
diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt
index 8335b9fbe..544c7b11a 100644
--- a/npc/re/quests/eden/eden_service.txt
+++ b/npc/re/quests/eden/eden_service.txt
@@ -41,7 +41,7 @@
 						mes "Maybe I am not yet qualified to use Cabinet.";
 						close;
 					}
-					set Zeny, Zeny - 500;
+					Zeny -= 500;
 					close2;
 					openstorage;
 					end;
diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt
index 9ef1a2b6e..d5abca9fd 100644
--- a/npc/re/quests/homun_s.txt
+++ b/npc/re/quests/homun_s.txt
@@ -510,7 +510,7 @@ que_house_s,24,47,3	script	Viorel#homun_s	4_M_ALCHE_E,{
 			mes "Good. Almost done!";
 			next;
 			specialeffect2 EF_SUI_EXPLOSION;
-			set Zeny, Zeny - 50000;
+			Zeny -= 50000;
 			hommutate .@Homunculus;
 			break;
 		case 2:
diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt
index de846567a..0fd885d8f 100644
--- a/npc/re/quests/magic_books.txt
+++ b/npc/re/quests/magic_books.txt
@@ -334,7 +334,7 @@ geffen_in,175,112,4	script	Lea	2_F_MAGICMASTER,{
 					next;
 					mes "[Lea]";
 					mes "Please try not to lose or damage the book to avoid paying any extra charges.";
-					if (.@Payment == 1) set Zeny, Zeny - 10000;
+					if (.@Payment == 1) Zeny -= 10000;
 					else if (.@Payment == 2) delitem 1006,2; //Old_Magic_Book
 					else delitem 1097,50; //Worn_Out_Page
 					getitem 6188+.@i,1; //Magic_Book_FB, Magic_Book_CB, Magic_Book_LB
@@ -379,7 +379,7 @@ geffen_in,175,112,4	script	Lea	2_F_MAGICMASTER,{
 					next;
 					mes "[Lea]";
 					mes "The Intermediate and Superior Magic Books must be returned upon borrowing the Ultimate Magic Book. Remember that you're just borrowing them, so make sure you take good care of those books.";
-					if (.@Payment == 1) set Zeny, Zeny - 50000;
+					if (.@Payment == 1) Zeny -= 50000;
 					else if (.@Payment == 2) delitem 603,2; //Old_Blue_Box
 					else delitem 985,9; //Elunium
 					getitem .@Books[.@i-1],1; //Magic_Book_SG, Magic_Book_LOV, Magic_Book_MS, Magic_Book_TS, Magic_Book_JT, Magic_Book_WB, Magic_Book_HD, Magic_Book_ES
@@ -451,11 +451,11 @@ geffen_in,175,112,4	script	Lea	2_F_MAGICMASTER,{
 					next;
 					mes "[Lea]";
 					mes "The Intermediate and Superior Magic Books must be returned upon borrowing the Ultimate Magic Book. Remember that you're just borrowing them, so make sure you take good care of those books.";
-					if (.@Payment == 1) set Zeny, Zeny - 200000;
+					if (.@Payment == 1) Zeny -= 200000;
 					else if (.@Payment == 2) delitem 7094,12; //Mystery_Piece
 					else if (.@Payment == 3) delitem 984,7; //Oridecon
 					else delitem 617,1; //Old_Violet_Box
-					if (.@Payment > 1) set Zeny, Zeny - 100000;
+					if (.@Payment > 1) Zeny -= 100000;
 					getitem 6201+.@i,1; //Magic_Book_ES_, Magic_Book_CL, Magic_Book_CR, Magic_Book_DL
 					close;
 				}
@@ -647,7 +647,7 @@ mid_camp,255,244,4	script	Galfos	4_M_JOB_WIZARD,{
 				specialeffect2 EF_DISPELL;
 				progressbar "ffff00",4;
 				specialeffect2 EF_LORD;
-				set Zeny, Zeny - 1000000;
+				Zeny -= 1000000;
 				getitem 6194+.@i,1; //Magic_Book_CM, Magic_Book_TV
 				mes "[Galfos]";
 				mes "Man, I almost lost my control to the incredible magic energy! Here's your Magic Book.";
diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index 7c5ccbc7b..b6aa85ce9 100644
--- a/npc/re/quests/quests_brasilis.txt
+++ b/npc/re/quests/quests_brasilis.txt
@@ -471,7 +471,7 @@ brasilis,187,162,5	script	Candy Maker	4_M_BRZ_MAN1,{
 			if (Zeny > 3999) {
 				mes "[Candy Maker]";
 				mes "Here is a delicious guarana candy.";
-				set Zeny, Zeny-4000;
+				Zeny -= 4000;
 				getitem 12414,1; //Guarana_Candy
 				close;
 			}
diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt
index 7cb41b0af..e3d1a7302 100644
--- a/npc/re/quests/quests_dewata.txt
+++ b/npc/re/quests/quests_dewata.txt
@@ -2097,7 +2097,7 @@ dew_fild01,127,240,4	script	Gatti#weapon	2_M_OLDBLSMITH,{
 		}
 		specialeffect2 EF_REPAIRWEAPON;
 		progressbar "0xFFFF00",3;
-		set Zeny, Zeny - 100000;
+		Zeny -= 100000;
 
 		// Socket 3
 		set .@i, rand(4300);
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index c3ecc7f70..7afe04039 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -137,7 +137,7 @@ dic_dun01,266,113,5	script	Curious Sapha#ep13_3_	4_MAN_BENKUNI,{
 			mes "You changed your mind?";
 			close;
 		}
-		set Zeny, Zeny - .@deal;
+		Zeny -= .@deal;
 		getitem 6437,.@input; //Scaraba_Perfume
 		mes "[Curious Sapha]";
 		mes "Here you go. Scaraba might flock around you so don't use it near Scaraba Hall.";
@@ -430,7 +430,7 @@ dic_in01,254,119,0	script	Item Storage#01	CLEAR_NPC,{
 		mes "Not enough Zeny.";
 		close; 
 	}
-	set Zeny, Zeny-500;
+	Zeny -= 500;
 	close2;
 	openstorage;
 	end;
@@ -3704,7 +3704,7 @@ dic_in01,245,119,4	script	Shay#ep133_13	4_M_ACROSS,{
 			if (Zeny > 1999) {
 				mes "[Shay]";
 				mes "Here is your "+.@str$[@menu]+".";
-				set Zeny, Zeny - 2000;
+				Zeny -= 2000;
 				getitem .@item[@menu],1; //Tropical_Sograt
 				break;
 			}
@@ -7540,7 +7540,7 @@ moc_para01,44,19,3	script	Cat Hand Agent#gekk	4_M_MERCAT2,{
 								mes "[Agent Geck]";
 								mes "With this, our contract is now complete.";
 								mes "Geck will help you to get to Ash-Vacuum in one piece.";
-								set Zeny, Zeny - 50000;
+								Zeny -= 50000;
 								set ep13_start, 100;
 								next;
 								mes "[Agent Geck]";
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index bb5619c58..0bc237d58 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -67,7 +67,7 @@
 			mes "I'm afraid it's not enough. Sorry, but it can't be done for free~";
 			close;
 		}
-		set Zeny, Zeny-.@price;
+		Zeny -= .@price;
 	} else {
 		if (countitem(12636) < .@price) {
 			mes "[Teleport Cat]";
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index dbf405542..5593300ec 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -345,7 +345,7 @@ malangdo,184,139,4	script	Storekeeper#mal	4_CAT_ADV2,{
 			mes "You don't have enough zeny...";
 			close;
 		}
-		set Zeny, Zeny-.@zeny;
+		Zeny -= .@zeny;
 		break;
 	}
 	mes "[Storekeeper]";
@@ -10624,7 +10624,7 @@ mal_in01,15,16,3	script	Fallen Angel#mal	4_F_VALKYRIE2,{
 		else if (.@i < 854) set .@enchant,4710; //Inteligence1
 		else set .@enchant,0;
 
-		set Zeny, Zeny - 1000000;
+		Zeny -= 1000000;
 		delequip EQI_GARMENT;
 		if (.@enchant == 0) {
 			mes "[Fallen Angel]";
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index edc964053..581cf2d23 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -2403,7 +2403,7 @@ malaya,326,68,2	script	Pedro the Sailor	4W_SAILOR,{
 				mes "[Pedro the Sailor]";
 				mes "Thank you~";
 				mes "Let's go before the ghosts come back!";
-				set Zeny, Zeny - 1000;
+				Zeny -= 1000;
 				close2;
 				warp "izlude",195,180;
 				end;
@@ -3359,7 +3359,7 @@ ma_fild01,166,214,6	script	Old Man in Dilemma#GA	4_F_BARYO_OLD,{
 				if (countitem(6497) >= 3 && Zeny >= 1000) {
 					specialeffect2 EF_CONE;
 					specialeffect EF_FORESTLIGHT2;
-					set Zeny, Zeny-1000;
+					Zeny -= 1000;
 					getitem 12775,1; //Ancient_Spirit_Agimat
 				} else {
 					mes "[Old Man in Dilemma]";
diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt
index 5c062bdf4..480618a70 100644
--- a/npc/re/quests/quests_morocc.txt
+++ b/npc/re/quests/quests_morocc.txt
@@ -93,7 +93,7 @@ moc_prydb1,103,54,3	script	Suspicious Cat#night	4_CAT_SAILOR4,{
 			mes "Where do you think you're going! You're so broke!";
 			close;
 		}
-		set Zeny, Zeny-5000;
+		Zeny -= 5000;
 		mes "[Suspicious Cat]";
 		mes "Bah, what's up with this old money... you don't have anything sparkly or shiny?!";
 		mes "Ahh, just follow me!";