Pvp/Pk

### Eclipse Workspace Patch 1.0
#P L2jFrozen_GameServer
Index: head-src/com/l2jfrozen/gameserver/model/actor/instance/L2PcInstance.java
===================================================================
--- head-src/com/l2jfrozen/gameserver/model/actor/instance/L2PcInstance.java	(revision 1118)
+++ head-src/com/l2jfrozen/gameserver/model/actor/instance/L2PcInstance.java	(working copy)
@@ -7603,6 +7603,27 @@
 					}
 				}
 			}
+
+			if (Config.ANNOUNCE_PK_PVP && pk != null && !pk.isGM())
+			{
+				String msg = "";
+				if (getPvpFlag() == 0)
+				{
+					msg = Config.ANNOUNCE_PK_MSG.replace("$killer", pk.getName()).replace("$target", getName());
+					if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
+						Announcements.getInstance().announceToAll(SystemMessage.getSystemMessage(SystemMessageId.S1).addString(msg));
+					else
+						Announcements.getInstance().announceToAll(msg);
+				}
+				else if (getPvpFlag() != 0)
+				{
+					msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", pk.getName()).replace("$target", getName());
+					if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
+						Announcements.getInstance().announceToAll(SystemMessage.getSystemMessage(SystemMessageId.S1).addString(msg));
+					else
+						Announcements.getInstance().announceToAll(msg);
+				}
+			}
 		}

 		// Unsummon Cubics
Index: head-src/com/l2jfrozen/Config.java
===================================================================
--- head-src/com/l2jfrozen/Config.java	(revision 1118)
+++ head-src/com/l2jfrozen/Config.java	(working copy)
@@ -2170,6 +2170,11 @@
 	public static String PM_TEXT2;
 	public static boolean NEW_PLAYER_EFFECT;

+	public static boolean ANNOUNCE_PK_PVP;
+	public static boolean ANNOUNCE_PK_PVP_NORMAL_MESSAGE;
+	public static String ANNOUNCE_PK_MSG;
+	public static String ANNOUNCE_PVP_MSG;
+
 	// ============================================================
 	public static void loadFrozenConfig()
 	{
@@ -2191,6 +2196,11 @@
 			PM_TEXT2 = frozenSettings.getProperty("PMText2", "Vote for us every 24h");
 			NEW_PLAYER_EFFECT = Boolean.parseBoolean(frozenSettings.getProperty("NewPlayerEffect", "True"));

+			ANNOUNCE_PK_PVP = Boolean.parseBoolean(frozenSettings.getProperty("AnnouncePkPvP", "False"));
+			ANNOUNCE_PK_PVP_NORMAL_MESSAGE = Boolean.parseBoolean(frozenSettings.getProperty("AnnouncePkPvPNormalMessage", "True"));
+			ANNOUNCE_PK_MSG = frozenSettings.getProperty("AnnouncePkMsg", "$killer has slaughtered $target");
+			ANNOUNCE_PVP_MSG = frozenSettings.getProperty("AnnouncePvpMsg", "$killer has defeated $target");
+
 		}
 		catch (final Exception e)
 		{
Index: config/frozen/frozen.properties
===================================================================
--- config/frozen/frozen.properties	(revision 1118)
+++ config/frozen/frozen.properties	(working copy)
@@ -22,4 +22,23 @@

 # New players get fireworks the first time they log in
 # Default: False
-NewPlayerEffect = False
\ No newline at end of file
+NewPlayerEffect = False
+
+#-==========================================================-#
+# Advanced Pvp & Pk Announce System
+#-==========================================================-#
+# Enable/Disable show announce who killed who
+# Default: False
+AnnouncePkPvP = False
+
+# Announce this as normal system message
+# Default: True
+AnnouncePkPvPNormalMessage = True
+
+# Default Pk message template.
+# Configs: $killer, $target
+AnnouncePkMsg = Player $killer has slaughtered $target .
+
+# Default PvP message template.
+# variables: $killer, $target
+AnnouncePvpMsg = Player $killer has defeated $target .
\ No newline at end of file