Updated system messages and NPC strings.

This commit is contained in:
MobiusDev
2018-03-13 16:07:06 +00:00
parent 702c86935e
commit 55dfe422e2
497 changed files with 313051 additions and 320214 deletions

View File

@@ -983,7 +983,7 @@ public class L2CharacterAI extends AbstractAI
{
if (_actor.checkTransformed(transform -> !transform.isCombat()))
{
_actor.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
_actor.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
_actor.sendPacket(ActionFailed.STATIC_PACKET);
return true;
}

View File

@@ -263,7 +263,7 @@ public final class BotReportTable
final int ip = hashIp(reporter);
if (!timeHasPassed(_ipRegistry, ip))
{
reporter.sendPacket(SystemMessageId.THIS_CHARACTER_CANNOT_MAKE_A_REPORT_THE_TARGET_HAS_ALREADY_BEEN_REPORTED_BY_EITHER_YOUR_CLAN_OR_ALLIANCE_OR_HAS_ALREADY_BEEN_REPORTED_FROM_YOUR_CURRENT_IP);
reporter.sendPacket(SystemMessageId.THIS_CHARACTER_CANNOT_MAKE_A_REPORT_THE_TARGET_HAS_ALREADY_BEEN_REPORTED_BY_EITHER_YOUR_CLAN_OR_HAS_ALREADY_BEEN_REPORTED_FROM_YOUR_CURRENT_IP);
return false;
}
@@ -277,7 +277,7 @@ public final class BotReportTable
if (!Config.BOTREPORT_ALLOW_REPORTS_FROM_SAME_CLAN_MEMBERS && rcd.reportedBySameClan(reporter.getClan()))
{
reporter.sendPacket(SystemMessageId.THIS_CHARACTER_CANNOT_MAKE_A_REPORT_THE_TARGET_HAS_ALREADY_BEEN_REPORTED_BY_EITHER_YOUR_CLAN_OR_ALLIANCE_OR_HAS_ALREADY_BEEN_REPORTED_FROM_YOUR_CURRENT_IP);
reporter.sendPacket(SystemMessageId.THIS_CHARACTER_CANNOT_MAKE_A_REPORT_THE_TARGET_HAS_ALREADY_BEEN_REPORTED_BY_EITHER_YOUR_CLAN_OR_HAS_ALREADY_BEEN_REPORTED_FROM_YOUR_CURRENT_IP);
return false;
}
}

View File

@@ -300,7 +300,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager<CeremonyOfChaos
}
else if ((clan == null) || (clan.getLevel() < 6))
{
sm = SystemMessageId.ONLY_CHARACTERS_WHO_ARE_A_PART_OF_A_CLAN_OF_LEVEL_6_OR_ABOVE_MAY_PARTICIPATE;
sm = SystemMessageId.ONLY_CHARACTERS_WHO_ARE_A_PART_OF_A_CLAN_OF_LEVEL_3_OR_ABOVE_MAY_PARTICIPATE;
canRegister = false;
}
else if (getRegisteredPlayers().size() >= (getVariables().getInt(MAX_ARENAS_KEY, 5) * getMaxPlayersInArena()))
@@ -383,7 +383,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager<CeremonyOfChaos
if (registerPlayer(player))
{
player.sendPacket(SystemMessageId.YOU_ARE_NOW_ON_THE_WAITING_LIST_YOU_WILL_AUTOMATICALLY_BE_TELEPORTED_WHEN_THE_TOURNAMENT_STARTS_AND_WILL_BE_REMOVED_FROM_THE_WAITING_LIST_IF_YOU_LOG_OUT_IF_YOU_CANCEL_REGISTRATION_WITHIN_THE_LAST_MINUTE_OF_ENTERING_THE_ARENA_AFTER_SIGNING_UP_30_TIMES_OR_MORE_OR_FORFEIT_AFTER_ENTERING_THE_ARENA_30_TIMES_OR_MORE_DURING_A_CYCLE_YOU_BECOME_INELIGIBLE_FOR_PARTICIPATION_IN_THE_CEREMONY_OF_CHAOS_UNTIL_THE_NEXT_CYCLE_ALL_THE_BUFFS_EXCEPT_THE_VITALITY_BUFF_WILL_BE_REMOVED_ONCE_YOU_ENTER_THE_ARENAS);
player.sendPacket(SystemMessageId.EXCEPT_THE_VITALITY_BUFF_ALL_BUFFS_INCLUDING_ART_OF_SEDUCTION_WILL_BE_DELETED);
player.sendPacket(SystemMessageId.ALL_BUFFS_LIKE_ROSY_SEDUCTIONS_AND_ART_OF_SEDUCTION_WILL_BE_REMOVED_SAYHA_S_GRACE_WILL_REMAIN);
player.sendPacket(ExCuriousHouseState.PREPARE_PACKET);
}
return new TerminateReturn(true, false, false);

View File

@@ -41,7 +41,7 @@ public final class PcCafePointsManager
if (player.getPcCafePoints() >= Config.PC_CAFE_MAX_POINTS)
{
final SystemMessage message = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_THE_MAXIMUM_NUMBER_OF_PC_POINTS);
final SystemMessage message = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_THE_MAXIMUM_NUMBER_OF_PA_POINTS);
player.sendPacket(message);
return;
}
@@ -67,11 +67,11 @@ public final class PcCafePointsManager
if (Config.PC_CAFE_ENABLE_DOUBLE_POINTS && (Rnd.get(100) < Config.PC_CAFE_DOUBLE_POINTS_CHANCE))
{
points *= 2;
message = SystemMessage.getSystemMessage(SystemMessageId.DOUBLE_POINTS_YOU_EARNED_S1_PC_POINT_S);
message = SystemMessage.getSystemMessage(SystemMessageId.DOUBLE_POINTS_YOU_EARNED_S1_PA_POINT_S);
}
else
{
message = SystemMessage.getSystemMessage(SystemMessageId.YOU_EARNED_S1_PC_POINT_S);
message = SystemMessage.getSystemMessage(SystemMessageId.DOUBLE_POINTS_YOU_EARNED_S1_PA_POINT_S);
}
if ((player.getPcCafePoints() + points) > Config.PC_CAFE_MAX_POINTS)
{

View File

@@ -155,11 +155,11 @@ public final class ClanWar
{
_state = ClanWarState.MUTUAL;
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_500_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm.addString(victimClan.getName());
killerClan.broadcastToOnlineMembers(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_500_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm.addString(killerClan.getName());
victimClan.broadcastToOnlineMembers(sm);
@@ -236,11 +236,11 @@ public final class ClanWar
{
_state = ClanWarState.MUTUAL;
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_500_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm.addString(attacker.getName());
attacked.broadcastToOnlineMembers(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_500_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm.addString(attacked.getName());
attacker.broadcastToOnlineMembers(sm);

View File

@@ -146,7 +146,7 @@ public class Fishing
{
if (minPlayerLevel == 85)
{
_player.sendPacket(SystemMessageId.FISHING_IS_AVAILABLE_TO_CHARACTERS_LV_85_OR_ABOVE);
_player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_AS_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
}
else // In case of custom fishing level.
{
@@ -176,7 +176,7 @@ public class Fishing
if (_player.isTransformed() || _player.isInBoat())
{
_player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHEN_TRANSFORMED_OR_WHILE_RIDING_AS_A_PASSENGER_OF_A_BOAT_IT_S_AGAINST_THE_RULES);
_player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_RIDING_AS_A_PASSENGER_OF_A_BOAT_OR_TRANSFORMED);
_player.sendPacket(ActionFailed.STATIC_PACKET);
stopFishing(FishingEndType.ERROR);
return;

View File

@@ -2260,7 +2260,7 @@ public class L2Clan implements IIdentifiable, INamable
}
else
{
activeChar.sendPacket(SystemMessageId.THE_ACADEMY_ROYAL_GUARD_ORDER_OF_KNIGHTS_IS_FULL_AND_CANNOT_ACCEPT_NEW_MEMBERS_AT_THIS_TIME);
activeChar.sendPacket(SystemMessageId.THE_CLAN_IS_FULL);
}
return false;
}

View File

@@ -953,7 +953,7 @@ public class L2Npc extends L2Character
final String msg = Config.ANNOUNCE_PK_MSG.replace("$killer", player.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
@@ -985,7 +985,7 @@ public class L2Npc extends L2Character
final String msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", player.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}

View File

@@ -615,7 +615,7 @@ public abstract class L2Summon extends L2Playable
// Check if this skill is enabled (e.g. reuse time)
if (isSkillDisabled(skill))
{
sendPacket(SystemMessageId.THAT_PET_SERVITOR_SKILL_CANNOT_BE_USED_BECAUSE_IT_IS_RECHARGING);
sendPacket(SystemMessageId.THAT_SERVITOR_SKILL_CANNOT_BE_USED_BECAUSE_IT_IS_RECHARGING);
return false;
}
@@ -721,7 +721,7 @@ public abstract class L2Summon extends L2Playable
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4);
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addNpcName(this);
sm.addString(target.getName());
sm.addInt(damage);
@@ -939,7 +939,7 @@ public abstract class L2Summon extends L2Playable
if (isBetrayed())
{
sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
sendPacket(ActionFailed.STATIC_PACKET);
return false;
}

View File

@@ -152,7 +152,7 @@ public class DoppelgangerInstance extends L2Npc
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4);
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addNpcName(this);
sm.addString(target.getName());
sm.addInt(damage);

View File

@@ -3056,7 +3056,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@@ -3384,7 +3384,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@@ -3440,7 +3440,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -3465,7 +3465,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -3497,7 +3497,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -3680,7 +3680,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -3769,7 +3769,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return null;
@@ -4983,7 +4983,7 @@ public final class L2PcInstance extends L2Playable
msg = Config.ANNOUNCE_PK_MSG.replace("$killer", killer.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
@@ -4997,7 +4997,7 @@ public final class L2PcInstance extends L2Playable
msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", killer.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
@@ -6116,7 +6116,7 @@ public final class L2PcInstance extends L2Playable
{
// You can't mount, dismount, break and drop items while fishing
sendPacket(ActionFailed.STATIC_PACKET);
sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING2);
sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
return false;
}
else if (isTransformed() || isCursedWeaponEquipped())
@@ -8347,7 +8347,7 @@ public final class L2PcInstance extends L2Playable
// Check if the caster is sitting
if (isSitting())
{
sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING);
sendPacket(SystemMessageId.YOU_CANNOT_USE_ACTIONS_AND_SKILLS_WHILE_THE_CHARACTER_IS_SITTING);
sendPacket(ActionFailed.STATIC_PACKET);
return false;
}
@@ -9350,7 +9350,7 @@ public final class L2PcInstance extends L2Playable
}
if (isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.PEACE) || isInsideZone(ZoneId.SIEGE))
{
_noDuelReason = SystemMessageId.C1_CANNOT_MAKE_A_CHALLENGE_TO_A_DUEL_BECAUSE_C1_IS_CURRENTLY_IN_A_DUEL_PROHIBITED_AREA_PEACEFUL_ZONE_BATTLE_ZONE_NEAR_WATER_RESTART_PROHIBITED_AREA;
_noDuelReason = SystemMessageId.C1_IS_IN_AN_AREA_WHERE_DUEL_IS_NOT_ALLOWED_AND_YOU_CANNOT_APPLY_FOR_A_DUEL;
return false;
}
return true;
@@ -11500,7 +11500,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4);
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this);
sm.addString(target.getName());
sm.addInt(damage);
@@ -13730,7 +13730,7 @@ public final class L2PcInstance extends L2Playable
if (AdminData.getInstance().requireConfirm(command))
{
setAdminConfirmCmd(fullCommand);
final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S13);
final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
dlg.addString("Are you sure you want execute command " + fullCommand.substring(6) + " ?");
addAction(PlayerAction.ADMIN_COMMAND);
sendPacket(dlg);

View File

@@ -393,7 +393,7 @@ public class L2PetInstance extends L2Summon
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -441,7 +441,7 @@ public class L2PetInstance extends L2Summon
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}

View File

@@ -161,7 +161,7 @@ public class L2SiegeFlagInstance extends L2Npc
if (_clan != null)
{
// send warning to owners of headquarters that theirs base is under attack
_clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.YOUR_BASE_IS_BEING_ATTACKED));
_clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.SIEGE_CAMP_IS_UNDER_ATTACK));
setCanTalk(false);
ThreadPoolManager.schedule(new ScheduleTalkTask(), 20000);
}

View File

@@ -271,7 +271,7 @@ public final class L2TrapInstance extends L2Npc
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addString(getName());
sm.addString(target.getName());
sm.addInt(damage);

View File

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

View File

@@ -98,7 +98,7 @@ public class ConditionPlayerCanCreateBase extends Condition
}
else if (!player.isInsideZone(ZoneId.HQ))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_HERE);
player.sendPacket(SystemMessageId.YOU_CAN_T_BUILD_HEADQUARTERS_HERE);
canCreateBase = false;
}
return (_val == canCreateBase);

View File

@@ -79,7 +79,7 @@ public class ConditionPlayerCanCreateOutpost extends Condition
}
else if (!player.isInsideZone(ZoneId.HQ))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_HERE);
player.sendPacket(SystemMessageId.YOU_CAN_T_BUILD_HEADQUARTERS_HERE);
canCreateOutpost = false;
}
return (_val == canCreateOutpost);

View File

@@ -63,7 +63,7 @@ public class ConditionPlayerCanSwitchSubclass extends Condition
}
else if (player.isOnEvent(CeremonyOfChaosEvent.class))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_YOUR_SUBCLASS_WHILE_REGISTERED_IN_THE_CEREMONY_OF_CHAOS);
player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_YOUR_SUBCLASS_WHILE_REGISTERING_FOR_THE_CEREMONY_OF_CHAOS);
canSwitchSub = false;
}
else if (player.isOnEvent())

View File

@@ -70,7 +70,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
}
else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true))
{
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeCastle = false;
}
return (_val == canTakeCastle);

View File

@@ -70,7 +70,7 @@ public class ConditionPlayerCanTakeFort extends Condition
}
else if (!Util.checkIfInRange(200, player, effected, true))
{
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeFort = false;
}
return (_val == canTakeFort);

View File

@@ -1147,7 +1147,7 @@ public class Siege implements Siegable
}
else if ((player.getClan() == null) || (player.getClan().getLevel() < SiegeManager.getInstance().getSiegeClanMinLevel()))
{
player.sendPacket(SystemMessageId.ONLY_CLANS_OF_LEVEL_5_OR_ABOVE_MAY_REGISTER_FOR_A_CASTLE_SIEGE);
player.sendPacket(SystemMessageId.ONLY_CLANS_OF_LEVEL_3_OR_ABOVE_MAY_REGISTER_FOR_A_CASTLE_SIEGE);
}
else if (player.getClan().getId() == getCastle().getOwnerId())
{

View File

@@ -258,7 +258,7 @@ public final class ItemAuction
if (newBid > 100000000000L)
{
player.sendPacket(SystemMessageId.BIDDING_IS_NOT_ALLOWED_BECAUSE_THE_MAXIMUM_BIDDING_PRICE_EXCEEDS_100_BILLION);
player.sendPacket(SystemMessageId.THE_HIGHEST_BID_IS_OVER_999_9_BILLION_THEREFORE_YOU_CANNOT_PLACE_A_BID);
return;
}
@@ -334,7 +334,7 @@ public final class ItemAuction
final L2PcInstance old = _highestBid.getPlayer();
if (old != null)
{
old.sendPacket(SystemMessageId.YOU_HAVE_BEEN_OUTBID);
old.sendPacket(SystemMessageId.YOU_WERE_OUTBID_THE_NEW_HIGHEST_BID_IS_S1_ADENA);
}
_highestBid = bid;

View File

@@ -263,7 +263,7 @@ public class OlympiadManager
if (!noble.isNoble())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_ONLY_NOBLESSE_EXALTED_CHARACTERS_CAN_PARTICIPATE_IN_THE_OLYMPIAD);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CHARACTER_C1_DOES_NOT_MEET_THE_CONDITIONS_ONLY_CHARACTERS_WHO_HAVE_CHANGED_TWO_OR_MORE_CLASSES_CAN_PARTICIPATE_IN_OLYMPIAD);
sm.addString(noble.getName());
noble.sendPacket(sm);
return false;

View File

@@ -409,7 +409,7 @@ public class SkillCaster implements Runnable
{
if (caster.isPlayer())
{
caster.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
caster.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
}
return false;
}

View File

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

View File

@@ -65,7 +65,7 @@ public final class DlgAnswer implements IClientIncomingPacket
return;
}
if (_messageId == SystemMessageId.S13.getId())
if (_messageId == SystemMessageId.S1_3.getId())
{
if (activeChar.removeAction(PlayerAction.ADMIN_COMMAND))
{

View File

@@ -561,7 +561,7 @@ public class MultiSellChoose implements IClientIncomingPacket
{
if (player.getPcCafePoints() < totalCount)
{
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_ARE_SHORT_OF_PC_POINTS));
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_ARE_SHORT_OF_PA_POINTS));
return false;
}
return true;

View File

@@ -206,7 +206,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
if (!activeChar.destroyItemByItemId("Consume", item.getId(), item.getCount(), trainer, false))
{
// Doesn't have required item.
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
L2VillageMasterInstance.showPledgeSkillList(activeChar);
return;
}
@@ -271,7 +271,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
{
if (!activeChar.destroyItemByItemId("SubSkills", item.getId(), item.getCount(), trainer, false))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
return;
}
@@ -420,7 +420,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
}
if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
return;
}
@@ -437,7 +437,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
if (count >= 2)
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE);
return;
}
@@ -473,7 +473,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
if ((activeChar.getLevel() < 85) || !activeChar.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
return;
}
@@ -490,7 +490,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
if (count >= 2)
{
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE);
return;
}
@@ -622,7 +622,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
}
else
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
}
return false;
}
@@ -640,7 +640,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
if (reqItemCount < item.getCount())
{
// Player doesn't have required item.
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL);
showSkillList(trainer, player);
return false;
}
@@ -706,7 +706,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
private void giveSkill(L2PcInstance player, L2Npc trainer, Skill skill, boolean store)
{
// Send message.
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S12);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_2);
sm.addSkillName(skill);
player.sendPacket(sm);

View File

@@ -96,10 +96,10 @@ public final class RequestAllyInfo implements IClientIncomingPacket
sm.addInt(aci.getTotal());
client.sendPacket(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.EMPTY4);
sm = SystemMessage.getSystemMessage(SystemMessageId.EMPTY_4);
}
sm = SystemMessage.getSystemMessage(SystemMessageId.EMPTY5);
sm = SystemMessage.getSystemMessage(SystemMessageId.EMPTY_5);
client.sendPacket(sm);
}
else

View File

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

View File

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

View File

@@ -126,7 +126,7 @@ public final class RequestDropItem implements IClientIncomingPacket
if (activeChar.isFishing())
{
// You can't mount, dismount, break and drop items while fishing
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING2);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
return;
}
if (activeChar.isFlying())

View File

@@ -71,7 +71,7 @@ public final class RequestDuelStart implements IClientIncomingPacket
final String name = FakePlayerData.getInstance().getProperName(_player);
if (activeChar.isInsideZone(ZoneId.PVP) || activeChar.isInsideZone(ZoneId.PEACE) || activeChar.isInsideZone(ZoneId.SIEGE))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_MAKE_A_CHALLENGE_TO_A_DUEL_BECAUSE_C1_IS_CURRENTLY_IN_A_DUEL_PROHIBITED_AREA_PEACEFUL_ZONE_BATTLE_ZONE_NEAR_WATER_RESTART_PROHIBITED_AREA);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHERE_DUEL_IS_NOT_ALLOWED_AND_YOU_CANNOT_APPLY_FOR_A_DUEL);
sm.addString(name);
activeChar.sendPacket(sm);
return;

View File

@@ -137,7 +137,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket
// attempting to destroy scroll
if (activeChar.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, activeChar, item) == null)
{
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH);
activeChar.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
@@ -149,7 +149,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket
{
if (activeChar.getInventory().destroyItem("Enchant", support.getObjectId(), 1, activeChar, item) == null)
{
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH);
activeChar.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));

View File

@@ -113,7 +113,7 @@ public final class RequestGiveItemToPet implements IClientIncomingPacket
if (!pet.getInventory().validateWeight(item, _amount))
{
player.sendPacket(SystemMessageId.YOUR_PET_CANNOT_CARRY_ANY_MORE_ITEMS2);
player.sendPacket(SystemMessageId.YOUR_PET_CANNOT_CARRY_ANY_MORE_ITEMS_2);
return;
}

View File

@@ -88,7 +88,7 @@ public final class RequestMoveToLocationInVehicle implements IClientIncomingPack
if (activeChar.hasSummon())
{
client.sendPacket(SystemMessageId.YOU_SHOULD_RELEASE_YOUR_PET_OR_SERVITOR_SO_THAT_IT_DOES_NOT_FALL_OFF_OF_THE_BOAT_AND_DROWN);
client.sendPacket(SystemMessageId.YOU_SHOULD_RELEASE_YOUR_SERVITOR_SO_THAT_IT_DOES_NOT_FALL_OFF_OF_THE_BOAT_AND_DROWN);
client.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

View File

@@ -77,7 +77,7 @@ public final class RequestPetition implements IClientIncomingPacket
if (PetitionManager.getInstance().getPendingPetitionCount() == Config.MAX_PETITIONS_PENDING)
{
client.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_BY_VISITING_HTTPS_SUPPORT_LINEAGE2_COM);
client.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_COM);
return;
}

View File

@@ -69,7 +69,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket
{
try
{
activeChar.sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_TRYING_ON_EQUIPMENT2);
activeChar.sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_TRYING_ON_EQUIPMENT_2);
activeChar.sendPacket(new ExUserInfoEquipSlot(activeChar));
}
catch (Exception e)

View File

@@ -71,7 +71,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
}
else
{
requestor.sendPacket(SystemMessageId.THE_S1_CLAN_DID_NOT_RESPOND_WAR_PROCLAMATION_HAS_BEEN_REFUSED2);
requestor.sendPacket(SystemMessageId.THE_S1_CLAN_DID_NOT_RESPOND_WAR_PROCLAMATION_HAS_BEEN_REFUSED_2);
}
activeChar.setActiveRequester(null);
requestor.onTransactionResponse();

View File

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

View File

@@ -131,7 +131,7 @@ public final class UseItem implements IClientIncomingPacket
if (activeChar.isFishing() && ((_itemId < 6535) || (_itemId > 6540)))
{
// You cannot do anything else while fishing
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING3);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
return;
}

View File

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

View File

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

View File

@@ -65,7 +65,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (activeChar.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, activeChar, item) == null)
{
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
client.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;

View File

@@ -59,7 +59,7 @@ public class RequestJoinCuriousHouse implements IClientIncomingPacket
if (CeremonyOfChaosManager.getInstance().registerPlayer(player))
{
player.sendPacket(SystemMessageId.YOU_ARE_NOW_ON_THE_WAITING_LIST_YOU_WILL_AUTOMATICALLY_BE_TELEPORTED_WHEN_THE_TOURNAMENT_STARTS_AND_WILL_BE_REMOVED_FROM_THE_WAITING_LIST_IF_YOU_LOG_OUT_IF_YOU_CANCEL_REGISTRATION_WITHIN_THE_LAST_MINUTE_OF_ENTERING_THE_ARENA_AFTER_SIGNING_UP_30_TIMES_OR_MORE_OR_FORFEIT_AFTER_ENTERING_THE_ARENA_30_TIMES_OR_MORE_DURING_A_CYCLE_YOU_BECOME_INELIGIBLE_FOR_PARTICIPATION_IN_THE_CEREMONY_OF_CHAOS_UNTIL_THE_NEXT_CYCLE_ALL_THE_BUFFS_EXCEPT_THE_VITALITY_BUFF_WILL_BE_REMOVED_ONCE_YOU_ENTER_THE_ARENAS);
player.sendPacket(SystemMessageId.EXCEPT_THE_VITALITY_BUFF_ALL_BUFFS_INCLUDING_ART_OF_SEDUCTION_WILL_BE_DELETED);
player.sendPacket(SystemMessageId.ALL_BUFFS_LIKE_ROSY_SEDUCTIONS_AND_ART_OF_SEDUCTION_WILL_BE_REMOVED_SAYHA_S_GRACE_WILL_REMAIN);
player.sendPacket(ExCuriousHouseState.PREPARE_PACKET);
}
else

View File

@@ -78,41 +78,41 @@ public class RequestItemEnsoul implements IClientIncomingPacket
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_USING_THE_PRIVATE_STORE_WORKSHOP);
player.sendPacket(SystemMessageId.RUNE_INSERTION_IS_IMPOSSIBLE_WHEN_PRIVATE_STORE_AND_WORKSHOP_ARE_OPENED);
return;
}
else if (player.hasAbnormalType(AbnormalType.FREEZING))
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_FROZEN);
player.sendPacket(SystemMessageId.RUNE_INSERTION_IS_IMPOSSIBLE_WHILE_IN_FROZEN_STATE);
}
else if (player.isDead())
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_DEAD);
player.sendPacket(SystemMessageId.RUNE_INSERTION_IS_IMPOSSIBLE_IF_THE_CHARACTER_IS_DEAD);
return;
}
else if ((player.getActiveTradeList() != null) || player.hasItemRequest())
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_TRADING);
player.sendPacket(SystemMessageId.RUNE_INSERTION_IS_IMPOSSIBLE_DURING_EXCHANGE);
return;
}
else if (player.hasAbnormalType(AbnormalType.PARALYZE))
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_PETRIFIED);
player.sendPacket(SystemMessageId.RUNE_INSERTION_IS_IMPOSSIBLE_WHILE_PETRIFIED);
return;
}
else if (player.isFishing())
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_FISHING);
player.sendPacket(SystemMessageId.RUNE_INSERTION_IS_IMPOSSIBLE_DURING_FISHING);
return;
}
else if (player.isSitting())
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_SEATED);
player.sendPacket(SystemMessageId.RUNE_INSERTION_IS_IMPOSSIBLE_WHILE_SITTING);
return;
}
else if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player))
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_IN_BATTLE);
player.sendPacket(SystemMessageId.RUNE_INSERTION_IS_IMPOSSIBLE_WHILE_IN_COMBAT);
return;
}
@@ -162,7 +162,7 @@ public class RequestItemEnsoul implements IClientIncomingPacket
final L2ItemInstance soulCrystal = player.getInventory().getItemByObjectId(itemOption.getSoulCrystalObjectId());
if (soulCrystal == null)
{
player.sendPacket(SystemMessageId.INVALID_SOUL_CRYSTAL);
player.sendPacket(SystemMessageId.THE_RUNE_DOES_NOT_FIT);
continue;
}

View File

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

View File

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

View File

@@ -81,6 +81,6 @@ public final class RequestFriendList implements IClientIncomingPacket
}
// =========================
activeChar.sendPacket(SystemMessageId.EMPTY3);
activeChar.sendPacket(SystemMessageId.EMPTY_3);
}
}

View File

@@ -81,7 +81,7 @@ public class RequestLuckyGamePlay implements IClientIncomingPacket
final long tickets = _type == LuckyGameType.LUXURY ? player.getInventory().getInventoryItemCount(LUXURY_FORTUNE_READING_TICKET, -1) : player.getInventory().getInventoryItemCount(FORTUNE_READING_TICKET, -1);
if (tickets < _reading)
{
player.sendPacket(SystemMessageId.NOT_ENOUGH_TICKETS);
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_TICKETS_YOU_CANNOT_CONTINUE_THE_GAME);
player.sendPacket(_type == LuckyGameType.LUXURY ? ExBettingLuckyGameResult.LUXURY_INVALID_ITEM_COUNT : ExBettingLuckyGameResult.NORMAL_INVALID_ITEM_COUNT);
return;
}

View File

@@ -51,7 +51,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket
if (activeChar.hasSummon())
{
activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_USE_SAYUNE_WHILE_PET_OR_SUMMONED_PET_IS_OUT);
activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_USE_SAYUNE_WHILE_A_SERVITOR_IS_AROUND);
return;
}

View File

@@ -41,7 +41,7 @@ public class ConfirmDlg extends AbstractMessagePacket<ConfirmDlg>
public ConfirmDlg(String text)
{
this(SystemMessageId.S13);
this(SystemMessageId.S1_3);
addString(text);
}

View File

@@ -37,7 +37,7 @@ public final class SystemMessage extends AbstractMessagePacket<SystemMessage>
throw new NullPointerException();
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(text);
return sm;
}