diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32029-1.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32029-1.htm
deleted file mode 100644
index 374923ddefd5e1132c091cb6e77cd4200b36edc7..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32029-1.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Steward:<br>
-It is nothing you can deal with by yourself. Remember, discretion is the better part of valor.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32029-10.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32029-10.htm
deleted file mode 100644
index f41decac572e9e11d976ec13434c17e8d5eb94d0..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32029-10.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Steward:<br>
-It is fortunate for us that Freya is absent for we could never dare to threaten her favored pets otherwise. We will lure them forth with the Silver Hemocytes you gave me.<br>
-If you enter the garden before the gate closes, I will be unable to help you at all. Therefore, please make your move after the gate has closed. Until then, you may wait here and make your preparations as you think best. Never forget: Your goal is to get rid of the Ice Fairy Sirra, a pest who is unjustly favored by the Queen.<br>
-<a action="bypass -h npc_%objectId%_Chat 11">Just who is this Ice Fairy Sirra pest?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 4">What kind of creatures are in the garden?</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32029-11.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32029-11.htm
deleted file mode 100644
index 7a6e918175347237e3a228924b827c47d20ee5f7..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32029-11.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Steward:<br>
-The Ice Fairy Sirra was once Freya's maid before Freya became the Ice Queen. For reasons we do not know, she was transformed into a solid block of ice. Freya made a bargain through prayer for Sirra's life, but could not accept her new incarnation and left Freya's service.<br>
-Even though her anger and torment overwhelmed her, Sirra remained close to her former master and thus, came to stay in Freya's garden. We have recently learned that the Ice Queen also granted Sirra the power to draw from the life force of any creature within the garden. Thus, if you kill the creatures of the garden first, it will be easier for you to kill the Ice Fairy.<br>
-<a action="bypass -h npc_%objectId%_Chat 4"> "What kind of freakish creatures are in the garden?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32029-2.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32029-2.htm
deleted file mode 100644
index 5b75666f56b71ee609b4bb168f550af2411e8aac..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32029-2.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Steward:<br>
-Your pockets are crammed with objects; the chaos is offensive to me. Organize your pockets and then speak to me.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32029-3.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32029-3.htm
deleted file mode 100644
index a18b78d1a2e5ea16dc21ea4dda0d3438d14be03f..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32029-3.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Steward:<br>
-That is fine. Let us prepare for your ordeal. We will have an appropriate fighting arena prepared for you shortly, so make yourselves ready and wait here until the gate is closed. If you do not remain here until then, I cannot help you.<br>
-<a action="bypass -h npc_%objectId%_Chat 4">"What kind of creatures are in the garden?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32029-4.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32029-4.htm
deleted file mode 100644
index cd800d507c94b00c14ee69fb090f182680601532..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32029-4.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body>Steward:<br>
-There are many beings in the garden. Would you like to ask about...<br>
-<a action="bypass -h npc_%objectId%_Chat 5">. . . Buffalo and Gardener?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 6">. . . Freya's Servant?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 7">. . . Freya's White Bear and Freya's Dog?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 8">. . . the Captain of the Royal Guard?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 9">"I don't want any more information."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32029-5.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32029-5.htm
deleted file mode 100644
index 621ece62fcd73f1cb14cccbc690b757b43cb928d..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32029-5.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body>Steward:<br>
-We don't know all the details, but we are given to understand that if you defeat the gardener, you can receive immunity to the coldness emanating from the ice statue.<br>
-Would you like to know more about...<br>
-<a action="bypass -h npc_%objectId%_Chat 6">. . . Freya's Servant?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 7">. . . Freya's White Bear and Freya's Dog?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 8">. . . the Captain of the Royal Guard?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 9">"I don't want any more information."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32029-6.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32029-6.htm
deleted file mode 100644
index a434ccf0e3a1a94b03fc60916c9825abf82b65f7..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32029-6.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body>Steward:<br>
-We know but little about Freya's Servants, but we understand that if you defeat them, Ice Fairy Sirra will become vulnerable to magical attacks.<br>
-Would you like to know more about...<br>
-<a action="bypass -h npc_%objectId%_Chat 5">. . . Buffalo and Gardener?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 7">. . . Freya's White Bear and Freya's Dog?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 8">. . . the Captain of the Royal Guard?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 9">"I don't want any more information."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32029-7.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32029-7.htm
deleted file mode 100644
index 612d86cbeaa9d5989e4d89c4180e212b3b67d350..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32029-7.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body>Steward:<br>
-Our only intelligence on these creatures is that if you defeat them, Ice Fairy Sirra will become vulnerable to physical attack.<br>
-Would you like to know more about...<br>
-<a action="bypass -h npc_%objectId%_Chat 5">. . . Buffalo and Gardener?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 6">. . . Freya's Servants?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 8">. . . the Captain of the Royal Guard?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 9">"I don't want any more information."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32029-8.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32029-8.htm
deleted file mode 100644
index cb0f66452a0251ddee69c946405c3c46e469f63e..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32029-8.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body>Steward:<br>
-Sirra rejected the romantic attentions of the Captain of the Royal Guard. He is still in love with her, however, and he guards her from any outsiders who may disturb her. The Captain draws his power from the mystic who is protecting Sirra, so if you vanquish the Captain, you will likely hurt the mystic as well.<br>
-Would you like to know more about...<br>
-<a action="bypass -h npc_%objectId%_Chat 5">...Buffalo and the Gardener?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 6">...Freya's Servant?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 7">...Freya's White Bear and Freya's Dog?</a><br>
-<a action="bypass -h npc_%objectId%_Chat 9">"I don't need to obtain more information. But thanks."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32029-9.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32029-9.htm
deleted file mode 100644
index 52279493d4dfc71aeff0258ee500f5c2be142a1c..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32029-9.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Steward:<br>
-Well, then. We have little time, so please dispose of the matter quickly. Thank you, and good luck.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32761.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32761.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7754c6a449d48a6d3f2a71fedadf31ab7fa0c6ea
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/default/32761.htm
@@ -0,0 +1,5 @@
+<html><body>Kegor:<br>
+What are you here for?<br>
+Whatever it is, take it up with Jinia.<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/IceQueensCastle.xml b/L2J_DataPack_BETA/dist/game/data/instances/IceQueensCastle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3d8e707812cd3db0e7487fa0d7f90776224c241f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/instances/IceQueensCastle.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<instance name="Ice Queen's Castle" allowRandomWalk="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+ <activityTime val="20" />
+ <allowSummon val="false" />
+ <emptyDestroyTime val="5" />
+ <spawnPoint spawnX="113883" spawnY="-108777" spawnZ="-848" />
+ <doorlist>
+ <door doorId="23140101" />
+ </doorlist>
+ <spawnlist>
+ <group name="general">
+ <!-- Freya -->
+ <spawn npcId="18847" x="114720" y="-117085" z="-11088" heading="15956" respawn="0" />
+ <!-- Archery Knight -->
+ <spawn npcId="22767" x="114713" y="-115109" z="-11198" heading="16456" respawn="30" />
+ <spawn npcId="22767" x="114008" y="-115080" z="-11198" heading="3568" respawn="30" />
+ <spawn npcId="22767" x="114422" y="-115508" z="-11198" heading="12400" respawn="30" />
+ <spawn npcId="22767" x="115023" y="-115508" z="-11198" heading="20016" respawn="30" />
+ <spawn npcId="22767" x="115459" y="-115079" z="-11198" heading="27936" respawn="30" />
+ <!-- Battalion Leader -->
+ <spawn npcId="18848" x="114861" y="-113615" z="-11198" heading="-21832" respawn="60" />
+ <spawn npcId="18848" x="114633" y="-113619" z="-11198" heading="-12224" respawn="60" />
+ <!-- Legionnaire -->
+ <spawn npcId="18849" x="114950" y="-113647" z="-11198" heading="-20880" respawn="45" />
+ <spawn npcId="18849" x="114540" y="-113654" z="-11198" heading="-12880" respawn="45" />
+ <!-- Mercenary Archer -->
+ <spawn npcId="18926" x="115041" y="-113694" z="-11198" heading="-22440" respawn="45" />
+ <spawn npcId="18926" x="114446" y="-113698" z="-11198" heading="-11264" respawn="45" />
+ </group>
+ </spawnlist>
+</instance>
diff --git a/L2J_DataPack_BETA/dist/game/data/instances/JiniaGuildHideout2.xml b/L2J_DataPack_BETA/dist/game/data/instances/JiniaGuildHideout2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ac11115308200a51310b61a7cd07975b4c2ed336
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/instances/JiniaGuildHideout2.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 ac71c401b987010eaf5b298644ffab4ef5f4c27e..7f788a2ea14b0c9a69bc06cdb40cdd91111a2e8c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -30,6 +30,7 @@ ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
ai/npc/ForgeOfTheGods/Rooney.java
ai/npc/ForgeOfTheGods/TarBeetle.java
ai/npc/FortuneTelling/FortuneTelling.java
+ai/npc/FreyasSteward/FreyasSteward.java
ai/npc/Jinia/Jinia.java
ai/npc/KetraOrcSupport/KetraOrcSupport.java
ai/npc/MercenaryCaptain/MercenaryCaptain.java
@@ -182,7 +183,9 @@ instances/DemonPrinceFloor/DemonPrinceFloor.java
instances/FinalEmperialTomb/FinalEmperialTomb.java
instances/HellboundTown/HellboundTown.java
instances/HideoutOfTheDawn/HideoutOfTheDawn.java
+instances/IceQueensCastle/IceQueensCastle.java
instances/JiniaGuildHideout1/JiniaGuildHideout1.java
+instances/JiniaGuildHideout2/JiniaGuildHideout2.java
instances/Kamaloka/Kamaloka.java
instances/MithrilMine/MithrilMine.java
instances/NornilsGarden/NornilsGarden.java
@@ -652,7 +655,7 @@ quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
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/Q10285_MeetingSirra/Q10285_MeetingSirra.java
#quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
#quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
quests/Q10288_SecretMission/Q10288_SecretMission.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FreyasSteward/32029-1.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FreyasSteward/32029-1.html
new file mode 100644
index 0000000000000000000000000000000000000000..f922a62c3cab578f94668cc8032def8609792957
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FreyasSteward/32029-1.html
@@ -0,0 +1,3 @@
+<html><body>Steward:<br>
+This is beyond you. Wait for the right time.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FreyasSteward/32029.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FreyasSteward/32029.html
new file mode 100644
index 0000000000000000000000000000000000000000..3c8e6ecff4a38b67dd606c73ea85b33c8aaa5d12
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FreyasSteward/32029.html
@@ -0,0 +1,5 @@
+<html><body>Steward:<br>
+Welcome to the castle of the great Queen Freya. This place is open to the public per the Ice Queen's instruction, though the queen doesn't like noise. Please try to be quiet.<br><br>
+<a action="bypass -h Quest FreyasSteward">They work together with the Jinea Guild.</a><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/scripts/ai/npc/FreyasSteward/FreyasSteward.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java
new file mode 100644
index 0000000000000000000000000000000000000000..53ecf5d23aebc65b929c9035aa470f173bb318ab
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java
@@ -0,0 +1,69 @@
+/*
+ * 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 ai.npc.FreyasSteward;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Freya's Steward AI.
+ * @author Adry_85
+ */
+public final class FreyasSteward extends AbstractNpcAI
+{
+ // NPC
+ private static final int FREYAS_STEWARD = 32029;
+ // Location
+ private static final Location TELEPORT_LOC = new Location(103045, -124361, -2768);
+ // Misc
+ private static final int MIN_LEVEL = 82;
+
+ private FreyasSteward()
+ {
+ super(FreyasSteward.class.getSimpleName(), "ai/npc");
+ addStartNpc(FREYAS_STEWARD);
+ addFirstTalkId(FREYAS_STEWARD);
+ addTalkId(FREYAS_STEWARD);
+ }
+
+ @Override
+ public String onFirstTalk(L2Npc npc, L2PcInstance player)
+ {
+ return "32029.html";
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ player.teleToLocation(TELEPORT_LOC);
+ return null;
+ }
+ return "32029-1.html";
+ }
+
+ public static void main(String[] args)
+ {
+ new FreyasSteward();
+ }
+}
\ No newline at end of file
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 c767f229cef26ab706791f52f9ea27a69f113583..d966bed61876067783047ee8b3f6d0cc9d7503bc 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,6 +18,7 @@
*/
package ai.npc.Jinia;
+import quests.Q10285_MeetingSirra.Q10285_MeetingSirra;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -76,7 +77,8 @@ public final class Jinia extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- return player.getLevel() < MIN_LEVEL ? "32781-01.html" : "32781-02.html";
+ final QuestState st = player.getQuestState(Q10285_MeetingSirra.class.getSimpleName());
+ return ((player.getLevel() >= MIN_LEVEL) && (st != null) && st.isCompleted()) ? "32781-02.html" : "32781-01.html";
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java
new file mode 100644
index 0000000000000000000000000000000000000000..51b2401a0b788655217cc837b2916fbbbe820e33
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java
@@ -0,0 +1,225 @@
+/*
+ * 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.IceQueensCastle;
+
+import quests.Q10285_MeetingSirra.Q10285_MeetingSirra;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+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.skills.L2Skill;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+
+/**
+ * Ice Queen's Castle instance zone.
+ * @author Adry_85
+ */
+public final class IceQueensCastle extends Quest
+{
+ protected class IQCWorld extends InstanceWorld
+ {
+ long storeTime = 0;
+ }
+
+ private static final int INSTANCEID = 137;
+ // NPCs
+ private static final int FREYA = 18847;
+ private static final int BATTALION_LEADER = 18848;
+ private static final int LEGIONNAIRE = 18849;
+ private static final int INVISIBLE_NPC = 18919;
+ private static final int MERCENARY_ARCHER = 18926;
+ private static final int ARCHERY_KNIGHT = 22767;
+ private static final int JINIA = 32781;
+ // Locations
+ private static final Location START_LOC = new Location(114000, -112357, -11200, 0, 0);
+ private static final Location EXIT_LOC = new Location(113883, -108777, -848, 0, 0);
+ private static final Location FREYA_LOC = new Location(114730, -114805, -11200, 50, 0);
+ // Skill
+ private static SkillHolder ETHERNAL_BLIZZARD = new SkillHolder(6276, 1);
+ // Door
+ private static final int ICE_QUEEN_DOOR = 23140101;
+
+ private IceQueensCastle()
+ {
+ super(-1, IceQueensCastle.class.getSimpleName(), "instances");
+ addStartNpc(JINIA);
+ addTalkId(JINIA);
+ addSeeCreatureId(BATTALION_LEADER, LEGIONNAIRE, MERCENARY_ARCHER);
+ addSpawnId(FREYA);
+ addSpellFinishedId(FREYA);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ switch (event)
+ {
+ case "ATTACK_KNIGHT":
+ {
+ for (L2Character character : npc.getKnownList().getKnownCharacters())
+ {
+ if ((character.getId() == ARCHERY_KNIGHT) && !character.isDead() && !((L2Attackable) character).isDecayed())
+ {
+ npc.setIsRunning(true);
+ npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, character);
+ ((L2Attackable) npc).addDamageHate(character, 0, 999999);
+ }
+ }
+ startQuestTimer("ATTACK_KNIGHT", 3000, npc, null);
+ break;
+ }
+ case "TIMER_MOVING":
+ {
+ if (npc != null)
+ {
+ npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, FREYA_LOC);
+ }
+ break;
+ }
+ case "TIMER_BLIZZARD":
+ {
+ npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.I_CAN_NO_LONGER_STAND_BY));
+ npc.stopMove(null);
+ npc.setTarget(player);
+ npc.doCast(ETHERNAL_BLIZZARD.getSkill());
+ break;
+ }
+ case "TIMER_SCENE_21":
+ {
+ if (npc != null)
+ {
+ player.showQuestMovie(21);
+ npc.deleteMe();
+ startQuestTimer("TIMER_PC_LEAVE", 24000, npc, player);
+ }
+ break;
+ }
+ case "TIMER_PC_LEAVE":
+ {
+ final QuestState qs = player.getQuestState(Q10285_MeetingSirra.class.getSimpleName());
+ if ((qs != null))
+ {
+ qs.setMemoState(3);
+ qs.setCond(10, true);
+ final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
+ world.removeAllowed(player.getObjectId());
+ player.setInstanceId(0);
+ player.teleToLocation(EXIT_LOC, 0);
+ }
+ break;
+ }
+ }
+ return super.onAdvEvent(event, npc, player);
+ }
+
+ @Override
+ public String onSeeCreature(L2Npc npc, L2Character creature, boolean isSummon)
+ {
+ if (creature.isPlayer() && npc.isScriptValue(0))
+ {
+ for (L2Character character : npc.getKnownList().getKnownCharacters())
+ {
+ if ((character.getId() == ARCHERY_KNIGHT) && !character.isDead() && !((L2Attackable) character).isDecayed())
+ {
+ npc.setIsRunning(true);
+ npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, character);
+ ((L2Attackable) npc).addDamageHate(character, 0, 999999);
+ npc.setScriptValue(1);
+ startQuestTimer("ATTACK_KNIGHT", 5000, npc, null);
+ }
+ }
+ NpcSay ns = new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.S1_MAY_THE_PROTECTION_OF_THE_GODS_BE_UPON_YOU);
+ ns.addStringParameter(creature.getName());
+ npc.broadcastPacket(ns);
+ }
+ return super.onSeeCreature(npc, creature, isSummon);
+ }
+
+ @Override
+ public final String onSpawn(L2Npc npc)
+ {
+ startQuestTimer("TIMER_MOVING", 60000, npc, null);
+ startQuestTimer("TIMER_BLIZZARD", 180000, npc, null);
+ return super.onSpawn(npc);
+ }
+
+ @Override
+ public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill)
+ {
+ if (skill == ETHERNAL_BLIZZARD.getSkill())
+ {
+ startQuestTimer("TIMER_SCENE_21", 1000, npc, player);
+ }
+ return super.onSpellFinished(npc, player, skill);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance talker)
+ {
+ enterInstance(talker, "IceQueensCastle.xml", START_LOC);
+ 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 IQCWorld))
+ {
+ player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
+ return 0;
+ }
+ teleportPlayer(player, loc, world.getInstanceId(), false);
+ return 0;
+ }
+ // New instance
+ world = new IQCWorld();
+ world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(template));
+ world.setTemplateId(INSTANCEID);
+ world.setStatus(0);
+ ((IQCWorld) world).storeTime = System.currentTimeMillis();
+ InstanceManager.getInstance().addWorld(world);
+ _log.info("SevenSign started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName());
+ // teleport players
+ teleportPlayer(player, loc, world.getInstanceId(), false);
+ world.addAllowed(player.getObjectId());
+ openDoor(ICE_QUEEN_DOOR, world.getInstanceId());
+ addSpawn(INVISIBLE_NPC, 114394, -112383, -11200, 0, false, 0, false, INSTANCEID);
+ return world.getInstanceId();
+ }
+
+ public static void main(String[] args)
+ {
+ new IceQueensCastle();
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java
new file mode 100644
index 0000000000000000000000000000000000000000..b663e47835c1e816fd1aac66d4d6e63c2259e720
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.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.JiniaGuildHideout2;
+
+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.network.SystemMessageId;
+
+/**
+ * Jinia Guild Hideout instance zone.
+ * @author Adry_85
+ */
+public final class JiniaGuildHideout2 extends Quest
+{
+ protected class JGH2World extends InstanceWorld
+ {
+ long storeTime = 0;
+ }
+
+ private static final int INSTANCEID = 141;
+ // NPC
+ private static final int RAFFORTY = 32020;
+ // Location
+ private static final Location START_LOC = new Location(-23530, -8963, -5413, 0, 0);
+
+ private JiniaGuildHideout2()
+ {
+ super(-1, JiniaGuildHideout2.class.getSimpleName(), "instances");
+ addStartNpc(RAFFORTY);
+ addTalkId(RAFFORTY);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance talker)
+ {
+ final QuestState qs = talker.getQuestState(Q10285_MeetingSirra.class.getSimpleName());
+ if ((qs != null) && qs.isMemoState(1))
+ {
+ enterInstance(talker, "JiniaGuildHideout2.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("SevenSign 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 JiniaGuildHideout2();
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ee22fa11611aebe61469faf14c6b32c7d5df65b7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-01.htm
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+You're back, and alive, thank the Gods! And you rescued Kegor? Courage and skill in battle a rare commodity these days. We owe you immensely.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32020-02.htm">"I just helped a man in trouble."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-02.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b36d7203b130bc0c9ba1717cd07d068ff10def2f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-02.htm
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+The Divine Sword is ours once again! Now comes the time to actually use the darned thing... Now a guild member could wield it, sure. But none of us compare to you - you are truly a demon on the battlefield. Will you see this through with us?<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32020-03.htm">"I've come this far. Let's end the reign of the Ice Queen together!"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-03.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6e7c13cdbcb0eb2e5d16c56709d47182801f9423
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-03.htm
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+We're thrilled to have you, truly. Come inside the clan hall. Jinia and Kegor have much to speak about with you. Ready to go in?<br>
+<a action="bypass -h npc_%objectId%_Quest JiniaGuildHideout2">Enter.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-04.htm
new file mode 100644
index 0000000000000000000000000000000000000000..5375c628aa11220da4f34aa90aa37108b9fdd8f1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-04.htm
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+It's not time. Patience.<br>
+(Only characters level 82 or above who have completed quest "Acquisition of Divine Sword" may take on this quest.)
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-05.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c3e80e2244f5c5ad7baf8fcc70244eb8f3dce99b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-05.htm
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+You lucked out to have us around is what happened. Now get some rest, try a mug of ale at the pub. Maybe a dark brew with a nice foamy head. We will discuss this later.<br>
+(You have already completed this quest.)
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..82f2bc436b0d55a6987760b98d89d0f2f12962bb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-06.html
@@ -0,0 +1,5 @@
+<html><body>Rafforty:<br>
+You are always welcome inside the Jinia Guild Clan Hall. Jinia and Kegor are waiting for you.<br>
+Enter now?<br>
+<a action="bypass -h npc_%objectId%_Quest JiniaGuildHideout2">Enter.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..60974fdcfe479a0fb81774296f38f0a8697203ab
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-07.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+We respect your decision. Jinia Guild will find a solution to this problem somehow, even without you.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..4a32949136728ebfab62c71f4c2ac2082633b2bd
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-08.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Hello? Are you OK there? Come on now, pull yourself together...
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..13f44f28135a61b2f3ce8d47b64dec5f351a4cba
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32020-09.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Forgive me, but can you come back later? The Guild is having an important meeting right now.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32029-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32029-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..df3c611ed01ea9ba3ef552b6dcbb9151baafda9a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32029-01.html
@@ -0,0 +1,4 @@
+<html><body>Freya's Steward:<br>
+Ah, there you are. Jinia told me you'd be coming. She awaits you now. Are you ready?<br>
+<a action="bypass -h Quest Q10285_MeetingSirra TELEPORT">"Yes, I'm ready."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..5c9d894781548de74fb8b8768a1352012db49a7e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-01.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+Quite commendable! Kegor told me of your exploits. The Guild has much to thank you for. It is without saying that Jinia Guild is forever indebted to you. I... there is more to tell, however.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32760-02.html">Keep listening.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..314e42e51b5167d2bc264fbc068ac8796263df24
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-02.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+The Guild exists to stop the Ice Queen Freya, but it's become clear that we aren't strong enough. Everyone we've sent against her has disappeared.<br>
+Take a moment to talk with Kegor. He wanted to thank you again.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..332e318f5f6226b6ed622f98db23b8c5bb7f13d5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-03.html
@@ -0,0 +1,3 @@
+<html><body>Jinia:<br>
+Why don't we talk to Kegor first? He must have much to say to you, adventurer.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..ace249dcbf92dc62d25f1f92a096705d1dc7e6b8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-04.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+As I told you, the Ice Queen Freya used to be a princess named Felicia of the old Elmoreden Empire. Her natural beauty, her magical talent, and her lust for knowledge and power helped make her the perfect host for Freya. When Sayan's Ice Cystal broke, her body became its vessel. Her love for the people of the Empire became perverted, as she became obsessed with preserving their beauty in the form of ice sculptures to last forever.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32760-05.html">Ask if anything can be done.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..ddaea1abbe11440cb6de998577cf46c06d582cc9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-05.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+I am not sure. As I told you before, I fear that Felicia may be lost forever, since she froze even her best friend Kier. But it's possible Felicia's soul still exists somewhere within the Ice Queen, weakening Freya. We have an idea - we might strengthen Felicia's spirit through some sort of medium that can absorb the Ice Queen's power, thus weakening Freya's grasp on Felicia's body.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32760-06.html">"What's that idea?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..8f3e78112f2a356454c905368788092fb1903567
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-06.html
@@ -0,0 +1,3 @@
+<html><body>Jinia:<br>
+Who is this? What is this woman? Find out what she's doing here!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..ef5988bb038cbf3fae2f0ddd73c520c4c2e206d6
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-07.html
@@ -0,0 +1,3 @@
+<html><body>Jinia:<br>
+This is Sirra, formerly known as the Ice Fairy. Listen to her - she has some important things to say.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..d53c3806973af89a2ef724fcc74060708348af3c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-08.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+I understand how all this must sound but Sirra is not lying.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32760-09.html">Ask about what happened.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..9eef6738674683399c6012c0fec54f9e0744e3eb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-09.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+Our guild has looked at every option. Nothing seems like it will work. It has been said that 'the enemy of the enemy is one's friend.' Sirra is certainly Freya's enemy, egomaniacal wizard though she may be. Her power would be of great help to us.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32760-10.html">"Must we join with our enemy?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-10.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-10.html
new file mode 100644
index 0000000000000000000000000000000000000000..68984daa3b1642ca74cabde762e89780ab4a1fd8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-10.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+I know, Sirra's not quite like us. Her aims are not the same. She's been our enemy before and I don't doubt that she might be again. But right now, Freya is the greater evil and we need Sirra's help. This is our best chance at stopping the Ice Queen.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32760-11.html">"It doesn't make sense."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-11.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-11.html
new file mode 100644
index 0000000000000000000000000000000000000000..35ce7126c1ac94a765752550a9757ae577630317
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-11.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+We need your help. With your strength, this plan could work! The Ice Queen must be stopped... Please, I'll do anything.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32760-12.html">"...there's no other choice."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-12.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-12.html
new file mode 100644
index 0000000000000000000000000000000000000000..e6b1585bb2a716c454fd5b783d407093f7373683
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-12.html
@@ -0,0 +1,5 @@
+<html><body>Jinia:<br>
+(Beams, her smile wide)<br>
+Thank you so much. Freya's threat won't end here. Like I said, we have to stop her before she tries to conquer the world with her icy grip. Let us meet at the Queen's Garden. I'll talk to the butler and let him know you're coming. See you there.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32760-13.html">"See you."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-13.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-13.html
new file mode 100644
index 0000000000000000000000000000000000000000..90e976bc2174686e18b80be927e5e96498fd2622
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-13.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+Let our visitor out, please.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32760-14.html">Leave the Hall.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-14.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-14.html
new file mode 100644
index 0000000000000000000000000000000000000000..383833c3894a729bf7598543a339742db0a325e8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-14.html
@@ -0,0 +1,3 @@
+<html><body>Jinia:<br>
+Good luck to you!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-15.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-15.html
new file mode 100644
index 0000000000000000000000000000000000000000..093fe3d58a8a9171553fade868704f7167ce4cec
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32760-15.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+First, let's go to Freya's garden. I'll talk to the butler. We'll meet there.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32760-13.html">Ok, we will.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..fb5ef1846e66cf458232522516a3fab77efd2ccd
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-01.html
@@ -0,0 +1,5 @@
+<html><body>Kegor:<br>
+Again, thank you! Without you, we'd be in deeper trouble and I may very well have died. You are quite skilled... thank the Gods you are on our side! However, as skilled as you are, it isn't enough. In order to stop Freya, we'll need something of immense power that can absorb her power, such as the Divine Sword of Kier.<br>
+Kier used to be Princess Felicia's best friend and protector. The power of his sword was remarkable but not without danger. Over time, wielding it sapped my strength. I wandered around the Mithril Mines until I collapsed.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32761-02.html">"Are you okay now?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..1668ad54bc0622e25da52e2711931959a9114603
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-02.html
@@ -0,0 +1,3 @@
+<html><body>Kegor:<br>
+Don't worry about me, I'll be all right. But you'll want to talk to Jinia. I have nothing more to say until you do.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..3645cdc86872f33f61845bde07c009a7b17ba9fb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-03.html
@@ -0,0 +1,3 @@
+<html><body>Kegor:<br>
+You don't have to worry about me. Can you go over the details with Jinia? That's all I can tell you for now.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..1508235735b37d8f20bc5d467766c0e531a46289
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32761-04.html
@@ -0,0 +1,3 @@
+<html><body>Kegor:<br>
+I don't like it either...but we could use Sirra's power to help us. Just listen to Sirra's story first.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..3d6440623a885ac5b31f18b4afd01054cf6d1cc1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-01.html
@@ -0,0 +1,4 @@
+<html><body>Sirr:<br>
+Ah, you foolish humans. What beautiful ice sculptures you would all make, preserved for eternity in winter's grasp.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32762-02.html">"Who are you?!"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..e4568064e536afdb0cee41578d4691491e11b0b3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-02.html
@@ -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 Quest Q10285_MeetingSirra 32762-03.html">"What is Freya's chamberlain doing here?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..e5600d0b24d3d891eecf599323bd2777ab9bba80
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-03.html
@@ -0,0 +1,4 @@
+<html><body>Sirra:<br>
+I will admit, I was not acting of my own free will as the Ice Fairy. As hard as it may be to believe, even one as great as Master Magician Sirra can be misled. That foolish Felicia! When she broke that ice crystal, she believed it a mistake and tried to hide the shards from the rest of us. Eventually, everyone near her came under the crystal's control...<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32762-04.html">"Sayan's crystals can influence people?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..3eb3f6b442dd3fcb0beda4d29c025f7a85091127
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-04.html
@@ -0,0 +1,4 @@
+<html><body>Sirra:<br>
+Don't fool yourself and pity Felicia. Yes, she was just a normal human once. But she was never innocent. She unabashedly sought more and more power, and to say she was self-centered is an understatement. We were all merely characters in her universe. When she absorbed the power of Freya from the crystal, it only accentuated her more vile personality traits and gave her power no mortal should possess. She has become not unlike a god herself.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32762-05.html">"Your point?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..f855b1793988beb3ebc1e4067e621c02326cb2fa
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-05.html
@@ -0,0 +1,4 @@
+<html><body>Sirra:<br>
+I grew up with 'Licia' - Felicia - when she was a snot-nosed child. I know her better than she knows herself. Know this: fighting Freya alone is suicide. We may be able to help each other - I have a plan that just might work.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32762-06.html">"Work together with you?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..aa0033e4952843b59952f526e948f9bd2ffab6a5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-06.html
@@ -0,0 +1,4 @@
+<html><body>Sirra:<br>
+It's our castle and you'll need the help of those within to defeat her. We were all caught up in Freya's destructive web: not just the knights, soldiers, and nobles but also the butlers, servants, and cooks. Even myself, the Grand Head Chamberlain. While we cannot defy Freya's will, we know she poses a dire threat to the world and we may still be able to help. I assure you that you will need it.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32762-07.html">"How do I defeat Freya?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..08bfa3f57fc7b20f55f8a86463f9cd5f019a941c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-07.html
@@ -0,0 +1,4 @@
+<html><body>Sirra:<br>
+We can isolate Freya's essence and seal it in what is called a frozen core, a device not unlike the ice crystal that began this whole thing. It so happens I am capable of making this device! I assure you, it is not because I am fabulous, though I am. It is part of the curse Freya placed on me. She believes her power over her consorts so great that I would never move against her, and in a way it is true. But I can give you this, and my curse will become your gift. Join us, we can stop Freya together!<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32762-08.html">"Give me a break. I won't fall into your trap, Sirra."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..178b4af9e9080690cf0875339493f42e12e21135
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-08.html
@@ -0,0 +1,3 @@
+<html><body>Sirra:<br>
+You are a fool! But I'm not going to waste my breath trying to convince you. Go ahead and try to fight Freya. I assure you that you will fail. If you don't end up another sculpture in her garden, I suggest you come back and talk to me. Goodbye for now.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..c324f4f3b55213e40fc8dc5002965871ebf038fc
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32762-09.html
@@ -0,0 +1,3 @@
+<html><body>Sirra:<br>
+Have it your way. When you come to your senses, I'll be waiting right here. You're welcome.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..586c00d1d4add4af1748219163b9558ed9ffc908
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-01.html
@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+You're here! We've been waiting. Let's continue with haste.<br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32781-02.html">Let's enter.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..197637ee6507fa85cf8162e6ae60c4138330ca68
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-02.html
@@ -0,0 +1,5 @@
+<html><body>Jinia:<br>
+Are you ready?<br>
+<a action="bypass -h npc_%objectId%_Quest IceQueensCastle">"Let's do it!"</a><br>
+<a action="bypass -h Quest Q10285_MeetingSirra 32781-03.html">"Wait a moment, there's something I need to do first."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..87f5f8dbc9ae6df14d7cf1d0ad5c867f320237fd
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-03.html
@@ -0,0 +1,3 @@
+<html><body>Jinia:<br>
+Just tell me when you are ready.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..643902f4d107c44df408becc6514dd623d8b1ec9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/32781-04.html
@@ -0,0 +1,3 @@
+<html><body>Jinia:<br>
+Let's go back to Lephri and talk to him.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
new file mode 100644
index 0000000000000000000000000000000000000000..99d8d9a161143a6c975f729168f8f2ce053ef117
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -0,0 +1,385 @@
+/*
+ * 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.Q10285_MeetingSirra;
+
+import quests.Q10284_AcquisitionOfDivineSword.Q10284_AcquisitionOfDivineSword;
+
+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;
+
+/**
+ * Meeting Sirra (10285)
+ * @author Adry_85
+ */
+public class Q10285_MeetingSirra extends Quest
+{
+ // NPCs
+ private static final int RAFFORTY = 32020;
+ private static final int FREYAS_STEWARD = 32029;
+ private static final int JINIA = 32760;
+ private static final int KEGOR = 32761;
+ private static final int SIRRA = 32762;
+ private static final int JINIA2 = 32781;
+ // Misc
+ private static final int MIN_LEVEL = 82;
+ // Locations
+ private static final Location EXIT_LOC = new Location(113793, -109342, -845, 0);
+ private static final Location FREYA_LOC = new Location(103045, -124361, -2768, 0);
+
+ private Q10285_MeetingSirra()
+ {
+ super(10285, Q10285_MeetingSirra.class.getSimpleName(), "Meeting Sirra");
+ addStartNpc(RAFFORTY);
+ addTalkId(RAFFORTY, JINIA, KEGOR, SIRRA, JINIA2, FREYAS_STEWARD);
+ }
+
+ @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":
+ {
+ htmltext = event;
+ break;
+ }
+ case "32020-03.htm":
+ {
+ st.startQuest();
+ st.setMemoState(1);
+ htmltext = event;
+ break;
+ }
+ case "32760-02.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 0))
+ {
+ st.set("ex", 1);
+ st.setCond(3, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32760-05.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 2))
+ {
+ htmltext = event;
+ }
+ break;
+ }
+ case "32760-06.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 2))
+ {
+ 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.THERES_NOTHING_YOU_CANT_SAY_I_CANT_LISTEN_TO_YOU_ANYMORE));
+ st.set("ex", 3);
+ st.setCond(5, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32760-09.html":
+ case "32760-10.html":
+ case "32760-11.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 4))
+ {
+ htmltext = event;
+ }
+ break;
+ }
+ case "32760-12.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 4))
+ {
+ st.set("ex", 5);
+ st.setCond(7, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32760-13.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 5))
+ {
+ 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-14.html":
+ {
+ if (st.isMemoState(2))
+ {
+ player.teleToLocation(EXIT_LOC, 0);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32761-02.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 1))
+ {
+ st.set("ex", 2);
+ st.setCond(4, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32762-02.html":
+ case "32762-03.html":
+ case "32762-04.html":
+ case "32762-05.html":
+ case "32762-06.html":
+ case "32762-07.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 3))
+ {
+ htmltext = event;
+ }
+ break;
+ }
+ case "32762-08.html":
+ {
+ if (st.isMemoState(1) && (st.getInt("ex") == 3))
+ {
+ st.set("ex", 4);
+ st.setCond(6, true);
+ htmltext = event;
+ npc.deleteMe();
+ }
+ break;
+ }
+ case "32781-02.html":
+ case "32781-03.html":
+ {
+ if (st.isMemoState(2))
+ {
+ htmltext = event;
+ }
+ break;
+ }
+ case "TELEPORT":
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ player.teleToLocation(FREYA_LOC, 0);
+ }
+ 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.htm";
+ }
+ break;
+ }
+ case State.CREATED:
+ {
+ if (npc.getId() == RAFFORTY)
+ {
+ st = player.getQuestState(Q10284_AcquisitionOfDivineSword.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:
+ {
+ switch (st.getMemoState())
+ {
+ case 1:
+ {
+ htmltext = (player.getLevel() >= MIN_LEVEL) ? "32020-06.html" : "32020-09.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "32020-07.html";
+ break;
+ }
+ case 3:
+ {
+ st.giveAdena(283425, true);
+ st.addExpAndSp(939075, 83855);
+ st.exitQuest(false, true);
+ htmltext = "32020-08.html";
+ break;
+ }
+ }
+ 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-03.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "32760-04.html";
+ break;
+ }
+ case 3:
+ {
+ htmltext = "32760-07.html";
+ break;
+ }
+ case 4:
+ {
+ htmltext = "32760-08.html";
+ break;
+ }
+ case 5:
+ {
+ htmltext = "32760-15.html";
+ break;
+ }
+ }
+ }
+ break;
+ }
+ case KEGOR:
+ {
+ if (st.isMemoState(1))
+ {
+ final int state = st.getInt("ex");
+ switch (state)
+ {
+ case 1:
+ {
+ htmltext = "32761-01.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "32761-03.html";
+ break;
+ }
+ case 3:
+ {
+ htmltext = "32761-04.html";
+ break;
+ }
+ }
+ }
+ break;
+ }
+ case SIRRA:
+ {
+ if (st.isMemoState(1))
+ {
+ final int state = st.getInt("ex");
+ if (state == 3)
+ {
+ htmltext = "32762-01.html";
+ }
+ else if (state == 4)
+ {
+ htmltext = "32762-09.html";
+ }
+ }
+ break;
+ }
+ case JINIA2:
+ {
+ if (st.isMemoState(2))
+ {
+ htmltext = "32781-01.html";
+ }
+ else if (st.isMemoState(3))
+ {
+ htmltext = "32781-04.html";
+ }
+ break;
+ }
+ case FREYAS_STEWARD:
+ {
+ if (st.isMemoState(2))
+ {
+ htmltext = "32029-01.html";
+ st.setCond(8, true);
+ }
+ break;
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ public static void main(String args[])
+ {
+ new Q10285_MeetingSirra();
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/sql/game/npc.sql b/L2J_DataPack_BETA/dist/sql/game/npc.sql
index 20f1e896a5ab0cdf5d62ee40b7cd5ed24647dd1a..d90bdc91ecc154987d570d5611342d8b99eb4d6e 100644
--- a/L2J_DataPack_BETA/dist/sql/game/npc.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/npc.sql
@@ -2362,9 +2362,9 @@ INSERT INTO `npc` VALUES
(18844, 18844, "Reptilikon's Ward", 0, "", 0, "LineageNpcEV.totem_of_cocracon_b", 30, 54, 85, "male", "L2Npc", 40, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 0, 0, 0, 1, 1, 0, 1),
(18845, 18845, "Torumba's Telegraph", 0, "", 0, "LineageNPC.camera_target_dummy_a", 0.1, 0.1, 85, "male", "L2Npc", 40, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 0, 0, 0, 1, 1, 0, 1),
(18846, 18846, "Kegor", 0, "", 0, "LineageMonster5.swordmaster_kegor", 15, 27.5, 85, "male", "L2QuestGuard", 40, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 0, 0, 0, 40, 120, 0, 1),
-(18847, 18847, "Freya", 0, "Ice Queen", 0, "LineageMonster5.freya_throne", 50, 98.5, 85, "female", "L2Npc", 40, 2388699.675054, 1846.8, 918.195504, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 0, 0, 0, 45, 150, 0, 1),
-(18848, 18848, "Battalion Leader", 0, "Jinia Guild", 0, "LineageNPC2.garrison_of_insurgents", 10, 23.75, 85, "female", "L2Npc", 40, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 80, 641, 0, 30, 160, 0, 1),
-(18849, 18849, "Legionnaire", 0, "Jinia Guild", 0, "LineageNPC2.officer_of_insurgents_orc", 14.5, 30, 85, "male", "L2Npc", 40, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 9813, 9813, 0, 40, 160, 0, 1),
+(18847, 18847, "Freya", 0, "Ice Queen", 0, "LineageMonster5.freya_throne", 50, 98.5, 85, "female", "L2Monster", 40, 2388699.675054, 1846.8, 918.195504, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 0, 0, 0, 45, 150, 0, 1),
+(18848, 18848, "Battalion Leader", 0, "Jinia Guild", 0, "LineageNPC2.garrison_of_insurgents", 10, 23.75, 85, "female", "L2QuestGuard", 40, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 80, 641, 0, 30, 160, 0, 1),
+(18849, 18849, "Legionnaire", 0, "Jinia Guild", 0, "LineageNPC2.officer_of_insurgents_orc", 14.5, 30, 85, "male", "L2QuestGuard", 40, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 9813, 9813, 0, 40, 160, 0, 1),
(18850, 18850, "Jinia", 0, "", 0, "LineageMonster5.guildmaster_jinia", 11, 23.5, 85, "female", "L2Npc", 40, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 0, 0, 0, 40, 120, 0, 1),
(18851, 18851, "Kegor", 0, "", 0, "LineageMonster5.swordmaster_kegor", 15, 27.5, 85, "male", "L2Npc", 40, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 0, 0, 0, 40, 120, 0, 1),
(18852, 18852, "Sirra", 0, "", 0, "LineageMonster5.human_sirr", 10, 22, 85, "female", "L2Npc", 40, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 0, 0, 0, 40, 120, 0, 1),
@@ -2441,7 +2441,7 @@ INSERT INTO `npc` VALUES
(18923, 18923, "Door Golem", 0, "Final", 0, "LineageMonster2.baby_buffalo", 8, 15, 84, "male", "L2Npc", 40, 4039.042705, 1812, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1144.7313, 357.86723, 781.70308, 261.87171, 253, 4, 333, 0, 0, 0, 30, 80, 0, 1),
(18924, 18924, "Door Golem", 0, "", 0, "LineageMonster2.baby_buffalo", 8, 15, 84, "male", "L2Npc", 40, 4039.042705, 1812, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1144.7313, 357.86723, 781.70308, 261.87171, 253, 4, 333, 0, 0, 0, 30, 80, 0, 1),
(18925, 18925, "Trap", 0, "", 0, "LineageNpcEV.Trap_device_bottom_staff", 30, 13, 84, "etc", "L2Npc", 40, 4039.042705, 1812, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1144.7313, 357.86723, 781.70308, 261.87171, 253, 4, 333, 0, 0, 0, 1, 1, 0, 1),
-(18926, 18926, "Mercenary Archer", 0, "Jinia Guild", 0, "LineageNPC2.archer_of_insurgents", 10, 23.5, 85, "male", "L2Npc", 1100, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 8, 333, 0, 0, 0, 30, 160, 0, 1),
+(18926, 18926, "Mercenary Archer", 0, "Jinia Guild", 0, "LineageNPC2.archer_of_insurgents", 10, 23.5, 85, "male", "L2QuestGuard", 1100, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 8, 333, 0, 0, 0, 30, 160, 0, 1),
(18927, 18927, "Fire", 0, "", 0, "LineageNpcEV.camp_fire_a", 29, 30.5, 84, "male", "L2Npc", 40, 4039.042705, 1812, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1144.7313, 357.86723, 781.70308, 261.87171, 253, 4, 333, 0, 0, 0, 1, 1, 0, 1),
(18928, 18928, "Annihilation Furnace", 0, "", 0, "LineageNpcEV.gracia_fire_pot", 63, 33.5, 85, "male", "L2TerrainObject", 40, 4234.063127, 1846.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1188.87259, 361.78814, 811.84586, 264.74086, 253, 4, 333, 0, 0, 0, 1, 1, 0, 1),
(18929, 18929, "Ward of the Grail", 0, "", 0, "LineageMonster.will_o_wisp", 13, 22, 84, "male", "L2Monster", 40, 4039.042705, 1812, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1144.7313, 357.86723, 781.70308, 261.87171, 253, 1, 333, 0, 0, 0, 25, 140, 0, 1),
diff --git a/L2J_DataPack_BETA/dist/sql/game/npcaidata.sql b/L2J_DataPack_BETA/dist/sql/game/npcaidata.sql
index 70844258eee37610839d1f45072e8a192b1dd949..06b7cdc800575ee65de3b9512d33aefa4a8d92a9 100644
--- a/L2J_DataPack_BETA/dist/sql/game/npcaidata.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/npcaidata.sql
@@ -2347,9 +2347,9 @@ INSERT INTO `npcaidata` VALUES
(18844, 7, 15, 0, 300, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Reptilikon's Ward
(18845, 7, 15, 0, 300, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Torumba's Telegraph
(18846, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Kegor
-(18847, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Freya
-(18848, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Battalion Leader
-(18849, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Legionnaire
+(18847, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 900, 0, "null", 300, "null", 0, 0, "fighter"), -- Freya
+(18848, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 2000, "null", 0, 0, "fighter"), -- Battalion Leader
+(18849, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 2000, "null", 0, 0, "fighter"), -- Legionnaire
(18850, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Jinia
(18851, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Kegor
(18852, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Sirra
@@ -2426,7 +2426,7 @@ INSERT INTO `npcaidata` VALUES
(18923, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Door Golem
(18924, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Door Golem
(18925, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Trap
-(18926, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Mercenary Archer
+(18926, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 2000, "null", 0, 0, "fighter"), -- Mercenary Archer
(18927, 7, 15, 0, 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Fire
(18928, 7, 15, 0, 300, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Annihilation Furnace
(18929, 7, 15, 0, 300, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1500, 0, "grail_clan", 1500, "null", 0, 0, "fighter"), -- Ward of the Grail
@@ -4852,7 +4852,7 @@ INSERT INTO `npcaidata` VALUES
(22764, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 400, 0, "cocracon_elite_clan", 300, "null", 0, 0, "fighter"), -- Elite Kiriona
(22765, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 400, 0, "cocracon_elite_clan", 300, "null", 0, 0, "fighter"), -- Elite Kaiona
(22766, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 300, 0, "null", 1000, "null", 0, 0, "fighter"), -- Mithril Millipede
-(22767, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Archery Knight
+(22767, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 300, 0, "null", 300, "null", 0, 0, "fighter"), -- Archery Knight
(22768, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 400, 0, "null", 300, "null", 0, 0, "fighter"), -- Tanta Lizardman Scout
(22769, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Tanta Lizardman Warrior
(22770, 7, 15, 0, 300, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "null", 300, "null", 0, 0, "fighter"), -- Tanta Lizardman Soldier
diff --git a/L2J_DataPack_BETA/dist/sql/game/npcskills.sql b/L2J_DataPack_BETA/dist/sql/game/npcskills.sql
index 6c363e252ea77cce422d9879ad205b9c64e14140..07b1509ba7358f72b26d7bed3f70bffe24d7cb84 100644
--- a/L2J_DataPack_BETA/dist/sql/game/npcskills.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/npcskills.sql
@@ -26966,7 +26966,6 @@ INSERT INTO `npcskills` VALUES
(18847, 4414, 2), -- Armor Type
(18847, 4415, 3), -- Weapon Type
(18847, 4416, 6), -- Races
-(18847, 6276, 1), -- Eternal Blizzard
(18847, 6278, 1), -- Ice Ball
-- Battalion Leader
(18848, 4032, 10), -- NPC Strike