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

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
View File

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

24
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -3086,7 +3086,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3414,7 +3414,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;
@ -3495,7 +3495,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@ -3527,7 +3527,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@ -3710,7 +3710,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@ -3799,7 +3799,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return null;
@ -5013,7 +5013,7 @@ public final class L2PcInstance extends L2Playable
msg = Config.ANNOUNCE_PK_MSG.replace("$killer", killer.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
@ -5027,7 +5027,7 @@ public final class L2PcInstance extends L2Playable
msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", killer.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
@ -6146,7 +6146,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())
@ -11572,7 +11572,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4);
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this);
sm.addString(target.getName());
sm.addInt(damage);
@ -13801,7 +13801,7 @@ public final class L2PcInstance extends L2Playable
if (AdminData.getInstance().requireConfirm(command))
{
setAdminConfirmCmd(fullCommand);
final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S13);
final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
dlg.addString("Are you sure you want execute command " + fullCommand.substring(6) + " ?");
addAction(PlayerAction.ADMIN_COMMAND);
sendPacket(dlg);

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
View File

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

72718
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/NpcStringId.java
View File

File diff suppressed because it is too large Load Diff

31497
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/SystemMessageId.java
View File

File diff suppressed because it is too large Load Diff

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@ -706,7 +706,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
private void giveSkill(L2PcInstance player, L2Npc trainer, Skill skill, boolean store)
{
// Send message.
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S12);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_2);
sm.addSkillName(skill);
player.sendPacket(sm);

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
View File

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

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendList.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java
View File

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

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
View File

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