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

Updated system messages.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-12-20 22:02:03 +00:00
parent 484db5e377
commit 8f9c6448ae
326 changed files with 10477 additions and 7318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java
View File

@@ -1012,7 +1012,7 @@ public class CreatureAI extends AbstractAI
// while flying there is no move to cast
if ((_actor.getAI().getIntention() == AI_INTENTION_CAST) && _actor.isPlayer() && _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;
}

10
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java
View File

@@ -227,7 +227,7 @@ public class BotReportTable
if (bot.isInsideZone(ZoneId.PEACE) || bot.isInsideZone(ZoneId.PVP))
{
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_A_CHARACTER_IN_THIS_AREA);
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_A_CHARACTER_WHO_IS_IN_A_PEACE_ZONE_OR_A_BATTLEGROUND);
return false;
}
@@ -264,7 +264,7 @@ public 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;
}
@@ -278,7 +278,7 @@ public 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;
}
}
@@ -287,14 +287,14 @@ public class BotReportTable
{
if (rcdRep.getPointsLeft() == 0)
{
reporter.sendPacket(SystemMessageId.YOU_SPENT_ALL_AVAILABLE_POINTS_THEY_WILL_BECOME_AVAILABLE_WHEN_THEY_ARE_RESET_AT_06_30_AM_EVERY_DAY);
reporter.sendPacket(SystemMessageId.YOU_HAVE_USED_ALL_AVAILABLE_POINTS_POINTS_ARE_RESET_EVERYDAY_AT_NOON);
return false;
}
final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime());
if (reuse < Config.BOTREPORT_REPORT_DELAY)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MIN_YOU_HAVE_S2_POINT_S_LEFT);
sm.addInt((int) (reuse / 60000));
sm.addInt(rcdRep.getPointsLeft());
reporter.sendPacket(sm);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
View File

@@ -169,7 +169,7 @@ public class ClanTable
}
if (player.getClanId() != 0)
{
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
player.sendPacket(SystemMessageId.FAILED_TO_CREATE_A_CLAN);
return null;
}
if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime())

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
View File

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

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java
View File

@@ -155,7 +155,7 @@ public class HandysBlockCheckerManager
{
if (_arenaPlayers[i].getAllPlayers().contains(player))
{
final SystemMessage msg = new SystemMessage(SystemMessageId.THE_MATCH_C1_PREVIOUSLY_PARTICIPATED_IN_SHOULD_END_BEFORE_YOU_APPLY_PLEASE_TRY_AGAIN_LATER);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_REGISTERED_ON_THE_MATCH_WAITING_LIST);
msg.addString(player.getName());
player.sendPacket(msg);
return false;

16
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -300,7 +300,7 @@ public class ItemCommissionManager
commissionItem.setSaleEndTask(saleEndTask);
_commissionItems.put(commissionItem.getCommissionId(), commissionItem);
player.getLastCommissionInfos().put(itemInstance.getId(), new ExResponseCommissionInfo(itemInstance.getId(), pricePerUnit, itemCount, (byte) ((durationInDays - 1) / 2)));
player.sendPacket(SystemMessageId.THE_ITEM_HAS_BEEN_SUCCESSFULLY_REGISTERED);
player.sendPacket(SystemMessageId.THE_ITEM_HAS_BEEN_REGISTERED);
player.sendPacket(ExResponseCommissionRegister.SUCCEED);
}
@@ -325,7 +325,7 @@ public class ItemCommissionManager
final CommissionItem commissionItem = getCommissionItem(commissionId);
if (commissionItem == null)
{
player.sendPacket(SystemMessageId.CANCELLATION_OF_SALE_HAS_FAILED_BECAUSE_REQUIREMENTS_ARE_NOT_MET);
player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_THE_SALE);
player.sendPacket(ExResponseCommissionDelete.FAILED);
return;
}
@@ -338,15 +338,15 @@ public class ItemCommissionManager
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
player.sendPacket(SystemMessageId.CANCELLATION_OF_SALE_HAS_FAILED_BECAUSE_REQUIREMENTS_ARE_NOT_MET);
player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_THE_SALE);
player.sendPacket(ExResponseCommissionDelete.FAILED);
return;
}
if ((_commissionItems.remove(commissionId) == null) || !commissionItem.getSaleEndTask().cancel(false))
{
player.sendPacket(SystemMessageId.CANCELLATION_OF_SALE_HAS_FAILED_BECAUSE_REQUIREMENTS_ARE_NOT_MET);
player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_THE_SALE);
player.sendPacket(ExResponseCommissionDelete.FAILED);
return;
}
@@ -354,12 +354,12 @@ public class ItemCommissionManager
if (deleteItemFromDB(commissionId))
{
player.getInventory().addItem("Commission Cancellation", commissionItem.getItemInstance(), player, null);
player.sendPacket(SystemMessageId.CANCELLATION_OF_SALE_FOR_THE_ITEM_IS_SUCCESSFUL);
player.sendPacket(SystemMessageId.THE_SALE_IS_CANCELLED);
player.sendPacket(ExResponseCommissionDelete.SUCCEED);
}
else
{
player.sendPacket(SystemMessageId.CANCELLATION_OF_SALE_HAS_FAILED_BECAUSE_REQUIREMENTS_ARE_NOT_MET);
player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_THE_SALE);
player.sendPacket(ExResponseCommissionDelete.FAILED);
}
}
@@ -389,7 +389,7 @@ public class ItemCommissionManager
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
player.sendPacket(ExResponseCommissionBuyItem.FAILED);
return;
}

8
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/MonsterRace.java
View File

@@ -269,7 +269,7 @@ public class MonsterRace
case 1020: // 17 min
{
final int minutes = (_finalCountdown == 960) ? 2 : 1;
final SystemMessage msg = new SystemMessage(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_S1_MINUTE_S);
final SystemMessage msg = new SystemMessage(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_S1_MIN);
msg.addInt(minutes);
msg.addInt(_raceNumber);
Broadcast.toAllPlayersInZoneType(DerbyTrackZone.class, msg);
@@ -277,14 +277,14 @@ public class MonsterRace
}
case 1050: // 17 min 30 sec
{
final SystemMessage msg = new SystemMessage(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_30_SECONDS);
final SystemMessage msg = new SystemMessage(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_30_SEC);
msg.addInt(_raceNumber);
Broadcast.toAllPlayersInZoneType(DerbyTrackZone.class, msg);
break;
}
case 1070: // 17 min 50 sec
{
final SystemMessage msg = new SystemMessage(SystemMessageId.MONSTER_RACE_S1_IS_ABOUT_TO_BEGIN_COUNTDOWN_IN_FIVE_SECONDS);
final SystemMessage msg = new SystemMessage(SystemMessageId.MONSTER_RACE_S1_IS_ABOUT_TO_BEGIN_COUNTDOWN_IN_5_SEC);
msg.addInt(_raceNumber);
Broadcast.toAllPlayersInZoneType(DerbyTrackZone.class, msg);
break;
@@ -296,7 +296,7 @@ public class MonsterRace
case 1079: // 17 min 59 sec
{
final int seconds = 1080 - _finalCountdown;
final SystemMessage msg = new SystemMessage(SystemMessageId.THE_RACE_WILL_BEGIN_IN_S1_SECOND_S);
final SystemMessage msg = new SystemMessage(SystemMessageId.THE_RACE_BEGINS_IN_S1_SEC);
msg.addInt(seconds);
Broadcast.toAllPlayersInZoneType(DerbyTrackZone.class, msg);
break;

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CommandChannel.java
View File

@@ -102,7 +102,7 @@ public class CommandChannel extends AbstractPlayerGroup
party.broadcastPacket(ExCloseMPCC.STATIC_PACKET);
if (_parties.size() < 2)
{
broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_IS_DISBANDED));
disbandChannel();
}
else

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@@ -309,7 +309,7 @@ public class CursedWeapon implements INamable
// CursedWeaponsManager.announce(msg);
final CursedWeapon cw = CursedWeaponsManager.getInstance().getCursedWeapon(_player.getCursedWeaponEquippedId());
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING_TYPE_CURSEDSWORD_TO_CHECK_OTHER_INFORMATION);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_HAS_S2_MIN_OF_USAGE_TIME_REMAINING);
final int timeLeft = (int) (cw.getTimeLeft() / 60000);
msg.addItemName(_player.getCursedWeaponEquippedId());
msg.addInt(timeLeft);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Duel.java
View File

@@ -771,7 +771,7 @@ public class Duel
SystemMessage sm = null;
if (_countdown > 0)
{
sm = new SystemMessage(SystemMessageId.THE_DUEL_WILL_BEGIN_IN_S1_SECOND_S);
sm = new SystemMessage(SystemMessageId.THE_DUEL_STARTS_IN_S1_SEC);
sm.addInt(_countdown);
}
else

10
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Party.java
View File

@@ -550,14 +550,14 @@ public class Party extends AbstractPlayerGroup
SystemMessage msg;
if (type == MessageType.EXPELLED)
{
player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_EXPELLED_FROM_THE_PARTY);
msg = new SystemMessage(SystemMessageId.C1_WAS_EXPELLED_FROM_THE_PARTY);
player.sendPacket(SystemMessageId.YOU_ARE_DISMISSED_FROM_THE_PARTY);
msg = new SystemMessage(SystemMessageId.C1_IS_DISMISSED_FROM_THE_PARTY);
msg.addString(player.getName());
broadcastPacket(msg);
}
else if ((type == MessageType.LEFT) || (type == MessageType.DISCONNECTED))
{
player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_PARTY);
player.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_PARTY);
msg = new SystemMessage(SystemMessageId.C1_HAS_LEFT_THE_PARTY);
msg.addString(player.getName());
broadcastPacket(msg);
@@ -637,7 +637,7 @@ public class Party extends AbstractPlayerGroup
public void disbandParty()
{
_disbanding = true;
broadcastPacket(new SystemMessage(SystemMessageId.THE_PARTY_HAS_DISPERSED));
broadcastPacket(new SystemMessage(SystemMessageId.THE_PARTY_IS_DISBANDED));
for (Player member : _members)
{
if (member != null)
@@ -1146,7 +1146,7 @@ public class Party extends AbstractPlayerGroup
{
broadcastPacket(new ExSetPartyLooting(1, _changeRequestDistributionType));
_distributionType = _changeRequestDistributionType;
final SystemMessage sm = new SystemMessage(SystemMessageId.PARTY_LOOT_WAS_CHANGED_TO_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.PARTY_LOOTING_METHOD_WAS_CHANGED_TO_S1);
sm.addSystemString(_changeRequestDistributionType.getSysStringId());
broadcastPacket(sm);
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Request.java
View File

@@ -94,7 +94,7 @@ public class Request
{
if (partner == null)
{
_player.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
_player.sendPacket(SystemMessageId.THE_TARGET_CANNOT_BE_INVITED);
return false;
}
if (partner.getRequest().isProcessingRequest())

66
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -2217,7 +2217,7 @@ public class Player extends Playable
{
if (item.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
}
@@ -2246,7 +2246,7 @@ public class Player extends Playable
{
if (item.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.EQUIPPED_S1_S2);
sm = new SystemMessage(SystemMessageId.S1_S2_EQUIPPED);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
}
@@ -2445,7 +2445,7 @@ public class Player extends Playable
}
setLvlJoinedAcademy(0);
// oust pledge member from the academy, cuz he has finished his 2nd class transfer
final SystemMessage msg = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN);
msg.addPcName(this);
_clan.broadcastToOnlineMembers(msg);
_clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(getName()));
@@ -3067,7 +3067,7 @@ public class Player extends Playable
{
if (sendMessage)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_ADENA);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_ADENA);
sm.addLong(count);
sendPacket(sm);
}
@@ -3211,7 +3211,7 @@ public class Player extends Playable
{
if (sendMessage)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
sm.addItemName(Inventory.ANCIENT_ADENA_ID);
sm.addLong(count);
sendPacket(sm);
@@ -3374,7 +3374,7 @@ public class Player extends Playable
{
if (process.equalsIgnoreCase("Sweeper") || process.equalsIgnoreCase("Quest"))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
sm.addItemName(itemId);
sm.addLong(count);
sendPacket(sm);
@@ -3389,7 +3389,7 @@ public class Player extends Playable
}
else if (process.equalsIgnoreCase("Sweeper") || process.equalsIgnoreCase("Quest"))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1);
sm.addItemName(itemId);
sendPacket(sm);
}
@@ -6027,7 +6027,7 @@ public class Player extends Playable
final Item unequippedItem = unequipped.get(0);
if (unequippedItem.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(unequippedItem.getEnchantLevel());
sm.addItemName(unequippedItem);
}
@@ -6068,7 +6068,7 @@ public class Player extends Playable
final Item unequippedItem = unequipped.get(0);
if (unequippedItem.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(unequippedItem.getEnchantLevel());
sm.addItemName(unequippedItem);
}
@@ -6139,21 +6139,21 @@ public class Player extends Playable
{
// A strider cannot be ridden when dead
sendPacket(ActionFailed.STATIC_PACKET);
sendPacket(SystemMessageId.YOU_CANNOT_USE_A_MOUNT_WHILE_DEAD);
sendPacket(SystemMessageId.A_MOUNT_CANNOT_BE_RIDDEN_WHEN_DEAD);
return false;
}
else if (pet.isDead())
{
// A dead strider cannot be ridden.
sendPacket(ActionFailed.STATIC_PACKET);
sendPacket(SystemMessageId.YOU_CANNOT_USE_A_DEAD_MOUNT);
sendPacket(SystemMessageId.A_DEAD_MOUNT_CANNOT_BE_RIDDEN);
return false;
}
else if (pet.isInCombat() || pet.isRooted())
{
// A strider in battle cannot be ridden
sendPacket(ActionFailed.STATIC_PACKET);
sendPacket(SystemMessageId.YOU_CANNOT_USE_A_MOUNT_THAT_IS_IN_BATTLE);
sendPacket(SystemMessageId.A_MOUNT_IN_BATTLE_CANNOT_BE_RIDDEN);
return false;
}
else if (isInCombat())
@@ -8093,7 +8093,7 @@ public class Player extends Playable
if (henna.getCancelCount() > 0)
{
_inventory.addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
sm.addItemName(henna.getDyeItemId());
sm.addLong(henna.getCancelCount());
sendPacket(sm);
@@ -8582,20 +8582,20 @@ public class Player extends Playable
final int seconds = (remainingTime % 60);
if (hours > 0)
{
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_H_S3_MIN_S4_SEC);
sm.addSkillName(usedSkill);
sm.addInt(hours);
sm.addInt(minutes);
}
else if (minutes > 0)
{
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_MIN_S3_SEC);
sm.addSkillName(usedSkill);
sm.addInt(minutes);
}
else
{
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_SEC);
sm.addSkillName(usedSkill);
}
@@ -8618,7 +8618,7 @@ public class Player extends Playable
// Check if the caster is sitting
if (_waitTypeSitting)
{
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;
}
@@ -9572,7 +9572,7 @@ public class Player extends Playable
}
if (_isInDuel || _startingDuel)
{
_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL;
_noDuelReason = SystemMessageId.C1_IS_ALREADY_IN_A_DUEL;
return false;
}
if (_inOlympiadMode || isRegisteredOnEvent())
@@ -9582,7 +9582,7 @@ public class Player extends Playable
}
if (isCursedWeaponEquipped())
{
_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_IN_A_CHAOTIC_OR_PURPLE_STATE;
_noDuelReason = SystemMessageId.C1_IS_IN_A_CHAOTIC_OR_PURPLE_STATE_AND_CANNOT_PARTICIPATE_IN_A_DUEL;
return false;
}
if (_privateStoreType != PrivateStoreType.NONE)
@@ -9592,7 +9592,7 @@ public class Player extends Playable
}
if (isMounted() || isInBoat())
{
_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_RIDING_A_BOAT_FENRIR_OR_STRIDER;
_noDuelReason = SystemMessageId.C1_IS_RIDING_A_BOAT_FENRIR_OR_STRIDER_AND_THEREFORE_CANNOT_DUEL;
return false;
}
if (isFishing())
@@ -11777,7 +11777,7 @@ public class Player extends Playable
if (skill != null)
{
skill.applyEffects(this, this);
sendPacket(new SystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILEN_S_BREATH_LEVEL_S1).addInt(nextLv));
sendPacket(new SystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILLIEN_S_BREATH_LEVEL_S1).addInt(nextLv));
}
}
@@ -11788,11 +11788,11 @@ public class Player extends Playable
{
final Skill skill = SkillData.getInstance().getSkill(CommonSkill.SHILENS_BREATH.getId(), nextLv);
skill.applyEffects(this, this);
sendPacket(new SystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILEN_S_BREATH_LEVEL_S1).addInt(nextLv));
sendPacket(new SystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILLIEN_S_BREATH_LEVEL_S1).addInt(nextLv));
}
else
{
sendPacket(SystemMessageId.SHILEN_S_BREATH_HAS_BEEN_PURIFIED);
sendPacket(SystemMessageId.SHILLIEN_S_BREATH_HAS_BEEN_PURIFIED);
}
}
@@ -11802,7 +11802,7 @@ public class Player extends Playable
{
final Skill skill = SkillData.getInstance().getSkill(CommonSkill.SHILENS_BREATH.getId(), level);
skill.applyEffects(this, this);
sendPacket(new SystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILEN_S_BREATH_LEVEL_S1).addInt(level));
sendPacket(new SystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILLIEN_S_BREATH_LEVEL_S1).addInt(level));
}
}
@@ -11870,12 +11870,12 @@ public class Player extends Playable
}
else if (target.isDoor() || (target instanceof ControlTower))
{
sm = new SystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm = new SystemMessage(SystemMessageId.YOU_VE_HIT_FOR_S1_DAMAGE);
sm.addInt(damage);
}
else if (this != target)
{
sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm = new SystemMessage(SystemMessageId.C1_HAS_DEALT_S3_DAMAGE_TO_C2);
sm.addPcName(this);
// Localisation related.
@@ -11953,7 +11953,7 @@ public class Player extends Playable
if (equippedItem.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(equippedItem.getEnchantLevel());
sm.addItemName(equippedItem);
}
@@ -12392,17 +12392,17 @@ public class Player extends Playable
}
else if (hasBlockActions() && hasAbnormalType(AbnormalType.PARALYZE))
{
sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_YOU_ARE_IN_A_PETRIFIED_OR_PARALYZED_STATE);
sendPacket(SystemMessageId.CANNOT_TELEPORT_WHILE_PETRIFIED_OR_PARALYZED);
return false;
}
else if (isDead())
{
sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_YOU_ARE_DEAD);
sendPacket(SystemMessageId.YOU_CANNOT_USE_TELEPORT_WHILE_YOU_ARE_DEAD);
return false;
}
else if (isInWater())
{
sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_UNDERWATER);
sendPacket(SystemMessageId.YOU_CANNOT_USE_TELEPORT_UNDERWATER);
return false;
}
else if ((type == 1) && (isInsideZone(ZoneId.SIEGE) || isInsideZone(ZoneId.CLAN_HALL) || isInsideZone(ZoneId.JAIL) || isInsideZone(ZoneId.CASTLE) || isInsideZone(ZoneId.NO_SUMMON_FRIEND) || isInsideZone(ZoneId.FORT)))
@@ -12414,7 +12414,7 @@ public class Player extends Playable
{
if (type == 0)
{
sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_IN_THIS_AREA);
sendPacket(SystemMessageId.YOU_CANNOT_USE_TELEPORT_IN_THIS_AREA);
}
else if (type == 1)
{
@@ -12963,7 +12963,7 @@ public class Player extends Playable
if ((_fallingDamage > 0) && !isInvul())
{
reduceCurrentHp(Math.min(_fallingDamage, getCurrentHp() - 1), this, null, false, true, false, false);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_RECEIVED_S1_FALLING_DAMAGE);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_VE_RECEIVED_S1_DAMAGE_FROM_FALLING);
sm.addInt(_fallingDamage);
sendPacket(sm);
}
@@ -14233,7 +14233,7 @@ public class Player extends Playable
}
if (oldLevel < getFactionLevel(faction))
{
sendPacket(new SystemMessage(SystemMessageId.THE_AMITY_LEVEL_OF_S1_HAS_INCREASED_OPEN_THE_FACTIONS_WINDOW_TO_CHECK).addFactionName(faction.getId()));
sendPacket(new SystemMessage(SystemMessageId.THE_S1_FACTION_LEVEL_HAS_INCREASED_OPEN_THE_FACTIONS_WINDOW_TO_LEARN_MORE).addFactionName(faction.getId()));
}
}

8
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java
View File

@@ -454,7 +454,7 @@ public abstract class Summon extends Playable
if ((getInventory() != null) && (getInventory().getSize() > 0))
{
_owner.setPetInvItems(true);
sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_YOUR_PET_INVENTORY_RENDERING_YOU_UNABLE_TO_SELL_TRADE_DROP_PET_SUMMONING_ITEMS_PLEASE_EMPTY_YOUR_PET_INVENTORY);
sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_THE_PET_S_INVENTORY_TAKE_THEM_OUT_FIRST);
}
else
{
@@ -663,7 +663,7 @@ public abstract class Summon extends Playable
// 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;
}
@@ -764,7 +764,7 @@ public abstract class Summon extends Playable
}
else
{
sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm = new SystemMessage(SystemMessageId.C1_HAS_DEALT_S3_DAMAGE_TO_C2);
sm.addNpcName(this);
sm.addString(target.getName());
sm.addInt(damage);
@@ -968,7 +968,7 @@ public abstract class Summon extends Playable
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;
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/ControllableAirShip.java
View File

@@ -147,7 +147,7 @@ public class ControllableAirShip extends AirShip
}
else if (player.isCursedWeaponEquipped())
{
player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_A_CURSED_WEAPON_IS_EQUIPPED);
player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHEN_A_CURSED_WEAPON_IS_EQUIPPED);
return false;
}
else if (player.isFishing())

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Doppelganger.java
View File

@@ -151,7 +151,7 @@ public class Doppelganger extends Npc
}
else
{
sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm = new SystemMessage(SystemMessageId.C1_HAS_DEALT_S3_DAMAGE_TO_C2);
sm.addNpcName(this);
sm.addString(target.getName());
sm.addInt(damage);

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java
View File

@@ -599,7 +599,7 @@ public class Pet extends Summon
}
else if (target.getEnchantLevel() > 0)
{
smsg = new SystemMessage(SystemMessageId.YOUR_PET_PICKED_UP_S1_S2);
smsg = new SystemMessage(SystemMessageId.YOUR_PET_HAS_PICKED_UP_S1_S2);
smsg.addInt(target.getEnchantLevel());
smsg.addItemName(target);
sendPacket(smsg);
@@ -663,7 +663,7 @@ public class Pet extends Summon
return false;
}
stopFeed();
sendPacket(SystemMessageId.THE_PET_HAS_BEEN_KILLED_IF_YOU_DON_T_RESURRECT_IT_WITHIN_24_HOURS_THE_PET_S_BODY_WILL_DISAPPEAR_ALONG_WITH_ALL_THE_PET_S_ITEMS);
sendPacket(SystemMessageId.THE_PET_HAS_BEEN_KILLED_IF_YOU_DON_T_RESURRECT_IT_WITHIN_24_H_THE_PET_S_BODY_WILL_DISAPPEAR_ALONG_WITH_ALL_THE_PET_S_ITEMS);
DecayTaskManager.getInstance().add(this);
// do not decrease exp if is in duel, arena
return true;

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java
View File

@@ -167,7 +167,7 @@ public class RaceManager extends Npc
item.setCustomType1(ticket);
item.setCustomType2(TICKET_PRICES[priceId - 1] / 100);
player.addItem("Race", item, player, false);
final SystemMessage msg = new SystemMessage(SystemMessageId.ACQUIRED_S1_S2);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_S2_OBTAINED);
msg.addInt(MonsterRace.getInstance().getRaceNumber());
msg.addItemName(4443);
player.sendPacket(msg);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlag.java
View File

@@ -158,7 +158,7 @@ public class SiegeFlag extends Npc
if (canTalk() && (((getCastle() != null) && getCastle().getSiege().isInProgress()) || ((getFort() != null) && getFort().getSiege().isInProgress())) && (_clan != null))
{
// send warning to owners of headquarters that theirs base is under attack
_clan.broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_BASE_IS_BEING_ATTACKED));
_clan.broadcastToOnlineMembers(new SystemMessage(SystemMessageId.SIEGE_CAMP_IS_UNDER_ATTACK));
setCanTalk(false);
ThreadPool.schedule(new ScheduleTalkTask(), 20000);
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java
View File

@@ -276,7 +276,7 @@ public class Trap extends Npc
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_DEALT_S3_DAMAGE_TO_C2);
sm.addString(getName());
sm.addString(target.getName());
sm.addInt(damage);

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java
View File

@@ -246,7 +246,7 @@ public class VillageMaster extends Folk
final Clan clan = player.getClan();
if (clan.getAllyId() != 0)
{
player.sendPacket(SystemMessageId.THE_OPPOSING_CLAN_HAS_REQUESTED_TO_DISSOLVE);
player.sendPacket(SystemMessageId.YOU_CANNOT_DISPERSE_THE_CLANS_IN_YOUR_ALLIANCE);
return;
}
if (clan.isAtWar())
@@ -256,7 +256,7 @@ public class VillageMaster extends Folk
}
if ((clan.getCastleId() != 0) || (clan.getHideoutId() != 0) || (clan.getFortId() != 0))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_WHILE_OWNING_A_CLAN_HALL_OR_CASTLE);
player.sendPacket(SystemMessageId.YOU_CAN_T_DISBAND_THE_CLAN_THAT_HAS_A_CLAN_HALL_OR_CASTLE);
return;
}

10
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
View File

@@ -179,7 +179,7 @@ public class PlayerStat extends PlayableStat
}
else if (expAdded && !spAdded)
{
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP);
sm.addLong(finalExp);
}
else
@@ -507,11 +507,11 @@ public class PlayerStat extends PlayableStat
{
if (points < getVitalityPoints())
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_HAS_DECREASED);
getActiveChar().sendPacket(SystemMessageId.YOUR_SAYHA_S_GRACE_HAS_DECREASED);
}
else
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_HAS_INCREASED);
getActiveChar().sendPacket(SystemMessageId.YOUR_SAYHA_S_GRACE_HAS_INCREASED);
}
}
@@ -519,11 +519,11 @@ public class PlayerStat extends PlayableStat
if (points == 0)
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_IS_FULLY_EXHAUSTED);
getActiveChar().sendPacket(SystemMessageId.YOUR_SAYHA_S_GRACE_IS_FULLY_EXHAUSTED);
}
else if (points == MAX_VITALITY_POINTS)
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_IS_AT_MAXIMUM);
getActiveChar().sendPacket(SystemMessageId.YOUR_SAYHA_S_GRACE_IS_AT_MAXIMUM);
}
final Player player = getActiveChar();

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/status/PetStatus.java
View File

@@ -51,7 +51,7 @@ public class PetStatus extends SummonStatus
{
if (!isDOT && (getActiveChar().getOwner() != null))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_BY_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_DEALS_S2_DAMAGE_TO_THE_PET);
sm.addString(attacker.getName());
sm.addInt((int) value);
getActiveChar().sendPacket(sm);

6
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
View File

@@ -180,7 +180,7 @@ public class PlayerStatus extends PlayableStatus
mpDam = (int) (amount - mpDam);
if (mpDam > getActiveChar().getCurrentMp())
{
getActiveChar().sendPacket(SystemMessageId.MP_HAS_REACHED_0_THE_MANA_ARMOR_HAS_DISAPPEARED);
getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
getActiveChar().stopSkillEffects(SkillFinishType.REMOVED, 1556);
amount = mpDam - getActiveChar().getCurrentMp();
getActiveChar().setCurrentMp(0);
@@ -188,7 +188,7 @@ public class PlayerStatus extends PlayableStatus
else
{
getActiveChar().reduceCurrentMp(mpDam);
final SystemMessage smsg = new SystemMessage(SystemMessageId.MANA_ARMOR_DECREASED_YOUR_MP_BY_S1_INSTEAD_OF_HP);
final SystemMessage smsg = new SystemMessage(SystemMessageId.ARCANE_SHIELD_DECREASED_YOUR_MP_INSTEAD_OF_HP);
smsg.addInt(mpDam);
getActiveChar().sendPacket(smsg);
return;
@@ -272,7 +272,7 @@ public class PlayerStatus extends PlayableStatus
if ((tDmg > 0) && (summon != null) && (attackerPlayer != null))
{
smsg = new SystemMessage(SystemMessageId.YOU_HAVE_DEALT_S1_DAMAGE_TO_YOUR_TARGET_AND_S2_DAMAGE_TO_THE_SERVITOR);
smsg = new SystemMessage(SystemMessageId.YOU_VE_DEALT_S1_DAMAGE_TO_YOUR_TARGET_AND_S2_DAMAGE_TO_THEIR_SERVITOR);
smsg.addInt(fullValue);
smsg.addInt(tDmg);
attackerPlayer.sendPacket(smsg);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/WaterTask.java
View File

@@ -46,7 +46,7 @@ public class WaterTask implements Runnable
_player.reduceCurrentHp(reduceHp, _player, null, false, true, false, false);
// reduced hp, becouse not rest
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_TAKEN_S1_DAMAGE_BECAUSE_YOU_WERE_UNABLE_TO_BREATHE);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_VE_RECEIVED_S1_DAMAGE_FROM_BEING_UNABLE_TO_BREATHE);
sm.addInt((int) reduceHp);
_player.sendPacket(sm);
}

18
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@@ -2036,7 +2036,7 @@ public class Clan implements IIdentifiable, INamable
}
if (target == null)
{
player.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
player.sendPacket(SystemMessageId.THE_TARGET_CANNOT_BE_INVITED);
return false;
}
if (player.getObjectId() == target.getObjectId())
@@ -2046,7 +2046,7 @@ public class Clan implements IIdentifiable, INamable
}
if (_charPenaltyExpiryTime > Chronos.currentTimeMillis())
{
player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER);
player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE);
return false;
}
if (target.getClanId() != 0)
@@ -2058,7 +2058,7 @@ public class Clan implements IIdentifiable, INamable
}
if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
sm.addString(target.getName());
player.sendPacket(sm);
return false;
@@ -2100,12 +2100,12 @@ public class Clan implements IIdentifiable, INamable
final Clan leaderClan = player.getClan();
if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN))
{
player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN);
player.sendPacket(SystemMessageId.YOU_CAN_ACCEPT_A_NEW_CLAN_IN_THE_ALLIANCE_IN_24_H_AFTER_DISMISSING_ANOTHER_ONE);
return false;
}
if (target == null)
{
player.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
player.sendPacket(SystemMessageId.THE_TARGET_CANNOT_BE_INVITED);
return false;
}
if (player.getObjectId() == target.getObjectId())
@@ -2146,7 +2146,7 @@ public class Clan implements IIdentifiable, INamable
}
if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_DISMISSED)
{
player.sendPacket(SystemMessageId.A_CLAN_THAT_HAS_WITHDRAWN_OR_BEEN_EXPELLED_CANNOT_ENTER_INTO_AN_ALLIANCE_WITHIN_ONE_DAY_OF_WITHDRAWAL_OR_EXPULSION);
player.sendPacket(SystemMessageId.A_CLAN_CAN_JOIN_ANOTHER_ALLIANCE_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
return false;
}
}
@@ -2157,7 +2157,7 @@ public class Clan implements IIdentifiable, INamable
}
if (leaderClan.isAtWarWith(targetClan.getId()))
{
player.sendPacket(SystemMessageId.YOU_MAY_NOT_ALLY_WITH_A_CLAN_YOU_ARE_CURRENTLY_AT_WAR_WITH_THAT_WOULD_BE_DIABOLICAL_AND_TREACHEROUS);
player.sendPacket(SystemMessageId.YOU_CANNOT_MAKE_AN_ALLIANCE_WITH_A_CLAN_YOU_ARE_IN_WAR_WITH);
return false;
}
@@ -2283,7 +2283,7 @@ public class Clan implements IIdentifiable, INamable
return;
}
broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED));
broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_IS_DISBANDED));
final long currentTime = Chronos.currentTimeMillis();
for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId()))
@@ -2376,7 +2376,7 @@ public class Clan implements IIdentifiable, INamable
}
// notify all the members about it
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_CLAN_LEVEL_HAS_RISEN));
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_CLAN_S_LEVEL_HAS_INCREASED));
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
}

10
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
View File

@@ -138,11 +138,11 @@ public class ClanWar
if (killCount >= 5)
{
_state = ClanWarState.MUTUAL;
SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_500_CLAN_REPUTATION_POINTS_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
sm.addString(victimClan.getName());
killerClan.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_500_CLAN_REPUTATION_POINTS_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
sm.addString(killerClan.getName());
victimClan.broadcastToOnlineMembers(sm);
@@ -188,7 +188,7 @@ public class ClanWar
final Clan attackedClan = ClanTable.getInstance().getClan(_attackedClanId);
if ((attackerClan != null) && (attackedClan != null))
{
SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_DECLARED_BY_CLAN_S1_WAS_CANCELLED);
SystemMessage sm = new SystemMessage(SystemMessageId.THE_WAR_DECLARED_BY_THE_S1_CLAN_HAS_ENDED);
sm.addString(attackerClan.getName());
attackedClan.broadcastToOnlineMembers(sm);
@@ -205,11 +205,11 @@ public class ClanWar
public void mutualClanWarAccepted(Clan attacker, Clan attacked)
{
_state = ClanWarState.MUTUAL;
SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_500_CLAN_REPUTATION_POINTS_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
sm.addString(attacker.getName());
attacked.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_500_CLAN_REPUTATION_POINTS_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
sm.addString(attacked.getName());
attacker.broadcastToOnlineMembers(sm);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java
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 (_value == canCreateBase);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java
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 (_value == canCreateOutpost);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -70,7 +70,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
}
else if (!Util.checkIfInRange(200, player, effected, true) || (player.getZ() < effected.getZ()) || (Math.abs(player.getZ() - effected.getZ()) > 40))
{
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 (_value == canTakeCastle);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java
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 (_value == canTakeFort);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java
View File

@@ -45,7 +45,7 @@ public class ConditionPlayerHasFreeTeleportBookmarkSlots extends Condition
if ((player.getBookMarkSlot() + _teleportBookmarkSlots) > 18)
{
player.sendPacket(SystemMessageId.YOUR_NUMBER_OF_MY_TELEPORTS_SLOTS_HAS_REACHED_ITS_MAXIMUM_LIMIT);
player.sendPacket(SystemMessageId.YOU_HAVE_REACHED_THE_MAXIMUM_NUMBER_OF_MY_TELEPORT_SLOTS_OR_USE_CONDITIONS_ARE_NOT_OBSERVED);
return false;
}

8
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@@ -44,9 +44,9 @@ import org.l2jmobius.gameserver.enums.Faction;
import org.l2jmobius.gameserver.enums.Movie;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.instancemanager.MailManager;
import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
@@ -2673,21 +2673,21 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
// If item for reward is gold, send message of gold reward to client
if (item.getId() == Inventory.ADENA_ID)
{
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_ADENA);
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_ADENA);
smsg.addLong(count);
player.sendPacket(smsg);
}
// Otherwise, send message of object reward to client
else if (count > 1)
{
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
smsg.addItemName(item);
smsg.addLong(count);
player.sendPacket(smsg);
}
else
{
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1);
smsg.addItemName(item);
player.sendPacket(smsg);
}

14
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
View File

@@ -155,7 +155,7 @@ public class Fishing
{
if (Config.PREMIUM_ONLY_FISHING && !_player.hasPremiumStatus())
{
_player.sendPacket(SystemMessageId.FISHING_IS_AVAILABLE_TO_PREMIUM_USERS_ONLY);
_player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_AS_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
_player.sendPacket(ActionFailed.STATIC_PACKET);
stopFishing(FishingEndType.ERROR);
return;
@@ -183,7 +183,7 @@ public class Fishing
final Item rod = _player.getActiveWeaponInstance();
if ((rod == null) || (rod.getItemType() != WeaponType.FISHINGROD))
{
_player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_FISHING_POLE_EQUIPPED);
_player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_FISHING_ROD_EQUIPPED);
_player.sendPacket(ActionFailed.STATIC_PACKET);
stopFishing(FishingEndType.ERROR);
return;
@@ -192,7 +192,7 @@ public class Fishing
final FishingRod rodData = FishingData.getInstance().getRodData(rod.getId());
if (rodData == null)
{
_player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_FISHING_POLE_EQUIPPED);
_player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_FISHING_ROD_EQUIPPED);
_player.sendPacket(ActionFailed.STATIC_PACKET);
stopFishing(FishingEndType.ERROR);
return;
@@ -200,7 +200,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;
@@ -232,7 +232,7 @@ public class Fishing
}
else
{
_player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE_YOUR_CHARACTER_IS_NOT_FACING_WATER_OR_YOU_ARE_NOT_IN_A_FISHING_GROUND);
_player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE);
_player.sendPacket(ActionFailed.STATIC_PACKET);
}
stopFishing(FishingEndType.ERROR);
@@ -321,7 +321,7 @@ public class Fishing
final long sp = (long) (Rnd.get(fishingData.getSpRateMin(), fishingData.getSpRateMax()) * lvlModifier * _player.getStat().getMul(Stat.FISHING_EXP_SP_BONUS, 1));
_player.addExpAndSp(xp, sp, true);
_player.getInventory().addItem("Fishing Reward", fishingCatchData.getItemId(), 1, _player, null);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1);
msg.addItemName(fishingCatchData.getItemId());
_player.sendPacket(msg);
if (_player.isChargedShot(ShotType.GOLD_FISH_SOULSHOTS))
@@ -425,7 +425,7 @@ public class Fishing
final int baitZ = computeBaitZ(_player, baitX, baitY, fishingZone, waterZone);
if (baitZ == Integer.MIN_VALUE)
{
_player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE_YOUR_CHARACTER_IS_NOT_FACING_WATER_OR_YOU_ARE_NOT_IN_A_FISHING_GROUND);
_player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE);
return null;
}

6
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

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

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java
View File

@@ -858,11 +858,11 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
{
if (isEquipable())
{
creature.sendPacket(SystemMessageId.YOU_CANNOT_EQUIP_THAT_ITEM_IN_A_OLYMPIAD_MATCH);
creature.sendPacket(SystemMessageId.THE_ITEM_CANNOT_BE_EQUIPPED_IN_THE_OLYMPIAD);
}
else
{
creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_OLYMPIAD_MATCH);
creature.sendPacket(SystemMessageId.THE_ITEM_CANNOT_BE_USED_IN_THE_OLYMPIAD);
}
return false;
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java
View File

@@ -348,7 +348,7 @@ public class ItemAuction
{
_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_5_MIN;
_endingTime += ENDING_TIME_EXTEND_5;
broadcastToAllBidders(new SystemMessage(SystemMessageId.BIDDER_EXISTS_THE_AUCTION_TIME_HAS_BEEN_EXTENDED_BY_5_MINUTES));
broadcastToAllBidders(new SystemMessage(SystemMessageId.BIDDER_EXISTS_THE_AUCTION_TIME_HAS_BEEN_EXTENDED_FOR_5_MIN));
break;
}
case EXTEND_BY_5_MIN:
@@ -357,7 +357,7 @@ public class ItemAuction
{
_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_3_MIN;
_endingTime += ENDING_TIME_EXTEND_3;
broadcastToAllBidders(new SystemMessage(SystemMessageId.BIDDER_EXISTS_AUCTION_TIME_HAS_BEEN_EXTENDED_BY_3_MINUTES));
broadcastToAllBidders(new SystemMessage(SystemMessageId.BIDDER_EXISTS_AUCTION_TIME_HAS_BEEN_EXTENDED_FOR_3_MIN));
}
break;
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -152,7 +152,7 @@ public abstract class AbstractOlympiadGame
}
if (!player.isInventoryUnder90(true))
{
sm = new SystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_AS_THE_INVENTORY_WEIGHT_SLOT_IS_FILLED_BEYOND_80);
sm = new SystemMessage(SystemMessageId.C1_CAN_T_PARTICIPATE_IN_THE_OLYMPIAD_BECAUSE_THEIR_INVENTORY_IS_FILLED_FOR_MORE_THAN_80);
sm.addPcName(player);
player.sendPacket(sm);
return new SystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
@@ -428,7 +428,7 @@ public abstract class AbstractOlympiadGame
}
iu.addModifiedItem(item);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
sm.addItemName(item);
sm.addLong(holder.getCount());
player.sendPacket(sm);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@@ -56,7 +56,7 @@ public class OlympiadAnnouncer implements Runnable
}
case CLASSED:
{
npcString = NpcStringId.OLYMPIAD_CLASS_INDIVIDUAL_MATCH_IS_GOING_TO_BEGIN_IN_ARENA_S1_IN_A_MOMENT;
npcString = NpcStringId.THE_CLASS_DUELS_WILL_START_SHORTLY_IN_ARENA_S1;
break;
}
default:

6
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java
View File

@@ -495,7 +495,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
else if (_pOneCrash && _pTwoCrash)
{
stadium.broadcastPacket(new SystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE));
stadium.broadcastPacket(new SystemMessage(SystemMessageId.THE_DUEL_HAS_ENDED_IN_A_TIE));
_playerOne.updateStat(COMP_LOST, 1);
removePointsFromParticipant(_playerOne, pointDiff);
@@ -575,7 +575,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
{
_playerOne.updateStat(COMP_DRAWN, 1);
_playerTwo.updateStat(COMP_DRAWN, 1);
sm = new SystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
sm = new SystemMessage(SystemMessageId.THE_DUEL_HAS_ENDED_IN_A_TIE);
stadium.broadcastPacket(sm);
}
else if ((_playerTwo.getPlayer() == null) || !_playerTwo.getPlayer().isOnline() || ((playerTwoHp == 0) && (playerOneHp != 0)) || ((_damageP1 > _damageP2) && (playerTwoHp != 0) && (playerOneHp != 0)))
@@ -637,7 +637,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
// Save Fight Result
saveResults(_playerOne, _playerTwo, 0, _startTime, _fightTime, getType());
sm = new SystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
sm = new SystemMessage(SystemMessageId.THE_DUEL_HAS_ENDED_IN_A_TIE);
stadium.broadcastPacket(sm);
int value = Math.min(playerOnePoints / getDivider(), Config.ALT_OLY_MAX_POINTS);

10
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java
View File

@@ -193,7 +193,7 @@ public class OlympiadGameTask implements Runnable
{
if (_countDown > 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_TO_THE_OLYMPIAD_STADIUM_IN_S1_SECOND_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_WILL_BE_TAKEN_TO_THE_OLYMPIC_STADIUM_IN_S1_SEC);
sm.addInt(_countDown);
_game.broadcastPacket(sm);
}
@@ -236,7 +236,7 @@ public class OlympiadGameTask implements Runnable
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_MATCH_BEGINS_IN_S1_SEC);
sm.addInt(_countDown);
_stadium.broadcastPacket(sm);
}
@@ -260,7 +260,7 @@ public class OlympiadGameTask implements Runnable
{
if (_countDown > 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_MATCH_BEGINS_IN_S1_SEC);
sm.addInt(_countDown);
_stadium.broadcastPacket(sm);
}
@@ -293,7 +293,7 @@ public class OlympiadGameTask implements Runnable
{
if (announceTime == remaining)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_GAME_WILL_END_IN_S1_SECOND_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_GAME_ENDS_IN_S1_SEC);
sm.addInt(announceTime);
_stadium.broadcastPacket(sm);
break;
@@ -439,7 +439,7 @@ public class OlympiadGameTask implements Runnable
{
// game successfully started
_game.broadcastOlympiadInfo(_stadium);
_stadium.broadcastPacket(new SystemMessage(SystemMessageId.THE_MATCH_HAS_STARTED_FIGHT));
_stadium.broadcastPacket(new SystemMessage(SystemMessageId.THE_MATCH_HAS_BEGUN_FIGHT));
_stadium.updateZoneStatusForCharactersInside();
return true;
}

14
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
View File

@@ -179,20 +179,20 @@ public class OlympiadManager
{
if (!Olympiad._inCompPeriod)
{
player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
player.sendPacket(SystemMessageId.THE_OLYMPIAD_IS_NOT_HELD_RIGHT_NOW);
return false;
}
if (Olympiad.getInstance().getMillisToCompEnd() < 1200000)
{
player.sendPacket(SystemMessageId.GAME_PARTICIPATION_REQUEST_MUST_BE_FILED_NOT_EARLIER_THAN_10_MINUTES_AFTER_THE_GAME_ENDS);
player.sendPacket(SystemMessageId.GAME_PARTICIPATION_REQUEST_MUST_BE_FILED_NOT_EARLIER_THAN_10_MIN_AFTER_THE_GAME_ENDS);
return false;
}
final int charId = player.getObjectId();
if (Olympiad.getInstance().getRemainingWeeklyMatches(charId) < 1)
{
player.sendPacket(SystemMessageId.YOU_MAY_PARTICIPATE_IN_UP_TO_30_MATCHES_PER_WEEK);
player.sendPacket(SystemMessageId.THE_MAXIMUM_NUMBER_OF_MATCHES_YOU_CAN_PARTICIPATE_IN_1_WEEK_IS_25);
return false;
}
@@ -237,7 +237,7 @@ public class OlympiadManager
}
_classBasedRegisters.computeIfAbsent(getClassGroup(player), k -> ConcurrentHashMap.newKeySet()).add(charId);
player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REGISTERED_FOR_THE_OLYMPIAD_WAITING_LIST_FOR_A_CLASS_BATTLE);
player.sendPacket(SystemMessageId.YOU_VE_BEEN_REGISTERED_FOR_THE_OLYMPIAD_CLASS_MATCHES);
break;
}
case NON_CLASSED:
@@ -258,7 +258,7 @@ public class OlympiadManager
}
_nonClassBasedRegisters.add(charId);
player.sendPacket(SystemMessageId.YOU_ARE_CURRENTLY_REGISTERED_FOR_A_1V1_CLASS_IRRELEVANT_MATCH);
player.sendPacket(SystemMessageId.YOU_HAVE_REGISTERED_IN_THE_WORLD_OLYMPIAD);
break;
}
}
@@ -269,13 +269,13 @@ public class OlympiadManager
{
if (!Olympiad._inCompPeriod)
{
noble.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
noble.sendPacket(SystemMessageId.THE_OLYMPIAD_IS_NOT_HELD_RIGHT_NOW);
return false;
}
if (noble.getNobleLevel() == 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_ONLY_NOBLESSE_EXALTED_CHARACTERS_CAN_PARTICIPATE_IN_THE_OLYMPIAD);
final SystemMessage sm = new SystemMessage(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;

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHall.java
View File

@@ -374,7 +374,7 @@ public class ClanHall extends AbstractResidence
else
{
_checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day
final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_DEPOSIT_THE_NECESSARY_AMOUNT_OF_ADENA_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
sm.addInt(_lease);
_owner.broadcastToOnlineMembers(sm);
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java
View File

@@ -272,7 +272,7 @@ public class Castle extends AbstractResidence
}
setSide(side);
setOwner(clan);
final SystemMessage msg = new SystemMessage(SystemMessageId.CLAN_S1_HAS_SUCCEEDED_IN_S2);
final SystemMessage msg = new SystemMessage(SystemMessageId.S2_CLAN_S1_WINS);
msg.addString(clan.getName());
msg.addString(getName());
getSiege().announceToPlayer(msg, true);

14
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
View File

@@ -116,49 +116,49 @@ public class FortSiege implements Siegable
else if (_time == 600) // 10min remains
{
_fort.despawnSuspiciousMerchant();
sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_STARTS_IN_S1_MIN);
sm.addInt(10);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(300), 300000); // Prepare task for 5 minutes left.
}
else if (_time == 300) // 5min remains
{
sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_STARTS_IN_S1_MIN);
sm.addInt(5);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(60), 240000); // Prepare task for 1 minute left.
}
else if (_time == 60) // 1min remains
{
sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_STARTS_IN_S1_MIN);
sm.addInt(1);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(30), 30000); // Prepare task for 30 seconds left.
}
else if (_time == 30) // 30seconds remains
{
sm = new SystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_STARTS_IN_S1_SEC);
sm.addInt(30);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(10), 20000); // Prepare task for 10 seconds left.
}
else if (_time == 10) // 10seconds remains
{
sm = new SystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_STARTS_IN_S1_SEC);
sm.addInt(10);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(5), 5000); // Prepare task for 5 seconds left.
}
else if (_time == 5) // 5seconds remains
{
sm = new SystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_STARTS_IN_S1_SEC);
sm.addInt(5);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(1), 4000); // Prepare task for 1 seconds left.
}
else if (_time == 1) // 1seconds remains
{
sm = new SystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_STARTS_IN_S1_SEC);
sm.addInt(1);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(0), 1000); // Prepare task start siege.

12
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@@ -105,35 +105,35 @@ public class Siege implements Siegable
final long timeRemaining = _siegeEndDate.getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
if (timeRemaining > 3600000)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HOUR_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_CASTLE_SIEGE_ENDS_IN_S1_H);
sm.addInt(2);
announceToPlayer(sm, true);
ThreadPool.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 3600000); // Prepare task for 1 hr left.
}
else if ((timeRemaining <= 3600000) && (timeRemaining > 600000))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_CASTLE_SIEGE_ENDS_IN_S1_MIN);
sm.addInt((int) timeRemaining / 60000);
announceToPlayer(sm, true);
ThreadPool.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 600000); // Prepare task for 10 minute left.
}
else if ((timeRemaining <= 600000) && (timeRemaining > 300000))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_CASTLE_SIEGE_ENDS_IN_S1_MIN);
sm.addInt((int) timeRemaining / 60000);
announceToPlayer(sm, true);
ThreadPool.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 300000); // Prepare task for 5 minute left.
}
else if ((timeRemaining <= 300000) && (timeRemaining > 10000))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_CASTLE_SIEGE_ENDS_IN_S1_MIN);
sm.addInt((int) timeRemaining / 60000);
announceToPlayer(sm, true);
ThreadPool.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 10000); // Prepare task for 10 seconds count down
}
else if ((timeRemaining <= 10000) && (timeRemaining > 0))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.THIS_CASTLE_SIEGE_WILL_END_IN_S1_SECOND_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_CASTLE_SIEGE_ENDS_IN_S1_SEC);
sm.addInt((int) timeRemaining / 1000);
announceToPlayer(sm, true);
ThreadPool.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining); // Prepare task for second count down
@@ -1154,7 +1154,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() == _castle.getOwnerId())
{

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
View File

@@ -428,7 +428,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;
}
@@ -1076,7 +1076,7 @@ public class SkillCaster implements Runnable
if (player.isInOlympiadMode() && skill.isBlockedInOlympiad())
{
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_SKILL_IN_A_OLYMPIAD_MATCH);
player.sendPacket(SystemMessageId.THE_SKILL_CANNOT_BE_USED_IN_THE_OLYMPIAD);
return false;
}

4555
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/NpcStringId.java
View File

File diff suppressed because it is too large Load Diff

5703
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/SystemMessageId.java
View File

File diff suppressed because it is too large Load Diff

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java
View File

@@ -92,6 +92,6 @@ public class AllyDismiss implements IClientIncomingPacket
clan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ALLY_JOIN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_CLAN_DISMISSED); // 24*60*60*1000 = 86400000
clan.updateClanInDB();
player.sendPacket(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_EXPELLING_THE_CLAN);
player.sendPacket(SystemMessageId.THE_CLAN_IS_DISMISSED_FROM_THE_ALLIANCE);
}
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java
View File

@@ -70,6 +70,6 @@ public class AllyLeave implements IClientIncomingPacket
clan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ALLY_JOIN_DAYS_WHEN_LEAVED * 86400000), Clan.PENALTY_TYPE_CLAN_LEAVED); // 24*60*60*1000 = 86400000
clan.updateClanInDB();
player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_ALLIANCE);
player.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_ALLIANCE);
}
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@@ -380,7 +380,7 @@ public class EnterWorld implements IClientIncomingPacket
final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan);
if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_DEPOSIT_THE_NECESSARY_AMOUNT_OF_ADENA_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
sm.addInt(ch.getLease());
player.sendPacket(sm);
}
@@ -555,7 +555,7 @@ public class EnterWorld implements IClientIncomingPacket
if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis())
{
player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS);
player.sendPacket(SystemMessageId.YOU_ARE_DISMISSED_FROM_A_CLAN_YOU_CANNOT_JOIN_ANOTHER_FOR_24_H);
}
// remove combat flag before teleporting

8
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@@ -568,21 +568,21 @@ public class MultiSellChoose implements IClientIncomingPacket
if (addedItem.getCount() > 1)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
sm.addItemName(addedItem.getId());
sm.addLong(totalCount);
player.sendPacket(sm);
}
else if (addedItem.getEnchantLevel() > 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.ACQUIRED_S1_S2);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_OBTAINED);
sm.addLong(addedItem.getEnchantLevel());
sm.addItemName(addedItem.getId());
player.sendPacket(sm);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1);
sm.addItemName(addedItem);
player.sendPacket(sm);
}
@@ -644,7 +644,7 @@ public class MultiSellChoose implements IClientIncomingPacket
}
else if (!player.isClanLeader())
{
player.sendPacket(SystemMessageId.ONLY_THE_CLAN_LEADER_IS_ENABLED);
player.sendPacket(SystemMessageId.CAN_BE_USED_ONLY_BY_A_CLAN_LEADER);
return false;
}
else if (clan.getReputationScore() < totalCount)

14
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

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

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
View File

@@ -148,7 +148,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
}
else
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
}
}
else if (isPlayerShot(item.getItem()))

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
View File

@@ -87,7 +87,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (player.hasItemRequest())
{
player.sendPacket(SystemMessageId.YOU_CANNOT_CANCEL_DURING_AN_ITEM_ENHANCEMENT_OR_ATTRIBUTE_ENHANCEMENT);
player.sendPacket(SystemMessageId.UNAVAILABLE_WHILE_THE_ENCHANTING_IS_IN_PROCESS);
return;
}
@@ -187,7 +187,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
playerIU.addNewItem(newItem);
}
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(item.getId());
sm.addLong(count);
player.sendPacket(sm);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java
View File

@@ -54,7 +54,7 @@ public class RequestChangePetName implements IClientIncomingPacket
if (!pet.isPet())
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
return;
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
View File

@@ -215,7 +215,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
if (itemToRemove.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(itemToRemove.getEnchantLevel());
sm.addItemName(itemToRemove);
}
@@ -240,7 +240,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{
// add crystals
final Item createdItem = player.getInventory().addItem("Crystalize", holder.getId(), holder.getCount(), player, player);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
sm.addItemName(createdItem);
sm.addLong(holder.getCount());
player.sendPacket(sm);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
View File

@@ -181,7 +181,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
{
if (itemToRemove.getEnchantLevel() > 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(itemToRemove.getEnchantLevel());
sm.addItemName(itemToRemove);
player.sendPacket(sm);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
View File

@@ -64,7 +64,7 @@ public class RequestDuelAnswerStart implements IClientIncomingPacket
SystemMessage msg2 = null;
if (requestor.isInDuel())
{
msg1 = new SystemMessage(SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL);
msg1 = new SystemMessage(SystemMessageId.C1_IS_ALREADY_IN_A_DUEL);
msg1.addString(requestor.getName());
player.sendPacket(msg1);
return;

10
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -122,7 +122,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
// first validation check - also over enchant check
if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit())))))
{
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
@@ -163,7 +163,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
// last validation check
if ((item.getOwnerId() != player.getObjectId()) || !item.isEnchantable())
{
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
@@ -174,7 +174,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
{
case ERROR:
{
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
break;
@@ -292,7 +292,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
{
if (item.getEnchantLevel() > 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
player.sendPacket(sm);
@@ -398,7 +398,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
{
crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
sm.addItemName(crystals);
sm.addLong(count);
player.sendPacket(sm);

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java
View File

@@ -66,7 +66,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket
if ((item == null) || (scroll == null))
{
// message may be custom
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.sendPacket(new ExPutEnchantScrollItemResult(0));
request.setEnchantingItem(Player.ID_NONE);
request.setEnchantingScroll(Player.ID_NONE);
@@ -77,7 +77,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket
if ((scrollTemplate == null))
{
// message may be custom
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.sendPacket(new ExPutEnchantScrollItemResult(0));
request.setEnchantingScroll(Player.ID_NONE);
return;

6
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
View File

@@ -225,7 +225,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
}
else
{
sm = new SystemMessage(SystemMessageId.S2_ELEMENTAL_POWER_HAS_BEEN_ADDED_SUCCESSFULLY_TO_S1);
sm = new SystemMessage(SystemMessageId.S2_ATTRIBUTE_HAS_BEEN_ADDED_TO_S1);
}
sm.addItemName(item);
sm.addAttribute(realElement.getClientId());
@@ -238,11 +238,11 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
{
if (item.isArmor())
{
sm = new SystemMessage(SystemMessageId.THE_S3_S_ATTRIBUTE_WAS_SUCCESSFULLY_BESTOWED_ON_S1_S2_AND_RESISTANCE_TO_S4_WAS_INCREASED);
sm = new SystemMessage(SystemMessageId.S3_POWER_HAS_BEEN_ADDED_TO_S1_S2_S4_RESISTANCE_IS_INCREASED);
}
else
{
sm = new SystemMessage(SystemMessageId.S3_ELEMENTAL_POWER_HAS_BEEN_ADDED_SUCCESSFULLY_TO_S1_S2);
sm = new SystemMessage(SystemMessageId.S3_POWER_HAS_BEEN_ADDED_TO_S1_S2);
}
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java
View File

@@ -52,13 +52,13 @@ public class RequestExOustFromMPCC implements IClientIncomingPacket
target.getParty().getCommandChannel().removeParty(target.getParty());
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_WERE_DISMISSED_FROM_THE_COMMAND_CHANNEL);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_ARE_DISMISSED_FROM_THE_COMMAND_CHANNEL);
target.getParty().broadcastPacket(sm);
// check if CC has not been canceled
if (player.getParty().isInCommandChannel())
{
sm = new SystemMessage(SystemMessageId.C1_S_PARTY_HAS_BEEN_DISMISSED_FROM_THE_COMMAND_CHANNEL);
sm = new SystemMessage(SystemMessageId.C1_S_PARTY_IS_DISMISSED_FROM_THE_COMMAND_CHANNEL);
sm.addString(target.getParty().getLeader().getName());
player.getParty().getCommandChannel().broadcastPacket(sm);
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
View File

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

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
View File

@@ -94,7 +94,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket
{
if (clan.getLevel() < 3)
{
player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
player.sendPacket(SystemMessageId.A_CLAN_CREST_CAN_ONLY_BE_REGISTERED_WHEN_THE_CLAN_S_SKILL_LEVEL_IS_3_OR_ABOVE);
return;
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -157,12 +157,12 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
player.sendPacket(iu);
player.sendPacket(new SystemMessage(SystemMessageId.ARTIFACT_UPGRADE_SUCCEEDED_AND_YOU_OBTAINED_S1).addItemName(targetItem.getId()));
player.sendPacket(new SystemMessage(SystemMessageId.SUCCESSFUL_ARTIFACT_UPGRADE_YOU_HAVE_OBTAINED_S1).addItemName(targetItem.getId()));
player.sendPacket(new ExTryEnchantArtifactResult(ExTryEnchantArtifactResult.SUCCESS, targetItem.getEnchantLevel()));
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.FAILED_TO_UPGRADE_ARTIFACT_THE_ITEM_S_UPGRADE_LEVEL_WILL_REMAIN_THE_SAME));
player.sendPacket(new SystemMessage(SystemMessageId.UPGRADE_FAILED_THE_MODIFICATION_OF_THE_ITEMS_HAS_NOT_CHANGED));
player.sendPacket(new ExTryEnchantArtifactResult(ExTryEnchantArtifactResult.FAIL, targetItem.getEnchantLevel()));
}
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
View File

@@ -68,7 +68,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke
if ((item == null) || (scroll == null) || (support == null))
{
// message may be custom
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
request.setEnchantingItem(Player.ID_NONE);
request.setSupportItem(Player.ID_NONE);
return;
@@ -79,7 +79,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke
if ((scrollTemplate == null) || (supportTemplate == null) || !scrollTemplate.isValid(item, supportTemplate))
{
// message may be custom
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
request.setSupportItem(Player.ID_NONE);
player.sendPacket(new ExPutEnchantSupportItemResult(0));
return;

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
View File

@@ -63,7 +63,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if (player.getClan().getLevel() < 3)
{
player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
player.sendPacket(SystemMessageId.A_PLAYER_CAN_ONLY_BE_GRANTED_A_TITLE_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE);
return;
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java
View File

@@ -48,7 +48,7 @@ public class RequestJoinAlly implements IClientIncomingPacket
final Player target = World.getInstance().getPlayer(_objectId);
if (target == null)
{
player.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
player.sendPacket(SystemMessageId.THE_TARGET_CANNOT_BE_INVITED);
return;
}

6
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
View File

@@ -55,7 +55,7 @@ public class RequestJoinParty implements IClientIncomingPacket
{
if (player.getParty() == null)
{
player.sendPacket(SystemMessageId.THE_PARTY_HAS_DISPERSED);
player.sendPacket(SystemMessageId.THE_PARTY_IS_DISBANDED);
}
else
{
@@ -94,7 +94,7 @@ public class RequestJoinParty implements IClientIncomingPacket
final Player target = World.getInstance().getPlayer(_name);
if (target == null)
{
requestor.sendPacket(SystemMessageId.YOU_MUST_FIRST_SELECT_A_USER_TO_INVITE_TO_YOUR_PARTY);
requestor.sendPacket(SystemMessageId.SELECT_A_PLAYER_YOU_WANT_TO_INVITE_TO_YOUR_PARTY);
return;
}
@@ -144,7 +144,7 @@ public class RequestJoinParty implements IClientIncomingPacket
if (target == requestor)
{
requestor.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
requestor.sendPacket(SystemMessageId.THE_TARGET_CANNOT_BE_INVITED);
return;
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
View File

@@ -95,7 +95,7 @@ public class RequestJoinPledge implements IClientIncomingPacket
final Player target = World.getInstance().getPlayer(_target);
if (target == null)
{
player.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
player.sendPacket(SystemMessageId.THE_TARGET_CANNOT_BE_INVITED);
return;
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
View File

@@ -89,14 +89,14 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
if (player.hasSummon())
{
player.sendPacket(SystemMessageId.YOU_SHOULD_RELEASE_YOUR_PET_OR_SERVITOR_SO_THAT_IT_DOES_NOT_FALL_OFF_OF_THE_BOAT_AND_DROWN);
player.sendPacket(SystemMessageId.YOU_SHOULD_RELEASE_YOUR_SERVITOR_SO_THAT_IT_DOES_NOT_FALL_OFF_OF_THE_BOAT_AND_DROWN);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.isTransformed())
{
player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_A_BOAT);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
View File

@@ -65,7 +65,7 @@ public class RequestOustFromPartyRoom implements IClientIncomingPacket
final Party memberParty = player.getParty();
if ((playerParty != null) && (memberParty != null) && (playerParty.getLeaderObjectId() == memberParty.getLeaderObjectId()))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DISMISS_A_PARTY_MEMBER_BY_FORCE);
player.sendPacket(SystemMessageId.FAILED_TO_DISMISS_THE_PARTY_MEMBER_2);
}
else
{

8
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
View File

@@ -86,11 +86,11 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
clan.updateClanInDB();
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN);
sm.addString(member.getName());
clan.broadcastToOnlineMembers(sm);
player.sendPacket(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_EXPELLING_THE_CLAN_MEMBER);
player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER);
player.sendPacket(SystemMessageId.THE_CLAN_MEMBER_IS_DISMISSED);
player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE);
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(_target));
@@ -98,7 +98,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
if (member.isOnline())
{
final Player target = member.getPlayer();
target.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS);
target.sendPacket(SystemMessageId.YOU_ARE_DISMISSED_FROM_A_CLAN_YOU_CANNOT_JOIN_ANOTHER_FOR_24_H);
}
}
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
View File

@@ -82,7 +82,7 @@ public class RequestPetition implements IClientIncomingPacket
if (PetitionManager.getInstance().getPendingPetitionCount() == Config.MAX_PETITIONS_PENDING)
{
player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_COM);
player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_EU_4GAMESUPPORT_COM);
return;
}

6
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
View File

@@ -61,7 +61,7 @@ public class RequestPledgeDraftListApply implements IClientIncomingPacket
{
if (ClanEntryManager.getInstance().removeFromWaitingList(player.getObjectId()))
{
player.sendPacket(SystemMessageId.ENTRY_APPLICATION_CANCELLED_YOU_MAY_APPLY_TO_A_NEW_CLAN_AFTER_5_MINUTES);
player.sendPacket(SystemMessageId.ENTRY_APPLICATION_CANCELLED_YOU_MAY_APPLY_TO_A_NEW_CLAN_AFTER_5_MIN);
}
break;
}
@@ -70,11 +70,11 @@ public class RequestPledgeDraftListApply implements IClientIncomingPacket
final PledgeWaitingInfo pledgeDraftList = new PledgeWaitingInfo(player.getObjectId(), player.getLevel(), _karma, player.getClassId().getId(), player.getName());
if (ClanEntryManager.getInstance().addToWaitingList(player.getObjectId(), pledgeDraftList))
{
player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_DAYS_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MINUTES);
player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_D_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MIN);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_IN_S1_MIN_AFTER_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
player.sendPacket(sm);
}

8
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java
View File

@@ -85,11 +85,11 @@ public class RequestPledgeRecruitBoardAccess implements IClientIncomingPacket
{
if (ClanEntryManager.getInstance().addToClanList(clan.getId(), pledgeRecruitInfo))
{
player.sendPacket(SystemMessageId.ENTRY_APPLICATION_COMPLETE_USE_MY_APPLICATION_TO_CHECK_OR_CANCEL_YOUR_APPLICATION_APPLICATION_IS_AUTOMATICALLY_CANCELLED_AFTER_30_DAYS_IF_YOU_CANCEL_APPLICATION_YOU_CANNOT_APPLY_AGAIN_FOR_5_MINUTES);
player.sendPacket(SystemMessageId.ENTRY_APPLICATION_COMPLETE_USE_MY_APPLICATION_TO_CHECK_OR_CANCEL_YOUR_APPLICATION_APPLICATION_IS_AUTOMATICALLY_CANCELLED_AFTER_30_D_IF_YOU_CANCEL_APPLICATION_YOU_CANNOT_APPLY_AGAIN_FOR_5_MIN);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_IN_S1_MIN_AFTER_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getClanLockTime(clan.getId()));
player.sendPacket(sm);
}
@@ -99,11 +99,11 @@ public class RequestPledgeRecruitBoardAccess implements IClientIncomingPacket
{
if (ClanEntryManager.getInstance().updateClanList(clan.getId(), pledgeRecruitInfo))
{
player.sendPacket(SystemMessageId.ENTRY_APPLICATION_COMPLETE_USE_MY_APPLICATION_TO_CHECK_OR_CANCEL_YOUR_APPLICATION_APPLICATION_IS_AUTOMATICALLY_CANCELLED_AFTER_30_DAYS_IF_YOU_CANCEL_APPLICATION_YOU_CANNOT_APPLY_AGAIN_FOR_5_MINUTES);
player.sendPacket(SystemMessageId.ENTRY_APPLICATION_COMPLETE_USE_MY_APPLICATION_TO_CHECK_OR_CANCEL_YOUR_APPLICATION_APPLICATION_IS_AUTOMATICALLY_CANCELLED_AFTER_30_D_IF_YOU_CANCEL_APPLICATION_YOU_CANNOT_APPLY_AGAIN_FOR_5_MIN);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_IN_S1_MIN_AFTER_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getClanLockTime(clan.getId()));
player.sendPacket(sm);
}

6
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
View File

@@ -56,7 +56,7 @@ public class RequestPledgeSetAcademyMaster implements IClientIncomingPacket
if (!player.hasClanPrivilege(ClanPrivilege.CL_APPRENTICE))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_DISMISS_AN_APPRENTICE);
player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_THE_RIGHT_TO_DISMISS_MENTEES);
return;
}
@@ -106,7 +106,7 @@ public class RequestPledgeSetAcademyMaster implements IClientIncomingPacket
apprenticeMember.saveApprenticeAndSponsor(0, 0);
sponsorMember.saveApprenticeAndSponsor(0, 0);
sm = new SystemMessage(SystemMessageId.S2_CLAN_MEMBER_C1_S_APPRENTICE_HAS_BEEN_REMOVED);
sm = new SystemMessage(SystemMessageId.S2_C1_S_MENTEE_IS_DISMISSED);
}
else
{
@@ -137,7 +137,7 @@ public class RequestPledgeSetAcademyMaster implements IClientIncomingPacket
// saving to database even if online, since both must match
apprenticeMember.saveApprenticeAndSponsor(0, sponsorMember.getObjectId());
sponsorMember.saveApprenticeAndSponsor(apprenticeMember.getObjectId(), 0);
sm = new SystemMessage(SystemMessageId.S2_HAS_BEEN_DESIGNATED_AS_THE_APPRENTICE_OF_CLAN_MEMBER_S1);
sm = new SystemMessage(SystemMessageId.S1_HAS_BECOME_S2_S_MENTOR);
}
sm.addString(sponsorMember.getName());
sm.addString(apprenticeMember.getName());

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
View File

@@ -66,12 +66,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
{
if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())
{
player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER);
player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE);
return;
}
if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
sm.addString(player.getName());
player.sendPacket(sm);
return;

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
View File

@@ -76,7 +76,7 @@ public class RequestPledgeWaitingApply implements IClientIncomingPacket
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_IN_S1_MIN_AFTER_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
player.sendPacket(sm);
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
View File

@@ -216,7 +216,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
playerIU.addNewItem(newItem);
}
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(item.getId());
sm.addLong(count);
player.sendPacket(sm);
@@ -241,7 +241,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
if (sender != null)
{
sender.addAdena("PayMail", adena, player, false);
sm = new SystemMessage(SystemMessageId.S2_HAS_MADE_A_PAYMENT_OF_S1_ADENA_PER_YOUR_PAYMENT_REQUEST_MAIL);
sm = new SystemMessage(SystemMessageId.S2_COMPLETED_THE_PAYMENT_AND_YOU_RECEIVE_S1_ADENA);
sm.addLong(adena);
sm.addString(player.getName());
sender.sendPacket(sm);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
View File

@@ -82,7 +82,7 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket
if (_manufactureRecipes == null)
{
player.sendPacket(SystemMessageId.ITEMS_ARE_NOT_AVAILABLE_FOR_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
player.sendPacket(SystemMessageId.ITEMS_IN_A_PRIVATE_STORE_OR_A_PRIVATE_WORKSHOP_CANNOT_BE_EQUIPPED);
player.setPrivateStoreType(PrivateStoreType.NONE);
player.broadcastUserInfo();
return;

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java
View File

@@ -99,7 +99,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket
{
if (clan.getLevel() < 3)
{
player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
player.sendPacket(SystemMessageId.A_CLAN_CREST_CAN_ONLY_BE_REGISTERED_WHEN_THE_CLAN_S_SKILL_LEVEL_IS_3_OR_ABOVE);
return;
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

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

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -82,7 +82,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(member.getPlayer()))
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
player.sendPacket(SystemMessageId.THE_CLAN_WAR_CANNOT_BE_STOPPED_BECAUSE_SOMEONE_FROM_YOUR_CLAN_IS_STILL_ENGAGED_IN_BATTLE);
return;
}
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
View File

@@ -59,7 +59,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
{
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
player.sendPacket(SystemMessageId.THE_CLAN_WAR_CANNOT_BE_STOPPED_BECAUSE_SOMEONE_FROM_YOUR_CLAN_IS_STILL_ENGAGED_IN_BATTLE);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
View File

@@ -109,7 +109,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
final Item unequippedItem = unequipped.get(0);
if (unequippedItem.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(unequippedItem.getEnchantLevel());
}
else

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
View File

@@ -72,7 +72,7 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if (player.isProcessingTransaction())
{
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
player.sendPacket(SystemMessageId.ITEMS_FROM_GAME_ASSISTANTS_CANNOT_BE_EXCHANGED);
return;
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
View File

@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
player.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
player.sendPacket(SystemMessageId.YOU_CANNOT_JOIN_ANOTHER_CLAN_FOR_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
}
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@@ -156,7 +156,7 @@ public class Say2 implements IClientIncomingPacket
}
else if (Config.BAN_CHAT_CHANNELS.contains(chatType))
{
player.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SECONDS);
player.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
}
return;
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
View File

@@ -110,7 +110,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
}
else if ((warehouse instanceof ClanWarehouse) && !player.isClanLeader())
{
player.sendPacket(SystemMessageId.ITEMS_LEFT_AT_THE_CLAN_HALL_WAREHOUSE_CAN_ONLY_BE_RETRIEVED_BY_THE_CLAN_LEADER_DO_YOU_WANT_TO_CONTINUE);
player.sendPacket(SystemMessageId.ITEMS_LEFT_IN_THE_CLAN_WAREHOUSE_CAN_ONLY_BE_RETRIEVED_BY_THE_CLAN_LEADER_CONTINUE);
return;
}

8
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@@ -254,7 +254,7 @@ public class UseItem implements IClientIncomingPacket
{
if (!item.isEquipped() && (player.getInventory().getArtifactSlots() == 0))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVEN_T_EQUIPPED_AN_ARTIFACT_BOOK_SO_S1_CANNOT_BE_EQUIPPED);
final SystemMessage sm = new SystemMessage(SystemMessageId.UNABLE_TO_EQUIP_S1_BECAUSE_YOU_DO_NOT_HAVE_AN_ARTIFACT_BOOK);
sm.addItemName(item);
player.sendPacket(sm);
return;
@@ -312,20 +312,20 @@ public class UseItem implements IClientIncomingPacket
final SystemMessage sm;
if (hours > 0)
{
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_H_S3_MIN_S4_SEC);
sm.addItemName(item);
sm.addInt(hours);
sm.addInt(minutes);
}
else if (minutes > 0)
{
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_MIN_S3_SEC);
sm.addItemName(item);
sm.addInt(minutes);
}
else
{
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_AGAIN_IN_S2_SEC);
sm.addItemName(item);
}
sm.addInt(seconds);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java
View File

@@ -73,7 +73,7 @@ public class RequestAlchemyConversion implements IClientIncomingPacket
if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player))
{
player.sendPacket(new ExAlchemyConversion(0, 0));
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_ALCHEMY_DURING_BATTLE);
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_ALCHEMY_WHILE_IN_BATTLE);
return;
}
else if (player.isInStoreMode() || (player.getPrivateStoreType() != PrivateStoreType.NONE))

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java
View File

@@ -94,7 +94,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket
if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_ALCHEMY_DURING_BATTLE);
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_ALCHEMY_WHILE_IN_BATTLE);
return;
}
else if (player.isInStoreMode() || (player.getPrivateStoreType() != PrivateStoreType.NONE))

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
View File

@@ -58,7 +58,7 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}

16
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java
View File

@@ -76,41 +76,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.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_WHEN_PRIVATE_STORE_AND_WORKSHOP_ARE_OPENED);
return;
}
if (player.hasAbnormalType(AbnormalType.FREEZING))
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_FROZEN);
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_WHILE_IN_FROZEN_STATE);
}
if (player.isDead())
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_DEAD);
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_IF_THE_CHARACTER_IS_DEAD);
return;
}
if ((player.getActiveTradeList() != null) || player.hasItemRequest())
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_TRADING);
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_DURING_EXCHANGE);
return;
}
if (player.hasAbnormalType(AbnormalType.PARALYZE))
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_PETRIFIED);
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_WHILE_THE_CHARACTER_IS_PETRIFIED);
return;
}
if (player.isFishing())
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_FISHING);
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_DURING_FISHING);
return;
}
if (player.isSitting())
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_SEATED);
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_WHILE_SITTING);
return;
}
if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player))
{
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_IN_BATTLE);
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_DURING_COMBAT);
return;
}

6
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java
View File

@@ -58,7 +58,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE))
{
player.sendPacket(SystemMessageId.CAN_ONLY_ENTER_TO_A_PEACE_ZONE);
player.sendPacket(SystemMessageId.YOU_CAN_ENTER_THE_AREA_ONLY_FROM_PEACE_ZONE);
return;
}
if (player.isInCombat())
@@ -83,7 +83,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
}
if (player.isInOlympiadMode() || OlympiadManager.getInstance().isRegistered(player))
{
player.sendPacket(SystemMessageId.CANNOT_USE_TIME_LIMITED_HUNTING_ZONES_WHILE_WAITING_FOR_THE_OLYMPIAD);
player.sendPacket(SystemMessageId.SPECIAL_INSTANCE_ZONES_CANNOT_BE_USED_WHILE_WAITING_FOR_THE_OLYMPIAD);
return;
}
if (player.isRegisteredOnEvent() || (player.getBlockCheckerArena() > -1))
@@ -167,7 +167,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
}
else
{
player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_TIME_AVAILABLE_TO_ENTER_THE_HUNTING_ZONE);
player.sendPacket(SystemMessageId.YOU_CANNOT_ADD_MORE_TIME_FOR_A_CURRENT_HUNTING_ZONES);
}
}
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java
View File

@@ -79,7 +79,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;
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
View File

@@ -127,7 +127,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket
final int hours = (int) (remainingTime / 3600);
remainingTime = remainingTime % 3600;
final int minutes = (int) (remainingTime / 60);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_BOND_WITH_A_NEW_MENTEE_IN_S1_DAY_S_S2_HOUR_S_S3_MINUTE_S);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_BOND_WITH_A_NEW_MENTEE_IN_S1_D_S2_H_S3_MIN);
msg.addInt(days);
msg.addInt(hours);
msg.addInt(minutes);
@@ -157,7 +157,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket
// }
else if ((MentorManager.getInstance().getMentees(mentor.getObjectId()) != null) && (MentorManager.getInstance().getMentees(mentor.getObjectId()).size() >= 3))
{
mentor.sendPacket(SystemMessageId.A_MENTOR_CAN_HAVE_UP_TO_3_MENTEES_AT_THE_SAME_TIME);
mentor.sendPacket(SystemMessageId.A_MENTOR_CAN_HAVE_NO_MORE_THAN_3_MENTEES);
return false;
}
else if (mentee.isMentee())

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