Code
Index: /Trunk/L2J-Mack_IL/Config/PvP.propierties
===================================================================
--- /Trunk/L2J-Mack_IL/Config/PvP.propierties (revision 1156)
+++ /Trunk/L2J-Mack_IL/Config/PvP.propierties (working copy)
@@ -29,3 +29,11 @@
PvPVsNormalTime = 40000
# Length one stays in PvP mode after hitting a purple player (in ms)
PvPVsPvPTime = 20000
+
+# Announces when a Player PK another Player. Default - false
+AnnouncePkKill = False
+# Announces when a Player Pvp another Player. Default - false
+AnnouncePvPKill = False
+# Announces when a Player kill another Player. Default - false
+# NOTE: If AnnounceKill is enabled, AnnouncePk and AnnouncePvP will be disabled.
+AnnounceAllKill = False
Index: /Trunk/L2J-Mack_IL/L2J-Mack_GameServer/java/com/l2dot/Config.java
===================================================================
--- /Trunk/L2J-Mack_IL/L2J-Mack_GameServer/java/com/l2dot/Config.java (revision 1156)
+++ /Trunk/L2J-Mack_IL/L2J-Mack_GameServer/java/com/l2dot/Config.java (working copy)
@@ -777,7 +777,13 @@
public static int PVP_NORMAL_TIME;
- public static int PVP_PVP_TIME;
+ public static int PVP_PVP_TIME;
+ public static boolean ANNOUNCE_PVP_KILL;
+ public static boolean ANNOUNCE_PK_KILL;
+ public static boolean ANNOUNCE_ALL_KILL;
// Karma Punishment
/** Allow player with karma to be killed in peace zone ? */
@@ -1926,6 +1932,18 @@
PVP_NORMAL_TIME = Integer.parseInt(pvpSettings.getProperty("PvPVsNormalTime", "15000"));
PVP_PVP_TIME = Integer.parseInt(pvpSettings.getProperty("PvPVsPvPTime", "30000"));
+ ANNOUNCE_ALL_KILL = Boolean.parseBoolean(pvpSettings.getProperty("AnnounceAllKill", "False")); // Get the AnnounceAllKill, AnnouncePvpKill and AnnouncePkKill values
+ if ( !ANNOUNCE_ALL_KILL )
+ {
+ ANNOUNCE_PVP_KILL = Boolean.parseBoolean(pvpSettings.getProperty("AnnouncePvPKill", "False"));
+ ANNOUNCE_PK_KILL = Boolean.parseBoolean(pvpSettings.getProperty("AnnouncePkKill", "False"));
+ }
+ else
+ {
+ ANNOUNCE_PVP_KILL = false;
+ ANNOUNCE_PK_KILL = false;
+ }
+
}
catch (Exception e)
{
@@ -2323,6 +2341,9 @@
else if (pName.equalsIgnoreCase("PvPVsNormalTime")) PVP_NORMAL_TIME = Integer.parseInt(pValue);
else if (pName.equalsIgnoreCase("PvPVsPvPTime")) PVP_PVP_TIME = Integer.parseInt(pValue);
+ else if (pName.equalsIgnoreCase("AnnouncePvPKill") && !ANNOUNCE_ALL_KILL ) ANNOUNCE_PVP_KILL = Boolean.valueOf(pValue); // Set announce Pvp value
+ else if (pName.equalsIgnoreCase("AnnouncePkKill") && !ANNOUNCE_ALL_KILL ) ANNOUNCE_PK_KILL = Boolean.valueOf(pValue); // Set announce Pk value
+ else if (pName.equalsIgnoreCase("AnnounceAllKill") && !ANNOUNCE_PVP_KILL && !ANNOUNCE_PK_KILL ) ANNOUNCE_ALL_KILL = Boolean.valueOf(pValue); // Set announce kill value
else if (pName.equalsIgnoreCase("GlobalChat")) DEFAULT_GLOBAL_CHAT = pValue;
else if (pName.equalsIgnoreCase("TradeChat")) DEFAULT_TRADE_CHAT = pValue;
else if (pName.equalsIgnoreCase("MenuStyle")) GM_ADMIN_MENU_STYLE = pValue;
Index: /Trunk/L2J-Mack_IL/L2J-Mack_GameServer/java/com/l2dot/gameserver/Announcements.java
===================================================================
--- /trunk/L2J-Mack_IL/L2J-Mack_GameServer/java/com/l2dot/gameserver/Announcements.java (revision 5)
+++ /trunk/L2J-Mack_IL/L2J-Mack_GameServer/java/com/l2dot/gameserver/Announcements.java (revision 69)
@@ -240,3 +240,11 @@
}
}
+
+ public void announceToPlayers(String message)
+ {
+ // Get all players
+ for (L2PcInstance player : L2World.getInstance().getAllPlayers()) {
+ player.sendMessage(message);
+ }
+ }
}
Index: /Trunk/L2J-Mack_IL/L2J-Mack_GameServer/java/com/l2dot/gameserver/model/actor/instance/
L2PcInstance.java