Various community board merchant improvements.

This commit is contained in:
MobiusDev
2015-05-07 20:43:24 +00:00
parent 998fca3057
commit 74bb130dd0
41 changed files with 134 additions and 27 deletions

View File

@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/multisell.xsd">
<npcs>
<npc>-1</npc> <!-- CB -->
</npcs>
<item>
<ingredient id="57" count="5000"/>
<production id="886" count="2"/>

View File

@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/multisell.xsd">
<npcs>
<npc>-1</npc> <!-- CB -->
</npcs>
<item>
<ingredient id="57" count="500"/>
<production id="736" count="1"/>

View File

@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/multisell.xsd">
<npcs>
<npc>-1</npc> <!-- CB -->
</npcs>
<item>
<ingredient id="57" count="1336100"/> <!-- Adena -->
<production id="78" count="1" chance="100"/> <!-- Great Sword -->

View File

@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/multisell.xsd">
<npcs>
<npc>-1</npc> <!-- CB -->
</npcs>
<item>
<ingredient id="57" count="319200"/> <!-- Adena -->
<production id="357" count="1" chance="100"/> <!-- Zubei's Breastplate -->

View File

@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/multisell.xsd">
<npcs>
<npc>-1</npc> <!-- CB -->
</npcs>
<item>
<ingredient id="57" count="10000000"/>
<production id="1419" count="1"/>

View File

@@ -65,6 +65,12 @@ public final class HomeBoard implements IParseBoardHandler
@Override
public boolean parseCommunityBoardCommand(String command, L2PcInstance activeChar)
{
if (Config.CUSTOM_CB_ENABLED && Config.COMMUNITYBOARD_COMBAT_DISABLED && activeChar.isInCombat())
{
activeChar.sendMessage("You can't use the Community Board right now.");
return false;
}
if (command.equals("_bbshome") || command.equals("_bbstop"))
{
final String customPath = Config.CUSTOM_CB_ENABLED ? "Custom/" : "";
@@ -95,6 +101,7 @@ public final class HomeBoard implements IParseBoardHandler
final String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/CommunityBoard/Custom/" + page + ".html");
CommunityBoardHandler.separateAndSend(html, activeChar);
MultisellData.getInstance().separateAndSend(multisellId, activeChar, null, false);
return true;
}
else if (Config.CUSTOM_CB_ENABLED && Config.COMMUNITYBOARD_ENABLE_MULTISELLS && command.startsWith("_bbssell"))
{
@@ -103,6 +110,7 @@ public final class HomeBoard implements IParseBoardHandler
CommunityBoardHandler.separateAndSend(html, activeChar);
activeChar.sendPacket(new BuyList(BuyListData.getInstance().getBuyList(423), activeChar.getAdena(), 0));
activeChar.sendPacket(new ExBuySellList(activeChar, false));
return true;
}
else if (Config.CUSTOM_CB_ENABLED && Config.COMMUNITYBOARD_ENABLE_TELEPORTS && command.startsWith("_bbsteleport"))
{
@@ -150,7 +158,7 @@ public final class HomeBoard implements IParseBoardHandler
final String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/CommunityBoard/Custom/" + page + ".html");
CommunityBoardHandler.separateAndSend(html, activeChar);
}
return true;
return false;
}
/**

View File

@@ -8,10 +8,7 @@
<xs:sequence minOccurs="1" maxOccurs="1">
<xs:element name="npc" minOccurs="1" maxOccurs="unbounded">
<xs:simpleType>
<xs:restriction base="xs:positiveInteger">
<xs:minInclusive value="1" />
<xs:maxInclusive value="65535" />
</xs:restriction>
<xs:restriction base="xs:integer" />
</xs:simpleType>
</xs:element>
</xs:sequence>