summaryrefslogtreecommitdiff
path: root/npc/re/cities
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/cities
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/cities')
-rw-r--r--npc/re/cities/brasilis.txt4
-rw-r--r--npc/re/cities/dewata.txt6
-rw-r--r--npc/re/cities/dicastes.txt2
-rw-r--r--npc/re/cities/eclage.txt2
-rw-r--r--npc/re/cities/malangdo.txt4
-rw-r--r--npc/re/cities/malaya.txt4
-rw-r--r--npc/re/cities/mora.txt10
7 files changed, 16 insertions, 16 deletions
diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt
index 4bd42661f..fe9f768c4 100644
--- a/npc/re/cities/brasilis.txt
+++ b/npc/re/cities/brasilis.txt
@@ -31,7 +31,7 @@ alberta,246,82,3 script Crewman#bra2 4W_SAILOR,{
if (Zeny > 9999) {
mes "[Crewman]";
mes "Cool~!! Let's go~!";
- Zeny -=10000;
+ set Zeny, Zeny-10000;
close2;
warp "brasilis",314,60;
end;
@@ -145,7 +145,7 @@ brasilis,137,77,5 script Ice-Cream Maker 4_M_03,{
mes "Lighten your pack before buying this.";
close;
}
- Zeny -=.@icecream_hap;
+ set Zeny, Zeny-.@icecream_hap;
getitem 536,.@input; //Ice_Cream
close;
case 2:
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index 1205a4de1..a0fa10275 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -29,7 +29,7 @@ alberta,212,202,4 script Dewata Sailor#alberta 4_M_DEWMAN,{
mes "^8B4513Dewata^000000 is a beautiful and peaceful island country.";
mes "Have a nice trip~";
close2;
- Zeny -= 10000;
+ set Zeny, Zeny - 10000;
warp "dewata",232,53;
end;
} else {
@@ -296,7 +296,7 @@ dewata,146,109,5 script Restauranteur#dew 4_COOK,{
}
mes "[Restauranteur]";
mes "Here's your "+getitemname(.@food)+", you won't regret it!";
- Zeny -= 5000;
+ set Zeny, Zeny - 5000;
getitem .@food,1;
close;
case 2:
@@ -509,7 +509,7 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{
mes "You make a wish for ^0000FF" + .@wish$ + "^000000 to the small shrine.";
next;
callsub L_Wish;
- Zeny -= .@input;
+ set Zeny, Zeny - .@input;
if (.@stat & 1 && .@bonus)
consumeitem 12043; //Str_Dish03
else if (.@stat & 2 && .@bonus)
diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt
index 09397c0e5..f46ce2651 100644
--- a/npc/re/cities/dicastes.txt
+++ b/npc/re/cities/dicastes.txt
@@ -653,7 +653,7 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 4_MAN_BENKUNI,{
close;
close;
}
- Zeny -=5000;
+ set Zeny, Zeny-5000;
mes "[Crazy Venknick]";
mes "Thanks.";
emotion e_gg,0,"Complaining Galten#fihs";
diff --git a/npc/re/cities/eclage.txt b/npc/re/cities/eclage.txt
index e637b67d5..009f87ab3 100644
--- a/npc/re/cities/eclage.txt
+++ b/npc/re/cities/eclage.txt
@@ -438,7 +438,7 @@ ecl_in02,164,56,2 script Receptionist#Laphine 4_F_FAIRYKID2,{
mes "It seems like you don't have enough zeny. Would you check your account again, please?";
close;
}
- Zeny -=5000;
+ set Zeny, Zeny-5000;
break;
case 3:
close;
diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt
index ae5d8b48c..6e6e8749a 100644
--- a/npc/re/cities/malangdo.txt
+++ b/npc/re/cities/malangdo.txt
@@ -199,7 +199,7 @@ mora,57,150,4 duplicate(Dolangmal) Dolangmal#9 4_CAT_DOWN
mes "Money? Where is the money? You can't go anywhere without the money. Shame on you.";
close;
}
- Zeny -= .@price;
+ set Zeny, Zeny - .@price;
mes "[Odgnalam]";
mes "Let me send you right away. Let's go~";
warp "malangdo",217,85;
@@ -273,7 +273,7 @@ malangdo,219,86,4 script Kong#malang 4_CAT_SAILOR2,{
mes .@no_money$;
close;
}
- Zeny -= .@price;
+ set Zeny, Zeny - .@price;
mes .@yes_money$;
if (.@i == 1)
warp "izlude",195,212;
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt
index 8eb9ad77e..ae746e7d2 100644
--- a/npc/re/cities/malaya.txt
+++ b/npc/re/cities/malaya.txt
@@ -49,7 +49,7 @@ alberta,196,202,3 script Optamara Crew#alberta 4W_SAILOR,{
mes "[Optamara Crew]";
mes "Great!";
mes "Heading for Port Malaya!!";
- Zeny -=10000;
+ set Zeny, Zeny-10000;
close2;
warp "malaya",271,55;
end;
@@ -124,7 +124,7 @@ ma_in01,30,94,4 script Inn Keeper#ma 4_F_MALAYA,{
mes "[Inn Keeper]";
mes "Hope you enjoy your stay.";
close2;
- Zeny -=5000;
+ set Zeny, Zeny-5000;
percentheal 100,100;
warp "ma_in01",43,98;
end;
diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt
index 91b1e132f..64f315fa9 100644
--- a/npc/re/cities/mora.txt
+++ b/npc/re/cities/mora.txt
@@ -453,7 +453,7 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{
mes "[Raffle Philosopher]";
mes "The quote I'm going to tell you is...";
mes "Let's see... Wait a second.";
- Zeny -=.@input;
+ set Zeny, Zeny-.@input;
next;
mes ". . . . . . . . .";
next;
@@ -1021,9 +1021,9 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{
next;
mes "You feel somebody rummaging through your pockets before you pass out.";
if (Zeny >= 5000)
- Zeny -=5000;
+ set Zeny, Zeny-5000;
else
- Zeny = 0;
+ set Zeny, 0;
close2;
percentheal -99,0;
warp "mora",31,132;
@@ -1120,7 +1120,7 @@ mora,43,127,3 script Innkeeper#mora_inn 4_M_RAFLE_OR,{
mes "[Innkeeper]";
mes "Make yourself at home.";
close2;
- Zeny -=5000;
+ set Zeny, Zeny-5000;
percentheal 100,100;
warp "mora",32,123;
end;
@@ -1176,7 +1176,7 @@ mora,48,128,0 script Drawer#mora_warehouse HIDDEN_NPC,{
mes "- You don't seem to have 100 zeny with you. -";
close;
}
- Zeny -=100;
+ set Zeny, Zeny-100;
openstorage;
close;
case 2: