From 94ac9fe3303c4d604485a4784e8f5c99f5457863 Mon Sep 17 00:00:00 2001
From: Taylor Locke <kisuka@kisuka.com>
Date: Mon, 25 Nov 2013 06:03:06 -0800
Subject: 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]
---
 npc/custom/quests/hunting_missions.txt  | 4 ++--
 npc/custom/quests/kaho_balmung.txt      | 2 +-
 npc/custom/quests/kahohorn.txt          | 2 +-
 npc/custom/quests/quest_shop.txt        | 2 +-
 npc/custom/quests/questboard.txt        | 4 ++--
 npc/custom/quests/sphinx_mask.txt       | 2 +-
 npc/custom/quests/sunglasses.txt        | 4 ++--
 npc/custom/quests/thq/THQS_GuildNPC.txt | 2 +-
 npc/custom/quests/thq/THQS_QuestNPC.txt | 2 +-
 npc/custom/quests/thq/THQS_TTShop.txt   | 6 +++---
 10 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'npc/custom/quests')

diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index d5d466f73..5c3c6a469 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -92,7 +92,7 @@ function Chk; function Cm;
 					emotion e_sry;
 					close;
 				}
-				set Zeny, Zeny-.Reset;
+				Zeny -= .Reset;
 				emotion e_cash;
 			}
 			mes "[Hunting Missions]";
@@ -173,7 +173,7 @@ Mission_Status:
 	set #Mission_Points, #Mission_Points+.@Mission_Points;
 	set BaseExp, BaseExp+.@Base_Exp;
 	set JobExp, JobExp+.@Job_Exp;
-	set Zeny, Zeny+.@zeny;
+	Zeny += .@zeny;
 	for(set .@i,0; .@i<.Quests; set .@i,.@i+1) {
 		setd "Mission"+.@i,0;
 		setd "Mission"+.@i+"_",0;
diff --git a/npc/custom/quests/kaho_balmung.txt b/npc/custom/quests/kaho_balmung.txt
index fac8b85ff..4e598922d 100644
--- a/npc/custom/quests/kaho_balmung.txt
+++ b/npc/custom/quests/kaho_balmung.txt
@@ -42,7 +42,7 @@ prontera,158,356,4	script	Royal Messenger	8W_SOLDIER,{
 		close; }
 	for(set .@j,1; .@j<13; set .@j,.@j+2)
 		delitem getd(".@Req"+.@i+"["+.@j+"]"), getd(".@Req"+.@i+"["+(.@j+1)+"]");
-	set Zeny, Zeny-1000000;
+	Zeny -= 1000000;
 	mes "I see you already have all the items you need. Here's your "+getitemname(getd(".@Req"+.@i+"[0]"))+", as promised.";
 	getitem getd(".@Req"+.@i+"[0]"),1;
 	close;
diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt
index 882728925..840cb4e12 100644
--- a/npc/custom/quests/kahohorn.txt
+++ b/npc/custom/quests/kahohorn.txt
@@ -59,7 +59,7 @@ geffen,115,107,5	script	Lord Kaho's Servant	1_M_PUBMASTER,{
 	for(set .@i,0; .@i<18; set .@i,.@i+1)
 		delitem .@items[.@i],1;
 	delitem 714,3;
-	set Zeny, Zeny-5000000;
+	Zeny -= 5000000;
 	mes "Wow! You are brave indeed!";
 	getitem 5013,1;
 	mes "Enjoy being God of Rune-Midgard!";
diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt
index 9398826ba..ff383717c 100644
--- a/npc/custom/quests/quest_shop.txt
+++ b/npc/custom/quests/quest_shop.txt
@@ -138,7 +138,7 @@ OnBuyItem:
 				mes "^FF0000You need "+(((.@q[2]*getiteminfo(.@q[0],6))+Weight-MaxWeight)/10)+" additional weight capacity to complete this trade.^000000";
 				close;
 			}
-			if (.@q[4]) set Zeny, Zeny-(.@q[4]*.@q[1]);
+			if (.@q[4]) Zeny -= (.@q[4]*.@q[1]);
 			if (.@q[5]) setd .Points$[0], getd(.Points$[0])-(.@q[5]*.@q[1]);
 			if (.@q[6]) for(set .@i,6; .@i<getarraysize(.@q); set .@i,.@i+2)
 				delitem .@q[.@i],.@q[.@i+1]*.@q[1];
diff --git a/npc/custom/quests/questboard.txt b/npc/custom/quests/questboard.txt
index 28a25cc28..b4a53d816 100644
--- a/npc/custom/quests/questboard.txt
+++ b/npc/custom/quests/questboard.txt
@@ -194,7 +194,7 @@ L_checkitems:
 	mes "[^FF7700Questboard^000000]";
 	mes "Congratulation! Here is your Reward.";
 	if(getd("." +currentquest$+"_collectionprize")!=0) getitem(getd("." +currentquest$+"_collectionprize"),getd("." +currentquest$+"_collectionamount"));
-	set Zeny,Zeny+getd("." +currentquest$+"_collectionzeny");
+	Zeny += getd("." +currentquest$+"_collectionzeny");
 	getexp getd("." +currentquest$+"_collectionexp["+0+"]"),getd("." +currentquest$+"_collectionexp["+1+"]");
 	setd(currentquest$ + "_collection_delay"),gettimetick(2)+.quest_delay;
 	set currentquest$, "";
@@ -228,7 +228,7 @@ L_checkmobs2:
 		setd(currentquest$+"_"+.@currentmob+"_"+.@x+"_killcount", 0);
 	}
 	if(getd("." +currentquest$+"_huntingprize")!=0) getitem(getd("." +currentquest$+"_huntingprize"),getd("." +currentquest$+"_huntingamount"));
-	set Zeny, Zeny+getd("." +currentquest$+"_huntingzeny");
+	Zeny += getd("." +currentquest$+"_huntingzeny");
 	getexp getd("." +currentquest$+"_huntingexp["+0+"]"),getd("." +currentquest$+"_huntingexp["+1+"]");
 	setd(currentquest$ + "_hunting_delay"),gettimetick(2)+.quest_delay;
 	set currentquest$, "";
diff --git a/npc/custom/quests/sphinx_mask.txt b/npc/custom/quests/sphinx_mask.txt
index b4e9c118c..a32828b8b 100644
--- a/npc/custom/quests/sphinx_mask.txt
+++ b/npc/custom/quests/sphinx_mask.txt
@@ -42,7 +42,7 @@ L_Menu:
 	if (Zeny < getarg(2)) {
 		mes "Are youz playin wit me? You don't have ze money!";
 		close; }
-	set Zeny, Zeny-getarg(2);
+	Zeny -= getarg(2);
 	mes "O ho ho, it's a deal, then!";
 	getitem 7114,1;
 	set sphmask_q,1;
diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt
index a4c828457..447fca877 100644
--- a/npc/custom/quests/sunglasses.txt
+++ b/npc/custom/quests/sunglasses.txt
@@ -56,7 +56,7 @@ alberta,88,193,5	script	Sunglasses Trader	1_F_MERCHANT_01,{
 		close; }
 	delitem 730,1;
 	delitem 949,50;
-	set Zeny, Zeny-100000;
+	Zeny -= 100000;
 	set SG_QUEST1,1;
 	mes "[Sunglasses Trader]";
 	mes "Great. Now, listen carefully.";
@@ -94,7 +94,7 @@ moc_fild07,334,186,5	script	Maseph	4_F_GON,{
 		mes "You do not have enough Zeny. Come back to me when you do.";
 		close; }
 	delitem 2201,1;
-	set Zeny, Zeny-400000;
+	Zeny -= 400000;
 	mes "Thank you. I will get on it right away...";
 	next;
 	mes "[Maseph]";
diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt
index 3e0723781..326735a7a 100644
--- a/npc/custom/quests/thq/THQS_GuildNPC.txt
+++ b/npc/custom/quests/thq/THQS_GuildNPC.txt
@@ -26,7 +26,7 @@ yuno_in01,124,164,6	script	Guild Leader	1_M_PRON_KING,{
 	next;
 	menu "Pay ^FF000025,000z^000000.",-,"Thats way to high!!",N_HighPrice;
 	if (Zeny < 25000) goto N_NoZeny;
-	set Zeny,Zeny-25000;
+	Zeny -= 25000;
 	//getitem 7950, 1;
 	//getitem 7951, 1;
 	set Event_THQS,1;
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index 9a09089b0..76790221b 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -42,7 +42,7 @@ N_PayZeny:
 	set nine_qset, 0;
 	set ten_qset, 0;
 	set On_Quest, 0;
-	set Zeny,Zeny-2500;
+	Zeny -= 2500;
 	//add time delay penalty. You can get another quest after 2 - 3 hours. [Lupus]
 	set #THQ_DELAY, (gettime(7)*12*31*24+gettime(6)*31*24+gettime(5)*24+gettime(3)+rand(2,3));
 	mes "[Guy]";
diff --git a/npc/custom/quests/thq/THQS_TTShop.txt b/npc/custom/quests/thq/THQS_TTShop.txt
index 25e080a8e..dfa83a587 100644
--- a/npc/custom/quests/thq/THQS_TTShop.txt
+++ b/npc/custom/quests/thq/THQS_TTShop.txt
@@ -51,7 +51,7 @@ N_Shop:
 	close;
 N_GetZeny1k:
 	set #Treasure_Token,#Treasure_Token-1;
-	set Zeny,Zeny+1000;
+	Zeny += 1000;
 	close;
 N_10T:
 	if (#Treasure_Token > 9) goto N_GetZeny10k;
@@ -59,7 +59,7 @@ N_10T:
 	close;
 N_GetZeny10k:
 	set #Treasure_Token,#Treasure_Token-10;
-	set Zeny,Zeny+10000;
+	Zeny += 10000;
 	close;
 N_100T:
 	if (#Treasure_Token > 99) goto N_GetZeny100k;
@@ -67,7 +67,7 @@ N_100T:
 	close;
 N_GetZeny100k:
 	set #Treasure_Token,#Treasure_Token-100;
-	set Zeny,Zeny+100000;
+	Zeny += 100000;
 	close;
 
 N_BuyWeps:
-- 
cgit v1.2.3-70-g09d2