Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ### Eclipse Workspace Patch 1.0
- #P L2jfreecore_trunk
- Index: src/main/java/com/l2jfree/Config.java
- ===================================================================
- --- src/main/java/com/l2jfree/Config.java (revision 4957)
- +++ src/main/java/com/l2jfree/Config.java (working copy)
- @@ -986,6 +986,7 @@
- public static boolean DEVELOPER; // Enable/disable DEVELOPER TREATMENT
- public static boolean TEST_KNOWNLIST = false; // Internal properties for developers tests only
- public static boolean ALLOW_WEDDING;
- + public static boolean ALLOW_MAMMON_VOICE;
- public static boolean SERVER_LIST_BRACKET; // Displays [] in front of server name ?
- public static boolean SERVER_LIST_CLOCK; // Displays a clock next to the server name ?
- public static boolean SERVER_LIST_TESTSERVER; // Display test server in the list of servers ?
- @@ -1180,6 +1181,7 @@
- ALLOW_PET_WALKERS = Boolean.parseBoolean(optionsSettings.getProperty("AllowPetWalkers", "False"));
- ALLOW_CURSED_WEAPONS = Boolean.parseBoolean(optionsSettings.getProperty("AllowCursedWeapons", "False"));
- ALLOW_WEDDING = Boolean.parseBoolean(optionsSettings.getProperty("AllowWedding", "False"));
- + ALLOW_MAMMON_VOICE = Boolean.parseBoolean(optionsSettings.getProperty("AllowMammonVoice", "False"));
- ALLOW_GUARDS = Boolean.parseBoolean(optionsSettings.getProperty("AllowGuards", "False"));
- DEFAULT_GLOBAL_CHAT = ChatMode.valueOf(optionsSettings.getProperty("GlobalChat", "REGION").toUpperCase());
- Index: src/main/java/com/l2jfree/gameserver/handler/VoicedCommandHandler.java
- ===================================================================
- --- src/main/java/com/l2jfree/gameserver/handler/VoicedCommandHandler.java (revision 4861)
- +++ src/main/java/com/l2jfree/gameserver/handler/VoicedCommandHandler.java (working copy)
- @@ -48,6 +48,10 @@
- registerVoicedCommandHandler(new CastleDoors());
- registerVoicedCommandHandler(new Hellbound());
- registerVoicedCommandHandler(new VersionInfo());
- + if (Config.ALLOW_MAMMON_VOICE)
- + {
- + registerVoicedCommandHandler(new Mammon());
- + }
- if (Config.ALLOW_WEDDING)
- {
- registerVoicedCommandHandler(new Wedding());
- Index: src/main/java/com/l2jfree/gameserver/handler/voicedcommandhandlers/Mammon.java
- ===================================================================
- --- src/main/java/com/l2jfree/gameserver/handler/voicedcommandhandlers/Mammon.java (revision 0)
- +++ src/main/java/com/l2jfree/gameserver/handler/voicedcommandhandlers/Mammon.java (revision 0)
- @@ -0,0 +1,107 @@
- +/*
- + * 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 com.l2jfree.gameserver.handler.voicedcommandhandlers;
- +
- +import com.l2jfree.gameserver.SevenSigns;
- +import com.l2jfree.gameserver.datatables.SpawnTable;
- +import com.l2jfree.gameserver.handler.IVoicedCommandHandler;
- +import com.l2jfree.gameserver.instancemanager.TownManager;
- +import com.l2jfree.gameserver.model.actor.instance.L2PcInstance;
- +import com.l2jfree.gameserver.model.entity.Town;
- +import com.l2jfree.gameserver.model.L2Spawn;
- +
- +
- +/*
- + * @author EverDreaM,Ph@t3
- + */
- +
- +public class Mammon implements IVoicedCommandHandler
- +{
- + private static String[] _voicedCommands = { "mammon", "mmammon", "bmammon" };
- + private String mnearestTown, bnearestTown;
- + private SpawnTable s = SpawnTable.getInstance();
- +
- + public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
- + {
- + if(command.startsWith("mammon"))
- + return MammonInfo(activeChar);
- + else if(command.startsWith("mmammon"))
- + return MMammonInfo(activeChar);
- + else if(command.startsWith("bmammon"))
- + return BMammonInfo(activeChar);
- + return false;
- + }
- +
- + public boolean initMammon(L2PcInstance activeChar)
- + {
- + if (!SevenSigns.getInstance().isSealValidationPeriod())
- + {
- + activeChar.sendMessage("The competition period is currently in effect.");
- + return false;
- + }
- + else
- + {
- + mnearestTown = findNPCLocTown(SevenSigns.MAMMON_MERCHANT_ID);
- + bnearestTown = findNPCLocTown(SevenSigns.MAMMON_BLACKSMITH_ID);
- + return true;
- + }
- + }
- +
- + public String findNPCLocTown(int npcId)
- + {
- + String nearestTown = "";
- + for (L2Spawn spawn : s.getSpawnTable().values())
- + if (npcId == spawn.getNpcid()) {
- + Town town = TownManager.getInstance().getClosestTown(spawn.getLocx(), spawn.getLocy(), spawn.getLocz());
- + if (town != null)
- + nearestTown = TownManager.getInstance().getTownName(town.getTownId());
- + else
- + nearestTown = "None";
- + }
- + return nearestTown;
- +
- + }
- +
- + public boolean MammonInfo(L2PcInstance activeChar)
- + {
- + if (initMammon(activeChar))
- + {
- + activeChar.sendMessage("The Merchant of Mammon is near " + mnearestTown);
- + activeChar.sendMessage("The Blacksmith of Mammon is near " + bnearestTown);
- + }
- + return true;
- + }
- + public boolean MMammonInfo(L2PcInstance activeChar)
- + {
- + if (initMammon(activeChar))
- + {
- + activeChar.sendMessage("The Merchant of Mammon is near " + mnearestTown);
- + }
- + return true;
- + }
- + public boolean BMammonInfo(L2PcInstance activeChar)
- + {
- + if (initMammon(activeChar))
- + {
- + activeChar.sendMessage("The Blacksmith of Mammon is near " + bnearestTown);
- + }
- + return true;
- + }
- +
- + public String[] getVoicedCommandList()
- + {
- + return _voicedCommands;
- + }
- +}
- Index: config/options.properties
- ===================================================================
- --- config/options.properties (revision 4957)
- +++ config/options.properties (working copy)
- @@ -330,4 +330,7 @@
- EnableJythonShell = False
- # Interval in ms to check for deadlocks, 0 to disable
- -DeadLockCheck = 10000
- \ No newline at end of file
- +DeadLockCheck = 10000
- +
- +#Allow Voice Command Handler for Mammons spawn location
- +AllowMammonVoice = False
- \ No newline at end of file
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement