* 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

13 files changed, 137 insertions, 77 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index aa3ea08ad..1eccd0522 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,19 @@
 Date		Added
 ======
+2009/03/02
+	* Rev. 13559 Another round of bug fixes to various scripts. [L0ne_W0lf]
+	- 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.
 2009/01/19
 	* Rev. 13458 Looooots of bugfixes provided by various people! [L0ne_W0lf]
 	- Fixed Seal quest checking for oridecon hammer. Again. (Bugreport:2363)
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]";
diff --git a/npc/guild/agit_template.txt b/npc/guild/agit_template.txt
index 3c8913b18..83ce19292 100644
--- a/npc/guild/agit_template.txt
+++ b/npc/guild/agit_template.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4
+//= 1.6
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -41,6 +41,10 @@
 //= 1.4 Fixed a typo in defense investment. [L0ne_W0lf]
 //= 1.5 Fixed spawn point of the emperium in Payon 1. [L0ne_W0lf]
 //=     Double-investing doubles the price now.
+//= 1.6 Corrected Zeny check when summoning guardians. [L0ne_W0lf]
+//=     Corrected cost for investing, thanks to Ai4rei.
+//=     Second invest is now quadruple the value of the first
+//=     Investing now happens at the turn of the day.
 //============================================================
 
 // AGIT Manager Template
@@ -484,19 +488,29 @@ OnRecvCastle:
 		close;
 	case 2:
 		set .@Economy,GetCastleData(strnpcinfo(2),2);
-		if(.@Economy < 8) set .@eco_invest,10000;
-		if(.@Economy >= 8) set .@eco_invest,20000;
-		if(.@Economy >= 16) set .@eco_invest,40000;
-		if(.@Economy >= 25) set .@eco_invest,80000;
-		if(.@Economy >= 34) set .@eco_invest,160000;
-		if(.@Economy >= 44) set .@eco_invest,320000;
-		if(.@Economy >= 54) set .@eco_invest,640000;
-		if(.@Economy >= 65) set .@eco_invest,1280000;
-		if(.@Economy >= 76) set .@eco_invest,2560000;
-		if(.@Economy >= 88) set .@eco_invest,5120000;
-		//Double the cost of investing if you've already invested once.
+		if (.@Economy > 6) { set .@eco_invest,5000; }
+		else if ((.@Economy <= 6) && (.@Economy >= 10)) { set .@eco_invest,10000; }
+		else if ((.@Economy <= 11) && (.@Economy >= 15)) { set .@eco_invest,20000; }
+		else if ((.@Economy <= 16) && (.@Economy >= 20)) { set .@eco_invest,35000; }
+		else if ((.@Economy <= 21) && (.@Economy >= 25)) { set .@eco_invest,55000; }
+		else if ((.@Economy <= 26) && (.@Economy >= 30)) { set .@eco_invest,80000; }
+		else if ((.@Economy <= 31) && (.@Economy >= 35)) { set .@eco_invest,110000; }
+		else if ((.@Economy <= 36) && (.@Economy >= 40)) { set .@eco_invest,145000; }
+		else if ((.@Economy <= 41) && (.@Economy >= 45)) { set .@eco_invest,185000; }
+		else if ((.@Economy <= 46) && (.@Economy >= 50)) { set .@eco_invest,230000; }
+		else if ((.@Economy <= 51) && (.@Economy >= 55)) { set .@eco_invest,280000; }
+		else if ((.@Economy <= 56) && (.@Economy >= 60)) { set .@eco_invest,335000; }
+		else if ((.@Economy <= 61) && (.@Economy >= 65)) { set .@eco_invest,395000; }
+		else if ((.@Economy <= 66) && (.@Economy >= 70)) { set .@eco_invest,460000; }
+		else if ((.@Economy <= 71) && (.@Economy >= 75)) { set .@eco_invest,530000; }
+		else if ((.@Economy <= 76) && (.@Economy >= 80)) { set .@eco_invest,605000; }
+		else if ((.@Economy <= 81) && (.@Economy >= 85)) { set .@eco_invest,685000; }
+		else if ((.@Economy <= 86) && (.@Economy >= 90)) { set .@eco_invest,770000; }
+		else if ((.@Economy <= 91) && (.@Economy >= 95)) { set .@eco_invest,860000; }
+		else if ((.@Economy <= 96) && (.@Economy >= 100)) { set .@eco_invest,955000; }
+		//Quadruple the cost of investing if you've already invested once.
 		if (GetCastleData(strnpcinfo(2),4)) {
-			set .@eco_invest,.@eco_invest*2;
+			set .@eco_invest,.@eco_invest*4;
 		}
 		mes "[ Steward " + .@name$ + " ]";
 		mes "If you raise commercial growth, the quantity of goods made by the guild will increase. So if you want a prosperous future, investment will be required.";
@@ -527,7 +541,6 @@ OnRecvCastle:
 			}
 			set zeny,zeny-.@eco_invest;
 			SetCastleData strnpcinfo(2),4,GetCastleData(strnpcinfo(2),4)+1;
-			SetCastleData strnpcinfo(2),2,.@Economy + 1 + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014));
 			mes "[ Steward " + .@name$ + "]";
 			mes "We finished the investment safely. I expect that our growth level will be increased by tomorrow.";
 			close;
@@ -538,19 +551,29 @@ OnRecvCastle:
 		}
 	case 3:
 		set .@Defence,GetCastleData(strnpcinfo(2),3);
-		if(.@Defence < 8) set .@def_invest,20000;
-		if(.@Defence >= 8) set .@def_invest,40000;
-		if(.@Defence >= 16) set .@def_invest,80000;
-		if(.@Defence >= 25) set .@def_invest,160000;
-		if(.@Defence >= 34) set .@def_invest,320000;
-		if(.@Defence >= 44) set .@def_invest,640000;
-		if(.@Defence >= 54) set .@def_invest,1280000;
-		if(.@Defence >= 65) set .@def_invest,2560000;
-		if(.@Defence >= 76) set .@def_invest,5120000;
-		if(.@Defence >= 88) set .@def_invest,10240000;
-		//Double the cost of investing if you've already invested once.
+		if (.@Defence > 6) { set .@def_invest,10000; }
+		else if ((.@Defence <= 6) && (.@Defence >= 10)) { set .@def_invest,20000; }
+		else if ((.@Defence <= 11) && (.@Defence >= 15)) { set .@def_invest,40000; }
+		else if ((.@Defence <= 16) && (.@Defence >= 20)) { set .@def_invest,70000; }
+		else if ((.@Defence <= 21) && (.@Defence >= 25)) { set .@def_invest,110000; }
+		else if ((.@Defence <= 26) && (.@Defence >= 30)) { set .@def_invest,160000; }
+		else if ((.@Defence <= 31) && (.@Defence >= 35)) { set .@def_invest,220000; }
+		else if ((.@Defence <= 36) && (.@Defence >= 40)) { set .@def_invest,290000; }
+		else if ((.@Defence <= 41) && (.@Defence >= 45)) { set .@def_invest,370000; }
+		else if ((.@Defence <= 46) && (.@Defence >= 50)) { set .@def_invest,460000; }
+		else if ((.@Defence <= 51) && (.@Defence >= 55)) { set .@def_invest,560000; }
+		else if ((.@Defence <= 56) && (.@Defence >= 60)) { set .@def_invest,670000; }
+		else if ((.@Defence <= 61) && (.@Defence >= 65)) { set .@def_invest,790000; }
+		else if ((.@Defence <= 66) && (.@Defence >= 70)) { set .@def_invest,920000; }
+		else if ((.@Defence <= 71) && (.@Defence >= 75)) { set .@def_invest,1060000; }
+		else if ((.@Defence <= 76) && (.@Defence >= 80)) { set .@def_invest,1210000; }
+		else if ((.@Defence <= 81) && (.@Defence >= 85)) { set .@def_invest,1370000; }
+		else if ((.@Defence <= 86) && (.@Defence >= 90)) { set .@def_invest,1540000; }
+		else if ((.@Defence <= 91) && (.@Defence >= 95)) { set .@def_invest,1720000; }
+		else if ((.@Defence <= 96) && (.@Defence >= 100)) { set .@def_invest,1910000; }
+		//Quadruple the cost of investing if you've already invested once.
 		if (GetCastleData(strnpcinfo(2),5)) {
-			set .@def_invest,.@def_invest*2;
+			set .@def_invest,.@def_invest*4;
 		}
 		mes "[ Steward " + .@name$ + " ]";
 		mes "If you raise the safeguard, the durability of the Guardians and emperium will increase. So if you expect more defenses in battles, investment will be required.";
@@ -581,7 +604,6 @@ OnRecvCastle:
 			}
 			set zeny,zeny-.@def_invest;
 			SetCastleData strnpcinfo(2),5,GetCastleData(strnpcinfo(2),5)+1;
-			SetCastleData strnpcinfo(2),3,.@Defence+1;
 			mes "[ Steward " + .@name$ + "]";
 			mes "We finished the investment safely. I expect that the safeguard level will be increased by tomorrow.";
 			close;
@@ -624,7 +646,7 @@ OnRecvCastle:
 				close;
 			}
 
-			if (Zeny < 1000) {
+			if (Zeny < 10000) {
 				mes "Well... I'm sorry but we don't have funds to summon the Guardian. We failed to summon the Guardian.";
 				close;
 			}
@@ -1230,10 +1252,6 @@ OnClock0001:
 		end;
 	}
 
-	// Reset daily investment limit.
-	setcastledata strnpcinfo(2),4,0;
-	setcastledata strnpcinfo(2),5,0;
-
 	// Spawn boxes in proper order.
 	for (set .@i,0; .@i <= .@Treasure ; set .@i,.@i+1) {
 		// set treasure box ID
@@ -1245,6 +1263,21 @@ OnClock0001:
 			setd "$@"+strnpcinfo(2)+"_treasure",getd("$@"+strnpcinfo(2)+"_treasure") | .@box;
 		}
 	}
+
+	// Apply investment to Eco. and Def. Only happens if there were investments made.
+	// Permanent Development can only happen once per day.
+	if (GetCastleData(strnpcinfo(2),4)) {
+		set .@Economy,GetCastleData(strnpcinfo(2),2);
+		SetCastleData strnpcinfo(2),2,.@Economy + GetCastleData(strnpcinfo(2),4) + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014));
+	}
+	if (GetCastleData(strnpcinfo(2),5)) {
+		set .@Defence,GetCastleData(strnpcinfo(2),3);
+		SetCastleData strnpcinfo(2),3,.@Defence + GetCastleData(strnpcinfo(2),5);
+	}
+	// Reset daily investment limits.
+	setcastledata strnpcinfo(2),4,0;
+	setcastledata strnpcinfo(2),5,0;
+
 	end;
 
 // Individual "You killed a chest" events to ensure proper spawning at the change of day.
diff --git a/npc/mobs/fields/morocc.txt b/npc/mobs/fields/morocc.txt
index a866a5dd2..f84fd8e14 100644
--- a/npc/mobs/fields/morocc.txt
+++ b/npc/mobs/fields/morocc.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
@@ -12,6 +12,8 @@
 //= 1.3 Added Morroc field 20, 21, and 22 spawns, as [L0ne_W0lf]
 //= 1.4 Updated spawns to reflect episode 12.1. [L0ne_W0lf]
 //= 1.5 Fixed Pheeroni spawn location. [Kisuka]
+//= 1.6 Added Satan MOrroc static spawn. [L0ne_W0lf]
+//=     Added 30s spawn time for all Morroc Shadows.
 //============================================================
 
 //==================================================
@@ -296,10 +298,10 @@ moc_fild20,0,0,0,0	monster	Drops	1113,30,0,0,0
 moc_fild20,0,0,0,0	monster	Scorpion	1001,70,0,0,0
 moc_fild20,0,0,0,0	monster	Picky	1050,50,0,0,0
 moc_fild20,0,0,0,0	monster	Picky	1049,50,0,0,0
-moc_fild20,0,0,0,0	monster	Morroc's Shadow	1918,1,0,0,0
-moc_fild20,0,0,0,0	monster	Morroc's Shadow	1919,1,0,0,0
-moc_fild20,0,0,0,0	monster	Morroc's Shadow	1920,1,0,0,0
-moc_fild20,0,0,0,0	monster	Morroc's Shadow	1921,1,0,0,0
+moc_fild20,0,0,0,0	monster	Morroc's Shadow	1918,1,30000,0,0
+moc_fild20,0,0,0,0	monster	Morroc's Shadow	1919,1,30000,0,0
+moc_fild20,0,0,0,0	monster	Morroc's Shadow	1920,1,30000,0,0
+moc_fild20,0,0,0,0	monster	Morroc's Shadow	1921,1,30000,0,0
 
 //==================================================
 // moc_fild21 - Dimensional Gorge
@@ -307,15 +309,16 @@ moc_fild20,0,0,0,0	monster	Morroc's Shadow	1921,1,0,0,0
 moc_fild21,0,0,0,0	monster	Golem	1040,61,0,0,0
 moc_fild21,0,0,0,0	monster	Stalactic Golem	1278,46,0,0,0
 moc_fild21,0,0,0,0	monster	Lava Golem	1366,46,0,0,0
-moc_fild21,0,0,0,0	monster	Morroc's Shadow	1918,46,0,0,0
-moc_fild21,0,0,0,0	monster	Morroc's Shadow	1919,46,0,0,0
-moc_fild21,0,0,0,0	monster	Morroc's Shadow	1920,46,0,0,0
-moc_fild21,0,0,0,0	monster	Morroc's Shadow	1921,34,0,0,0
+moc_fild21,0,0,0,0	monster	Morroc's Shadow	1918,46,30000,0,0
+moc_fild21,0,0,0,0	monster	Morroc's Shadow	1919,46,30000,0,0
+moc_fild21,0,0,0,0	monster	Morroc's Shadow	1920,46,30000,0,0
+moc_fild21,0,0,0,0	monster	Morroc's Shadow	1921,34,30000,0,0
 
 //==================================================
 // moc_fild22 - Dimensional Gorge
 //==================================================
-moc_fild22,0,0,0,0	monster	Morroc's Shadow	1918,60,0,0,0
-moc_fild22,0,0,0,0	monster	Morroc's Shadow	1919,60,0,0,0
-moc_fild22,0,0,0,0	monster	Morroc's Shadow	1920,60,0,0,0
-moc_fild22,0,0,0,0	monster	Morroc's Shadow	1921,25,0,0,0
+moc_fild22,0,0,0,0	monster	Morroc's Shadow	1918,60,30000,0,0
+moc_fild22,0,0,0,0	monster	Morroc's Shadow	1919,60,30000,0,0
+moc_fild22,0,0,0,0	monster	Morroc's Shadow	1920,60,30000,0,0
+moc_fild22,0,0,0,0	monster	Morroc's Shadow	1921,25,30000,0,0
+moc_fild22,0,0,0,0	monster	Woudned Satan Morroc	1917,1,43200000,3600000,1
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index aabe87184..d54266947 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf (Script), DZeroX (Timer)
 //===== Current Version: ===================================== 
-//= 4.5
+//= 4.6
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -96,6 +96,7 @@
 //=     Corrected some typos in the dialogs.
 //= 4.4 Updated reviecer and robots NPC to use mobcount. (bugreport:2380) [L0ne_W0lf]
 //= 4.5 Removed a delitem that was no logner needed. [L0en_W0lf]
+//= 4.6 Fixed impossible condition for security guard. [L0ne_W0lf]
 //============================================================ 
 
 //============================================================================
@@ -756,7 +757,7 @@ yuno_fild08,196,196,5	script	Hanie#kh1	102,{
 // Academy Security Guards
 //----------------------------------------------------------------------------
 yuno_fild08,158,194,6	script	Security Guard#1::KHAGuard	852,{
-	if ((KielHyreQuest < 2) && (KielHyreQuest > 31)) { 
+	if ((KielHyreQuest < 2) || (KielHyreQuest > 31)) { 
 		mes "[Security Guard]";
 		mes "I'm sorry, but if you aren't";
 		mes "associated with this institution,";
diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt
index 9cfe6f253..7d9a0e63f 100644
--- a/npc/quests/obb_quest.txt
+++ b/npc/quests/obb_quest.txt
@@ -3,7 +3,7 @@
 //===== By ===================================================
 //= Celesta, Lupus
 //===== Version ==============================================
-//= 1.9
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -19,6 +19,7 @@
 //= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.8 Added missing checkweights. [L0ne_W0lf]
 //= 1.9 Moved Morroc NPCs to Morroc Ruins. [L0ne_W0lf]
+//= 2.0 Removed unused "name" variable. [L0ne_W0lf]
 //============================================================ 
 
 alberta,43,244,0	script	Tourist#thai	99,{
@@ -1017,7 +1018,6 @@ moc_ruins,105,62,4	script	Jacob#thai	50,{
 				mes "'^0000FFTry to be in someone else's shoes before judging that person.^000000'";
 				mes "Do you understand?";
 				next;
-				set name,PcName;
 				mes "["+strcharinfo(0)+"]";
 				mes "(There's more this guy can tell me, I just know it...)";
 				close;
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index 1ae068b9a..3b18c5faa 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 2.2a
+//= 2.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -44,6 +44,7 @@
 //=     Added missing quest, "Oridecon/Mineral Quest"
 //=     Full overhual of the Uwe Kleine quest.
 //= 2.2a Fixed typos in var names from EIN_LOVERQRQ to EIN_LOVERQ. (bugreport:2464) [Paradox924X]
+//= 2.3 Removed occurance of PcName. [L0ne_W0lf]
 //============================================================ 
 
 // Oridecon Stone OR Mineral Stone Quest
@@ -1049,7 +1050,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 			mes "Oh! Hello again,";
 			mes "you cutie adventurer.";
 			mes "So tell me, what brings";
-			mes "you here, "+PcName+"?";
+			mes "you here, "+strcharinfo(0)+"?";
 			next;
 			switch(select("Ask about Cooking.:Ask about Einbroch.:Cancel.")) {
 			case 1:
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index cbd99e095..593f59cad 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 2.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -32,6 +32,7 @@
 //= 1.9 Bug fixes/Typos. [Paradox924X]
 //= 2.0 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 2.1 Fixed guard tower warper ALWAYS warping. (bugreport:2377) [L0ne_W0lf]
+//= 2.2 Removed unused "name" variable. [L0ne_W0lf]
 //============================================================ 
 
 // Soup Quest
@@ -4333,7 +4334,6 @@ OnTouch:
 
 louyang,217,278,0	script	 #lou_path	111,{
 	if (ch_poison == 12 || ch_poison == 16) {
-		set name,PcName;
 		mes "["+strcharinfo(0)+"]";
 		mes "What's this?";
 		mes "A crack in the wall?";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index c0dfac447..ab77879a1 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 2.4
+//= 2.5
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -28,6 +28,7 @@
 //= 2.4 Implemented Ep. 12.1 Continental Guard Quest. [L0ne_W0lf]
 //=     Moved Dandelion's Request to a it's own file.
 //=     Added support NPCs required to finish Gaebolg quest.
+//= 2.5 Fixed Group of Evil never re-enabling. [L0ne_W0lf]
 //============================================================ 
 
 //==================================================================================//
@@ -1881,7 +1882,6 @@ OnInit:
 
 OnEnable:
 	enablenpc "Group of Evil#edq";
-	donpcevent "Time-Space Gap#edq::OnDisable";
 	end;
 
 OnDisable:
@@ -1933,7 +1933,7 @@ OnTimer1800000:
 OnTimer21600000:
 	stopnpctimer;
 	set $@re_moc,0;
-	disablenpc "Time-Space Gap#edq";
+	donpcevent "Time-Space Gap#edq::OnDisable";
 	end;
 }
 
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index a806db290..44a147a98 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.8
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -52,6 +52,8 @@
 //= 1.7 Fixed a typo in monestary quest. [L0ne_W0lf]
 //= 1.8 Renamed temporary global variable. [L0ne_W0lf]
 //=     moved OnMyMobDead for access quest to a different NPC.
+//= 1.9 Fixed mapwarp warping to disabled map. [L0ne_W0lf]
+//= 2.0 Removed duplicate dialog. [L0ne_W0lf]
 //============================================================ 
 
 // Nameless Island and Cursed Monestary Access Quest
@@ -2800,7 +2802,6 @@ OnTouch:
 		mes "priests, the corruption...^000000";
 		next;
 		mes "^3355FFHe also explained the role";
-		mes "He also explained the role";
 		mes "of the priests in the inhumane";
 		mes "testing conducted by the";
 		mes "Rekenber Corporation, and";
@@ -8830,7 +8831,7 @@ z_agit,97,101,3	script	Louis	931,{
 		close2;
 		getitem 7724,1; //Forbidden_Secret_Art
 		set zdan_edq,18;
-		mapwarp "z_agit","moc_fild09",68,298;
+		mapwarp "z_agit","moc_fild17",209,235;
 		set $@monster_zgang,0;
 		set $@door2,0;
 		hideonnpc "Louis";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index e058350cb..45ff7aa43 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 3.2
+//= 3.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -57,6 +57,8 @@
 //=     Some more numeric conversion, and some other cleanup.
 //= 3.1 Updated Ice Necklace quest, added missing checks. [L0ne_W0lf]
 //= 3.2 Added missing updates for Peace to the Arunafeltz quest. [L0ne_W0lf]
+//= 3.3 Fixed occurance of PcName. [L0ne_W0lf]
+//=     Fixed level 4 ID warps always being usable.
 //============================================================ 
 
 // Lost Child Quest (Prerequisite to High Priest quest)
@@ -3813,10 +3815,10 @@ OnTimer7200000:
 ice_dun03,1,175,3	script	#ice_sec	-1,{
 OnStart:
 	initnpctimer;
-	hideoffnpc "#ice_4f_1";
-	hideoffnpc "#ice_4f_2";
-	hideoffnpc "#ice_4f_3";
-	hideoffnpc "#ice_4f_4";
+	enablenpc "#ice_4f_1";
+	enablenpc "#ice_4f_2";
+	enablenpc "#ice_4f_3";
+	enablenpc "#ice_4f_4";
 	donpcevent "#ice_4f_1::OnEnable";
 	donpcevent "#ice_4f_2::OnEnable";
 	donpcevent "#ice_4f_3::OnEnable";
@@ -3825,10 +3827,10 @@ OnStart:
 
 OnTimer60000:
 	stopnpctimer;
-	hideonnpc "#ice_4f_1";
-	hideonnpc "#ice_4f_2";
-	hideonnpc "#ice_4f_3";
-	hideonnpc "#ice_4f_4";
+	disablenpc "#ice_4f_1";
+	disablenpc "#ice_4f_2";
+	disablenpc "#ice_4f_3";
+	disablenpc "#ice_4f_4";
 	end;
 }
 
@@ -7173,7 +7175,7 @@ ra_temsky,99,99,5	script	Pope#rachel	936,{
 			mes "strange to me. Well, it's";
 			mes "good to hear it from you.";
 			next;
-			mes "["+PcName+"]";
+			mes "["+strcharinfo(0)+"]";
 			mes "(^333333I can't just leave";
 			mes "now. I should try to see";
 			mes "if I can learn anything";