From 8d3e8ca50ef6e1ad4fdf890556d76d42107e5f6e Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 25 Jan 2021 18:25:56 +0000 Subject: [PATCH] Dimensional merchant improvements. --- .../ai/others/DimensionalMerchant/32478.html | 37 ++++++++++++++++--- .../DimensionalMerchant.java | 9 +++++ .../network/clientpackets/ExOpenHtml.java | 8 +--- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/DimensionalMerchant/32478.html b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/DimensionalMerchant/32478.html index 6457f7be8c..f644191127 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/DimensionalMerchant/32478.html +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/DimensionalMerchant/32478.html @@ -1,6 +1,33 @@ -Dimensional MerchantDimensional Merchant:
-Hi! You can deal with Dimensional items here. Dimensional items can be obtained in the item catalogue. However, if the inventory is full you can't put any Dimensional items in it.
- - - +Game Assistant + + + + +
+ + + + +
+ + + + +
Here you can exchange, receive and transfer items.
+ + + + + + + + + + + +
+
+
+
+
\ No newline at end of file diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java index 41ae71f532..2441767512 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java @@ -16,6 +16,7 @@ */ package ai.others.DimensionalMerchant; +import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -27,6 +28,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.ExPremiumManagerShowHtml; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; @@ -103,6 +105,13 @@ public class DimensionalMerchant extends AbstractNpcAI return htmltext; } + @Override + public String onFirstTalk(Npc npc, PlayerInstance player) + { + player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/DimensionalMerchant/32478.html"))); + return null; + } + @RegisterEvent(EventType.ON_PLAYER_BYPASS) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void OnPlayerBypass(OnPlayerBypass event) diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java index 8d93ad9144..cdbe1edae2 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.GameClient; -import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.network.serverpackets.ExPremiumManagerShowHtml; /** * @author Mobius @@ -43,10 +43,6 @@ public class ExOpenHtml implements IClientIncomingPacket return; } - // FIXME: - // client.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/DimensionalMerchant/32478.html"))); - final NpcHtmlMessage html = new NpcHtmlMessage(); - html.setHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/DimensionalMerchant/32478.html")); - player.sendPacket(html); + client.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/DimensionalMerchant/32478.html"))); } }