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