lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of proper system messages.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-02-11 20:09:38 +00:00
parent 220e0b716c
commit 85759e26ca
275 changed files with 7681 additions and 6374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java vendored
View File

@ -1174,7 +1174,7 @@ public class Frintezza extends Quest
if ((creature instanceof PlayerInstance) && (Rnd.get(100) < 80)) if ((creature instanceof PlayerInstance) && (Rnd.get(100) < 80))
{ {
skill.getEffects(_frintezza, creature, false, false, false); skill.getEffects(_frintezza, creature, false, false, false);
creature.sendPacket(new SystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT).addSkillName(5008, 4)); creature.sendPacket(new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU).addSkillName(5008, 4));
} }
} }
} }
@ -1193,7 +1193,7 @@ public class Frintezza extends Quest
creature.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); creature.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
skill.getEffects(_frintezza, creature, false, false, false); skill.getEffects(_frintezza, creature, false, false, false);
creature.startAbnormalEffect(Creature.ABNORMAL_EFFECT_DANCE_STUNNED); creature.startAbnormalEffect(Creature.ABNORMAL_EFFECT_DANCE_STUNNED);
creature.sendPacket(new SystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT).addSkillName(5008, 5)); creature.sendPacket(new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU).addSkillName(5008, 5));
} }
} }
startQuestTimer("stop_effect", 25000, _frintezza, null); startQuestTimer("stop_effect", 25000, _frintezza, null);

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java vendored
View File

@ -223,7 +223,7 @@ public class Q508_AClansReputation extends Quest
htmltext = "30868-" + raid + "b.htm"; htmltext = "30868-" + raid + "b.htm";
st.takeItems(item, 1); st.takeItems(item, 1);
clan.setReputationScore(clan.getReputationScore() + reward, true); clan.setReputationScore(clan.getReputationScore() + reward, true);
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED).addNumber(reward)); player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addNumber(reward));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
} }
} }

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java vendored
View File

@ -210,7 +210,7 @@ public class Q509_TheClansPrestige extends Quest
htmltext = "31331-" + raid + "b.htm"; htmltext = "31331-" + raid + "b.htm";
st.takeItems(item, 1); st.takeItems(item, 1);
clan.setReputationScore(clan.getReputationScore() + reward, true); clan.setReputationScore(clan.getReputationScore() + reward, true);
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED).addNumber(reward)); player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addNumber(reward));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
} }
} }

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q510_AClansReputation/Q510_AClansReputation.java vendored
View File

@ -113,7 +113,7 @@ public class Q510_AClansReputation extends Quest
st.takeItems(CLAW, -1); st.takeItems(CLAW, -1);
final Clan clan = player.getClan(); final Clan clan = player.getClan();
clan.setReputationScore(clan.getReputationScore() + reward, true); clan.setReputationScore(clan.getReputationScore() + reward, true);
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED).addNumber(reward)); player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addNumber(reward));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
htmltext = "31331-7.htm"; htmltext = "31331-7.htm";

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java vendored
View File

@ -454,7 +454,7 @@ public class OracleTeleport extends Quest
} }
else if (player.getAllActiveQuests().size() >= 25) else if (player.getAllActiveQuests().size() >= 25)
{ {
player.sendPacket(SystemMessageId.TOO_MANY_QUESTS); player.sendPacket(SystemMessageId.YOU_CURRENTLY_HAVE_TOO_MANY_QUESTS_IN_PROGRESS);
st.exitQuest(true); st.exitQuest(true);
} }
else if (!st.hasQuestItems(7079)) else if (!st.hasQuestItems(7079))

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java
View File

@ -77,7 +77,7 @@ public class RecipeController
return; return;
} }
player.sendPacket(new SystemMessage(SystemMessageId.CANT_ALTER_RECIPEBOOK_WHILE_CRAFTING)); player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_ALTER_YOUR_RECIPE_BOOK_WHILE_ENGAGED_IN_MANUFACTURING));
} }
public synchronized void requestMakeItemAbort(PlayerInstance player) public synchronized void requestMakeItemAbort(PlayerInstance player)
@ -129,7 +129,7 @@ public class RecipeController
{ {
if (player.isInDuel()) if (player.isInDuel())
{ {
player.sendPacket(SystemMessageId.CANT_CRAFT_DURING_COMBAT); player.sendPacket(SystemMessageId.WHILE_YOU_ARE_ENGAGED_IN_COMBAT_YOU_CANNOT_OPERATE_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
return; return;
} }
@ -267,7 +267,7 @@ public class RecipeController
_price = temp.getCost(); _price = temp.getCost();
if (_target.getAdena() < _price) // check price if (_target.getAdena() < _price) // check price
{ {
_target.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA); _target.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
abort(); abort();
return; return;
} }
@ -422,7 +422,7 @@ public class RecipeController
if (adenatransfer == null) if (adenatransfer == null)
{ {
_target.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA); _target.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
abort(); abort();
return; return;
} }
@ -514,7 +514,7 @@ public class RecipeController
if (_target == _player) if (_target == _player)
{ {
// you equipped ... // you equipped ...
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_EQUIPPED); final SystemMessage sm = new SystemMessage(SystemMessageId.EQUIPPED_S1_S2);
sm.addNumber(count); sm.addNumber(count);
sm.addItemName(item.getItemId()); sm.addItemName(item.getItemId());
_player.sendPacket(sm); _player.sendPacket(sm);
@ -659,14 +659,14 @@ public class RecipeController
SystemMessage sm = null; SystemMessage sm = null;
if (itemCount > 1) if (itemCount > 1)
{ {
sm = new SystemMessage(SystemMessageId.EARNED_S2_S1_S); sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(itemId); sm.addItemName(itemId);
sm.addNumber(itemCount); sm.addNumber(itemCount);
_target.sendPacket(sm); _target.sendPacket(sm);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.EARNED_ITEM); sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
sm.addItemName(itemId); sm.addItemName(itemId);
_target.sendPacket(sm); _target.sendPacket(sm);
} }
@ -674,7 +674,7 @@ public class RecipeController
if (_target != _player) if (_target != _player)
{ {
// inform manufacturer of earned profit // inform manufacturer of earned profit
sm = new SystemMessage(SystemMessageId.EARNED_ADENA); sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_ADENA);
sm.addNumber(_price); sm.addNumber(_price);
_player.sendPacket(sm); _player.sendPacket(sm);
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
View File

@ -257,7 +257,7 @@ public class Shutdown extends Thread
// announce only every minute after 10 minutes left and every second after 20 seconds // announce only every minute after 10 minutes left and every second after 20 seconds
if (((seconds <= 20) || (seconds == (minutes * 10))) && (seconds <= 600) && (hours <= 1)) if (((seconds <= 20) || (seconds == (minutes * 10))) && (seconds <= 600) && (hours <= 1))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECONDS); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECOND_S_PLEASE_FIND_A_SAFE_PLACE_TO_LOG_OUT);
sm.addString(Integer.toString(seconds)); sm.addString(Integer.toString(seconds));
Announcements.getInstance().announceToAll(sm); Announcements.getInstance().announceToAll(sm);
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/CommunityBoard.java
View File

@ -57,7 +57,7 @@ public class CommunityBoard
if (!Config.ENABLE_COMMUNITY_BOARD) if (!Config.ENABLE_COMMUNITY_BOARD)
{ {
player.sendPacket(SystemMessageId.CB_OFFLINE); player.sendPacket(SystemMessageId.THE_COMMUNITY_SERVER_IS_CURRENTLY_OFFLINE);
return; return;
} }
@ -113,7 +113,7 @@ public class CommunityBoard
if (!Config.ENABLE_COMMUNITY_BOARD) if (!Config.ENABLE_COMMUNITY_BOARD)
{ {
player.sendPacket(SystemMessageId.CB_OFFLINE); player.sendPacket(SystemMessageId.THE_COMMUNITY_SERVER_IS_CURRENTLY_OFFLINE);
return; return;
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java
View File

@ -217,7 +217,7 @@ public class ClanBBSManager extends BaseBBSManager
if (clan.getLevel() < 2) if (clan.getLevel() < 2)
{ {
activeChar.sendPacket(SystemMessageId.NO_CB_IN_MY_CLAN); activeChar.sendPacket(SystemMessageId.THERE_ARE_NO_COMMUNITIES_IN_MY_CLAN_CLAN_COMMUNITIES_ARE_ALLOWED_FOR_CLANS_WITH_SKILL_LEVELS_OF_2_AND_HIGHER);
sendClanList(activeChar, 1); sendClanList(activeChar, 1);
return; return;
} }
@ -321,7 +321,7 @@ public class ClanBBSManager extends BaseBBSManager
if (clan.getLevel() < 2) if (clan.getLevel() < 2)
{ {
activeChar.sendPacket(SystemMessageId.NO_CB_IN_MY_CLAN); activeChar.sendPacket(SystemMessageId.THERE_ARE_NO_COMMUNITIES_IN_MY_CLAN_CLAN_COMMUNITIES_ARE_ALLOWED_FOR_CLANS_WITH_SKILL_LEVELS_OF_2_AND_HIGHER);
sendClanList(activeChar, 1); sendClanList(activeChar, 1);
return; return;
} }

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java
View File

@ -551,7 +551,7 @@ public class MailBBSManager extends BaseBBSManager
// Check sender mails based on previous timestamp. If more than 10 mails have been found for today, then cancel the use. // Check sender mails based on previous timestamp. If more than 10 mails have been found for today, then cancel the use.
if (getPlayerMails(activeChar.getObjectId()).stream().filter(l -> l.sentDate.after(ts) && (l.location == MailType.SENTBOX)).count() >= 10) if (getPlayerMails(activeChar.getObjectId()).stream().filter(l -> l.sentDate.after(ts) && (l.location == MailType.SENTBOX)).count() >= 10)
{ {
activeChar.sendPacket(SystemMessageId.NO_MORE_MESSAGES_TODAY); activeChar.sendPacket(SystemMessageId.NO_MORE_MESSAGES_MAY_BE_SENT_AT_THIS_TIME_EACH_ACCOUNT_IS_ALLOWED_10_MESSAGES_PER_DAY);
return; return;
} }
@ -559,7 +559,7 @@ public class MailBBSManager extends BaseBBSManager
final String[] recipientNames = recipients.trim().split(";"); final String[] recipientNames = recipients.trim().split(";");
if ((recipientNames.length > 5) && !activeChar.isGM()) if ((recipientNames.length > 5) && !activeChar.isGM())
{ {
activeChar.sendPacket(SystemMessageId.ONLY_FIVE_RECIPIENTS); activeChar.sendPacket(SystemMessageId.YOU_ARE_LIMITED_TO_FIVE_RECIPIENTS_AT_A_TIME);
return; return;
} }
@ -585,7 +585,7 @@ public class MailBBSManager extends BaseBBSManager
final int recipientId = CharNameTable.getInstance().getPlayerObjectId(recipientName); final int recipientId = CharNameTable.getInstance().getPlayerObjectId(recipientName);
if ((recipientId <= 0) || (recipientId == activeChar.getObjectId())) if ((recipientId <= 0) || (recipientId == activeChar.getObjectId()))
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
continue; continue;
} }
@ -596,24 +596,24 @@ public class MailBBSManager extends BaseBBSManager
// Sender is a regular player, while recipient is a GM. // Sender is a regular player, while recipient is a GM.
if (isGM(recipientId)) if (isGM(recipientId))
{ {
activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_MAIL_GM_S1).addString(recipientName)); activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MESSAGE_TO_S1_DID_NOT_REACH_IT_S_RECIPIENT_YOU_CANNOT_SEND_MAIL_TO_THE_GM_STAFF).addString(recipientName));
continue; continue;
} }
// The recipient is on block mode. // The recipient is on block mode.
if (isBlocked(activeChar, recipientId)) if (isBlocked(activeChar, recipientId))
{ {
activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_BLOCKED_YOU_CANNOT_MAIL).addString(recipientName)); activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BLOCKED_YOU_YOU_CANNOT_SEND_MAIL_TO_S1).addString(recipientName));
continue; continue;
} }
// The recipient box is already full. // The recipient box is already full.
if (isRecipInboxFull(recipientId)) if (isRecipInboxFull(recipientId))
{ {
activeChar.sendPacket(SystemMessageId.MESSAGE_NOT_SENT); activeChar.sendPacket(SystemMessageId.THE_MESSAGE_WAS_NOT_SENT);
if (recipientPlayer != null) if (recipientPlayer != null)
{ {
recipientPlayer.sendPacket(SystemMessageId.MAILBOX_FULL); recipientPlayer.sendPacket(SystemMessageId.YOUR_MAILBOX_IS_FULL_THERE_IS_A_100_MESSAGE_LIMIT);
} }
continue; continue;
@ -652,7 +652,7 @@ public class MailBBSManager extends BaseBBSManager
if (recipientPlayer != null) if (recipientPlayer != null)
{ {
recipientPlayer.sendPacket(SystemMessageId.NEW_MAIL); recipientPlayer.sendPacket(SystemMessageId.YOU_VE_GOT_MAIL);
recipientPlayer.sendPacket(new PlaySound("systemmsg_e.1233")); recipientPlayer.sendPacket(new PlaySound("systemmsg_e.1233"));
recipientPlayer.sendPacket(ExMailArrived.STATIC_PACKET); recipientPlayer.sendPacket(ExMailArrived.STATIC_PACKET);
} }
@ -683,7 +683,7 @@ public class MailBBSManager extends BaseBBSManager
letter.unread = false; letter.unread = false;
getPlayerMails(activeChar.getObjectId()).add(0, letter); getPlayerMails(activeChar.getObjectId()).add(0, letter);
activeChar.sendPacket(SystemMessageId.SENT_MAIL); activeChar.sendPacket(SystemMessageId.YOU_VE_SENT_MAIL);
} }
} }
catch (Exception e) catch (Exception e)

22
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/ClanTable.java
View File

@ -170,19 +170,19 @@ public class ClanTable
if (10 > player.getLevel()) if (10 > player.getLevel())
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IR_ORDER_TO_CREATE_A_CLAN);
return null; return null;
} }
if (0 != player.getClanId()) if (0 != player.getClanId())
{ {
player.sendPacket(SystemMessageId.FAILED_TO_CREATE_CLAN); player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null; return null;
} }
if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) if (System.currentTimeMillis() < player.getClanCreateExpiryTime())
{ {
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_XX_DAYS_BEFORE_CREATING_A_NEW_CLAN); player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null; return null;
} }
@ -210,7 +210,7 @@ public class ClanTable
player.sendPacket(new PledgeShowMemberListAll(clan, player)); player.sendPacket(new PledgeShowMemberListAll(clan, player));
player.sendPacket(new UserInfo(player)); player.sendPacket(new UserInfo(player));
player.sendPacket(new PledgeShowMemberListUpdate(player)); player.sendPacket(new PledgeShowMemberListUpdate(player));
player.sendPacket(SystemMessageId.CLAN_CREATED); player.sendPacket(SystemMessageId.YOUR_CLAN_HAS_BEEN_CREATED);
return clan; return clan;
} }
@ -219,13 +219,13 @@ public class ClanTable
{ {
if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2)) if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2))
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return false; return false;
} }
if (clanName.length() > 16) if (clanName.length() > 16)
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_TOO_LONG); player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT);
return false; return false;
} }
@ -252,7 +252,7 @@ public class ClanTable
if (!match.matches()) if (!match.matches())
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return false; return false;
} }
@ -453,11 +453,11 @@ public class ClanTable
LOGGER.warning("Could not store clans wars data " + e); LOGGER.warning("Could not store clans wars data " + e);
} }
SystemMessage msg = new SystemMessage(SystemMessageId.CLAN_WAR_DECLARED_AGAINST_S1_IF_KILLED_LOSE_LOW_EXP); SystemMessage msg = new SystemMessage(SystemMessageId.A_CLAN_WAR_HAS_BEEN_DECLARED_AGAINST_THE_CLAN_S1_IF_YOU_ARE_KILLED_DURING_THE_CLAN_WAR_BY_MEMBERS_OF_THE_OPPOSING_CLAN_YOU_WILL_ONLY_LOSE_A_QUARTER_OF_THE_NORMAL_EXPERIENCE_FROM_DEATH);
msg.addString(clan2.getName()); msg.addString(clan2.getName());
clan1.broadcastToOnlineMembers(msg); clan1.broadcastToOnlineMembers(msg);
msg = new SystemMessage(SystemMessageId.CLAN_S1_DECLARED_WAR); msg = new SystemMessage(SystemMessageId.THE_CLAN_S1_HAS_DECLARED_A_CLAN_WAR);
msg.addString(clan1.getName()); msg.addString(clan1.getName());
clan2.broadcastToOnlineMembers(msg); clan2.broadcastToOnlineMembers(msg);
} }
@ -485,11 +485,11 @@ public class ClanTable
LOGGER.warning("Could not restore clans wars data " + e); LOGGER.warning("Could not restore clans wars data " + e);
} }
SystemMessage msg = new SystemMessage(SystemMessageId.WAR_AGAINST_S1_HAS_STOPPED); SystemMessage msg = new SystemMessage(SystemMessageId.THE_WAR_AGAINST_S1_CLAN_HAS_BEEN_STOPPED);
msg.addString(clan2.getName()); msg.addString(clan2.getName());
clan1.broadcastToOnlineMembers(msg); clan1.broadcastToOnlineMembers(msg);
msg = new SystemMessage(SystemMessageId.CLAN_S1_HAS_DECIDED_TO_STOP); msg = new SystemMessage(SystemMessageId.THE_CLAN_S1_HAS_DECIDED_TO_STOP_THE_WAR);
msg.addString(clan1.getName()); msg.addString(clan1.getName());
clan2.broadcastToOnlineMembers(msg); clan2.broadcastToOnlineMembers(msg);
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java
View File

@ -332,7 +332,7 @@ public class AdminData implements IXmlReader
} }
else else
{ {
player.sendPacket(new SystemMessage(SystemMessageId.NO_GM_PROVIDING_SERVICE_NOW)); player.sendPacket(new SystemMessage(SystemMessageId.THERE_ARE_NO_GMS_CURRENTLY_VISIBLE_IN_THE_PUBLIC_LIST_AS_THEY_MAY_BE_PERFORMING_OTHER_FUNCTIONS_AT_THE_MOMENT));
} }
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBan.java
View File

@ -89,7 +89,7 @@ public class AdminBan implements IAdminCommandHandler
if ((targetPlayer != null) && targetPlayer.equals(activeChar)) if ((targetPlayer != null) && targetPlayer.equals(activeChar))
{ {
activeChar.sendPacket(SystemMessageId.CANNOT_USE_ON_YOURSELF); activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ON_YOURSELF);
return false; return false;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java
View File

@ -291,7 +291,7 @@ public class AdminCreateItem implements IAdminCommandHandler
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addItem(item); iu.addItem(item);
player.sendPacket(iu); player.sendPacket(iu);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_PICKED_UP_S1_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
sm.addItemName(item.getItemId()); sm.addItemName(item.getItemId());
sm.addNumber(num); sm.addNumber(num);
player.sendPacket(sm); player.sendPacket(sm);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCursedWeapons.java
View File

@ -83,7 +83,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, " Don't exist in the world."); BuilderUtil.sendSysMessage(activeChar, " Don't exist in the world.");
} }
activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOT); activeChar.sendPacket(SystemMessageId.EMPTY_3);
} }
} }
else if (command.equalsIgnoreCase("admin_cw_info_menu")) else if (command.equalsIgnoreCase("admin_cw_info_menu"))

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDelete.java
View File

@ -74,7 +74,7 @@ public class AdminDelete implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java
View File

@ -166,7 +166,7 @@ public class AdminEditChar implements IAdminCommandHandler
} }
if (oldName == null) if (oldName == null)
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false; return false;
} }
BuilderUtil.sendSysMessage(activeChar, "Name changed from " + oldName + " to " + val); BuilderUtil.sendSysMessage(activeChar, "Name changed from " + oldName + " to " + val);
@ -240,7 +240,7 @@ public class AdminEditChar implements IAdminCommandHandler
showCharacterInfo(activeChar, target); showCharacterInfo(activeChar, target);
return true; return true;
} }
activeChar.sendPacket(SystemMessageId.CHARACTER_DOES_NOT_EXIST); activeChar.sendPacket(SystemMessageId.THAT_CHARACTER_DOES_NOT_EXIST);
return false; return false;
} }
case "admin_show_characters": case "admin_show_characters":
@ -608,7 +608,7 @@ public class AdminEditChar implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false; return false;
} }
return true; return true;

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java
View File

@ -183,7 +183,7 @@ public class AdminEffects implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
return false; return false;
} }
} }
@ -634,7 +634,7 @@ public class AdminEffects implements IAdminCommandHandler
if (!(obj instanceof Creature)) if (!(obj instanceof Creature))
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }
else else
{ {

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEnchant.java
View File

@ -173,7 +173,7 @@ public class AdminEnchant implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminExpSp.java
View File

@ -101,7 +101,7 @@ public class AdminExpSp implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
@ -126,7 +126,7 @@ public class AdminExpSp implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false; return false;
} }
@ -176,7 +176,7 @@ public class AdminExpSp implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false; return false;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java
View File

@ -203,7 +203,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
npc2 = (Creature) activeChar.getTarget(); npc2 = (Creature) activeChar.getTarget();
if (npc2 == null) if (npc2 == null)
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFortSiege.java
View File

@ -84,7 +84,7 @@ public class AdminFortSiege implements IAdminCommandHandler
{ {
if (player == null) if (player == null)
{ {
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
} }
else else
{ {
@ -95,7 +95,7 @@ public class AdminFortSiege implements IAdminCommandHandler
{ {
if (player == null) if (player == null)
{ {
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
} }
else else
{ {
@ -124,7 +124,7 @@ public class AdminFortSiege implements IAdminCommandHandler
{ {
if ((player == null) || (player.getClan() == null)) if ((player == null) || (player.getClan() == null))
{ {
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
} }
else else
{ {

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmChat.java
View File

@ -75,12 +75,12 @@ public class AdminGmChat implements IAdminCommandHandler
if (target == null) if (target == null)
{ {
activeChar.sendPacket(SystemMessageId.YOU_MUST_SELECT_A_TARGET); activeChar.sendPacket(SystemMessageId.SELECT_TARGET);
return; return;
} }
if (!(target instanceof PlayerInstance)) if (!(target instanceof PlayerInstance))
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
final PlayerInstance player = (PlayerInstance) target; final PlayerInstance player = (PlayerInstance) target;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java
View File

@ -69,7 +69,7 @@ public class AdminGmSpeed implements IAdminCommandHandler
if ((val == 0) && sendMessage) if ((val == 0) && sendMessage)
{ {
player.sendPacket(new SystemMessage(SystemMessageId.EFFECT_S1_DISAPPEARED).addSkillName(SUPER_HASTE_ID)); player.sendPacket(new SystemMessage(SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED).addSkillName(SUPER_HASTE_ID));
} }
else if ((val >= 1) && (val <= 4)) else if ((val >= 1) && (val <= 4))
{ {

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java
View File

@ -124,7 +124,7 @@ public class AdminHeal implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }
} }
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminKill.java
View File

@ -117,7 +117,7 @@ public class AdminKill implements IAdminCommandHandler
if ((obj == null) || (obj instanceof ControllableMobInstance) || !(obj instanceof Creature)) if ((obj == null) || (obj instanceof ControllableMobInstance) || !(obj instanceof Creature))
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }
else else
{ {

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminLevel.java
View File

@ -68,7 +68,7 @@ public class AdminLevel implements IAdminCommandHandler
{ {
if ((targetChar == null) || !(targetChar instanceof Playable)) if ((targetChar == null) || !(targetChar instanceof Playable))
{ {
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); // incorrect activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET); // incorrect
return false; return false;
} }

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java
View File

@ -105,7 +105,7 @@ public class AdminMenu implements IAdminCommandHandler
if (player == null) if (player == null)
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return true; return true;
} }
@ -137,7 +137,7 @@ public class AdminMenu implements IAdminCommandHandler
if (player == null) if (player == null)
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return true; return true;
} }
@ -280,7 +280,7 @@ public class AdminMenu implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }
AdminHelpPage.showHelpPage(activeChar, filename); AdminHelpPage.showHelpPage(activeChar, filename);
@ -307,13 +307,13 @@ public class AdminMenu implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
if (player.getObjectId() == activeChar.getObjectId()) if (player.getObjectId() == activeChar.getObjectId())
{ {
player.sendPacket(SystemMessageId.CANNOT_USE_ON_YOURSELF); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ON_YOURSELF);
} }
else else
{ {

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMobGroup.java
View File

@ -653,7 +653,7 @@ public class AdminMobGroup implements IAdminCommandHandler
activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getNpcId() + " (" + mobGroup.getStatus() + ")"); activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getNpcId() + " (" + mobGroup.getStatus() + ")");
} }
activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOT); activeChar.sendPacket(SystemMessageId.EMPTY_3);
} }
@Override @Override

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPetition.java
View File

@ -78,7 +78,7 @@ public class AdminPetition implements IAdminCommandHandler
{ {
if (PetitionManager.getInstance().isPlayerInConsultation(activeChar)) if (PetitionManager.getInstance().isPlayerInConsultation(activeChar))
{ {
activeChar.sendPacket(SystemMessageId.ONLY_ONE_ACTIVE_PETITION_AT_TIME); activeChar.sendPacket(SystemMessageId.YOU_MAY_ONLY_SUBMIT_ONE_PETITION_ACTIVE_AT_A_TIME);
return true; return true;
} }
int petitionId = -1; int petitionId = -1;
@ -123,7 +123,7 @@ public class AdminPetition implements IAdminCommandHandler
} }
if (!PetitionManager.getInstance().rejectPetition(activeChar, petitionId)) if (!PetitionManager.getInstance().rejectPetition(activeChar, petitionId))
{ {
activeChar.sendPacket(SystemMessageId.FAILED_CANCEL_PETITION_TRY_LATER); activeChar.sendPacket(SystemMessageId.FAILED_TO_CANCEL_PETITION_PLEASE_TRY_AGAIN_LATER);
return false; return false;
} }
return true; return true;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java
View File

@ -83,7 +83,7 @@ public class AdminPledge implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
showMainPage(activeChar); showMainPage(activeChar);
return false; return false;
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPolymorph.java
View File

@ -110,7 +110,7 @@ public class AdminPolymorph implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }
} }
@ -125,7 +125,7 @@ public class AdminPolymorph implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRes.java
View File

@ -115,7 +115,7 @@ public class AdminRes implements IAdminCommandHandler
if (obj instanceof ControllableMobInstance) if (obj instanceof ControllableMobInstance)
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
@ -158,7 +158,7 @@ public class AdminRes implements IAdminCommandHandler
if ((obj == null) || (obj instanceof PlayerInstance) || (obj instanceof ControllableMobInstance)) if ((obj == null) || (obj instanceof PlayerInstance) || (obj instanceof ControllableMobInstance))
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSiege.java
View File

@ -109,7 +109,7 @@ public class AdminSiege implements IAdminCommandHandler
{ {
if (player == null) if (player == null)
{ {
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
} }
else if (SiegeManager.getInstance().checkIsRegistered(player.getClan(), castle.getCastleId())) else if (SiegeManager.getInstance().checkIsRegistered(player.getClan(), castle.getCastleId()))
{ {
@ -124,7 +124,7 @@ public class AdminSiege implements IAdminCommandHandler
{ {
if (player == null) if (player == null)
{ {
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
} }
else else
{ {
@ -165,7 +165,7 @@ public class AdminSiege implements IAdminCommandHandler
{ {
if ((player == null) || (player.getClan() == null)) if ((player == null) || (player.getClan() == null))
{ {
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
} }
else else
{ {
@ -189,7 +189,7 @@ public class AdminSiege implements IAdminCommandHandler
{ {
if ((player == null) || (player.getClan() == null)) if ((player == null) || (player.getClan() == null))
{ {
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
} }
else if (!ClanHallManager.getInstance().isFree(clanhall.getId())) else if (!ClanHallManager.getInstance().isFree(clanhall.getId()))
{ {

20
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java
View File

@ -190,7 +190,7 @@ public class AdminSkill implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
@ -252,7 +252,7 @@ public class AdminSkill implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
return; return;
} }
@ -335,7 +335,7 @@ public class AdminSkill implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
@ -358,13 +358,13 @@ public class AdminSkill implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
if (player.getName().equals(activeChar.getName())) if (player.getName().equals(activeChar.getName()))
{ {
player.sendPacket(SystemMessageId.CANNOT_USE_ON_YOURSELF); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ON_YOURSELF);
} }
else else
{ {
@ -399,7 +399,7 @@ public class AdminSkill implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
@ -460,7 +460,7 @@ public class AdminSkill implements IAdminCommandHandler
else else
{ {
showMainPage(activeChar); showMainPage(activeChar);
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
@ -517,7 +517,7 @@ public class AdminSkill implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
@ -553,7 +553,7 @@ public class AdminSkill implements IAdminCommandHandler
else else
{ {
showMainPage(activeChar); showMainPage(activeChar);
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
@ -578,7 +578,7 @@ public class AdminSkill implements IAdminCommandHandler
if (skill != null) if (skill != null)
{ {
final String skillname = skill.getName(); final String skillname = skill.getName();
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_SKILL_S1_ADDED); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED);
sm.addSkillName(id); sm.addSkillName(id);
player.sendPacket(sm); player.sendPacket(sm);
player.getClan().broadcastToOnlineMembers(sm); player.getClan().broadcastToOnlineMembers(sm);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java
View File

@ -172,7 +172,7 @@ public class AdminSpawn implements IAdminCommandHandler
{ {
for (PlayerInstance player : World.getInstance().getAllPlayers()) for (PlayerInstance player : World.getInstance().getAllPlayers())
{ {
player.sendPacket(SystemMessageId.NPC_SERVER_NOT_OPERATING); player.sendPacket(SystemMessageId.THE_NPC_SERVER_IS_NOT_OPERATING_AT_THIS_TIME);
} }
RaidBossSpawnManager.getInstance().cleanUp(); RaidBossSpawnManager.getInstance().cleanUp();
DayNightSpawnManager.getInstance().cleanUp(); DayNightSpawnManager.getInstance().cleanUp();
@ -329,7 +329,7 @@ public class AdminSpawn implements IAdminCommandHandler
} }
catch (Exception e) catch (Exception e)
{ {
activeChar.sendPacket(SystemMessageId.TARGET_CANT_FOUND); activeChar.sendPacket(SystemMessageId.YOUR_TARGET_CANNOT_BE_FOUND);
} }
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java
View File

@ -60,7 +60,7 @@ public class AdminSuperHaste implements IAdminCommandHandler
if ((val == 0) && sendMessage) if ((val == 0) && sendMessage)
{ {
player.sendPacket(new SystemMessage(SystemMessageId.EFFECT_S1_DISAPPEARED).addSkillName(SUPER_HASTE_ID)); player.sendPacket(new SystemMessage(SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED).addSkillName(SUPER_HASTE_ID));
} }
else if ((val >= 1) && (val <= 4)) else if ((val >= 1) && (val <= 4))
{ {

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java
View File

@ -502,7 +502,7 @@ public class AdminTeleport implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
@ -536,13 +536,13 @@ public class AdminTeleport implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return; return;
} }
if (player.getObjectId() == activeChar.getObjectId()) if (player.getObjectId() == activeChar.getObjectId())
{ {
player.sendPacket(SystemMessageId.CANNOT_USE_ON_YOURSELF); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ON_YOURSELF);
} }
else else
{ {
@ -614,7 +614,7 @@ public class AdminTeleport implements IAdminCommandHandler
} }
else else
{ {
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }
} }
} }

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java
View File

@ -56,7 +56,7 @@ public class BeastSoulShot implements IItemHandler
if (playable instanceof Summon) if (playable instanceof Summon)
{ {
activeOwner = ((Summon) playable).getOwner(); activeOwner = ((Summon) playable).getOwner();
activeOwner.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM); activeOwner.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM);
return; return;
} }
@ -74,13 +74,13 @@ public class BeastSoulShot implements IItemHandler
if (activePet == null) if (activePet == null)
{ {
activeOwner.sendPacket(SystemMessageId.PETS_ARE_NOT_AVAILABLE_AT_THIS_TIME); activeOwner.sendPacket(SystemMessageId.PETS_AND_SERVITORS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
return; return;
} }
if (activePet.isDead()) if (activePet.isDead())
{ {
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET); activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
return; return;
} }
@ -119,7 +119,7 @@ public class BeastSoulShot implements IItemHandler
if ((shotCount <= shotConsumption)) if ((shotCount <= shotConsumption))
{ {
// Not enough Soulshots to use. // Not enough Soulshots to use.
activeOwner.sendPacket(SystemMessageId.NOT_ENOUGH_SOULSHOTS_FOR_PET); activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
return; return;
} }
@ -142,18 +142,18 @@ public class BeastSoulShot implements IItemHandler
{ {
activeOwner.removeAutoSoulShot(itemId); activeOwner.removeAutoSoulShot(itemId);
activeOwner.sendPacket(new ExAutoSoulShot(itemId, 0)); activeOwner.sendPacket(new ExAutoSoulShot(itemId, 0));
final SystemMessage sm = new SystemMessage(SystemMessageId.AUTO_USE_OF_S1_CANCELLED); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addString(item.getItem().getName()); sm.addString(item.getItem().getName());
activeOwner.sendPacket(sm); activeOwner.sendPacket(sm);
return; return;
} }
activeOwner.sendPacket(SystemMessageId.NOT_ENOUGH_SOULSHOTS); activeOwner.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SOULSHOTS_FOR_THAT);
return; return;
} }
// Pet uses the power of spirit. // Pet uses the power of spirit.
activeOwner.sendPacket(SystemMessageId.PET_USE_THE_POWER_OF_SPIRIT); activeOwner.sendPacket(SystemMessageId.PET_USES_THE_POWER_OF_SPIRIT);
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(activePet, activePet, 2033, 1, 0, 0), 360000/* 600 */); Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(activePet, activePet, 2033, 1, 0, 0), 360000/* 600 */);
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java
View File

@ -46,7 +46,7 @@ public class BeastSpice implements IItemHandler
if (!(player.getTarget() instanceof FeedableBeastInstance)) if (!(player.getTarget() instanceof FeedableBeastInstance))
{ {
player.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); player.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
return; return;
} }

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java
View File

@ -57,7 +57,7 @@ public class BeastSpiritShot implements IItemHandler
if (playable instanceof Summon) if (playable instanceof Summon)
{ {
activeOwner = ((Summon) playable).getOwner(); activeOwner = ((Summon) playable).getOwner();
activeOwner.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM); activeOwner.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM);
return; return;
} }
else if (playable instanceof PlayerInstance) else if (playable instanceof PlayerInstance)
@ -73,13 +73,13 @@ public class BeastSpiritShot implements IItemHandler
final Summon activePet = activeOwner.getPet(); final Summon activePet = activeOwner.getPet();
if (activePet == null) if (activePet == null)
{ {
activeOwner.sendPacket(SystemMessageId.PETS_ARE_NOT_AVAILABLE_AT_THIS_TIME); activeOwner.sendPacket(SystemMessageId.PETS_AND_SERVITORS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
return; return;
} }
if (activePet.isDead()) if (activePet.isDead())
{ {
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET); activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
return; return;
} }
@ -97,7 +97,7 @@ public class BeastSpiritShot implements IItemHandler
if (weaponInst == null) if (weaponInst == null)
{ {
activeOwner.sendPacket(SystemMessageId.CANNOT_USE_SPIRITSHOTS); activeOwner.sendPacket(SystemMessageId.YOU_MAY_NOT_USE_SPIRITSHOTS);
return; return;
} }
@ -112,14 +112,14 @@ public class BeastSpiritShot implements IItemHandler
if (shotConsumption == 0) if (shotConsumption == 0)
{ {
activeOwner.sendPacket(SystemMessageId.CANNOT_USE_SPIRITSHOTS); activeOwner.sendPacket(SystemMessageId.YOU_MAY_NOT_USE_SPIRITSHOTS);
return; return;
} }
if ((shotCount <= shotConsumption)) if ((shotCount <= shotConsumption))
{ {
// Not enough SpiritShots to use. // Not enough SpiritShots to use.
activeOwner.sendPacket(SystemMessageId.NOT_ENOUGH_SPIRITHOTS_FOR_PET); activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SPIRITSHOTS_NEEDED_FOR_A_PET_SERVITOR);
return; return;
} }
@ -155,19 +155,19 @@ public class BeastSpiritShot implements IItemHandler
{ {
activeOwner.removeAutoSoulShot(itemId); activeOwner.removeAutoSoulShot(itemId);
activeOwner.sendPacket(new ExAutoSoulShot(itemId, 0)); activeOwner.sendPacket(new ExAutoSoulShot(itemId, 0));
final SystemMessage sm = new SystemMessage(SystemMessageId.AUTO_USE_OF_S1_CANCELLED); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addString(item.getItem().getName()); sm.addString(item.getItem().getName());
activeOwner.sendPacket(sm); activeOwner.sendPacket(sm);
return; return;
} }
activeOwner.sendPacket(SystemMessageId.NOT_ENOUGH_SPIRITSHOTS); activeOwner.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SPIRITSHOTS_FOR_THAT);
return; return;
} }
// Pet uses the power of spirit. // Pet uses the power of spirit.
activeOwner.sendPacket(SystemMessageId.PET_USE_THE_POWER_OF_SPIRIT); activeOwner.sendPacket(SystemMessageId.PET_USES_THE_POWER_OF_SPIRIT);
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(activePet, activePet, isBlessed ? 2009 : 2008, 1, 0, 0), 360000/* 600 */); Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(activePet, activePet, isBlessed ? 2009 : 2008, 1, 0, 0), 360000/* 600 */);
} }

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java
View File

@ -70,7 +70,7 @@ public class BlessedSpiritShot implements IItemHandler
if (player.isInOlympiadMode()) if (player.isInOlympiadMode())
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT); final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
sm.addString(item.getItemName()); sm.addString(item.getItemName());
player.sendPacket(sm); player.sendPacket(sm);
@ -82,7 +82,7 @@ public class BlessedSpiritShot implements IItemHandler
{ {
if (!player.getAutoSoulShot().containsKey(itemId)) if (!player.getAutoSoulShot().containsKey(itemId))
{ {
player.sendPacket(SystemMessageId.CANNOT_USE_SPIRITSHOTS); player.sendPacket(SystemMessageId.YOU_MAY_NOT_USE_SPIRITSHOTS);
} }
return; return;
@ -100,7 +100,7 @@ public class BlessedSpiritShot implements IItemHandler
{ {
if (!player.getAutoSoulShot().containsKey(itemId)) if (!player.getAutoSoulShot().containsKey(itemId))
{ {
player.sendPacket(SystemMessageId.SPIRITSHOTS_GRADE_MISMATCH); player.sendPacket(SystemMessageId.THE_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE);
} }
return; return;
} }
@ -112,14 +112,14 @@ public class BlessedSpiritShot implements IItemHandler
{ {
player.removeAutoSoulShot(itemId); player.removeAutoSoulShot(itemId);
player.sendPacket(new ExAutoSoulShot(itemId, 0)); player.sendPacket(new ExAutoSoulShot(itemId, 0));
final SystemMessage sm = new SystemMessage(SystemMessageId.AUTO_USE_OF_S1_CANCELLED); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addString(item.getItem().getName()); sm.addString(item.getItem().getName());
player.sendPacket(sm); player.sendPacket(sm);
return; return;
} }
player.sendPacket(SystemMessageId.NOT_ENOUGH_SPIRITSHOTS); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SPIRITSHOTS_FOR_THAT);
return; return;
} }
@ -127,7 +127,7 @@ public class BlessedSpiritShot implements IItemHandler
weaponInst.setChargedSpiritshot(ItemInstance.CHARGED_BLESSED_SPIRITSHOT); weaponInst.setChargedSpiritshot(ItemInstance.CHARGED_BLESSED_SPIRITSHOT);
// Send message to client // Send message to client
player.sendPacket(SystemMessageId.ENABLED_SPIRITSHOT); player.sendPacket(SystemMessageId.POWER_OF_MANA_ENABLED);
Broadcast.toSelfAndKnownPlayersInRadius(player, new MagicSkillUse(player, player, SKILL_IDS[weaponGrade], 1, 0, 0), 360000/* 600 */); Broadcast.toSelfAndKnownPlayersInRadius(player, new MagicSkillUse(player, player, SKILL_IDS[weaponGrade], 1, 0, 0), 360000/* 600 */);
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BreakingArrow.java
View File

@ -45,7 +45,7 @@ public class BreakingArrow implements IItemHandler
final WorldObject target = player.getTarget(); final WorldObject target = player.getTarget();
if (!(target instanceof GrandBossInstance)) if (!(target instanceof GrandBossInstance))
{ {
player.sendPacket(SystemMessageId.INCORRECT_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java
View File

@ -58,7 +58,7 @@ public class ChestKey implements IItemHandler
if (!(target instanceof ChestInstance)) if (!(target instanceof ChestInstance))
{ {
player.sendPacket(SystemMessageId.INCORRECT_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
} }
else else

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java
View File

@ -70,7 +70,7 @@ public class CompBlessedSpiritShotPacks implements IItemHandler
player.getInventory().destroyItem("Extract", item, player, null); player.getInventory().destroyItem("Extract", item, player, null);
player.getInventory().addItem("Extract", itemToCreateId, amount, player, item); player.getInventory().addItem("Extract", itemToCreateId, amount, player, item);
final SystemMessage sm = new SystemMessage(SystemMessageId.EARNED_S2_S1_S); final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(itemToCreateId); sm.addItemName(itemToCreateId);
sm.addNumber(amount); sm.addNumber(amount);
player.sendPacket(sm); player.sendPacket(sm);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompShotPacks.java
View File

@ -92,7 +92,7 @@ public class CompShotPacks implements IItemHandler
player.getInventory().destroyItem("Extract", item, player, null); player.getInventory().destroyItem("Extract", item, player, null);
player.getInventory().addItem("Extract", itemToCreateId, amount, player, item); player.getInventory().addItem("Extract", itemToCreateId, amount, player, item);
final SystemMessage sm = new SystemMessage(SystemMessageId.EARNED_S2_S1_S); final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(itemToCreateId); sm.addItemName(itemToCreateId);
sm.addNumber(amount); sm.addNumber(amount);
player.sendPacket(sm); player.sendPacket(sm);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompSpiritShotPacks.java
View File

@ -69,7 +69,7 @@ public class CompSpiritShotPacks implements IItemHandler
player.getInventory().destroyItem("Extract", item, player, null); player.getInventory().destroyItem("Extract", item, player, null);
player.getInventory().addItem("Extract", itemToCreateId, amount, player, item); player.getInventory().addItem("Extract", itemToCreateId, amount, player, item);
final SystemMessage sm = new SystemMessage(SystemMessageId.EARNED_S2_S1_S); final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(itemToCreateId); sm.addItemName(itemToCreateId);
sm.addNumber(amount); sm.addNumber(amount);
player.sendPacket(sm); player.sendPacket(sm);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java
View File

@ -69,7 +69,7 @@ public class Crystals implements IItemHandler
if (player.isInOlympiadMode()) if (player.isInOlympiadMode())
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
return; return;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java
View File

@ -65,7 +65,7 @@ public class CustomPotions implements IItemHandler
if (player.isInOlympiadMode()) if (player.isInOlympiadMode())
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
return; return;
} }

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java
View File

@ -65,20 +65,20 @@ public class EnergyStone implements IItemHandler
} }
if (player.isSitting()) if (player.isSitting())
{ {
player.sendPacket(SystemMessageId.CANT_MOVE_SITTING); player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING);
return; return;
} }
final SkillCharge skill = getChargeSkill(player); final SkillCharge skill = getChargeSkill(player);
if (skill == null) if (skill == null)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addItemName(5589); sm.addItemName(5589);
player.sendPacket(sm); player.sendPacket(sm);
return; return;
} }
final SystemMessage sm1 = new SystemMessage(SystemMessageId.USE_S1_); final SystemMessage sm1 = new SystemMessage(SystemMessageId.USE_S1);
sm1.addItemName(5589); sm1.addItemName(5589);
player.sendPacket(sm1); player.sendPacket(sm1);
@ -98,13 +98,13 @@ public class EnergyStone implements IItemHandler
if (effect.numCharges < 2) if (effect.numCharges < 2)
{ {
effect.addNumCharges(1); effect.addNumCharges(1);
final SystemMessage sm = new SystemMessage(SystemMessageId.FORCE_INCREASED_TO_S1); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FORCE_HAS_INCREASED_TO_S1_LEVEL);
sm.addNumber(effect.getLevel()); sm.addNumber(effect.getLevel());
player.sendPacket(sm); player.sendPacket(sm);
} }
else if (effect.numCharges == 2) else if (effect.numCharges == 2)
{ {
player.sendPacket(SystemMessageId.FORCE_MAXLEVEL_REACHED); player.sendPacket(SystemMessageId.YOUR_FORCE_HAS_REACHED_MAXIMUM_CAPACITY);
} }
final MagicSkillUse msu = new MagicSkillUse(playable, player, skill.getId(), 1, 1, 0); final MagicSkillUse msu = new MagicSkillUse(playable, player, skill.getId(), 1, 1, 0);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java
View File

@ -98,13 +98,13 @@ public class ExtractableItems implements IItemHandler
SystemMessage sm; SystemMessage sm;
if (createAmount > 1) if (createAmount > 1)
{ {
sm = new SystemMessage(SystemMessageId.EARNED_S2_S1_S); sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(createItemId); sm.addItemName(createItemId);
sm.addNumber(createAmount); sm.addNumber(createAmount);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.EARNED_ITEM); sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
sm.addItemName(createItemId); sm.addItemName(createItemId);
} }
player.sendPacket(sm); player.sendPacket(sm);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java
View File

@ -49,7 +49,7 @@ public class Firework implements IItemHandler
if (!player.getFloodProtectors().getFirework().tryPerformAction("firework")) if (!player.getFloodProtectors().getFirework().tryPerformAction("firework"))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addItemName(itemId); sm.addItemName(itemId);
player.sendPacket(sm); player.sendPacket(sm);
return; return;
@ -63,7 +63,7 @@ public class Firework implements IItemHandler
if (player.isInOlympiadMode()) if (player.isInOlympiadMode())
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
return; return;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java
View File

@ -83,7 +83,7 @@ public class FishShots implements IItemHandler
if (((grade == Item.CRYSTAL_NONE) && (FishshotId != 6535)) || ((grade == Item.CRYSTAL_D) && (FishshotId != 6536)) || ((grade == Item.CRYSTAL_C) && (FishshotId != 6537)) || ((grade == Item.CRYSTAL_B) && (FishshotId != 6538)) || ((grade == Item.CRYSTAL_A) && (FishshotId != 6539)) || ((grade == Item.CRYSTAL_S) && (FishshotId != 6540))) if (((grade == Item.CRYSTAL_NONE) && (FishshotId != 6535)) || ((grade == Item.CRYSTAL_D) && (FishshotId != 6536)) || ((grade == Item.CRYSTAL_C) && (FishshotId != 6537)) || ((grade == Item.CRYSTAL_B) && (FishshotId != 6538)) || ((grade == Item.CRYSTAL_A) && (FishshotId != 6539)) || ((grade == Item.CRYSTAL_S) && (FishshotId != 6540)))
{ {
// 1479 - This fishing shot is not fit for the fishing pole crystal. // 1479 - This fishing shot is not fit for the fishing pole crystal.
player.sendPacket(SystemMessageId.WRONG_FISHINGSHOT_GRADE); player.sendPacket(SystemMessageId.THAT_IS_THE_WRONG_GRADE_OF_SOULSHOT_FOR_THAT_FISHING_POLE);
return; return;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java
View File

@ -53,7 +53,7 @@ public class Harvester implements IItemHandler
final PlayerInstance player = (PlayerInstance) playable; final PlayerInstance player = (PlayerInstance) playable;
if (!(player.getTarget() instanceof MonsterInstance)) if (!(player.getTarget() instanceof MonsterInstance))
{ {
player.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); player.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java
View File

@ -54,7 +54,7 @@ public class MOSKey implements IItemHandler
if (!(target instanceof DoorInstance)) if (!(target instanceof DoorInstance))
{ {
player.sendPacket(SystemMessageId.INCORRECT_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java
View File

@ -44,13 +44,13 @@ public class Nectar implements IItemHandler
if (!(player.getTarget() instanceof GourdInstance)) if (!(player.getTarget() instanceof GourdInstance))
{ {
player.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); player.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
return; return;
} }
if (!player.getName().equalsIgnoreCase(((GourdInstance) player.getTarget()).getOwner())) if (!player.getName().equalsIgnoreCase(((GourdInstance) player.getTarget()).getOwner()))
{ {
player.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); player.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
return; return;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/PaganKeys.java
View File

@ -57,7 +57,7 @@ public class PaganKeys implements IItemHandler
if (!(target instanceof DoorInstance)) if (!(target instanceof DoorInstance))
{ {
player.sendPacket(SystemMessageId.INCORRECT_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
View File

@ -235,7 +235,7 @@ public class Potions implements IItemHandler
if (activeChar.isInOlympiadMode()) if (activeChar.isInOlympiadMode())
{ {
activeChar.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT); activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
return; return;
} }
@ -413,7 +413,7 @@ public class Potions implements IItemHandler
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.INCOMPATIBLE_ITEM_GRADE); // INCOMPATIBLE_ITEM_GRADE final SystemMessage sm = new SystemMessage(SystemMessageId.INCOMPATIBLE_ITEM_GRADE_THIS_ITEM_CANNOT_BE_USED); // INCOMPATIBLE_ITEM_GRADE
sm.addItemName(itemId); sm.addItemName(itemId);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }
@ -437,7 +437,7 @@ public class Potions implements IItemHandler
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.INCOMPATIBLE_ITEM_GRADE); // INCOMPATIBLE_ITEM_GRADE final SystemMessage sm = new SystemMessage(SystemMessageId.INCOMPATIBLE_ITEM_GRADE_THIS_ITEM_CANNOT_BE_USED); // INCOMPATIBLE_ITEM_GRADE
sm.addItemName(itemId); sm.addItemName(itemId);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }
@ -461,7 +461,7 @@ public class Potions implements IItemHandler
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.INCOMPATIBLE_ITEM_GRADE); // INCOMPATIBLE_ITEM_GRADE final SystemMessage sm = new SystemMessage(SystemMessageId.INCOMPATIBLE_ITEM_GRADE_THIS_ITEM_CANNOT_BE_USED); // INCOMPATIBLE_ITEM_GRADE
sm.addItemName(itemId); sm.addItemName(itemId);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }
@ -758,7 +758,7 @@ public class Potions implements IItemHandler
{ {
return true; return true;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_PREPARED_FOR_REUSE); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
sm.addItemName(itemId); sm.addItemName(itemId);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
@ -794,7 +794,7 @@ public class Potions implements IItemHandler
{ {
if ((skill.getId() != 2166)) if ((skill.getId() != 2166))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_PREPARED_FOR_REUSE); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
sm.addSkillName(skill.getId(), skill.getLevel()); sm.addSkillName(skill.getId(), skill.getLevel());
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }
@ -840,7 +840,7 @@ public class Potions implements IItemHandler
{ {
if ((skill.getId() != 2166)) if ((skill.getId() != 2166))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_PREPARED_FOR_REUSE); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
sm.addSkillName(skill.getId(), skill.getLevel()); sm.addSkillName(skill.getId(), skill.getLevel());
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java
View File

@ -48,7 +48,7 @@ public class Recipes implements IItemHandler
final RecipeList recipe = RecipeData.getInstance().getRecipeByItemId(item.getItemId()); final RecipeList recipe = RecipeData.getInstance().getRecipeByItemId(item.getItemId());
if (player.hasRecipeList(recipe.getId())) if (player.hasRecipeList(recipe.getId()))
{ {
player.sendPacket(new SystemMessage(SystemMessageId.RECIPE_ALREADY_REGISTERED)); player.sendPacket(new SystemMessage(SystemMessageId.THAT_RECIPE_IS_ALREADY_REGISTERED));
} }
else if (recipe.isDwarvenRecipe()) else if (recipe.isDwarvenRecipe())
{ {
@ -57,11 +57,11 @@ public class Recipes implements IItemHandler
if (recipe.getLevel() > player.getDwarvenCraft()) if (recipe.getLevel() > player.getDwarvenCraft())
{ {
// Cannot add recipe, because create item level too low. // Cannot add recipe, because create item level too low.
player.sendPacket(new SystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER)); player.sendPacket(new SystemMessage(SystemMessageId.YOUR_CREATE_ITEM_LEVEL_IS_TOO_LOW_TO_REGISTER_THIS_RECIPE));
} }
else if (player.getDwarvenRecipeBook().length >= player.getDwarfRecipeLimit()) else if (player.getDwarvenRecipeBook().length >= player.getDwarfRecipeLimit())
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_REGISTER); final SystemMessage sm = new SystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_BE_REGISTERED);
sm.addNumber(player.getDwarfRecipeLimit()); sm.addNumber(player.getDwarfRecipeLimit());
player.sendPacket(sm); player.sendPacket(sm);
} }
@ -70,14 +70,14 @@ public class Recipes implements IItemHandler
player.registerDwarvenRecipeList(recipe); player.registerDwarvenRecipeList(recipe);
player.saveRecipeIntoDB(recipe); player.saveRecipeIntoDB(recipe);
player.destroyItem("Consume", item.getObjectId(), 1, null, false); player.destroyItem("Consume", item.getObjectId(), 1, null, false);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_ADDED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ADDED);
sm.addString(item.getItemName()); sm.addString(item.getItemName());
player.sendPacket(sm); player.sendPacket(sm);
} }
} }
else else
{ {
player.sendPacket(new SystemMessage(SystemMessageId.CANT_REGISTER_NO_ABILITY_TO_CRAFT)); player.sendPacket(new SystemMessage(SystemMessageId.THE_RECIPE_CANNOT_BE_REGISTERED_YOU_DO_NOT_HAVE_THE_ABILITY_TO_CREATE_ITEMS));
} }
} }
else if (player.hasCommonCraft()) else if (player.hasCommonCraft())
@ -85,11 +85,11 @@ public class Recipes implements IItemHandler
if (recipe.getLevel() > player.getCommonCraft()) if (recipe.getLevel() > player.getCommonCraft())
{ {
// Cannot add recipe, because create item level too low. // Cannot add recipe, because create item level too low.
player.sendPacket(new SystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER)); player.sendPacket(new SystemMessage(SystemMessageId.YOUR_CREATE_ITEM_LEVEL_IS_TOO_LOW_TO_REGISTER_THIS_RECIPE));
} }
else if (player.getCommonRecipeBook().length >= player.getCommonRecipeLimit()) else if (player.getCommonRecipeBook().length >= player.getCommonRecipeLimit())
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_REGISTER); final SystemMessage sm = new SystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_BE_REGISTERED);
sm.addNumber(player.getCommonRecipeLimit()); sm.addNumber(player.getCommonRecipeLimit());
player.sendPacket(sm); player.sendPacket(sm);
} }
@ -98,14 +98,14 @@ public class Recipes implements IItemHandler
player.registerCommonRecipeList(recipe); player.registerCommonRecipeList(recipe);
player.saveRecipeIntoDB(recipe); player.saveRecipeIntoDB(recipe);
player.destroyItem("Consume", item.getObjectId(), 1, null, false); player.destroyItem("Consume", item.getObjectId(), 1, null, false);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_ADDED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ADDED);
sm.addString(item.getItemName()); sm.addString(item.getItemName());
player.sendPacket(sm); player.sendPacket(sm);
} }
} }
else else
{ {
player.sendPacket(new SystemMessage(SystemMessageId.CANT_REGISTER_NO_ABILITY_TO_CRAFT)); player.sendPacket(new SystemMessage(SystemMessageId.THE_RECIPE_CANNOT_BE_REGISTERED_YOU_DO_NOT_HAVE_THE_ABILITY_TO_CREATE_ITEMS));
} }
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java
View File

@ -57,7 +57,7 @@ public class Remedy implements IItemHandler
if (player.isInOlympiadMode()) if (player.isInOlympiadMode())
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
return; return;
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/RollingDice.java
View File

@ -53,7 +53,7 @@ public class RollingDice implements IItemHandler
if (!player.getFloodProtectors().getRollDice().tryPerformAction("RollDice")) if (!player.getFloodProtectors().getRollDice().tryPerformAction("RollDice"))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addItemName(itemId); sm.addItemName(itemId);
player.sendPacket(sm); player.sendPacket(sm);
return; return;
@ -61,7 +61,7 @@ public class RollingDice implements IItemHandler
if (player.isInOlympiadMode()) if (player.isInOlympiadMode())
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
return; return;
} }
@ -87,7 +87,7 @@ public class RollingDice implements IItemHandler
Broadcast.toSelfAndKnownPlayers(player, new Dice(player.getObjectId(), item.getItemId(), number, destination.getX(), destination.getY(), destination.getZ())); Broadcast.toSelfAndKnownPlayers(player, new Dice(player.getObjectId(), item.getItemId(), number, destination.getX(), destination.getY(), destination.getZ()));
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_ROLLED_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_ROLLED_S2);
sm.addString(player.getName()); sm.addString(player.getName());
sm.addNumber(number); sm.addNumber(number);
player.sendPacket(sm); player.sendPacket(sm);

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
View File

@ -99,7 +99,7 @@ public class ScrollOfEscape implements IItemHandler
// Check to see if player is sitting // Check to see if player is sitting
if (player.isSitting()) if (player.isSitting())
{ {
player.sendPacket(SystemMessageId.CANT_MOVE_SITTING); player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING);
return; return;
} }
@ -130,7 +130,7 @@ public class ScrollOfEscape implements IItemHandler
// Check to see if player is on olympiad // Check to see if player is on olympiad
if (player.isInOlympiadMode()) if (player.isInOlympiadMode())
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
return; return;
} }
@ -196,7 +196,7 @@ public class ScrollOfEscape implements IItemHandler
// End SoE Animation section // End SoE Animation section
player.setTarget(null); player.setTarget(null);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
sm.addItemName(itemId); sm.addItemName(itemId);
player.sendPacket(sm); player.sendPacket(sm);
@ -261,7 +261,7 @@ public class ScrollOfEscape implements IItemHandler
} }
else if (_itemId == 5858) // do nothing else if (_itemId == 5858) // do nothing
{ {
_player.sendPacket(SystemMessageId.CLAN_HAS_NO_CLAN_HALL); _player.sendPacket(SystemMessageId.THE_CLAN_DOES_NOT_OWN_A_CLAN_HALL);
} }
else if ((_player.getKarma() > 0) && Config.ALT_KARMA_TELEPORT_TO_FLORAN) else if ((_player.getKarma() > 0) && Config.ALT_KARMA_TELEPORT_TO_FLORAN)
{ {

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java
View File

@ -52,7 +52,7 @@ public class ScrollOfResurrection implements IItemHandler
if (player.isSitting()) if (player.isSitting())
{ {
player.sendPacket(SystemMessageId.CANT_MOVE_SITTING); player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING);
return; return;
} }
@ -106,7 +106,7 @@ public class ScrollOfResurrection implements IItemHandler
if ((castle != null) && castle.getSiege().isInProgress()) if ((castle != null) && castle.getSiege().isInProgress())
{ {
condGood = false; condGood = false;
player.sendPacket(SystemMessageId.CANNOT_BE_RESURRECTED_DURING_SIEGE); player.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEFIELDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
} }
if (targetPet != null) if (targetPet != null)
@ -117,11 +117,11 @@ public class ScrollOfResurrection implements IItemHandler
{ {
if (targetPet.getOwner().isRevivingPet()) if (targetPet.getOwner().isRevivingPet())
{ {
player.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed. player.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
} }
else else
{ {
player.sendPacket(SystemMessageId.PET_CANNOT_RES); // A pet cannot be resurrected while it's owner is in the process of resurrecting. player.sendPacket(SystemMessageId.A_PET_CANNOT_BE_RESURRECTED_WHILE_IT_S_OWNER_IS_IN_THE_PROCESS_OF_RESURRECTING); // A pet cannot be resurrected while it's owner is in the process of resurrecting.
} }
condGood = false; condGood = false;
} }
@ -143,11 +143,11 @@ public class ScrollOfResurrection implements IItemHandler
{ {
if (targetPlayer.isRevivingPet()) if (targetPlayer.isRevivingPet())
{ {
player.sendPacket(SystemMessageId.MASTER_CANNOT_RES); // While a pet is attempting to resurrect, it cannot help in resurrecting its master. player.sendPacket(SystemMessageId.WHILE_A_PET_IS_ATTEMPTING_TO_RESURRECT_IT_CANNOT_HELP_IN_RESURRECTING_ITS_MASTER); // While a pet is attempting to resurrect, it cannot help in resurrecting its master.
} }
else else
{ {
player.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed. player.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
} }
condGood = false; condGood = false;
} }
@ -198,7 +198,7 @@ public class ScrollOfResurrection implements IItemHandler
return; return;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
sm.addItemName(itemId); sm.addItemName(itemId);
player.sendPacket(sm); player.sendPacket(sm);
} }
@ -207,7 +207,7 @@ public class ScrollOfResurrection implements IItemHandler
} }
else else
{ {
player.sendPacket(SystemMessageId.TARGET_IS_INCORRECT); player.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
} }
} }

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java
View File

@ -105,7 +105,7 @@ public class Scrolls implements IItemHandler
if (player.isInOlympiadMode()) if (player.isInOlympiadMode())
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
return; return;
} }
@ -135,7 +135,7 @@ public class Scrolls implements IItemHandler
} }
else else
{ {
player.sendPacket(SystemMessageId.INCOMPATIBLE_ITEM_GRADE); player.sendPacket(SystemMessageId.INCOMPATIBLE_ITEM_GRADE_THIS_ITEM_CANNOT_BE_USED);
} }
return; return;
} }
@ -158,7 +158,7 @@ public class Scrolls implements IItemHandler
} }
else else
{ {
player.sendPacket(SystemMessageId.INCOMPATIBLE_ITEM_GRADE); player.sendPacket(SystemMessageId.INCOMPATIBLE_ITEM_GRADE_THIS_ITEM_CANNOT_BE_USED);
} }
return; return;
} }
@ -182,7 +182,7 @@ public class Scrolls implements IItemHandler
} }
else else
{ {
player.sendPacket(SystemMessageId.INCOMPATIBLE_ITEM_GRADE); player.sendPacket(SystemMessageId.INCOMPATIBLE_ITEM_GRADE_THIS_ITEM_CANNOT_BE_USED);
} }
return; return;
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java
View File

@ -319,7 +319,7 @@ public class Seed implements IItemHandler
if (!(target instanceof NpcInstance)) if (!(target instanceof NpcInstance))
{ {
player.sendPacket(SystemMessageId.INCORRECT_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@ -335,7 +335,7 @@ public class Seed implements IItemHandler
if (monster.isDead()) if (monster.isDead())
{ {
player.sendPacket(SystemMessageId.INCORRECT_TARGET); player.sendPacket(SystemMessageId.INVALID_TARGET);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java
View File

@ -93,7 +93,7 @@ public class SoulCrystals implements IItemHandler
if (!(target instanceof MonsterInstance)) if (!(target instanceof MonsterInstance))
{ {
// Send a System Message to the caster // Send a System Message to the caster
player.sendPacket(new SystemMessage(SystemMessageId.INCORRECT_TARGET)); player.sendPacket(new SystemMessage(SystemMessageId.INVALID_TARGET));
// Send a Server->Client packet ActionFailed to the PlayerInstance // Send a Server->Client packet ActionFailed to the PlayerInstance
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java
View File

@ -82,7 +82,7 @@ public class SoulShots implements IItemHandler
{ {
if (!player.getAutoSoulShot().containsKey(itemId)) if (!player.getAutoSoulShot().containsKey(itemId))
{ {
player.sendPacket(SystemMessageId.SOULSHOTS_GRADE_MISMATCH); player.sendPacket(SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON);
} }
return; return;
} }
@ -107,13 +107,13 @@ public class SoulShots implements IItemHandler
player.removeAutoSoulShot(itemId); player.removeAutoSoulShot(itemId);
player.sendPacket(new ExAutoSoulShot(itemId, 0)); player.sendPacket(new ExAutoSoulShot(itemId, 0));
final SystemMessage sm = new SystemMessage(SystemMessageId.AUTO_USE_OF_S1_CANCELLED); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addString(item.getItem().getName()); sm.addString(item.getItem().getName());
player.sendPacket(sm); player.sendPacket(sm);
} }
else else
{ {
player.sendPacket(SystemMessageId.NOT_ENOUGH_SOULSHOTS); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SOULSHOTS_FOR_THAT);
} }
return; return;
} }
@ -127,7 +127,7 @@ public class SoulShots implements IItemHandler
} }
// Send message to client // Send message to client
player.sendPacket(SystemMessageId.ENABLED_SOULSHOT); player.sendPacket(SystemMessageId.POWER_OF_THE_SPIRITS_ENABLED);
Broadcast.toSelfAndKnownPlayersInRadius(player, new MagicSkillUse(player, player, SKILL_IDS[weaponGrade], 1, 0, 0), 360000/* 600 */); Broadcast.toSelfAndKnownPlayersInRadius(player, new MagicSkillUse(player, player, SKILL_IDS[weaponGrade], 1, 0, 0), 360000/* 600 */);
} }

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java
View File

@ -70,7 +70,7 @@ public class SpiritShot implements IItemHandler
{ {
if (!player.getAutoSoulShot().containsKey(itemId)) if (!player.getAutoSoulShot().containsKey(itemId))
{ {
player.sendPacket(SystemMessageId.CANNOT_USE_SPIRITSHOTS); player.sendPacket(SystemMessageId.YOU_MAY_NOT_USE_SPIRITSHOTS);
} }
return; return;
} }
@ -87,7 +87,7 @@ public class SpiritShot implements IItemHandler
{ {
if (!player.getAutoSoulShot().containsKey(itemId)) if (!player.getAutoSoulShot().containsKey(itemId))
{ {
player.sendPacket(SystemMessageId.SPIRITSHOTS_GRADE_MISMATCH); player.sendPacket(SystemMessageId.THE_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE);
} }
return; return;
} }
@ -100,13 +100,13 @@ public class SpiritShot implements IItemHandler
player.removeAutoSoulShot(itemId); player.removeAutoSoulShot(itemId);
player.sendPacket(new ExAutoSoulShot(itemId, 0)); player.sendPacket(new ExAutoSoulShot(itemId, 0));
final SystemMessage sm = new SystemMessage(SystemMessageId.AUTO_USE_OF_S1_CANCELLED); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addString(item.getItem().getName()); sm.addString(item.getItem().getName());
player.sendPacket(sm); player.sendPacket(sm);
} }
else else
{ {
player.sendPacket(SystemMessageId.NOT_ENOUGH_SPIRITSHOTS); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SPIRITSHOTS_FOR_THAT);
} }
return; return;
} }
@ -115,7 +115,7 @@ public class SpiritShot implements IItemHandler
weaponInst.setChargedSpiritshot(ItemInstance.CHARGED_SPIRITSHOT); weaponInst.setChargedSpiritshot(ItemInstance.CHARGED_SPIRITSHOT);
// Send message to client // Send message to client
player.sendPacket(SystemMessageId.ENABLED_SPIRITSHOT); player.sendPacket(SystemMessageId.POWER_OF_MANA_ENABLED);
Broadcast.toSelfAndKnownPlayersInRadius(player, new MagicSkillUse(player, player, SKILL_IDS[weaponGrade], 1, 0, 0), 360000/* 600 */); Broadcast.toSelfAndKnownPlayersInRadius(player, new MagicSkillUse(player, player, SKILL_IDS[weaponGrade], 1, 0, 0), 360000/* 600 */);
} }

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
View File

@ -85,7 +85,7 @@ public class SummonItems implements IItemHandler
if (player.isSitting()) if (player.isSitting())
{ {
player.sendPacket(SystemMessageId.CANT_MOVE_SITTING); player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING);
return; return;
} }
@ -103,7 +103,7 @@ public class SummonItems implements IItemHandler
if (player.isInOlympiadMode()) if (player.isInOlympiadMode())
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
return; return;
} }
@ -117,13 +117,13 @@ public class SummonItems implements IItemHandler
// Like L2OFF you can't summon pet in combat // Like L2OFF you can't summon pet in combat
if (player.isAttackingNow() || player.isInCombat()) if (player.isAttackingNow() || player.isInCombat())
{ {
player.sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_IN_COMBAT); player.sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_DURING_COMBAT);
return; return;
} }
if (player.isCursedWeaponEquiped() && sitem.isPetSummon()) if (player.isCursedWeaponEquiped() && sitem.isPetSummon())
{ {
player.sendPacket(SystemMessageId.STRIDER_CANT_BE_RIDDEN_WHILE_IN_BATTLE); player.sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE);
return; return;
} }
@ -168,7 +168,7 @@ public class SummonItems implements IItemHandler
// Skill 2046 used only for animation // Skill 2046 used only for animation
final Skill skill = SkillTable.getInstance().getInfo(2046, 1); final Skill skill = SkillTable.getInstance().getInfo(2046, 1);
player.useMagic(skill, true, true); player.useMagic(skill, true, true);
player.sendPacket(SystemMessageId.SUMMON_A_PET); player.sendPacket(SystemMessageId.SUMMONING_YOUR_PET);
ThreadPool.schedule(new PetSummonFinalizer(player, npcTemplate, item), 4800); ThreadPool.schedule(new PetSummonFinalizer(player, npcTemplate, item), 4800);
break; break;
} }

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java
View File

@ -117,13 +117,13 @@ public class Blow implements ISkillHandler
if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss))
{ {
skill.getEffects(creature, target, ss, sps, bss); skill.getEffects(creature, target, ss, sps, bss);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU);
sm.addSkillName(skill); sm.addSkillName(skill);
target.sendPacket(sm); target.sendPacket(sm);
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.ATTACK_FAILED); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_ATTACK_HAS_FAILED);
sm.addSkillName(skill); sm.addSkillName(skill);
creature.sendPacket(sm); creature.sendPacket(sm);
return; return;
@ -217,7 +217,7 @@ public class Blow implements ISkillHandler
player.setCurrentHp(player.getCurrentHp() - damage); player.setCurrentHp(player.getCurrentHp() - damage);
} }
} }
final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_GAVE_YOU_S2_DMG); final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_HIT_YOU_FOR_S2_DAMAGE);
smsg.addString(creature.getName()); smsg.addString(creature.getName());
smsg.addNumber((int) damage); smsg.addNumber((int) damage);
player.sendPacket(smsg); player.sendPacket(smsg);
@ -265,12 +265,12 @@ public class Blow implements ISkillHandler
{ {
if (skillIsEvaded && (target instanceof PlayerInstance)) if (skillIsEvaded && (target instanceof PlayerInstance))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.AVOIDED_S1S_ATTACK); final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_AVOIDED_S1_S_ATTACK);
sm.addString(creature.getName()); sm.addString(creature.getName());
((PlayerInstance) target).sendPacket(sm); ((PlayerInstance) target).sendPacket(sm);
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.ATTACK_FAILED); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_ATTACK_HAS_FAILED);
sm.addSkillName(skill); sm.addSkillName(skill);
creature.sendPacket(sm); creature.sendPacket(sm);
return; return;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java
View File

@ -67,7 +67,7 @@ public class ClanGate implements ISkillHandler
// please note clan gate expires in two minutes WHATEVER happens to the clan leader. // please note clan gate expires in two minutes WHATEVER happens to the clan leader.
ThreadPool.schedule(new RemoveClanGate(castle.getCastleId(), player), skill.getTotalLifeTime()); ThreadPool.schedule(new RemoveClanGate(castle.getCastleId(), player), skill.getTotalLifeTime());
castle.createClanGate(player.getX(), player.getY(), player.getZ() + 20); castle.createClanGate(player.getX(), player.getY(), player.getZ() + 20);
player.getClan().broadcastToOnlineMembers(new SystemMessage(SystemMessageId.COURT_MAGICIAN_CREATED_PORTAL)); player.getClan().broadcastToOnlineMembers(new SystemMessage(SystemMessageId.COURT_MAGICIAN_THE_PORTAL_HAS_BEEN_CREATED));
player.setParalyzed(true); player.setParalyzed(true);
} }
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java
View File

@ -64,7 +64,7 @@ public class CombatPointHeal implements ISkillHandler
{ {
cp = (target.getMaxCp() * cp) / 100.0; cp = (target.getMaxCp() * cp) / 100.0;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CP_WILL_BE_RESTORED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CPS_HAVE_BEEN_RESTORED);
sm.addNumber((int) cp); sm.addNumber((int) cp);
target.sendPacket(sm); target.sendPacket(sm);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java
View File

@ -187,7 +187,7 @@ public class Continuous implements ISkillHandler
if (!acted) if (!acted)
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.ATTACK_FAILED)); creature.sendPacket(new SystemMessage(SystemMessageId.YOUR_ATTACK_HAS_FAILED));
continue; continue;
} }
} }
@ -195,7 +195,7 @@ public class Continuous implements ISkillHandler
{ {
if (player != null) if (player != null)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getDisplayId()); sm.addSkillName(skill.getDisplayId());
creature.sendPacket(sm); creature.sendPacket(sm);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Craft.java
View File

@ -51,7 +51,7 @@ public class Craft implements ISkillHandler
if (player.getPrivateStoreType() != 0) if (player.getPrivateStoreType() != 0)
{ {
player.sendPacket(SystemMessageId.CANNOT_CREATED_WHILE_ENGAGED_IN_TRADING); player.sendPacket(SystemMessageId.AN_ITEM_MAY_NOT_BE_CREATED_WHILE_ENGAGED_IN_TRADING);
return; return;
} }
RecipeController.getInstance().requestBookOpen(player, (skill.getSkillType() == SkillType.DWARVEN_CRAFT)); RecipeController.getInstance().requestBookOpen(player, (skill.getSkillType() == SkillType.DWARVEN_CRAFT));

26
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java
View File

@ -108,7 +108,7 @@ public class Disablers implements ISkillHandler
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getId()); sm.addSkillName(skill.getId());
creature.sendPacket(sm); creature.sendPacket(sm);
@ -126,7 +126,7 @@ public class Disablers implements ISkillHandler
// Calculate skill evasion // Calculate skill evasion
if (Formulas.calcPhysicalSkillEvasion(target, skill)) if (Formulas.calcPhysicalSkillEvasion(target, skill))
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.ATTACK_FAILED)); creature.sendPacket(new SystemMessage(SystemMessageId.YOUR_ATTACK_HAS_FAILED));
break; break;
} }
// Calculate vengeance // Calculate vengeance
@ -148,7 +148,7 @@ public class Disablers implements ISkillHandler
} }
else if (creature instanceof PlayerInstance) else if (creature instanceof PlayerInstance)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getDisplayId()); sm.addSkillName(skill.getDisplayId());
creature.sendPacket(sm); creature.sendPacket(sm);
@ -168,7 +168,7 @@ public class Disablers implements ISkillHandler
} }
else if (creature instanceof PlayerInstance) else if (creature instanceof PlayerInstance)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getDisplayId()); sm.addSkillName(skill.getDisplayId());
creature.sendPacket(sm); creature.sendPacket(sm);
@ -188,7 +188,7 @@ public class Disablers implements ISkillHandler
} }
else if (creature instanceof PlayerInstance) else if (creature instanceof PlayerInstance)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getDisplayId()); sm.addSkillName(skill.getDisplayId());
creature.sendPacket(sm); creature.sendPacket(sm);
@ -212,7 +212,7 @@ public class Disablers implements ISkillHandler
} }
else if (creature instanceof PlayerInstance) else if (creature instanceof PlayerInstance)
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2)); creature.sendPacket(new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2));
} }
break; // Used to be fallthrough. break; // Used to be fallthrough.
} }
@ -282,7 +282,7 @@ public class Disablers implements ISkillHandler
} }
else if (creature instanceof PlayerInstance) else if (creature instanceof PlayerInstance)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getId()); sm.addSkillName(skill.getId());
creature.sendPacket(sm); creature.sendPacket(sm);
@ -310,7 +310,7 @@ public class Disablers implements ISkillHandler
} }
else if (creature instanceof PlayerInstance) else if (creature instanceof PlayerInstance)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getId()); sm.addSkillName(skill.getId());
creature.sendPacket(sm); creature.sendPacket(sm);
@ -343,7 +343,7 @@ public class Disablers implements ISkillHandler
} }
else if (creature instanceof PlayerInstance) else if (creature instanceof PlayerInstance)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getId()); sm.addSkillName(skill.getId());
creature.sendPacket(sm); creature.sendPacket(sm);
@ -411,7 +411,7 @@ public class Disablers implements ISkillHandler
{ {
if (creature instanceof PlayerInstance) if (creature instanceof PlayerInstance)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getDisplayId()); sm.addSkillName(skill.getDisplayId());
creature.sendPacket(sm); creature.sendPacket(sm);
@ -422,7 +422,7 @@ public class Disablers implements ISkillHandler
{ {
if (creature instanceof PlayerInstance) if (creature instanceof PlayerInstance)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getDisplayId()); sm.addSkillName(skill.getDisplayId());
creature.sendPacket(sm); creature.sendPacket(sm);
@ -495,7 +495,7 @@ public class Disablers implements ISkillHandler
} }
else if (creature instanceof PlayerInstance) else if (creature instanceof PlayerInstance)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getDisplayId()); sm.addSkillName(skill.getDisplayId());
creature.sendPacket(sm); creature.sendPacket(sm);
@ -556,7 +556,7 @@ public class Disablers implements ISkillHandler
} }
else if (creature instanceof PlayerInstance) else if (creature instanceof PlayerInstance)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getDisplayId()); sm.addSkillName(skill.getDisplayId());
creature.sendPacket(sm); creature.sendPacket(sm);

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java
View File

@ -73,7 +73,7 @@ public class Fishing implements ISkillHandler
player.endFishing(false); player.endFishing(false);
} }
// Cancels fishing // Cancels fishing
player.sendPacket(SystemMessageId.FISHING_ATTEMPT_CANCELLED); player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED);
return; return;
} }
@ -87,8 +87,8 @@ public class Fishing implements ISkillHandler
if (lure == null) if (lure == null)
{ {
// Bait not equiped. // Bait not equiped.
player.sendPacket(SystemMessageId.CANNOT_FISH_HERE); player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addString(skill.getName()); sm.addString(skill.getName());
player.sendPacket(sm); player.sendPacket(sm);
return; return;
@ -99,20 +99,20 @@ public class Fishing implements ISkillHandler
if ((lure2 == null) || (lure2.getCount() < 1)) // Not enough bait. if ((lure2 == null) || (lure2.getCount() < 1)) // Not enough bait.
{ {
player.sendPacket(SystemMessageId.NOT_ENOUGH_BAIT); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_BAIT);
return; return;
} }
if (player.isInBoat()) if (player.isInBoat())
{ {
// You can't fish while you are on boat // You can't fish while you are on boat
player.sendPacket(SystemMessageId.CANNOT_FISH_ON_BOAT); player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_RIDING_AS_A_PASSENGER_OF_A_BOAT_IT_S_AGAINST_THE_RULES);
return; return;
} }
if (player.isCrafting() || player.isInStoreMode()) if (player.isCrafting() || player.isInStoreMode())
{ {
player.sendPacket(SystemMessageId.CANNOT_FISH_WHILE_USING_RECIPE_BOOK); player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_USING_A_RECIPE_BOOK_PRIVATE_MANUFACTURE_OR_PRIVATE_STORE);
// if(!player.isGM()) // if(!player.isGM())
return; return;
} }
@ -146,8 +146,8 @@ public class Fishing implements ISkillHandler
else else
{ {
// You can't fish here // You can't fish here
player.sendPacket(SystemMessageId.BAIT_ON_HOOK_BEFORE_FISHING); player.sendPacket(SystemMessageId.YOU_MUST_PUT_BAIT_ON_YOUR_HOOK_BEFORE_YOU_CAN_FISH);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addString(skill.getName()); sm.addString(skill.getName());
player.sendPacket(sm); player.sendPacket(sm);
return; return;
@ -157,7 +157,7 @@ public class Fishing implements ISkillHandler
if ((player.getZ() <= -3800) || (player.getZ() < (z - 32))) if ((player.getZ() <= -3800) || (player.getZ() < (z - 32)))
{ {
// You can't fish in water // You can't fish in water
player.sendPacket(SystemMessageId.CANNOT_FISH_UNDER_WATER); player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_UNDER_WATER);
return; return;
} }
// Has enough bait, consume 1 and update inventory. Start fishing follows. // Has enough bait, consume 1 and update inventory. Start fishing follows.

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java
View File

@ -69,7 +69,7 @@ public class FishingSkill implements ISkillHandler
final ItemInstance weaponInst = creature.getActiveWeaponInstance(); final ItemInstance weaponInst = creature.getActiveWeaponInstance();
if ((weaponInst == null) || (weaponItem == null) || (weaponItem.getItemType() != WeaponType.ROD)) if ((weaponInst == null) || (weaponItem == null) || (weaponItem.getItemType() != WeaponType.ROD))
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED)); creature.sendPacket(new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS));
return; return;
} }
@ -85,7 +85,7 @@ public class FishingSkill implements ISkillHandler
int dmg = (int) (skill.getPower() * gradebonus * ss); int dmg = (int) (skill.getPower() * gradebonus * ss);
if (player.getSkillLevel(1315) <= (skill.getLevel() - 2)) // 1315 - Fish Expertise Penalty if (player.getSkillLevel(1315) <= (skill.getLevel() - 2)) // 1315 - Fish Expertise Penalty
{ {
player.sendPacket(SystemMessageId.REELING_PUMPING_3_LEVELS_HIGHER_THAN_FISHING_PENALTY); player.sendPacket(SystemMessageId.DUE_TO_YOUR_REELING_AND_OR_PUMPING_SKILL_BEING_THREE_OR_MORE_LEVELS_HIGHER_THAN_YOUR_FISHING_SKILL_A_50_DAMAGE_PENALTY_WILL_BE_APPLIED);
pen = 50; pen = 50;
final int penatlydmg = dmg - pen; final int penatlydmg = dmg - pen;
if (player.isGM()) if (player.isGM())

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java
View File

@ -114,14 +114,14 @@ public class Harvest implements ISkillHandler
} }
if (send) if (send)
{ {
SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_PICKED_UP_S1_S2); SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
smsg.addNumber(total); smsg.addNumber(total);
smsg.addItemName(cropId); smsg.addItemName(cropId);
_player.sendPacket(smsg); _player.sendPacket(smsg);
if (_player.getParty() != null) if (_player.getParty() != null)
{ {
smsg = new SystemMessage(SystemMessageId.S1_HARVESTED_S3_S2S); smsg = new SystemMessage(SystemMessageId.S1_HARVESTED_S3_S2_S);
smsg.addString(_player.getName()); smsg.addString(_player.getName());
smsg.addNumber(total); smsg.addNumber(total);
smsg.addItemName(cropId); smsg.addItemName(cropId);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java
View File

@ -155,14 +155,14 @@ public class Heal implements ISkillHandler
} }
else if ((creature instanceof PlayerInstance) && (creature != target)) else if ((creature instanceof PlayerInstance) && (creature != target))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_HP_RESTORED_BY_S1); final SystemMessage sm = new SystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_S1);
sm.addString(creature.getName()); sm.addString(creature.getName());
sm.addNumber((int) hp); sm.addNumber((int) hp);
target.sendPacket(sm); target.sendPacket(sm);
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HP_RESTORED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
sm.addNumber((int) hp); sm.addNumber((int) hp);
target.sendPacket(sm); target.sendPacket(sm);
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java
View File

@ -64,14 +64,14 @@ public class ManaHeal implements ISkillHandler
if ((actChar instanceof PlayerInstance) && (actChar != target)) if ((actChar instanceof PlayerInstance) && (actChar != target))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_MP_RESTORED_BY_S1); final SystemMessage sm = new SystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_S1);
sm.addString(actChar.getName()); sm.addString(actChar.getName());
sm.addNumber((int) mp); sm.addNumber((int) mp);
target.sendPacket(sm); target.sendPacket(sm);
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_MP_RESTORED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_MP_HAS_BEEN_RESTORED);
sm.addNumber((int) mp); sm.addNumber((int) mp);
target.sendPacket(sm); target.sendPacket(sm);
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java
View File

@ -70,7 +70,7 @@ public class Manadam implements ISkillHandler
final boolean acted = Formulas.getInstance().calcMagicAffected(creature, target, skill); final boolean acted = Formulas.getInstance().calcMagicAffected(creature, target, skill);
if (target.isInvul() || !acted) if (target.isInvul() || !acted)
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.MISSED_TARGET)); creature.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_MISSED));
} }
else else
{ {
@ -88,7 +88,7 @@ public class Manadam implements ISkillHandler
sump.addAttribute(StatusUpdate.CUR_MP, (int) target.getCurrentMp()); sump.addAttribute(StatusUpdate.CUR_MP, (int) target.getCurrentMp());
target.sendPacket(sump); target.sendPacket(sump);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_MP_HAS_BEEN_DRAINED_BY_S1); final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S_MP_HAS_BEEN_DRAINED_BY_S1);
if (creature instanceof NpcInstance) if (creature instanceof NpcInstance)
{ {
final int mobId = ((NpcInstance) creature).getNpcId(); final int mobId = ((NpcInstance) creature).getNpcId();
@ -108,7 +108,7 @@ public class Manadam implements ISkillHandler
if (creature instanceof PlayerInstance) if (creature instanceof PlayerInstance)
{ {
final SystemMessage sm2 = new SystemMessage(SystemMessageId.YOUR_OPPONENTS_MP_WAS_REDUCED_BY_S1); final SystemMessage sm2 = new SystemMessage(SystemMessageId.YOUR_OPPONENT_S_MP_WAS_REDUCED_BY_S1);
sm2.addNumber((int) mp); sm2.addNumber((int) mp);
creature.sendPacket(sm2); creature.sendPacket(sm2);
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java
View File

@ -96,7 +96,7 @@ public class Mdam implements ISkillHandler
{ {
creature.stopSkillEffects(skill.getId()); creature.stopSkillEffects(skill.getId());
skill.getEffects(null, creature, false, sps, bss); skill.getEffects(null, creature, false, sps, bss);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU);
sm.addSkillName(skill.getId()); sm.addSkillName(skill.getId());
creature.sendPacket(sm); creature.sendPacket(sm);
} }
@ -108,7 +108,7 @@ public class Mdam implements ISkillHandler
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getDisplayId()); sm.addSkillName(skill.getDisplayId());
creature.sendPacket(sm); creature.sendPacket(sm);

20
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java
View File

@ -101,7 +101,7 @@ public class Pdam implements ISkillHandler
// Calculate skill evasion // Calculate skill evasion
if (Formulas.calcPhysicalSkillEvasion(target, skill)) if (Formulas.calcPhysicalSkillEvasion(target, skill))
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.ATTACK_FAILED)); creature.sendPacket(new SystemMessage(SystemMessageId.YOUR_ATTACK_HAS_FAILED));
continue; continue;
} }
@ -142,7 +142,7 @@ public class Pdam implements ISkillHandler
} }
else else
{ {
final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_GAVE_YOU_S2_DMG); final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_HIT_YOU_FOR_S2_DAMAGE);
smsg.addString(target.getName()); smsg.addString(target.getName());
smsg.addNumber(damage); smsg.addNumber(damage);
creature.sendPacket(smsg); creature.sendPacket(smsg);
@ -155,7 +155,7 @@ public class Pdam implements ISkillHandler
creature.stopSkillEffects(skill.getId()); creature.stopSkillEffects(skill.getId());
skill.getEffects(null, creature, ss, sps, bss); skill.getEffects(null, creature, ss, sps, bss);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU);
sm.addSkillName(skill.getId()); sm.addSkillName(skill.getId());
creature.sendPacket(sm); creature.sendPacket(sm);
} }
@ -163,13 +163,13 @@ public class Pdam implements ISkillHandler
{ {
// Like L2OFF must remove the first effect if the second effect lands // Like L2OFF must remove the first effect if the second effect lands
skill.getEffects(creature, target, ss, sps, bss); skill.getEffects(creature, target, ss, sps, bss);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU);
sm.addSkillName(skill.getId()); sm.addSkillName(skill.getId());
target.sendPacket(sm); target.sendPacket(sm);
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getDisplayId()); sm.addSkillName(skill.getDisplayId());
creature.sendPacket(sm); creature.sendPacket(sm);
@ -218,7 +218,7 @@ public class Pdam implements ISkillHandler
} }
// Lethal Strike was succefful! // Lethal Strike was succefful!
creature.sendPacket(new SystemMessage(SystemMessageId.LETHAL_STRIKE)); creature.sendPacket(new SystemMessage(SystemMessageId.LETHAL_STRIKE));
creature.sendPacket(new SystemMessage(SystemMessageId.LETHAL_STRIKE_SUCCESSFUL)); creature.sendPacket(new SystemMessage(SystemMessageId.YOUR_LETHAL_STRIKE_WAS_SUCCESSFUL));
} }
} }
else if (skill.getDmgDirectlyToHP() || !(creature instanceof Playable)) // Make damage directly to HP else if (skill.getDmgDirectlyToHP() || !(creature instanceof Playable)) // Make damage directly to HP
@ -254,7 +254,7 @@ public class Pdam implements ISkillHandler
player.setCurrentHp(player.getCurrentHp() - damage); player.setCurrentHp(player.getCurrentHp() - damage);
} }
} }
final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_GAVE_YOU_S2_DMG); final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_HIT_YOU_FOR_S2_DAMAGE);
smsg.addString(creature.getName()); smsg.addString(creature.getName());
smsg.addNumber(damage); smsg.addNumber(damage);
player.sendPacket(smsg); player.sendPacket(smsg);
@ -292,7 +292,7 @@ public class Pdam implements ISkillHandler
} }
else // No - damage else // No - damage
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.ATTACK_FAILED)); creature.sendPacket(new SystemMessage(SystemMessageId.YOUR_ATTACK_HAS_FAILED));
} }
if ((skill.getId() == 345) || (skill.getId() == 346)) // Sonic Rage or Raging Force if ((skill.getId() == 345) || (skill.getId() == 346)) // Sonic Rage or Raging Force
@ -307,13 +307,13 @@ public class Pdam implements ISkillHandler
effect.addNumCharges(1); effect.addNumCharges(1);
creature.sendPacket(new EtcStatusUpdate((PlayerInstance) creature)); creature.sendPacket(new EtcStatusUpdate((PlayerInstance) creature));
final SystemMessage sm = new SystemMessage(SystemMessageId.FORCE_INCREASED_TO_S1); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FORCE_HAS_INCREASED_TO_S1_LEVEL);
sm.addNumber(effectcharge); sm.addNumber(effectcharge);
creature.sendPacket(sm); creature.sendPacket(sm);
} }
else else
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.FORCE_MAXLEVEL_REACHED)); creature.sendPacket(new SystemMessage(SystemMessageId.YOUR_FORCE_HAS_REACHED_MAXIMUM_CAPACITY));
} }
} }
else if (skill.getId() == 345) // Sonic Rage else if (skill.getId() == 345) // Sonic Rage

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java
View File

@ -50,7 +50,7 @@ public class Recall implements ISkillHandler
if (instance.isInOlympiadMode()) if (instance.isInOlympiadMode())
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT)); creature.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH));
return; return;
} }
@ -63,7 +63,7 @@ public class Recall implements ISkillHandler
if (creature.isInsideZone(ZoneId.PVP)) if (creature.isInsideZone(ZoneId.PVP))
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_SUMMON_IN_COMBAT)); creature.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_SUMMON_DURING_COMBAT));
return; return;
} }
@ -121,7 +121,7 @@ public class Recall implements ISkillHandler
if (targetChar.isInStoreMode()) if (targetChar.isInStoreMode())
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CURRENTLY_TRADING_OR_OPERATING_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_CURRENTLY_TRADING_OR_OPERATING_A_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED);
sm.addString(targetChar.getName()); sm.addString(targetChar.getName());
creature.sendPacket(sm); creature.sendPacket(sm);
continue; continue;
@ -135,7 +135,7 @@ public class Recall implements ISkillHandler
if (targetChar.isInOlympiadMode()) if (targetChar.isInOlympiadMode())
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_SUMMON_PLAYERS_WHO_ARE_IN_OLYMPIAD)); creature.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_SUMMON_PLAYERS_WHO_ARE_CURRENTLY_PARTICIPATING_IN_THE_GRAND_OLYMPIAD));
continue; continue;
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java
View File

@ -62,7 +62,7 @@ public class Spoil implements ISkillHandler
if (target.isSpoil()) if (target.isSpoil())
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.ALREDAY_SPOILED)); creature.sendPacket(new SystemMessage(SystemMessageId.IT_HAS_ALREADY_BEEN_SPOILED));
continue; continue;
} }
@ -75,11 +75,11 @@ public class Spoil implements ISkillHandler
{ {
target.setSpoil(true); target.setSpoil(true);
target.setSpoiledBy(creature.getObjectId()); target.setSpoiledBy(creature.getObjectId());
creature.sendPacket(new SystemMessage(SystemMessageId.SPOIL_SUCCESS)); creature.sendPacket(new SystemMessage(SystemMessageId.THE_SPOIL_CONDITION_HAS_BEEN_ACTIVATED));
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_UNAFFECTED_BY_S2); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getDisplayId()); sm.addSkillName(skill.getDisplayId());
creature.sendPacket(sm); creature.sendPacket(sm);

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java
View File

@ -57,7 +57,7 @@ public class SummonFriend implements ISkillHandler
if (activePlayer.isInOlympiadMode()) if (activePlayer.isInOlympiadMode())
{ {
activePlayer.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT); activePlayer.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_GRAND_OLYMPIAD_GAMES_MATCH);
return; return;
} }
@ -97,7 +97,7 @@ public class SummonFriend implements ISkillHandler
// Checks summoner not in arenas, siege zones, jail // Checks summoner not in arenas, siege zones, jail
if (activePlayer.isInsideZone(ZoneId.PVP)) if (activePlayer.isInsideZone(ZoneId.PVP))
{ {
activePlayer.sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_IN_COMBAT); activePlayer.sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_DURING_COMBAT);
return; return;
} }
@ -167,7 +167,7 @@ public class SummonFriend implements ISkillHandler
if (targetChar.isInStoreMode()) if (targetChar.isInStoreMode())
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CURRENTLY_TRADING_OR_OPERATING_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_CURRENTLY_TRADING_OR_OPERATING_A_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED);
sm.addString(targetChar.getName()); sm.addString(targetChar.getName());
creature.sendPacket(sm); creature.sendPacket(sm);
continue; continue;
@ -190,7 +190,7 @@ public class SummonFriend implements ISkillHandler
// Check for the the target's festival status // Check for the the target's festival status
if (targetChar.isInOlympiadMode()) if (targetChar.isInOlympiadMode())
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_SUMMON_PLAYERS_WHO_ARE_IN_OLYMPIAD)); creature.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_SUMMON_PLAYERS_WHO_ARE_CURRENTLY_PARTICIPATING_IN_THE_GRAND_OLYMPIAD));
continue; continue;
} }
@ -222,7 +222,7 @@ public class SummonFriend implements ISkillHandler
// Check already summon // Check already summon
if (!targetChar.teleportRequest((PlayerInstance) creature, skill)) if (!targetChar.teleportRequest((PlayerInstance) creature, skill))
{ {
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_SUMMONED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ALREADY_BEEN_SUMMONED);
sm.addString(target.getName()); sm.addString(target.getName());
creature.sendPacket(sm); creature.sendPacket(sm);
continue; continue;

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java
View File

@ -96,13 +96,13 @@ public class Sweep implements ISkillHandler
if (ritem.getCount() > 1) if (ritem.getCount() > 1)
{ {
smsg = new SystemMessage(SystemMessageId.EARNED_S2_S1_S); // earned $s2$s1 smsg = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); // earned $s2$s1
smsg.addItemName(ritem.getItemId()); smsg.addItemName(ritem.getItemId());
smsg.addNumber(ritem.getCount()); smsg.addNumber(ritem.getCount());
} }
else else
{ {
smsg = new SystemMessage(SystemMessageId.EARNED_ITEM); // earned $s1 smsg = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1); // earned $s1
smsg.addItemName(ritem.getItemId()); smsg.addItemName(ritem.getItemId());
} }
player.sendPacket(smsg); player.sendPacket(smsg);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java
View File

@ -58,7 +58,7 @@ public class Unlock implements ISkillHandler
final DoorInstance door = (DoorInstance) target; final DoorInstance door = (DoorInstance) target;
if (!door.isUnlockable()) if (!door.isUnlockable())
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.UNABLE_TO_UNLOCK_DOOR)); creature.sendPacket(new SystemMessage(SystemMessageId.THIS_DOOR_CANNOT_BE_UNLOCKED));
creature.sendPacket(ActionFailed.STATIC_PACKET); creature.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@ -71,7 +71,7 @@ public class Unlock implements ISkillHandler
} }
else else
{ {
creature.sendPacket(new SystemMessage(SystemMessageId.FAILED_TO_UNLOCK_DOOR)); creature.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_UNLOCK_THE_DOOR));
} }
} }
else if (target instanceof ChestInstance) else if (target instanceof ChestInstance)

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/ChannelDelete.java
View File

@ -45,7 +45,7 @@ public class ChannelDelete implements IUserCommandHandler
if (player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getChannelLeader().equals(player)) if (player.getParty().isLeader(player) && player.getParty().isInCommandChannel() && player.getParty().getCommandChannel().getChannelLeader().equals(player))
{ {
final CommandChannel channel = player.getParty().getCommandChannel(); final CommandChannel channel = player.getParty().getCommandChannel();
channel.broadcastToChannelMembers(new SystemMessage(SystemMessageId.COMMAND_CHANNEL_DISBANDED)); channel.broadcastToChannelMembers(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
channel.disbandChannel(); channel.disbandChannel();
return true; return true;

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/ChannelLeave.java
View File

@ -54,8 +54,8 @@ public class ChannelLeave implements IUserCommandHandler
final Party party = player.getParty(); final Party party = player.getParty();
channel.removeParty(party); channel.removeParty(party);
party.getLeader().sendPacket(SystemMessageId.LEFT_COMMAND_CHANNEL); party.getLeader().sendPacket(SystemMessageId.YOU_HAVE_QUIT_THE_COMMAND_CHANNEL);
channel.broadcastToChannelMembers(new SystemMessage(SystemMessageId.S1_PARTY_LEFT_COMMAND_CHANNEL).addString(party.getLeader().getName())); channel.broadcastToChannelMembers(new SystemMessage(SystemMessageId.S1_S_PARTY_HAS_LEFT_THE_COMMAND_CHANNEL).addString(party.getLeader().getName()));
return true; return true;
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/ClanWarsList.java
View File

@ -63,7 +63,7 @@ public class ClanWarsList implements IUserCommandHandler
if (id == 88) // Attack List if (id == 88) // Attack List
{ {
player.sendPacket(SystemMessageId.CLANS_YOU_DECLARED_WAR_ON); player.sendPacket(SystemMessageId.CLANS_YOU_VE_DECLARED_WAR_ON);
statement = con.prepareStatement("select clan_name,clan_id,ally_id,ally_name from clan_data,clan_wars where clan1=? and clan_id=clan2 and clan2 not in (select clan1 from clan_wars where clan2=?)"); statement = con.prepareStatement("select clan_name,clan_id,ally_id,ally_name from clan_data,clan_wars where clan1=? and clan_id=clan2 and clan2 not in (select clan1 from clan_wars where clan2=?)");
statement.setInt(1, clan.getClanId()); statement.setInt(1, clan.getClanId());
statement.setInt(2, clan.getClanId()); statement.setInt(2, clan.getClanId());
@ -98,14 +98,14 @@ public class ClanWarsList implements IUserCommandHandler
} }
else // Target Without Ally else // Target Without Ally
{ {
sm = new SystemMessage(SystemMessageId.S1_NO_ALLI_EXISTS); sm = new SystemMessage(SystemMessageId.S1_NO_ALLIANCE_EXISTS);
sm.addString(clanName); sm.addString(clanName);
} }
player.sendPacket(sm); player.sendPacket(sm);
} }
player.sendPacket(SystemMessageId.FRIEND_LIST_FOOT); player.sendPacket(SystemMessageId.EMPTY_3);
rset.close(); rset.close();
statement.close(); statement.close();

40
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Loc.java
View File

@ -39,102 +39,102 @@ public class Loc implements IUserCommandHandler
{ {
case 0: case 0:
{ {
msg = SystemMessageId.LOC_TI_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_TALKING_ISLAND_VILLAGE;
break; break;
} }
case 1: case 1:
{ {
msg = SystemMessageId.LOC_ELVEN_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_ELVEN_VILLAGE;
break; break;
} }
case 2: case 2:
{ {
msg = SystemMessageId.LOC_DARK_ELVEN_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_DARK_ELF_VILLAGE;
break; break;
} }
case 3: case 3:
{ {
msg = SystemMessageId.LOC_ORC_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_ORC_VILLAGE;
break; break;
} }
case 4: case 4:
{ {
msg = SystemMessageId.LOC_DWARVEN_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_DWARVEN_VILLAGE;
break; break;
} }
case 5: case 5:
{ {
msg = SystemMessageId.LOC_GLUDIO_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_TOWN_OF_GLUDIO;
break; break;
} }
case 6: case 6:
{ {
msg = SystemMessageId.LOC_GLUDIN_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_GLUDIN_VILLAGE;
break; break;
} }
case 7: case 7:
{ {
msg = SystemMessageId.LOC_DION_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_TOWN_OF_DION;
break; break;
} }
case 8: case 8:
{ {
msg = SystemMessageId.LOC_GIRAN_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_TOWN_OF_GIRAN;
break; break;
} }
case 9: case 9:
{ {
msg = SystemMessageId.LOC_OREN_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_TOWN_OF_OREN;
break; break;
} }
case 10: case 10:
{ {
msg = SystemMessageId.LOC_ADEN_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_ADEN_CASTLE_TOWN;
break; break;
} }
case 11: case 11:
{ {
msg = SystemMessageId.LOC_HUNTER_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_HUNTERS_VILLAGE;
break; break;
} }
case 12: case 12:
{ {
msg = SystemMessageId.LOC_GIRAN_HARBOR_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_GIRAN_HARBOR;
break; break;
} }
case 13: case 13:
{ {
msg = SystemMessageId.LOC_HEINE_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_HEINE;
break; break;
} }
case 14: case 14:
{ {
msg = SystemMessageId.LOC_RUNE_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_RUNE_VILLAGE;
break; break;
} }
case 15: case 15:
{ {
msg = SystemMessageId.LOC_GODDARD_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_TOWN_OF_GODDARD;
break; break;
} }
case 16: case 16:
{ {
msg = SystemMessageId.LOC_SCHUTTGART_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_TOWN_OF_SCHUTTGART;
break; break;
} }
case 17: case 17:
{ {
msg = SystemMessageId.LOC_FLORAN_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_FLORAN_VILLAGE;
break; break;
} }
case 18: case 18:
{ {
msg = SystemMessageId.LOC_PRIMEVAL_ISLE_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_PRIMEVAL_ISLE;
break; break;
} }
default: default:
{ {
msg = SystemMessageId.LOC_ADEN_S1_S2_S3; msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_ADEN_CASTLE_TOWN;
} }
} }

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Mount.java
View File

@ -52,22 +52,22 @@ public class Mount implements IUserCommandHandler
if (player.isDead()) if (player.isDead())
{ {
// A strider cannot be ridden when player is dead. // A strider cannot be ridden when player is dead.
player.sendPacket(new SystemMessage(SystemMessageId.STRIDER_CANT_BE_RIDDEN_WHILE_DEAD)); player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHEN_DEAD));
} }
else if (pet.isDead()) else if (pet.isDead())
{ {
// A dead strider cannot be ridden. // A dead strider cannot be ridden.
player.sendPacket(new SystemMessage(SystemMessageId.DEAD_STRIDER_CANT_BE_RIDDEN)); player.sendPacket(new SystemMessage(SystemMessageId.A_DEAD_STRIDER_CANNOT_BE_RIDDEN));
} }
else if (pet.isInCombat()) else if (pet.isInCombat())
{ {
// A strider in battle cannot be ridden. // A strider in battle cannot be ridden.
player.sendPacket(new SystemMessage(SystemMessageId.STRIDER_IN_BATLLE_CANT_BE_RIDDEN)); player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_IN_BATTLE_CANNOT_BE_RIDDEN));
} }
else if (player.isInCombat()) else if (player.isInCombat())
{ {
// A pet cannot be ridden while player is in battle. // A pet cannot be ridden while player is in battle.
player.sendPacket(new SystemMessage(SystemMessageId.STRIDER_CANT_BE_RIDDEN_WHILE_IN_BATTLE)); player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE));
} }
else if (!player.isInsideRadius(pet, 60, true, false)) else if (!player.isInsideRadius(pet, 60, true, false))
{ {
@ -76,13 +76,13 @@ public class Mount implements IUserCommandHandler
} }
else if (!GeoEngine.getInstance().canSeeTarget(player, pet)) else if (!GeoEngine.getInstance().canSeeTarget(player, pet))
{ {
player.sendPacket(new SystemMessage(SystemMessageId.CANT_SEE_TARGET)); player.sendPacket(new SystemMessage(SystemMessageId.CANNOT_SEE_TARGET));
return false; return false;
} }
else if (player.isSitting() || player.isMoving()) else if (player.isSitting() || player.isMoving())
{ {
// A strider can be ridden only when player is standing. // A strider can be ridden only when player is standing.
player.sendPacket(new SystemMessage(SystemMessageId.STRIDER_CAN_BE_RIDDEN_ONLY_WHILE_STANDING)); player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CAN_BE_RIDDEN_ONLY_WHEN_STANDING));
} }
else if (!pet.isDead() && !player.isMounted()) else if (!pet.isDead() && !player.isMounted())
{ {

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java
View File

@ -84,7 +84,7 @@ public class OfflineShop implements IUserCommandHandler
if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && (!player.isGM() || !Config.GM_RESTART_FIGHTING)) if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && (!player.isGM() || !Config.GM_RESTART_FIGHTING))
{ {
player.sendPacket(SystemMessageId.CANT_LOGOUT_WHILE_FIGHTING); player.sendPacket(SystemMessageId.YOU_CANNOT_EXIT_WHILE_IN_COMBAT);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return false; return false;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OlympiadStat.java
View File

@ -40,7 +40,7 @@ public class OlympiadStat implements IUserCommandHandler
return false; return false;
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_CURRENT_RECORD_FOR_THIS_OLYMPIAD_SESSION_IS_S1_MATCHES_S2_WINS_S3_DEFEATS_YOU_HAVE_EARNED_S4_OLYMPIAD_POINTS); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_CURRENT_RECORD_FOR_THIS_GRAND_OLYMPIAD_IS_S1_MATCH_ES_S2_WIN_S_AND_S3_DEFEAT_S_YOU_HAVE_EARNED_S4_OLYMPIAD_POINT_S);
sm.addNumber(Olympiad.getInstance().getCompetitionDone(player.getObjectId())); sm.addNumber(Olympiad.getInstance().getCompetitionDone(player.getObjectId()));
sm.addNumber(Olympiad.getInstance().getCompetitionWon(player.getObjectId())); sm.addNumber(Olympiad.getInstance().getCompetitionWon(player.getObjectId()));
sm.addNumber(Olympiad.getInstance().getCompetitionLost(player.getObjectId())); sm.addNumber(Olympiad.getInstance().getCompetitionLost(player.getObjectId()));

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/PartyInfo.java
View File

@ -56,33 +56,33 @@ public class PartyInfo implements IUserCommandHandler
{ {
case Party.ITEM_LOOTER: case Party.ITEM_LOOTER:
{ {
player.sendPacket(SystemMessageId.LOOTING_FINDERS_KEEPERS); player.sendPacket(SystemMessageId.LOOTING_METHOD_FINDERS_KEEPERS);
break; break;
} }
case Party.ITEM_ORDER: case Party.ITEM_ORDER:
{ {
player.sendPacket(SystemMessageId.LOOTING_BY_TURN); player.sendPacket(SystemMessageId.LOOTING_METHOD_BY_TURN);
break; break;
} }
case Party.ITEM_ORDER_SPOIL: case Party.ITEM_ORDER_SPOIL:
{ {
player.sendPacket(SystemMessageId.LOOTING_BY_TURN_INCLUDE_SPOIL); player.sendPacket(SystemMessageId.LOOTING_METHOD_BY_TURN_INCLUDING_SPOIL);
break; break;
} }
case Party.ITEM_RANDOM: case Party.ITEM_RANDOM:
{ {
player.sendPacket(SystemMessageId.LOOTING_RANDOM); player.sendPacket(SystemMessageId.LOOTING_METHOD_RANDOM);
break; break;
} }
case Party.ITEM_RANDOM_SPOIL: case Party.ITEM_RANDOM_SPOIL:
{ {
player.sendPacket(SystemMessageId.LOOTING_RANDOM_INCLUDE_SPOIL); player.sendPacket(SystemMessageId.LOOTING_METHOD_RANDOM_INCLUDING_SPOIL);
break; break;
} }
} }
player.sendPacket(new SystemMessage(SystemMessageId.PARTY_LEADER_S1).addString(partyLeader)); player.sendPacket(new SystemMessage(SystemMessageId.PARTY_LEADER_S1).addString(partyLeader));
player.sendMessage("Members: " + memberCount + "/9"); player.sendMessage("Members: " + memberCount + "/9");
player.sendPacket(SystemMessageId.FRIEND_LIST_FOOT); player.sendPacket(SystemMessageId.EMPTY_3);
return true; return true;
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Time.java
View File

@ -52,13 +52,13 @@ public class Time implements IUserCommandHandler
SystemMessage sm; SystemMessage sm;
if (GameTimeController.getInstance().isNowNight()) if (GameTimeController.getInstance().isNowNight())
{ {
sm = new SystemMessage(SystemMessageId.TIME_S1_S2_IN_THE_NIGHT); sm = new SystemMessage(SystemMessageId.THE_CURRENT_TIME_IS_S1_S2_IN_THE_NIGHT);
sm.addString(h); sm.addString(h);
sm.addString(m); sm.addString(m);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.TIME_S1_S2_IN_THE_DAY); sm = new SystemMessage(SystemMessageId.THE_CURRENT_TIME_IS_S1_S2_IN_THE_DAY);
sm.addString(h); sm.addString(h);
sm.addString(m); sm.addString(m);
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java
View File

@ -85,7 +85,7 @@ public class OfflineShop implements IVoicedCommandHandler
if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && (!player.isGM() || !Config.GM_RESTART_FIGHTING)) if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && (!player.isGM() || !Config.GM_RESTART_FIGHTING))
{ {
player.sendPacket(SystemMessageId.CANT_LOGOUT_WHILE_FIGHTING); player.sendPacket(SystemMessageId.YOU_CANNOT_EXIT_WHILE_IN_COMBAT);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return false; return false;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
View File

@ -175,7 +175,7 @@ public class Wedding implements IVoicedCommandHandler
if (activeChar.getFirstEffect(skill) == null) if (activeChar.getFirstEffect(skill) == null)
{ {
skill.getEffects(activeChar, activeChar, false, false, false); skill.getEffects(activeChar, activeChar, false, false, false);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU);
sm.addSkillName(skillId); sm.addSkillName(skillId);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java
View File

@ -608,7 +608,7 @@ public class ChristmasManager
final String itemName = ItemTable.getInstance().getTemplate(itemId).getName(); final String itemName = ItemTable.getInstance().getTemplate(itemId).getName();
SystemMessage sm; SystemMessage sm;
sm = new SystemMessage(SystemMessageId.EARNED_ITEM); sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
sm.addString(itemName + " from Santa's Present Bag..."); sm.addString(itemName + " from Santa's Present Bag...");
pc.broadcastPacket(sm); pc.broadcastPacket(sm);
} }

Some files were not shown because too many files have changed in this diff Show More