diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-04 04:24:50 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-04 04:24:50 +0000 |
| commit | 5a0c79ee6c863ffeed86c325d4ecd7708cc12b58 (patch) | |
| tree | 52dbf8bb745aa0c3770168ca2776d5ecee956df3 /npc | |
| parent | fbe26be93ce4bd3020d63e80d432ac0f91262831 (diff) | |
| download | hercules-5a0c79ee6c863ffeed86c325d4ecd7708cc12b58.tar.gz hercules-5a0c79ee6c863ffeed86c325d4ecd7708cc12b58.tar.bz2 hercules-5a0c79ee6c863ffeed86c325d4ecd7708cc12b58.tar.xz hercules-5a0c79ee6c863ffeed86c325d4ecd7708cc12b58.zip | |
- Added a missing zeny check in the Jawaii Bartender. (bugreport:2897)
- Added a missing 'close' in the Mage quest Bookshelf. (bugreport:2873)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13727 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 3 | ||||
| -rw-r--r-- | npc/cities/jawaii.txt | 6 | ||||
| -rw-r--r-- | npc/jobs/1-1/mage.txt | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index bc70ba074..0bd383e2e 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,8 @@ Date Added ====== +2009/05/04 + - Added a missing zeny check in the Jawaii Bartender. (bugreport:2897) [brianluau] + - Added a missing 'close' in the Mage quest Bookshelf. (bugreport:2873) 2009/05/03 - Switched the slot enchanter's checks so they come AFTER the final 'next' pause. (bugreport:2664) * Removed the obfuscation of the #kafra_code password, following ultramage's suggestion. [brianluau] diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index cafe6569d..a80fb4adc 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -891,9 +891,7 @@ jawaii_in,28,124,0 script Bartender#jaw 46,{ percentheal -100,0; end; } - if (Zeny >= 100) { - set zeny,zeny-100; - } + if (zeny > 99) set zeny,zeny-100; switch(rand(4)) { case 1: mes "[Bartender]"; @@ -1103,7 +1101,7 @@ S_KillChar: percentheal -100,0; end; } - set zeny,zeny-100; + if (zeny > 99) set zeny,zeny-100; set .@roof_jaw,.@roof_jaw+getarg(0); mes "[Bartender]"; mes "There you go."; diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt index ce9b1b1c9..e3159cb4f 100644 --- a/npc/jobs/1-1/mage.txt +++ b/npc/jobs/1-1/mage.txt @@ -603,9 +603,9 @@ moc_ruins,91,150,0 script Ponka-Hontas 93,{ mes "[Mage Guildsman]"; mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Testtube."; next; - IF (select("Alright, Deal.:Nah, forget it.") == 1) { + if (select("Alright, Deal.:Nah, forget it.") == 1) { mes "[Mage Guildsman]"; - if (zENY < 50) { + if (zeny < 50) { mes "I'm sorry, but you don't have enough money to cover the 50 Zeny fee."; close; } @@ -617,7 +617,7 @@ moc_ruins,91,150,0 script Ponka-Hontas 93,{ set zeny,zeny-50; getitem 1088,1; //Morocc_Potion } - CLOSE; + close; } geffen_in,177,112,4 script Bookshelf 111,{ @@ -714,4 +714,5 @@ geffen_in,177,112,4 script Bookshelf 111,{ mes "Mixing Machine)"; close; } + close; } |