diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/instances/DimensionMakkum.xml b/L2J_Mobius_3.0_Helios/dist/game/data/instances/DimensionMakkum.xml
new file mode 100644
index 0000000000..7aee367cec
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/instances/DimensionMakkum.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/34290.html b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/34290.html
new file mode 100644
index 0000000000..aff9656882
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/34290.html
@@ -0,0 +1,6 @@
+Dimensional Researcher Piore:
+I can't believe you actually defeated Makkum. I am the Dimensional Researcher Piore, studying the Dimensional Rift together with Lias.
+While we have confirmed that Makkum is here, he is not an easy opponent, and we were looking for the right opportunity. Iy's quite a feat foe you to defeat Makkum so soon. I'd like to express the gratitude of the Dimensional Researchers.
+I need to explore the Dimensional rift a bit more. If it's alright with you, could you go to Lias and tell her about the situation? I will send you to where Lias is.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
new file mode 100644
index 0000000000..6d1514fe73
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -0,0 +1,109 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package instances.DimensionMakkum;
+
+import com.l2jmobius.gameserver.model.actor.L2Npc;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.instancezone.Instance;
+import com.l2jmobius.gameserver.model.quest.QuestState;
+
+import instances.AbstractInstance;
+import quests.Q10658_MakkumInTheDimension.Q10658_MakkumInTheDimension;
+
+/**
+ * Dimension Makkum instance
+ * @author Gigi
+ */
+public class DimensionMakkum extends AbstractInstance
+{
+ // NPCs
+ private static final int PIORE = 34290;
+ private static final int DIMENSIONAL_MAKKUM = 26195;
+ // Misc
+ private static final int TEMPLATE_ID = 10658;
+
+ public DimensionMakkum()
+ {
+ super(TEMPLATE_ID);
+ addFirstTalkId(PIORE);
+ addKillId(DIMENSIONAL_MAKKUM);
+ addInstanceCreatedId(TEMPLATE_ID);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final Instance world = getPlayerInstance(player);
+ switch (event)
+ {
+ case "enter_instance":
+ {
+ enterInstance(player, npc, TEMPLATE_ID);
+ break;
+ }
+ case "spawn_piore":
+ {
+ addSpawn(PIORE, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 300000, false, world.getId());
+ break;
+ }
+ case "exitInstance":
+ {
+ if (world != null)
+ {
+ teleportPlayerOut(player, world);
+ }
+ break;
+ }
+ }
+ return super.onAdvEvent(event, npc, player);
+ }
+
+ @Override
+ public void onInstanceCreated(Instance instance, L2PcInstance player)
+ {
+ addSpawn(DIMENSIONAL_MAKKUM, 185064, -9610, -5488, 19610, false, 430000, true, instance.getId());
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+ {
+ final QuestState qs = killer.getQuestState(Q10658_MakkumInTheDimension.class.getSimpleName());
+ final Instance world = npc.getInstanceWorld();
+ if (world == null)
+ {
+ return super.onKill(npc, killer, isSummon);
+ }
+ startQuestTimer("spawn_piore", 4000, npc, killer);
+ if ((qs != null) && qs.isCond(1))
+ {
+ qs.setCond(2, true);
+ }
+ world.finishInstance();
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public String onFirstTalk(L2Npc npc, L2PcInstance player)
+ {
+ return "34290.html";
+ }
+
+ public static void main(String[] args)
+ {
+ new DimensionMakkum();
+ }
+}
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/MissingQuests.txt b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/MissingQuests.txt
index 4eaa219a4a..540906e4ba 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/MissingQuests.txt
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/MissingQuests.txt
@@ -77,7 +77,6 @@
10538 Giant's Evolution Cause of failed evolution
10539 Energy Supply Cutoff Plan Defeat Halisha's Henchman
10540 Thwarting Mimir's Plan Defeating Mimir
-10658 Makkum in the Dimension Dimensional Makkum
10712 The Minstrel's Song, Part 1
10717 The Minstrel's Song, Part 2
10720 The Minstrel's Song, Part 3
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-00.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-00.htm
new file mode 100644
index 0000000000..6ee0c9b18c
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-00.htm
@@ -0,0 +1,4 @@
+Dimensional Researcher Lias:
+to perform this task, you have to help me in the research Dimensional Crack.
+(This quest is for characters Lv. 100 or above who have completed the "100-day Subjugation Operation" quest 100 times.)
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-01.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-01.htm
new file mode 100644
index 0000000000..cad6c23742
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-01.htm
@@ -0,0 +1,6 @@
+Dimensional Researcher Lias:
+Wow! Would you take a look see how much the Dimensional Traces accumulated! HaargI mean, you were building up so much of them, I knew there was something special about you, but wow, I never expected it to be so much!
+You did know how much of the Dimensional Traces you picked up, didn't you?
+With this much, we'll be able to make it to the depths of the Dimensional Rift! If what I suppose to be true is right, who we'll find there is Makkum!
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-02.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-02.htm
new file mode 100644
index 0000000000..0f5c438850
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-02.htm
@@ -0,0 +1,5 @@
+Dimensional Researcher Lias:
+Yes, I'm certain. My research says so, and Queen Navari also suspects that it's Makkum in there.
+Of course, she said that it won't be the real form of Makkum. Still, everybody agreed that Makkum was the only one that has any reason to lie in hiding there!
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-03.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-03.htm
new file mode 100644
index 0000000000..02afa79fb5
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-03.htm
@@ -0,0 +1,7 @@
+Dimensional Researcher Lias:
+The Dimensional is already crumbling here and there, causing strange phenomena here and there.
+The Makkum who has hidden inside the Dimensional Rift was probably the one injured while fighting the adventurers, while the timeline is rather complicated...
+I think that Makkum, who was injured somewhere, has chosen this place to lick his wounds and gather up his remaining strength. I guess he expected it would be safe, since it,s not an easily accessible place.
+It appears that he took various measures to further improve the safety. He put in place the shells of Lillim and Nephilim we kept encountering, and the dimensional monsters that were hiding out inside.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-04.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-04.htm
new file mode 100644
index 0000000000..218990aadd
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-04.htm
@@ -0,0 +1,8 @@
+Dimensional Researcher Lias:
+The place where Makkum lies in hidden is so secret and hidden that even using the power emanating from the 100 Dimensional Traces you currently
+have will get just one person - you - there. Still, since Makkum has not yet recovered fully, I trust that if anyone were to be able to find and take advantage of any weaknesses he currently has, it's you!
+But don't let down your guard! Makkum is going to attack you at cost, even if it means sacrificing himself. Be as careful as you can in order to survive the battle.
+Remember, Makkum needs to be defeated within 7 minutes! if you find yourself unable to defeat Makkum when 7 minutes have passed, you'll need to get out of there at any cost. Be sure to take along a Blessed Escape with you.
+If you're ready to go to see Makkum, tell me.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-05.html b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-05.html
new file mode 100644
index 0000000000..68831ba3c2
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-05.html
@@ -0,0 +1,5 @@
+Dimensional Researcher Lias:
+Makkum needs to be defeated within 7 minutes! if you find yourself unable to defeat Makkum when 7 minutes have passed, you'll need to get out of there at any cost.
+If you're ready to go to see Makkum, tell me.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-06.html b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-06.html
new file mode 100644
index 0000000000..52662ad3b9
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-06.html
@@ -0,0 +1,10 @@
+Dimensional Researcher Lias:
+You've returned! Seeing as how the Dimensional Energy in you has changed, I'm guessing you've defeated Makkum! Amazing! I knew you'd succeed, Igoodboyl! Truly awesome.
+I've had these lying around to give one you when you slay Makkum and return. I'm sure they'll prove helpful. Choose the one you like!
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-07.html b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-07.html
new file mode 100644
index 0000000000..4bc2042c52
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-07.html
@@ -0,0 +1,4 @@
+Dimensional Researcher Lias:
+We hope you like our gift for you. Thank you so much for helping us with our Dimensional research.
+The Dimensional Traces that you have accumulated have been trained of there Dimensional Energy, so I'll take them off your hands. I'm sure Queen Navari greatly appreciates your help as well.
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
new file mode 100644
index 0000000000..402c30620a
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
@@ -0,0 +1,130 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package quests.Q10658_MakkumInTheDimension;
+
+import com.l2jmobius.gameserver.enums.QuestType;
+import com.l2jmobius.gameserver.model.actor.L2Npc;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.quest.Quest;
+import com.l2jmobius.gameserver.model.quest.QuestState;
+import com.l2jmobius.gameserver.model.quest.State;
+
+import quests.Q00928_100DaySubjugationOperation.Q00928_100DaySubjugationOperation;
+
+/**
+ * Makkum in the Dimension (10658)
+ * @URL https://l2wiki.com/Makkum_in_the_Dimension
+ * @VIDEO https://www.youtube.com/watch?v=1z5zLnMmKtw
+ * @author Gigi
+ */
+public class Q10658_MakkumInTheDimension extends Quest
+{
+ // Npc
+ private static final int LIAS = 34265;
+ // Items
+ private static final int DIMENSIONAL_TRACES = 47511;
+ // Misc
+ private static final int MIN_LEVEL = 100;
+
+ public Q10658_MakkumInTheDimension()
+ {
+ super(10658);
+ addStartNpc(LIAS);
+ addTalkId(LIAS);
+ addCondMinLevel(MIN_LEVEL, "34265-00.htm");
+ addCondCompletedQuest(Q00928_100DaySubjugationOperation.class.getSimpleName(), "34265-00.htm");
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "34265-02.htm":
+ case "34265-03.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "34265-04.htm":
+ {
+ qs.startQuest();
+ htmltext = event;
+ break;
+ }
+ default:
+ {
+ if (qs.isCond(2) && event.startsWith("giveReward_"))
+ {
+ final int itemId = Integer.parseInt(event.replace("giveReward_", ""));
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ giveItems(player, itemId, 1);
+ addExpAndSp(player, 4_303_647_428L, 10_328_753);
+ takeItems(player, DIMENSIONAL_TRACES, -1);
+ qs.exitQuest(QuestType.ONE_TIME, true);
+ htmltext = "34265-07.html";
+ }
+ else
+ {
+ htmltext = getNoQuestLevelRewardMsg(player);
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, true);
+ String htmltext = getNoQuestMsg(player);
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ if (getQuestItemsCount(player, DIMENSIONAL_TRACES) >= 100)
+ {
+ htmltext = "34265-01.htm";
+ break;
+ }
+ htmltext = "34265-00.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ htmltext = (qs.isCond(1)) ? "34265-05.html" : "34265-06.html";
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ }
+ }
+ return htmltext;
+ }
+}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java
index 9aefce8535..4c4875072b 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -351,6 +351,7 @@ import quests.Q10541_TrainLikeTheRealThing.Q10541_TrainLikeTheRealThing;
import quests.Q10542_SearchingForNewPower.Q10542_SearchingForNewPower;
import quests.Q10543_SheddingWeight.Q10543_SheddingWeight;
import quests.Q10544_SeekerSupplies.Q10544_SeekerSupplies;
+import quests.Q10658_MakkumInTheDimension.Q10658_MakkumInTheDimension;
import quests.Q10701_TheRoadToDestruction.Q10701_TheRoadToDestruction;
import quests.Q10702_TheRoadToInfinity.Q10702_TheRoadToInfinity;
import quests.Q10703_BottleOfIstinasSoul.Q10703_BottleOfIstinasSoul;
@@ -787,6 +788,7 @@ public class QuestMasterHandler
Q10542_SearchingForNewPower.class,
Q10543_SheddingWeight.class,
Q10544_SeekerSupplies.class,
+ Q10658_MakkumInTheDimension.class,
Q10701_TheRoadToDestruction.class,
Q10702_TheRoadToInfinity.class,
Q10703_BottleOfIstinasSoul.class,
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/26100-26199.xml
index e62bb0e4a1..4812e9e5c8 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/26100-26199.xml
@@ -2941,4 +2941,82 @@
-
+
+
+
+
+
+
+
+ HUMANOID
+ MALE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/instances/DimensionMakkum.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/instances/DimensionMakkum.xml
new file mode 100644
index 0000000000..7aee367cec
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/instances/DimensionMakkum.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/34290.html b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/34290.html
new file mode 100644
index 0000000000..aff9656882
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/34290.html
@@ -0,0 +1,6 @@
+Dimensional Researcher Piore:
+I can't believe you actually defeated Makkum. I am the Dimensional Researcher Piore, studying the Dimensional Rift together with Lias.
+While we have confirmed that Makkum is here, he is not an easy opponent, and we were looking for the right opportunity. Iy's quite a feat foe you to defeat Makkum so soon. I'd like to express the gratitude of the Dimensional Researchers.
+I need to explore the Dimensional rift a bit more. If it's alright with you, could you go to Lias and tell her about the situation? I will send you to where Lias is.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
new file mode 100644
index 0000000000..6d1514fe73
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -0,0 +1,109 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package instances.DimensionMakkum;
+
+import com.l2jmobius.gameserver.model.actor.L2Npc;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.instancezone.Instance;
+import com.l2jmobius.gameserver.model.quest.QuestState;
+
+import instances.AbstractInstance;
+import quests.Q10658_MakkumInTheDimension.Q10658_MakkumInTheDimension;
+
+/**
+ * Dimension Makkum instance
+ * @author Gigi
+ */
+public class DimensionMakkum extends AbstractInstance
+{
+ // NPCs
+ private static final int PIORE = 34290;
+ private static final int DIMENSIONAL_MAKKUM = 26195;
+ // Misc
+ private static final int TEMPLATE_ID = 10658;
+
+ public DimensionMakkum()
+ {
+ super(TEMPLATE_ID);
+ addFirstTalkId(PIORE);
+ addKillId(DIMENSIONAL_MAKKUM);
+ addInstanceCreatedId(TEMPLATE_ID);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final Instance world = getPlayerInstance(player);
+ switch (event)
+ {
+ case "enter_instance":
+ {
+ enterInstance(player, npc, TEMPLATE_ID);
+ break;
+ }
+ case "spawn_piore":
+ {
+ addSpawn(PIORE, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 300000, false, world.getId());
+ break;
+ }
+ case "exitInstance":
+ {
+ if (world != null)
+ {
+ teleportPlayerOut(player, world);
+ }
+ break;
+ }
+ }
+ return super.onAdvEvent(event, npc, player);
+ }
+
+ @Override
+ public void onInstanceCreated(Instance instance, L2PcInstance player)
+ {
+ addSpawn(DIMENSIONAL_MAKKUM, 185064, -9610, -5488, 19610, false, 430000, true, instance.getId());
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+ {
+ final QuestState qs = killer.getQuestState(Q10658_MakkumInTheDimension.class.getSimpleName());
+ final Instance world = npc.getInstanceWorld();
+ if (world == null)
+ {
+ return super.onKill(npc, killer, isSummon);
+ }
+ startQuestTimer("spawn_piore", 4000, npc, killer);
+ if ((qs != null) && qs.isCond(1))
+ {
+ qs.setCond(2, true);
+ }
+ world.finishInstance();
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public String onFirstTalk(L2Npc npc, L2PcInstance player)
+ {
+ return "34290.html";
+ }
+
+ public static void main(String[] args)
+ {
+ new DimensionMakkum();
+ }
+}
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/MissingQuests.txt b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/MissingQuests.txt
index 6eb212e55a..b1251c6786 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/MissingQuests.txt
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/MissingQuests.txt
@@ -147,7 +147,6 @@
10538 Giant's Evolution Cause of failed evolution
10539 Energy Supply Cutoff Plan Defeat Halisha's Henchman
10540 Thwarting Mimir's Plan Defeating Mimir
-10658 Makkum in the Dimension Dimensional Makkum
10712 The Minstrel's Song, Part 1
10717 The Minstrel's Song, Part 2
10720 The Minstrel's Song, Part 3
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-00.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-00.htm
new file mode 100644
index 0000000000..6ee0c9b18c
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-00.htm
@@ -0,0 +1,4 @@
+Dimensional Researcher Lias:
+to perform this task, you have to help me in the research Dimensional Crack.
+(This quest is for characters Lv. 100 or above who have completed the "100-day Subjugation Operation" quest 100 times.)
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-01.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-01.htm
new file mode 100644
index 0000000000..cad6c23742
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-01.htm
@@ -0,0 +1,6 @@
+Dimensional Researcher Lias:
+Wow! Would you take a look see how much the Dimensional Traces accumulated! HaargI mean, you were building up so much of them, I knew there was something special about you, but wow, I never expected it to be so much!
+You did know how much of the Dimensional Traces you picked up, didn't you?
+With this much, we'll be able to make it to the depths of the Dimensional Rift! If what I suppose to be true is right, who we'll find there is Makkum!
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-02.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-02.htm
new file mode 100644
index 0000000000..0f5c438850
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-02.htm
@@ -0,0 +1,5 @@
+Dimensional Researcher Lias:
+Yes, I'm certain. My research says so, and Queen Navari also suspects that it's Makkum in there.
+Of course, she said that it won't be the real form of Makkum. Still, everybody agreed that Makkum was the only one that has any reason to lie in hiding there!
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-03.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-03.htm
new file mode 100644
index 0000000000..02afa79fb5
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-03.htm
@@ -0,0 +1,7 @@
+Dimensional Researcher Lias:
+The Dimensional is already crumbling here and there, causing strange phenomena here and there.
+The Makkum who has hidden inside the Dimensional Rift was probably the one injured while fighting the adventurers, while the timeline is rather complicated...
+I think that Makkum, who was injured somewhere, has chosen this place to lick his wounds and gather up his remaining strength. I guess he expected it would be safe, since it,s not an easily accessible place.
+It appears that he took various measures to further improve the safety. He put in place the shells of Lillim and Nephilim we kept encountering, and the dimensional monsters that were hiding out inside.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-04.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-04.htm
new file mode 100644
index 0000000000..218990aadd
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-04.htm
@@ -0,0 +1,8 @@
+Dimensional Researcher Lias:
+The place where Makkum lies in hidden is so secret and hidden that even using the power emanating from the 100 Dimensional Traces you currently
+have will get just one person - you - there. Still, since Makkum has not yet recovered fully, I trust that if anyone were to be able to find and take advantage of any weaknesses he currently has, it's you!
+But don't let down your guard! Makkum is going to attack you at cost, even if it means sacrificing himself. Be as careful as you can in order to survive the battle.
+Remember, Makkum needs to be defeated within 7 minutes! if you find yourself unable to defeat Makkum when 7 minutes have passed, you'll need to get out of there at any cost. Be sure to take along a Blessed Escape with you.
+If you're ready to go to see Makkum, tell me.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-05.html b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-05.html
new file mode 100644
index 0000000000..68831ba3c2
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-05.html
@@ -0,0 +1,5 @@
+Dimensional Researcher Lias:
+Makkum needs to be defeated within 7 minutes! if you find yourself unable to defeat Makkum when 7 minutes have passed, you'll need to get out of there at any cost.
+If you're ready to go to see Makkum, tell me.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-06.html b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-06.html
new file mode 100644
index 0000000000..52662ad3b9
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-06.html
@@ -0,0 +1,10 @@
+Dimensional Researcher Lias:
+You've returned! Seeing as how the Dimensional Energy in you has changed, I'm guessing you've defeated Makkum! Amazing! I knew you'd succeed, Igoodboyl! Truly awesome.
+I've had these lying around to give one you when you slay Makkum and return. I'm sure they'll prove helpful. Choose the one you like!
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-07.html b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-07.html
new file mode 100644
index 0000000000..4bc2042c52
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/34265-07.html
@@ -0,0 +1,4 @@
+Dimensional Researcher Lias:
+We hope you like our gift for you. Thank you so much for helping us with our Dimensional research.
+The Dimensional Traces that you have accumulated have been trained of there Dimensional Energy, so I'll take them off your hands. I'm sure Queen Navari greatly appreciates your help as well.
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
new file mode 100644
index 0000000000..402c30620a
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
@@ -0,0 +1,130 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package quests.Q10658_MakkumInTheDimension;
+
+import com.l2jmobius.gameserver.enums.QuestType;
+import com.l2jmobius.gameserver.model.actor.L2Npc;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.quest.Quest;
+import com.l2jmobius.gameserver.model.quest.QuestState;
+import com.l2jmobius.gameserver.model.quest.State;
+
+import quests.Q00928_100DaySubjugationOperation.Q00928_100DaySubjugationOperation;
+
+/**
+ * Makkum in the Dimension (10658)
+ * @URL https://l2wiki.com/Makkum_in_the_Dimension
+ * @VIDEO https://www.youtube.com/watch?v=1z5zLnMmKtw
+ * @author Gigi
+ */
+public class Q10658_MakkumInTheDimension extends Quest
+{
+ // Npc
+ private static final int LIAS = 34265;
+ // Items
+ private static final int DIMENSIONAL_TRACES = 47511;
+ // Misc
+ private static final int MIN_LEVEL = 100;
+
+ public Q10658_MakkumInTheDimension()
+ {
+ super(10658);
+ addStartNpc(LIAS);
+ addTalkId(LIAS);
+ addCondMinLevel(MIN_LEVEL, "34265-00.htm");
+ addCondCompletedQuest(Q00928_100DaySubjugationOperation.class.getSimpleName(), "34265-00.htm");
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "34265-02.htm":
+ case "34265-03.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "34265-04.htm":
+ {
+ qs.startQuest();
+ htmltext = event;
+ break;
+ }
+ default:
+ {
+ if (qs.isCond(2) && event.startsWith("giveReward_"))
+ {
+ final int itemId = Integer.parseInt(event.replace("giveReward_", ""));
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ giveItems(player, itemId, 1);
+ addExpAndSp(player, 4_303_647_428L, 10_328_753);
+ takeItems(player, DIMENSIONAL_TRACES, -1);
+ qs.exitQuest(QuestType.ONE_TIME, true);
+ htmltext = "34265-07.html";
+ }
+ else
+ {
+ htmltext = getNoQuestLevelRewardMsg(player);
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, true);
+ String htmltext = getNoQuestMsg(player);
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ if (getQuestItemsCount(player, DIMENSIONAL_TRACES) >= 100)
+ {
+ htmltext = "34265-01.htm";
+ break;
+ }
+ htmltext = "34265-00.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ htmltext = (qs.isCond(1)) ? "34265-05.html" : "34265-06.html";
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ }
+ }
+ return htmltext;
+ }
+}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java
index a45834aba6..56052373d8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -348,6 +348,7 @@ import quests.Q10541_TrainLikeTheRealThing.Q10541_TrainLikeTheRealThing;
import quests.Q10542_SearchingForNewPower.Q10542_SearchingForNewPower;
import quests.Q10543_SheddingWeight.Q10543_SheddingWeight;
import quests.Q10544_SeekerSupplies.Q10544_SeekerSupplies;
+import quests.Q10658_MakkumInTheDimension.Q10658_MakkumInTheDimension;
import quests.Q10701_TheRoadToDestruction.Q10701_TheRoadToDestruction;
import quests.Q10702_TheRoadToInfinity.Q10702_TheRoadToInfinity;
import quests.Q10703_BottleOfIstinasSoul.Q10703_BottleOfIstinasSoul;
@@ -781,6 +782,7 @@ public class QuestMasterHandler
Q10542_SearchingForNewPower.class,
Q10543_SheddingWeight.class,
Q10544_SeekerSupplies.class,
+ Q10658_MakkumInTheDimension.class,
Q10701_TheRoadToDestruction.class,
Q10702_TheRoadToInfinity.class,
Q10703_BottleOfIstinasSoul.class,
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml
index c627e4028f..6f847a6d2b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml
@@ -5498,14 +5498,26 @@
-
+
+
+
+
+
+ HUMANOID
- FEMALE
+ MALE
+
-
+
+
+
+
+
+
+
-
-
+
+
@@ -5521,7 +5533,10 @@
-
+
+
+
+