Updated messages according to client.

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/CemeteryMonsters.java

@@ -61,11 +61,11 @@ public class CemeteryMonsters extends AbstractNpcAI
 		NpcStringId.DO_NOT_DEFILE_THIS_PLACE_WITH_YOUR_PRESENCE,
 		NpcStringId.HEH_INTERESTING_TRICK_YOU_USE_THERE,
 		NpcStringId.I_WILL_REMEMBER_YOU,
-		NpcStringId.I_WON_T_BEG_FOR_MY_LIFE_DO_WHAT_YOU_WILL,
+		NpcStringId.I_WILL_NOT_LOSE,
 		NpcStringId.BEHOLD_MY_POWER,
 		NpcStringId.HIS_MAJESTY_TRAVIS_HAS_ORDERED_IMMEDIATE_EXECUTION,
-		NpcStringId.ARE_YOU_TRYING_TO_MAKE_ME_DIE_A_SECOND_DEATH,
+		NpcStringId.HOW_DARE_YOU_TRY_TO_HARM_ME_WITH_YOUR_EVIL_SCHEMES_2,
-		NpcStringId.WHAT_FOOLISHNESS,
+		NpcStringId.YOU_IDIOT_2,
 		NpcStringId.FOOL,
 		NpcStringId.REMEMBER_OUR_HISTORY_OUR_GLORIOUS_HISTORY,
 		NpcStringId.WHO_ARE_YOU_YOU_WEREN_T_HERE_BEFORE,

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java

@@ -69,7 +69,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	@Override
 	public String onKill(Npc npc, PlayerInstance player, boolean isSummon)
 	{
-		final NpcStringId msg = getRandomBoolean() ? NpcStringId.UGH_A_CURSE_UPON_YOU : NpcStringId.I_REALLY_DIDN_T_WANT_TO_FIGHT;
+		final NpcStringId msg = getRandomBoolean() ? NpcStringId.A_CURSE_UPON_YOU_2 : NpcStringId.I_REALLY_DIDN_T_WANT_TO_FIGHT;
 		npc.broadcastSay(ChatType.NPC_GENERAL, msg);
 		cancelQuestTimer("say", npc, null);
 		cancelQuestTimer("reward", npc, player);

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java

@@ -93,7 +93,7 @@ public class Rooney extends AbstractNpcAI
 			{
 				case 1:
 				{
-					npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HURRY_HURRY);
+					npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HURRY);
 					break;
 				}
 				case 2:

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java

@@ -126,7 +126,7 @@ public class Theorn extends AbstractNpcAI
 				if ((player != null) && !player.isDead() && (player.getEffectList().getBuffInfoBySkillId(REWARD_BUFF_X2) != null))
 				{
 					addExpAndSp(player, 0, 1000000);
-					showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X_2, ExShowScreenMessage.TOP_CENTER, 5000);
+					showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X2, ExShowScreenMessage.TOP_CENTER, 5000);
 					player.getEffectList().stopEffects(AbnormalType.STAR_AGATHION_EXP_SP_BUFF1);
 				}
 				break;
@@ -136,7 +136,7 @@ public class Theorn extends AbstractNpcAI
 				if ((player != null) && !player.isDead() && (player.getEffectList().getBuffInfoBySkillId(REWARD_BUFF_X4) != null))
 				{
 					addExpAndSp(player, 0, 2000000);
-					showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X_4, ExShowScreenMessage.TOP_CENTER, 5000);
+					showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X4, ExShowScreenMessage.TOP_CENTER, 5000);
 					player.getEffectList().stopEffects(AbnormalType.STAR_AGATHION_EXP_SP_BUFF1);
 				}
 				break;
@@ -146,7 +146,7 @@ public class Theorn extends AbstractNpcAI
 				if ((player != null) && !player.isDead() && (player.getEffectList().getBuffInfoBySkillId(REWARD_BUFF_X8) != null))
 				{
 					addExpAndSp(player, 0, 4000000);
-					showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X_8, ExShowScreenMessage.TOP_CENTER, 5000);
+					showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X8, ExShowScreenMessage.TOP_CENTER, 5000);
 					player.getEffectList().stopEffects(AbnormalType.STAR_AGATHION_EXP_SP_BUFF1);
 				}
 				break;
@@ -156,7 +156,7 @@ public class Theorn extends AbstractNpcAI
 				if ((player != null) && !player.isDead() && (player.getEffectList().getBuffInfoBySkillId(REWARD_BUFF_X16) != null))
 				{
 					addExpAndSp(player, 0, 8000000);
-					showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X_16, ExShowScreenMessage.TOP_CENTER, 5000);
+					showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X16, ExShowScreenMessage.TOP_CENTER, 5000);
 					player.getEffectList().stopEffects(AbnormalType.STAR_AGATHION_EXP_SP_BUFF1);
 				}
 				break;

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java

@@ -71,7 +71,7 @@ public class BloodySuccubus extends AbstractNpcAI
 	{
 		NpcStringId.FOR_THE_GODDESS,
 		NpcStringId.YOU_WILL_DIE,
-		NpcStringId.DIE_2,
+		NpcStringId.DIE,
 		NpcStringId.YOU_WILL_BE_DESTROYED,
 		NpcStringId.OOOOH,
 		NpcStringId.DO_NOT_INTERFERE

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java

@@ -475,7 +475,7 @@ public class PrimevalIsle extends AbstractNpcAI
 			}
 			else
 			{
-				showOnScreenMsg(player, NpcStringId.THE_DEINONYCHUS_MESOZOIC_STONE_CANNOT_BE_OBTAINED_WHEN_INVENTORY_WEIGHT_VOLUME_IS_AT_80_OR_MORE, 2, 6000);
+				showOnScreenMsg(player, NpcStringId.WHEN_INVENTORY_WEIGHT_NUMBER_ARE_MORE_THAN_80_THE_LIFE_STONE_FROM_THE_BEGINNING_CANNOT_BE_ACQUIRED, 2, 6000);
 			}
 		}
 		return super.onKill(npc, killer, isSummon);

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java

@@ -247,7 +247,7 @@ public class AwakeningMaster extends AbstractNpcAI
 		
 		if (!player.isInventoryUnder80(false))
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_AWAKEN_DUE_TO_YOUR_CURRENT_INVENTORY_WEIGHT_PLEASE_REDUCE_YOUR_INVENTORY_WEIGHT_AND_TRY_AGAIN_DWARVES_MUST_BE_AT_20_OR_BELOW_THE_WEIGHT_MAX_TO_AWAKEN);
+			player.sendPacket(SystemMessageId.YOU_CANNOT_AWAKEN_DUE_TO_YOUR_CURRENT_INVENTORY_WEIGHT_PLEASE_ORGANIZE_YOUR_INVENTORY_AND_TRY_AGAIN_DWARVEN_CHARACTERS_MUST_BE_AT_20_OR_BELOW_THE_INVENTORY_MAX_TO_AWAKEN);
 			return;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java

@@ -63,7 +63,7 @@ public class BoyAndGirl extends AbstractNpcAI
 		}
 		else if (event.equals("NPC_SHOUT"))
 		{
-			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WEEE : NpcStringId.BOYS_ARE_SO_ANNOYING);
+			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WOW_2 : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
 		return super.onAdvEvent(event, npc, player);

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -506,7 +506,7 @@ public class Raina extends AbstractNpcAI
 				
 				player.setActiveClass(player.getTotalSubClasses());
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.NEW_SLOT_USED));
-				player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
+				player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
 				player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 				break;
 			}
@@ -571,7 +571,7 @@ public class Raina extends AbstractNpcAI
 					player.setActiveClass(classIndex);
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
-					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
+					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
 				}
 				break;
 			}
@@ -648,7 +648,7 @@ public class Raina extends AbstractNpcAI
 				{
 					player.setActiveClass(player.getTotalSubClasses());
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.NEW_SLOT_USED));
-					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
+					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreesData.getInstance().cleanSkillUponAwakening(player);
 					player.sendPacket(new AcquireSkillList(player));

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java

@@ -274,7 +274,7 @@ public class Baium extends AbstractNpcAI
 				{
 					if (players.isHero())
 					{
-						zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.YOU_DARE_CHALLENGE_ME_AND_MY_DARK_POWERS_S1_HOW_FOOLISH, 2, 4000, players.getName()));
+						zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.NOT_EVEN_THE_GODS_THEMSELVES_COULD_TOUCH_ME_BUT_YOU_S1_YOU_DARE_CHALLENGE_ME_IGNORANT_MORTAL, 2, 4000, players.getName()));
 						break;
 					}
 				}

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java

@@ -96,10 +96,10 @@ public class Fafurion extends AbstractNpcAI
 			{
 				if (player.calculateDistance2D(FAFURION_SPAWN_LOC) < 5000)
 				{
-					player.sendPacket(new ExShowScreenMessage(NpcStringId.ALL_WHO_FEAR_FAFURION_LEAVE_THIS_PLACE_AT_ONCE, ExShowScreenMessage.TOP_CENTER, 10000, true));
+					player.sendPacket(new ExShowScreenMessage(NpcStringId.ALL_WHO_FEAR_OF_FAFURION_LEAVE_THIS_PLACE_AT_ONCE, ExShowScreenMessage.TOP_CENTER, 10000, true));
 					for (PlayerInstance plr : World.getInstance().getVisibleObjectsInRange(player, PlayerInstance.class, 5000))
 					{
-						plr.sendPacket(new ExShowScreenMessage(NpcStringId.ALL_WHO_FEAR_FAFURION_LEAVE_THIS_PLACE_AT_ONCE, ExShowScreenMessage.TOP_CENTER, 10000, true));
+						plr.sendPacket(new ExShowScreenMessage(NpcStringId.ALL_WHO_FEAR_OF_FAFURION_LEAVE_THIS_PLACE_AT_ONCE, ExShowScreenMessage.TOP_CENTER, 10000, true));
 					}
 				}
 				break;

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java

@@ -130,9 +130,9 @@ public class LastImperialTomb extends AbstractInstance
 	static
 	{
 		SKILL_MSG.put(1, NpcStringId.REQUIEM_OF_HATRED);
-		SKILL_MSG.put(2, NpcStringId.RONDO_OF_LONELINESS);
+		SKILL_MSG.put(2, NpcStringId.RONDO_OF_SOLITUDE);
-		SKILL_MSG.put(3, NpcStringId.GALLOPING_TOCCATA);
+		SKILL_MSG.put(3, NpcStringId.FRENETIC_TOCCATA);
-		SKILL_MSG.put(4, NpcStringId.FUGUE_OF_RAPTURE);
+		SKILL_MSG.put(4, NpcStringId.FUGUE_OF_JUBILATION);
 		SKILL_MSG.put(5, NpcStringId.HYPNOTIC_MAZURKA);
 	}
 	// Spawns

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java

@@ -1231,7 +1231,7 @@ public class CastleChamberlain extends AbstractNpcAI
 				{
 					if (manor.isManorApproved())
 					{
-						player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_4_30_AM_AND_8_PM);
+						player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_6_00_AM_AND_8_00_PM);
 						return;
 					}
 					player.sendPacket(new ExShowSeedSetting(castleId));
@@ -1241,7 +1241,7 @@ public class CastleChamberlain extends AbstractNpcAI
 				{
 					if (manor.isManorApproved())
 					{
-						player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_4_30_AM_AND_8_PM);
+						player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_6_00_AM_AND_8_00_PM);
 						return;
 					}
 					player.sendPacket(new ExShowCropSetting(castleId));

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java

@@ -337,7 +337,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			final ClanHall playerClanHall = ClanHallData.getInstance().getClanHallByClan(clan);
 			if (playerClanHall != null)
 			{
-				player.sendPacket(SystemMessageId.YOU_ALREADY_HAVE_A_CLAN_HALL_SO_YOU_CANNOT_BID);
+				player.sendPacket(SystemMessageId.YOU_ALREADY_HAVE_A_CLAN_HALL_SO_YOU_CANNOT_BET);
 				return;
 			}
 			

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java

@@ -75,7 +75,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI
 		{
 			NpcStringId.PREPARE_TO_DIE,
 			NpcStringId.I_LL_DOUBLE_MY_STRENGTH,
-			NpcStringId.YOU_HAVE_MORE_SKILL_THAN_I_THOUGHT
+			NpcStringId.IT_S_STRONGER_THAN_EXPECTED_2
 		}
 	};
 	

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java

@@ -80,7 +80,7 @@ public class HappyHours extends LongTimeEvent
 					{
 						_lastRewardTime = System.currentTimeMillis();
 						final ExShowScreenMessage screenMsg = new ExShowScreenMessage("You obtained 20 Sibi's coins.", ExShowScreenMessage.TOP_CENTER, 7000, 0, true, true);
-						final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_SIBI_S_COINS);
+						final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_VE_OBTAINED_S1_LUCKY_COINS);
 						systemMsg.addInt(20);
 						for (PlayerInstance plr : World.getInstance().getPlayers())
 						{

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java

@@ -120,7 +120,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 				final int minutes = ((int) remainingTime % 3600) / 60;
 				if (hours > 0)
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.THERE_ARE_S1_HR_AND_S2_MIN_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.THERE_ARE_S1_HOUR_S_AND_S2_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 					player.sendPacket(sm);
@@ -128,7 +128,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 				}
 				else if (minutes > 0)
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.THERE_ARE_S1_MIN_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.THERE_ARE_S1_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
 					sm.addInt(minutes);
 					player.sendPacket(sm);
 					htmltext = "32599-scroll24.htm";

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java

@@ -76,7 +76,7 @@ public class ChatWorld implements IChatHandler
 		}
 		else if (activeChar.getWorldChatUsed() >= activeChar.getWorldChatPoints())
 		{
-			activeChar.sendPacket(SystemMessageId.YOU_HAVE_SPENT_YOUR_WORLD_CHAT_QUOTA_FOR_THE_DAY_THE_WORLD_CHAT_QUOTA_RESETS_AT_7_AM_EVERY_DAY);
+			activeChar.sendPacket(SystemMessageId.YOU_HAVE_SPENT_YOUR_WORLD_CHAT_QUOTA_FOR_THE_DAY_A_NEW_DAY_STARTS_EVERY_DAY_AT_18_30);
 		}
 		else
 		{

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java

@@ -153,7 +153,7 @@ public class ConvertItem extends AbstractEffect
 		}
 		else
 		{
-			msg = new SystemMessage(SystemMessageId.EQUIPPED_S1);
+			msg = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
 			msg.addItemName(newItem);
 		}
 		player.sendPacket(msg);

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java

@@ -129,7 +129,7 @@ public class Disarmor extends AbstractEffect
 					}
 					else
 					{
-						sm = new SystemMessage(SystemMessageId.EQUIPPED_S1);
+						sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
 						sm.addItemName(item);
 					}
 					player.sendPacket(sm);

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java

@@ -90,7 +90,7 @@ public class Harvesting extends AbstractEffect
 					{
 						if (item.getCount() == 1)
 						{
-							sm = new SystemMessage(SystemMessageId.C1_HARVESTED_S2);
+							sm = new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_2);
 							sm.addString(player.getName());
 							sm.addItemName(harvestedItem.getId());
 						}

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java

@@ -166,7 +166,7 @@ public class RestorationRandom extends AbstractEffect
 		}
 		else if (item.getEnchantLevel() > 0)
 		{
-			sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2);
+			sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2);
 			sm.addInt(item.getEnchantLevel());
 			sm.addItemName(item);
 		}

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java

@@ -49,7 +49,7 @@ public class BeastSoulShot implements IItemHandler
 		final PlayerInstance activeOwner = playable.getActingPlayer();
 		if (!activeOwner.hasSummon())
 		{
-			activeOwner.sendPacket(SystemMessageId.PETS_AND_SERVITORS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
+			activeOwner.sendPacket(SystemMessageId.SERVITORS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
 			return false;
 		}
 		
@@ -99,7 +99,7 @@ public class BeastSoulShot implements IItemHandler
 			// Not enough Soulshots to use.
 			if (!activeOwner.disableAutoShot(itemId))
 			{
-				activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
+				activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_SERVITOR);
 			}
 			return false;
 		}
@@ -109,7 +109,7 @@ public class BeastSoulShot implements IItemHandler
 		{
 			if (!activeOwner.disableAutoShot(itemId))
 			{
-				activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
+				activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_SERVITOR);
 			}
 			return false;
 		}

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java

@@ -49,7 +49,7 @@ public class BeastSpiritShot implements IItemHandler
 		final PlayerInstance activeOwner = playable.getActingPlayer();
 		if (!activeOwner.hasSummon())
 		{
-			activeOwner.sendPacket(SystemMessageId.PETS_AND_SERVITORS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
+			activeOwner.sendPacket(SystemMessageId.SERVITORS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
 			return false;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java

@@ -60,7 +60,7 @@ public class ExtractableItems implements IItemHandler
 		
 		if (!player.isInventoryUnder80(false))
 		{
-			player.sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);
+			player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_ITEM_OWNERSHIP_LIMIT_AND_YOU_CANNOT_TAKE_THE_ITEM_CHECK_ITEM_OWNERSHIP_TIME_LIMITS_FOR_THE_INVENTORY_PLEASE);
 			return false;
 		}
 		
@@ -230,7 +230,7 @@ public class ExtractableItems implements IItemHandler
 		}
 		else if (item.getEnchantLevel() > 0)
 		{
-			sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2);
+			sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2);
 			sm.addInt(item.getEnchantLevel());
 			sm.addItemName(item);
 		}

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java

@@ -59,7 +59,7 @@ public class FatedSupportBox implements IItemHandler
 		
 		if (!player.isInventoryUnder80(false))
 		{
-			player.sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);
+			player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_ITEM_OWNERSHIP_LIMIT_AND_YOU_CANNOT_TAKE_THE_ITEM_CHECK_ITEM_OWNERSHIP_TIME_LIMITS_FOR_THE_INVENTORY_PLEASE);
 			return false;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java

@@ -81,7 +81,7 @@ public class ItemSkillsTemplate implements IItemHandler
 			{
 				if (itemSkill.hasEffectType(EffectType.EXTRACT_ITEM) && (playable.getActingPlayer() != null) && !playable.getActingPlayer().isInventoryUnder80(false))
 				{
-					playable.getActingPlayer().sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);
+					playable.getActingPlayer().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_ITEM_OWNERSHIP_LIMIT_AND_YOU_CANNOT_TAKE_THE_ITEM_CHECK_ITEM_OWNERSHIP_TIME_LIMITS_FOR_THE_INVENTORY_PLEASE);
 					return false;
 				}
 				

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java

@@ -138,7 +138,7 @@ public class PaulinasSupportBox implements IItemHandler
 		
 		if (!player.isInventoryUnder80(false))
 		{
-			player.sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);
+			player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_ITEM_OWNERSHIP_LIMIT_AND_YOU_CANNOT_TAKE_THE_ITEM_CHECK_ITEM_OWNERSHIP_TIME_LIMITS_FOR_THE_INVENTORY_PLEASE);
 			return false;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java

@@ -64,7 +64,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition
 		}
 		else if (player.isInAirShip())
 		{
-			player.sendPacket(SystemMessageId.A_SERVITOR_OR_PET_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
+			player.sendPacket(SystemMessageId.A_SERVITOR_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
 			canSummon = false;
 		}
 		else if ((player.getSummonPoints() + _summonPoints) > player.getMaxSummonPoints())

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java

@@ -71,7 +71,7 @@ public class CanSummonPetSkillCondition implements ISkillCondition
 		}
 		else if (player.isInAirShip())
 		{
-			player.sendPacket(SystemMessageId.A_SERVITOR_OR_PET_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
+			player.sendPacket(SystemMessageId.A_SERVITOR_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
 			canSummon = false;
 		}
 		else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java

@@ -50,7 +50,7 @@ public class CanSummonSkillCondition implements ISkillCondition
 		}
 		else if (player.isInAirShip())
 		{
-			player.sendPacket(SystemMessageId.A_SERVITOR_OR_PET_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
+			player.sendPacket(SystemMessageId.A_SERVITOR_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
 			canSummon = false;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java

@@ -108,7 +108,7 @@ public class ClanWarsList implements IUserCommandHandler
 						else
 						{
 							// Target Without Ally
-							sm = new SystemMessage(SystemMessageId.S1_NO_ALLIANCE_EXISTS);
+							sm = new SystemMessage(SystemMessageId.S1_S2_ALLIANCE_2);
 							sm.addString(clanName);
 						}
 						player.sendPacket(sm);

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/AbstractInstance.java

@@ -112,7 +112,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
 		{
 			if (instance.getTemplateId() != templateId)
 			{
-				player.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON).addString(player.getName()));
+				player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
 				return;
 			}
 			onEnter(player, instance, false);
@@ -146,7 +146,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
 			// Check if maximum world count limit is exceeded
 			if ((template.getMaxWorlds() != -1) && (manager.getWorldCount(templateId) >= template.getMaxWorlds()))
 			{
-				player.sendPacket(SystemMessageId.THE_NUMBER_OF_INSTANT_ZONES_THAT_CAN_BE_CREATED_HAS_BEEN_EXCEEDED_PLEASE_TRY_AGAIN_LATER);
+				player.sendPacket(SystemMessageId.THE_NUMBER_OF_INSTANCE_ZONES_THAT_CAN_BE_CREATED_HAS_BEEN_EXCEEDED_PLEASE_TRY_AGAIN_LATER);
 				return;
 			}
 			
@@ -155,7 +155,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
 			{
 				if (getPlayerInstance(member) != null)
 				{
-					enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON).addString(p.getName())));
+					enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(p.getName())));
 					return;
 				}
 				

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java

@@ -536,7 +536,7 @@ public class DimensionalWrap extends AbstractInstance
 				}
 				case "NEXT_STAGE":
 				{
-					world.broadcastPacket(new ExShowScreenMessage(NpcStringId.S1_SECONDS_HAVE_BEEN_ADDED_TO_THE_INSTANCED_ZONE_DURATION, ExShowScreenMessage.TOP_CENTER, 5000, true, String.valueOf(180)));
+					world.broadcastPacket(new ExShowScreenMessage(NpcStringId.S1_SECONDS_HAVE_BEEN_ADDED_TO_THE_INSTANCE_ZONE_DURATION, ExShowScreenMessage.TOP_CENTER, 5000, true, String.valueOf(180)));
 					world.setDuration((int) ((world.getRemainingTime() / 60000) + 3));
 					startQuestTimer("START_STAGE", 8000, npc, null);
 					for (Npc n : world.getAliveNpcs())

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java

@@ -518,7 +518,7 @@ public class Kamaloka extends AbstractInstance
 			// but not in kamaloka
 			if ((player.getInstanceId() == 0) || (world.getTemplateId() != templateId))
 			{
-				player.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON).addString(player.getName()));
+				player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
 				return;
 			}
 			// check for level difference again on reenter
@@ -836,7 +836,7 @@ public class Kamaloka extends AbstractInstance
 				}
 				reenter.set(Calendar.HOUR_OF_DAY, RESET_HOUR);
 				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE);
+				final SystemMessage sm = new SystemMessage(SystemMessageId.INSTANCE_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE);
 				sm.addInstanceName(world.getTemplateId());
 				
 				// set instance reenter time for all allowed players

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java

@@ -174,7 +174,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI
 				// NPC has low HP Skill and HP is < 50% HP
 				if (!npc.isAffectedBySkill(lowHpSkill.getSkillId()) && (SkillCaster.checkUseConditions(npc, lowHpSkill.getSkill())))
 				{
-					npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.IT_S_NOT_OVER);
+					npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.IT_S_NOT_OVER_YET_2);
 					npc.doCast(lowHpSkill.getSkill());
 				}
 			}
@@ -207,7 +207,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI
 					{
 						if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill()))
 						{
-							npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3);
+							npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3);
 							npc.doCast(skill_02.getSkill(), null, true, false);
 						}
 						break;

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java

@@ -198,7 +198,7 @@ public class KartiaHelperBarton extends AbstractNpcAI
 				{
 					if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill()))
 					{
-						npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3);
+						npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3);
 						npc.doCast(skill_02.getSkill(), null, true, false);
 					}
 					break;

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java

@@ -197,7 +197,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI
 				{
 					if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill()))
 					{
-						npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3);
+						npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3);
 						npc.doCast(skill_02.getSkill(), null, true, false);
 					}
 					break;

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java

@@ -170,14 +170,14 @@ public class MemoryOfDisaster extends AbstractInstance
 		NpcStringId.DWARVES_FOREVER,
 		NpcStringId.SAVE_THE_DWARVEN_VILLAGE,
 		NpcStringId.WHOAAAAAA,
-		NpcStringId.FIGHT
+		NpcStringId.COME_ONE_2
 	};
 	private static final NpcStringId[] SHOUT_SILVERA_DEATH =
 	{
 		NpcStringId.SILVERA,
 		NpcStringId.WE_CAN_T_TAKE_ANY_MORE_LOSSES,
 		NpcStringId.TOO_LATE_3,
-		NpcStringId.NO_WAY_4,
+		NpcStringId.INCREDIBLE,
 		NpcStringId.ANOTHER_ONE_OVER_THERE
 	};
 	private static final NpcStringId[] SACRIFICED_DARK_ELF_SUICIDE_MESSAGES =
@@ -870,7 +870,7 @@ public class MemoryOfDisaster extends AbstractInstance
 					}
 					case SILVERA:
 					{
-						npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.MY_GOD);
+						npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WHOAAAAAA);
 						npc.doDie(null);
 						world.getNpc(SIEGE_GOLEM).doAutoAttack(attacker);
 						break;

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java

@@ -367,7 +367,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				case 0:
 					takeItems(creature.getActingPlayer(), GIANT_CANNONBALL, -1);
 					creature.teleToLocation(PLAYERS_RANDOM_LOCS[getRandom(PLAYERS_RANDOM_LOCS.length)]);
-					showOnScreenMsg(creature.getActingPlayer(), NpcStringId.YOU_NEED_TO_FIND_ESCAPE_DEVICE_RE_ENTRY_IS_NOT_ALLOWED_ONCE_YOU_VE_LEFT_THE_INSTANT_ZONE, ExShowScreenMessage.TOP_CENTER, 4000);
+					showOnScreenMsg(creature.getActingPlayer(), NpcStringId.YOU_NEED_TO_FIND_ESCAPE_DEVICE_RE_ENTRY_IS_NOT_ALLOWED_ONCE_YOU_VE_LEFT_THE_INSTANCE_ZONE, ExShowScreenMessage.TOP_CENTER, 4000);
 					instance.getParameters().increaseInt("PLAYERS_COUNT", 0, 1);
 					break;
 				case 1:

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipController.java

@@ -133,7 +133,7 @@ public abstract class AirShipController extends AbstractNpcAI
 			}
 			if (_isBusy)
 			{
-				player.sendPacket(SystemMessageId.ANOTHER_AIRSHIP_HAS_ALREADY_BEEN_SUMMONED_PLEASE_TRY_AGAIN_LATER);
+				player.sendPacket(SystemMessageId.ANOTHER_AIRSHIP_HAS_BEEN_SUMMONED_TO_THE_WHARF_PLEASE_TRY_AGAIN_LATER);
 				return null;
 			}
 			if (!player.hasClanPrivilege(ClanPrivilege.CL_SUMMON_AIRSHIP))

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatGludinRune.java

@@ -153,10 +153,10 @@ public class BoatGludinRune implements Runnable
 		BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED);
 		BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED);
 		
-		ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES);
+		ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES_2);
-		ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES);
+		ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES_2);
-		ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES);
+		ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES_2);
-		ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE);
+		ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE_2);
 		ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES);
 		ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES);
 		ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES);

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java

@@ -319,7 +319,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager<CeremonyOfChaos
 		}
 		else if ((clan == null) || (clan.getLevel() < 6))
 		{
-			sm = SystemMessageId.ONLY_CHARACTERS_WHO_ARE_A_PART_OF_A_CLAN_OF_LEVEL_6_OR_ABOVE_MAY_PARTICIPATE;
+			sm = SystemMessageId.ONLY_CHARACTERS_WHO_ARE_A_PART_OF_A_CLAN_OF_LEVEL_3_OR_ABOVE_MAY_PARTICIPATE;
 			canRegister = false;
 		}
 		else if (getRegisteredPlayers().size() >= (getVariables().getInt(MAX_ARENAS_KEY, 5) * getMaxPlayersInArena()))
@@ -349,7 +349,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager<CeremonyOfChaos
 		}
 		else if (player.isInInstance())
 		{
-			sm = SystemMessageId.YOU_MAY_NOT_REGISTER_WHILE_USING_THE_INSTANT_ZONE;
+			sm = SystemMessageId.YOU_MAY_NOT_REGISTER_WHILE_USING_THE_INSTANCE_ZONE;
 			canRegister = false;
 		}
 		else if (player.isInSiege())

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java

@@ -315,7 +315,7 @@ public class CursedWeaponsManager implements IXmlReader
 				cw.giveSkill();
 				player.setCursedWeaponEquippedId(cw.getItemId());
 				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING);
+				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING_TYPE_CURSEDSWORD_TO_CHECK_OTHER_INFORMATION);
 				sm.addString(cw.getName());
 				// sm.addItemName(cw.getItemId());
 				sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000));

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java

@@ -84,7 +84,7 @@ public class PetitionManager
 		currPetition.setState(PetitionState.IN_PROCESS);
 		
 		// Petition application accepted. (Send to Petitioner)
-		currPetition.sendPetitionerPacket(new SystemMessage(SystemMessageId.PETITION_APPLICATION_ACCEPTED));
+		currPetition.sendPetitionerPacket(new SystemMessage(SystemMessageId.PETITION_ACCEPTED));
 		
 		// Petition application accepted. Reciept No. is <ID>
 		SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_NRECEIPT_NO_IS_S1);

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/BlockList.java

@@ -194,7 +194,7 @@ public class BlockList
 		
 		if (player != null)
 		{
-			sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
+			sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
 			sm.addString(listOwner.getName());
 			player.sendPacket(sm);
 		}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CombatFlag.java

@@ -77,7 +77,7 @@ public class CombatFlag
 		// Equip with the weapon
 		_item = item;
 		_player.getInventory().equipItem(_item);
-		final SystemMessage sm = new SystemMessage(SystemMessageId.EQUIPPED_S1);
+		final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
 		sm.addItemName(_item);
 		_player.sendPacket(sm);
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CursedWeapon.java

@@ -279,7 +279,7 @@ public class CursedWeapon implements INamable
 			// _player.getInventory().getItemByItemId(_itemId).dropMe(_player, _player.getX(), _player.getY(), _player.getZ());
 		}
 		_isDropped = true;
-		final SystemMessage sm = new SystemMessage(SystemMessageId.S2_WAS_DROPPED_IN_THE_S1_REGION);
+		final SystemMessage sm = new SystemMessage(SystemMessageId.S2_WAS_DROPPED_IN_S1_LOCATION_THERE_ARE_ADENA_IN_THE_TREASURE_CHEST_S2_S3_NOW_S4_LATER_THE_LAST_OWNER_OF_THE_ITEM_WILL_RECEIVE_THE_ADENA_AT_23_59);
 		if (player != null)
 		{
 			sm.addZoneName(player.getX(), player.getY(), player.getZ()); // Region Name
@@ -301,13 +301,13 @@ public class CursedWeapon implements INamable
 		doTransform();
 		giveSkill();
 		
-		final SystemMessage msg = new SystemMessage(SystemMessageId.S2_S_OWNER_HAS_LOGGED_INTO_THE_S1_REGION);
+		final SystemMessage msg = new SystemMessage(SystemMessageId.THE_OWNER_OF_S2_IS_IN_S1_LOCATION_THERE_ARE_ADENA_IN_THE_TREASURE_CHEST_S2_S3_NOW_S4_LATER_THE_LAST_OWNER_OF_THE_ITEM_WILL_RECEIVE_THE_ADENA_AT_23_59);
 		msg.addZoneName(_player.getX(), _player.getY(), _player.getZ());
 		msg.addItemName(_player.getCursedWeaponEquippedId());
 		CursedWeaponsManager.announce(msg);
 		
 		final CursedWeapon cw = CursedWeaponsManager.getInstance().getCursedWeapon(_player.getCursedWeaponEquippedId());
-		final SystemMessage msg2 = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING);
+		final SystemMessage msg2 = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING_TYPE_CURSEDSWORD_TO_CHECK_OTHER_INFORMATION);
 		final int timeLeft = (int) (cw.getTimeLeft() / 60000);
 		msg2.addItemName(_player.getCursedWeaponEquippedId());
 		msg2.addInt(timeLeft);
@@ -436,7 +436,7 @@ public class CursedWeapon implements INamable
 		_item = item;
 		// ItemInstance[] items =
 		_player.getInventory().equipItem(_item);
-		SystemMessage sm = new SystemMessage(SystemMessageId.EQUIPPED_S1);
+		SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
 		sm.addItemName(_item);
 		_player.sendPacket(sm);
 		
@@ -463,7 +463,7 @@ public class CursedWeapon implements INamable
 		
 		_player.broadcastPacket(atk);
 		
-		sm = new SystemMessage(SystemMessageId.THE_OWNER_OF_S2_HAS_APPEARED_IN_THE_S1_REGION);
+		sm = new SystemMessage(SystemMessageId.THE_OWNER_OF_S2_APPEARED_IN_S1_LOCATION_THERE_ARE_ADENA_IN_THE_TREASURE_CHEST_S2_S3_NOW_S4_LATER_THE_LAST_OWNER_OF_THE_ITEM_WILL_RECEIVE_THE_ADENA_AT_23_59);
 		sm.addZoneName(_player.getX(), _player.getY(), _player.getZ()); // Region Name
 		sm.addItemName(_item);
 		CursedWeaponsManager.announce(sm);

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java

@@ -328,7 +328,7 @@ public class Party extends AbstractPlayerGroup
 			}
 		}
 		
-		SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_JOINED_S1_S_PARTY);
+		SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_JOINED_A_PARTY);
 		msg.addString(getLeader().getName());
 		player.sendPacket(msg);
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Petition.java

@@ -83,7 +83,7 @@ public class Petition
 				if (endState == PetitionState.PETITIONER_CANCEL)
 				{
 					// Receipt No. <ID> petition cancelled.
-					sm = new SystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED);
+					sm = new SystemMessage(SystemMessageId.PETITION_NO_S1_CANCELLED);
 					sm.addInt(_id);
 					_responder.sendPacket(sm);
 				}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -2130,7 +2130,7 @@ public class PlayerInstance extends Playable
 				}
 				else
 				{
-					sm = new SystemMessage(SystemMessageId.EQUIPPED_S1);
+					sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
 					sm.addItemName(item);
 				}
 				sendPacket(sm);
@@ -2268,7 +2268,7 @@ public class PlayerInstance extends Playable
 				}
 				setLvlJoinedAcademy(0);
 				// oust pledge member from the academy, cuz he has finished his 2nd class transfer
-				final SystemMessage msg = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISMISSED);
+				final SystemMessage msg = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED);
 				msg.addPcName(this);
 				_clan.broadcastToOnlineMembers(msg);
 				_clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(getName()));
@@ -3142,7 +3142,7 @@ public class PlayerInstance extends Playable
 				}
 				else if (item.getEnchantLevel() > 0)
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2);
 					sm.addInt(item.getEnchantLevel());
 					sm.addItemName(item);
 					sendPacket(sm);
@@ -5979,14 +5979,14 @@ public class PlayerInstance extends Playable
 			{
 				// A strider cannot be ridden while in battle
 				sendPacket(ActionFailed.STATIC_PACKET);
-				sendPacket(SystemMessageId.YOU_CANNOT_USE_A_MOUNT_WHILE_IN_BATTLE);
+				sendPacket(SystemMessageId.A_MOUNT_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE);
 				return false;
 			}
 			else if (_waitTypeSitting)
 			{
 				// A strider can be ridden only when standing
 				sendPacket(ActionFailed.STATIC_PACKET);
-				sendPacket(SystemMessageId.YOU_MUST_BE_STANDING_TO_USE_A_MOUNT);
+				sendPacket(SystemMessageId.A_MOUNT_CAN_BE_RIDDEN_ONLY_WHEN_STANDING);
 				return false;
 			}
 			else if (isFishing())
@@ -6012,7 +6012,7 @@ public class PlayerInstance extends Playable
 			else if (pet.isHungry())
 			{
 				sendPacket(ActionFailed.STATIC_PACKET);
-				sendPacket(SystemMessageId.YOU_CAN_NEITHER_MOUNT_NOR_DISMOUNT_WHILE_HUNGRY);
+				sendPacket(SystemMessageId.A_HUNGRY_MOUNT_CANNOT_BE_MOUNTED_OR_DISMOUNTED);
 				return false;
 			}
 			else if (!Util.checkIfInRange(200, this, pet, true))
@@ -6041,7 +6041,7 @@ public class PlayerInstance extends Playable
 			else if (isHungry())
 			{
 				sendPacket(ActionFailed.STATIC_PACKET);
-				sendPacket(SystemMessageId.YOU_CAN_NEITHER_MOUNT_NOR_DISMOUNT_WHILE_HUNGRY);
+				sendPacket(SystemMessageId.A_HUNGRY_MOUNT_CANNOT_BE_MOUNTED_OR_DISMOUNTED);
 				return false;
 			}
 			else
@@ -9340,12 +9340,12 @@ public class PlayerInstance extends Playable
 	{
 		if (isInCombat() || isJailed())
 		{
-			_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_BATTLE;
+			_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_HE_OR_SHE_IS_CURRENTLY_ENGAGED_IN_BATTLE;
 			return false;
 		}
 		if (isDead() || isAlikeDead() || ((getCurrentHp() < (getMaxHp() / 2)) || (getCurrentMp() < (getMaxMp() / 2))))
 		{
-			_noDuelReason = SystemMessageId.CANNOT_DUEL_BECAUSE_C1_S_HP_OR_MP_IS_BELOW_50;
+			_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_HER_OR_HIS_HP_OR_MP_IS_BELOW_50;
 			return false;
 		}
 		if (_isInDuel || _startingDuel)
@@ -9360,7 +9360,7 @@ public class PlayerInstance extends Playable
 		}
 		if (isOnEvent()) // custom event message
 		{
-			_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_BATTLE;
+			_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_HE_OR_SHE_IS_CURRENTLY_ENGAGED_IN_BATTLE;
 			return false;
 		}
 		if (isCursedWeaponEquipped())
@@ -9370,7 +9370,7 @@ public class PlayerInstance extends Playable
 		}
 		if (_privateStoreType != PrivateStoreType.NONE)
 		{
-			_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_A_PRIVATE_STORE_OR_MANUFACTURE;
+			_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_HE_OR_SHE_IS_CURRENTLY_ENGAGED_IN_A_PRIVATE_STORE_OR_MANUFACTURE;
 			return false;
 		}
 		if (isMounted() || isInBoat())
@@ -9380,7 +9380,7 @@ public class PlayerInstance extends Playable
 		}
 		if (isFishing())
 		{
-			_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_FISHING;
+			_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_HE_OR_SHE_IS_CURRENTLY_FISHING;
 			return false;
 		}
 		if (isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.PEACE) || isInsideZone(ZoneId.SIEGE))
@@ -10184,7 +10184,7 @@ public class PlayerInstance extends Playable
 			}
 			
 			final long restoreExp = Math.round(((_expBeforeDeath - getExp()) * _revivePower) / 100);
-			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_RESURRECT_YOU_AND_RESTORE_XP_S2_S3_ACCEPT.getId());
+			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId());
 			dlg.getSystemMessage().addPcName(reviver);
 			dlg.getSystemMessage().addLong(restoreExp);
 			dlg.getSystemMessage().addInt(power);
@@ -13871,7 +13871,7 @@ public class PlayerInstance extends Playable
 		if ((currentPoints + count) < faction.getPointsOfLevel(faction.getLevelCount() - 1))
 		{
 			getVariables().set(faction.toString(), currentPoints + count);
-			sendPacket(new SystemMessage(SystemMessageId.YOU_OBTAINED_S1_FACTION_POINTS_FOR_S2).addInt(count).addFactionName(faction.getId()));
+			sendPacket(new SystemMessage(SystemMessageId.YOU_OBTAINED_S1_AMITY_POINTS_FOR_S2).addInt(count).addFactionName(faction.getId()));
 		}
 		else
 		{

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java

@@ -110,15 +110,15 @@ public class RaceManagerInstance extends Npc
 			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.NOW_SELLING_TICKETS_FOR_MONSTER_RACE_S1), 30 * SECOND, 10 * MINUTE);
 			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKETS_ARE_NOW_AVAILABLE_FOR_MONSTER_RACE_S1), MINUTE, 10 * MINUTE);
 			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.NOW_SELLING_TICKETS_FOR_MONSTER_RACE_S1), MINUTE + (30 * SECOND), 10 * MINUTE);
-			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 2 * MINUTE, 10 * MINUTE);
+			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_MONSTER_RACE_S1_ARE_CLOSED), 2 * MINUTE, 10 * MINUTE);
-			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 3 * MINUTE, 10 * MINUTE);
+			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_MONSTER_RACE_S1_ARE_CLOSED), 3 * MINUTE, 10 * MINUTE);
-			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 4 * MINUTE, 10 * MINUTE);
+			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_MONSTER_RACE_S1_ARE_CLOSED), 4 * MINUTE, 10 * MINUTE);
-			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 5 * MINUTE, 10 * MINUTE);
+			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_MONSTER_RACE_S1_ARE_CLOSED), 5 * MINUTE, 10 * MINUTE);
-			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_THE_MONSTER_RACE_WILL_END_IN_S1_MINUTE_S), 6 * MINUTE, 10 * MINUTE);
+			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKET_SALES_FOR_MONSTER_RACE_S1_ARE_CLOSED), 6 * MINUTE, 10 * MINUTE);
-			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKETS_SALES_ARE_CLOSED_FOR_MONSTER_RACE_S1_ODDS_ARE_POSTED), 7 * MINUTE, 10 * MINUTE);
+			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.TICKETS_SALES_ARE_CLOSED_FOR_MONSTER_RACE_S1_YOU_CAN_SEE_THE_AMOUNT_OF_WIN), 7 * MINUTE, 10 * MINUTE);
 			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_S1_MINUTE_S), 7 * MINUTE, 10 * MINUTE);
 			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_S1_MINUTE_S), 8 * MINUTE, 10 * MINUTE);
-			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S1_WILL_BEGIN_IN_30_SECONDS), (8 * MINUTE) + (30 * SECOND), 10 * MINUTE);
+			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_30_SECONDS), (8 * MINUTE) + (30 * SECOND), 10 * MINUTE);
 			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.MONSTER_RACE_S1_IS_ABOUT_TO_BEGIN_COUNTDOWN_IN_FIVE_SECONDS), (8 * MINUTE) + (50 * SECOND), 10 * MINUTE);
 			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (55 * SECOND), 10 * MINUTE);
 			ThreadPool.scheduleAtFixedRate(new Announcement(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S), (8 * MINUTE) + (56 * SECOND), 10 * MINUTE);

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/WarnUserTakeBreakTask.java

@@ -43,7 +43,7 @@ public class WarnUserTakeBreakTask implements Runnable
 			if (_player.isOnline())
 			{
 				final long hours = TimeUnit.MILLISECONDS.toHours(_player.getUptime());
-				_player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_PLAYED_FOR_S1_HOUR_S_PLEASE_TAKE_A_BREAK).addLong(hours));
+				_player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_PLAYED_FOR_S1_H_TAKE_A_BREAK_PLEASE).addLong(hours));
 			}
 			else
 			{

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java

@@ -2131,7 +2131,7 @@ public class Clan implements IIdentifiable, INamable
 			final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DOES_NOT_MEET_THE_REQUIREMENTS_TO_JOIN_A_CLAN_ACADEMY);
 			sm.addString(target.getName());
 			player.sendPacket(sm);
-			player.sendPacket(SystemMessageId.IN_ORDER_TO_JOIN_THE_CLAN_ACADEMY_YOU_MUST_BE_UNAFFILIATED_WITH_A_CLAN_AND_BE_AN_UNAWAKENED_CHARACTER_LV_84_OR_BELOW_FPR_BOTH_MAIN_AND_SUBCLASS);
+			player.sendPacket(SystemMessageId.IN_ORDER_TO_JOIN_THE_CLAN_ACADEMY_YOU_MUST_BE_UNAFFILIATED_WITH_A_CLAN_AND_BE_AN_UNAWAKENED_CHARACTER_LV_84_OR_BELOW_FOR_BOTH_MAIN_AND_SUBCLASS);
 			return false;
 		}
 		if (getSubPledgeMembersCount(pledgeType) >= (pledgeType == 0 ? ClanLevelData.getCommonMemberLimit(_level) : ClanLevelData.getEliteMemberLimit(_level)))

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java

@@ -71,7 +71,7 @@ public class ClanWar
 		sm.addString(attacked.getName());
 		attacker.broadcastToOnlineMembers(sm);
 		
-		sm = new SystemMessage(SystemMessageId.S1_HAS_DECLARED_A_CLAN_WAR_THE_WAR_WILL_AUTOMATICALLY_START_IF_YOU_KILL_S1_CLAN_MEMBERS_5_TIMES_WITHIN_A_WEEK);
+		sm = new SystemMessage(SystemMessageId.S1_HAS_DECLARED_A_CLAN_WAR_THE_WAR_WILL_AUTOMATICALLY_START_IF_YOU_KILL_MORE_THAN_5_CLAN_MEMBERS_IN_A_WEEK);
 		sm.addString(attacker.getName());
 		attacked.broadcastToOnlineMembers(sm);
 	}
@@ -137,7 +137,7 @@ public class ClanWar
 			sm.addString(killerClan.getName());
 			victimClan.broadcastToOtherOnlineMembers(sm, victim);
 			
-			sm = new SystemMessage(SystemMessageId.BECAUSE_A_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
+			sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
 			sm.addString(victimClan.getName());
 			sm.addPcName(killer);
 			killerClan.broadcastToOtherOnlineMembers(sm, killer);
@@ -159,11 +159,11 @@ public class ClanWar
 			{
 				_state = ClanWarState.MUTUAL;
 				
-				SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_WILL_LOSE_10_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
+				SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
 				sm.addString(victimClan.getName());
 				killerClan.broadcastToOnlineMembers(sm);
 				
-				sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_WILL_LOSE_10_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
+				sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
 				sm.addString(killerClan.getName());
 				victimClan.broadcastToOnlineMembers(sm);
 				
@@ -238,11 +238,11 @@ public class ClanWar
 	{
 		_state = ClanWarState.MUTUAL;
 		
-		SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_WILL_LOSE_10_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
+		SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
 		sm.addString(attacker.getName());
 		attacked.broadcastToOnlineMembers(sm);
 		
-		sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_WILL_LOSE_10_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
+		sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
 		sm.addString(attacked.getName());
 		attacker.broadcastToOnlineMembers(sm);
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/FortSiege.java

@@ -338,7 +338,7 @@ public class FortSiege implements Siegable
 			// Schedule a task to prepare auto siege end
 			_siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task
 			
-			final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN);
+			final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN);
 			sm.addCastleId(_fort.getResidenceId());
 			announceToPlayer(sm);
 			saveFortSiege();

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java

@@ -832,7 +832,7 @@ public class Instance implements IIdentifiable, INamable
 			ps.executeBatch();
 			
 			// Save to memory and send message to player
-			final SystemMessage msg = new SystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE);
+			final SystemMessage msg = new SystemMessage(SystemMessageId.INSTANCE_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE);
 			if (InstanceManager.getInstance().getInstanceName(getTemplateId()) != null)
 			{
 				msg.addInstanceName(_template.getId());
@@ -898,7 +898,7 @@ public class Instance implements IIdentifiable, INamable
 		if (!player.isOnCustomEvent() && (_template.getEjectTime() > 0))
 		{
 			// Send message
-			final SystemMessage sm = new SystemMessage(SystemMessageId.IF_YOU_ARE_NOT_RESURRECTED_WITHIN_S1_MINUTE_S_YOU_WILL_BE_EXPELLED_FROM_THE_INSTANT_ZONE);
+			final SystemMessage sm = new SystemMessage(SystemMessageId.IF_YOU_ARE_NOT_RESURRECTED_WITHIN_S1_MINUTE_S_YOU_WILL_BE_EXPELLED_FROM_THE_INSTANCE_ZONE);
 			sm.addInt(_template.getEjectTime());
 			player.sendPacket(sm);
 			
@@ -1152,7 +1152,7 @@ public class Instance implements IIdentifiable, INamable
 		{
 			return;
 		}
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THIS_INSTANT_ZONE_WILL_BE_TERMINATED_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES);
+		final SystemMessage sm = new SystemMessage(SystemMessageId.THIS_INSTANCE_ZONE_WILL_BE_TERMINATED_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES);
 		sm.addInt(delay);
 		broadcastPacket(sm);
 	}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java

@@ -33,7 +33,7 @@ public class ConditionGroupMin extends Condition
 	public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml)
 	{
 		super(template, parameters, true, showMessageAndHtml);
-		setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCED_ZONE, (msg, player) -> msg.addInt(getLimit()));
+		setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCE_ZONE, (msg, player) -> msg.addInt(getLimit()));
 	}
 	
 	@Override

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -439,7 +439,7 @@ public class Olympiad extends ListenersContainer
 		@Override
 		public void run()
 		{
-			final SystemMessage sm = new SystemMessage(SystemMessageId.ROUND_S1_OF_THE_OLYMPIAD_GAMES_HAS_NOW_ENDED);
+			final SystemMessage sm = new SystemMessage(SystemMessageId.ROUND_S1_OF_THE_OLYMPIAD_HAS_NOW_ENDED);
 			sm.addInt(_currentCycle);
 			
 			Broadcast.toAllOnlinePlayers(sm);
@@ -520,7 +520,7 @@ public class Olympiad extends ListenersContainer
 			
 			_inCompPeriod = true;
 			
-			Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.SHARPEN_YOUR_SWORDS_TIGHTEN_THE_STITCHING_IN_YOUR_ARMOR_AND_MAKE_HASTE_TO_A_OLYMPIAD_MANAGER_BATTLES_IN_THE_OLYMPIAD_GAMES_ARE_NOW_TAKING_PLACE));
+			Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.THE_OLYMPIAD_HAS_BEGAN));
 			LOGGER.info("Olympiad System: Olympiad Games have started.");
 			LOGGER_OLYMPIAD.info("Result,Player1,Player2,Player1 HP,Player2 HP,Player1 Damage,Player2 Damage,Points,Classed");
 			
@@ -543,7 +543,7 @@ public class Olympiad extends ListenersContainer
 					return;
 				}
 				_inCompPeriod = false;
-				Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.MUCH_CARNAGE_HAS_BEEN_LEFT_FOR_THE_CLEANUP_CREW_OF_THE_OLYMPIAD_STADIUM_BATTLES_IN_THE_OLYMPIAD_GAMES_ARE_NOW_OVER));
+				Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.BATTLES_IN_THE_OLYMPIAD_GAMES_ARE_NOW_OVER));
 				LOGGER.info("Olympiad System: Olympiad games have ended.");
 				
 				while (OlympiadGameManager.getInstance().isBattleStarted()) // cleared in game manager

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java

@@ -183,7 +183,7 @@ public class OlympiadManager
 		
 		if (Olympiad.getInstance().getMillisToCompEnd() < 1200000)
 		{
-			player.sendPacket(SystemMessageId.PARTICIPATION_REQUESTS_ARE_NO_LONGER_BEING_ACCEPTED);
+			player.sendPacket(SystemMessageId.GAME_PARTICIPATION_REQUEST_MUST_BE_FILED_NOT_EARLIER_THAN_10_MINUTES_AFTER_THE_GAME_ENDS);
 			return false;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -355,7 +355,7 @@ public class SkillCaster implements Runnable
 			{
 				if (player.getFame() < _skill.getFamePointConsume())
 				{
-					player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_CLAN_REPUTATION_POINTS_TO_DO_THAT);
+					player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_FAME_TO_DO_THAT);
 					return false;
 				}
 				player.setFame(player.getFame() - _skill.getFamePointConsume());
@@ -1064,7 +1064,7 @@ public class SkillCaster implements Runnable
 			
 			if (player.getFame() < skill.getFamePointConsume())
 			{
-				player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_CLAN_REPUTATION_POINTS_TO_DO_THAT);
+				player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_FAME_TO_DO_THAT);
 				return false;
 			}
 			

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -164,7 +164,7 @@ public class Formulas
 				{
 					if (skill.hasEffectType(EffectType.HP_DRAIN))
 					{
-						attacker.sendPacket(SystemMessageId.DRAIN_WAS_ONLY_50_PERCENT_SUCCESSFUL);
+						attacker.sendPacket(SystemMessageId.DRAIN_WAS_ONLY_50_SUCCESSFUL);
 					}
 					else
 					{

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -76,7 +76,7 @@ public class DlgAnswer implements IClientIncomingPacket
 				AdminCommandHandler.getInstance().useAdminCommand(player, cmd, false);
 			}
 		}
-		else if ((_messageId == SystemMessageId.C1_IS_ATTEMPTING_TO_RESURRECT_YOU_AND_RESTORE_XP_S2_S3_ACCEPT.getId()) || (_messageId == SystemMessageId.YOUR_CHARM_OF_COURAGE_IS_TRYING_TO_RESURRECT_YOU_WOULD_YOU_LIKE_TO_RESURRECT_NOW.getId()))
+		else if ((_messageId == SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()) || (_messageId == SystemMessageId.YOUR_CHARM_OF_COURAGE_IS_TRYING_TO_RESURRECT_YOU_WOULD_YOU_LIKE_TO_RESURRECT_NOW.getId()))
 		{
 			player.reviveAnswer(_answer);
 		}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -700,7 +700,7 @@ public class EnterWorld implements IClientIncomingPacket
 			final PlayerInstance sponsor = World.getInstance().getPlayer(player.getSponsor());
 			if (sponsor != null)
 			{
-				final SystemMessage msg = new SystemMessage(SystemMessageId.YOUR_APPRENTICE_S1_HAS_LOGGED_IN);
+				final SystemMessage msg = new SystemMessage(SystemMessageId.YOUR_APPRENTICE_C1_HAS_LOGGED_IN);
 				msg.addString(player.getName());
 				sponsor.sendPacket(msg);
 			}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java

@@ -615,7 +615,7 @@ public class MultiSellChoose implements IClientIncomingPacket
 				{
 					if (player.getFame() < totalCount)
 					{
-						player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_CLAN_REPUTATION_POINTS_TO_DO_THAT);
+						player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_FAME_TO_DO_THAT);
 						return false;
 					}
 					return true;

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -213,7 +213,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 				{
 					if (!player.destroyItemByItemId("SubSkills", item.getId(), item.getCount(), trainer, false))
 					{
-						player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
+						player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
 						return;
 					}
 					
@@ -362,7 +362,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 				}
 				if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 				{
-					player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
+					player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
 					Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
 					return;
 				}
@@ -379,7 +379,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 				
 				if (count >= 2)
 				{
-					player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
+					player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
 					Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE);
 					return;
 				}
@@ -415,7 +415,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 				
 				if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
 				{
-					player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
+					player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
 					Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
 					return;
 				}
@@ -432,7 +432,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 				
 				if (count >= 2)
 				{
-					player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
+					player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
 					Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE);
 					return;
 				}
@@ -564,7 +564,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 							}
 							else
 							{
-								player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
+								player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
 							}
 							return false;
 						}
@@ -582,7 +582,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
 						if (reqItemCount < item.getCount())
 						{
 							// Player doesn't have required item.
-							player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
+							player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
 							showSkillList(trainer, player);
 							return false;
 						}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java

@@ -92,7 +92,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
 							}
 							if (soulshotCount > item.getCount())
 							{
-								client.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
+								client.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_SERVITOR);
 								return;
 							}
 						}
@@ -110,7 +110,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
 							}
 							if (spiritshotCount > item.getCount())
 							{
-								client.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
+								client.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_SERVITOR);
 								return;
 							}
 						}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java

@@ -257,6 +257,6 @@ public class RequestBuyItem implements IClientIncomingPacket
 		
 		client.sendPacket(new ExUserInfoInvenWeight(player));
 		client.sendPacket(new ExBuySellList(player, true));
-		player.sendPacket(SystemMessageId.THE_TRADE_WAS_SUCCESSFUL);
+		player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
 	}
 }

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java

@@ -194,7 +194,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
 		final List<ItemChanceHolder> crystallizationRewards = ItemCrystallizationData.getInstance().getCrystallizationRewards(itemToRemove);
 		if ((crystallizationRewards == null) || crystallizationRewards.isEmpty())
 		{
-			player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+			player.sendMessage("Crystallization cannot be proceeded because there are no items registered.");
+			// CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED changed to ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1
+			// player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
 			return;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java

@@ -80,7 +80,7 @@ public class RequestDuelAnswerStart implements IClientIncomingPacket
 				msg1 = new SystemMessage(SystemMessageId.YOU_HAVE_ACCEPTED_C1_S_CHALLENGE_TO_A_PARTY_DUEL_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS);
 				msg1.addString(requestor.getName());
 				
-				msg2 = new SystemMessage(SystemMessageId.S1_HAS_ACCEPTED_YOUR_CHALLENGE_TO_DUEL_AGAINST_THEIR_PARTY_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS);
+				msg2 = new SystemMessage(SystemMessageId.C1_HAS_ACCEPTED_YOUR_CHALLENGE_TO_DUEL_AGAINST_THEIR_PARTY_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS);
 				msg2.addString(player.getName());
 			}
 			else

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java

@@ -270,7 +270,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
 					if (scrollTemplate.isSafe())
 					{
 						// safe enchant - remain old value
-						client.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_VALUE_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
+						client.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_SKILL_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
 						client.sendPacket(new EnchantResult(EnchantResult.SAFE_FAIL, item));
 						
 						if (Config.LOG_ITEM_ENCHANTS)

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java

@@ -156,7 +156,7 @@ public class RequestExAskJoinMPCC implements IClientIncomingPacket
 		
 		if (!hasRight)
 		{
-			requestor.sendPacket(SystemMessageId.COMMAND_CHANNELS_CAN_ONLY_BE_FORMED_BY_A_PARTY_LEADER_WHO_IS_ALSO_THE_LEADER_OF_A_LEVEL_5_CLAN);
+			requestor.sendPacket(SystemMessageId.NO_CLANS_DECLARED_A_WAR_ON_YOU);
 			return;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java

@@ -86,11 +86,11 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
 			{
 				if (targetItem.isArmor())
 				{
-					sm = new SystemMessage(SystemMessageId.S1_S2_S_S3_ATTRIBUTE_WAS_REMOVED_SO_RESISTANCE_TO_S4_WAS_DECREASED);
+					sm = new SystemMessage(SystemMessageId.S3_ATTRIBUTE_WAS_REMOVED_FROM_S1_S2_SO_RESISTANCE_TO_S4_WAS_DECREASED);
 				}
 				else
 				{
-					sm = new SystemMessage(SystemMessageId.S1_S2_S_S3_ATTRIBUTE_HAS_BEEN_REMOVED);
+					sm = new SystemMessage(SystemMessageId.S1_S2_ATTRIBUTE_HAS_BEEN_REMOVED);
 				}
 				sm.addInt(targetItem.getEnchantLevel());
 				sm.addItemName(targetItem);

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java

@@ -143,7 +143,7 @@ public class RequestJoinParty implements IClientIncomingPacket
 		
 		if (BlockList.isBlocked(target, requestor))
 		{
-			sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
+			sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
 			sm.addString(target.getName());
 			requestor.sendPacket(sm);
 			return;

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java

@@ -85,7 +85,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
 		clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
 		clan.updateClanInDB();
 		
-		final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISMISSED);
+		final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED);
 		sm.addString(member.getName());
 		clan.broadcastToOnlineMembers(sm);
 		client.sendPacket(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_EXPELLING_THE_CLAN_MEMBER);

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java

@@ -77,7 +77,7 @@ public class RequestPetition implements IClientIncomingPacket
 		
 		if (PetitionManager.getInstance().getPendingPetitionCount() == Config.MAX_PETITIONS_PENDING)
 		{
-			client.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_BY_VISITING_HTTPS_SUPPORT_4GAME_COM);
+			client.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_COM);
 			return;
 		}
 		
@@ -85,7 +85,7 @@ public class RequestPetition implements IClientIncomingPacket
 		
 		if (totalPetitions > Config.MAX_PETITIONS_PER_PLAYER)
 		{
-			final SystemMessage sm = new SystemMessage(SystemMessageId.WE_HAVE_RECEIVED_S1_PETITIONS_FROM_YOU_TODAY_AND_THAT_IS_THE_MAXIMUM_THAT_YOU_CAN_SUBMIT_IN_ONE_DAY_YOU_CANNOT_SUBMIT_ANY_MORE_PETITIONS);
+			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_MAXIMUM_NUMBER_OF_PETITIONS_TODAY_YOU_CANNOT_SUBMIT_MORE_PETITIONS);
 			sm.addInt(totalPetitions);
 			client.sendPacket(sm);
 			return;

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java

@@ -72,7 +72,7 @@ public class RequestPledgeDraftListApply implements IClientIncomingPacket
 				
 				if (ClanEntryManager.getInstance().addToWaitingList(player.getObjectId(), pledgeDraftList))
 				{
-					client.sendPacket(SystemMessageId.ENTERED_INTO_WAITING_LIST_NAME_IS_AUTOMATICALLY_DELETED_AFTER_30_DAYS_IF_DELETE_FROM_WAITING_LIST_IS_USED_YOU_CANNOT_ENTER_NAMES_INTO_THE_WAITING_LIST_FOR_5_MINUTES);
+					client.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_DAYS_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MINUTES);
 				}
 				else
 				{

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java

@@ -139,7 +139,7 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
 		
 		if (player.isCrafting())
 		{
-			player.sendPacket(SystemMessageId.CURRENTLY_CRAFTING_AN_ITEM_PLEASE_WAIT);
+			player.sendPacket(SystemMessageId.THE_ITEM_CREATION_IS_IN_PROGRESS_PLEASE_WAIT);
 			return;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java

@@ -96,7 +96,7 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket
 		
 		if (player.isCrafting())
 		{
-			player.sendPacket(SystemMessageId.CURRENTLY_CRAFTING_AN_ITEM_PLEASE_WAIT);
+			player.sendPacket(SystemMessageId.THE_ITEM_CREATION_IS_IN_PROGRESS_PLEASE_WAIT);
 			return;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java

@@ -170,7 +170,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
 		
 		if (manufacturer.isCrafting())
 		{
-			player.sendPacket(SystemMessageId.CURRENTLY_CRAFTING_AN_ITEM_PLEASE_WAIT);
+			player.sendPacket(SystemMessageId.THE_ITEM_CREATION_IS_IN_PROGRESS_PLEASE_WAIT);
 			return;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java

@@ -57,7 +57,7 @@ public class RequestRecipeShopManageList implements IClientIncomingPacket
 		
 		if (player.isCrafting())
 		{
-			player.sendPacket(SystemMessageId.CURRENTLY_CRAFTING_AN_ITEM_PLEASE_WAIT);
+			player.sendPacket(SystemMessageId.THE_ITEM_CREATION_IS_IN_PROGRESS_PLEASE_WAIT);
 			return;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java

@@ -198,7 +198,7 @@ public class RequestSendPost implements IClientIncomingPacket
 		
 		if (FakePlayerData.getInstance().isTalkable(_receiver))
 		{
-			final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BLOCKED_YOU_YOU_CANNOT_SEND_MAIL_TO_C1);
+			final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BLOCKED_YOU_YOU_CANNOT_SEND_MAIL_TO_THIS_CHARACTER);
 			sm.addString(FakePlayerData.getInstance().getProperName(_receiver));
 			player.sendPacket(sm);
 			return;
@@ -236,7 +236,7 @@ public class RequestSendPost implements IClientIncomingPacket
 		
 		if (BlockList.isInBlockList(receiverId, player.getObjectId()))
 		{
-			final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BLOCKED_YOU_YOU_CANNOT_SEND_MAIL_TO_C1);
+			final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BLOCKED_YOU_YOU_CANNOT_SEND_MAIL_TO_THIS_CHARACTER);
 			sm.addString(_receiver);
 			player.sendPacket(sm);
 			return;
@@ -256,7 +256,7 @@ public class RequestSendPost implements IClientIncomingPacket
 		
 		if (!client.getFloodProtectors().getSendMail().tryPerformAction("sendmail"))
 		{
-			player.sendPacket(SystemMessageId.THE_PREVIOUS_MAIL_WAS_FORWARDED_LESS_THAN_1_MINUTE_AGO_AND_THIS_CANNOT_BE_FORWARDED);
+			player.sendPacket(SystemMessageId.THE_PREVIOUS_MAIL_WAS_FORWARDED_LESS_THAN_10_SEC_AGO_AND_THIS_CANNOT_BE_FORWARDED);
 			return;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java

@@ -61,7 +61,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
 		
 		if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
 		{
-			client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+			client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
 			client.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
@@ -99,7 +99,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
 		}
 		else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
 		{
-			client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+			client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
 			client.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java

@@ -73,7 +73,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
 		clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
 		clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
 		
-		client.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
+		client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
 		client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
 	}
 }

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java

@@ -216,7 +216,7 @@ public class TradeRequest implements IClientIncomingPacket
 		
 		if (BlockList.isBlocked(partner, player))
 		{
-			sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
+			sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
 			sm.addString(partner.getName());
 			client.sendPacket(sm);
 			return;

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java

@@ -100,7 +100,7 @@ public class RequestDivideAdena implements IClientIncomingPacket
 		
 		if (player.getAdena() < targets.size())
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_PROCEED_AS_THERE_IS_INSUFFICIENT_ADENA);
+			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA_2);
 			cancelDistribution(request);
 			return;
 		}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java

@@ -73,7 +73,7 @@ public class RequestDivideAdenaStart implements IClientIncomingPacket
 		
 		if (player.getAdena() < targets.size())
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_PROCEED_AS_THERE_IS_INSUFFICIENT_ADENA);
+			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA_2);
 			return;
 		}
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java

@@ -163,7 +163,7 @@ public class RequestAlchemyConversion implements IClientIncomingPacket
 			if (player.getInventory().getInventoryItemCount(ingredient.getId(), -1) < (ingredient.getCount() * _craftTimes))
 			{
 				player.sendPacket(new ExAlchemyConversion(0, 0));
-				player.sendPacket(SystemMessageId.NOT_ENOUGH_INGREDIENTS);
+				player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_MATERIALS_TO_PERFORM_THAT_ACTION_2);
 				return;
 			}
 		}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java

@@ -181,7 +181,9 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
 		}
 		else
 		{
-			client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+			player.sendMessage("Crystallization cannot be proceeded because there are no items registered.");
+			// CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED changed to ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1
+			// client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
 		}
 	}
 }

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java

@@ -91,7 +91,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
 				requestor.getFriendList().add(player.getObjectId());
 				
 				// has joined as friend.
-				msg = new SystemMessage(SystemMessageId.S1_HAS_JOINED_AS_A_FRIEND);
+				msg = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ADDED_TO_YOUR_FRIENDS_LIST_2);
 				msg.addString(requestor.getName());
 				player.sendPacket(msg);
 				player.getFriendList().add(requestor.getObjectId());

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java

@@ -84,7 +84,7 @@ public class RequestFriendDel implements IClientIncomingPacket
 			statement.execute();
 			
 			// Player deleted from your friend list
-			sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DELETED_FROM_YOUR_FRIENDS_LIST);
+			sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_REMOVED_FROM_YOUR_FRIENDS_LIST_2);
 			sm.addString(_name);
 			player.sendPacket(sm);
 			

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java

@@ -162,7 +162,7 @@ public class RequestLuckyGamePlay implements IClientIncomingPacket
 				iu.addItem(item);
 				if (reward.getKey() == LuckyGameItemType.UNIQUE)
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_OF_S3_THROUGH_FORTUNE_READING);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_X_S3_IN_THE_STANDARD_LUCKY_GAME);
 					sm.addPcName(player);
 					sm.addLong(r.getCount());
 					sm.addItemName(item);