Updated system messages.

This commit is contained in:
MobiusDevelopment
2021-12-20 22:02:03 +00:00
parent 484db5e377
commit 8f9c6448ae
326 changed files with 10477 additions and 7318 deletions

View File

@@ -60,7 +60,7 @@ public class Orfen extends AbstractNpcAI
private static final NpcStringId[] TEXT =
{
NpcStringId.S1_STOP_KIDDING_YOURSELF_ABOUT_YOUR_OWN_POWERLESSNESS,
NpcStringId.S1_I_LL_MAKE_YOU_FEEL_WHAT_TRUE_FEAR_IS,
NpcStringId.S1_YOU_WILL_LEARN_WHAT_THE_TRUE_FEAR_IS,
NpcStringId.YOU_RE_REALLY_STUPID_TO_HAVE_CHALLENGED_ME_S1_GET_READY,
NpcStringId.S1_DO_YOU_THINK_THAT_S_GOING_TO_WORK
};

View File

@@ -72,7 +72,7 @@ public class ArenaManager extends AbstractNpcAI
}
else
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
}
break;
}
@@ -85,7 +85,7 @@ public class ArenaManager extends AbstractNpcAI
}
else
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
}
break;
}
@@ -101,7 +101,7 @@ public class ArenaManager extends AbstractNpcAI
}
else
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
}
break;
}

View File

@@ -742,7 +742,7 @@ public class CastleChamberlain extends AbstractNpcAI
}
else
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
}
}
htmltext = "chamberlain-01.html";

View File

@@ -507,7 +507,7 @@ public class ClanHallManager extends AbstractNpcAI
}
else
{
htmltext = htmltext.replaceAll("%" + name + "recovery%", "<fstring p1=\"\" p2=\"\">" + NpcStringId.NONE_2.getId() + "</fstring>");
htmltext = htmltext.replaceAll("%" + name + "recovery%", "<fstring p1=\"\" p2=\"\">" + NpcStringId.DISABLED.getId() + "</fstring>");
htmltext = htmltext.replaceAll("%" + name + "price%", "");
htmltext = htmltext.replaceAll("%" + name + "expire%", "");
htmltext = htmltext.replaceAll("%" + name + "deactive%", "");

View File

@@ -45,7 +45,7 @@ public class ChatAlliance implements IChatHandler
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}
if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

View File

@@ -46,7 +46,7 @@ public class ChatClan implements IChatHandler
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}
if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

View File

@@ -77,7 +77,7 @@ public class ChatGeneral implements IChatHandler
{
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}

View File

@@ -48,7 +48,7 @@ public class ChatHeroVoice implements IChatHandler
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}
if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

View File

@@ -46,7 +46,7 @@ public class ChatParty implements IChatHandler
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}
if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

View File

@@ -44,7 +44,7 @@ public class ChatPartyMatchRoom implements IChatHandler
{
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}
if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

View File

@@ -42,7 +42,7 @@ public class ChatPartyRoomAll implements IChatHandler
{
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}
if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

View File

@@ -42,7 +42,7 @@ public class ChatPartyRoomCommander implements IChatHandler
{
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}
if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

View File

@@ -41,7 +41,7 @@ public class ChatPetition implements IChatHandler
{
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}
if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

View File

@@ -44,7 +44,7 @@ public class ChatShout implements IChatHandler
{
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}
if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

View File

@@ -44,7 +44,7 @@ public class ChatTrade implements IChatHandler
{
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}
if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))

View File

@@ -45,7 +45,7 @@ public class ChatWhisper implements IChatHandler
{
if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
return;
}

View File

@@ -67,7 +67,7 @@ public class ChatWorld implements IChatHandler
}
else if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type))
{
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER);
activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_S1_SEC_OF_PROHIBITION_IS_LEFT);
}
else if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
{

View File

@@ -111,7 +111,7 @@ public class ConvertItem extends AbstractEffect
final SystemMessage sm;
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);
}
@@ -150,13 +150,13 @@ public class ConvertItem extends AbstractEffect
final SystemMessage msg;
if (newItem.getEnchantLevel() > 0)
{
msg = new SystemMessage(SystemMessageId.S1_S2_EQUIPPED);
msg = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1_S2);
msg.addInt(newItem.getEnchantLevel());
msg.addItemName(newItem);
}
else
{
msg = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
msg = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1);
msg.addItemName(newItem);
}
player.sendPacket(msg);

View File

@@ -94,7 +94,7 @@ public class Cp extends AbstractEffect
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_RECOVER_S1_CP);
sm.addInt((int) amount);
effected.sendPacket(sm);
}

View File

@@ -83,7 +83,7 @@ public class CpHeal extends AbstractEffect
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_RECOVER_S1_CP);
sm.addInt((int) amount);
effected.sendPacket(sm);
}

View File

@@ -80,7 +80,7 @@ public class CpHealPercent extends AbstractEffect
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_RECOVER_S1_CP);
sm.addInt((int) amount);
effected.sendPacket(sm);
}

View File

@@ -83,7 +83,7 @@ public class Disarmor extends AbstractEffect
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);
}
@@ -125,13 +125,13 @@ public class Disarmor extends AbstractEffect
{
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);
}
player.sendPacket(sm);

View File

@@ -58,7 +58,7 @@ public class GiveClanReputation extends AbstractEffect
{
if (member.isOnline())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_CLAN_HAS_ADDED_S1_POINT_S_TO_ITS_CLAN_REPUTATION);
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_REPUTATION_POINTS_S1);
sm.addInt(_reputation);
member.getPlayer().sendPacket(sm);
}

View File

@@ -142,7 +142,7 @@ public class Heal extends AbstractEffect
{
if (skill.getId() == 4051)
{
effected.sendPacket(SystemMessageId.REJUVENATING_HP);
effected.sendPacket(SystemMessageId.RECOVERS_HP);
}
else if (effector.isPlayer() && (effector != effected))
{

View File

@@ -176,7 +176,7 @@ public class HpCpHeal extends AbstractEffect
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_RECOVER_S1_CP);
sm.addInt((int) amount);
effected.sendPacket(sm);
}

View File

@@ -62,7 +62,7 @@ public class BlessedSoulShots implements IItemHandler
{
if (!player.getAutoSoulShot().contains(itemId))
{
player.sendPacket(SystemMessageId.CANNOT_USE_SOULSHOTS);
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SOULSHOTS);
}
return false;
}

View File

@@ -58,7 +58,7 @@ public class BlessedSpiritShot implements IItemHandler
{
if (!player.getAutoSoulShot().contains(itemId))
{
player.sendPacket(SystemMessageId.YOU_MAY_NOT_USE_SPIRITSHOTS);
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SPIRITSHOTS);
}
return false;
}

View File

@@ -59,7 +59,7 @@ public class SoulShots implements IItemHandler
{
if (!player.getAutoSoulShot().contains(itemId))
{
player.sendPacket(SystemMessageId.CANNOT_USE_SOULSHOTS);
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SOULSHOTS);
}
return false;
}

View File

@@ -58,7 +58,7 @@ public class SpiritShot implements IItemHandler
{
if (!player.getAutoSoulShot().contains(itemId))
{
player.sendPacket(SystemMessageId.YOU_MAY_NOT_USE_SPIRITSHOTS);
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SPIRITSHOTS);
}
return false;
}

View File

@@ -40,7 +40,7 @@ public class PetAttack implements IPlayerActionHandler
final Pet pet = player.getPet();
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);
}
else if (pet.isBetrayed())
{

View File

@@ -41,7 +41,7 @@ public class PetHold implements IPlayerActionHandler
final Pet pet = player.getPet();
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);
}
else if (pet.isBetrayed())
{

View File

@@ -41,7 +41,7 @@ public class PetMove implements IPlayerActionHandler
final Pet pet = player.getPet();
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);
}
else if (pet.isBetrayed())
{

View File

@@ -46,7 +46,7 @@ public class PetSkillUse implements IPlayerActionHandler
}
else 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);
}
else if (pet.isBetrayed())
{

View File

@@ -40,7 +40,7 @@ public class PetStop implements IPlayerActionHandler
final Pet pet = player.getPet();
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);
}
else if (pet.isBetrayed())
{

View File

@@ -39,11 +39,11 @@ public class UnsummonPet implements IPlayerActionHandler
}
else if (((Pet) 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);
}
else if (pet.isBetrayed())
{
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);
}
else if (pet.isDead())
{
@@ -51,7 +51,7 @@ public class UnsummonPet implements IPlayerActionHandler
}
else if (pet.isAttackingNow() || pet.isInCombat() || pet.isMovementDisabled())
{
player.sendPacket(SystemMessageId.A_PET_CANNOT_BE_UNSUMMONED_DURING_BATTLE);
player.sendPacket(SystemMessageId.A_PET_CANNOT_BE_RECALLED_IN_COMBAT);
}
else if (pet.isHungry())
{

View File

@@ -74,7 +74,7 @@ public class EnemyNot implements ITargetTypeHandler
{
if (sendMessage)
{
creature.sendPacket(SystemMessageId.THE_TARGET_IS_LOCATED_WHERE_YOU_CANNOT_CHARGE);
creature.sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_THE_TARGET);
}
return null;
}

View File

@@ -76,7 +76,7 @@ public class Target implements ITargetTypeHandler
{
if (sendMessage)
{
creature.sendPacket(SystemMessageId.THE_TARGET_IS_LOCATED_WHERE_YOU_CANNOT_CHARGE);
creature.sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_THE_TARGET);
}
return null;
}

View File

@@ -108,7 +108,7 @@ public class ClanWarsList implements IUserCommandHandler
else
{
// Target Without Ally
sm = new SystemMessage(SystemMessageId.S1_S2_ALLIANCE_2);
sm = new SystemMessage(SystemMessageId.S1_NO_ALLIANCE);
sm.addString(clanName);
}
player.sendPacket(sm);

View File

@@ -48,17 +48,17 @@ public class PartyInfo implements IUserCommandHandler
{
case FINDERS_KEEPERS:
{
player.sendPacket(SystemMessageId.LOOTING_METHOD_FINDERS_KEEPERS);
player.sendPacket(SystemMessageId.LOOT_FINDERS_KEEPERS);
break;
}
case RANDOM:
{
player.sendPacket(SystemMessageId.LOOTING_METHOD_RANDOM);
player.sendPacket(SystemMessageId.LOOT_RANDOM);
break;
}
case RANDOM_INCLUDING_SPOIL:
{
player.sendPacket(SystemMessageId.LOOTING_METHOD_RANDOM_INCLUDING_SPOIL);
player.sendPacket(SystemMessageId.LOOT_RANDOM_INCLUDING_SPOILS);
break;
}
case BY_TURN:

View File

@@ -162,7 +162,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
// Check if any player from the group has already finished the instance
if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0)
{
enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName())));
enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.C1_CANNOT_ENTER_YET).addString(member.getName())));
return;
}
}

View File

@@ -132,7 +132,7 @@ public class LastImperialTomb extends AbstractInstance
SKILL_MSG.put(1, NpcStringId.REQUIEM_OF_HATRED);
SKILL_MSG.put(2, NpcStringId.RONDO_OF_SOLITUDE);
SKILL_MSG.put(3, NpcStringId.FRENETIC_TOCCATA);
SKILL_MSG.put(4, NpcStringId.FUGUE_OF_JUBILATION);
SKILL_MSG.put(4, NpcStringId.FUGUE_OF_RAPTURE);
SKILL_MSG.put(5, NpcStringId.HYPNOTIC_MAZURKA);
}
// Spawns

View File

@@ -72,7 +72,7 @@ public class Q10296_LetsPayRespectsToOurFallenBrethren extends Quest
addCondMinLevel(MIN_LEVEL, "no_lvl.html");
addCondMaxLevel(MAX_LEVEL, "no_lvl.html");
addCondCompletedQuest(Q10295_RespectforGraves.class.getSimpleName(), "no_lvl.html");
setQuestNameNpcStringId(NpcStringId.LV_52_58_LET_S_PAY_RESPECTS_TO_OUR_FALLEN_BRETHREN);
setQuestNameNpcStringId(NpcStringId.LV_52_58_PAY_RESPECTS_TO_FALLEN_BRETHREN);
}
@Override

View File

@@ -77,7 +77,7 @@ public class Q10299_GetIncrediblePower extends Quest
addTalkId(ORVEN);
addKillId(MONSTERS);
addCondMinLevel(MIN_LEVEL, "no_lvl.html");
setQuestNameNpcStringId(NpcStringId.LV_45_GET_INCREDIBLE_POWER);
setQuestNameNpcStringId(NpcStringId.LV_45_75_TO_GET_INCREDIBLE_POWER);
}
@Override

View File

@@ -64,7 +64,7 @@ public class Q10300_ExploringTheCrumaTower extends Quest
addTalkId(ORVEN, CARSUS);
addKillId(PORTA, EXCURO, MORDEO, RICENSEO, KRATOR, CATHEROK, PREMO, VALIDUS, DICOR, PERUM, TORFE);
addCondMinLevel(MIN_LEVEL, "no_lvl.html");
setQuestNameNpcStringId(NpcStringId.LV_65_CRUMA_TOWER_EXPLORATION_SUPPORT);
setQuestNameNpcStringId(NpcStringId.LV_65_EXPLORING_THE_CRUMA_TOWER);
}
@Override

View File

@@ -61,7 +61,7 @@ public class Q10301_NotSoSilentValley extends Quest
addTalkId(ORVEN);
addKillId(CHIMERA_PIECE, MUTATED_CREATION, CREATURE_OF_THE_PAST, FORGOTTEN_FACE, SOLDIER_OF_ANCIENT_TIMES, GIANT_SHADOW, WARRIOR_OF_ANCIENT_TIMES, SHAMAN_OF_ANCIENT_TIMES, FORGOTTEN_ANCIENT_PEOPLE, ANCIENT_GUARDIAN);
addCondMinLevel(MIN_LEVEL, "no_lvl.html");
setQuestNameNpcStringId(NpcStringId.DEFEAT_THE_MONSTERS_IN_THE_SILENT_VALLEY_2);
setQuestNameNpcStringId(NpcStringId.DEFEAT_MONSTERS_IN_THE_SILENT_VALLEY_2);
}
@Override
@@ -178,7 +178,7 @@ public class Q10301_NotSoSilentValley extends Quest
if ((qs != null) && qs.isCond(1))
{
final Set<NpcLogListHolder> holder = new HashSet<>();
holder.add(new NpcLogListHolder(NpcStringId.DEFEAT_THE_MONSTERS_IN_THE_SILENT_VALLEY_2.getId(), true, qs.getInt(KILL_COUNT_VAR)));
holder.add(new NpcLogListHolder(NpcStringId.DEFEAT_MONSTERS_IN_THE_SILENT_VALLEY_2.getId(), true, qs.getInt(KILL_COUNT_VAR)));
return holder;
}
return super.getNpcLogList(player);

View File

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

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.C1_HAS_ALREADY_BEEN_REGISTERED_ON_THE_MATCH_WAITING_LIST);
msg.addString(player.getName());
player.sendPacket(msg);
return false;

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

View File

@@ -246,7 +246,7 @@ public class RecipeManager
_price = item.getCost();
if (_target.getAdena() < _price) // check price
{
_target.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
_target.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
abort();
return;
}
@@ -387,7 +387,7 @@ public class RecipeManager
final Item adenatransfer = _target.transferItem("PayManufacture", _target.getInventory().getAdenaInstance().getObjectId(), _price, _player.getInventory(), _player);
if (adenatransfer == null)
{
_target.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
_target.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
abort();
return;
}
@@ -482,7 +482,7 @@ public class RecipeManager
grabItems -= count;
if (_target == _player)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_EQUIPPED); // you equipped ...
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1_S2); // you equipped ...
sm.addLong(count);
sm.addItemName(item.getItemId());
_player.sendPacket(sm);
@@ -621,7 +621,7 @@ public class RecipeManager
inv.destroyItemByItemId("Manufacture", tmp.getItemId(), tmp.getQuantity(), _target, _player);
if (tmp.getQuantity() > 1)
{
sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
sm = new SystemMessage(SystemMessageId.S1_X_S2_DISAPPEARED);
sm.addItemName(tmp.getItemId());
sm.addLong(tmp.getQuantity());
_target.sendPacket(sm);
@@ -702,7 +702,7 @@ public class RecipeManager
if (itemCount > 1)
{
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(itemId);
sm.addLong(itemCount);
_target.sendPacket(sm);

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;

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

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

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

View File

@@ -432,7 +432,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);

View File

@@ -734,7 +734,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());
@@ -771,7 +771,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_S3_S2_S_BY_USING_SWEEPER) : new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_X_S3);
msg.addString(looter.getName());
msg.addItemName(itemId);
msg.addLong(itemCount);

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

View File

@@ -1182,7 +1182,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());

View File

@@ -1056,11 +1056,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;
@@ -1105,7 +1105,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;
}
@@ -4039,7 +4039,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;
}

View File

@@ -2236,7 +2236,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);
}
@@ -2265,13 +2265,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);
@@ -3069,7 +3069,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);
}
@@ -3106,7 +3106,7 @@ public class Player extends Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
}
return false;
}
@@ -3185,7 +3185,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);
@@ -3213,7 +3213,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);
@@ -3249,7 +3249,7 @@ public class Player extends Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
}
return false;
}
@@ -3277,7 +3277,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);
@@ -3377,7 +3377,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);
@@ -3495,7 +3495,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);
@@ -3610,7 +3610,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);
@@ -6011,7 +6011,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);
}
@@ -6052,7 +6052,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);
}
@@ -8007,13 +8007,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.PATTERN_WAS_DELETED);
// Remove henna duration task
if (henna.getDuration() > 0)
@@ -11891,7 +11891,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);
}

View File

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

View File

@@ -533,7 +533,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);
@@ -579,7 +579,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);
@@ -1608,7 +1608,7 @@ public class Pet extends Summon
{
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);
}
@@ -1637,13 +1637,13 @@ public class Pet extends Summon
{
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);

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

View File

@@ -360,13 +360,13 @@ public class VillageMaster extends Folk
// Subclasses may not be changed while you have exceeded your inventory limit.
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);
return;
}
// Subclasses may not be changed while a you are over your weight limit.
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);
return;
}
@@ -1046,7 +1046,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;
}

View File

@@ -359,7 +359,7 @@ public class PlayableStat extends CreatureStat
{
if (member.isOnline())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_CLAN_HAS_ADDED_S1_POINT_S_TO_ITS_CLAN_REPUTATION);
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_REPUTATION_POINTS_S1);
sm.addInt(reputation);
member.getPlayer().sendPacket(sm);
}

View File

@@ -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.ARCANE_SHIELD_S1_DECREASED_YOUR_MP_INSTEAD_OF_HP);
smsg.addInt(mpDam);
getActiveChar().sendPacket(smsg);
return;

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

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);
}
@@ -169,7 +169,7 @@ public class ClanWar
// Reduce reputation.
cancelor.takeReputationScore(500);
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);

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())

View File

@@ -43,9 +43,9 @@ import org.l2jmobius.gameserver.enums.AttributeType;
import org.l2jmobius.gameserver.enums.Movie;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.instancemanager.MailManager;
import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
@@ -2647,14 +2647,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);

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

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

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

View File

@@ -932,7 +932,7 @@ public class Hero
if ((clan != null) && (clan.getLevel() >= 3))
{
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);

View File

@@ -347,7 +347,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));
@@ -394,7 +394,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);
}

View File

@@ -887,7 +887,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);

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
{

View File

@@ -805,7 +805,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);
@@ -824,7 +824,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);
}

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

View File

@@ -196,7 +196,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);
@@ -205,7 +205,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
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);
@@ -258,7 +258,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);
@@ -267,7 +267,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);
}

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
{

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

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

View File

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

View File

@@ -213,7 +213,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);
}
@@ -238,7 +238,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);

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

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

View File

@@ -183,7 +183,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);

View File

@@ -298,7 +298,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);
@@ -403,7 +403,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);

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

View File

@@ -60,7 +60,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
if (player.getHennaEmptySlots() == 0)
{
player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
player.sendPacket(SystemMessageId.YOU_HAVE_NO_FREE_PATTERN_SLOTS);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -82,11 +82,11 @@ public class RequestHennaEquip implements IClientIncomingPacket
iu.addModifiedItem(player.getInventory().getAdenaInstance());
player.sendInventoryUpdate(iu);
player.sendPacket(new HennaEquipList(player));
player.sendPacket(SystemMessageId.THE_SYMBOL_HAS_BEEN_ADDED);
player.sendPacket(SystemMessageId.PATTERN_ADDED);
}
else
{
player.sendPacket(SystemMessageId.THE_SYMBOL_CANNOT_BE_DRAWN);
player.sendPacket(SystemMessageId.YOU_CANNOT_MAKE_A_PATTERN);
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);

View File

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

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;

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

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_MAXIMUM_NUMBER_OF_TOTAL_OF_S1_PETITIONS_TODAY_YOU_CANNOT_SUBMIT_MORE_PETITIONS);
sm.addInt(totalPetitions);
player.sendPacket(sm);
return;

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

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

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

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

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