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

Updated system messages and NPC strings.

Browse Source
This commit is contained in:
MobiusDev
2018-03-13 16:07:06 +00:00
parent 702c86935e
commit 55dfe422e2
497 changed files with 313051 additions and 320214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
+3 -3
View File
@@ -907,7 +907,7 @@ public final class FourSepulchersManager
if (player.getWeightPenalty() >= 3)
{
mem.sendPacket(SystemMessageId.PROGRESS_IN_A_QUEST_IS_POSSIBLE_ONLY_WHEN_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
mem.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
return;
}
}
@@ -935,7 +935,7 @@ public final class FourSepulchersManager
if (player.getWeightPenalty() >= 3)
{
mem.sendPacket(SystemMessageId.PROGRESS_IN_A_QUEST_IS_POSSIBLE_ONLY_WHEN_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
mem.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
return;
}
}
@@ -956,7 +956,7 @@ public final class FourSepulchersManager
if (player.getWeightPenalty() >= 3)
{
player.sendPacket(SystemMessageId.PROGRESS_IN_A_QUEST_IS_POSSIBLE_ONLY_WHEN_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
return;
}
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/BlockList.java
+1 -1
View File
@@ -249,7 +249,7 @@ public class BlockList
{
listOwner.sendMessage((i++) + ". " + CharNameTable.getInstance().getNameById(playerId));
}
listOwner.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
listOwner.sendPacket(SystemMessageId.EMPTY_3);
}
/**
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+1 -1
View File
@@ -1831,7 +1831,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
if (!destroyItemByItemId("Consume", skill.getItemConsumeId(), skill.getItemConsumeCount(), null, true))
{
getActingPlayer().sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
getActingPlayer().sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
abortCast();
return;
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+1 -1
View File
@@ -799,7 +799,7 @@ public abstract class L2Summon extends L2Playable
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_GIVEN_C2_DAMAGE_OF_S3);
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_DONE_S3_POINTS_OF_DAMAGE_TO_C2);
sm.addNpcName(this);
sm.addCharName(target);
sm.addInt(damage);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java
+2 -2
View File
@@ -363,7 +363,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
// Weight/Inventory check
if (!Config.CLASS_MASTER_SETTINGS.getRewardItems(newJobLevel).isEmpty() && !player.isInventoryUnder90(false))
{
player.sendPacket(SystemMessageId.PROGRESS_IN_A_QUEST_IS_POSSIBLE_ONLY_WHEN_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
return false;
}
@@ -372,7 +372,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
{
if (player.getInventory().getInventoryItemCount(holder.getId(), -1) < holder.getCount())
{
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
return false;
}
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+10 -10
View File
@@ -3355,7 +3355,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@@ -3418,7 +3418,7 @@ public final class L2PcInstance extends L2Playable
}
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@@ -3442,7 +3442,7 @@ public final class L2PcInstance extends L2Playable
}
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@@ -3470,7 +3470,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -3668,7 +3668,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -3759,7 +3759,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return null;
@@ -4480,7 +4480,7 @@ public final class L2PcInstance extends L2Playable
{
if (target.getEnchantLevel() > 0)
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.ATTENTION_C1_HAS_PICKED_UP_S2S3);
smsg = SystemMessage.getSystemMessage(SystemMessageId.ATTENTION_C1_HAS_PICKED_UP_S2_S3);
smsg.addPcName(this);
smsg.addInt(target.getEnchantLevel());
}
@@ -6309,7 +6309,7 @@ public final class L2PcInstance extends L2Playable
{
// You can't mount, dismount, break and drop items while fishing
sendPacket(ActionFailed.STATIC_PACKET);
sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING2);
sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
return false;
}
else if (isTransformed() || isCursedWeaponEquipped())
@@ -12366,7 +12366,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_GIVEN_C2_DAMAGE_OF_S3);
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_DONE_S3_POINTS_OF_DAMAGE_TO_C2);
sm.addPcName(this);
sm.addCharName(target);
sm.addInt(damage);
@@ -12821,7 +12821,7 @@ public final class L2PcInstance extends L2Playable
}
else if (isParalyzed())
{
sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_YOU_ARE_IN_A_FLINT_OR_PARALYZED_STATE);
sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_YOU_ARE_IN_A_PETRIFIED_OR_PARALYZED_STATE);
return false;
}
else if (isDead())
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
+2 -2
View File
@@ -374,7 +374,7 @@ public class L2PetInstance extends L2Summon
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -421,7 +421,7 @@ public class L2PetInstance extends L2Summon
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
+1 -1
View File
@@ -342,7 +342,7 @@ public final class L2TrapInstance extends L2Npc
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_GIVEN_C2_DAMAGE_OF_S3);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_DONE_S3_POINTS_OF_DAMAGE_TO_C2);
sm.addCharName(this);
sm.addCharName(target);
sm.addInt(damage);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
+1 -1
View File
@@ -209,7 +209,7 @@ public class PcStat extends PlayableStat
{
if ((addToExp - baseExp) > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_EXP_BONUS_S2_AND_S3_SP_BONUS_S4);
sm.addLong(addToExp);
sm.addLong(addToExp - baseExp);
sm.addInt(addToSp);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/NevitSystem.java
+5 -5
View File
@@ -80,11 +80,11 @@ public class NevitSystem implements IUniqueId
if ((percent >= 45) && (percent < 50))
{
_player.sendPacket(SystemMessageId.YOUR_BIRTHDAY_GIFT_HAS_ARRIVED_YOU_CAN_OBTAIN_IT_FROM_THE_GATEKEEPER_IN_ANY_VILLAGE);
_player.sendPacket(SystemMessageId.HAPPY_BIRTHDAY_ALEGRIA_HAS_SENT_YOU_A_BIRTHDAY_GIFT);
}
else if ((percent >= 50) && (percent < 75))
{
_player.sendPacket(SystemMessageId.YOU_ARE_FURTHER_INFUSED_WITH_THE_BLESSINGS_OF_NEVIT);
_player.sendPacket(SystemMessageId.YOU_ARE_FURTHER_INFUSED_WITH_THE_BLESSINGS_OF_NEVIT_CONTINUE_TO_BATTLE_EVIL_WHEREVER_IT_MAY_LURK);
}
else if (percent >= 75)
{
@@ -126,12 +126,12 @@ public class NevitSystem implements IUniqueId
}
case 50:
{
getPlayer().sendPacket(SystemMessageId.YOU_ARE_FURTHER_INFUSED_WITH_THE_BLESSINGS_OF_NEVIT);
getPlayer().sendPacket(SystemMessageId.YOU_ARE_FURTHER_INFUSED_WITH_THE_BLESSINGS_OF_NEVIT_CONTINUE_TO_BATTLE_EVIL_WHEREVER_IT_MAY_LURK);
break;
}
case 75:
{
getPlayer().sendPacket(SystemMessageId.NEVIT_S_ADVENT_BLESSING_SHINES_STRONGLY_FROM_ABOVE);
getPlayer().sendPacket(SystemMessageId.NEVIT_S_ADVENT_BLESSING_SHINES_STRONGLY_FROM_ABOVE_YOU_CAN_ALMOST_SEE_HIS_DIVINE_AURA);
break;
}
}
@@ -201,7 +201,7 @@ public class NevitSystem implements IUniqueId
{
getPlayer().getVariables().set("nevit_b", time);
getPlayer().sendPacket(new ExNevitAdventEffect(time));
getPlayer().sendPacket(SystemMessageId.NEVIT_HAS_BLESSED_YOU_FROM_ABOVE);
getPlayer().sendPacket(SystemMessageId.THE_ANGEL_NEVIT_HAS_BLESSED_YOU_FROM_ABOVE_YOU_ARE_IMBUED_WITH_FULL_VITALITY_AS_WELL_AS_A_VITALITY_REPLENISHING_EFFECT_AND_SHOULD_YOU_DIE_YOU_WILL_NOT_LOSE_EXP);
getPlayer().startAbnormalVisualEffect(true, AbnormalVisualEffect.NAVIT_ADVENT);
_nevitEffectTask = ThreadPoolManager.schedule(new NevitEffectEnd(), time * 1000L);
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java
+1 -1
View File
@@ -181,7 +181,7 @@ public final class AuctionableHall extends ClanHall
{
ClanHallAuctionManager.getInstance().initNPC(getId());
ClanHallManager.getInstance().setFree(getId());
Clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE));
Clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED));
}
else
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
+7 -7
View File
@@ -112,18 +112,18 @@ public abstract class AbstractOlympiadGame
{
if ((player == null) || !player.isOnline())
{
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_MADE_HASTE_WITH_THEIR_TAIL_BETWEEN_THEIR_LEGS);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_MADE_HASTE_WITH_THEIR_TAIL_BETWEEN_THEIR_LEGS_THE_MATCH_HAS_BEEN_CANCELLED);
}
if ((player.getClient() == null) || player.getClient().isDetached())
{
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_MADE_HASTE_WITH_THEIR_TAIL_BETWEEN_THEIR_LEGS);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_MADE_HASTE_WITH_THEIR_TAIL_BETWEEN_THEIR_LEGS_THE_MATCH_HAS_BEEN_CANCELLED);
}
// safety precautions
if (player.inObserverMode() || TvTEvent.isPlayerParticipant(player.getObjectId()))
{
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
}
SystemMessage sm;
@@ -132,14 +132,14 @@ public abstract class AbstractOlympiadGame
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_PARTICIPATE_IN_THE_OLYMPIAD);
sm.addPcName(player);
player.sendPacket(sm);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
}
if (player.isSubClassActive())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_YOU_CANNOT_PARTICIPATE_IN_THE_OLYMPIAD_BECAUSE_YOU_HAVE_CHANGED_TO_YOUR_SUB_CLASS);
sm.addPcName(player);
player.sendPacket(sm);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
}
if (player.isCursedWeaponEquipped())
{
@@ -147,14 +147,14 @@ public abstract class AbstractOlympiadGame
sm.addPcName(player);
sm.addItemName(player.getCursedWeaponEquippedId());
player.sendPacket(sm);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
}
if (!player.isInventoryUnder90(true))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_YOU_CANNOT_PARTICIPATE_IN_THE_OLYMPIAD_BECAUSE_YOUR_INVENTORY_SLOT_EXCEEDS_80);
sm.addPcName(player);
player.sendPacket(sm);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
}
return null;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java
+3 -3
View File
@@ -513,7 +513,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
else if (_pOneCrash && _pTwoCrash)
{
stadium.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR));
stadium.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE));
_playerOne.updateStat(COMP_LOST, 1);
removePointsFromParticipant(_playerOne, pointDiff);
@@ -607,7 +607,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
{
_playerOne.updateStat(COMP_DRAWN, 1);
_playerTwo.updateStat(COMP_DRAWN, 1);
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR);
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
stadium.broadcastPacket(sm);
}
else if ((_playerTwo.getPlayer() == null) || !_playerTwo.getPlayer().isOnline() || ((playerTwoHp == 0) && (playerOneHp != 0)) || ((_damageP1 > _damageP2) && (playerTwoHp != 0) && (playerOneHp != 0)))
@@ -665,7 +665,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
// Save Fight Result
saveResults(_playerOne, _playerTwo, 0, _startTime, _fightTime, getType());
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR);
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
stadium.broadcastPacket(sm);
int value = Math.min(playerOnePoints / getDivider(), Config.ALT_OLY_MAX_POINTS);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java
+2 -2
View File
@@ -753,7 +753,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
}
else if (tOneCrash && tTwoCrash)
{
stadium.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR));
stadium.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE));
for (int i = _teamOneSize; --i >= 0;)
{
@@ -905,7 +905,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
}
else
{
stadium.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR));
stadium.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE));
for (int i = 0; i < _teamOneSize; i++)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+1 -1
View File
@@ -1580,7 +1580,7 @@ public final class Formulas
}
if (target.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_AVOIDED_C1_S_ATTACK2);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_AVOIDED_C1_S_ATTACK_2);
sm.addString(activeChar.getName());
target.getActingPlayer().sendPacket(sm);
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/NpcStringId.java
+523 -534
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/SystemMessageId.java
+547 -497
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+2 -2
View File
@@ -555,12 +555,12 @@ public class EnterWorld extends L2GameClientPacket
final int birthday = activeChar.checkBirthDay();
if (birthday == 0)
{
activeChar.sendPacket(SystemMessageId.YOUR_BIRTHDAY_GIFT_HAS_ARRIVED_YOU_CAN_OBTAIN_IT_FROM_THE_GATEKEEPER_IN_ANY_VILLAGE);
activeChar.sendPacket(SystemMessageId.HAPPY_BIRTHDAY_ALEGRIA_HAS_SENT_YOU_A_BIRTHDAY_GIFT);
// activeChar.sendPacket(new ExBirthdayPopup()); Removed in H5?
}
else if (birthday != -1)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S1_DAYS_UNTIL_YOUR_CHARACTER_S_BIRTHDAY_ON_THAT_DAY_YOU_CAN_OBTAIN_A_SPECIAL_GIFT_FROM_THE_GATEKEEPER_IN_ANY_VILLAGE);
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S1_DAYS_REMAINING_UNTIL_YOUR_BIRTHDAY_ON_YOUR_BIRTHDAY_YOU_WILL_RECEIVE_A_GIFT_THAT_ALEGRIA_HAS_CAREFULLY_PREPARED);
sm.addString(Integer.toString(birthday));
activeChar.sendPacket(sm);
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+1 -1
View File
@@ -514,7 +514,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
private void giveSkill(L2PcInstance player, L2Npc trainer, Skill skill)
{
// Send message.
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S12);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_2);
sm.addSkillName(skill);
player.sendPacket(sm);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+2 -2
View File
@@ -1280,7 +1280,7 @@ public final class RequestActionUse extends L2GameClientPacket
}
if (activeChar.isFishing())
{
sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING3);
sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
return;
}
@@ -1335,7 +1335,7 @@ public final class RequestActionUse extends L2GameClientPacket
if (requester.isFishing())
{
sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING3);
sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
return;
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+2 -2
View File
@@ -94,10 +94,10 @@ public final class RequestAllyInfo extends L2GameClientPacket
sm.addInt(aci.getTotal());
activeChar.sendPacket(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_SEPARATOR);
sm = SystemMessage.getSystemMessage(SystemMessageId.EMPTY_4);
}
sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_FOOT);
sm = SystemMessage.getSystemMessage(SystemMessageId.EMPTY_5);
activeChar.sendPacket(sm);
}
else
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
+1 -1
View File
@@ -125,7 +125,7 @@ public final class RequestDropItem extends L2GameClientPacket
if (activeChar.isFishing())
{
// You can't mount, dismount, break and drop items while fishing
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING2);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
return;
}
if (activeChar.isFlying())
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+3 -3
View File
@@ -129,7 +129,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
scroll = activeChar.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, activeChar, item);
if (scroll == null)
{
activeChar.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
activeChar.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH);
activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
activeChar.sendPacket(new EnchantResult(2, 0, 0));
@@ -142,7 +142,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
support = activeChar.getInventory().destroyItem("Enchant", support.getObjectId(), 1, activeChar, item);
if (support == null)
{
activeChar.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
activeChar.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH);
activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
activeChar.sendPacket(new EnchantResult(2, 0, 0));
@@ -233,7 +233,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
if (scrollTemplate.isSafe())
{
// safe enchant - remain old value
activeChar.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_SKILL_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
activeChar.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_LEVEL_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
activeChar.sendPacket(new EnchantResult(5, 0, 0));
if (Config.LOG_ITEM_ENCHANTS)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+1 -1
View File
@@ -167,7 +167,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
if (!player.destroyItem("AttrEnchant", stone, 1, player, true))
{
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to attribute enchant with a stone he doesn't have", Config.DEFAULT_PUNISH);
player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
return;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestFriendList.java
+1 -1
View File
@@ -79,6 +79,6 @@ public final class RequestFriendList extends L2GameClientPacket
}
// =========================
activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
activeChar.sendPacket(SystemMessageId.EMPTY_3);
}
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+1 -1
View File
@@ -66,7 +66,7 @@ public final class RequestPreviewItem extends L2GameClientPacket
{
try
{
activeChar.sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_TRYING_ON_EQUIPMENT2);
activeChar.sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_TRYING_ON_EQUIPMENT_2);
activeChar.sendPacket(new UserInfo(activeChar));
}
catch (Exception e)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
+1 -1
View File
@@ -56,7 +56,7 @@ public final class RequestReplyStartPledgeWar extends L2GameClientPacket
}
else
{
requestor.sendPacket(SystemMessageId.THE_S1_CLAN_DID_NOT_RESPOND_WAR_PROCLAMATION_HAS_BEEN_REFUSED2);
requestor.sendPacket(SystemMessageId.THE_S1_CLAN_DID_NOT_RESPOND_WAR_PROCLAMATION_HAS_BEEN_REFUSED_2);
}
activeChar.setActiveRequester(null);
requestor.onTransactionResponse();
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+1 -1
View File
@@ -73,7 +73,7 @@ public final class RequestVoteNew extends L2GameClientPacket
if (activeChar.getRecomLeft() <= 0)
{
activeChar.sendPacket(SystemMessageId.YOU_CURRENTLY_DO_NOT_HAVE_ANY_RECOMMENDATIONS);
activeChar.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+3 -3
View File
@@ -65,12 +65,12 @@ public final class RequestWithDrawPremiumItem extends L2GameClientPacket
}
else if ((activeChar.getWeightPenalty() >= 3) || !activeChar.isInventoryUnder90(false))
{
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_VITAMIN_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (activeChar.isProcessingTransaction())
{
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_VITAMIN_ITEM_DURING_AN_EXCHANGE);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,7 +101,7 @@ public final class RequestWithDrawPremiumItem extends L2GameClientPacket
if (activeChar.getPremiumItemList().isEmpty())
{
activeChar.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_VITAMIN_ITEMS_TO_BE_FOUND);
activeChar.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
+1 -1
View File
@@ -144,7 +144,7 @@ public final class UseItem extends L2GameClientPacket
if (activeChar.isFishing() && ((_itemId < 6535) || (_itemId > 6540)))
{
// You cannot do anything else while fishing
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING3);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
return;
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+1 -1
View File
@@ -35,7 +35,7 @@ public final class SystemMessage extends AbstractMessagePacket<SystemMessage>
throw new NullPointerException();
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S12);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_2);
sm.addString(text);
return sm;
}