From daccca168d7b3ec1849c90b4d0ccbe2ce39f44e4 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 23 Aug 2017 20:33:23 +0000
Subject: [PATCH] Improved Memory of Disaster.

---
 .../instances/MemoryOfDisaster/MemoryOfDisaster.java   | 10 ++--------
 .../instances/MemoryOfDisaster/calltochange_end.htm    |  2 +-
 .../instances/MemoryOfDisaster/MemoryOfDisaster.java   | 10 ++--------
 .../instances/MemoryOfDisaster/calltochange_end.htm    |  2 +-
 .../instances/MemoryOfDisaster/MemoryOfDisaster.java   | 10 ++--------
 .../instances/MemoryOfDisaster/calltochange_end.htm    |  2 +-
 6 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/L2J_Mobius_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java
index 84de2350f6..2f7ac24bd1 100644
--- a/L2J_Mobius_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java
+++ b/L2J_Mobius_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java
@@ -649,22 +649,16 @@ public final class MemoryOfDisaster extends AbstractInstance
 				break;
 			}
 			case "TIMER_ID_END":
-			{
-				playMovie(player, Movie.SC_AWAKENING_OPENING_E);
-				getTimers().addTimer("TIMER_ID_ED_SCEN_END", 30000, npc, player);
-				break;
-			}
-			case "TIMER_ID_ED_SCEN_END":
 			{
 				playMovie(player, Movie.SC_AWAKENING_OPENING_F);
-				getTimers().addTimer("TIMER_ID_FINAL_ED_SCEN_END", 10000, npc, player);
+				getTimers().addTimer("TIMER_ID_FINAL_ED_SCEN_END", 40000, npc, player);
 				break;
 			}
 			case "TIMER_ID_FINAL_ED_SCEN_END":
 			{
 				// myself->SetOneTimeQuestFlag(myself->c_ai0, 10491, 1);
-				player.sendPacket(new TutorialShowHtml(getHtm(player.getHtmlPrefix(), "calltochange_end.htm")));
 				finishInstance(player, 0);
+				player.sendPacket(new TutorialShowHtml(getHtm(player.getHtmlPrefix(), "calltochange_end.htm")));
 				break;
 			}
 			case "TIMER_ID_DIE":
diff --git a/L2J_Mobius_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm b/L2J_Mobius_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm
index 790a2ac2fd..b87028f919 100644
--- a/L2J_Mobius_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm
+++ b/L2J_Mobius_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm
@@ -3,5 +3,5 @@ My faithful servant Cellphine is waiting to guide you to your fate of Awakening.
 To find Cellphine, go to the Museum, the largest building at Southern most part of Talking Island Village.<br1>
 Speak to the Pantheon to enter the Museum and find Cellphine inside.<br>
 Follow Cellphine's instructions to answer my call.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="link tutorial_close_0">Close Window</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h tutorial_close">Close Window</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java
index 84de2350f6..2f7ac24bd1 100644
--- a/L2J_Mobius_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java
@@ -649,22 +649,16 @@ public final class MemoryOfDisaster extends AbstractInstance
 				break;
 			}
 			case "TIMER_ID_END":
-			{
-				playMovie(player, Movie.SC_AWAKENING_OPENING_E);
-				getTimers().addTimer("TIMER_ID_ED_SCEN_END", 30000, npc, player);
-				break;
-			}
-			case "TIMER_ID_ED_SCEN_END":
 			{
 				playMovie(player, Movie.SC_AWAKENING_OPENING_F);
-				getTimers().addTimer("TIMER_ID_FINAL_ED_SCEN_END", 10000, npc, player);
+				getTimers().addTimer("TIMER_ID_FINAL_ED_SCEN_END", 40000, npc, player);
 				break;
 			}
 			case "TIMER_ID_FINAL_ED_SCEN_END":
 			{
 				// myself->SetOneTimeQuestFlag(myself->c_ai0, 10491, 1);
-				player.sendPacket(new TutorialShowHtml(getHtm(player.getHtmlPrefix(), "calltochange_end.htm")));
 				finishInstance(player, 0);
+				player.sendPacket(new TutorialShowHtml(getHtm(player.getHtmlPrefix(), "calltochange_end.htm")));
 				break;
 			}
 			case "TIMER_ID_DIE":
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm b/L2J_Mobius_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm
index 790a2ac2fd..b87028f919 100644
--- a/L2J_Mobius_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm
@@ -3,5 +3,5 @@ My faithful servant Cellphine is waiting to guide you to your fate of Awakening.
 To find Cellphine, go to the Museum, the largest building at Southern most part of Talking Island Village.<br1>
 Speak to the Pantheon to enter the Museum and find Cellphine inside.<br>
 Follow Cellphine's instructions to answer my call.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="link tutorial_close_0">Close Window</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h tutorial_close">Close Window</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java
index 84de2350f6..2f7ac24bd1 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java
@@ -649,22 +649,16 @@ public final class MemoryOfDisaster extends AbstractInstance
 				break;
 			}
 			case "TIMER_ID_END":
-			{
-				playMovie(player, Movie.SC_AWAKENING_OPENING_E);
-				getTimers().addTimer("TIMER_ID_ED_SCEN_END", 30000, npc, player);
-				break;
-			}
-			case "TIMER_ID_ED_SCEN_END":
 			{
 				playMovie(player, Movie.SC_AWAKENING_OPENING_F);
-				getTimers().addTimer("TIMER_ID_FINAL_ED_SCEN_END", 10000, npc, player);
+				getTimers().addTimer("TIMER_ID_FINAL_ED_SCEN_END", 40000, npc, player);
 				break;
 			}
 			case "TIMER_ID_FINAL_ED_SCEN_END":
 			{
 				// myself->SetOneTimeQuestFlag(myself->c_ai0, 10491, 1);
-				player.sendPacket(new TutorialShowHtml(getHtm(player.getHtmlPrefix(), "calltochange_end.htm")));
 				finishInstance(player, 0);
+				player.sendPacket(new TutorialShowHtml(getHtm(player.getHtmlPrefix(), "calltochange_end.htm")));
 				break;
 			}
 			case "TIMER_ID_DIE":
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm b/L2J_Mobius_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm
index 790a2ac2fd..b87028f919 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/calltochange_end.htm
@@ -3,5 +3,5 @@ My faithful servant Cellphine is waiting to guide you to your fate of Awakening.
 To find Cellphine, go to the Museum, the largest building at Southern most part of Talking Island Village.<br1>
 Speak to the Pantheon to enter the Museum and find Cellphine inside.<br>
 Follow Cellphine's instructions to answer my call.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="link tutorial_close_0">Close Window</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h tutorial_close">Close Window</Button>
 </body></html>
\ No newline at end of file