diff --git a/L2J_DataPack_BETA/dist/game/data/html/seven_signs/blkmrkt_1.htm b/L2J_DataPack_BETA/dist/game/data/html/seven_signs/blkmrkt_1.htm
index e6986a06ca5ddd9c646b5f0b97bddc17cc92ebb9..a880c9ee9b0c05dff684b74fbb6b363adc1757b8 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/seven_signs/blkmrkt_1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/seven_signs/blkmrkt_1.htm
@@ -1,11 +1,12 @@
<html><body>Black Marketeer of Mammon:<br>
-Out of respect for the traditions of the old empire, both the Lords of Dawn and the Revolutionaries of Dusk use <font color="LEVEL">Ancient Adena</font> as their currency.<br>
-Certainly, traditions and customs are important, but in this day and age... If you go to the market with those ancient coins, you won't be able to buy anything! Right?<br>
-Say, do you have any Ancient Adena weighing down your purse? I can help you.<br>
-Also, if your weapon carries a special capability you no longer want, I can remove it. No questions asked!<br>
-I also carry rare goods that you won't find anywhere else. Stop by and see for yourself some time. You might just find a once-in-a-lifetime deal...<br>
-<a action="bypass -h npc_%objectId%_Link seven_signs/blkmrkt_2.htm">Exchange Ancient Adena for Adena.</a><br>
-<a action="bypass -h npc_%objectId%_multisell 310922002">Buy black market goods.</a><br>
-<a action="bypass -h npc_%objectId%_exc_multisell 310922001">Remove a weapon's special ability.</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
+The Lords of Dawn and the Revolutionary Troops of Dusk use <font color="LEVEL">ancient adena</font> as their currency, following in the old empire's tradition.<br>
+Tradition and customs are important but they are so old... If you were to go to the market with that money in this day and age... you couldn't buy a thing.<br>
+Do you have any ancient adena that you don't know what to do with? Or do you happen to need ancient adena for whatever reason? If so, I'll help you.<br>
+Also, if your weapon has a special ability that you do not want, I can take remove it, too. I dont't know why you would want to take off a special ability that's been bestowed on your weapon, but we'll do anything for adena.<br>
+I have also obtained some rare goods, so stop by some time. These items aren't easy to obtain.<br>
+<a action="bypass -h npc_%objectId%_Link seven_signs/blkmrkt_2.htm">Exchange ancient adena for adena</a><br>
+<a action="bypass -h npc_%objectId%_Quest BlackMarketeerOfMammon">Exchange adena for ancient adena</a><br>
+<a action="bypass -h npc_%objectId%_multisell 310922002">Trade black market goods</a><br>
+<a action="bypass -h npc_%objectId%_exc_multisell 310922001">Remove weapon's special ability</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.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index cb89c6b144f502999c28e6f8f85a1f4fe490cff8..57d5192c8107326e55d89984f1f3134eec7ef6d8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -11,6 +11,7 @@ handlers/MasterHandler.java
# AI Section
# Npc
+ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
ai/npc/Dorian/Dorian.java
ai/npc/DragonVortex/DragonVortex.java
ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..90ca156f61d48e0b62510677b05263c602b3bff3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-01.html
@@ -0,0 +1,7 @@
+<html><body>Black Marketeer of Mammon:<br>
+The cost is high if you wish to keep the <font color="LEVEL">ancient Adena</font> from corroding. I'm sure you won't like it, but you must pay 4 times the normal cost. Also, we only see in bundles of 500,000 ancient Adena.<br>
+To make sure the ancient currency is spread widely, we have limited the amount that an individual can buy per day.<br>
+Have you decided to buy?<br>
+<a action="bypass -h Quest BlackMarketeerOfMammon exchange">Exchange 2,000,000 Adena for 500,000 ancient Adena</a><br>
+<a action="bypass -h npc_%objectId%_Link seven_signs/blkmrkt_1.htm">Back</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..5e8c0d82c0844d110774212ff72930edefe9e65e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-02.html
@@ -0,0 +1,4 @@
+<html><body>Black Marketeer of Mammon:<br>
+Ancient Adena is not for sale right now. Please come back later.<br>
+<a action="bypass -h npc_%objectId%_Link seven_signs/blkmrkt_1.htm">Back</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..26632239befa783b476db9af26f5f2edcee7d04b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-03.html
@@ -0,0 +1,4 @@
+<html><body>Black Marketeer of Mammon:<br>
+Haven't you already purchased Ancient Adena today? We have limited sales to once per day in order to stop people buying too much. You will be able to buy again tomorrow. Hahaha.<br>
+<a action="bypass -h npc_%objectId%_Link seven_signs/blkmrkt_1.htm">Back</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..71d83e441195f8d92a6eb1094d17a7184a075803
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-04.html
@@ -0,0 +1,5 @@
+<html><body>Black Marketeer of Mammon:<br>
+<font color="LEVEL">[Exchange success]</font><br>
+Thank you! Please use it well. Come back tomorrow!<br>
+<a action="bypass -h npc_%objectId%_Link seven_signs/blkmrkt_1.htm">Back</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..34cda3b539a09a3f50f06b32f1f03fa628e530ea
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-05.html
@@ -0,0 +1,4 @@
+<html><body>Black Marketeer of Mammon:<br>
+You must bring more Adena in order to buy my ancient Adena. As I have already said, we do not sell it piece by piece.<br>
+<a action="bypass -h npc_%objectId%_Link seven_signs/blkmrkt_1.htm">Back</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..746f1bc0378a3ae5c71e28c541a33d83a96d2cc7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-06.html
@@ -0,0 +1,4 @@
+<html><body>Black Marketeer of Mammon:<br>
+I only sell to worthy adventurers above level 60. You might need it right away, but you're still going to have to come back after traveling some more.<br>
+<a action="bypass -h npc_%objectId%_Link seven_signs/blkmrkt_1.htm">Back</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
new file mode 100644
index 0000000000000000000000000000000000000000..0a6b03aae491a4e2f6369b48d300be173b75775b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -0,0 +1,117 @@
+/*
+ * 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.BlackMarketeerOfMammon;
+
+import java.util.Calendar;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.QuestState.QuestType;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Black Marketeer of Mammon - Exchange Adena for AA.
+ * @author Adry_85
+ */
+public class BlackMarketeerOfMammon extends AbstractNpcAI
+{
+ // NPC
+ private static final int BLACK_MARKETEER = 31092;
+ // Misc
+ private static final int MIN_LEVEL = 60;
+
+ public BlackMarketeerOfMammon(String name, String descr)
+ {
+ super(name, descr);
+
+ addStartNpc(BLACK_MARKETEER);
+ addTalkId(BLACK_MARKETEER);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance talker)
+ {
+ return exchangeAvailable() ? "31092-01.html" : "31092-02.html";
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ QuestState qs = player.getQuestState(getName());
+ if ("exchange".equals(event))
+ {
+ if (exchangeAvailable())
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ if (!qs.isNowAvailable())
+ {
+ htmltext = "31092-03.html";
+ }
+ else
+ {
+ if (player.getAdena() >= 2000000)
+ {
+ qs.setState(State.STARTED);
+ takeItems(player, PcInventory.ADENA_ID, 2000000);
+ giveItems(player, PcInventory.ANCIENT_ADENA_ID, 500000);
+ htmltext = "31092-04.html";
+ qs.exitQuest(QuestType.DAILY, false);
+ }
+ else
+ {
+ htmltext = "31092-05.html";
+ }
+ }
+ }
+ else
+ {
+ htmltext = "31092-06.html";
+ }
+ }
+ else
+ {
+ htmltext = "31092-02.html";
+ }
+ }
+
+ return htmltext;
+ }
+
+ private boolean exchangeAvailable()
+ {
+ Calendar currentTime = Calendar.getInstance();
+ Calendar minTime = Calendar.getInstance();
+ minTime.set(Calendar.HOUR_OF_DAY, 20);
+ minTime.set(Calendar.MINUTE, 0);
+ minTime.set(Calendar.SECOND, 0);
+ Calendar maxtTime = Calendar.getInstance();
+ maxtTime.set(Calendar.HOUR_OF_DAY, 23);
+ maxtTime.set(Calendar.MINUTE, 59);
+ maxtTime.set(Calendar.SECOND, 59);
+
+ return (currentTime.compareTo(minTime) >= 0) && (currentTime.compareTo(maxtTime) <= 0);
+ }
+
+ public static void main(String[] args)
+ {
+ new BlackMarketeerOfMammon(BlackMarketeerOfMammon.class.getSimpleName(), "ai/npc");
+ }
+}