diff --git a/trunk/dist/game/data/html/CommunityBoard/Custom/merchant/main.html b/trunk/dist/game/data/html/CommunityBoard/Custom/merchant/main.html index b34b8cec12..735c9b8afb 100644 --- a/trunk/dist/game/data/html/CommunityBoard/Custom/merchant/main.html +++ b/trunk/dist/game/data/html/CommunityBoard/Custom/merchant/main.html @@ -1,85 +1,302 @@ - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 		-
- - - - -
- Merchant - Under development... -
- - - - -
- - - - - - - - - - -
LINEAGE II MOBIUS - COMMUNITY BOARD
-
-
- - \ No newline at end of file + + + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 		+
+ + + + + + + + + + + + + +
Merchant
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+
+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+
+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+
+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+
+
+ + +
+ 		+
+ + +
+
+
+ + +
+
+
+ + + + +
+ + + + + + + + + + +
LINEAGE II MOBIUS - COMMUNITY BOARD
+
+
+ \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600001.xml b/trunk/dist/game/data/multisell/custom/600001.xml new file mode 100644 index 0000000000..fcce0c2347 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600001.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600002.xml b/trunk/dist/game/data/multisell/custom/600002.xml new file mode 100644 index 0000000000..5f6aad162e --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600002.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600003.xml b/trunk/dist/game/data/multisell/custom/600003.xml new file mode 100644 index 0000000000..bd0013da4f --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600003.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600004.xml b/trunk/dist/game/data/multisell/custom/600004.xml new file mode 100644 index 0000000000..c095ac5acc --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600004.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600005.xml b/trunk/dist/game/data/multisell/custom/600005.xml new file mode 100644 index 0000000000..76b69055ca --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600005.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600006.xml b/trunk/dist/game/data/multisell/custom/600006.xml new file mode 100644 index 0000000000..b66e62ef03 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600006.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600007.xml b/trunk/dist/game/data/multisell/custom/600007.xml new file mode 100644 index 0000000000..3904b30ccb --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600007.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600008.xml b/trunk/dist/game/data/multisell/custom/600008.xml new file mode 100644 index 0000000000..02edd384ef --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600008.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600009.xml b/trunk/dist/game/data/multisell/custom/600009.xml new file mode 100644 index 0000000000..410e52d06c --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600009.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600010.xml b/trunk/dist/game/data/multisell/custom/600010.xml new file mode 100644 index 0000000000..c798af8b3a --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600010.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600011.xml b/trunk/dist/game/data/multisell/custom/600011.xml new file mode 100644 index 0000000000..ecd9ae6cfe --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600011.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600012.xml b/trunk/dist/game/data/multisell/custom/600012.xml new file mode 100644 index 0000000000..44fe63fd8f --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600012.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600013.xml b/trunk/dist/game/data/multisell/custom/600013.xml new file mode 100644 index 0000000000..3d229b2bc4 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600013.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600014.xml b/trunk/dist/game/data/multisell/custom/600014.xml new file mode 100644 index 0000000000..e34b142393 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600014.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600015.xml b/trunk/dist/game/data/multisell/custom/600015.xml new file mode 100644 index 0000000000..3a21839d4a --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600015.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600016.xml b/trunk/dist/game/data/multisell/custom/600016.xml new file mode 100644 index 0000000000..95d2436a08 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600016.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600017.xml b/trunk/dist/game/data/multisell/custom/600017.xml new file mode 100644 index 0000000000..1753e4886c --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600017.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600018.xml b/trunk/dist/game/data/multisell/custom/600018.xml new file mode 100644 index 0000000000..e4b8723a78 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600018.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600019.xml b/trunk/dist/game/data/multisell/custom/600019.xml new file mode 100644 index 0000000000..f589edf475 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600019.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600020.xml b/trunk/dist/game/data/multisell/custom/600020.xml new file mode 100644 index 0000000000..3bb715753f --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600020.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600021.xml b/trunk/dist/game/data/multisell/custom/600021.xml new file mode 100644 index 0000000000..26b598f5d8 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600021.xml @@ -0,0 +1,283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600022.xml b/trunk/dist/game/data/multisell/custom/600022.xml new file mode 100644 index 0000000000..af38f7e7af --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600022.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600023.xml b/trunk/dist/game/data/multisell/custom/600023.xml new file mode 100644 index 0000000000..06e36ea1ee --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600023.xml @@ -0,0 +1,679 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600024.xml b/trunk/dist/game/data/multisell/custom/600024.xml new file mode 100644 index 0000000000..978fd686b9 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600024.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600025.xml b/trunk/dist/game/data/multisell/custom/600025.xml new file mode 100644 index 0000000000..4dc83089d3 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600025.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600026.xml b/trunk/dist/game/data/multisell/custom/600026.xml new file mode 100644 index 0000000000..51d267f540 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600026.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/custom/600027.xml b/trunk/dist/game/data/multisell/custom/600027.xml new file mode 100644 index 0000000000..5f60131275 --- /dev/null +++ b/trunk/dist/game/data/multisell/custom/600027.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/trunk/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index fa190b4696..d7e2e0da28 100644 --- a/trunk/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/trunk/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -26,11 +26,14 @@ import com.l2jserver.Config; import com.l2jserver.L2DatabaseFactory; import com.l2jserver.gameserver.cache.HtmCache; import com.l2jserver.gameserver.data.sql.impl.ClanTable; +import com.l2jserver.gameserver.data.xml.impl.BuyListData; import com.l2jserver.gameserver.data.xml.impl.MultisellData; import com.l2jserver.gameserver.datatables.SkillData; import com.l2jserver.gameserver.handler.CommunityBoardHandler; import com.l2jserver.gameserver.handler.IParseBoardHandler; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; +import com.l2jserver.gameserver.network.serverpackets.BuyList; +import com.l2jserver.gameserver.network.serverpackets.ExBuySellList; /** * Home board. @@ -46,6 +49,7 @@ public final class HomeBoard implements IParseBoardHandler "_bbshome", "_bbstop", "_bbsmultisell", + "_bbssell", "_bbsteleport", "_bbsbuff" }; @@ -86,9 +90,17 @@ public final class HomeBoard implements IParseBoardHandler final String[] buypassOptions = fullBypass.split(","); final int multisellId = Integer.parseInt(buypassOptions[0]); final String page = buypassOptions[1]; - MultisellData.getInstance().separateAndSend(multisellId, activeChar, null, false); final String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/Custom/" + page + ".html"); CommunityBoardHandler.separateAndSend(html, activeChar); + MultisellData.getInstance().separateAndSend(multisellId, activeChar, null, false); + } + else if (Config.CUSTOM_CB_ENABLED && Config.COMMUNITYBOARD_ENABLE_MULTISELLS && command.startsWith("_bbssell")) + { + final String page = command.replace("_bbssell;", ""); + final String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/Custom/" + page + ".html"); + CommunityBoardHandler.separateAndSend(html, activeChar); + activeChar.sendPacket(new BuyList(BuyListData.getInstance().getBuyList(423), activeChar.getAdena(), 0)); + activeChar.sendPacket(new ExBuySellList(activeChar, false)); } else if (Config.CUSTOM_CB_ENABLED && Config.COMMUNITYBOARD_ENABLE_TELEPORTS && command.startsWith("_bbsteleport")) {