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/kafras/cool_event_corp.txt | 16 ++++++++-------- npc/kafras/dts_warper.txt | 24 ++++++++++++------------ npc/kafras/functions_kafras.txt | 10 +++++----- npc/kafras/kafras.txt | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) (limited to 'npc/kafras') diff --git a/npc/kafras/cool_event_corp.txt b/npc/kafras/cool_event_corp.txt index 4f0f88329..e06f0dedc 100644 --- a/npc/kafras/cool_event_corp.txt +++ b/npc/kafras/cool_event_corp.txt @@ -56,7 +56,7 @@ hugel,88,168,4 script Cool Event Corp. Staff::CoolEventCorpStaffHugel 4_M_ZONDAM close2; break; } - Zeny -= 40; + set Zeny, Zeny - 40; mes "Let me open your personal"; mes "storage for you right away."; mes "Thanks for supporting Cool"; @@ -110,7 +110,7 @@ hugel,88,168,4 script Cool Event Corp. Staff::CoolEventCorpStaffHugel 4_M_ZONDAM mes "Zeny to pay the Pushcart"; mes "rental fee of 800 Zeny."; } else { - Zeny -= 800; + set Zeny, Zeny - 800; setcart; } } @@ -172,7 +172,7 @@ rachel,109,138,5 script Cool Event Corp. Staff::CoolEventCorpStaffRachel 4_M_ZON close2; break; } - Zeny -= 40; + set Zeny, Zeny - 40; mes "Let me open your personal"; mes "storage for you right away."; mes "Thanks for supporting Cool"; @@ -192,7 +192,7 @@ rachel,109,138,5 script Cool Event Corp. Staff::CoolEventCorpStaffRachel 4_M_ZON delitem 7060,1; } else { - Zeny -=2200; + set Zeny,Zeny-2200; } warp "veins",205,101; cutin "",255; @@ -252,7 +252,7 @@ rachel,109,138,5 script Cool Event Corp. Staff::CoolEventCorpStaffRachel 4_M_ZON mes "Zeny to pay the Pushcart"; mes "rental fee of 800 Zeny."; } else { - Zeny -= 800; + set Zeny, Zeny - 800; setcart; } } @@ -314,7 +314,7 @@ veins,208,128,5 script Cool Event Corp. Staff::CoolEventCorpStaffVeins 4_M_ZONDA close2; break; } - Zeny -= 40; + set Zeny, Zeny - 40; mes "Let me open your personal"; mes "storage for you right away."; mes "Thanks for supporting Cool"; @@ -334,7 +334,7 @@ veins,208,128,5 script Cool Event Corp. Staff::CoolEventCorpStaffVeins 4_M_ZONDA delitem 7060,1; } else { - Zeny -=2200; + set Zeny,Zeny-2200; } warp "rachel",115,125; cutin "",255; @@ -395,7 +395,7 @@ veins,208,128,5 script Cool Event Corp. Staff::CoolEventCorpStaffVeins 4_M_ZONDA mes "rental fee of 800 Zeny."; close2; } else { - Zeny -= 800; + set Zeny, Zeny - 800; setcart; } } diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt index 1547d4b0f..3a76e8259 100644 --- a/npc/kafras/dts_warper.txt +++ b/npc/kafras/dts_warper.txt @@ -534,7 +534,7 @@ function script F_VoteKafra { case 1: if (Zeny >= 4000) { cutin "",255; - Zeny -=4000; + set Zeny, Zeny-4000; warp "xmas_dun02",130,123; end; } @@ -558,7 +558,7 @@ function script F_VoteKafra { switch(select("Toy Factory, Level 2 -> 4,000 z:Clock Tower, Level 3 -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "xmas_dun02",130,123; end; @@ -574,7 +574,7 @@ function script F_VoteKafra { break; case 2: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "alde_dun03",265,22; end; @@ -599,7 +599,7 @@ function script F_VoteKafra { switch(select("Toy Factory, Level 2 -> 4,000 z:Clock Tower, Level 3 -> 4,000 z:Lava Dungeon, Level 2 -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "xmas_dun02",130,123; end; @@ -615,7 +615,7 @@ function script F_VoteKafra { break; case 2: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "alde_dun03",265,22; end; @@ -631,7 +631,7 @@ function script F_VoteKafra { break; case 3: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "mag_dun02",47,40; end; @@ -933,7 +933,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "iz_dun02",234,206; end; @@ -961,7 +961,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Clock Tower, 3rd Floor -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "iz_dun02",234,206; end; @@ -976,7 +976,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ break; case 2: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "c_tower3",64,143; end; @@ -1011,7 +1011,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Clock Tower, 3rd Floor -> 4,000 z:Glast Heim Entrance -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "iz_dun02",234,206; end; @@ -1026,7 +1026,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ break; case 2: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "c_tower3",64,143; end; @@ -1041,7 +1041,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ break; case 3: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "glast_01",368,303; end; diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index e53e71696..2edf0990b 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -251,7 +251,7 @@ function script F_KafStor { mes "Storage access fee is "+getarg(1)+" zeny."; return; } - Zeny -=getarg(1); + set Zeny, Zeny-getarg(1); set RESRVPTS, RESRVPTS + (getarg(1)/5); } } @@ -308,7 +308,7 @@ function script F_KafTele { cutin "", 255; end; } - Zeny -= @wrpP[.@j]; + set Zeny, Zeny - @wrpP[.@j]; set RESRVPTS, RESRVPTS + (@wrpP[.@j]/16); } cutin "", 255; @@ -371,7 +371,7 @@ function script F_KafCart { mes "rental fee of "+getarg(1)+" zeny."; return 1; } - Zeny -=getarg(1); + set Zeny,Zeny-getarg(1); set RESRVPTS, RESRVPTS + 48; } setcart; @@ -504,7 +504,7 @@ function script F_SetKafCode { emotion e_cash; break; } - Zeny -=1000; + set Zeny,Zeny-1000; if(@code == #kafra_code) { set #kafra_code,0; mes "You've successfully cleared your storage password."; @@ -548,7 +548,7 @@ S_SET: emotion e_cash; return; } - Zeny -=5000; + set Zeny,Zeny-5000; set #kafra_code,@code; mes "You've protected your storage with a secret password."; mes "Thank you for using "+getarg(1)+"."; diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt index 2858af7b3..acdff608d 100644 --- a/npc/kafras/kafras.txt +++ b/npc/kafras/kafras.txt @@ -66,7 +66,7 @@ aldeba_in,96,181,4 script Kafra Service 4_F_KAFRA5,{ mes "and administrative functions,"; mes "I'll access your Storage for you."; next; - Zeny -=20; + set Zeny, Zeny-20; set RESRVPTS, RESRVPTS + (20/5); mes "[Kafra Leilah]"; mes "In the future, please"; -- cgit v1.2.3-70-g09d2