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]

3 files changed, 7 insertions, 7 deletions

diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index e5f80bd3d..2e03ce410 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -207,7 +207,7 @@ geffen_in,164,124,4	script	Mage Guildsman	2_F_MAGICMASTER,{
 		next;
 		callfunc "Job_Change",Job_Mage;
 		callfunc "F_ClearJobVar";
-		set Zeny,Zeny+50;
+		Zeny += 50;
 		if(checkquest(1005) != -1) {
 			completequest 1005;
 		}
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 631e29516..59b612e5b 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -133,7 +133,7 @@ alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 					mes "Please return when you have earned the 500 zeny that you need to become a Merchant.";
 					close;
 				}
-				set Zeny, Zeny-500;
+				Zeny -= 500;
 				mes "Ah yes...!";
 				mes "Now your";
 				mes "membership";
@@ -169,7 +169,7 @@ alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 			mes "[Chief Mahnsoo]";
 			mes "*Ahem* Aaaaand let me give you a little bit of money for delivering that message to Blossom for me.";
 			mes "I hope you'll help me again next time~";
-			set Zeny, Zeny+200;
+			Zeny += 200;
 			set quest_alb_01,2;
 		}
 		else {
@@ -341,7 +341,7 @@ alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 					mes "[Chief Mahnsoo]";
 					if (Zeny >= 1000) {
 						set job_merchant_q,2;
-						set Zeny, Zeny-1000;
+						Zeny -= 1000;
 						mes "Alright~";
 						mes "That's 1,000 zeny.";
 						mes "Excellent, excellent.";
@@ -355,7 +355,7 @@ alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 					mes "[Chief Mahnsoo]";
 					if (Zeny >= 500) {
 						set job_merchant_q,1;
-						set Zeny, Zeny-500;
+						Zeny -= 500;
 						mes "Let's see...";
 						mes "That's 500 Zeny. Although I don't think splitting payment is a good idea for any Merchant, it's alright since you're still learning.";
 					}
@@ -1058,7 +1058,7 @@ prontera,248,42,0	script	Kafra Employee#mer	4_F_KAFRA2,{
 				cutin "",255;
 				end;
 			}
-			set Zeny, Zeny-600;
+			Zeny -= 600;
 			set RESRVPTS, RESRVPTS + 37;
 			cutin "",255;
 			warp "izlude",94,103;
diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt
index 389c257f5..356809cdc 100644
--- a/npc/pre-re/jobs/1-1/thief.txt
+++ b/npc/pre-re/jobs/1-1/thief.txt
@@ -443,7 +443,7 @@ moc_prydb1,42,133,2	script	Comrade	2_M_THIEFMASTER,{
 		next;
 		mes "[Brad]";
 		mes "Here is a small subsidy for a Newbie like you. Spend it whereever you want. Alright then, I'll see you around~";
-		set Zeny, Zeny+.@money_thief;
+		Zeny += .@money_thief;
 		close;
 	}
 }