* 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, 3 insertions, 3 deletions

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