summaryrefslogtreecommitdiff
path: root/npc/re/quests
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-11-28 00:42:20 +0100
committerHaru <haru@dotalux.com>2013-11-28 00:43:49 +0100
commit4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6 (patch)
treee2dd2640adb13411dee1982e3a7d13c12d4e04b3 /npc/re/quests
parentc069e2e9b89f712c6ad6ebba983460408f6da198 (diff)
downloadhercules-4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6.tar.gz
hercules-4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6.tar.bz2
hercules-4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6.tar.xz
hercules-4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6.zip
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 <haru@dotalux.com>
Diffstat (limited to 'npc/re/quests')
-rw-r--r--npc/re/quests/eden/eden_iro.txt4
-rw-r--r--npc/re/quests/eden/eden_quests.txt16
-rw-r--r--npc/re/quests/eden/eden_service.txt2
-rw-r--r--npc/re/quests/homun_s.txt2
-rw-r--r--npc/re/quests/magic_books.txt10
-rw-r--r--npc/re/quests/quests_brasilis.txt2
-rw-r--r--npc/re/quests/quests_dewata.txt2
-rw-r--r--npc/re/quests/quests_dicastes.txt8
-rw-r--r--npc/re/quests/quests_eclage.txt2
-rw-r--r--npc/re/quests/quests_malangdo.txt10
-rw-r--r--npc/re/quests/quests_malaya.txt4
-rw-r--r--npc/re/quests/quests_morocc.txt2
12 files changed, 32 insertions, 32 deletions
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 904cd670f..b4400854f 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;
- Zeny -= .@cost[.@i];
+ set Zeny, 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;
- Zeny -=1000;
+ set Zeny, 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 cebd70b87..c96d5a049 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. -";
- Zeny -= 2700;
+ set Zeny, 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. -";
- Zeny -= 3000;
+ set Zeny, 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. -";
- Zeny -= 3600;
+ set Zeny, 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. -";
- Zeny -= 4000;
+ set Zeny, 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. -";
- Zeny -= 4500;
+ set Zeny, 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. -";
- Zeny -= 5000;
+ set Zeny, 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;
}
- Zeny -= 250000;
+ set Zeny, 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;
}
- Zeny -= 250000;
+ set Zeny, 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 544c7b11a..8335b9fbe 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;
}
- Zeny -= 500;
+ set Zeny, Zeny - 500;
close2;
openstorage;
end;
diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt
index d5abca9fd..9ef1a2b6e 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;
- Zeny -= 50000;
+ set Zeny, Zeny - 50000;
hommutate .@Homunculus;
break;
case 2:
diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt
index 0fd885d8f..de846567a 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) Zeny -= 10000;
+ if (.@Payment == 1) set Zeny, 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) Zeny -= 50000;
+ if (.@Payment == 1) set Zeny, 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) Zeny -= 200000;
+ if (.@Payment == 1) set Zeny, 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) Zeny -= 100000;
+ if (.@Payment > 1) set Zeny, 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;
- Zeny -= 1000000;
+ set Zeny, 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 f7e4a2418..7c5ccbc7b 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.";
- Zeny -=4000;
+ set Zeny, 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 e3d1a7302..7cb41b0af 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;
- Zeny -= 100000;
+ set Zeny, 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 b83acd793..c3ecc7f70 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;
}
- Zeny -= .@deal;
+ set Zeny, 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;
}
- Zeny -=500;
+ set Zeny, 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]+".";
- Zeny -= 2000;
+ set Zeny, 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.";
- Zeny -= 50000;
+ set Zeny, 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 3e7b6d381..bb5619c58 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;
}
- Zeny -=.@price;
+ set Zeny, 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 651390e54..dbf405542 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;
}
- Zeny -=.@zeny;
+ set Zeny, Zeny-.@zeny;
break;
}
mes "[Storekeeper]";
@@ -807,7 +807,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 4_CAT_MERMASTER,{
mes "If you see the words on the first page of this book, there's a sentence seeming like short conversation.";
next;
mes "[Linguist Devore]";
- mes "It's like this, for the question, ?????? ?????, it says, ???? ?????? ??????????, ??????????????????. ?? ???????";
+ mes "It's like this, for the question, ¬¬¬Ñ¬Ü ¬ã¬Ú?, it says, ¬¡¬Ù ¬ã¬ì¬Þ ¬Õ¬à¬Ò¬â¬Ö, ¬Ò¬Ý¬Ñ¬Ô¬à¬Õ¬Ñ¬â¬ñ. ¬¡ ¬£¬Ú¬Ö?";
next;
mes "[Linguist Devore]";
mes "Though I tried talking to Biscuit like this, there was no feedback.";
@@ -9637,7 +9637,7 @@ mal_in01,134,221,4 script KungKung#gamer 4_M_BABYCAT,{
case 1: // Attack
mes "How would you like to attack?";
mes " ";
- mes "?? Tip !!";
+ mes "¡¡ Tip !!";
mes "Choose back: ^FF0000You win if the cat shows the back of its paw.^000000";
mes "Choose palm: ^FF0000You win if the cat shows the palm of its paw.^000000";
next;
@@ -9683,7 +9683,7 @@ mal_in01,134,221,4 script KungKung#gamer 4_M_BABYCAT,{
case 2: // Defend
mes "How would you like to defend?";
mes " ";
- mes "?? Tip !!";
+ mes "¡¡ Tip !!";
mes "Choose back: ^FF0000You win if the cat shows the back of its paw.^000000";
mes "Choose palm: ^FF0000You win if the cat shows the palm of its paw.^000000";
next;
@@ -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;
- Zeny -= 1000000;
+ set Zeny, 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 26ede25c0..edc964053 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!";
- Zeny -= 1000;
+ set Zeny, 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;
- Zeny -=1000;
+ set Zeny, 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 6ee595af1..5c062bdf4 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;
}
- Zeny -=5000;
+ set Zeny, 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!";