diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/13128.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/13128.htm
index ade83018bd77464401a6e2c079cb7182287aeb0f..3929421bd7d3ee84208fb7bf066173c4909a5d05 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/13128.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/13128.htm
@@ -1,5 +1,5 @@
<html><body>Golem Trader:<br>
I.can.buy.and.sell.goods. Any.money.from.the.transaction.goes.to.the.Merchant.Guild.<br>
I.exist.for.only.3.minutes.after.being.summoned.<br>
-<a action="bypass -h summon_%objectId%_Buy 1312801">Buy.</a>
-</body></html>
\ No newline at end of file
+<a action="bypass -h npc_%objectId%_Buy 1312801">Trade.</a>
+</body></ht
\ 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 938b5b7b060988a3443f3d8703fe7469ab8b1332..93a55de087ed32c4258374e8b7cb01130178e74b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -43,6 +43,7 @@ ai/npc/NpcBuffers/Totems.java
ai/npc/PriestOfBlessing/PriestOfBlessing.java
ai/npc/Rafforty/Rafforty.java
ai/npc/SubclassCertification/SubclassCertification.java
+ai/npc/Summons/MerchantGolem/GolemTrader.java
ai/npc/SymbolMaker/SymbolMaker.java
ai/npc/Teleports/CrumaTower/CrumaTower.java
ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java
new file mode 100644
index 0000000000000000000000000000000000000000..e3401b63e9811b2d9dbf6a03a7af00d075e6aef4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java
@@ -0,0 +1,33 @@
+package ai.npc.Summons.MerchantGolem;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+
+/**
+ * Golem Trader AI.
+ * @author Zoey76
+ */
+public class GolemTrader extends AbstractNpcAI
+{
+ // NPC
+ private static final int GOLEM_TRADER = 13128;
+
+ public GolemTrader()
+ {
+ super(GolemTrader.class.getSimpleName(), "ai/npc/Summons");
+ addSpawnId(GOLEM_TRADER);
+ }
+
+ @Override
+ public String onSpawn(L2Npc npc)
+ {
+ npc.scheduleDespawn(180000);
+ return super.onSpawn(npc);
+ }
+
+ public static void main(String[] args)
+ {
+ new GolemTrader();
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/sql/game/npc.sql b/L2J_DataPack_BETA/dist/sql/game/npc.sql
index 97d8cf1c353348f13c79f253d5d4fd07349b5d98..922e5c59373bce603736cf95e233853548679193 100644
--- a/L2J_DataPack_BETA/dist/sql/game/npc.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/npc.sql
@@ -381,7 +381,7 @@ INSERT INTO `npc` VALUES
(13125, 13125, "Trap", 0, "", 0, "LineageNpc2.trap_mark", 5, 10, 64, "etc", "L2Npc", 40, 2244.67715, 1219.8, 0, 0.9, 40, 43, 30, 21, 20, 20, 0, 0, 8.47458, 60000, 5.78704, 200000, 253, 1, 333, 0, 0, 0, 50, 1, 0, 1),
(13126, 13126, "Trap", 0, "", 0, "LineageNpc2.trap_mark", 5, 10, 64, "etc", "L2Npc", 40, 2444.46819, 1345.8, 0, 0.9, 40, 43, 30, 21, 20, 20, 0, 0, 8.47458, 60000, 5.78704, 200000, 253, 1, 333, 0, 0, 0, 50, 1, 0, 1),
(13127, 13127, "Trap", 0, "", 0, "LineageNpc2.trap_mark", 5, 10, 68, "etc", "L2Npc", 40, 2632.19636, 1475, 0, 0.9, 40, 43, 30, 21, 20, 20, 0, 0, 8.47458, 60000, 5.78704, 200000, 253, 1, 333, 0, 0, 0, 50, 1, 0, 1),
-(13128, 13128, "Golem Trader", 0, "", 0, "LineageNPC.e_teleporter_FDwarf", 8, 21.3, 70, "female", "L2MerchantSummon", 40, 2632.19636, 1475, 0, 0.9, 40, 43, 30, 21, 20, 20, 0, 0, 8.47458, 60000, 5.78704, 200000, 253, 1, 333, 0, 0, 0, 50, 1, 0, 1),
+(13128, 13128, "Golem Trader", 0, "", 0, "LineageNPC.e_teleporter_FDwarf", 8, 21.3, 70, "female", "L2Merchant", 40, 2632.19636, 1475, 0, 0.9, 40, 43, 30, 21, 20, 20, 0, 0, 8.47458, 60000, 5.78704, 200000, 253, 1, 333, 0, 0, 0, 50, 1, 0, 1),
(13129, 13129, "Teleporter", 0, "", 0, "LineageNPC.a_teleporter_FHuman", 8, 25, 55, "female", "L2Npc", 40, 1673.05473, 889.8, 0, 0.9, 40, 43, 30, 21, 20, 25, 0, 0, 8.47458, 60000, 5.78704, 200000, 253, 1, 333, 0, 0, 0, 50, 180, 0, 1),
(13130, 13130, "Light Purple Maned Horse", 0, "", 0, "LineageMonster4.gray_horse", 31, 32.5, 55, "female", "L2Npc", 40, 1673.05473, 889.8, 0, 0.9, 40, 43, 30, 21, 20, 25, 0, 0, 8.47458, 60000, 5.78704, 200000, 253, 1, 333, 0, 0, 0, 41, 180, 0, 1),
(13131, 13131, "Grizzly Bear", 0, "", 0, "LineageMonster.grizzly", 21, 40, 55, "male", "L2Npc", 40, 1673.05473, 889.8, 0, 0.9, 40, 43, 30, 21, 20, 25, 0, 0, 8.47458, 60000, 5.78704, 200000, 253, 1, 333, 0, 0, 0, 40, 180, 0, 1),