diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32020.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32020.htm
deleted file mode 100644
index e1cdd96496882507a1faf5ead815fc9a8a946675..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32020.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Rafforty:<br>
-It's very warm in here! Quite a bit different from the chaos outside, don't you think? It's a nice place to take a rest. If you need anything, please let me know.<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.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index bbcf29a3dc81d665ffb4b25fd5eec5dab7743dd8..2af7f053a39e4f6d36734cfb628396c2d4663550 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -23,6 +23,7 @@ ai/npc/NpcBuffers/CabaleBuffer.java
ai/npc/NpcBuffers/ChristmasTree.java
ai/npc/NpcBuffers/Totems.java
ai/npc/PriestOfBlessing/PriestOfBlessing.java
+ai/npc/Rafforty/Rafforty.java
ai/npc/Teleports/CrumaTower/CrumaTower.java
ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..3a1c511f7d6e56a8f17ef1450194724e442e3206
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-01.html
@@ -0,0 +1,5 @@
+<html><body>Rafforty:<br>
+Is this a Freya Necklace? Hmm... it's okay I guess. It isn't as interesting as a Blessed Freya Necklace. You could be lucky enough to get one, or if you happen to aquire Freya's Soul in a bottle you can create a Blessed Freya Necklace. However the process is, well... different. Tell you what, if you bring me these items I can make one for you.<br>
+<a action="bypass -h Quest Rafforty 32020-04.html">"I have a Bottle of Freya's Soul."</a><br>
+<a action="bypass -h Quest Rafforty 32020-03.html">"Where can I get Freya's Soul?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..525f649dd1ac0294080394f3cecad6a05967f3c2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-02.html
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+I wish I could tell you more about whatever it is you have to show me. But it doesn't look like you have anything to show.<br>
+(Requires a Freya Necklace.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..f3de6efc0dcc1342725f512ae9afe98497e913f0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-03.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+I don't know the details, but if I had to hazard a guess, it would be something you would get after defeating Freya. You could always ask around to see what other people have to say.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..bcab3293eaab0593e623ed9ef68b796cfe2decf3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-04.html
@@ -0,0 +1,5 @@
+<html><body>Rafforty:<br>
+Yes, I sensed that you had Freya's Soul contained in a Bottle before you even answered! Nah, I saw it when you were showing me your Freya Necklace. You must have made her very angry. If you are ready, I can begin the process of making a Blessed Freya Necklace.<br>
+<a action="bypass -h Quest Rafforty 32020-07.html">"Make me a Blessed Freya Necklace."</a><br>
+<a action="bypass -h Quest Rafforty 32020-06.html">"I do not want a Blessed Freya Necklace."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..a99187cb42248b2b06e4b84d837ff9364a277140
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-05.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Sorry there, stranger, but unless you can bring me a Bottle of Freya's Soul, I can't do anything with that Freya Necklace you are carrying. Speak to me when you actually have these items.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..440ed37691ec01a7522d2967ac313101e6d7dfa9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-06.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Wow. Lack of trust, huh? Good luck finding someone else who can make a Blessed Freya Necklace.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..3a3002835c20adf382e6a65d954952784782b8aa
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-07.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Ah... a masterpiece if I do say so myself. Here is your Blessed Freya Necklace. Now you truly have something that is interesting.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..38da5342cc0090ed9d5d8699f02f4ed127df2a95
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020-08.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+If you want me to help you will have to give me the item. I cannot do anything without it.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020.html
new file mode 100644
index 0000000000000000000000000000000000000000..b89ebd896ff16bfbbc05b1eb2934aab72acd90d9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/32020.html
@@ -0,0 +1,5 @@
+<html><body>Rafforty:<br>
+Welcome to my little oasis. Although it may be cold and blustery out there, it's like an endless spring day in here. Needless to say, I don't really venture outside much any more. Although I like my privacy, I'm always willing to lend a helping hand to those in need. And if you don't mind me saying, you look like you're in need.<br>
+<a action="bypass -h Quest Rafforty 32020-01.html">I have a necklace I'd like you to look at.</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/Rafforty/Rafforty.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java
new file mode 100644
index 0000000000000000000000000000000000000000..8a343d3d93c101fed60caed21052c6e24aa419fc
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java
@@ -0,0 +1,85 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.npc.Rafforty;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Rafforty AI
+ * @author malyelfik, Gladicek
+ */
+public class Rafforty extends AbstractNpcAI
+{
+ // NPC ID
+ private static final int RAFFORTY = 32020;
+
+ // Items
+ private static final int NECKLACE = 16025;
+ private static final int BLESSED_NECKLACE = 16026;
+ private static final int BOTTLE = 16027;
+
+ @Override
+ public String onFirstTalk(L2Npc npc, L2PcInstance player)
+ {
+ return "32020.html";
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ switch (event)
+ {
+ case "32020-01.html":
+ if (!hasQuestItems(player, NECKLACE))
+ {
+ htmltext = "32020-02.html";
+ }
+ break;
+ case "32020-04.html":
+ if (!hasQuestItems(player, BOTTLE))
+ {
+ htmltext = "32020-05.html";
+ }
+ break;
+ case "32020-07.html":
+ if (!hasQuestItems(player, BOTTLE, NECKLACE))
+ {
+ return "32020-08.html";
+ }
+ takeItems(player, NECKLACE, 1);
+ takeItems(player, BOTTLE, 1);
+ giveItems(player, BLESSED_NECKLACE, 1);
+ break;
+ }
+ return htmltext;
+ }
+
+ public Rafforty(String name, String descr)
+ {
+ super(name, descr);
+ addStartNpc(RAFFORTY);
+ addFirstTalkId(RAFFORTY);
+ addTalkId(RAFFORTY);
+ }
+
+ public static void main(String[] args)
+ {
+ new Rafforty(Rafforty.class.getSimpleName(), "ai/npc/");
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/spawnlist.sql b/L2J_DataPack_BETA/dist/sql/game/spawnlist.sql
index b16d0677efc6c7583739b1f5f851cd717736eccc..32861b6a5c1edee411dbc16a0c04566be99d9a87 100644
--- a/L2J_DataPack_BETA/dist/sql/game/spawnlist.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/spawnlist.sql
@@ -32624,13 +32624,13 @@ INSERT INTO `spawnlist` VALUES
-- Misa
("Ice_Queen_Castle", 1, 32018, 107888, -120464, -3744, 0, 0, 24576, 60, 0, 2),
-- Rafforty
-("Ice Merchant/Frozen", 1, 32020, 113847, -109386, -852, 0, 0, 20733, 60, 0, 0),
+("Ice Merchant/Frozen", 1, 32020, 113808, -109344, -846, 0, 0, 8192, 60, 0, 0),
-- Ice Sculpture
("Ice_Queen_Castle", 1, 32021, 117920, -126592, -2584, 0, 0, 8192, 60, 0, 0),
-- Kier
("Ice_Queen_Castle", 1, 32022, 104512, -107648, -3688, 0, 0, 28672, 60, 0, 0),
-- Ice Shelf
-("Ice Merchant/Frozen", 1, 32023, 113741, -109246, -841, 0, 0, 29413, 60, 0, 0),
+("Ice Merchant/Frozen", 1, 32023, 113760, -109264, -840, 0, 0, 0, 60, 0, 0),
-- Freya's Steward
("Ice_Queen_Castle", 1, 32029, 115451, -125706, -3448, 0, 0, 0, 60, 0, 0),
-- Ice Fairy Sculpture