From fc5a9c42679ffb190b12254ace60f0dc1564c35d Mon Sep 17 00:00:00 2001
From: Adry_85 <Adrya85@hotmail.it>
Date: Tue, 10 Dec 2013 11:30:41 +0000
Subject: [PATCH] BETA: Missing quest '''Reunion with Sirra''' (10286).
'''NOTE:''' Freya Feature. '''NOTE2:''' Freya's instance will be added
soon.
---
.../dist/game/data/html/default/32762.htm | 4 +
.../data/instances/JiniaGuildHideout3.xml | 19 ++
L2J_DataPack_BETA/dist/game/data/scripts.cfg | 3 +-
.../game/data/scripts/ai/npc/Jinia/Jinia.java | 6 +-
.../JiniaGuildHideout3.java | 101 +++++++
.../instances/MithrilMine/MithrilMine.java | 2 +-
.../Q10286_ReunionWithSirra/32020-01.htm | 4 +
.../Q10286_ReunionWithSirra/32020-02.htm | 4 +
.../Q10286_ReunionWithSirra/32020-03.html | 4 +
.../Q10286_ReunionWithSirra/32020-04.htm | 4 +
.../Q10286_ReunionWithSirra/32020-05.html | 4 +
.../Q10286_ReunionWithSirra/32020-06.html | 4 +
.../Q10286_ReunionWithSirra/32020-07.html | 3 +
.../Q10286_ReunionWithSirra/32020-08.html | 3 +
.../Q10286_ReunionWithSirra/32760-01.html | 4 +
.../Q10286_ReunionWithSirra/32760-02.html | 4 +
.../Q10286_ReunionWithSirra/32760-03.html | 4 +
.../Q10286_ReunionWithSirra/32760-04.html | 4 +
.../Q10286_ReunionWithSirra/32760-05.html | 3 +
.../Q10286_ReunionWithSirra/32760-06.html | 4 +
.../Q10286_ReunionWithSirra/32760-07.html | 4 +
.../Q10286_ReunionWithSirra/32760-08.html | 2 +
.../Q10286_ReunionWithSirra/32762-01.html | 4 +
.../Q10286_ReunionWithSirra/32762-02.html | 4 +
.../Q10286_ReunionWithSirra/32762-03.html | 4 +
.../Q10286_ReunionWithSirra/32762-04.html | 3 +
.../Q10286_ReunionWithSirra/32762-05.html | 3 +
.../Q10286_ReunionWithSirra/32781-01.html | 4 +
.../Q10286_ReunionWithSirra/32781-02.html | 5 +
.../Q10286_ReunionWithSirra/32781-03.html | 3 +
.../Q10286_ReunionWithSirra/32781-04.html | 4 +
.../Q10286_ReunionWithSirra.java | 274 ++++++++++++++++++
32 files changed, 497 insertions(+), 5 deletions(-)
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/default/32762.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/instances/JiniaGuildHideout3.xml
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-01.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-02.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-04.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-05.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-06.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-07.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-08.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-01.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-05.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-06.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-07.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-08.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-01.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-05.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-01.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32762.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32762.htm
new file mode 100644
index 0000000000..a0a2dce276
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/default/32762.htm
@@ -0,0 +1,4 @@
+<html><body>Sirra:<br>
+I'm the great Sirra, Master Elven Magician and chamberlain to her majesty, the Ice Queen Freya. Some call me the Ice Fairy. No doubt you've heard of me.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/instances/JiniaGuildHideout3.xml b/L2J_DataPack_BETA/dist/game/data/instances/JiniaGuildHideout3.xml
new file mode 100644
index 0000000000..ac11115308
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/instances/JiniaGuildHideout3.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<instance name="Jinia Guild Hideout" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+ <activityTime val="5" />
+ <allowSummon val="false" />
+ <emptyDestroyTime val="5" />
+ <spawnPoint spawnX="113793" spawnY="-109342" spawnZ="-845" />
+ <spawnlist>
+ <group name="general">
+ <!-- Jinia -->
+ <spawn npcId="32760" x="-24040" y="-8969" z="-5360" heading="64974" respawn="0" />
+ <!-- Battalion Leader -->
+ <spawn npcId="32777" x="-23993" y="-9069" z="-5384" heading="2912" respawn="0" />
+ <!-- Legionnaire -->
+ <spawn npcId="32778" x="-23970" y="-9139" z="-5384" heading="58968" respawn="0" />
+ <!-- Kegor -->
+ <spawn npcId="32761" x="-23993" y="-8845" z="-5384" heading="59150" respawn="0" />
+ </group>
+ </spawnlist>
+</instance>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 8d69680416..3e4f56b8ba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -188,6 +188,7 @@ instances/HideoutOfTheDawn/HideoutOfTheDawn.java
instances/IceQueensCastle/IceQueensCastle.java
instances/JiniaGuildHideout1/JiniaGuildHideout1.java
instances/JiniaGuildHideout2/JiniaGuildHideout2.java
+instances/JiniaGuildHideout3/JiniaGuildHideout3.java
instances/Kamaloka/Kamaloka.java
instances/MithrilMine/MithrilMine.java
instances/NornilsGarden/NornilsGarden.java
@@ -658,7 +659,7 @@ quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
-#quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
#quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
quests/Q10288_SecretMission/Q10288_SecretMission.java
quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Jinia/Jinia.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Jinia/Jinia.java
index d966bed618..bca80dac70 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Jinia/Jinia.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Jinia/Jinia.java
@@ -18,7 +18,7 @@
*/
package ai.npc.Jinia;
-import quests.Q10285_MeetingSirra.Q10285_MeetingSirra;
+import quests.Q10286_ReunionWithSirra.Q10286_ReunionWithSirra;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -59,7 +59,7 @@ public final class Jinia extends AbstractNpcAI
}
else
{
- final QuestState st = player.getQuestState("Q10286_ReunionWithSirra");
+ final QuestState st = player.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName());
if ((st != null) && st.isCompleted())
{
giveItems(player, FROZEN_CORE, 1);
@@ -77,7 +77,7 @@ public final class Jinia extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(Q10285_MeetingSirra.class.getSimpleName());
+ final QuestState st = player.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName());
return ((player.getLevel() >= MIN_LEVEL) && (st != null) && st.isCompleted()) ? "32781-02.html" : "32781-01.html";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java
new file mode 100644
index 0000000000..454b69df51
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2004-2013 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack 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.
+ *
+ * L2J DataPack 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 <http://www.gnu.org/licenses/>.
+ */
+package instances.JiniaGuildHideout3;
+
+import quests.Q10286_ReunionWithSirra.Q10286_ReunionWithSirra;
+
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Jinia Guild Hideout instance zone.
+ * @author Adry_85
+ */
+public final class JiniaGuildHideout3 extends Quest
+{
+ protected class JGH2World extends InstanceWorld
+ {
+ long storeTime = 0;
+ }
+
+ private static final int INSTANCEID = 145;
+ // NPC
+ private static final int RAFFORTY = 32020;
+ // Location
+ private static final Location START_LOC = new Location(-23530, -8963, -5413, 0, 0);
+
+ private JiniaGuildHideout3()
+ {
+ super(-1, JiniaGuildHideout3.class.getSimpleName(), "instances");
+ addStartNpc(RAFFORTY);
+ addTalkId(RAFFORTY);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance talker)
+ {
+ final QuestState qs = talker.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName());
+ if ((qs != null) && qs.isMemoState(1))
+ {
+ enterInstance(talker, "JiniaGuildHideout3.xml", START_LOC);
+ qs.setCond(2, true);
+ }
+ return super.onTalk(npc, talker);
+ }
+
+ protected int enterInstance(L2PcInstance player, String template, Location loc)
+ {
+ // check for existing instances for this player
+ InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
+ // existing instance
+ if (world != null)
+ {
+ if (!(world instanceof JGH2World))
+ {
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
+ return 0;
+ }
+ teleportPlayer(player, loc, world.getInstanceId(), false);
+ return 0;
+ }
+ // New instance
+ world = new JGH2World();
+ world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(template));
+ world.setTemplateId(INSTANCEID);
+ world.setStatus(0);
+ ((JGH2World) world).storeTime = System.currentTimeMillis();
+ InstanceManager.getInstance().addWorld(world);
+ _log.info("Jinia Guild Hideout started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName());
+ // teleport players
+ teleportPlayer(player, loc, world.getInstanceId(), false);
+ world.addAllowed(player.getObjectId());
+ return world.getInstanceId();
+ }
+
+ public static void main(String[] args)
+ {
+ new JiniaGuildHideout3();
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
index a4b37ed133..5499e643a4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
@@ -255,7 +255,7 @@ public final class MithrilMine extends Quest
world.setStatus(0);
((MMWorld) world).storeTime = System.currentTimeMillis();
InstanceManager.getInstance().addWorld(world);
- _log.info("Jinia Guild Hideout started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName());
+ _log.info("Mithril Mine started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName());
// teleport players
teleportPlayer(player, loc, world.getInstanceId(), false);
world.addAllowed(player.getObjectId());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-01.htm
new file mode 100644
index 0000000000..a149a42db2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-01.htm
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+You were hit with Freya's Eternal Blizzard during the battle at the castle. We rescued you before the freeze fully set in. Any later and you'd be in no better shape than Kier.<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32020-02.htm">"It's such a blur, I can't remember..."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-02.htm
new file mode 100644
index 0000000000..47e7ed836e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-02.htm
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+Honestly, if we'd lost you like we did Kier... I'm not exaggerating when I say there would be no hope.<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32020-03.html">Continue listening.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-03.html
new file mode 100644
index 0000000000..6d5daaa4b0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-03.html
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+Sorry, I'm a little long winded at times. If I keep Jinia waiting any longer, I have a feeling Freya would no longer be my biggest worry.<br>
+<a action="bypass -h npc_%objectId%_Quest JiniaGuildHideout3">Enter.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-04.htm
new file mode 100644
index 0000000000..59325fa6d2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-04.htm
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+It's not time for that yet.<br>
+(Only character with level 82 or above and who has completed the quest of Reunion with Sirra can take on this quest.)
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-05.html
new file mode 100644
index 0000000000..e27cc75d3d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-05.html
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+We can reminisce once the future is in good hands, friend.<br>
+(You have already completed this quest.)
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-06.html
new file mode 100644
index 0000000000..2e2719b10f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-06.html
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+Jinia's ready to see you.<br>
+<a action="bypass -h npc_%objectId%_Quest JiniaGuildHideout3">Enter.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-07.html
new file mode 100644
index 0000000000..5cc1b2d994
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-07.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Be sure to bring me some good news, and don't let anything happen to Jinia. Ahh, you swore it!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-08.html
new file mode 100644
index 0000000000..72876bf650
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32020-08.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Best not to try right now. Private guild meeting going on. Come back later okay?
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-01.html
new file mode 100644
index 0000000000..7704f62741
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-01.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+Thank the gods you survived. Are you all right?<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32760-02.html">"I'm OK."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-02.html
new file mode 100644
index 0000000000..a58716d208
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-02.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+I am sure we approached Freya the wrong way. Like I said before... we probably aren't strong enough to confront her directly. She's just too powerful.<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32760-03.html">Continue listening.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-03.html
new file mode 100644
index 0000000000..f0f4430ae2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-03.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+Victory is ours only when we have separated Freya's spirit from Felicia's body. We'll need a medium that can absorb Freya's essence instantly.<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32760-04.html">Continue listening.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-04.html
new file mode 100644
index 0000000000..6dcfd2f526
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-04.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+I truly believe we have to give Freya's chamberlain, Sirra, a real chance. If it wasn't for her, I wouldn't know such a medium even existed, and it's the one thing that could make this plan work.<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32760-05.html">"Alright..."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-05.html
new file mode 100644
index 0000000000..4ae12578cd
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-05.html
@@ -0,0 +1,3 @@
+<html><body>Jinia:<br>
+Sirra's appeared in the nick of time. Decide after you speak with Sirra. See things our way...
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-06.html
new file mode 100644
index 0000000000..37e9473111
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-06.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+I know she's not quite... right in the head, but it was right to keep the peace. To defeat Freya and save Felicia, we had to join forces with Sirra.<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32760-07.html">Continue listening.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-07.html
new file mode 100644
index 0000000000..6112f5d79a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-07.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+When you are finished preparing, we will engage in a battle that will determine the fate of the world. Meet at the Ice Queen's castle garden again. This time we'll be ready.<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32760-08.html">Go outside of the hideout.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-08.html
new file mode 100644
index 0000000000..e5e32de72e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32760-08.html
@@ -0,0 +1,2 @@
+<html><body>Jinia:<br>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-01.html
new file mode 100644
index 0000000000..010e8fb9a4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-01.html
@@ -0,0 +1,4 @@
+<html><body>Sirra:<br>
+Having fun? I have to say, you surprised even me. The fact that you ignored my advice and yet still live is proof that you might have what it takes to defeat Freya. So, wasn't the Queen just a delight?<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32762-02.html">"What do you want to say?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-02.html
new file mode 100644
index 0000000000..b486605681
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-02.html
@@ -0,0 +1,4 @@
+<html><body>Sirra:<br>
+I know not everyone operates on the same level of genius as I do, so I don't mind explaining it to you. But you better listen because I'm not going to bother explaining again, got it? We need each other. Accept my help, and you may defeat Freya. There. You're welcome.<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32762-03.html">"How can I trust you?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-03.html
new file mode 100644
index 0000000000..2d8f8ae87a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-03.html
@@ -0,0 +1,4 @@
+<html><body>Sirra:<br>
+I told you already, but hey why not, let's just rehash a bit. Felicia broke Sayan's ice crystal into bits and tried to hide it from us. Then the power of the crystal leaked out and took control of everyone in the castle.<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32762-04.html">"OK, but what do you want?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-04.html
new file mode 100644
index 0000000000..0f26fbb20d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-04.html
@@ -0,0 +1,3 @@
+<html><body>Sirra:<br>
+I have no hidden motive. You and I share a common goal. And THAT makes us partners. You are most honored by it... Have you figured out how to withstand her deadliest magic? As partners, I'll tell you. Use frozen core, and her eternal blizzard magic will feel like a slushy. Wait until Freya casts that magic, and then use the frozen core right away.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-05.html
new file mode 100644
index 0000000000..5f2231d936
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32762-05.html
@@ -0,0 +1,3 @@
+<html><body>Sirra:<br>
+Well, those frozen cores I mentioned can make that deadly magic feel like a soft winter snow. Next time you fight her, wait until she tries to cast the spell and immediately use the frozen core when you start to feel the cold. Ah, I wish I could see the look on her face when her power proves useless. And that's how the Great Sirra will bring about the end of Freya's reign!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-01.html
new file mode 100644
index 0000000000..426a2bb3a9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-01.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+You're here! I've been waiting for you. All our preparations are complete. Shall we depart?<br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32781-02.html">"Yes, I'm ready."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-02.html
new file mode 100644
index 0000000000..c3024e638e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-02.html
@@ -0,0 +1,5 @@
+<html><body>Jinia:<br>
+Alright, we'll depart now. Keep those nerves of steel!<br>
+<a action="bypass -h npc_%objectId%_Quest IceQueensCastleEasy">Enter the Ice Queen's Castle.</a><br>
+<a action="bypass -h Quest Q10286_ReunionWithSirra 32781-03.html">"Wait a moment, I'm not ready."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-03.html
new file mode 100644
index 0000000000..e12de9660b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-03.html
@@ -0,0 +1,3 @@
+<html><body>Jinia:<br>
+Alright, understood. Preparations must be thorough. Just let me know when you're ready to go.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-04.html
new file mode 100644
index 0000000000..569b960d31
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/32781-04.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+I finally thought we had accomplished our life-long dream... Sirra's betrayal surprised us all. She only wanted to defeat the Ice Queen so she could take her place...<br>
+But, we won't overlook the courage you've shown. Allow us a chance to properly show our gratitude. Why don't we go to Jinia Guild and conclude this later.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
new file mode 100644
index 0000000000..195f2d30b4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (C) 2004-2013 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack 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.
+ *
+ * L2J DataPack 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 <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10286_ReunionWithSirra;
+
+import quests.Q10285_MeetingSirra.Q10285_MeetingSirra;
+
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+
+/**
+ * Reunion with Sirra (10286)
+ * @author Adry_85
+ */
+public class Q10286_ReunionWithSirra extends Quest
+{
+ // NPCs
+ private static final int RAFFORTY = 32020;
+ private static final int JINIA = 32760;
+ private static final int SIRRA = 32762;
+ private static final int JINIA2 = 32781;
+ // Item
+ private static final int BLACK_FROZEN_CORE = 15470;
+ // Misc
+ private static final int MIN_LEVEL = 82;
+ // Location
+ private static final Location EXIT_LOC = new Location(113793, -109342, -845, 0);
+
+ private Q10286_ReunionWithSirra()
+ {
+ super(10286, Q10286_ReunionWithSirra.class.getSimpleName(), "Reunion with Sirra");
+ addStartNpc(RAFFORTY);
+ addTalkId(RAFFORTY, JINIA, SIRRA, JINIA2);
+ registerQuestItems(BLACK_FROZEN_CORE);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = player.getQuestState(getName());
+ if (st == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "32020-02.htm":
+ {
+ st.startQuest();
+ st.setMemoState(1);
+ htmltext = event;
+ break;
+ }
+ case "32020-03.html":
+ case "32760-02.html":
+ case "32760-03.html":
+ case "32760-04.html":
+ {
+ if (st.isMemoState(1))
+ {
+ htmltext = event;
+ }
+ break;
+ }
+ case "32760-05.html":
+ {
+ if (st.isMemoState(1))
+ {
+ L2Npc sirra = addSpawn(SIRRA, -23905, -8790, -5384, 56238, false, 0, false, npc.getInstanceId());
+ sirra.broadcastPacket(new NpcSay(sirra.getObjectId(), Say2.NPC_ALL, sirra.getId(), NpcStringId.YOU_ADVANCED_BRAVELY_BUT_GOT_SUCH_A_TINY_RESULT_HOHOHO));
+ st.set("ex", 1);
+ st.setCond(3, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32760-07.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 2))
+ {
+ st.unset("ex");
+ st.setMemoState(2);
+ final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
+ world.removeAllowed(player.getObjectId());
+ player.setInstanceId(0);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32760-08.html":
+ {
+ if (st.isMemoState(2))
+ {
+ st.setCond(5, true);
+ player.teleToLocation(EXIT_LOC, 0);
+ htmltext = event; // TODO: missing "jinia_npc_q10286_10.htm"
+ }
+ break;
+ }
+ case "32762-02.html":
+ case "32762-03.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 1))
+ {
+ htmltext = event;
+ }
+ break;
+ }
+ case "32762-04.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 1))
+ {
+ if (!st.hasQuestItems(BLACK_FROZEN_CORE))
+ {
+ st.giveItems(BLACK_FROZEN_CORE, 5);
+ }
+ st.set("ex", 2);
+ st.setCond(4, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32781-02.html":
+ case "32781-03.html":
+ {
+ if (st.isMemoState(2))
+ {
+ htmltext = event;
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ QuestState st = player.getQuestState(getName());
+ String htmltext = getNoQuestMsg(player);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ switch (st.getState())
+ {
+ case State.COMPLETED:
+ {
+ if (npc.getId() == RAFFORTY)
+ {
+ htmltext = "32020-05.html";
+ }
+ break;
+ }
+ case State.CREATED:
+ {
+ if (npc.getId() == RAFFORTY)
+ {
+ st = player.getQuestState(Q10285_MeetingSirra.class.getSimpleName());
+ htmltext = ((player.getLevel() >= MIN_LEVEL) && (st != null) && (st.isCompleted())) ? "32020-01.htm" : "32020-04.htm";
+ }
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (npc.getId())
+ {
+ case RAFFORTY:
+ {
+ if (st.isMemoState(1))
+ {
+ htmltext = (player.getLevel() >= MIN_LEVEL) ? "32020-06.html" : "32020-08.html";
+ }
+ else if (st.isMemoState(2))
+ {
+ htmltext = "32020-07.html";
+ }
+ break;
+ }
+ case JINIA:
+ {
+ if (st.isMemoState(1))
+ {
+ final int state = st.getInt("ex");
+ switch (state)
+ {
+ case 0:
+ {
+ htmltext = "32760-01.html";
+ break;
+ }
+ case 1:
+ {
+ htmltext = "32760-05.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "32760-06.html";
+ break;
+ }
+ }
+ }
+ break;
+ }
+ case SIRRA:
+ {
+ if (st.isMemoState(1))
+ {
+ final int state = st.getInt("ex");
+ if (state == 1)
+ {
+ htmltext = "32762-01.html";
+ }
+ else if (state == 2)
+ {
+ htmltext = "32762-05.html";
+ }
+ }
+ break;
+ }
+ case JINIA2:
+ {
+ if (st.isMemoState(2))
+ {
+ htmltext = "32781-01.html";
+ }
+ else if (st.isMemoState(10))
+ {
+ st.addExpAndSp(2152200, 181070);
+ st.exitQuest(false, true);
+ htmltext = "32781-04.html";
+ }
+ break;
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ public static void main(String args[])
+ {
+ new Q10286_ReunionWithSirra();
+ }
+}
--
GitLab