* 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

3 files changed, 13 insertions, 8 deletions

diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt
index a8760657d..1fc669907 100644
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena Revision 3000+
 //===== Description: ========================================= 
@@ -23,6 +23,7 @@
 //= 1.3 Implemented the Lover's quest. [MasterOfMuppets]
 //= 1.4 Moved quests to quests/quests_ein.txt [Evera]
 //= 1.5 Optimized some of the NPCs and fixed some typos [DZeroX]
+//= 1.6 Replaced occurances of PcName. [L0ne_W0lf]
 //============================================================
 
 einbech,172,113,4	script	Nemuk#ein	855,{
@@ -456,7 +457,7 @@ ein_in01,277,95,7	script	Ryan Danger#air#einbech	855,{
 	mes "clothes? I'll buy you whatever";
 	mes "you want, it's on me! C'mon~";
 	next;
-	mes "["+PcName+"]";
+	mes "["+strcharinfo(0)+"]";
 	mes "N-no...!";
 	mes "I-I-I-I...";
 	mes "^666666(This is the";
@@ -476,7 +477,7 @@ ein_in01,277,95,7	script	Ryan Danger#air#einbech	855,{
 	mes "Or am I?";
 	mes "Bwahahahaha!";
 	next;
-	mes "["+PcName+"]";
+	mes "["+strcharinfo(0)+"]";
 	mes "(Th-this guy";
 	mes "must be drunk out";
 	mes "of his freakin' mind!)";
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index e59c94da0..fb0298857 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -29,6 +29,7 @@
 //= 1.5 Updated Hotel Employee to work with Airship Ticket Quest [Samuray22]
 //= 1.6 Optimized several NPCs [DZeroX]
 //= 1.7 Replaced outdated variable with getarg. [L0ne_W0lf]
+//= 1.8 Fixed Occurances of PcName. [L0ne_W0lf]
 //============================================================
 
 einbroch,218,198,5	script	Mark#ein	855,{
@@ -330,7 +331,7 @@ einbroch,40,116,1	script	Airship Engineer#ein-1	855,{
 		next;
 		switch(select("Ah~:Uh huh...")) {
 		case 1:
-			mes "["+PcName+"]";
+			mes "["+strcharinfo(0)+"]";
 			mes "Ah~";
 			mes "I see, so you're";
 			mes "working on restoring";
@@ -344,7 +345,7 @@ einbroch,40,116,1	script	Airship Engineer#ein-1	855,{
 			mes "fixing up Burielle...";
 			close;
 		case 2:
-			mes "["+PcName+"]";
+			mes "["+strcharinfo(0)+"]";
 			mes "Uh huh...";
 			mes "Right. For a second";
 			mes "there, I thought you were";
@@ -352,7 +353,7 @@ einbroch,40,116,1	script	Airship Engineer#ein-1	855,{
 			mes "then I also assumed that you";
 			mes "weren't, you know, a nutcase.";
 			next;
-			mes "["+PcName+"]";
+			mes "["+strcharinfo(0)+"]";
 			mes "Oh, did you say,";
 			mes "''prettiest model?''";
 			mes "All Airships look the";
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]";