From 4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6 Mon Sep 17 00:00:00 2001 From: Haru Date: Thu, 28 Nov 2013 00:42:20 +0100 Subject: Revert "Cleaned up Zeny manipulation in scripts." Reverted due to a serious regression. I'll commit this again once I fixed the issue in the script engine. Sorry for the inconvenience. This reverts commit 4faa0ec9df7067cee3eb1c1953fccc6c2f842179. Signed-off-by: Haru --- npc/re/jobs/3-1/guillotine_cross.txt | 18 +++++++++--------- npc/re/jobs/3-2/shadow_chaser.txt | 8 ++++---- npc/re/jobs/novice/supernovice_ex.txt | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'npc/re/jobs') diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index df51c3496..2d106dc4a 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -243,7 +243,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 799) { mes "Here you are, take it."; - Zeny -= 800; + set Zeny, Zeny - 800; getitem 12112,1; //Tropical_Sograt close; } @@ -253,7 +253,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 799) { mes "Here you are, take it."; - Zeny -= 800; + set Zeny, Zeny - 800; getitem 12113,1; //Vermilion_The_Beach close; } @@ -697,7 +697,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ if (Zeny > 499) { mes "Here you are. Milk."; mes "Then take a rest."; - Zeny -= 500; + set Zeny, Zeny - 500; getitem 519,1; //Milk close; } @@ -737,7 +737,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 799) { mes "Here you are, take it."; - Zeny -= 800; + set Zeny, Zeny - 800; getitem 12112,1; //Tropical_Sograt close; } @@ -747,7 +747,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 799) { mes "Here you are, take it."; - Zeny -= 800; + set Zeny, Zeny - 800; getitem 12113,1; //Vermilion_The_Beach close; } @@ -764,7 +764,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ if (Zeny > 499) { mes "I feel sorry to take 500 zeny per bottle, but I have to."; mes "It's very hard to get milk in Veins."; - Zeny -= 500; + set Zeny, Zeny - 500; getitem 519,1; //Milk close; } @@ -799,7 +799,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 999) { mes "Here you are, take it."; - Zeny -= 1000; + set Zeny, Zeny - 1000; getitem 12112,1; //Tropical_Sograt close; } @@ -809,7 +809,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 999) { mes "Here you are, take it."; - Zeny -= 1000; + set Zeny, Zeny - 1000; getitem 12113,1; //Vermilion_The_Beach close; } @@ -1289,7 +1289,7 @@ ve_in,228,108,3 script Waitress#3rdgc04 1_F_PUBGIRL,{ mes "[Waitress]"; mes "Oh by the way, my name is Madelle."; mes "I hope you remember my name."; - Zeny -= 5000; + set Zeny, Zeny - 5000; setquest 7112; next; mes "- Madelle's information is attached to a quest board. What information have I collected? -"; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index 230d5b49c..772570cca 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -2304,7 +2304,7 @@ s_atelier,29,119,3 script Max#sc05_prt 4W_M_01,{ mes "Good luck!"; delitem 7150,.@i[2]; //Bamboo_Cut delitem 949,.@i[3]; //Feather - Zeny -= .@i[4]; + set Zeny, Zeny - .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; } @@ -2357,7 +2357,7 @@ s_atelier,136,70,3 script Titika#sc09_ra 4_F_CHILD,{ mes "I'll exchange it with the goods that I made."; delitem 7150,.@i[2]; //Bamboo_Cut delitem 949,.@i[3]; //Feather - Zeny -= .@i[4]; + set Zeny, Zeny - .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; } @@ -2407,7 +2407,7 @@ s_atelier,124,128,3 script RimiGX#sc07_yuno 4_F_LGTGIRL,{ mes "It will be fast when I exchange the stuff made?"; delitem 7150,.@i[2]; //Bamboo_Cut delitem 949,.@i[3]; //Feather - Zeny -= .@i[4]; + set Zeny, Zeny - .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; } @@ -2457,7 +2457,7 @@ s_atelier,26,68,3 script Vito#sc11_lgt 4_M_KHMAN,{ mes "I'm going to exchange the blush I made before."; delitem 7150,.@i[2]; //Bamboo_Cut delitem 949,.@i[3]; //Feather - Zeny -= .@i[4]; + set Zeny, Zeny - .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; } diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 05d98dc96..3a8dad744 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -653,7 +653,7 @@ airplane,33,47,5 script Nudor#sp2 4_F_NOVICE,{ mes "Woa~!! "+.@n+" Zeny! This helped me so much~ Tehee~"; mes "I can't believe it..."; changequest 5099,5100; - Zeny -= .@n; + set Zeny, Zeny - .@n; if (.@i < 5) set EXSUPNOV_Q_, .@i; else { if (.@n > 1000000) set EXSUPNOV_Q_,4; -- cgit v1.2.3-60-g2f50