* Another round of bug fixes to various scripts.

- Added Satan Morroc spawn and corrected shadow spawn timers. (bugreport:2690)
- Fixed Group of Evil NPC not reactivating  when it should. (bugreport:2696)
- Fixed the Zeny check when summoning guardians in agits. (bugreport:2712)
- Added zeny check to Jawaii bartender (hung the script.) (bugreport:2747)
- Corrected a mapwarp assosiated with the z-gang quest. (bugreport:2757)
- Fixed warps in ice dungeon 3 being usable all the time. (bugreport:2776)
- Corrected impossible condition if in Keil Hyre quest. (bugreport:2789)
- Corrected leftover aegis variables in several scripts. (bugreport:2794)
- Removed duplicate line from nameless quest. (bugreport:2795)
* Implemented official behaviour/Cost for investing in economy and defence
- Eco/Def will be modified on the turn of the day instead of immediately.
- Cost has been updated to official values. Investing twice now costs 4 times the first investment.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13559 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 5 insertions, 2 deletions

diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index b4d322023..cafe6569d 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -5,7 +5,7 @@
 //= DNett123 (1.1 - 1.5)
 //= L0ne_w0lf
 //===== Current Version: =====================================
-//= 3.5
+//= 3.6
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -34,6 +34,7 @@
 //= 3.3a Just a little typo error. [Samuray22]
 //= 3.4 Added missing checkweights. [L0ne_W0lf]
 //= 3.5 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 3.6 Fixed bartender so he no longer hangs. [L0ne_W0lf]
 //============================================================
 
 // Jawaii
@@ -890,7 +891,9 @@ jawaii_in,28,124,0	script	Bartender#jaw	46,{
 				percentheal -100,0;
 				end;
 			}
-			set zeny,zeny-100;
+			if (Zeny >= 100) {
+				set zeny,zeny-100;
+			}
 			switch(rand(4)) {
 			case 1:
 				mes "[Bartender]";