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

Repaired and cleaned system messages.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-12-21 01:32:47 +00:00
parent b5ac8c8dfb
commit a484179b9f
213 changed files with 3907 additions and 3799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@ public class Shutdown extends Thread
*/
private void sendServerQuit(int seconds)
{
final SystemMessage sysm = new SystemMessage(SystemMessageId.THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECOND_S_PLEASE_FIND_A_SAFE_PLACE_TO_LOG_OUT);
final SystemMessage sysm = new SystemMessage(SystemMessageId.THE_SERVER_WILL_BE_SHUT_DOWN_IN_S1_SEC_PLEASE_FIND_A_SAFE_PLACE_TO_LOG_OUT);
sysm.addInt(seconds);
Broadcast.toAllOnlinePlayers(sysm);
}

8
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_WHO_IS_IN_A_PEACE_ZONE_OR_A_BATTLEGROUND);
reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_A_CHARACTER_IN_THIS_AREA);
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_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_ALLIANCE_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_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_ALLIANCE_OR_HAS_ALREADY_BEEN_REPORTED_FROM_YOUR_CURRENT_IP);
return false;
}
}
@@ -287,7 +287,7 @@ public class BotReportTable
{
if (rcdRep.getPointsLeft() == 0)
{
reporter.sendPacket(SystemMessageId.YOU_HAVE_USED_ALL_AVAILABLE_POINTS_POINTS_ARE_RESET_EVERYDAY_AT_NOON);
reporter.sendPacket(SystemMessageId.YOU_SPENT_ALL_AVAILABLE_POINTS_THEY_WILL_BECOME_AVAILABLE_WHEN_THEY_ARE_RESET_AT_06_30_AM_EVERY_DAY);
return false;
}

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_MIN_OF_USAGE_TIME_REMAINING);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_TIME_S2_MIN_TYPE_CURSEDSWORD_TO_CHECK_OTHER_INFORMATION);
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.YOU_HAVE_ALREADY_BEEN_REGISTERED_ON_THE_MATCH_WAITING_LIST);
final SystemMessage msg = new SystemMessage(SystemMessageId.THE_MATCH_C1_PREVIOUSLY_PARTICIPATED_IN_SHOULD_END_BEFORE_YOU_APPLY_PLEASE_TRY_AGAIN_LATER);
msg.addString(player.getName());
player.sendPacket(msg);
return false;

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

@@ -397,7 +397,7 @@ public class ItemCommissionManager
final long totalPrice = itemInstance.getCount() * commissionItem.getPricePerUnit();
if (!player.getInventory().reduceAdena("Commission Registration Fee", totalPrice, player, null))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
player.sendPacket(ExResponseCommissionBuyItem.FAILED);
return;
}

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

@@ -84,7 +84,7 @@ public class PetitionManager
currPetition.sendPetitionerPacket(new SystemMessage(SystemMessageId.PETITION_ACCEPTED));
// Petition application accepted. Reciept No. is <ID>
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_NRECEIPT_NO_IS_S1);
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_RECEIPT_NO_IS_S1);
sm.addInt(currPetition.getId());
currPetition.sendResponderPacket(sm);

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

@@ -277,7 +277,7 @@ public class MonsterRace
}
case 1050: // 17 min 30 sec
{
final SystemMessage msg = new SystemMessage(SystemMessageId.MONSTER_RACE_S2_WILL_BEGIN_IN_30_SEC);
final SystemMessage msg = new SystemMessage(SystemMessageId.MONSTER_RACE_S1_WILL_BEGIN_IN_30_SEC);
msg.addInt(_raceNumber);
Broadcast.toAllPlayersInZoneType(DerbyTrackZone.class, msg);
break;

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

@@ -192,7 +192,7 @@ public class BlockList
final Player player = World.getInstance().getPlayer(targetId);
if (player != null)
{
sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(listOwner.getName());
player.sendPacket(sm);
}

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

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

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

@@ -92,7 +92,7 @@ public class ContactList
final int contactId = CharNameTable.getInstance().getIdByName(name);
if (_contacts.contains(name))
{
_player.sendPacket(SystemMessageId.THE_NAME_ALREADY_EXISTS_ON_THE_ADDED_LIST);
_player.sendPacket(SystemMessageId.THE_CHARACTER_IS_ALREADY_IN_THE_LIST);
return false;
}
else if (_player.getName().equals(name))
@@ -118,7 +118,7 @@ public class ContactList
{
if (contactName.equalsIgnoreCase(name))
{
_player.sendPacket(SystemMessageId.THE_NAME_ALREADY_EXISTS_ON_THE_ADDED_LIST);
_player.sendPacket(SystemMessageId.THE_CHARACTER_IS_ALREADY_IN_THE_LIST);
return false;
}
}

4
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_MIN_OF_USAGE_TIME_REMAINING);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_S_REMAINING_TIME_S2_MIN_TYPE_CURSEDSWORD_TO_CHECK_OTHER_INFORMATION);
final int timeLeft = (int) (cw.getTimeLeft() / 60000);
msg.addItemName(_player.getCursedWeaponEquippedId());
msg.addInt(timeLeft);
@@ -435,7 +435,7 @@ public class CursedWeapon implements INamable
_item = item;
// Item[] items =
_player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1);
sm.addItemName(_item);
_player.sendPacket(sm);

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

@@ -732,7 +732,7 @@ public class Party extends AbstractPlayerGroup
// Send messages to other party members about reward
if (item.getCount() > 1)
{
final SystemMessage msg = new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2);
final SystemMessage msg = new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_X_S3);
msg.addString(target.getName());
msg.addItemName(item);
msg.addLong(item.getCount());
@@ -769,7 +769,7 @@ public class Party extends AbstractPlayerGroup
// Send messages to other party members about reward
if (itemCount > 1)
{
final SystemMessage msg = spoil ? new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2_S_BY_USING_SWEEPER) : new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2);
final SystemMessage msg = spoil ? new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_X_S3_BY_USING_SWEEPER) : new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_X_S3);
msg.addString(looter.getName());
msg.addItemName(itemId);
msg.addLong(itemCount);

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

@@ -94,7 +94,7 @@ public class Petition
// End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button
if ((_petitioner != null) && _petitioner.isOnline())
{
_petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE);
_petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_PLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE);
_petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET);
}

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

@@ -733,7 +733,7 @@ public class TradeList
if (totalPrice > playerInventory.getAdena())
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
return 1;
}
@@ -755,7 +755,7 @@ public class TradeList
final Item adenaItem = playerInventory.getAdenaInstance();
if (!playerInventory.reduceAdena("PrivateStore", totalPrice, player, _owner))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
return 1;
}
playerIU.addItem(adenaItem);

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

@@ -1150,7 +1150,7 @@ public class Attackable extends Npc
// Broadcast message if RaidBoss was defeated
if (_isRaid && !_isRaidMinion)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S2_X_S3);
sm.addString(getName());
sm.addItemName(item);
sm.addLong(drop.getCount());

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

@@ -1052,11 +1052,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{
if (weaponItem.getItemType() == WeaponType.FISHINGROD)
{
sendPacket(SystemMessageId.YOU_LOOK_ODDLY_AT_THE_FISHING_POLE_IN_DISBELIEF_AND_REALIZE_THAT_YOU_CAN_T_ATTACK_ANYTHING_WITH_THIS);
sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_WHILE_FISHING);
}
else
{
sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_PERFORM_ANY_ATTACKS);
sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_WITH_THIS_WEAPON);
}
sendPacket(ActionFailed.STATIC_PACKET);
return;
@@ -1094,7 +1094,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isInsidePeaceZone(getActingPlayer()))
{
getAI().setIntention(AI_INTENTION_ACTIVE);
sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_IN_A_PEACEFUL_ZONE);
sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_IN_A_PEACEFUL_ZONE);
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -4009,7 +4009,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (isInsidePeaceZone(player))
{
// If Creature or target is in a peace zone, send a system message TARGET_IN_PEACEZONE a Server->Client packet ActionFailed
player.sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE);
player.sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

42
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_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
}
@@ -2246,13 +2246,13 @@ public class Player extends Playable
{
if (item.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.S1_S2_EQUIPPED);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1_S2);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
}
else
{
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1);
sm.addItemName(item);
}
sendPacket(sm);
@@ -3067,7 +3067,7 @@ public class Player extends Playable
{
if (sendMessage)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_ADENA);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_ADENA_2);
sm.addLong(count);
sendPacket(sm);
}
@@ -3104,7 +3104,7 @@ public class Player extends Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
}
return false;
}
@@ -3183,7 +3183,7 @@ public class Player extends Playable
{
if (count > 1)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_X_S2_DISAPPEARED);
sm.addItemName(Inventory.BEAUTY_TICKET_ID);
sm.addLong(count);
sendPacket(sm);
@@ -3211,7 +3211,7 @@ public class Player extends Playable
{
if (sendMessage)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(Inventory.ANCIENT_ADENA_ID);
sm.addLong(count);
sendPacket(sm);
@@ -3247,7 +3247,7 @@ public class Player extends Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
}
return false;
}
@@ -3275,7 +3275,7 @@ public class Player extends Playable
{
if (count > 1)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_X_S2_DISAPPEARED);
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_OBTAINED_S1_S2_PC_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(itemId);
sm.addLong(count);
sendPacket(sm);
@@ -3492,7 +3492,7 @@ public class Player extends Playable
{
if (count > 1)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_X_S2_DISAPPEARED);
sm.addItemName(destoyedItem);
sm.addLong(count);
sendPacket(sm);
@@ -3607,7 +3607,7 @@ public class Player extends Playable
{
if (count > 1)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_X_S2_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
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_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.ITEM_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_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.ITEM_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.A_MOUNT_CANNOT_BE_RIDDEN_WHEN_DEAD);
sendPacket(SystemMessageId.YOU_CANNOT_USE_A_MOUNT_WHILE_DEAD);
return false;
}
else if (pet.isDead())
{
// A dead strider cannot be ridden.
sendPacket(ActionFailed.STATIC_PACKET);
sendPacket(SystemMessageId.A_DEAD_MOUNT_CANNOT_BE_RIDDEN);
sendPacket(SystemMessageId.YOU_CANNOT_USE_A_DEAD_MOUNT);
return false;
}
else if (pet.isInCombat() || pet.isRooted())
{
// A strider in battle cannot be ridden
sendPacket(ActionFailed.STATIC_PACKET);
sendPacket(SystemMessageId.A_MOUNT_IN_BATTLE_CANNOT_BE_RIDDEN);
sendPacket(SystemMessageId.YOU_CANNOT_USE_A_MOUNT_THAT_IS_IN_BATTLE);
return false;
}
else if (isInCombat())
@@ -8093,13 +8093,13 @@ 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_OBTAINED_S1_S2_PC_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(henna.getDyeItemId());
sm.addLong(henna.getCancelCount());
sendPacket(sm);
}
}
sendPacket(SystemMessageId.THE_SYMBOL_HAS_BEEN_DELETED);
sendPacket(SystemMessageId.TATTOO_WAS_REMOVED);
// Remove henna duration task
if (henna.getDuration() > 0)
@@ -8618,7 +8618,7 @@ public class Player extends Playable
// Check if the caster is sitting
if (_waitTypeSitting)
{
sendPacket(SystemMessageId.YOU_CANNOT_USE_ACTIONS_AND_SKILLS_WHILE_THE_CHARACTER_IS_SITTING);
sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING);
sendPacket(ActionFailed.STATIC_PACKET);
return false;
}
@@ -11953,7 +11953,7 @@ public class Player extends Playable
if (equippedItem.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED);
sm.addInt(equippedItem.getEnchantLevel());
sm.addItemName(equippedItem);
}

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_THE_PET_S_INVENTORY_TAKE_THEM_OUT_FIRST);
sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_YOUR_PET_INVENTORY_RENDERING_YOU_UNABLE_TO_SELL_TRADE_DROP_PET_SUMMONING_ITEMS_PLEASE_EMPTY_YOUR_PET_INVENTORY);
}
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_SERVITOR_SKILL_CANNOT_BE_USED_BECAUSE_IT_IS_RECHARGING);
sendPacket(SystemMessageId.THAT_PET_SERVITOR_SKILL_CANNOT_BE_USED_BECAUSE_IT_IS_RECHARGING);
return false;
}
@@ -968,7 +968,7 @@ public abstract class Summon extends Playable
if (isBetrayed())
{
sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
sendPacket(ActionFailed.STATIC_PACKET);
return false;
}
@@ -996,7 +996,7 @@ public abstract class Summon extends Playable
if (!_owner.getAccessLevel().allowPeaceAttack() && _owner.isInsidePeaceZone(this, target))
{
sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE);
sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE);
return false;
}

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

@@ -413,7 +413,7 @@ public class Pet extends Summon
{
if (count > 1)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_X_S2_DISAPPEARED);
sm.addItemName(item.getId());
sm.addLong(count);
sendPacket(sm);
@@ -459,7 +459,7 @@ public class Pet extends Summon
{
if (count > 1)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_X_S2_DISAPPEARED);
sm.addItemName(item.getId());
sm.addLong(count);
sendPacket(sm);

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.S1_S2_OBTAINED);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_2);
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.SIEGE_CAMP_IS_UNDER_ATTACK));
_clan.broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_BASE_IS_BEING_ATTACKED));
setCanTalk(false);
ThreadPool.schedule(new ScheduleTalkTask(), 20000);
}

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.YOU_CANNOT_DISPERSE_THE_CLANS_IN_YOUR_ALLIANCE);
player.sendPacket(SystemMessageId.THE_OPPOSING_CLAN_HAS_REQUESTED_TO_DISSOLVE);
return;
}
if (clan.isAtWar())
@@ -284,7 +284,7 @@ public class VillageMaster extends Folk
}
if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN);
player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_S1_CLAN);
return;
}

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

@@ -507,11 +507,11 @@ public class PlayerStat extends PlayableStat
{
if (points < getVitalityPoints())
{
getActiveChar().sendPacket(SystemMessageId.YOUR_SAYHA_S_GRACE_HAS_DECREASED);
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_HAS_DECREASED);
}
else
{
getActiveChar().sendPacket(SystemMessageId.YOUR_SAYHA_S_GRACE_HAS_INCREASED);
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_HAS_INCREASED);
}
}
@@ -519,11 +519,11 @@ public class PlayerStat extends PlayableStat
if (points == 0)
{
getActiveChar().sendPacket(SystemMessageId.YOUR_SAYHA_S_GRACE_IS_FULLY_EXHAUSTED);
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_IS_FULLY_EXHAUSTED);
}
else if (points == MAX_VITALITY_POINTS)
{
getActiveChar().sendPacket(SystemMessageId.YOUR_SAYHA_S_GRACE_IS_AT_MAXIMUM);
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_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.C1_DEALS_S2_DAMAGE_TO_THE_PET);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_DEALT_S2_DAMAGE_TO_YOUR_PET);
sm.addString(attacker.getName());
sm.addInt((int) value);
getActiveChar().sendPacket(sm);

4
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_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
getActiveChar().sendPacket(SystemMessageId.MP_HAS_REACHED_0_THE_MANA_ARMOR_HAS_DISAPPEARED);
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.ARCANE_SHIELD_DECREASED_YOUR_MP_INSTEAD_OF_HP);
final SystemMessage smsg = new SystemMessage(SystemMessageId.DUE_TO_THE_MANA_ARMOR_EFFECT_YOU_LOSE_S1_MP_INSTEAD_OF_HP);
smsg.addInt(mpDam);
getActiveChar().sendPacket(smsg);
return;

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

@@ -49,7 +49,7 @@ public class FameTask implements Runnable
return;
}
_player.setFame(_player.getFame() + _value);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_FAME);
final SystemMessage sm = new SystemMessage(SystemMessageId.PERSONAL_REPUTATION_S1);
sm.addInt(_value);
_player.sendPacket(sm);
_player.sendPacket(new UserInfo(_player));

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

@@ -2324,7 +2324,7 @@ public class Clan implements IIdentifiable, INamable
if (requiredReputation <= _reputationScore)
{
setReputationScore(_reputationScore - requiredReputation);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
final SystemMessage cr = new SystemMessage(SystemMessageId.CLAN_REPUTATION_POINTS_S1_2);
cr.addInt(requiredReputation);
player.sendPacket(cr);
@@ -2376,7 +2376,7 @@ public class Clan implements IIdentifiable, INamable
}
// notify all the members about it
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_CLAN_S_LEVEL_HAS_INCREASED));
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_CLAN_LEVEL_HAS_RISEN));
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
}

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

@@ -65,7 +65,7 @@ public class ClanWar
sm.addString(attacked.getName());
attacker.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.S1_HAS_DECLARED_A_CLAN_WAR_THE_WAR_WILL_AUTOMATICALLY_START_IF_YOU_KILL_MORE_THAN_5_CLAN_MEMBERS_IN_A_WEEK);
sm = new SystemMessage(SystemMessageId.S1_HAS_DECLARED_A_CLAN_WAR_THE_WAR_WILL_AUTOMATICALLY_START_IF_YOU_KILL_MORE_THAN_5_S1_CLAN_MEMBERS_IN_A_WEEK);
sm.addString(attacker.getName());
attacked.broadcastToOnlineMembers(sm);
}
@@ -138,11 +138,11 @@ public class ClanWar
if (killCount >= 5)
{
_state = ClanWarState.MUTUAL;
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);
SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
sm.addString(victimClan.getName());
killerClan.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_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 = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
sm.addString(killerClan.getName());
victimClan.broadcastToOnlineMembers(sm);
@@ -169,7 +169,7 @@ public class ClanWar
// Reduce reputation.
cancelor.takeReputationScore(5000);
player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
SystemMessage sm = new SystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
SystemMessage sm = new SystemMessage(SystemMessageId.THE_WAR_IS_OVER_AS_YOU_VE_ADMITTED_DEFEAT_FROM_THE_CLAN_S1_YOU_VE_LOST);
sm.addString(winnerClan.getName());
cancelor.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_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);
SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
sm.addString(attacker.getName());
attacked.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_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 = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_S1_HAS_STARTED_THE_CLAN_THAT_WITHDRAWS_FROM_THE_WAR_FIRST_LOSE_10_000_CLAN_REPUTATION_POINTS_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_NEW_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_IS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_HUNTING_ZONES);
sm.addString(attacked.getName());
attacker.broadcastToOnlineMembers(sm);

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_CAN_T_BUILD_HEADQUARTERS_HERE);
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_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_CAN_T_BUILD_HEADQUARTERS_HERE);
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_HERE);
canCreateOutpost = false;
}
return (_value == canCreateOutpost);

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java
View File

@@ -52,12 +52,12 @@ public class ConditionPlayerCanSwitchSubclass extends Condition
}
else if (!player.isInventoryUnder90(true))
{
player.sendPacket(SystemMessageId.A_SUBCLASS_CANNOT_BE_CREATED_OR_CHANGED_BECAUSE_YOU_HAVE_EXCEEDED_YOUR_INVENTORY_LIMIT);
player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_OR_CHANGE_A_SUBCLASS_WHILE_YOU_HAVE_NO_FREE_SPACE_IN_YOUR_INVENTORY);
canSwitchSub = false;
}
else if (player.getWeightPenalty() >= 2)
{
player.sendPacket(SystemMessageId.A_SUBCLASS_CANNOT_BE_CREATED_OR_CHANGED_WHILE_YOU_ARE_OVER_YOUR_WEIGHT_LIMIT);
player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_OR_CHANGE_A_DUAL_CLASS_WHILE_YOU_HAVE_OVERWEIGHT);
canSwitchSub = false;
}
else if (player.isRegisteredOnEvent())

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

@@ -2673,14 +2673,14 @@ 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_ACQUIRED_S1_ADENA);
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_ADENA_2);
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_OBTAINED_S1_S2_PC_S);
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
smsg.addItemName(item);
smsg.addLong(count);
player.sendPacket(smsg);

8
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.YOU_CANNOT_FISH_AS_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
_player.sendPacket(SystemMessageId.FISHING_IS_AVAILABLE_TO_PREMIUM_USERS_ONLY);
_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_WHILE_RIDING_AS_A_PASSENGER_OF_A_BOAT_OR_TRANSFORMED);
_player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHEN_TRANSFORMED_OR_WHILE_RIDING_AS_A_PASSENGER_OF_A_BOAT_IT_S_AGAINST_THE_RULES);
_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);
_player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE_YOUR_CHARACTER_IS_NOT_FACING_WATER_OR_YOU_ARE_NOT_IN_A_FISHING_GROUND);
_player.sendPacket(ActionFailed.STATIC_PACKET);
}
stopFishing(FishingEndType.ERROR);
@@ -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);
_player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE_YOUR_CHARACTER_IS_NOT_FACING_WATER_OR_YOU_ARE_NOT_IN_A_FISHING_GROUND);
return null;
}

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

@@ -33,7 +33,7 @@ public class ConditionReenter extends Condition
public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml)
{
super(template, parameters, onlyLeader, showMessageAndHtml);
setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName()));
setSystemMessage(SystemMessageId.C1_CANNOT_ENTER_YET, (message, player) -> message.addString(player.getName()));
}
@Override

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

@@ -459,7 +459,7 @@ public class ItemAuction
return false;
}
player.sendPacket(SystemMessageId.YOU_CURRENTLY_HAVE_THE_HIGHEST_BID_BUT_THE_RESERVE_HAS_NOT_BEEN_MET);
player.sendPacket(SystemMessageId.YOU_VE_ALREADY_MADE_A_BID);
return true;
}

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

@@ -51,7 +51,7 @@ public class PartyMatchingRoom extends MatchingRoom
@Override
protected void notifyInvalidCondition(Player player)
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIREMENTS_TO_ENTER_THAT_PARTY_ROOM);
player.sendPacket(SystemMessageId.YOU_DON_T_MEET_THE_REQUIREMENTS_TO_ENTER_A_PARTY_ROOM);
}
@Override

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

@@ -89,7 +89,7 @@ public abstract class AbstractOlympiadGame
protected final void addPointsToParticipant(Participant par, int points)
{
par.updateStat(POINTS, points);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_EARNED_S2_POINTS_IN_THE_OLYMPIAD_GAMES);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_EARNED_OLYMPIAD_POINTS_X_S2);
sm.addString(par.getName());
sm.addInt(points);
broadcastPacket(sm);
@@ -98,7 +98,7 @@ public abstract class AbstractOlympiadGame
protected final void removePointsFromParticipant(Participant par, int points)
{
par.updateStat(POINTS, -points);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_LOST_S2_POINTS_IN_THE_OLYMPIAD_GAMES);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_LOST_OLYMPIAD_POINTS_X_S2);
sm.addString(par.getName());
sm.addInt(points);
broadcastPacket(sm);
@@ -130,7 +130,7 @@ public abstract class AbstractOlympiadGame
SystemMessage sm;
if (player.isDead())
{
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_PARTICIPATE_IN_THE_OLYMPIAD);
sm = new SystemMessage(SystemMessageId.C1_IS_DEAD_AND_CANNOT_PARTICIPATE_IN_THE_OLYMPIAD);
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_OBTAINED_S1_S2_PC_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(item);
sm.addLong(holder.getCount());
player.sendPacket(sm);

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

@@ -932,7 +932,7 @@ public class Hero
if ((clan != null) && (clan.getLevel() >= 5))
{
clan.addReputationScore(Config.HERO_POINTS);
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_NAMED_A_HERO_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_REPUTATION);
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_C1_HAS_BECOME_THE_HERO_CLAN_REPUTATION_POINTS_S2);
sm.addString(CharNameTable.getInstance().getNameById(player.getObjectId()));
sm.addInt(Config.HERO_POINTS);
clan.broadcastToOnlineMembers(sm);

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

@@ -275,7 +275,7 @@ public class OlympiadManager
if (noble.getNobleLevel() == 0)
{
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);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_ONLY_NOBLESSE_CHARACTERS_CAN_PARTICIPATE_IN_THE_OLYMPIAD);
sm.addString(noble.getName());
noble.sendPacket(sm);
return false;

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.S2_CLAN_S1_WINS);
final SystemMessage msg = new SystemMessage(SystemMessageId.CLAN_S1_HAS_SUCCEEDED_IN_S2);
msg.addString(clan.getName());
msg.addString(getName());
getSiege().announceToPlayer(msg, true);

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

@@ -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_3_OR_ABOVE_MAY_REGISTER_FOR_A_CASTLE_SIEGE);
player.sendPacket(SystemMessageId.ONLY_CLANS_OF_LEVEL_5_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

@@ -346,7 +346,7 @@ public class SkillCaster implements Runnable
if (caster.isPlayer() && !instantCast)
{
// Send a system message to the player.
caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET));
caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_VE_USED_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET));
// Show the gauge bar for casting.
caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime));
@@ -393,7 +393,7 @@ public class SkillCaster implements Runnable
}
clan.takeReputationScore(_skill.getClanRepConsume());
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CLAN_REPUTATION_HAS_BEEN_CONSUMED);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CLAN_REPUTATION_POINTS_SPENT);
msg.addInt(_skill.getClanRepConsume());
player.sendPacket(msg);
}

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

@@ -886,7 +886,7 @@ public class Formulas
{
if (attacker.isPlayer())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.DAMAGE_IS_DECREASED_BECAUSE_C1_RESISTED_C2_S_MAGIC);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_RESISTED_C2_S_MAGIC_DAMAGE_IS_DECREASED);
sm.addString(target.getName());
sm.addString(attacker.getName());
attacker.sendPacket(sm);

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

@@ -252,7 +252,7 @@ public class TeleportHolder
{
if (loc.getFeeId() == Inventory.ADENA_ID)
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
}
else
{

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@@ -809,7 +809,7 @@ public class EnterWorld implements IClientIncomingPacket
{
clan.getClanMember(player.getObjectId()).setPlayer(player);
final SystemMessage msg = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_LOGGED_INTO_GAME);
final SystemMessage msg = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_LOGGED_IN);
msg.addString(player.getName());
clan.broadcastToOtherOnlineMembers(msg, player);
clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(player), player);
@@ -826,7 +826,7 @@ public class EnterWorld implements IClientIncomingPacket
final Player sponsor = World.getInstance().getPlayer(player.getSponsor());
if (sponsor != null)
{
final SystemMessage msg = new SystemMessage(SystemMessageId.YOUR_APPRENTICE_C1_HAS_LOGGED_IN);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_LOGGED_IN);
msg.addString(player.getName());
sponsor.sendPacket(msg);
}

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

@@ -340,7 +340,7 @@ public class MultiSellChoose implements IClientIncomingPacket
if (clan != null)
{
clan.takeReputationScore((int) totalCount);
final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
final SystemMessage smsg = new SystemMessage(SystemMessageId.CLAN_REPUTATION_POINTS_S1_2);
smsg.addLong(totalCount);
player.sendPacket(smsg);
}
@@ -568,14 +568,14 @@ public class MultiSellChoose implements IClientIncomingPacket
if (addedItem.getCount() > 1)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(addedItem.getId());
sm.addLong(totalCount);
player.sendPacket(sm);
}
else if (addedItem.getEnchantLevel() > 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_OBTAINED);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_2);
sm.addLong(addedItem.getEnchantLevel());
sm.addItemName(addedItem.getId());
player.sendPacket(sm);

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

@@ -217,7 +217,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_X_S2_DISAPPEARED);
sm.addItemName(item.getId());
sm.addLong(item.getCount());
player.sendPacket(sm);
@@ -226,7 +226,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (repCost > 0)
{
clan.takeReputationScore(repCost);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
final SystemMessage cr = new SystemMessage(SystemMessageId.CLAN_REPUTATION_POINTS_S1_2);
cr.addInt(repCost);
player.sendPacket(cr);
}

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

@@ -51,7 +51,7 @@ public class RequestAnswerJoinAlly implements IClientIncomingPacket
if (_response == 0)
{
player.sendPacket(SystemMessageId.NO_RESPONSE_YOUR_ENTRANCE_TO_THE_ALLIANCE_HAS_BEEN_CANCELLED);
requestor.sendPacket(SystemMessageId.NO_RESPONSE_INVITATION_TO_JOIN_AN_ALLIANCE_HAS_BEEN_CANCELLED);
requestor.sendPacket(SystemMessageId.NO_RESPONSE_THE_INVITATION_TO_JOIN_THE_ALLIANCE_IS_CANCELLED);
}
else
{

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_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
}
}
else if (isPlayerShot(item.getItem()))

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

@@ -219,7 +219,7 @@ public class RequestBuyItem implements IClientIncomingPacket
// Charge buyer and add tax to castle treasury if not owned by npc clan
if ((subTotal < 0) || !player.reduceAdena("Buy", subTotal, player.getLastFolkNPC(), false))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

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

@@ -166,7 +166,7 @@ public class RequestBuySeed implements IClientIncomingPacket
}
else if ((totalPrice < 0) || (player.getAdena() < totalPrice))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
return;
}

6
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.UNAVAILABLE_WHILE_THE_ENCHANTING_IS_IN_PROCESS);
player.sendPacket(SystemMessageId.UNAVAILABLE_WHILE_THE_ENCHANTING_ATTRIBUTE_ENHANCING_IS_IN_PROCESS);
return;
}
@@ -208,7 +208,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANCELED_THE_SENT_MAIL);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_CANCELLED_SENDING_A_MAIL);
sm.addString(player.getName());
receiver.sendPacket(sm);
receiver.sendPacket(new ExChangePostState(true, _msgId, Message.DELETED));
@@ -217,6 +217,6 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
MailManager.getInstance().deleteMessageInDb(_msgId);
player.sendPacket(new ExChangePostState(false, _msgId, Message.DELETED));
player.sendPacket(SystemMessageId.MAIL_SUCCESSFULLY_CANCELLED);
player.sendPacket(SystemMessageId.YOU_VE_CANCELLED_SENDING_A_MAIL);
}
}

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

@@ -1,5 +1,5 @@
/*
* This file is part of the L2J Mobius project.
YOU_HAVE_OBTAINED_S1_X_S2_2 * This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -215,7 +215,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
if (itemToRemove.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.ITEM_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_OBTAINED_S1_S2_PC_S);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(createdItem);
sm.addLong(holder.getCount());
player.sendPacket(sm);

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

@@ -64,7 +64,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
player.sendPacket(SystemMessageId.THE_MAILBOX_FUNCTIONS_CAN_BE_USED_ONLY_IN_PEACE_ZONES_OUTSIDE_OF_THEM_YOU_CAN_ONLY_CHECK_ITS_CONTENTS);
return;
}

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

@@ -64,7 +64,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
player.sendPacket(SystemMessageId.THE_MAILBOX_FUNCTIONS_CAN_BE_USED_ONLY_IN_PEACE_ZONES_OUTSIDE_OF_THEM_YOU_CAN_ONLY_CHECK_ITS_CONTENTS);
return;
}

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_UNEQUIPPED);
final SystemMessage sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED);
sm.addInt(itemToRemove.getEnchantLevel());
sm.addItemName(itemToRemove);
player.sendPacket(sm);

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.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
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.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
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.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
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_UNEQUIPPED);
final SystemMessage sm = new SystemMessage(SystemMessageId.ITEM_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_OBTAINED_S1_S2_PC_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
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.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
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.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(new ExPutEnchantScrollItemResult(0));
request.setEnchantingScroll(Player.ID_NONE);
return;

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

@@ -86,7 +86,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
}
else
{
sm = new SystemMessage(SystemMessageId.S1_S2_S_ATTRIBUTE_HAS_BEEN_REMOVED);
sm = new SystemMessage(SystemMessageId.S1_S2_S_S3_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.A_CLAN_CREST_CAN_ONLY_BE_REGISTERED_WHEN_THE_CLAN_S_SKILL_LEVEL_IS_3_OR_ABOVE);
player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
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.SUCCESSFUL_ARTIFACT_UPGRADE_YOU_HAVE_OBTAINED_S1).addItemName(targetItem.getId()));
player.sendPacket(new SystemMessage(SystemMessageId.ARTIFACT_UPGRADE_SUCCEEDED_AND_YOU_OBTAINED_S1).addItemName(targetItem.getId()));
player.sendPacket(new ExTryEnchantArtifactResult(ExTryEnchantArtifactResult.SUCCESS, targetItem.getEnchantLevel()));
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.UPGRADE_FAILED_THE_MODIFICATION_OF_THE_ITEMS_HAS_NOT_CHANGED));
player.sendPacket(new SystemMessage(SystemMessageId.FAILED_TO_UPGRADE_ARTIFACT_THE_ITEM_S_UPGRADE_LEVEL_WILL_REMAIN_THE_SAME));
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.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
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.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
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.A_PLAYER_CAN_ONLY_BE_GRANTED_A_TITLE_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE);
player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
return;
}

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

@@ -72,7 +72,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
{
if (player.getHenna(4) != null)
{
player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
player.sendPacket(SystemMessageId.YOU_HAVE_NO_FREE_TATTOO_SLOTS);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,7 +85,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
}
else if (player.getHennaEmptySlots() == 0)
{
player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
player.sendPacket(SystemMessageId.YOU_HAVE_NO_FREE_TATTOO_SLOTS);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -100,11 +100,11 @@ public class RequestHennaEquip implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.sendPacket(new HennaEquipList(player));
player.updateSymbolSealSkills();
player.sendPacket(SystemMessageId.THE_SYMBOL_HAS_BEEN_ADDED);
player.sendPacket(SystemMessageId.A_TATTOO_IS_ADDED);
}
else
{
player.sendPacket(SystemMessageId.THE_SYMBOL_CANNOT_BE_DRAWN);
player.sendPacket(SystemMessageId.YOU_CANNOT_MAKE_A_TATTOO);
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !henna.isAllowedClass(player.getClassId()))
{
Util.handleIllegalPlayerAction(player, "Exploit attempt: Character " + player.getName() + " of account " + player.getAccountName() + " tryed to add a forbidden henna.", Config.DEFAULT_PUNISH);

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

@@ -67,7 +67,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
}
else
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
player.sendPacket(ActionFailed.STATIC_PACKET);
}
found = true;

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

@@ -59,7 +59,7 @@ public class RequestJoinParty implements IClientIncomingPacket
}
else
{
player.sendPacket(SystemMessageId.THE_PLAYER_DECLINED_TO_JOIN_YOUR_PARTY);
player.sendPacket(SystemMessageId.THE_PLAYER_HAS_DECLINED_TO_JOIN_YOUR_PARTY);
}
player.onTransactionResponse();
}
@@ -136,7 +136,7 @@ public class RequestJoinParty implements IClientIncomingPacket
if (BlockList.isBlocked(target, requestor))
{
sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(target.getName());
requestor.sendPacket(sm);
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_SERVITOR_SO_THAT_IT_DOES_NOT_FALL_OFF_OF_THE_BOAT_AND_DROWN);
player.sendPacket(SystemMessageId.YOU_SHOULD_RELEASE_YOUR_PET_OR_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_A_BOAT);
player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

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

@@ -150,7 +150,7 @@ public class RequestPackageSend implements IClientIncomingPacket
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, player, false))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
warehouse.deleteMe();
return;
}

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

@@ -85,7 +85,7 @@ public class RequestPetGetItem implements IClientIncomingPacket
if (pet.isUncontrollable())
{
player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_SATIETY_REACHES_0_YOU_CANNOT_CONTROL_IT);
return;
}

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

@@ -89,7 +89,7 @@ public class RequestPetition implements IClientIncomingPacket
final int totalPetitions = PetitionManager.getInstance().getPlayerTotalPetitionCount(player) + 1;
if (totalPetitions > Config.MAX_PETITIONS_PER_PLAYER)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_MAXIMUM_NUMBER_OF_PETITIONS_TODAY_YOU_CANNOT_SUBMIT_MORE_PETITIONS);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_THE_MAXIMUM_NUMBER_OF_PETITIONS_S1_TODAY_YOU_CANNOT_SUBMIT_MORE);
sm.addInt(totalPetitions);
player.sendPacket(sm);
return;
@@ -102,11 +102,11 @@ public class RequestPetition implements IClientIncomingPacket
}
final int petitionId = PetitionManager.getInstance().submitPetition(player, _content, _type);
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_NRECEIPT_NO_IS_S1);
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_RECEIPT_NO_IS_S1);
sm.addInt(petitionId);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_S1_PETITION_S_NYOU_MAY_SUBMIT_S2_MORE_PETITION_S_TODAY);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_S1_PETITION_S_YOU_MAY_SUBMIT_S2_MORE_PETITION_S_TODAY);
sm.addInt(totalPetitions);
sm.addInt(Config.MAX_PETITIONS_PER_PLAYER - totalPetitions);
player.sendPacket(sm);

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

@@ -241,7 +241,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
if (sender != null)
{
sender.addAdena("PayMail", adena, player, false);
sm = new SystemMessage(SystemMessageId.S2_COMPLETED_THE_PAYMENT_AND_YOU_RECEIVE_S1_ADENA);
sm = new SystemMessage(SystemMessageId.S2_HAS_MADE_A_PAYMENT_OF_S1_ADENA_PER_YOUR_PAYMENT_REQUEST_MAIL);
sm.addLong(adena);
sm.addString(player.getName());
sender.sendPacket(sm);

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

@@ -51,7 +51,7 @@ public class RequestPostItemList implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
player.sendPacket(SystemMessageId.THE_MAILBOX_FUNCTIONS_CAN_BE_USED_ONLY_IN_PEACE_ZONES_OUTSIDE_OF_THEM_YOU_CAN_ONLY_CHECK_ITS_CONTENTS);
return;
}

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

@@ -227,7 +227,7 @@ public class RequestPreviewItem implements IClientIncomingPacket
// Charge buyer and add tax to castle treasury if not owned by npc clan because a Try On is not Free
if ((totalPrice < 0) || !player.reduceAdena("Wear", totalPrice, player.getLastFolkNPC(), true))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
return;
}

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

@@ -178,7 +178,7 @@ public class RequestProcureCropList implements IClientIncomingPacket
sm.addLong(i.getCount());
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
sm = new SystemMessage(SystemMessageId.NOT_ENOUGH_ADENA);
player.sendPacket(sm);
continue;
}

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

@@ -59,7 +59,7 @@ public class RequestReceivedPost implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE) && msg.hasAttachments())
{
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
player.sendPacket(SystemMessageId.THE_MAILBOX_FUNCTIONS_CAN_BE_USED_ONLY_IN_PEACE_ZONES_OUTSIDE_OF_THEM_YOU_CAN_ONLY_CHECK_ITS_CONTENTS);
return;
}

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

@@ -145,7 +145,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
// Check if player can pay.
if (player.getAdena() < manufactureRecipeCost)
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
return;
}
@@ -183,7 +183,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
final Item paidAdena = player.transferItem("PayManufacture", player.getInventory().getAdenaInstance().getObjectId(), manufactureRecipeCost, manufacturer.getInventory(), manufacturer);
if (paidAdena == null)
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
return;
}
}

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

@@ -84,7 +84,7 @@ public class RequestRefineCancel implements IClientIncomingPacket
if (!player.reduceAdena("RequestRefineCancel", price, targetItem, true))
{
player.sendPacket(ExVariationCancelResult.STATIC_PACKET_FAILURE);
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
return;
}

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

@@ -184,7 +184,7 @@ public class RequestRefundItem implements IClientIncomingPacket
if (!Config.MERCHANT_ZERO_SELL_PRICE && ((adena < 0) || !player.reduceAdena("Refund", adena, player.getLastFolkNPC(), false)))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

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

@@ -65,7 +65,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
player.sendPacket(SystemMessageId.THE_MAILBOX_FUNCTIONS_CAN_BE_USED_ONLY_IN_PEACE_ZONES_OUTSIDE_OF_THEM_YOU_CAN_ONLY_CHECK_ITS_CONTENTS);
return;
}

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

@@ -58,7 +58,7 @@ public class RequestSentPost implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE) && msg.hasAttachments())
{
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
player.sendPacket(SystemMessageId.THE_MAILBOX_FUNCTIONS_CAN_BE_USED_ONLY_IN_PEACE_ZONES_OUTSIDE_OF_THEM_YOU_CAN_ONLY_CHECK_ITS_CONTENTS);
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.A_CLAN_CREST_CAN_ONLY_BE_REGISTERED_WHEN_THE_CLAN_S_SKILL_LEVEL_IS_3_OR_ABOVE);
player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
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_3_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_5_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_3_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_5_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.THE_CLAN_WAR_CANNOT_BE_STOPPED_BECAUSE_SOMEONE_FROM_YOUR_CLAN_IS_STILL_ENGAGED_IN_BATTLE);
player.sendPacket(SystemMessageId.THE_CLAN_WAR_CANNOT_BE_STOPPED_BECAUSE_SOMEONE_FROM_YOUR_CLAN_IS_STILL_ENGAGED_IN_BATTLE_CLAN_MEMBERS_IN_BATTLE_S1);
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.THE_CLAN_WAR_CANNOT_BE_STOPPED_BECAUSE_SOMEONE_FROM_YOUR_CLAN_IS_STILL_ENGAGED_IN_BATTLE);
player.sendPacket(SystemMessageId.THE_CLAN_WAR_CANNOT_BE_STOPPED_BECAUSE_SOMEONE_FROM_YOUR_CLAN_IS_STILL_ENGAGED_IN_BATTLE_CLAN_MEMBERS_IN_BATTLE_S1);
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_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED);
sm.addInt(unequippedItem.getEnchantLevel());
}
else

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);
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);
}
return;
}

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

@@ -157,7 +157,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
return;
}

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

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

2
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.UNABLE_TO_EQUIP_S1_BECAUSE_YOU_DO_NOT_HAVE_AN_ARTIFACT_BOOK);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVEN_T_EQUIPPED_AN_ARTIFACT_BOOK_SO_S1_CANNOT_BE_EQUIPPED);
sm.addItemName(item);
player.sendPacket(sm);
return;

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

@@ -50,7 +50,7 @@ public class RequestAbilityList implements IClientIncomingPacket
if (player.getLevel() < 85)
{
player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
player.sendPacket(SystemMessageId.REACH_LV_85_TO_USE);
return;
}

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

@@ -46,7 +46,7 @@ public class RequestAbilityWndClose implements IClientIncomingPacket
if (player.getLevel() < 85)
{
player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
player.sendPacket(SystemMessageId.REACH_LV_85_TO_USE);
return;
}

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

@@ -46,7 +46,7 @@ public class RequestAbilityWndOpen implements IClientIncomingPacket
if (player.getLevel() < 85)
{
player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
player.sendPacket(SystemMessageId.REACH_LV_85_TO_USE);
return;
}

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

@@ -92,7 +92,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getLevel() < 85)
{
player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
player.sendPacket(SystemMessageId.REACH_LV_85_TO_USE);
return;
}
else if (player.isInOlympiadMode())

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

@@ -60,7 +60,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getLevel() < 85)
{
player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
player.sendPacket(SystemMessageId.REACH_LV_85_TO_USE);
return;
}
else if (player.isInOlympiadMode())

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

@@ -73,7 +73,7 @@ public class RequestDivideAdena implements IClientIncomingPacket
final Party party = player.getParty();
if (party == null)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_PROCEED_AS_YOU_ARE_NOT_IN_AN_ALLIANCE_OR_PARTY);
player.sendPacket(SystemMessageId.YOU_CANNOT_DISTRIBUTE_ADENA_IF_YOU_ARE_NOT_A_MEMBER_OF_AN_ALLIANCE_OR_A_COMMAND_CHANNEL);
cancelDistribution(request);
return;
}
@@ -95,7 +95,7 @@ public class RequestDivideAdena implements IClientIncomingPacket
final List<Player> targets = commandChannel != null ? commandChannel.getMembers() : party.getMembers();
if (player.getAdena() < targets.size())
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA_2);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA_2);
cancelDistribution(request);
return;
}

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

@@ -51,7 +51,7 @@ public class RequestDivideAdenaStart implements IClientIncomingPacket
final Party party = player.getParty();
if (party == null)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_PROCEED_AS_YOU_ARE_NOT_IN_AN_ALLIANCE_OR_PARTY);
player.sendPacket(SystemMessageId.YOU_CANNOT_DISTRIBUTE_ADENA_IF_YOU_ARE_NOT_A_MEMBER_OF_AN_ALLIANCE_OR_A_COMMAND_CHANNEL);
return;
}
@@ -70,7 +70,7 @@ public class RequestDivideAdenaStart implements IClientIncomingPacket
final List<Player> targets = commandChannel != null ? commandChannel.getMembers() : party.getMembers();
if (player.getAdena() < targets.size())
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA_2);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA_2);
return;
}

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

@@ -174,7 +174,7 @@ public class RequestAlchemyConversion implements IClientIncomingPacket
if (!inventory.validateWeight(totalWeight) || ((totalslots > 0) && !inventory.validateCapacity(totalslots)))
{
player.sendPacket(new ExAlchemyConversion(0, 0));
player.sendPacket(SystemMessageId.THERE_IS_NOT_ENOUGH_INVENTORY_SPACE_PLEASE_MAKE_MORE_ROOM_AND_TRY_AGAIN);
player.sendPacket(SystemMessageId.NOT_ENOUGH_INVENTORY_SPACE_FREE_UP_SOME_SPACE_AND_TRY_AGAIN);
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.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_WHEN_PRIVATE_STORE_AND_WORKSHOP_ARE_OPENED);
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_USING_THE_PRIVATE_STORE_WORKSHOP);
return;
}
if (player.hasAbnormalType(AbnormalType.FREEZING))
{
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_WHILE_IN_FROZEN_STATE);
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_FROZEN);
}
if (player.isDead())
{
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_IF_THE_CHARACTER_IS_DEAD);
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_DEAD);
return;
}
if ((player.getActiveTradeList() != null) || player.hasItemRequest())
{
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_DURING_EXCHANGE);
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_TRADING);
return;
}
if (player.hasAbnormalType(AbnormalType.PARALYZE))
{
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_WHILE_THE_CHARACTER_IS_PETRIFIED);
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_PETRIFIED);
return;
}
if (player.isFishing())
{
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_DURING_FISHING);
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_FISHING);
return;
}
if (player.isSitting())
{
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_WHILE_SITTING);
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_SEATED);
return;
}
if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player))
{
player.sendPacket(SystemMessageId.SOUL_CRYSTAL_INSERTION_IS_IMPOSSIBLE_DURING_COMBAT);
player.sendPacket(SystemMessageId.CANNOT_USE_THE_SOUL_CRYSTAL_SYSTEM_WHILE_IN_BATTLE);
return;
}

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