Updated system messages.

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Aden/CemeteryMonsters.java

@@ -64,7 +64,7 @@ public class CemeteryMonsters extends AbstractNpcAI
 		NpcStringId.I_WILL_NOT_LOSE,
 		NpcStringId.BEHOLD_MY_POWER,
 		NpcStringId.HIS_MAJESTY_TRAVIS_HAS_ORDERED_IMMEDIATE_EXECUTION,
-		NpcStringId.HOW_DARE_YOU_TRY_TO_HARM_ME_WITH_YOUR_EVIL_SCHEMES_2,
+		NpcStringId.DO_YOU_WANT_TO_KILL_ME_2,
 		NpcStringId.YOU_IDIOT_2,
 		NpcStringId.FOOL,
 		NpcStringId.REMEMBER_OUR_HISTORY_OUR_GLORIOUS_HISTORY,

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java

@@ -168,7 +168,7 @@ public class Apherus extends AbstractNpcAI
 				{
 					openDoor(door, npc.getInstanceId());
 				}
-				npc.broadcastPacket(new ExShowScreenMessage(NpcStringId.APHERUS_GARDEN_DOOR_WAS_OPENED, ExShowScreenMessage.TOP_CENTER, 3000, true));
+				npc.broadcastPacket(new ExShowScreenMessage(NpcStringId.APHERUS_GARDEN_IS_OPEN, ExShowScreenMessage.TOP_CENTER, 3000, true));
 			}
 			else
 			{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java

@@ -97,7 +97,7 @@ public class Maguen extends AbstractNpcAI
 				maguen.setRunning();
 				maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
 				maguen.broadcastStatusUpdate();
-				showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000);
+				showOnScreenMsg(player, NpcStringId.MAGUEN, 2, 4000);
 				startQuestTimer("DIST_CHECK_TIMER", 1000, maguen, player);
 				break;
 			}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java

@@ -88,7 +88,7 @@ public class Nemo extends AbstractNpcAI
 					maguen.setRunning();
 					maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
 					maguen.broadcastStatusUpdate();
-					showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000);
+					showOnScreenMsg(player, NpcStringId.MAGUEN, 2, 4000);
 					maguenAi().startQuestTimer("DIST_CHECK_TIMER", 1000, maguen, player);
 					npc.setScriptValue(npc.getScriptValue() + 1);
 					htmltext = "32735-05.html";

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -489,7 +489,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_S1_HAS_BEEN_ADDED_CONGRATS);
+				player.sendPacket(SystemMessageId.YOU_HAVE_ACHIEVED_THE_SECOND_CLASS_S1_CONGRATS);
 				player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 				break;
 			}
@@ -553,7 +553,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_S1_HAS_BEEN_ADDED_CONGRATS);
+					player.sendPacket(SystemMessageId.YOU_HAVE_ACHIEVED_THE_SECOND_CLASS_S1_CONGRATS);
 				}
 				break;
 			}
@@ -631,7 +631,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_S1_HAS_BEEN_ADDED_CONGRATS);
+					player.sendPacket(SystemMessageId.YOU_HAVE_ACHIEVED_THE_SECOND_CLASS_S1_CONGRATS);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
 					player.restoreDualSkills();

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java

@@ -49,7 +49,7 @@ public class Remons extends AbstractNpcAI
 		{
 			case "NPC_SHOUT":
 			{
-				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.PERHAPS_EVEN_THE_VILLAGE_BECOMES_DANGEROUS);
+				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.MAY_THE_VILLAGE_ALSO_BE_IN_DANGER);
 				getTimers().addTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 				break;
 			}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java

@@ -263,7 +263,7 @@ public class BalokWarzone extends AbstractInstance
 				world.getAliveNpcs(MINION, HELL_DISCIPLE, HELLS_GATE).forEach(guard -> guard.doDie(null));
 				world.removeNpcs();
 				world.finishInstance();
-				world.broadcastPacket(new SystemMessage(SystemMessageId.THIS_DUNGEON_WILL_EXPIRE_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES).addInt((int) 5.0D));
+				world.broadcastPacket(new SystemMessage(SystemMessageId.THE_INSTANCE_ZONE_EXPIRES_IN_S1_MIN_AFTER_THAT_YOU_WILL_BE_TELEPORTED_OUTSIDE).addInt((int) 5.0D));
 			}
 			else
 			{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java

@@ -131,7 +131,7 @@ public class LastImperialTomb extends AbstractInstance
 		SKILL_MSG.put(1, NpcStringId.REQUIEM_OF_HATRED);
 		SKILL_MSG.put(2, NpcStringId.RONDO_OF_SOLITUDE);
 		SKILL_MSG.put(3, NpcStringId.FRENETIC_TOCCATA);
-		SKILL_MSG.put(4, NpcStringId.FUGUE_OF_JUBILATION);
+		SKILL_MSG.put(4, NpcStringId.FUGUE_OF_RAPTURE);
 		SKILL_MSG.put(5, NpcStringId.HYPNOTIC_MAZURKA);
 	}
 	// Spawns

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java

@@ -48,7 +48,7 @@ public class Orfen extends AbstractNpcAI
 	private static final NpcStringId[] TEXT =
 	{
 		NpcStringId.S1_STOP_KIDDING_YOURSELF_ABOUT_YOUR_OWN_POWERLESSNESS,
-		NpcStringId.S1_I_LL_MAKE_YOU_FEEL_WHAT_TRUE_FEAR_IS,
+		NpcStringId.S1_YOU_WILL_LEARN_WHAT_THE_TRUE_FEAR_IS,
 		NpcStringId.YOU_RE_REALLY_STUPID_TO_HAVE_CHALLENGED_ME_S1_GET_READY,
 		NpcStringId.S1_DO_YOU_THINK_THAT_S_GOING_TO_WORK
 	};

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java

@@ -154,7 +154,7 @@ public class CastleTeleporter extends AbstractNpcAI
 			case "MASS_TELEPORT":
 			{
 				final int region = MapRegionManager.getInstance().getMapRegionLocId(npc.getX(), npc.getY());
-				final NpcSay msg = new NpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.THE_DEFENDERS_OF_S1_CASTLE_WILL_BE_TELEPORTED_TO_THE_INNER_CASTLE);
+				final NpcSay msg = new NpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.THE_DEFENDERS_OF_S1_CASTLE_WILL_BE_TELEPORTED_INSIDE);
 				msg.addStringParameter(npc.getCastle().getName());
 				npc.getCastle().oustAllPlayers();
 				npc.setScriptValue(0);

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java

@@ -94,7 +94,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 				
 				if (!player.isClanLeader() || (clan.getLevel() < 4))
 				{
-					player.sendPacket(SystemMessageId.YOU_CAN_PARTICIPATE_IN_THE_CLAN_HALL_AUCTION_IF_YOUR_CLAN_LEVEL_IS_4_OR_ABOVE_AND_YOU_ARE_THE_CLAN_LEADER_OR_HAVE_THE_AUCTION_RIGHT);
+					player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_WHOSE_CLAN_IS_OF_LEVEL_2_OR_ABOVE_IS_ALLOWED_TO_PARTICIPATE_IN_A_CLAN_HALL_AUCTION);
 					return htmltext;
 				}
 				
@@ -123,7 +123,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 				
 				if (!player.isClanLeader() || (clan.getLevel() < 4))
 				{
-					player.sendPacket(SystemMessageId.YOU_CAN_PARTICIPATE_IN_THE_CLAN_HALL_AUCTION_IF_YOUR_CLAN_LEVEL_IS_4_OR_ABOVE_AND_YOU_ARE_THE_CLAN_LEADER_OR_HAVE_THE_AUCTION_RIGHT);
+					player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_WHOSE_CLAN_IS_OF_LEVEL_2_OR_ABOVE_IS_ALLOWED_TO_PARTICIPATE_IN_A_CLAN_HALL_AUCTION);
 					return htmltext;
 				}
 				
@@ -175,7 +175,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 				
 				if (!player.isClanLeader() || (clan.getLevel() < 4))
 				{
-					player.sendPacket(SystemMessageId.YOU_CAN_PARTICIPATE_IN_THE_CLAN_HALL_AUCTION_IF_YOUR_CLAN_LEVEL_IS_4_OR_ABOVE_AND_YOU_ARE_THE_CLAN_LEADER_OR_HAVE_THE_AUCTION_RIGHT);
+					player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_WHOSE_CLAN_IS_OF_LEVEL_2_OR_ABOVE_IS_ALLOWED_TO_PARTICIPATE_IN_A_CLAN_HALL_AUCTION);
 					return htmltext;
 				}
 				
@@ -332,7 +332,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			
 			if (!player.isClanLeader() || (clan.getLevel() < 4))
 			{
-				player.sendPacket(SystemMessageId.YOU_CAN_PARTICIPATE_IN_THE_CLAN_HALL_AUCTION_IF_YOUR_CLAN_LEVEL_IS_4_OR_ABOVE_AND_YOU_ARE_THE_CLAN_LEADER_OR_HAVE_THE_AUCTION_RIGHT);
+				player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_WHOSE_CLAN_IS_OF_LEVEL_2_OR_ABOVE_IS_ALLOWED_TO_PARTICIPATE_IN_A_CLAN_HALL_AUCTION);
 				return;
 			}
 			final ClanHall playerClanHall = ClanHallData.getInstance().getClanHallByClan(clan);
@@ -372,7 +372,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 				}
 				else if (clan.getWarehouse().destroyItemByItemId("Clan Hall Auction", Inventory.ADENA_ID, bid, player, null) == null)
 				{
-					player.sendPacket(SystemMessageId.THERE_IS_NOT_ENOUGH_ADENA_IN_THE_CLAN_HALL_WAREHOUSE);
+					player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA_IN_THE_CLAN_WAREHOUSE);
 					return;
 				}
 				

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java

@@ -364,7 +364,7 @@ public class ClanHallManager extends AbstractNpcAI
 												htmltext = getHtm(player, "ClanHallManager-funcConfirm" + funcId + ".html");
 												htmltext = htmltext.replace("%funcId%", String.valueOf(funcId));
 												htmltext = htmltext.replace("%funcLv%", String.valueOf(funcLv));
-												htmltext = htmltext.replace("%funcCost%", "<fstring p1=\"" + template.getCost().getCount() + "\" p2=\"" + template.getDurationAsDays() + "\">" + NpcStringId.FONT_COLOR_FFAABB_S1_FONT_ADENA_S2_DAY_S.getId() + "</fstring>");
+												htmltext = htmltext.replace("%funcCost%", "<fstring p1=\"" + template.getCost().getCount() + "\" p2=\"" + template.getDurationAsDays() + "\">" + NpcStringId.FONT_COLOR_FFAABB_S1_FONT_NBSP_ADENA_S2_D.getId() + "</fstring>");
 											}
 										}
 									}
@@ -506,7 +506,7 @@ public class ClanHallManager extends AbstractNpcAI
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
-			htmltext = htmltext.replaceAll("%" + name + "price%", "<fstring p1=\"" + func.getTemplate().getCost().getCount() + "\" p2=\"" + func.getTemplate().getDurationAsDays() + "\">" + NpcStringId.FONT_COLOR_FFAABB_S1_FONT_ADENA_S2_DAY_S.getId() + "</fstring>");
+			htmltext = htmltext.replaceAll("%" + name + "price%", "<fstring p1=\"" + func.getTemplate().getCost().getCount() + "\" p2=\"" + func.getTemplate().getDurationAsDays() + "\">" + NpcStringId.FONT_COLOR_FFAABB_S1_FONT_NBSP_ADENA_S2_D.getId() + "</fstring>");
 			htmltext = htmltext.replace("%" + name + "expire%", "Withdraw the fee for the next time at " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(func.getExpiration())));
 			htmltext = htmltext.replaceAll("%" + name + "deactive%", "[<a action=\"bypass -h Quest ClanHallManager manageFunctions removeFunction confirm " + func.getType().toString() + "\">Deactivate</a>]");
 		}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java

@@ -123,7 +123,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	{
 		if (player.isInOlympiadMode() || OlympiadManager.getInstance().isRegistered(player))
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THE_BEAUTY_SHOP_WHILE_REGISTERED_IN_THE_OLYMPIAD);
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THE_BEAUTY_SHOP_WHILE_REGISTERING_IN_THE_OLYMPIAD);
 			return false;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java

@@ -482,7 +482,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 			
 			// Clear mentee status
 			player.sendPacket(new ExMentorList(player));
-			player.sendPacket(new SystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player));
+			player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NO_LONGER_S1_S_MENTEE_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_86_OR_HIGHER).addPcName(player));
 			sendMail(player.getObjectId(), MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, GRADUTION_BOX, 1);
 		}
 	}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -109,7 +109,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 						}
 						else
 						{
-							player.sendPacket(SystemMessageId.NOT_ENOUGH_SPACE_IN_THE_INVENTORY_UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
+							player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
 						}
 					}
 					else
@@ -127,7 +127,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 						}
 						else
 						{
-							player.sendPacket(SystemMessageId.NOT_ENOUGH_SPACE_IN_THE_INVENTORY_UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
+							player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
 						}
 					}
 					else
@@ -151,7 +151,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 					}
 					else
 					{
-						player.sendPacket(SystemMessageId.NOT_ENOUGH_SPACE_IN_THE_INVENTORY_UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
+						player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
 					}
 				}
 				else
@@ -170,7 +170,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 					}
 					else if (!player.isInventoryUnder80(false))
 					{
-						player.sendPacket(SystemMessageId.NOT_ENOUGH_SPACE_IN_THE_INVENTORY_UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
+						player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
 					}
 					else
 					{
@@ -193,7 +193,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 					}
 					else if (!player.isInventoryUnder80(false))
 					{
-						player.sendPacket(SystemMessageId.NOT_ENOUGH_SPACE_IN_THE_INVENTORY_UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
+						player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
 					}
 					else
 					{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -152,7 +152,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 				}
 				else if (!player.isInventoryUnder80(false))
 				{
-					player.sendPacket(SystemMessageId.NOT_ENOUGH_SPACE_IN_THE_INVENTORY_UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
+					player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
 				}
 				else if (event.equals("register1v1"))
 				{
@@ -194,7 +194,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 				}
 				else
 				{
-					player.sendPacket(SystemMessageId.NOT_ENOUGH_SPACE_IN_THE_INVENTORY_UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
+					player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
 				}
 				break;
 			}
@@ -314,7 +314,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 			{
 				if (!Olympiad.getInstance().inCompPeriod())
 				{
-					player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+					player.sendPacket(SystemMessageId.THE_OLYMPIAD_IS_NOT_HELD_RIGHT_NOW);
 					return false;
 				}
 				
@@ -331,7 +331,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 			}
 			else if (!Olympiad.getInstance().inCompPeriod())
 			{
-				player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+				player.sendPacket(SystemMessageId.THE_OLYMPIAD_IS_NOT_HELD_RIGHT_NOW);
 				return false;
 			}
 			else if (player.isRegisteredOnEvent())

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/TeleportToFantasy/TeleportToFantasy.java

@@ -82,7 +82,7 @@ public class TeleportToFantasy extends AbstractNpcAI
 			}
 			else
 			{
-				npc.broadcastSay(ChatType.GENERAL, NpcStringId.IF_YOUR_MEANS_OF_ARRIVAL_WAS_A_BIT_UNCONVENTIONAL_THEN_I_LL_BE_SENDING_YOU_BACK_TO_THE_TOWN_OF_RUNE_WHICH_IS_THE_NEAREST_TOWN);
+				npc.broadcastSay(ChatType.GENERAL, NpcStringId.YOUR_MEANS_OF_ARRIVAL_HAS_BEEN_A_BIT_UNCONVENTIONAL_I_LL_SEND_YOU_TO_RUNE_WHICH_IS_THE_NEAREST_TOWN);
 				player.teleToLocation(TELEPORTER_LOCATIONS.get(31320)); // Rune
 			}
 		}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java

@@ -149,7 +149,7 @@ public class TrainingCamp extends AbstractNpcAI
 						}
 						else
 						{
-							player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_REWARDS_FOR_TRAINING_IF_YOU_HAVE_TRAINED_FOR_LESS_THAN_1_MINUTE);
+							player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_REWARDS_FOR_TRAINING_IF_YOU_HAVE_TRAINED_FOR_LESS_THAN_1_MIN);
 						}
 					}
 					else
@@ -186,7 +186,7 @@ public class TrainingCamp extends AbstractNpcAI
 						}
 						else
 						{
-							player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_REWARDS_FOR_TRAINING_IF_YOU_HAVE_TRAINED_FOR_LESS_THAN_1_MINUTE);
+							player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_REWARDS_FOR_TRAINING_IF_YOU_HAVE_TRAINED_FOR_LESS_THAN_1_MIN);
 						}
 						player.setTraingCampDuration(player.getTraingCampDuration() + holder.getTrainingTime(TimeUnit.SECONDS));
 						player.removeTraingCampInfo();
@@ -229,7 +229,7 @@ public class TrainingCamp extends AbstractNpcAI
 	{
 		if (player.getLevel() <= Config.TRAINING_CAMP_MIN_LEVEL)
 		{
-			player.sendPacket(new SystemMessage(SystemMessageId.LV_S1_OR_ABOVE).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
+			player.sendPacket(new SystemMessage(SystemMessageId.LV_S1).addInt(Config.TRAINING_CAMP_MIN_LEVEL));
 			return false;
 		}
 		else if (player.getLevel() >= Config.TRAINING_CAMP_MAX_LEVEL)

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/WarriorFishingBlock.java

@@ -47,7 +47,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	// NPC Strings
 	private static final NpcStringId[] NPC_STRINGS_ON_SPAWN =
 	{
-		NpcStringId.CROAK_CROAK_FOOD_LIKE_S1_IN_THIS_PLACE,
+		NpcStringId.CROAK_ROAK_IS_THERE_FOOD_LIKE_S1_HERE,
 		NpcStringId.S1_HOW_LUCKY_I_AM,
 		NpcStringId.PRAY_THAT_YOU_CAUGHT_A_WRONG_FISH_S1
 	};

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java

@@ -93,7 +93,7 @@ public class FreyaCelebration extends LongTimeEvent
 					final long remainingTime = (reuseTime - currentTime) / 1000;
 					final int hours = (int) (remainingTime / 3600);
 					final int minutes = (int) ((remainingTime % 3600) / 60);
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_H_S3_MIN);
 					sm.addItemName(FREYA_POTION);
 					sm.addInt(hours);
 					sm.addInt(minutes);

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java

@@ -100,7 +100,7 @@ public class GiftOfVitality extends LongTimeEvent
 					final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000;
 					final int hours = (int) (remainingTime / 3600);
 					final int minutes = (int) ((remainingTime % 3600) / 60);
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_H_S3_MIN);
 					sm.addSkillName(23179);
 					sm.addInt(hours);
 					sm.addInt(minutes);

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/HappyHours/HappyHours.java

@@ -81,7 +81,7 @@ public class HappyHours extends LongTimeEvent
 					{
 						_lastRewardTime = Chronos.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_VE_OBTAINED_S1_LUCKY_COINS);
+						final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_OBTAINED_S1_SIBI_S_COINS);
 						systemMsg.addInt(20);
 						for (Player plr : World.getInstance().getPlayers())
 						{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java

@@ -64,7 +64,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 						final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000;
 						final int hours = (int) (remainingTime / 3600);
 						final int minutes = (int) ((remainingTime % 3600) / 60);
-						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_H_S3_MIN);
 						sm.addItemName(GATEKEEPER_TRANSFORMATION_STICK);
 						sm.addInt(hours);
 						sm.addInt(minutes);

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java

@@ -116,7 +116,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_HOUR_S_AND_S2_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.THE_ITEM_CAN_BE_OBTAINED_IN_S1_H_S2_MIN);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 					player.sendPacket(sm);
@@ -124,7 +124,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 				}
 				else if (minutes > 0)
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.THERE_ARE_S1_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.THE_ITEM_CAN_BE_OBTAINED_IN_S1_MIN);
 					sm.addInt(minutes);
 					player.sendPacket(sm);
 					htmltext = "32599-scroll24.htm";

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/Observation.java

@@ -96,7 +96,7 @@ public class Observation implements IBypassHandler
 		
 		if (player.hasSummon())
 		{
-			player.sendPacket(SystemMessageId.YOU_MAY_NOT_OBSERVE_A_SIEGE_WITH_A_PET_OR_SERVITOR_SUMMONED);
+			player.sendPacket(SystemMessageId.YOU_MAY_NOT_OBSERVE_A_SIEGE_WITH_A_SERVITOR_SUMMONED);
 			return false;
 		}
 		if (player.isRegisteredOnEvent())
@@ -135,7 +135,7 @@ public class Observation implements IBypassHandler
 				}
 				else
 				{
-					player.sendPacket(SystemMessageId.OBSERVATION_IS_ONLY_POSSIBLE_DURING_A_SIEGE);
+					player.sendPacket(SystemMessageId.SPECTATOR_MODE_IS_ONLY_AVAILABLE_DURING_A_SIEGE);
 				}
 				return true;
 			}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java

@@ -256,7 +256,7 @@ public class QuestLink implements IBypassHandler
 		{
 			if (((q.getId() >= 1) && (q.getId() < 20000)) && ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(true)))
 			{
-				player.sendPacket(SystemMessageId.NOT_ENOUGH_SPACE_IN_THE_INVENTORY_UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
+				player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
 				return;
 			}
 			

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java

@@ -45,7 +45,7 @@ public class ChatAlliance implements IChatHandler
 		
 		if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 		{
-			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 			return;
 		}
 		if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatClan.java

@@ -46,7 +46,7 @@ public class ChatClan implements IChatHandler
 		
 		if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 		{
-			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 			return;
 		}
 		if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java

@@ -77,13 +77,13 @@ public class ChatGeneral implements IChatHandler
 		{
 			if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 			{
-				activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+				activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 				return;
 			}
 			
 			if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
 			{
-				activeChar.sendPacket(new SystemMessage(SystemMessageId.GENERAL_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
+				activeChar.sendPacket(new SystemMessage(SystemMessageId.GENERAL_CHAT_CANNOT_BE_USED_BY_CHARACTERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
 				return;
 			}
 			

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java

@@ -48,7 +48,7 @@ public class ChatHeroVoice implements IChatHandler
 		
 		if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 		{
-			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 			return;
 		}
 		if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatParty.java

@@ -40,13 +40,13 @@ public class ChatParty implements IChatHandler
 	{
 		if (!activeChar.isInParty())
 		{
-			activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY);
+			activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_AND_CAN_T_SEND_MESSAGES_TO_THE_PARTY_CHAT);
 			return;
 		}
 		
 		if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 		{
-			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 			return;
 		}
 		if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java

@@ -44,7 +44,7 @@ public class ChatPartyMatchRoom implements IChatHandler
 		{
 			if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 			{
-				activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+				activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 				return;
 			}
 			if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java

@@ -42,7 +42,7 @@ public class ChatPartyRoomAll implements IChatHandler
 		{
 			if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 			{
-				activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+				activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 				return;
 			}
 			if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java

@@ -42,7 +42,7 @@ public class ChatPartyRoomCommander implements IChatHandler
 		{
 			if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 			{
-				activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+				activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 				return;
 			}
 			if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java

@@ -41,7 +41,7 @@ public class ChatPetition implements IChatHandler
 	{
 		if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 		{
-			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 			return;
 		}
 		if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatShout.java

@@ -44,7 +44,7 @@ public class ChatShout implements IChatHandler
 	{
 		if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 		{
-			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 			return;
 		}
 		if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
@@ -54,7 +54,7 @@ public class ChatShout implements IChatHandler
 		}
 		if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
 		{
-			activeChar.sendPacket(new SystemMessage(SystemMessageId.SHOUT_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
+			activeChar.sendPacket(new SystemMessage(SystemMessageId.SHOUT_CANNOT_BE_USED_BY_CHARACTERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
 			return;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java

@@ -44,7 +44,7 @@ public class ChatTrade implements IChatHandler
 	{
 		if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 		{
-			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 			return;
 		}
 		if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
@@ -54,7 +54,7 @@ public class ChatTrade implements IChatHandler
 		}
 		if (activeChar.getLevel() < 20)
 		{
-			activeChar.sendPacket(new SystemMessage(SystemMessageId.TRADE_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(20));
+			activeChar.sendPacket(new SystemMessage(SystemMessageId.TRADE_CHAT_CANNOT_BE_USED_BY_CHARACTERS_LV_S1_OR_LOWER).addInt(20));
 			return;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java

@@ -45,7 +45,7 @@ public class ChatWhisper implements IChatHandler
 	{
 		if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 		{
-			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 			return;
 		}
 		
@@ -108,7 +108,7 @@ public class ChatWhisper implements IChatHandler
 			}
 			if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.getWhisperers().contains(receiver.getObjectId()) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
 			{
-				activeChar.sendPacket(new SystemMessage(SystemMessageId.NON_PREMIUM_USERS_LV_S1_OR_LOWER_CAN_RESPOND_TO_A_WHISPER_BUT_CANNOT_INITIATE_IT).addInt(Config.MINIMUM_CHAT_LEVEL));
+				activeChar.sendPacket(new SystemMessage(SystemMessageId.CHARACTERS_LV_S1_OR_LOWER_CAN_RESPOND_TO_A_WHISPER_BUT_CANNOT_INITIATE_IT).addInt(Config.MINIMUM_CHAT_LEVEL));
 				return;
 			}
 			if (!BlockList.isBlocked(receiver, activeChar))

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java

@@ -67,7 +67,7 @@ public class ChatWorld implements IChatHandler
 		}
 		else if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
 		{
-			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
+			activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
 		}
 		else if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
 		{
@@ -75,7 +75,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_A_NEW_DAY_STARTS_EVERY_DAY_AT_18_30);
+			activeChar.sendPacket(SystemMessageId.YOU_HAVE_SPENT_YOUR_WORLD_CHAT_QUOTA_FOR_THE_DAY_IT_IS_RESET_DAILY_AT_7_A_M);
 		}
 		else
 		{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java

@@ -111,7 +111,7 @@ public class ConvertItem extends AbstractEffect
 			final SystemMessage sm;
 			if (unequippedItem.getEnchantLevel() > 0)
 			{
-				sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+				sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
 				sm.addInt(unequippedItem.getEnchantLevel());
 				sm.addItemName(unequippedItem);
 			}
@@ -150,7 +150,7 @@ public class ConvertItem extends AbstractEffect
 		final SystemMessage msg;
 		if (newItem.getEnchantLevel() > 0)
 		{
-			msg = new SystemMessage(SystemMessageId.EQUIPPED_S1_S2);
+			msg = new SystemMessage(SystemMessageId.S1_S2_EQUIPPED);
 			msg.addInt(newItem.getEnchantLevel());
 			msg.addItemName(newItem);
 		}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java

@@ -83,7 +83,7 @@ public class Disarmor extends AbstractEffect
 			final Item unequippedItem = unequipped.get(0);
 			if (unequippedItem.getEnchantLevel() > 0)
 			{
-				sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
+				sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
 				sm.addInt(unequippedItem.getEnchantLevel());
 				sm.addItemName(unequippedItem);
 			}
@@ -125,7 +125,7 @@ public class Disarmor extends AbstractEffect
 				{
 					if (item.getEnchantLevel() > 0)
 					{
-						sm = new SystemMessage(SystemMessageId.EQUIPPED_S1_S2);
+						sm = new SystemMessage(SystemMessageId.S1_S2_EQUIPPED);
 						sm.addInt(item.getEnchantLevel());
 						sm.addItemName(item);
 					}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Plunder.java

@@ -70,7 +70,7 @@ public class Plunder extends AbstractEffect
 		
 		if (monster.isSpoiled())
 		{
-			effector.sendPacket(SystemMessageId.PLUNDER_SKILL_HAS_BEEN_ALREADY_USED_ON_THIS_TARGET);
+			effector.sendPacket(SystemMessageId.THE_TARGET_HAS_BEEN_ALREADY_ROBBED);
 			return;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Restoration.java

@@ -58,7 +58,7 @@ public class Restoration extends AbstractEffect
 		
 		if ((_itemId <= 0) || (_itemCount <= 0))
 		{
-			effected.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE);
+			effected.sendPacket(SystemMessageId.FAILED_TO_CHANGE_THE_ITEM);
 			LOGGER.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!");
 			return;
 		}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java

@@ -97,7 +97,7 @@ public class RestorationRandom extends AbstractEffect
 		final Player player = effected.getActingPlayer();
 		if (creationList.isEmpty())
 		{
-			player.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE);
+			player.sendPacket(SystemMessageId.FAILED_TO_CHANGE_THE_ITEM);
 			return;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java

@@ -79,7 +79,7 @@ public class SoulEating extends AbstractEffect
 			final int maxSouls = (int) player.getStat().getValue(Stat.MAX_SOULS, 0);
 			if (player.getChargedSouls() >= maxSouls)
 			{
-				playable.sendPacket(SystemMessageId.SOUL_CANNOT_BE_ABSORBED_ANYMORE);
+				playable.sendPacket(SystemMessageId.YOU_CAN_T_ABSORB_MORE_SOULS);
 				return;
 			}
 			

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java

@@ -56,7 +56,7 @@ public class BeastSoulShot implements IItemHandler
 		final Summon pet = playable.getPet();
 		if ((pet != null) && pet.isDead())
 		{
-			activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
+			activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_SERVITOR_SAD_ISN_T_IT);
 			return false;
 		}
 		
@@ -71,7 +71,7 @@ public class BeastSoulShot implements IItemHandler
 		
 		if ((pet == null) && aliveServitor.isEmpty())
 		{
-			activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
+			activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_SERVITOR_SAD_ISN_T_IT);
 			return false;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java

@@ -56,7 +56,7 @@ public class BeastSpiritShot implements IItemHandler
 		final Summon pet = playable.getPet();
 		if ((pet != null) && pet.isDead())
 		{
-			activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
+			activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_SERVITOR_SAD_ISN_T_IT);
 			return false;
 		}
 		
@@ -71,7 +71,7 @@ public class BeastSpiritShot implements IItemHandler
 		
 		if ((pet == null) && aliveServitor.isEmpty())
 		{
-			activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
+			activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_SERVITOR_SAD_ISN_T_IT);
 			return false;
 		}
 		
@@ -105,7 +105,7 @@ public class BeastSpiritShot implements IItemHandler
 			// Not enough SpiritShots to use.
 			if (!activeOwner.disableAutoShot(itemId))
 			{
-				activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SPIRITSHOTS_NEEDED_FOR_A_PET_SERVITOR);
+				activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SPIRITSHOTS_FOR_THE_SERVITOR);
 			}
 			return false;
 		}
@@ -114,7 +114,7 @@ public class BeastSpiritShot implements IItemHandler
 		{
 			if (!activeOwner.disableAutoShot(itemId))
 			{
-				activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SPIRITSHOTS_NEEDED_FOR_A_PET_SERVITOR);
+				activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SPIRITSHOTS_FOR_THE_SERVITOR);
 			}
 			return false;
 		}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java

@@ -203,7 +203,7 @@ public class ExtractableItems implements IItemHandler
 		
 		if (extractedItems.isEmpty() && !primeReward)
 		{
-			player.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE);
+			player.sendPacket(SystemMessageId.FAILED_TO_CHANGE_THE_ITEM);
 		}
 		if (!enchantedItems.isEmpty())
 		{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java

@@ -32,7 +32,7 @@ public class ItemSkills extends ItemSkillsTemplate
 		final Player player = playable.getActingPlayer();
 		if ((player != null) && player.isInOlympiadMode())
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_OLYMPIAD_MATCH);
+			player.sendPacket(SystemMessageId.THE_ITEM_CANNOT_BE_USED_IN_THE_OLYMPIAD);
 			return false;
 		}
 		return super.useItem(playable, item, forceUse);

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java

@@ -200,7 +200,7 @@ public class ItemSkillsTemplate implements IItemHandler
 			SystemMessage sm = null;
 			if (hours > 0)
 			{
-				sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
+				sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_H_S3_MIN_S4_SEC);
 				if ((skill == null) || skill.isStatic())
 				{
 					sm.addItemName(item);
@@ -214,7 +214,7 @@ public class ItemSkillsTemplate implements IItemHandler
 			}
 			else if (minutes > 0)
 			{
-				sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
+				sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_MIN_S3_SEC);
 				if ((skill == null) || skill.isStatic())
 				{
 					sm.addItemName(item);
@@ -227,7 +227,7 @@ public class ItemSkillsTemplate implements IItemHandler
 			}
 			else
 			{
-				sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
+				sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_SEC);
 				if ((skill == null) || skill.isStatic())
 				{
 					sm.addItemName(item);

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Recipes.java

@@ -90,7 +90,7 @@ public class Recipes implements IItemHandler
 		
 		if (recipeLevel)
 		{
-			player.sendPacket(SystemMessageId.YOUR_CREATE_ITEM_LEVEL_IS_TOO_LOW_TO_REGISTER_THIS_RECIPE);
+			player.sendPacket(SystemMessageId.THE_LEVEL_OF_CREATE_ITEM_IS_TOO_LOW_FOR_REGISTERING_THE_RECIPE);
 			return false;
 		}
 		
@@ -112,7 +112,7 @@ public class Recipes implements IItemHandler
 		}
 		
 		player.destroyItem("Consume", item.getObjectId(), 1, null, false);
-		final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ADDED);
+		final SystemMessage sm = new SystemMessage(SystemMessageId.S1_ADDED);
 		sm.addItemName(item);
 		player.sendPacket(sm);
 		return true;

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java

@@ -45,7 +45,7 @@ public class RollingDice implements IItemHandler
 		final int itemId = item.getId();
 		if (player.isInOlympiadMode())
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_OLYMPIAD_MATCH);
+			player.sendPacket(SystemMessageId.THE_ITEM_CANNOT_BE_USED_IN_THE_OLYMPIAD);
 			return false;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java

@@ -46,7 +46,7 @@ public class SummonItems extends ItemSkillsTemplate
 		
 		if (player.isSitting())
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING);
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_ACTIONS_AND_SKILLS_WHILE_THE_CHARACTER_IS_SITTING);
 			return false;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -33,7 +33,7 @@ public class PetAttack implements IPlayerActionHandler
 	{
 		if ((player.getPet() == null) || !player.getPet().isPet())
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 			return;
 		}
 		
@@ -44,7 +44,7 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.isBetrayed())
 		{
-			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/PetHold.java

@@ -34,7 +34,7 @@ public class PetHold implements IPlayerActionHandler
 	{
 		if ((player.getPet() == null) || !player.getPet().isPet())
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 			return;
 		}
 		
@@ -45,7 +45,7 @@ public class PetHold implements IPlayerActionHandler
 		}
 		else if (pet.isBetrayed())
 		{
-			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 		}
 		else
 		{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/PetMove.java

@@ -34,7 +34,7 @@ public class PetMove implements IPlayerActionHandler
 	{
 		if ((player.getPet() == null) || !player.getPet().isPet())
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 			return;
 		}
 		
@@ -45,7 +45,7 @@ public class PetMove implements IPlayerActionHandler
 		}
 		else if (pet.isBetrayed())
 		{
-			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 		}
 		else if ((player.getTarget() != null) && (pet != player.getTarget()) && !pet.isMovementDisabled())
 		{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -42,7 +42,7 @@ public class PetSkillUse implements IPlayerActionHandler
 		final Pet pet = player.getPet();
 		if (pet == null)
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 		}
 		else if (pet.isUncontrollable())
 		{
@@ -50,7 +50,7 @@ public class PetSkillUse implements IPlayerActionHandler
 		}
 		else if (pet.isBetrayed())
 		{
-			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 		}
 		else if ((pet.getLevel() - player.getLevel()) > 20)
 		{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/PetStop.java

@@ -33,7 +33,7 @@ public class PetStop implements IPlayerActionHandler
 	{
 		if ((player.getPet() == null) || !player.getPet().isPet())
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 			return;
 		}
 		
@@ -44,7 +44,7 @@ public class PetStop implements IPlayerActionHandler
 		}
 		else if (pet.isBetrayed())
 		{
-			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 		}
 		else
 		{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -43,7 +43,7 @@ public class ServitorAttack implements IPlayerActionHandler
 		}
 		else
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 		}
 	}
 }

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorHold.java

@@ -33,7 +33,7 @@ public class ServitorHold implements IPlayerActionHandler
 	{
 		if (!player.hasServitors())
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 			return;
 		}
 		
@@ -41,7 +41,7 @@ public class ServitorHold implements IPlayerActionHandler
 		{
 			if (s.isBetrayed())
 			{
-				player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+				player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 				return;
 			}
 			

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorMode.java

@@ -33,7 +33,7 @@ public class ServitorMode implements IPlayerActionHandler
 	{
 		if (!player.hasServitors())
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 			return;
 		}
 		
@@ -45,7 +45,7 @@ public class ServitorMode implements IPlayerActionHandler
 				{
 					if (s.isBetrayed())
 					{
-						player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+						player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 						return;
 					}
 					
@@ -59,7 +59,7 @@ public class ServitorMode implements IPlayerActionHandler
 				{
 					if (s.isBetrayed())
 					{
-						player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+						player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 						return;
 					}
 					

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorMove.java

@@ -34,7 +34,7 @@ public class ServitorMove implements IPlayerActionHandler
 	{
 		if (!player.hasServitors())
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 			return;
 		}
 		
@@ -46,7 +46,7 @@ public class ServitorMove implements IPlayerActionHandler
 				{
 					if (summon.isBetrayed())
 					{
-						player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+						player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 						return;
 					}
 					

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -36,7 +36,7 @@ public class ServitorSkillUse implements IPlayerActionHandler
 		final Summon summon = player.getAnyServitor();
 		if ((summon == null) || !summon.isServitor())
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 			return;
 		}
 		
@@ -44,7 +44,7 @@ public class ServitorSkillUse implements IPlayerActionHandler
 		{
 			if (summon.isBetrayed())
 			{
-				player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+				player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 				return;
 			}
 			

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorStop.java

@@ -32,7 +32,7 @@ public class ServitorStop implements IPlayerActionHandler
 	{
 		if (!player.hasServitors())
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 			return;
 		}
 		
@@ -40,7 +40,7 @@ public class ServitorStop implements IPlayerActionHandler
 		{
 			if (s.isBetrayed())
 			{
-				player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+				player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 				return;
 			}
 			

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java

@@ -35,7 +35,7 @@ public class UnsummonPet implements IPlayerActionHandler
 		final Summon pet = player.getPet();
 		if (pet == null)
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 		}
 		else if (((Pet) pet).isUncontrollable())
 		{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java

@@ -39,7 +39,7 @@ public class UnsummonServitor implements IPlayerActionHandler
 			{
 				if (s.isBetrayed())
 				{
-					player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+					player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
 					canUnsummon = false;
 					break;
 				}
@@ -66,7 +66,7 @@ public class UnsummonServitor implements IPlayerActionHandler
 		}
 		else
 		{
-			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 		}
 	}
 }

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java

@@ -96,7 +96,7 @@ public class BuildCampSkillCondition implements ISkillCondition
 		}
 		else if (!player.isInsideZone(ZoneId.HQ))
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_HERE);
+			player.sendPacket(SystemMessageId.YOU_CAN_T_BUILD_HEADQUARTERS_HERE);
 			canCreateBase = false;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java

@@ -47,7 +47,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition
 		
 		if ((player.getBookMarkSlot() + _teleportBookmarkSlots) > 18)
 		{
-			player.sendPacket(SystemMessageId.YOUR_NUMBER_OF_MY_TELEPORTS_SLOTS_HAS_REACHED_ITS_MAXIMUM_LIMIT);
+			player.sendPacket(SystemMessageId.YOU_HAVE_REACHED_THE_MAXIMUM_NUMBER_OF_MY_TELEPORT_SLOTS_OR_USE_CONDITIONS_ARE_NOT_OBSERVED);
 			return false;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java

@@ -68,7 +68,7 @@ public class OpCheckFlagSkillCondition implements ISkillCondition
 		}
 		else if (!Util.checkIfInRange(200, player, target, true))
 		{
-			player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
+			player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
 			canTakeFort = false;
 		}
 		return canTakeFort;

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java

@@ -68,7 +68,7 @@ public class PossessHolythingSkillCondition implements ISkillCondition
 		}
 		else if (!Util.checkIfInRange(skill.getCastRange(), player, target, true) || (Math.abs(player.getZ() - target.getZ()) > 45))
 		{
-			player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
+			player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
 			canTakeCastle = false;
 		}
 		return canTakeCastle;

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/Enemy.java

@@ -89,7 +89,7 @@ public class Enemy implements ITargetTypeHandler
 			{
 				if (sendMessage)
 				{
-					creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
+					creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
 				}
 				return null;
 			}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java

@@ -64,7 +64,7 @@ public class EnemyNot implements ITargetTypeHandler
 			{
 				if (sendMessage)
 				{
-					creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
+					creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
 				}
 				
 				return null;

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java

@@ -89,7 +89,7 @@ public class EnemyOnly implements ITargetTypeHandler
 			{
 				if (sendMessage)
 				{
-					creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
+					creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
 				}
 				return null;
 			}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/NpcBody.java

@@ -68,7 +68,7 @@ public class NpcBody implements ITargetTypeHandler
 				{
 					if (sendMessage)
 					{
-						creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
+						creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
 					}
 					return null;
 				}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/PcBody.java

@@ -95,7 +95,7 @@ public class PcBody implements ITargetTypeHandler
 			{
 				if (sendMessage)
 				{
-					creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
+					creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
 				}
 				
 				return null;

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/Target.java

@@ -66,7 +66,7 @@ public class Target implements ITargetTypeHandler
 		{
 			if (sendMessage)
 			{
-				creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
+				creature.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
 			}
 			
 			return null;

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java

@@ -44,7 +44,7 @@ public class ChannelDelete implements IUserCommandHandler
 		if (player.isInParty() && player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getLeader().equals(player))
 		{
 			final CommandChannel channel = player.getParty().getCommandChannel();
-			channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
+			channel.broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_IS_DISBANDED));
 			channel.disbandChannel();
 			return true;
 		}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java

@@ -44,7 +44,7 @@ public class ChannelLeave implements IUserCommandHandler
 		
 		if (!player.isInParty() || !player.getParty().isLeader(player))
 		{
-			player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_LEAVE_A_COMMAND_CHANNEL);
+			player.sendPacket(SystemMessageId.ONLY_THE_PARTY_LEADER_CAN_LEAVE_THE_COMMAND_CHANNEL);
 			return false;
 		}
 		
@@ -53,7 +53,7 @@ public class ChannelLeave implements IUserCommandHandler
 			final CommandChannel channel = player.getParty().getCommandChannel();
 			final Party party = player.getParty();
 			channel.removeParty(party);
-			party.getLeader().sendPacket(SystemMessageId.YOU_HAVE_QUIT_THE_COMMAND_CHANNEL);
+			party.getLeader().sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_COMMAND_CHANNEL);
 			
 			final SystemMessage sm = new SystemMessage(SystemMessageId.C1_S_PARTY_HAS_LEFT_THE_COMMAND_CHANNEL);
 			sm.addPcName(party.getLeader());

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -46,7 +46,7 @@ public class OlympiadStat implements IUserCommandHandler
 		final WorldObject target = player.getTarget();
 		if ((target == null) || !target.isPlayer() || (target.getActingPlayer().getNobleLevel() == 0))
 		{
-			player.sendPacket(SystemMessageId.THIS_COMMAND_CAN_ONLY_BE_USED_WHEN_THE_TARGET_IS_AN_AWAKENED_NOBLESSE_EXALTED);
+			player.sendPacket(SystemMessageId.COMMAND_AVAILABLE_FOR_THOSE_WHO_HAVE_COMPLETED_2ND_CLASS_TRANSFER);
 			return false;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java

@@ -48,7 +48,7 @@ public class SiegeStatus implements IUserCommandHandler
 		
 		if ((player.getNobleLevel() == 0) || !player.isClanLeader())
 		{
-			player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_THAT_IS_A_NOBLESSE_EXALTED_CAN_VIEW_THE_SIEGE_WAR_STATUS_WINDOW_DURING_A_SIEGE_WAR);
+			player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_THAT_IS_A_NOBLESSE_OR_EXALTED_CAN_VIEW_THE_SIEGE_STATUS_WINDOW_DURING_A_SIEGE_WAR);
 			return false;
 		}
 		
@@ -86,7 +86,7 @@ public class SiegeStatus implements IUserCommandHandler
 			return true;
 		}
 		
-		player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_THAT_IS_A_NOBLESSE_EXALTED_CAN_VIEW_THE_SIEGE_WAR_STATUS_WINDOW_DURING_A_SIEGE_WAR);
+		player.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_THAT_IS_A_NOBLESSE_OR_EXALTED_CAN_VIEW_THE_SIEGE_STATUS_WINDOW_DURING_A_SIEGE_WAR);
 		
 		return false;
 	}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java

@@ -57,7 +57,7 @@ public class Unstuck implements IUserCommandHandler
 		
 		if (player.isInOlympiadMode())
 		{
-			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_SKILL_IN_A_OLYMPIAD_MATCH);
+			player.sendPacket(SystemMessageId.THE_SKILL_CANNOT_BE_USED_IN_THE_OLYMPIAD);
 			return false;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java

@@ -497,7 +497,7 @@ public class AltarOfShilen extends AbstractInstance
 				for (Player player : _world.getPlayers())
 				{
 					player.sendPacket(new Earthquake(player.getX(), player.getY(), player.getZ(), 20, 5));
-					player.sendPacket(new ExShowScreenMessage(NpcStringId.SACRIFICE_HAS_BEEN_KILLED_SACRIFICE_LEFT_S1, ExShowScreenMessage.MIDDLE_CENTER, 3000, String.valueOf(_victims)));
+					player.sendPacket(new ExShowScreenMessage(NpcStringId.SACRIFICES_HAVE_BEEN_KILLED_SACRIFICES_LEFT_S1, ExShowScreenMessage.MIDDLE_CENTER, 3000, String.valueOf(_victims)));
 				}
 			}
 			if ((_world.getStatus() == 2) && !_firstFloorVictims.isEmpty())

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java

@@ -209,7 +209,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 		{
 			if (player.isOnline())
 			{
-				player.sendPacket(SystemMessageId.REGISTRATION_FOR_THE_CEREMONY_OF_CHAOS_HAS_BEGUN);
+				player.sendPacket(SystemMessageId.THE_REGISTRATION_FOR_THE_CEREMONY_OF_CHAOS_HAS_BEGUN);
 				if (canRegister(player, false))
 				{
 					player.sendPacket(ExCuriousHouseState.REGISTRATION_PACKET);
@@ -230,7 +230,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 			{
 				if (player.isOnline())
 				{
-					player.sendPacket(SystemMessageId.REGISTRATION_FOR_THE_CEREMONY_OF_CHAOS_HAS_ENDED);
+					player.sendPacket(SystemMessageId.THE_REGISTRATION_FOR_THE_CEREMONY_OF_CHAOS_IS_OVER);
 					if (!REGISTERED_PLAYERS.contains(player))
 					{
 						player.sendPacket(ExCuriousHouseState.IDLE_PACKET);
@@ -451,7 +451,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 		{
 			if (player != null)
 			{
-				player.sendPacket(SystemMessageId.THE_MATCH_HAS_STARTED_FIGHT);
+				player.sendPacket(SystemMessageId.THE_MATCH_HAS_BEGUN_FIGHT);
 				player.setImmobilized(false);
 				player.setInvisible(false);
 				player.broadcastInfo();
@@ -516,7 +516,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				REGISTERED_PLAYERS.add(player);
 				player.setRegisteredOnEvent(true);
 				player.sendPacket(SystemMessageId.YOU_ARE_NOW_ON_THE_WAITING_LIST_YOU_WILL_AUTOMATICALLY_BE_TELEPORTED_WHEN_THE_TOURNAMENT_STARTS_AND_WILL_BE_REMOVED_FROM_THE_WAITING_LIST_IF_YOU_LOG_OUT_IF_YOU_CANCEL_REGISTRATION_WITHIN_THE_LAST_MINUTE_OF_ENTERING_THE_ARENA_AFTER_SIGNING_UP_30_TIMES_OR_MORE_OR_FORFEIT_AFTER_ENTERING_THE_ARENA_30_TIMES_OR_MORE_DURING_A_CYCLE_YOU_BECOME_INELIGIBLE_FOR_PARTICIPATION_IN_THE_CEREMONY_OF_CHAOS_UNTIL_THE_NEXT_CYCLE_ALL_THE_BUFFS_EXCEPT_THE_VITALITY_BUFF_WILL_BE_REMOVED_ONCE_YOU_ENTER_THE_ARENAS);
-				player.sendPacket(SystemMessageId.EXCEPT_THE_VITALITY_BUFF_ALL_BUFFS_INCLUDING_ART_OF_SEDUCTION_WILL_BE_DELETED);
+				player.sendPacket(SystemMessageId.ALL_BUFFS_LIKE_ROSY_SEDUCTIONS_AND_ART_OF_SEDUCTION_WILL_BE_REMOVED_SAYHA_S_GRACE_WILL_REMAIN);
 				player.sendPacket(ExCuriousHouseState.PREPARE_PACKET);
 				break;
 			}
@@ -526,7 +526,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					removeListeners(player);
 					player.setRegisteredOnEvent(false);
-					player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_TAKEN_OFF_THE_WAIT_LIST_YOU_MAY_ONLY_ENTER_THE_WAIT_LIST_ON_MON_THURS_EVERY_QUARTER_OF_AN_HOUR_FOR_5_MINUTES_BETWEEN_20_00_AND_23_40_IF_YOU_CANCEL_REGISTRATION_OR_CHOOSE_TO_FORFEIT_AFTER_ENTERING_A_MATCH_30_TIMES_OR_MORE_DURING_A_CYCLE_YOU_MUST_WAIT_UNTIL_THE_NEXT_CYCLE_TO_PARTICIPATE_IN_THE_CEREMONY_OF_CHAOS_UPON_ENTERING_THE_ARENA_ALL_BUFFS_EXCLUDING_VITALITY_BUFFS_ARE_REMOVED);
+					player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_TAKEN_OFF_THE_WAIT_LIST_YOU_MAY_ONLY_ENTER_THE_WAIT_LIST_ON_MON_THURS_EVERY_QUARTER_OF_AN_HOUR_FOR_5_MIN_BETWEEN_20_00_AND_23_40_IF_YOU_CANCEL_REGISTRATION_OR_CHOOSE_TO_FORFEIT_AFTER_ENTERING_A_MATCH_30_TIMES_OR_MORE_DURING_A_CYCLE_YOU_MUST_WAIT_UNTIL_THE_NEXT_CYCLE_TO_PARTICIPATE_IN_THE_CEREMONY_OF_CHAOS_UPON_ENTERING_THE_ARENA_ALL_BUFFS_EXCLUDING_VITALITY_BUFFS_ARE_REMOVED);
 					player.sendPacket(ExCuriousHouseState.IDLE_PACKET);
 				}
 				break;
@@ -648,7 +648,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 			case "match_start_countdown":
 			{
 				final int time = params.getInt("time", 0);
-				final SystemMessage countdown = new SystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S);
+				final SystemMessage countdown = new SystemMessage(SystemMessageId.THE_MATCH_BEGINS_IN_S1_SEC);
 				countdown.addByte(time);
 				broadcastPacket(countdown);
 				
@@ -713,7 +713,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 		SystemMessage msg = null;
 		if (winners.isEmpty() || (winners.size() > 1))
 		{
-			msg = new SystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
+			msg = new SystemMessage(SystemMessageId.THE_DUEL_HAS_ENDED_IN_A_TIE);
 		}
 		else
 		{
@@ -1027,7 +1027,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 		SystemMessageId sm = null;
 		if (player.getLevel() < 85)
 		{
-			sm = SystemMessageId.ONLY_CHARACTERS_LEVEL_85_OR_ABOVE_MAY_PARTICIPATE_IN_THE_TOURNAMENT;
+			sm = SystemMessageId.ONLY_CHARACTERS_OF_LV_85_CAN_PARTICIPATE_IN_THE_TOURNAMENT;
 			canRegister = false;
 		}
 		else if (player.isFlyingMounted())
@@ -1042,7 +1042,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 		}
 		else if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() != 0))
 		{
-			sm = SystemMessageId.NOT_ENOUGH_SPACE_IN_THE_INVENTORY_UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY;
+			sm = SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY;
 			canRegister = false;
 		}
 		else if ((clan == null) || (clan.getLevel() < 3))
@@ -1082,12 +1082,12 @@ public class CeremonyOfChaos extends AbstractNpcAI
 		}
 		else if (player.isInSiege())
 		{
-			sm = SystemMessageId.YOU_CANNOT_REGISTER_FOR_THE_WAITING_LIST_ON_THE_BATTLEFIELD_CASTLE_SIEGE_FORTRESS_SIEGE;
+			sm = SystemMessageId.YOU_CANNOT_REGISTER_FOR_THE_WAITING_LIST_ON_THE_BATTLEFIELD_CASTLE_SIEGE_FORTRESS_BATTLE;
 			canRegister = false;
 		}
 		else if (player.isInsideZone(ZoneId.SIEGE))
 		{
-			sm = SystemMessageId.YOU_CANNOT_REGISTER_IN_THE_WAITING_LIST_WHILE_BEING_INSIDE_OF_A_BATTLEGROUND_CASTLE_SIEGE_FORTRESS_SIEGE;
+			sm = SystemMessageId.YOU_CANNOT_REGISTER_IN_THE_WAITING_LIST_WHILE_BEING_INSIDE_OF_A_BATTLEGROUND_CASTLE_SIEGE_FORTRESS_BATTLE;
 			canRegister = false;
 		}
 		else if (player.isFlyingMounted())
@@ -1102,7 +1102,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 		}
 		else if (player.isInTimedHuntingZone(player.getX(), player.getY()))
 		{
-			sm = SystemMessageId.CANNOT_USE_TIME_LIMITED_HUNTING_ZONES_WHILE_WAITING_FOR_THE_CEREMONY_OF_CHAOS;
+			sm = SystemMessageId.SPECIAL_INSTANCE_ZONES_CANNOT_BE_USED_WHILE_WAITING_FOR_THE_CEREMONY_OF_CHAOS;
 			canRegister = false;
 		}
 		

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java

@@ -446,7 +446,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "exit":
 			{
 				startQuestTimer("finish", 3000, npc, player);
-				player.sendPacket(new SystemMessage(SystemMessageId.THIS_DUNGEON_WILL_EXPIRE_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES).addInt(1));
+				player.sendPacket(new SystemMessage(SystemMessageId.THE_INSTANCE_ZONE_EXPIRES_IN_S1_MIN_AFTER_THAT_YOU_WILL_BE_TELEPORTED_OUTSIDE).addInt(1));
 				final QuestState qs = player.getQuestState(Q11027_PathOfDestinyOvercome.class.getSimpleName());
 				if (qs != null)
 				{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java

@@ -832,7 +832,7 @@ public class Kamaloka extends AbstractInstance
 				}
 				reenter.set(Calendar.HOUR_OF_DAY, RESET_HOUR);
 				
-				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);
+				final SystemMessage sm = new SystemMessage(SystemMessageId.INSTANCE_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_WITH_INSTANCEZONE);
 				sm.addInstanceName(world.getTemplateId());
 				
 				// set instance reenter time for all allowed players

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java

@@ -93,7 +93,7 @@ public class KastiaExceptional extends AbstractInstance
 				{
 					case 0:
 					{
-						showOnScreenMsg(world, NpcStringId.STAGE_1, ExShowScreenMessage.TOP_CENTER, 10000, true);
+						showOnScreenMsg(world, NpcStringId.LV_1_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 						world.setStatus(1);
 						world.spawnGroup("wave_1");
 						startQuestTimer("check_status", 10000, null, player);
@@ -103,7 +103,7 @@ public class KastiaExceptional extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
-							showOnScreenMsg(world, NpcStringId.STAGE_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							showOnScreenMsg(world, NpcStringId.LV_2_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 							world.setStatus(2);
 							world.spawnGroup("wave_2");
 						}
@@ -114,7 +114,7 @@ public class KastiaExceptional extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
-							showOnScreenMsg(world, NpcStringId.STAGE_3, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							showOnScreenMsg(world, NpcStringId.LV_3_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 							world.setStatus(3);
 							world.spawnGroup("wave_3");
 						}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java

@@ -93,7 +93,7 @@ public class KastiaExtreme extends AbstractInstance
 				{
 					case 0:
 					{
-						showOnScreenMsg(world, NpcStringId.STAGE_1, ExShowScreenMessage.TOP_CENTER, 10000, true);
+						showOnScreenMsg(world, NpcStringId.LV_1_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 						world.setStatus(1);
 						world.spawnGroup("wave_1");
 						startQuestTimer("check_status", 10000, null, player);
@@ -103,7 +103,7 @@ public class KastiaExtreme extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
-							showOnScreenMsg(world, NpcStringId.STAGE_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							showOnScreenMsg(world, NpcStringId.LV_2_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 							world.setStatus(2);
 							world.spawnGroup("wave_2");
 						}
@@ -114,7 +114,7 @@ public class KastiaExtreme extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
-							showOnScreenMsg(world, NpcStringId.STAGE_3, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							showOnScreenMsg(world, NpcStringId.LV_3_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 							world.setStatus(3);
 							world.spawnGroup("wave_3");
 						}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java

@@ -93,7 +93,7 @@ public class KastiaHard extends AbstractInstance
 				{
 					case 0:
 					{
-						showOnScreenMsg(world, NpcStringId.STAGE_1, ExShowScreenMessage.TOP_CENTER, 10000, true);
+						showOnScreenMsg(world, NpcStringId.LV_1_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 						world.setStatus(1);
 						world.spawnGroup("wave_1");
 						startQuestTimer("check_status", 10000, null, player);
@@ -103,7 +103,7 @@ public class KastiaHard extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
-							showOnScreenMsg(world, NpcStringId.STAGE_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							showOnScreenMsg(world, NpcStringId.LV_2_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 							world.setStatus(2);
 							world.spawnGroup("wave_2");
 						}
@@ -114,7 +114,7 @@ public class KastiaHard extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
-							showOnScreenMsg(world, NpcStringId.STAGE_3, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							showOnScreenMsg(world, NpcStringId.LV_3_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 							world.setStatus(3);
 							world.spawnGroup("wave_3");
 						}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java

@@ -93,7 +93,7 @@ public class KastiaLow extends AbstractInstance
 				{
 					case 0:
 					{
-						showOnScreenMsg(world, NpcStringId.STAGE_1, ExShowScreenMessage.TOP_CENTER, 10000, true);
+						showOnScreenMsg(world, NpcStringId.LV_1_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 						world.setStatus(1);
 						world.spawnGroup("wave_1");
 						startQuestTimer("check_status", 10000, null, player);
@@ -103,7 +103,7 @@ public class KastiaLow extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
-							showOnScreenMsg(world, NpcStringId.STAGE_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							showOnScreenMsg(world, NpcStringId.LV_2_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 							world.setStatus(2);
 							world.spawnGroup("wave_2");
 						}
@@ -114,7 +114,7 @@ public class KastiaLow extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
-							showOnScreenMsg(world, NpcStringId.STAGE_3, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							showOnScreenMsg(world, NpcStringId.LV_3_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 							world.setStatus(3);
 							world.spawnGroup("wave_3");
 						}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java

@@ -93,7 +93,7 @@ public class KastiaMedium extends AbstractInstance
 				{
 					case 0:
 					{
-						showOnScreenMsg(world, NpcStringId.STAGE_1, ExShowScreenMessage.TOP_CENTER, 10000, true);
+						showOnScreenMsg(world, NpcStringId.LV_1_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 						world.setStatus(1);
 						world.spawnGroup("wave_1");
 						startQuestTimer("check_status", 10000, null, player);
@@ -103,7 +103,7 @@ public class KastiaMedium extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
-							showOnScreenMsg(world, NpcStringId.STAGE_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							showOnScreenMsg(world, NpcStringId.LV_2_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 							world.setStatus(2);
 							world.spawnGroup("wave_2");
 						}
@@ -114,7 +114,7 @@ public class KastiaMedium extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
-							showOnScreenMsg(world, NpcStringId.STAGE_3, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							showOnScreenMsg(world, NpcStringId.LV_3_2, ExShowScreenMessage.TOP_CENTER, 10000, true);
 							world.setStatus(3);
 							world.spawnGroup("wave_3");
 						}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java

@@ -268,7 +268,7 @@ public class NornilsGarden extends AbstractInstance
 					world.getAliveNpcs(BOZ_STAGE4).forEach(boz -> boz.doDie(null));
 					world.spawnGroup("wave_4");
 					world.finishInstance();
-					world.broadcastPacket(new SystemMessage(SystemMessageId.THIS_DUNGEON_WILL_EXPIRE_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES).addInt((int) 5.0D));
+					world.broadcastPacket(new SystemMessage(SystemMessageId.THE_INSTANCE_ZONE_EXPIRES_IN_S1_MIN_AFTER_THAT_YOU_WILL_BE_TELEPORTED_OUTSIDE).addInt((int) 5.0D));
 				}
 				break;
 			}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/Nursery/Nursery.java

@@ -299,7 +299,7 @@ public class Nursery extends AbstractInstance
 						{
 							gameManager.getVariables().increaseInt("GAME_POINTS", returnPoint);
 						}
-						showOnScreenMsg(instance, NpcStringId.MAGUEN_GETS_SURPRISED_AND_GIVES_S1_PIECES_OF_BIO_ENERGY_RESIDUE, ExShowScreenMessage.MIDDLE_CENTER, 3000, String.valueOf(returnPoint));
+						showOnScreenMsg(instance, NpcStringId.MAGUEN_IS_SURPRISED_AND_LOSES_S1_PIECES_OF_BIO_ENERGY_RESIDUE, ExShowScreenMessage.MIDDLE_CENTER, 3000, String.valueOf(returnPoint));
 						npc.setTargetable(false);
 						npc.doDie(null);
 					}
@@ -350,7 +350,7 @@ public class Nursery extends AbstractInstance
 				final Npc maguen = addSpawn(MAGUEN, npc, false, 0, false, instance.getId());
 				maguen.setRunning();
 				maguen.getAI().startFollow(killer);
-				showOnScreenMsg(instance, NpcStringId.MAGUEN_APPEARANCE, ExShowScreenMessage.MIDDLE_CENTER, 4000);
+				showOnScreenMsg(instance, NpcStringId.MAGUEN, ExShowScreenMessage.MIDDLE_CENTER, 4000);
 				getTimers().addTimer("MAGUEN_WAIT_TIMER", 4000, maguen, killer);
 				getTimers().addTimer("MAGUEN_HIDE_TIMER", 60000, maguen, null);
 			}
@@ -418,7 +418,7 @@ public class Nursery extends AbstractInstance
 					}
 					npc.setTargetable(true);
 					managerVars.increaseInt("GAME_POINTS", decreasePoints * -1);
-					showOnScreenMsg(instance, NpcStringId.MAGUEN_STOLE_S1_PIECES_OF_BIO_ENERGY_RESIDUE, ExShowScreenMessage.MIDDLE_CENTER, 4000, String.valueOf(decreasePoints));
+					showOnScreenMsg(instance, NpcStringId.MAGUEN_HAS_STOLEN_S1_PIECES_OF_BIO_ENERGY_RESIDUE, ExShowScreenMessage.MIDDLE_CENTER, 4000, String.valueOf(decreasePoints));
 					npcVars.set("MAGUEN_STOLEN_COUNT", decreasePoints);
 					npcVars.set("MAGUEN_STATUS", 1);
 					if (decreasePoints > 50)

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java

@@ -160,19 +160,19 @@ public class PailakaRuneCastle extends AbstractInstance
 				{
 					case 0:
 					{
-						showOnScreenMsg(world, NpcStringId.STAGE_1, ExShowScreenMessage.TOP_CENTER, 5000, true);
+						showOnScreenMsg(world, NpcStringId.LV_1_2, ExShowScreenMessage.TOP_CENTER, 5000, true);
 						monsters = world.spawnGroup("monsters_first_wave");
 						break;
 					}
 					case 1:
 					{
-						showOnScreenMsg(world, NpcStringId.STAGE_2, ExShowScreenMessage.TOP_CENTER, 5000, true);
+						showOnScreenMsg(world, NpcStringId.LV_2_2, ExShowScreenMessage.TOP_CENTER, 5000, true);
 						monsters = world.spawnGroup("monsters_second_wave");
 						break;
 					}
 					case 2:
 					{
-						showOnScreenMsg(world, NpcStringId.STAGE_3, ExShowScreenMessage.TOP_CENTER, 5000, true);
+						showOnScreenMsg(world, NpcStringId.LV_3_2, ExShowScreenMessage.TOP_CENTER, 5000, true);
 						monsters = world.spawnGroup("monsters_third_wave");
 						break;
 					}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java

@@ -88,7 +88,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 				final Instance world = player.getInstanceWorld();
 				if (isInInstance(world))
 				{
-					showOnScreenMsg(world, NpcStringId.THE_CHALLENGE_FOR_THE_THRONE_OF_HEROES_GOLDBERG_WILL_BEGIN_SHORTLY_PLEASE_GET_READY, ExShowScreenMessage.TOP_CENTER, 5000, true);
+					showOnScreenMsg(world, NpcStringId.THE_CHALLENGE_FOR_THE_THRONE_OF_HEROES_GOLDBERG_WILL_BEGIN_SHORTLY_NPLEASE_GET_READY_HEROES, ExShowScreenMessage.TOP_CENTER, 5000, true);
 					startQuestTimer("ANNOUNCE_RAID_PREP", 15000, null, player);
 				}
 				break;

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java

@@ -89,7 +89,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 				final Instance world = player.getInstanceWorld();
 				if (isInInstance(world))
 				{
-					showOnScreenMsg(world, NpcStringId.THE_CHALLENGE_FOR_THE_THRONE_OF_HEROES_MARY_REED_WILL_BEGIN_SHORTLY, ExShowScreenMessage.TOP_CENTER, 5000, true);
+					showOnScreenMsg(world, NpcStringId.THE_CHALLENGE_FOR_THE_THRONE_OF_HEROES_MARY_REED_WILL_BEGIN_SHORTLY_NPLEASE_GET_READY_HEROES, ExShowScreenMessage.TOP_CENTER, 5000, true);
 					startQuestTimer("ANNOUNCE_RAID_PREP", 15000, null, player);
 				}
 				break;
@@ -169,7 +169,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 				final Instance world = npc.getInstanceWorld();
 				if (isInInstance(world))
 				{
-					showOnScreenMsg(world, NpcStringId.MARY_REED_SUMMONS_ZAKEN, ExShowScreenMessage.TOP_CENTER, 5000, true);
+					showOnScreenMsg(world, NpcStringId.MARY_REED_SUMMONS_ZAKEN_NZAKEN_WILL_BE_HERE_VERY_SOON, ExShowScreenMessage.TOP_CENTER, 5000, true);
 					startQuestTimer("MARY_REED_SPAWNS_ZAKEN", 10000, npc, null);
 				}
 				break;
@@ -179,7 +179,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 				final Instance world = npc.getInstanceWorld();
 				if (isInInstance(world))
 				{
-					showOnScreenMsg(world, NpcStringId.ZAKEN_YOUR_TIME_HAS_COME, ExShowScreenMessage.TOP_CENTER, 5000, true);
+					showOnScreenMsg(world, NpcStringId.ZAKEN_YOUR_TIME_HAS_COME_KILL_THEM_ALL, ExShowScreenMessage.TOP_CENTER, 5000, true);
 					world.spawnGroup("MARY_REED_MINION_ZAKEN");
 				}
 				break;

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java

@@ -42,7 +42,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 	private static final NpcStringId[] TAUTI_MESSAGES =
 	{
 		NpcStringId.TAUTI_INTENDS_TO_SHOW_OFF_HIS_POWER_TO_HIS_FOLLOWERS,
-		NpcStringId.TAUTI_INTENDS_TO_SHOW_OFF_HIS_POWER_TO_THOSE_WHO_AVOID_HIM
+		NpcStringId.TAUTI_IS_GOING_TO_CRUSH_DOWN_THOSE_WHO_ARE_RUNNING_AWAY
 	};
 	
 	public ThroneOfHeroesTauti()
@@ -86,7 +86,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 				final Instance world = player.getInstanceWorld();
 				if (isInInstance(world))
 				{
-					showOnScreenMsg(world, NpcStringId.THE_CHALLENGE_FOR_THE_THRONE_OF_HEROES_TAUTI_WILL_BEGIN_SHORTLY, ExShowScreenMessage.TOP_CENTER, 5000, true);
+					showOnScreenMsg(world, NpcStringId.THE_CHALLENGE_FOR_THE_THRONE_OF_HEROES_TAUTI_WILL_BEGIN_SHORTLY_NPLEASE_GET_READY_HEROES, ExShowScreenMessage.TOP_CENTER, 5000, true);
 					startQuestTimer("ANNOUNCE_RAID_PREP", 15000, null, player);
 				}
 				break;

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/LetterQuest.java

@@ -180,7 +180,7 @@ public abstract class LetterQuest extends Quest
 				}
 				else if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player))
 				{
-					showOnScreenMsg(player, NpcStringId.YOU_CANNOT_TELEPORT_IN_COMBAT, ExShowScreenMessage.TOP_CENTER, 5000);
+					showOnScreenMsg(player, NpcStringId.YOU_CANNOT_TELEPORT_WHILE_IN_COMBAT_MODE, ExShowScreenMessage.TOP_CENTER, 5000);
 				}
 				else if (player.isTransformed())
 				{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java

@@ -208,7 +208,7 @@ public class Q10591_NobleMaterial extends Quest
 					basicRewards(player);
 					player.setNobleLevel(1);
 					player.broadcastInfo();
-					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000);
+					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_S1_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 					qs.exitQuest(false, true);
 					htmltext = event;
 				}
@@ -223,7 +223,7 @@ public class Q10591_NobleMaterial extends Quest
 					basicRewards(player);
 					player.setNobleLevel(1);
 					player.broadcastInfo();
-					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000);
+					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_S1_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 					qs.exitQuest(false, true);
 					htmltext = event;
 				}
@@ -238,7 +238,7 @@ public class Q10591_NobleMaterial extends Quest
 					basicRewards(player);
 					player.setNobleLevel(1);
 					player.broadcastInfo();
-					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000);
+					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_S1_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 					qs.exitQuest(false, true);
 					htmltext = event;
 				}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java

@@ -51,7 +51,7 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 	private static final int LEONA_BLACKBIRDS_MESSAGE = 48545;
 	// Misc
 	private static final int MIN_LEVEL = 103;
-	private final NpcStringId _startMessage = NpcStringId.A_MESSAGE_HAS_ARRIVED_FROM_LEONA_BLACKBIRD_NCLICK_THE_QUESTION_MARK_ICON_TO_READ_IT;
+	private final NpcStringId _startMessage = NpcStringId.YOU_VE_GOT_A_MESSAGE_FROM_LEONA_BLACKBIRD_NCLICK_THE_QUESTION_MARK_ICON_TO_READ;
 	
 	public Q10885_SaviorsPathDiscovery()
 	{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java

@@ -353,7 +353,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 						{
 							qs.setCond(4, true);
 							qs.unset(KILL_COUNT_VAR);
-							showOnScreenMsg(killer, NpcStringId.USE_SCROLL_OF_ESCAPE_SILVAN_IN_YOUR_INVENTORY_NTALK_TO_SILVAN_TO_COMPLETE_THE_QUEST, ExShowScreenMessage.TOP_CENTER, 10000);
+							showOnScreenMsg(killer, NpcStringId.USE_TELEPORTATION_CUBE_IN_YOUR_INVENTORY_NTALK_TO_SILVAN_TO_COMPLETE_THE_QUEST, ExShowScreenMessage.TOP_CENTER, 10000);
 						}
 					}
 					break;
@@ -374,7 +374,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 						{
 							qs.setCond(7, true);
 							qs.unset(KILL_COUNT_VAR2);
-							showOnScreenMsg(killer, NpcStringId.USE_SCROLL_OF_ESCAPE_TARTI_IN_YOUR_INVENTORY_NTALK_TO_TARTI_TO_COMPLETE_THE_QUEST, ExShowScreenMessage.TOP_CENTER, 10000);
+							showOnScreenMsg(killer, NpcStringId.USE_TELEPORTATION_CUBE_IN_YOUR_INVENTORY_NTALK_TO_TARTI_TO_COMPLETE_THE_QUEST, ExShowScreenMessage.TOP_CENTER, 10000);
 						}
 					}
 					break;