summaryrefslogtreecommitdiff
path: root/npc/jobs
diff options
context:
space:
mode:
authorTaylor Locke <kisuka@kisuka.com>2013-11-25 06:03:06 -0800
committerHaru <haru@dotalux.com>2013-11-30 21:38:38 +0100
commit94ac9fe3303c4d604485a4784e8f5c99f5457863 (patch)
treee33f4d96453941392a1d9b721d4a179ba8f89941 /npc/jobs
parentafb2ed27fcc12f86f2418425dd1e7c9b8234a1f2 (diff)
downloadhercules-94ac9fe3303c4d604485a4784e8f5c99f5457863.tar.gz
hercules-94ac9fe3303c4d604485a4784e8f5c99f5457863.tar.bz2
hercules-94ac9fe3303c4d604485a4784e8f5c99f5457863.tar.xz
hercules-94ac9fe3303c4d604485a4784e8f5c99f5457863.zip
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]
Diffstat (limited to 'npc/jobs')
-rw-r--r--npc/jobs/2-1/blacksmith.txt2
-rw-r--r--npc/jobs/2-1/knight.txt2
-rw-r--r--npc/jobs/2-2/alchemist.txt2
-rw-r--r--npc/jobs/2-2/dancer.txt2
-rw-r--r--npc/jobs/2-2/rogue.txt4
-rw-r--r--npc/jobs/2-2/sage.txt6
-rw-r--r--npc/jobs/novice/supernovice.txt2
-rw-r--r--npc/jobs/valkyrie.txt2
8 files changed, 11 insertions, 11 deletions
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index c8cfd8a2d..48cf68150 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -1616,7 +1616,7 @@ geffen_in,109,170,3 script Blacksmith Guildsman#gef 4_F_JOB_BLACKSMITH,{
mes "Excuse me, but you do not have enough money.";
close;
}
- set Zeny, Zeny-600;
+ Zeny -= 600;
warp "izlude",94,103;
end;
case 3:
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index 0b988998e..368cbca45 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -2062,7 +2062,7 @@ prt_in,87,92,4 script Sir Gray#knt 2_M_SWORDMASTER,{
mes "You attained a reliable item.";
mes "It'll be a good companion on your adventures.";
delitem 999,1; //Steel
- set Zeny, Zeny - 74000;
+ Zeny -= 74000;
getitem 1163,1; //Claymore
close;
}
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 59504aadd..1bb03d812 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -175,7 +175,7 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 4_F_ALCHE,{
mes "Come back to me when you have 50,000 Zeny, otherwise we can't process your application.";
close;
}
- set Zeny, Zeny-50000;
+ Zeny -= 50000;
mes "[Parmy Gianino]";
mes "Let's see.";
mes "" + strcharinfo(0);
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 4075ce51f..e0b59c71d 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -316,7 +316,7 @@ job_duncer,43,93,4 script Aile#da 4_F_07,{
mes "tuition fee.";
next;
cutin "job_dancer_eir01",2;
- set Zeny, Zeny-10000;
+ Zeny -= 10000;
mes "[Aile]";
mes "Next, go to ^CD6889Bijou^000000, who is in charge of the interviewing process. She will have a couple of things she'll need to ask you.";
set DANC_Q,5;
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 4ce7fe424..842d9cd05 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -661,7 +661,7 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{
countitem(908) > 4 && countitem(945) > 4) {
mes "[Mr. Smith]";
mes "Ummm...let's see...";
- set Zeny, Zeny-10000;
+ Zeny -= 10000;
delitem 915,5; //Chrysalis
delitem 713,5; //Empty_Bottle
delitem 1002,5; //Iron_Ore
@@ -974,7 +974,7 @@ S_CheckItems:
if (Zeny > 9999 && countitem(getarg(0)) >= getarg(1) && countitem(getarg(2)) >= getarg(3) && countitem(getarg(4)) >= getarg(5) && countitem(getarg(6)) >= getarg(7)) {
mes "[Mr. Smith]";
mes "Okay, we've got the application fee, ^FF000010,000 zeny^000000, "+getarg(1)+" "+getitemname(getarg(0))+", "+getarg(3)+" "+getitemname(getarg(2))+", "+getarg(5)+" "+getitemname(getarg(4))+" and "+getarg(7)+" "+getitemname(getarg(6))+"...";
- set Zeny, Zeny-10000;
+ Zeny -= 10000;
delitem getarg(0),getarg(1);
delitem getarg(2),getarg(3);
delitem getarg(4),getarg(5);
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 4f93ba7db..46973a538 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -343,7 +343,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{
next;
if (select("Pay 70,000 zeny.:Give him Old Magicbook and Necklace of Wisdom.") == 1) {
if (Zeny > 69999) {
- set Zeny, Zeny-70000;
+ Zeny -= 70000;
mes "[Metheus Sylphe]";
mes "Thank you, your application has been accepted.";
mes "Next, you will take an entrance test.";
@@ -515,7 +515,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{
next;
}
else if (Zeny > 69999) {
- set Zeny, Zeny-70000;
+ Zeny -= 70000;
mes "[Metheus Sylphe]";
mes "Well done. Let me proceed with your application request.";
set SAGE_Q,4;
@@ -545,7 +545,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{
if (Zeny > 29999) {
for (set .@i, 0; .@i < .@size ; set .@i, .@i+1)
delitem .@item[.@i], .@count[.@i];
- set Zeny, Zeny-30000;
+ Zeny -= 30000;
mes "[Metheus Sylphe]";
mes "Well done. Let me proceed with your application request.";
set .@SAGE_Q_T,SAGE_Q;
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index cf9ea7b87..2887b2ae3 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.txt
@@ -431,7 +431,7 @@ aldebaran,54,238,5 script Kafra Employee#sn 4_F_KAFRA1,{
}
if (Zeny >= 1899) {
set RESRVPTS, RESRVPTS + 190;
- set Zeny, Zeny-1900;
+ Zeny -= 1900;
if (getskilllv("MC_PUSHCART") > 0) setcart;
mes "[Kafra Employee]";
mes "Thank you for using my service.";
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index 42c27551c..0aa4c4e3f 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -231,7 +231,7 @@ yuno_in02,88,164,5 script Metheus Sylphe#Library 2_M_SAGE_B,{
next;
if (select("Donate.:Cancel.") == 1) {
if (Zeny >= 1285000) {
- set Zeny, Zeny-1285000;
+ Zeny -= 1285000;
set valkyrie_Q,1;
mes "[Metheus Sylphe]";
mes "Thank you, your donation will be used for a good cause. You may";