* Fixed and commented out old Anthell entrance warps (bugreport:3589).

- Moved entrance to cmd_fild08 to match mapcache updates.
* Fixed an issue in Resurrection of Satan Morroc (Continental Guard Quest) when player dying/logging out during conversation could prevent summoning of Satan Morroc until server reboot (bugreport:3437).


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

3 files changed, 28 insertions, 8 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 891731223..a1423fba6 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
 Date		Added
 ======
+2011/03/21
+	* Fixed and commented out old Anthell entrance warps (bugreport:3589). Moved entrance to cmd_fild08 to match mapcache updates [Gepard]
+	- Fixed an issue in Resurrection of Satan Morroc (Continental Guard Quest) when player dying/logging out during conversation
+	  could prevent summoning of Satan Morroc until server reboot (bugreport:3437).
 2011/03/17
 	* Rev. 14747 Endless Tower fixes: [Gepard]
 	- Added missing end's to prevent accidental disabling of warps between floors. (bugreport:4623)
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index f6ad5bf73..ccd1a54e0 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 2.8
+//= 2.9
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -41,6 +41,8 @@
 //=     finished it to return to the previous map.
 //= 2.7 Corrected weight checks, they only check for inventory slots. [L0ne_W0lf]
 //= 2.8 Disabled Assassin bar pub NPCs, as they are included in the 13.1 quests file. [L0ne_W0lf]
+//= 2.9 Fixed player dying/logging out during conversation could prevent
+//=     summoning of Satan Morroc until server reboot. [Gepard]
 //============================================================ 
 
 // Stop Post Quest
@@ -1899,7 +1901,6 @@ OnDisable:
 
 moc_fild21,178,239,0	script	Group of Evil#edq	844,1,1,{
 	if (((rebirth_moc_edq == 4) || (rebirth_moc_edq == 7)) && ($@re_moc == 1)) {
-		set $@re_moc,2;
 		mes "Awed by the time-space gap where darkness is given life, you instinctively step back.";
 		next;
 		mes "You can feel the power of the darkness rise from the gap where light and darkness are mingled.";
@@ -1907,7 +1908,10 @@ moc_fild21,178,239,0	script	Group of Evil#edq	844,1,1,{
 		mes "[" + strcharinfo(0) + "]";
 		mes "Wah...!";
 		close2;
-		donpcevent "Satan Summon#edq::OnEnable";
+		if($@re_moc == 1) {
+			set $@re_moc,2;
+			donpcevent "Satan Summon#edq::OnEnable";
+		}
 		end;
 	}
 	else {
diff --git a/npc/warps/dungeons/anthell.txt b/npc/warps/dungeons/anthell.txt
index 44625e45d..22203a738 100644
--- a/npc/warps/dungeons/anthell.txt
+++ b/npc/warps/dungeons/anthell.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -12,13 +12,25 @@
 //= 1.3 Changed var anthell to @anthell. Optimized [Lupus]
 //= 1.4 Removed Duplicates [Silent]
 //= 1.5 Updated warps for episode 12.1 [L0ne_W0lf]
+//= 1.6 Fixed coordinates for pre-2010/06/09 maps (bugreport:3589)
+//=     Moved entrance to cmd_fild08 to match mapcache [Gepard]
 //============================================================
 
 //= Ant Hell =================================================
-moc_fild20,156,143,0	warp	moc_ant1-1	3,4,anthell01,35,262
-anthell01,35,267,0	warp	moc_ant1-2	1,1,moc_fild20,164,145
-moc_fild20,337,315,0	warp	moc_ant2-1	3,3,anthell01,35,262
-anthell02,172,169,0	warp	moc_ant2-2	1,1,moc_fild20,330,314
+
+/* Pre 2010-06-09adata_x1.gpf version
+ * Requires modified mapcache and client-side maps
+ */
+//moc_fild20,156,143,0	warp	moc_ant1-1	1,1,anthell01,35,263
+//anthell01,35,267,0	warp	moc_ant1-2	1,1,moc_fild20,161,144
+//moc_fild20,337,315,0	warp	moc_ant2-1	1,1,anthell02,168,170
+//anthell02,171,170,0	warp	moc_ant2-2	1,1,moc_fild20,333,315
+
+/* 2010-06-09 version */
+cmd_fild08,335,355,0	warp	moc_ant1-1	3,4,anthell01,35,262
+anthell01,35,267,0	warp	moc_ant1-2	1,1,cmd_fild08,330,355
+cmd_fild08,348,82,0	warp	moc_ant2-1	3,3,anthell02,168,170
+anthell02,172,169,0	warp	moc_ant2-2	1,1,cmd_fild08,344,82
 
 anthell01,253,32,0	warp	ant01	2,1,anthell02,34,263
 anthell02,32,267,0	warp	ant01-1	2,2,anthell01,253,35