Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Added a missing zeny check in the Jawaii Bartender. (bugreport:2897)

Browse Source 
- Added a missing 'close' in the Mage quest Bookshelf. (bugreport:2873)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13727 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2009-05-04 04:24:50 +00:00
parent 072ee7a90b
commit 1b588722ad
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
npc/Changelog.txt
View File

@ -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]

6
npc/cities/jawaii.txt
View File

@ -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.";

7
npc/jobs/1-1/mage.txt
View File

@ -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;
}