Updated system messages.

This commit is contained in:
MobiusDevelopment
2022-12-08 06:58:55 +00:00
parent d582049150
commit ca344b5854
210 changed files with 2843 additions and 2123 deletions

View File

@@ -397,7 +397,7 @@ public class SystemMessage extends ServerPacket
{ {
params[i] = _params[i].getValue(); params[i] = _params[i].getValue();
} }
writeShort(SystemMessageId.S1_2.getId()); writeShort(SystemMessageId.S1_3.getId());
writeByte(1); writeByte(1);
writeByte(TYPE_TEXT); writeByte(TYPE_TEXT);
writeString(sml.getLocalisation(params)); writeString(sml.getLocalisation(params));

View File

@@ -61,7 +61,7 @@ public class Roiental extends AbstractNpcAI
} }
else if (player.getClan() == null) else if (player.getClan() == null)
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_3);
} }
else if ((player.getClan().getLevel() < CLAN_MIN_LVL_GB)) else if ((player.getClan().getLevel() < CLAN_MIN_LVL_GB))
{ {
@@ -88,7 +88,7 @@ public class Roiental extends AbstractNpcAI
} }
else if (player.getClan() == null) else if (player.getClan() == null)
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_3);
} }
else if ((player.getClan().getLevel() < CLAN_MIN_LVL_MR)) else if ((player.getClan().getLevel() < CLAN_MIN_LVL_MR))
{ {
@@ -115,7 +115,7 @@ public class Roiental extends AbstractNpcAI
} }
else if (player.getClan() == null) else if (player.getClan() == null)
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_3);
} }
else if ((player.getClan().getLevel() < CLAN_MIN_LVL_TA)) else if ((player.getClan().getLevel() < CLAN_MIN_LVL_TA))
{ {

View File

@@ -289,7 +289,7 @@ public class AwakeningMaster extends AbstractNpcAI
{ {
player.setBaseClass(player.getActiveClass()); player.setBaseClass(player.getActiveClass());
} }
player.sendPacket(SystemMessageId.CONGRATULATIONS_YOU_VE_COMPLETED_A_CLASS_TRANSFER); player.sendPacket(SystemMessageId.CONGRATULATIONS_YOU_VE_COMPLETED_THE_CLASS_CHANGE);
player.broadcastUserInfo(UserInfoType.BASIC_INFO, UserInfoType.MAX_HPCPMP); player.broadcastUserInfo(UserInfoType.BASIC_INFO, UserInfoType.MAX_HPCPMP);
player.broadcastInfo(); player.broadcastInfo();

View File

@@ -97,7 +97,7 @@ public class BaylorWarzone extends AbstractInstance
if (player.isInCommandChannel()) if (player.isInCommandChannel())
{ {
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS); player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_AS_YOU_DON_T_MEET_THE_REQUIREMENTS);
return null; return null;
} }
@@ -134,7 +134,7 @@ public class BaylorWarzone extends AbstractInstance
} }
else else
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
} }
} }
return super.onAdvEvent(event, npc, player); return super.onAdvEvent(event, npc, player);

View File

@@ -180,12 +180,12 @@ public class EnergySeeds extends AbstractNpcAI
if (getRandom(100) < 33) if (getRandom(100) < 33)
{ {
caster.sendPacket(SystemMessageId.YOUR_COLLECTION_HAS_SUCCEEDED); caster.sendPacket(SystemMessageId.YOU_HAVE_GATHERED_SOME_ORE);
caster.addItem("EnergySeed", itemId, getRandom(RATE + 1, 2 * RATE), null, true); caster.addItem("EnergySeed", itemId, getRandom(RATE + 1, 2 * RATE), null, true);
} }
else else
{ {
caster.sendPacket(SystemMessageId.YOUR_COLLECTION_HAS_SUCCEEDED); caster.sendPacket(SystemMessageId.YOU_HAVE_GATHERED_SOME_ORE);
caster.addItem("EnergySeed", itemId, getRandom(1, RATE), null, true); caster.addItem("EnergySeed", itemId, getRandom(1, RATE), null, true);
} }
seedCollectEvent(caster, npc, spawn._seedId); seedCollectEvent(caster, npc, spawn._seedId);

View File

@@ -86,12 +86,12 @@ public class StarStones extends AbstractNpcAI
} }
if (getRandom(100) < 33) if (getRandom(100) < 33)
{ {
caster.sendPacket(SystemMessageId.YOUR_COLLECTION_HAS_SUCCEEDED); caster.sendPacket(SystemMessageId.YOU_HAVE_GATHERED_SOME_ORE);
caster.addItem("StarStone", itemId, getRandom(COLLECTION_RATE + 1, 2 * COLLECTION_RATE), null, true); caster.addItem("StarStone", itemId, getRandom(COLLECTION_RATE + 1, 2 * COLLECTION_RATE), null, true);
} }
else if (((skill.getLevel() == 1) && (getRandom(100) < 15)) || ((skill.getLevel() == 2) && (getRandom(100) < 50)) || ((skill.getLevel() == 3) && (getRandom(100) < 75))) else if (((skill.getLevel() == 1) && (getRandom(100) < 15)) || ((skill.getLevel() == 2) && (getRandom(100) < 50)) || ((skill.getLevel() == 3) && (getRandom(100) < 75)))
{ {
caster.sendPacket(SystemMessageId.YOUR_COLLECTION_HAS_SUCCEEDED); caster.sendPacket(SystemMessageId.YOU_HAVE_GATHERED_SOME_ORE);
caster.addItem("StarStone", itemId, getRandom(1, COLLECTION_RATE), null, true); caster.addItem("StarStone", itemId, getRandom(1, COLLECTION_RATE), null, true);
} }
else else

View File

@@ -65,26 +65,26 @@ public class AdminPetition implements IAdminCommandHandler
{ {
if (PetitionManager.getInstance().isPlayerInConsultation(activeChar)) if (PetitionManager.getInstance().isPlayerInConsultation(activeChar))
{ {
activeChar.sendPacket(SystemMessageId.YOU_MAY_ONLY_SUBMIT_ONE_PETITION_ACTIVE_AT_A_TIME); activeChar.sendPacket(SystemMessageId.YOUR_GLOBAL_SUPPORT_REQUEST_WAS_RECEIVED);
return true; return true;
} }
if (PetitionManager.getInstance().isPetitionInProcess(petitionId)) if (PetitionManager.getInstance().isPetitionInProcess(petitionId))
{ {
activeChar.sendPacket(SystemMessageId.YOUR_PETITION_IS_BEING_PROCESSED); activeChar.sendPacket(SystemMessageId.YOUR_GLOBAL_SUPPORT_REQUEST_IS_BEING_PROCESSED);
return true; return true;
} }
if (!PetitionManager.getInstance().acceptPetition(activeChar, petitionId)) if (!PetitionManager.getInstance().acceptPetition(activeChar, petitionId))
{ {
activeChar.sendPacket(SystemMessageId.NOT_UNDER_PETITION_CONSULTATION); activeChar.sendPacket(SystemMessageId.NO_GLOBAL_SUPPORT_CONSULTATIONS_ARE_UNDER_WAY);
} }
} }
else if (command.startsWith("admin_reject_petition")) else if (command.startsWith("admin_reject_petition"))
{ {
if (!PetitionManager.getInstance().rejectPetition(activeChar, petitionId)) if (!PetitionManager.getInstance().rejectPetition(activeChar, petitionId))
{ {
activeChar.sendPacket(SystemMessageId.FAILED_TO_CANCEL_PETITION_PLEASE_TRY_AGAIN_LATER); activeChar.sendPacket(SystemMessageId.FAILED_TO_CANCEL_YOUR_GLOBAL_SUPPORT_REQUEST_PLEASE_TRY_AGAIN_LATER);
} }
PetitionManager.getInstance().sendPendingPetitionList(activeChar); PetitionManager.getInstance().sendPendingPetitionList(activeChar);
} }
@@ -92,7 +92,7 @@ public class AdminPetition implements IAdminCommandHandler
{ {
if (PetitionManager.getInstance().isPetitionInProcess()) if (PetitionManager.getInstance().isPetitionInProcess())
{ {
activeChar.sendPacket(SystemMessageId.YOUR_PETITION_IS_BEING_PROCESSED); activeChar.sendPacket(SystemMessageId.YOUR_GLOBAL_SUPPORT_REQUEST_IS_BEING_PROCESSED);
return false; return false;
} }
PetitionManager.getInstance().clearPendingPetitions(); PetitionManager.getInstance().clearPendingPetitions();

View File

@@ -51,7 +51,7 @@ public class ChatPetition implements IChatHandler
} }
if (!PetitionManager.getInstance().isPlayerInConsultation(activeChar)) if (!PetitionManager.getInstance().isPlayerInConsultation(activeChar))
{ {
activeChar.sendPacket(SystemMessageId.YOU_ARE_CURRENTLY_NOT_IN_A_PETITION_CHAT); activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_THE_GLOBAL_SUPPORT_CHAT);
return; return;
} }
PetitionManager.getInstance().sendActivePetitionMessage(activeChar, text); PetitionManager.getInstance().sendActivePetitionMessage(activeChar, text);

View File

@@ -85,7 +85,7 @@ public class CallPc extends AbstractEffect
} }
target.addScript(new SummonRequestHolder(player)); target.addScript(new SummonRequestHolder(player));
final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId()); final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WANTS_TO_SUMMON_YOU_TO_S2_ACCEPT.getId());
confirm.getSystemMessage().addString(player.getName()); confirm.getSystemMessage().addString(player.getName());
confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ()); confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
confirm.addTime(30000); confirm.addTime(30000);
@@ -157,7 +157,7 @@ public class CallPc extends AbstractEffect
if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING_2); final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHERE_SUMMONING_OR_TELEPORTING_IS_BLOCKED_2);
sm.addString(target.getName()); sm.addString(target.getName());
effector.sendPacket(sm); effector.sendPacket(sm);
return false; return false;
@@ -165,7 +165,7 @@ public class CallPc extends AbstractEffect
if (target.isInsideZone(ZoneId.NO_SUMMON_FRIEND) || target.isInsideZone(ZoneId.JAIL)) if (target.isInsideZone(ZoneId.NO_SUMMON_FRIEND) || target.isInsideZone(ZoneId.JAIL))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING); final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHERE_SUMMONING_OR_TELEPORTING_IS_BLOCKED);
sm.addString(target.getName()); sm.addString(target.getName());
effector.sendPacket(sm); effector.sendPacket(sm);
return false; return false;
@@ -174,7 +174,7 @@ public class CallPc extends AbstractEffect
final Instance instance = effector.getInstanceWorld(); final Instance instance = effector.getInstanceWorld();
if ((instance != null) && !instance.isPlayerSummonAllowed()) if ((instance != null) && !instance.isPlayerSummonAllowed())
{ {
effector.sendPacket(SystemMessageId.YOU_MAY_NOT_SUMMON_FROM_YOUR_CURRENT_LOCATION); effector.sendPacket(SystemMessageId.CANNOT_BE_SUMMONED_IN_THIS_LOCATION);
return false; return false;
} }

View File

@@ -111,13 +111,13 @@ public class ConvertItem extends AbstractEffect
final SystemMessage sm; final SystemMessage sm;
if (unequippedItem.getEnchantLevel() > 0) if (unequippedItem.getEnchantLevel() > 0)
{ {
sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(unequippedItem.getEnchantLevel()); sm.addInt(unequippedItem.getEnchantLevel());
sm.addItemName(unequippedItem); sm.addItemName(unequippedItem);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_UNEQUIPPED);
sm.addItemName(unequippedItem); sm.addItemName(unequippedItem);
} }
player.sendPacket(sm); player.sendPacket(sm);
@@ -150,13 +150,13 @@ public class ConvertItem extends AbstractEffect
final SystemMessage msg; final SystemMessage msg;
if (newItem.getEnchantLevel() > 0) if (newItem.getEnchantLevel() > 0)
{ {
msg = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1_S2); msg = new SystemMessage(SystemMessageId.S1_S2_EQUIPPED);
msg.addInt(newItem.getEnchantLevel()); msg.addInt(newItem.getEnchantLevel());
msg.addItemName(newItem); msg.addItemName(newItem);
} }
else else
{ {
msg = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1); msg = new SystemMessage(SystemMessageId.S1_EQUIPPED);
msg.addItemName(newItem); msg.addItemName(newItem);
} }
player.sendPacket(msg); player.sendPacket(msg);

View File

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

View File

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

View File

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

View File

@@ -83,13 +83,13 @@ public class Disarmor extends AbstractEffect
final Item unequippedItem = unequipped.get(0); final Item unequippedItem = unequipped.get(0);
if (unequippedItem.getEnchantLevel() > 0) if (unequippedItem.getEnchantLevel() > 0)
{ {
sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(unequippedItem.getEnchantLevel()); sm.addInt(unequippedItem.getEnchantLevel());
sm.addItemName(unequippedItem); sm.addItemName(unequippedItem);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_UNEQUIPPED);
sm.addItemName(unequippedItem); sm.addItemName(unequippedItem);
} }
player.sendPacket(sm); player.sendPacket(sm);
@@ -125,13 +125,13 @@ public class Disarmor extends AbstractEffect
{ {
if (item.getEnchantLevel() > 0) if (item.getEnchantLevel() > 0)
{ {
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1_S2); sm = new SystemMessage(SystemMessageId.S1_S2_EQUIPPED);
sm.addInt(item.getEnchantLevel()); sm.addInt(item.getEnchantLevel());
sm.addItemName(item); sm.addItemName(item);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1); sm = new SystemMessage(SystemMessageId.S1_EQUIPPED);
sm.addItemName(item); sm.addItemName(item);
} }
player.sendPacket(sm); player.sendPacket(sm);

View File

@@ -85,7 +85,7 @@ public class EnergyAttack extends AbstractEffect
final int charge = Math.min(_chargeConsume, attacker.getCharges()); final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge)) if (!attacker.decreaseCharges(charge))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
attacker.sendPacket(sm); attacker.sendPacket(sm);
return; return;

View File

@@ -51,6 +51,6 @@ public class HairAccessorySet extends AbstractEffect
final Player player = effected.getActingPlayer(); final Player player = effected.getActingPlayer();
player.setHairAccessoryEnabled(!player.isHairAccessoryEnabled()); player.setHairAccessoryEnabled(!player.isHairAccessoryEnabled());
player.broadcastUserInfo(UserInfoType.APPAREANCE); player.broadcastUserInfo(UserInfoType.APPAREANCE);
player.sendPacket(player.isHairAccessoryEnabled() ? SystemMessageId.HAIR_ACCESSORIES_WILL_BE_DISPLAYED_FROM_NOW_ON : SystemMessageId.HAIR_ACCESSORIES_WILL_NO_LONGER_BE_DISPLAYED); player.sendPacket(player.isHairAccessoryEnabled() ? SystemMessageId.HEAD_ACCESSORIES_ARE_VISIBLE_FROM_NOW_ON : SystemMessageId.HEAD_ACCESSORIES_ARE_NO_LONGER_SHOWN);
} }
} }

View File

@@ -148,7 +148,7 @@ public class Heal extends AbstractEffect
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_VE_RECOVERED_S1_HP);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }

View File

@@ -88,7 +88,7 @@ public class HealPercent extends AbstractEffect
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); sm = new SystemMessage(SystemMessageId.YOU_VE_RECOVERED_S1_HP);
} }
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);

View File

@@ -93,7 +93,7 @@ public class Hp extends AbstractEffect
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); sm = new SystemMessage(SystemMessageId.YOU_VE_RECOVERED_S1_HP);
} }
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);

View File

@@ -52,7 +52,7 @@ public class HpByLevel extends AbstractEffect
final int restored = (int) (absorb - effector.getCurrentHp()); final int restored = (int) (absorb - effector.getCurrentHp());
effector.setCurrentHp(absorb); effector.setCurrentHp(absorb);
// System message // System message
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_VE_RECOVERED_S1_HP);
sm.addInt(restored); sm.addInt(restored);
effector.sendPacket(sm); effector.sendPacket(sm);
} }

View File

@@ -152,7 +152,7 @@ public class HpCpHeal extends AbstractEffect
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_VE_RECOVERED_S1_HP);
sm.addInt((int) (healAmount + additionalHp)); sm.addInt((int) (healAmount + additionalHp));
effected.sendPacket(sm); effected.sendPacket(sm);
} }
@@ -180,7 +180,7 @@ public class HpCpHeal extends AbstractEffect
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_RECOVER_S1_CP); final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_VE_RECOVERED_S1_CP);
sm.addInt((int) (amount + additionalCp)); sm.addInt((int) (amount + additionalCp));
effected.sendPacket(sm); effected.sendPacket(sm);
} }

View File

@@ -69,7 +69,7 @@ public class MagicalSoulAttack extends AbstractEffect
final int chargedSouls = Math.min(skill.getMaxSoulConsumeCount(), effector.getActingPlayer().getCharges()); final int chargedSouls = Math.min(skill.getMaxSoulConsumeCount(), effector.getActingPlayer().getCharges());
if (!effector.getActingPlayer().decreaseCharges(chargedSouls)) if (!effector.getActingPlayer().decreaseCharges(chargedSouls))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
effector.sendPacket(sm); effector.sendPacket(sm);
return; return;

View File

@@ -89,7 +89,7 @@ public class PhysicalSoulAttack extends AbstractEffect
final int souls = Math.min(skill.getMaxSoulConsumeCount(), effector.getActingPlayer().getCharges()); final int souls = Math.min(skill.getMaxSoulConsumeCount(), effector.getActingPlayer().getCharges());
if (!effector.getActingPlayer().decreaseCharges(souls)) if (!effector.getActingPlayer().decreaseCharges(souls))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
effector.sendPacket(sm); effector.sendPacket(sm);
return; return;

View File

@@ -94,7 +94,7 @@ public class TeleportToPlayer extends AbstractEffect
if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING_2); final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHERE_SUMMONING_OR_TELEPORTING_IS_BLOCKED_2);
sm.addString(target.getName()); sm.addString(target.getName());
effector.sendPacket(sm); effector.sendPacket(sm);
return; return;
@@ -102,7 +102,7 @@ public class TeleportToPlayer extends AbstractEffect
if (target.isInsideZone(ZoneId.NO_SUMMON_FRIEND) || target.isInsideZone(ZoneId.JAIL)) if (target.isInsideZone(ZoneId.NO_SUMMON_FRIEND) || target.isInsideZone(ZoneId.JAIL))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING); final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHERE_SUMMONING_OR_TELEPORTING_IS_BLOCKED);
sm.addString(target.getName()); sm.addString(target.getName());
effector.sendPacket(sm); effector.sendPacket(sm);
return; return;
@@ -111,7 +111,7 @@ public class TeleportToPlayer extends AbstractEffect
final Instance instance = target.getInstanceWorld(); final Instance instance = target.getInstanceWorld();
if (((instance != null) && !instance.isPlayerSummonAllowed()) || target.isInsideZone(ZoneId.TIMED_HUNTING)) if (((instance != null) && !instance.isPlayerSummonAllowed()) || target.isInsideZone(ZoneId.TIMED_HUNTING))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING); final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHERE_SUMMONING_OR_TELEPORTING_IS_BLOCKED);
sm.addString(target.getName()); sm.addString(target.getName());
effector.sendPacket(sm); effector.sendPacket(sm);
return; return;

View File

@@ -112,7 +112,7 @@ public class TriggerHealPercentBySkill extends AbstractEffect
} }
SystemMessage sm; SystemMessage sm;
sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); sm = new SystemMessage(SystemMessageId.YOU_VE_RECOVERED_S1_HP);
sm.addInt((int) amount); sm.addInt((int) amount);
player.sendPacket(sm); player.sendPacket(sm);
} }

View File

@@ -68,7 +68,7 @@ public class CharmOfCourage implements IItemHandler
if (itemLevel < level) if (itemLevel < level)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addItemName(item.getId()); sm.addItemName(item.getId());
player.sendPacket(sm); player.sendPacket(sm);
return false; return false;

View File

@@ -69,7 +69,7 @@ public class EventItem implements IItemHandler
final int blockCheckerArena = castor.getBlockCheckerArena(); final int blockCheckerArena = castor.getBlockCheckerArena();
if (blockCheckerArena == -1) if (blockCheckerArena == -1)
{ {
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage msg = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
msg.addItemName(item); msg.addItemName(item);
castor.sendPacket(msg); castor.sendPacket(msg);
return false; return false;

View File

@@ -66,7 +66,7 @@ public class FatedSupportBox implements IItemHandler
// Characters that have gone through their 2nd class transfer/1st liberation will be able to open the Fated Support Box at level 40. // Characters that have gone through their 2nd class transfer/1st liberation will be able to open the Fated Support Box at level 40.
if ((player.getLevel() < 40) || player.isInCategory(CategoryType.FIRST_CLASS_GROUP) || ((race != Race.ERTHEIA) && player.isInCategory(CategoryType.SECOND_CLASS_GROUP))) if ((player.getLevel() < 40) || player.isInCategory(CategoryType.FIRST_CLASS_GROUP) || ((race != Race.ERTHEIA) && player.isInCategory(CategoryType.SECOND_CLASS_GROUP)))
{ {
player.sendPacket(new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET).addItemName(item)); player.sendPacket(new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET).addItemName(item));
return false; return false;
} }

View File

@@ -88,7 +88,7 @@ public class PetFood implements IItemHandler
return true; return true;
} }
} }
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addItemName(item); sm.addItemName(item);
player.sendPacket(sm); player.sendPacket(sm);
} }

View File

@@ -58,7 +58,7 @@ public class SummonItems extends ItemSkillsTemplate
if (player.isAttackingNow()) if (player.isAttackingNow())
{ {
player.sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_DURING_COMBAT); player.sendPacket(SystemMessageId.CANNOT_BE_SUMMONED_WHILE_IN_COMBAT);
return false; return false;
} }

View File

@@ -107,7 +107,7 @@ public class SocialAction implements IPlayerActionHandler
{ {
if (player != null) if (player != null)
{ {
player.sendPacket(SystemMessageId.THE_COUPLE_ACTION_WAS_DENIED); player.sendPacket(SystemMessageId.THE_COUPLE_ACTION_REQUEST_HAS_BEEN_DENIED);
player.onTransactionResponse(); player.onTransactionResponse();
} }
} }

View File

@@ -61,35 +61,35 @@ public class BuildCampSkillCondition implements ISkillCondition
final SystemMessage sm; final SystemMessage sm;
if ((castle == null) && (fort == null)) if ((castle == null) && (fort == null))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canCreateBase = false; canCreateBase = false;
} }
else if (((castle != null) && !castle.getSiege().isInProgress()) || ((fort != null) && !fort.getSiege().isInProgress())) else if (((castle != null) && !castle.getSiege().isInProgress()) || ((fort != null) && !fort.getSiege().isInProgress()))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canCreateBase = false; canCreateBase = false;
} }
else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()) == null)) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()) == null))) else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()) == null)) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()) == null)))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canCreateBase = false; canCreateBase = false;
} }
else if (!player.isClanLeader()) else if (!player.isClanLeader())
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canCreateBase = false; canCreateBase = false;
} }
else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= SiegeManager.getInstance().getFlagMaxCount())) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= FortSiegeManager.getInstance().getFlagMaxCount()))) else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= SiegeManager.getInstance().getFlagMaxCount())) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= FortSiegeManager.getInstance().getFlagMaxCount())))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canCreateBase = false; canCreateBase = false;

View File

@@ -59,12 +59,12 @@ public class CanSummonPetSkillCondition implements ISkillCondition
} }
else if ((player.getActiveTradeList() != null) || player.hasItemRequest() || (player.getPrivateStoreType() != PrivateStoreType.NONE)) else if ((player.getActiveTradeList() != null) || player.hasItemRequest() || (player.getPrivateStoreType() != PrivateStoreType.NONE))
{ {
player.sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_DURING_A_TRADE_OR_WHILE_USING_A_PRIVATE_STORE); player.sendPacket(SystemMessageId.CANNOT_BE_SUMMONED_WHILE_TRADING);
canSummon = false; canSummon = false;
} }
else if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player)) else if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player))
{ {
player.sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_DURING_COMBAT); player.sendPacket(SystemMessageId.CANNOT_BE_SUMMONED_WHILE_IN_COMBAT);
canSummon = false; canSummon = false;
} }
else if (player.isInAirShip()) else if (player.isInAirShip())

View File

@@ -56,7 +56,7 @@ public class OpCheckFlagSkillCondition implements ISkillCondition
final SystemMessage sm; final SystemMessage sm;
if ((fort == null) || (fort.getResidenceId() <= 0) || !fort.getSiege().isInProgress() || (fort.getSiege().getAttackerClan(player.getClan()) == null)) if ((fort == null) || (fort.getResidenceId() <= 0) || !fort.getSiege().isInProgress() || (fort.getSiege().getAttackerClan(player.getClan()) == null))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canTakeFort = false; canTakeFort = false;

View File

@@ -57,7 +57,7 @@ public class OpResurrectionSkillCondition implements ISkillCondition
canResurrect = false; canResurrect = false;
if (caster.isPlayer()) if (caster.isPlayer())
{ {
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage msg = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
msg.addSkillName(skill); msg.addSkillName(skill);
caster.sendPacket(msg); caster.sendPacket(msg);
} }
@@ -88,7 +88,7 @@ public class OpResurrectionSkillCondition implements ISkillCondition
canResurrect = false; canResurrect = false;
if (caster.isPlayer()) if (caster.isPlayer())
{ {
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage msg = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
msg.addSkillName(skill); msg.addSkillName(skill);
caster.sendPacket(msg); caster.sendPacket(msg);
} }

View File

@@ -65,7 +65,7 @@ public class OpSweeperSkillCondition implements ISkillCondition
} }
else else
{ {
sweeper.sendPacket(SystemMessageId.SWEEPER_FAILED_TARGET_NOT_SPOILED); sweeper.sendPacket(SystemMessageId.THE_SWEEPER_HAS_FAILED_AS_THE_TARGET_IS_NOT_SPOILED);
} }
} }
} }

View File

@@ -56,7 +56,7 @@ public class PossessHolythingSkillCondition implements ISkillCondition
SystemMessage sm; SystemMessage sm;
if ((castle == null) || (castle.getResidenceId() <= 0) || !castle.getSiege().isInProgress() || (castle.getSiege().getAttackerClan(player.getClan()) == null)) if ((castle == null) || (castle.getResidenceId() <= 0) || !castle.getSiege().isInProgress() || (castle.getSiege().getAttackerClan(player.getClan()) == null))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canTakeCastle = false; canTakeCastle = false;

View File

@@ -214,7 +214,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
if (player.isInCommandChannel()) if (player.isInCommandChannel())
{ {
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS); player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_AS_YOU_DON_T_MEET_THE_REQUIREMENTS);
return null; return null;
} }
@@ -251,7 +251,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
} }
else else
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
} }
if (player.getInstanceWorld() != null) if (player.getInstanceWorld() != null)

View File

@@ -515,7 +515,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
REGISTERED_PLAYERS.add(player); REGISTERED_PLAYERS.add(player);
player.setRegisteredOnEvent(true); player.setRegisteredOnEvent(true);
player.sendPacket(SystemMessageId.YOU_ARE_NOW_ON_THE_WAITING_LIST_YOU_WILL_AUTOMATICALLY_BE_TELEPORTED_WHEN_THE_TOURNAMENT_STARTS_AND_WILL_BE_REMOVED_FROM_THE_WAITING_LIST_IF_YOU_LOG_OUT_IF_YOU_CANCEL_REGISTRATION_WITHIN_THE_LAST_MINUTE_OF_ENTERING_THE_ARENA_AFTER_SIGNING_UP_30_TIMES_OR_MORE_OR_FORFEIT_AFTER_ENTERING_THE_ARENA_30_TIMES_OR_MORE_DURING_A_CYCLE_YOU_BECOME_INELIGIBLE_FOR_PARTICIPATION_IN_THE_CEREMONY_OF_CHAOS_UNTIL_THE_NEXT_CYCLE_ALL_THE_BUFFS_EXCEPT_THE_VITALITY_BUFF_WILL_BE_REMOVED_ONCE_YOU_ENTER_THE_ARENAS); player.sendPacket(SystemMessageId.YOU_ARE_NOW_ON_THE_WAITING_LIST_YOU_WILL_AUTOMATICALLY_BE_TELEPORTED_WHEN_THE_TOURNAMENT_STARTS_AND_WILL_BE_REMOVED_FROM_THE_WAITING_LIST_IF_YOU_LOG_OUT_IF_YOU_CANCEL_REGISTRATION_WITHIN_THE_LAST_MINUTE_OF_ENTERING_THE_ARENA_AFTER_SIGNING_UP_30_TIMES_OR_MORE_OR_FORFEIT_AFTER_ENTERING_THE_ARENA_30_TIMES_OR_MORE_DURING_A_CYCLE_YOU_BECOME_INELIGIBLE_FOR_PARTICIPATION_IN_THE_CEREMONY_OF_CHAOS_UNTIL_THE_NEXT_CYCLE_ALL_THE_BUFFS_EXCEPT_THE_VITALITY_BUFF_WILL_BE_REMOVED_ONCE_YOU_ENTER_THE_ARENAS);
player.sendPacket(SystemMessageId.EXCEPT_THE_VITALITY_BUFF_ALL_BUFFS_INCLUDING_ART_OF_SEDUCTION_WILL_BE_DELETED); player.sendPacket(SystemMessageId.ROSY_SEDUCTION_AND_ART_OF_SEDUCTION_BUFFS_WILL_BE_REMOVED_THE_VITALITY_BUFF_WILL_REMAIN);
player.sendPacket(ExCuriousHouseState.PREPARE_PACKET); player.sendPacket(ExCuriousHouseState.PREPARE_PACKET);
break; break;
} }

View File

@@ -124,7 +124,7 @@ public class CommandPost extends AbstractInstance
if (player.isInCommandChannel()) if (player.isInCommandChannel())
{ {
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS); player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_AS_YOU_DON_T_MEET_THE_REQUIREMENTS);
return null; return null;
} }
@@ -157,7 +157,7 @@ public class CommandPost extends AbstractInstance
} }
else else
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
} }
if (player.getInstanceWorld() != null) if (player.getInstanceWorld() != null)

View File

@@ -417,7 +417,7 @@ public class Kamaloka extends AbstractInstance
// player must be in party // player must be in party
if (party == null) if (party == null)
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
return false; return false;
} }
// ...and be party leader // ...and be party leader

View File

@@ -164,7 +164,7 @@ public class KrofinNest extends AbstractInstance
if (player.isInCommandChannel()) if (player.isInCommandChannel())
{ {
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS); player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_AS_YOU_DON_T_MEET_THE_REQUIREMENTS);
return null; return null;
} }
@@ -201,7 +201,7 @@ public class KrofinNest extends AbstractInstance
} }
else else
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
} }
if (player.getInstanceWorld() != null) if (player.getInstanceWorld() != null)

View File

@@ -98,7 +98,7 @@ public class NightmareKamaloka extends AbstractInstance
if (player.isInCommandChannel()) if (player.isInCommandChannel())
{ {
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS); player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_AS_YOU_DON_T_MEET_THE_REQUIREMENTS);
return null; return null;
} }
@@ -135,7 +135,7 @@ public class NightmareKamaloka extends AbstractInstance
} }
else else
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
} }
} }
else if ("SPAWN_BOSSES".equals(event)) else if ("SPAWN_BOSSES".equals(event))

View File

@@ -65,7 +65,7 @@ public class SpiritForest extends AbstractInstance
if (player.isInCommandChannel()) if (player.isInCommandChannel())
{ {
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS); player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_AS_YOU_DON_T_MEET_THE_REQUIREMENTS);
return null; return null;
} }
@@ -102,7 +102,7 @@ public class SpiritForest extends AbstractInstance
} }
else else
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
} }
} }
return null; return null;

View File

@@ -114,7 +114,7 @@ public abstract class AirShipController extends AbstractNpcAI
private static final int STARSTONE = 13277; private static final int STARSTONE = 13277;
private static final int SUMMON_COST = 5; private static final int SUMMON_COST = 5;
private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_YOU_DON_T_HAVE_ENOUGH_S1).addItemName(STARSTONE); private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_S1_TO_SUMMON_THE_AIRSHIP).addItemName(STARSTONE);
@Override @Override
public String onAdvEvent(String event, Npc npc, Player player) public String onAdvEvent(String event, Npc npc, Player player)
@@ -125,7 +125,7 @@ public abstract class AirShipController extends AbstractNpcAI
{ {
if (_dockedShip.isOwner(player)) if (_dockedShip.isOwner(player))
{ {
player.sendPacket(SystemMessageId.THE_CLAN_OWNED_AIRSHIP_ALREADY_EXISTS); player.sendPacket(SystemMessageId.YOUR_CLAN_ALREADY_HAS_AN_AIRSHIP);
} }
return null; return null;
} }
@@ -136,13 +136,13 @@ public abstract class AirShipController extends AbstractNpcAI
} }
if (!player.hasClanPrivilege(ClanPrivilege.CL_USE_FUNCTIONS)) if (!player.hasClanPrivilege(ClanPrivilege.CL_USE_FUNCTIONS))
{ {
player.sendPacket(SystemMessageId.AIRSHIP_SUMMON_LICENSE_REGISTRATION_CAN_ONLY_BE_DONE_BY_THE_CLAN_LEADER); player.sendPacket(SystemMessageId.THE_AIRSHIP_SUMMON_LICENSE_REGISTRATION_CAN_ONLY_BE_DONE_BY_THE_CLAN_LEADER);
return null; return null;
} }
final int ownerId = player.getClanId(); final int ownerId = player.getClanId();
if (!AirShipManager.getInstance().hasAirShipLicense(ownerId)) if (!AirShipManager.getInstance().hasAirShipLicense(ownerId))
{ {
player.sendPacket(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_EITHER_YOU_HAVE_NOT_REGISTERED_YOUR_AIRSHIP_LICENSE_OR_THE_AIRSHIP_HAS_NOT_YET_BEEN_SUMMONED); player.sendPacket(SystemMessageId.YOU_HAVEN_T_REGISTERED_YOUR_AIRSHIP_LICENSE_OR_YOUR_CLAN_DOESN_T_HAVE_IT);
return null; return null;
} }
if (AirShipManager.getInstance().hasAirShip(ownerId)) if (AirShipManager.getInstance().hasAirShip(ownerId))
@@ -233,7 +233,7 @@ public abstract class AirShipController extends AbstractNpcAI
} }
else if (player.isFlyingMounted()) else if (player.isFlyingMounted())
{ {
player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS); player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_THE_AIRSHIP_AS_YOU_DON_T_MEET_THE_REQUIREMENTS);
return null; return null;
} }
@@ -248,12 +248,12 @@ public abstract class AirShipController extends AbstractNpcAI
{ {
if ((player.getClan() == null) || (player.getClan().getLevel() < 5)) if ((player.getClan() == null) || (player.getClan().getLevel() < 5))
{ {
player.sendPacket(SystemMessageId.IN_ORDER_TO_ACQUIRE_AN_AIRSHIP_THE_CLAN_S_LEVEL_MUST_BE_LEVEL_5_OR_ABOVE); player.sendPacket(SystemMessageId.ONLY_CLANS_OF_LV_5_OR_HIGHER_CAN_GET_THE_AIRSHIP);
return null; return null;
} }
if (!player.isClanLeader()) if (!player.isClanLeader())
{ {
player.sendPacket(SystemMessageId.AIRSHIP_SUMMON_LICENSE_REGISTRATION_CAN_ONLY_BE_DONE_BY_THE_CLAN_LEADER); player.sendPacket(SystemMessageId.THE_AIRSHIP_SUMMON_LICENSE_REGISTRATION_CAN_ONLY_BE_DONE_BY_THE_CLAN_LEADER);
return null; return null;
} }
final int ownerId = player.getClanId(); final int ownerId = player.getClanId();
@@ -269,7 +269,7 @@ public abstract class AirShipController extends AbstractNpcAI
} }
AirShipManager.getInstance().registerLicense(ownerId); AirShipManager.getInstance().registerLicense(ownerId);
player.sendPacket(SystemMessageId.THE_AIRSHIP_SUMMON_LICENSE_HAS_BEEN_ENTERED_YOUR_CLAN_CAN_NOW_SUMMON_THE_AIRSHIP); player.sendPacket(SystemMessageId.THE_AIRSHIP_SUMMON_LICENSE_HAS_BEEN_REGISTERED_YOUR_CLAN_CAN_NOW_SUMMON_AN_AIRSHIP);
return null; return null;
} }
else else

View File

@@ -235,7 +235,7 @@ public class ItemCommissionManager
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {
player.sendPacket(SystemMessageId.THE_MAXIMUM_NUMBER_OF_AUCTION_HOUSE_ITEMS_FOR_REGISTRATION_IS_10); player.sendPacket(SystemMessageId.THE_MAXIMUM_NUMBER_OF_WORLD_TRADE_ITEMS_FOR_REGISTRATION_IS_10);
player.sendPacket(ExResponseCommissionRegister.FAILED); player.sendPacket(ExResponseCommissionRegister.FAILED);
return; return;
} }
@@ -338,7 +338,7 @@ public class ItemCommissionManager
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3)) if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{ {
player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE); player.sendPacket(SystemMessageId.TO_BUY_CANCEL_YOU_NEED_20_OF_FREE_WEIGHT_AND_10_OF_FREE_SLOTS_IN_YOUR_INVENTORY);
player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_THE_SALE); player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_THE_SALE);
player.sendPacket(ExResponseCommissionDelete.FAILED); player.sendPacket(ExResponseCommissionDelete.FAILED);
return; return;
@@ -389,7 +389,7 @@ public class ItemCommissionManager
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3)) if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{ {
player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE); player.sendPacket(SystemMessageId.TO_BUY_CANCEL_YOU_NEED_20_OF_FREE_WEIGHT_AND_10_OF_FREE_SLOTS_IN_YOUR_INVENTORY);
player.sendPacket(ExResponseCommissionBuyItem.FAILED); player.sendPacket(ExResponseCommissionBuyItem.FAILED);
return; return;
} }

View File

@@ -81,15 +81,15 @@ public class PetitionManager
currPetition.setState(PetitionState.IN_PROCESS); currPetition.setState(PetitionState.IN_PROCESS);
// Petition application accepted. (Send to Petitioner) // Petition application accepted. (Send to Petitioner)
currPetition.sendPetitionerPacket(new SystemMessage(SystemMessageId.PETITION_ACCEPTED)); currPetition.sendPetitionerPacket(new SystemMessage(SystemMessageId.YOUR_GLOBAL_SUPPORT_REQUEST_WAS_RECEIVED_2));
// Petition application accepted. Reciept No. is <ID> // Petition application accepted. Reciept No. is <ID>
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_RECEIPT_NO_IS_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_GLOBAL_SUPPORT_REQUEST_WAS_RECEIVED_REQUEST_NO_S1);
sm.addInt(currPetition.getId()); sm.addInt(currPetition.getId());
currPetition.sendResponderPacket(sm); currPetition.sendResponderPacket(sm);
// Petition consultation with <Player> underway. // Petition consultation with <Player> underway.
sm = new SystemMessage(SystemMessageId.STARTING_PETITION_CONSULTATION_WITH_C1); sm = new SystemMessage(SystemMessageId.A_GLOBAL_SUPPORT_CONSULTATION_C1_HAS_BEEN_STARTED);
sm.addString(currPetition.getPetitioner().getName()); sm.addString(currPetition.getPetitioner().getName());
currPetition.sendResponderPacket(sm); currPetition.sendResponderPacket(sm);

View File

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

View File

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

View File

@@ -395,7 +395,7 @@ public class CursedWeapon implements INamable
// Equip with the weapon // Equip with the weapon
_item = item; _item = item;
_player.getInventory().equipItem(_item); _player.getInventory().equipItem(_item);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1); SystemMessage sm = new SystemMessage(SystemMessageId.S1_EQUIPPED);
sm.addItemName(_item); sm.addItemName(_item);
_player.sendPacket(sm); _player.sendPacket(sm);

View File

@@ -320,7 +320,7 @@ public class HuntPass
_sayhasSustentionTask.cancel(true); _sayhasSustentionTask.cancel(true);
_sayhasSustentionTask = null; _sayhasSustentionTask = null;
} }
_user.sendPacket(new SystemMessage(SystemMessageId.SAYHA_S_GRACE_SUSTENTION_EFFECT_OF_THE_SEASON_PASS_IS_ACTIVATED_AVAILABLE_SAYHA_S_GRACE_SUSTENTION_TIME_IS_RUNNING)); _user.sendPacket(new SystemMessage(SystemMessageId.THE_MAXIMUM_NUMBER_OF_WORLD_TRADE_ITEMS_FOR_REGISTRATION_IS_10));
_sayhasSustentionTask = ThreadPool.schedule(this::onSayhaEndTime, Math.max(0, getAvailableSayhaTime() - getUsedSayhaTime()) * 1000L); _sayhasSustentionTask = ThreadPool.schedule(this::onSayhaEndTime, Math.max(0, getAvailableSayhaTime() - getUsedSayhaTime()) * 1000L);
} }
else else
@@ -331,7 +331,7 @@ public class HuntPass
_toggleStartTime = 0; _toggleStartTime = 0;
_sayhasSustentionTask.cancel(true); _sayhasSustentionTask.cancel(true);
_sayhasSustentionTask = null; _sayhasSustentionTask = null;
_user.sendPacket(new SystemMessage(SystemMessageId.SAYHA_S_GRACE_SUSTENTION_EFFECT_OF_THE_SEASON_PASS_HAS_BEEN_DEACTIVATED_THE_SUSTENTION_TIME_YOU_HAVE_DOES_NOT_DECREASE)); _user.sendPacket(new SystemMessage(SystemMessageId.THE_MAXIMUM_NUMBER_OF_WORLD_TRADE_ITEMS_FOR_REGISTRATION_IS_10));
} }
} }
} }

View File

@@ -76,14 +76,14 @@ public class Petition
else else
{ {
// Ending petition consultation with <Player>. // Ending petition consultation with <Player>.
SystemMessage sm = new SystemMessage(SystemMessageId.PETITION_CONSULTATION_WITH_C1_HAS_ENDED); SystemMessage sm = new SystemMessage(SystemMessageId.A_GLOBAL_SUPPORT_CONSULTATION_C1_HAS_BEEN_FINISHED);
sm.addString(_petitioner.getName()); sm.addString(_petitioner.getName());
_responder.sendPacket(sm); _responder.sendPacket(sm);
if (endState == PetitionState.PETITIONER_CANCEL) if (endState == PetitionState.PETITIONER_CANCEL)
{ {
// Receipt No. <ID> petition cancelled. // Receipt No. <ID> petition cancelled.
sm = new SystemMessage(SystemMessageId.PETITION_NO_S1_CANCELLED); sm = new SystemMessage(SystemMessageId.REQUEST_NO_S1_TO_THE_GLOBAL_SUPPORT_WAS_CANCELLED);
sm.addInt(_id); sm.addInt(_id);
_responder.sendPacket(sm); _responder.sendPacket(sm);
} }
@@ -93,7 +93,7 @@ public class Petition
// End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button // End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button
if ((_petitioner != null) && _petitioner.isOnline()) if ((_petitioner != null) && _petitioner.isOnline())
{ {
_petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_PLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); _petitioner.sendPacket(SystemMessageId.GLOBAL_SUPPORT_HAS_ALREADY_RESPONDED_TO_YOUR_REQUEST_PLEASE_GIVE_US_FEEDBACK_ON_THE_SERVICE_QUALITY);
_petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET); _petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET);
} }

View File

@@ -1052,7 +1052,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (getActingPlayer().inObserverMode()) if (getActingPlayer().inObserverMode())
{ {
sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE); sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_FUNCTION_IN_THE_OBSERVER_MODE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

View File

@@ -2274,13 +2274,13 @@ public class Player extends Playable
{ {
if (item.getEnchantLevel() > 0) if (item.getEnchantLevel() > 0)
{ {
sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(item.getEnchantLevel()); sm.addInt(item.getEnchantLevel());
sm.addItemName(item); sm.addItemName(item);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_UNEQUIPPED);
sm.addItemName(item); sm.addItemName(item);
} }
sendPacket(sm); sendPacket(sm);
@@ -2303,13 +2303,13 @@ public class Player extends Playable
{ {
if (item.getEnchantLevel() > 0) if (item.getEnchantLevel() > 0)
{ {
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1_S2); sm = new SystemMessage(SystemMessageId.S1_S2_EQUIPPED);
sm.addInt(item.getEnchantLevel()); sm.addInt(item.getEnchantLevel());
sm.addItemName(item); sm.addItemName(item);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_S1); sm = new SystemMessage(SystemMessageId.S1_EQUIPPED);
sm.addItemName(item); sm.addItemName(item);
} }
sendPacket(sm); sendPacket(sm);
@@ -2535,7 +2535,7 @@ public class Player extends Playable
} }
else else
{ {
sendPacket(SystemMessageId.CONGRATULATIONS_YOU_VE_COMPLETED_A_CLASS_TRANSFER); sendPacket(SystemMessageId.CONGRATULATIONS_YOU_VE_COMPLETED_THE_CLASS_CHANGE);
} }
// Remove class permitted hennas. // Remove class permitted hennas.
@@ -6122,13 +6122,13 @@ public class Player extends Playable
final Item unequippedItem = unequipped.get(0); final Item unequippedItem = unequipped.get(0);
if (unequippedItem.getEnchantLevel() > 0) if (unequippedItem.getEnchantLevel() > 0)
{ {
sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(unequippedItem.getEnchantLevel()); sm.addInt(unequippedItem.getEnchantLevel());
sm.addItemName(unequippedItem); sm.addItemName(unequippedItem);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_UNEQUIPPED);
sm.addItemName(unequippedItem); sm.addItemName(unequippedItem);
} }
sendPacket(sm); sendPacket(sm);
@@ -6163,13 +6163,13 @@ public class Player extends Playable
final Item unequippedItem = unequipped.get(0); final Item unequippedItem = unequipped.get(0);
if (unequippedItem.getEnchantLevel() > 0) if (unequippedItem.getEnchantLevel() > 0)
{ {
sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(unequippedItem.getEnchantLevel()); sm.addInt(unequippedItem.getEnchantLevel());
sm.addItemName(unequippedItem); sm.addItemName(unequippedItem);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_UNEQUIPPED);
sm.addItemName(unequippedItem); sm.addItemName(unequippedItem);
} }
sendPacket(sm); sendPacket(sm);
@@ -8726,7 +8726,7 @@ public class Player extends Playable
if (_observerMode) if (_observerMode)
{ {
sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE); sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_FUNCTION_IN_THE_OBSERVER_MODE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return false; return false;
} }
@@ -12190,13 +12190,13 @@ public class Player extends Playable
if (equippedItem.getEnchantLevel() > 0) if (equippedItem.getEnchantLevel() > 0)
{ {
sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(equippedItem.getEnchantLevel()); sm.addInt(equippedItem.getEnchantLevel());
sm.addItemName(equippedItem); sm.addItemName(equippedItem);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_UNEQUIPPED);
sm.addItemName(equippedItem); sm.addItemName(equippedItem);
} }
sendPacket(sm); sendPacket(sm);

View File

@@ -217,7 +217,7 @@ public class ControllableAirShip extends AirShip
if ((_fuel == 0) && (old > 0)) if ((_fuel == 0) && (old > 0))
{ {
broadcastToPassengers(new SystemMessage(SystemMessageId.THE_AIRSHIP_S_FUEL_EP_HAS_RUN_OUT_THE_AIRSHIP_S_SPEED_WILL_BE_GREATLY_DECREASED_IN_THIS_CONDITION)); broadcastToPassengers(new SystemMessage(SystemMessageId.THE_AIRSHIP_S_FUEL_EP_HAS_RUN_OUT_THE_AIRSHIP_S_SPEED_IS_GREATLY_DECREASED));
} }
else if (_fuel < LOW_FUEL) else if (_fuel < LOW_FUEL)
{ {

View File

@@ -2251,7 +2251,7 @@ public class Clan implements IIdentifiable, INamable
} }
if (_level < 5) if (_level < 5)
{ {
player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LV_5_OR_HIGHER);
return; return;
} }
if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY))
@@ -2295,7 +2295,7 @@ public class Clan implements IIdentifiable, INamable
{ {
if (_allyId == 0) if (_allyId == 0)
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_AN_ALLIANCE);
return; return;
} }
if (!player.isClanLeader() || (_clanId != _allyId)) if (!player.isClanLeader() || (_clanId != _allyId))

View File

@@ -120,11 +120,11 @@ public class ClanWar
} }
// System Message notification to clan members // System Message notification to clan members
SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1); SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_KILLED_BY_A_MEMBER_OF_THE_S2_CLAN_CLAN_REPUTATION_POINTS_1);
sm.addPcName(victim); sm.addPcName(victim);
sm.addString(killerClan.getName()); sm.addString(killerClan.getName());
victimClan.broadcastToOnlineMembers(sm); victimClan.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1); sm = new SystemMessage(SystemMessageId.A_MEMBER_OF_THE_S1_CLAN_IS_KILLED_BY_C2_CLAN_REPUTATION_POINTS_1);
sm.addString(victimClan.getName()); sm.addString(victimClan.getName());
sm.addPcName(killer); sm.addPcName(killer);
killerClan.broadcastToOnlineMembers(sm); killerClan.broadcastToOnlineMembers(sm);

View File

@@ -47,7 +47,7 @@ public class ConditionPlayerCallPc extends Condition
} }
else if (player.isInOlympiadMode()) else if (player.isInOlympiadMode())
{ {
player.sendPacket(SystemMessageId.YOU_MAY_NOT_SUMMON_FROM_YOUR_CURRENT_LOCATION); player.sendPacket(SystemMessageId.CANNOT_BE_SUMMONED_IN_THIS_LOCATION);
canCallPlayer = false; canCallPlayer = false;
} }
else if (player.inObserverMode()) else if (player.inObserverMode())

View File

@@ -63,35 +63,35 @@ public class ConditionPlayerCanCreateBase extends Condition
final SystemMessage sm; final SystemMessage sm;
if ((castle == null) && (fort == null)) if ((castle == null) && (fort == null))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canCreateBase = false; canCreateBase = false;
} }
else if (((castle != null) && !castle.getSiege().isInProgress()) || ((fort != null) && !fort.getSiege().isInProgress())) else if (((castle != null) && !castle.getSiege().isInProgress()) || ((fort != null) && !fort.getSiege().isInProgress()))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canCreateBase = false; canCreateBase = false;
} }
else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()) == null)) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()) == null))) else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()) == null)) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()) == null)))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canCreateBase = false; canCreateBase = false;
} }
else if (!player.isClanLeader()) else if (!player.isClanLeader())
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canCreateBase = false; canCreateBase = false;
} }
else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= SiegeManager.getInstance().getFlagMaxCount())) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= FortSiegeManager.getInstance().getFlagMaxCount()))) else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= SiegeManager.getInstance().getFlagMaxCount())) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= FortSiegeManager.getInstance().getFlagMaxCount())))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canCreateBase = false; canCreateBase = false;

View File

@@ -61,7 +61,7 @@ public class ConditionPlayerCanResurrect extends Condition
canResurrect = false; canResurrect = false;
if (effector.isPlayer()) if (effector.isPlayer())
{ {
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage msg = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
msg.addSkillName(skill); msg.addSkillName(skill);
effector.sendPacket(msg); effector.sendPacket(msg);
} }
@@ -132,7 +132,7 @@ public class ConditionPlayerCanResurrect extends Condition
canResurrect = false; canResurrect = false;
if (effector.isPlayer()) if (effector.isPlayer())
{ {
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage msg = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
msg.addSkillName(skill); msg.addSkillName(skill);
effector.sendPacket(msg); effector.sendPacket(msg);
} }

View File

@@ -76,7 +76,7 @@ public class ConditionPlayerCanSweep extends Condition
} }
else else
{ {
sweeper.sendPacket(SystemMessageId.SWEEPER_FAILED_TARGET_NOT_SPOILED); sweeper.sendPacket(SystemMessageId.THE_SWEEPER_HAS_FAILED_AS_THE_TARGET_IS_NOT_SPOILED);
} }
} }
} }

View File

@@ -58,7 +58,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
SystemMessage sm; SystemMessage sm;
if ((castle == null) || (castle.getResidenceId() <= 0) || !castle.getSiege().isInProgress() || (castle.getSiege().getAttackerClan(player.getClan()) == null)) if ((castle == null) || (castle.getResidenceId() <= 0) || !castle.getSiege().isInProgress() || (castle.getSiege().getAttackerClan(player.getClan()) == null))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canTakeCastle = false; canTakeCastle = false;

View File

@@ -58,7 +58,7 @@ public class ConditionPlayerCanTakeFort extends Condition
final SystemMessage sm; final SystemMessage sm;
if ((fort == null) || (fort.getResidenceId() <= 0) || !fort.getSiege().isInProgress() || (fort.getSiege().getAttackerClan(player.getClan()) == null)) if ((fort == null) || (fort.getResidenceId() <= 0) || !fort.getSiege().isInProgress() || (fort.getSiege().getAttackerClan(player.getClan()) == null))
{ {
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
canTakeFort = false; canTakeFort = false;

View File

@@ -52,7 +52,7 @@ public class ConditionTargetMyPartyExceptMe extends Condition
} }
else if (!player.isInParty() || !player.getParty().equals(effected.getParty())) else if (!player.isInParty() || !player.getParty().equals(effected.getParty()))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
isPartyMember = false; isPartyMember = false;

View File

@@ -31,7 +31,7 @@ public class ConditionParty extends Condition
public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml)
{ {
super(template, parameters, true, showMessageAndHtml); super(template, parameters, true, showMessageAndHtml);
setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); setSystemMessage(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
} }
@Override @Override

View File

@@ -344,7 +344,7 @@ public class AppearanceStone
{ {
if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL))
{ {
player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); player.sendPacket(SystemMessageId.HEAD_ACCESSORIES_ONLY);
return false; return false;
} }
break; break;
@@ -387,12 +387,12 @@ public class AppearanceStone
{ {
if (_weaponType != WeaponType.CROSSBOW) if (_weaponType != WeaponType.CROSSBOW)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_EXTRACTED);
return false; return false;
} }
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_EXTRACTED);
return false; return false;
} }
} }

View File

@@ -577,7 +577,7 @@ public class Olympiad extends ListenersContainer
player.sendPacket(new ExOlympiadInfo(0)); player.sendPacket(new ExOlympiadInfo(0));
} }
Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.BATTLES_IN_THE_OLYMPIAD_GAMES_ARE_NOW_OVER)); Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.THE_OLYMPIAD_IS_OVER));
LOGGER.info("Olympiad System: Olympiad games have ended."); LOGGER.info("Olympiad System: Olympiad games have ended.");
while (OlympiadGameManager.getInstance().isBattleStarted()) // cleared in game manager while (OlympiadGameManager.getInstance().isBattleStarted()) // cleared in game manager

View File

@@ -97,7 +97,7 @@ public class OlympiadManager
{ {
if (showMessage) if (showMessage)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_WAITING_LIST_FOR_THE_ALL_CLASS_BATTLE); final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_FOR_ALL_CLASS_BATTLES);
sm.addPcName(noble); sm.addPcName(noble);
player.sendPacket(sm); player.sendPacket(sm);
} }
@@ -158,7 +158,7 @@ public class OlympiadManager
} }
case NON_CLASSED: case NON_CLASSED:
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_WAITING_LIST_FOR_THE_ALL_CLASS_BATTLE); final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_FOR_ALL_CLASS_BATTLES);
sm.addPcName(noble); sm.addPcName(noble);
player.sendPacket(sm); player.sendPacket(sm);
break; break;

View File

@@ -532,7 +532,7 @@ public class Siege implements Siegable
_siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength()); _siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength());
ThreadPool.schedule(new ScheduleEndSiegeTask(_castle), 1000); // Prepare auto end task ThreadPool.schedule(new ScheduleEndSiegeTask(_castle), 1000); // Prepare auto end task
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_SIEGE_HAS_BEGUN);
sm.addCastleId(_castle.getResidenceId()); sm.addCastleId(_castle.getResidenceId());
Broadcast.toAllOnlinePlayers(sm); Broadcast.toAllOnlinePlayers(sm);
Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17")); Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17"));

View File

@@ -311,7 +311,7 @@ public class BuffInfo
// When effects are initialized, the successfully landed. // When effects are initialized, the successfully landed.
if (!_hideStartMessage && _effected.isPlayer() && !_skill.isHidingMessages() && !_skill.isAura()) if (!_hideStartMessage && _effected.isPlayer() && !_skill.isHidingMessages() && !_skill.isAura())
{ {
final SystemMessage sm = new SystemMessage(_skill.isToggle() ? SystemMessageId.YOU_VE_USED_S1 : SystemMessageId.S1_S_EFFECT_CAN_BE_FELT); final SystemMessage sm = new SystemMessage(_skill.isToggle() ? SystemMessageId.YOU_VE_USED_S1 : SystemMessageId.YOU_FEEL_THE_S1_EFFECT);
sm.addSkillName(_skill); sm.addSkillName(_skill);
_effected.sendPacket(sm); _effected.sendPacket(sm);
} }

View File

@@ -1053,7 +1053,7 @@ public class Skill implements IIdentifiable
if (creature.isPlayer() && creature.getActingPlayer().isMounted() && isBad() && !MountEnabledSkillList.contains(_id)) if (creature.isPlayer() && creature.getActingPlayer().isMounted() && isBad() && !MountEnabledSkillList.contains(_id))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(_id); sm.addSkillName(_id);
creature.sendPacket(sm); creature.sendPacket(sm);
return false; return false;
@@ -1063,7 +1063,7 @@ public class Skill implements IIdentifiable
{ {
if (sendMessage && !((creature == object) && isBad())) // Self targeted bad skills should not send a message. if (sendMessage && !((creature == object) && isBad())) // Self targeted bad skills should not send a message.
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(_id); sm.addSkillName(_id);
creature.sendPacket(sm); creature.sendPacket(sm);
} }

View File

@@ -1136,7 +1136,7 @@ public class SkillCaster implements Runnable
// Check if not in AirShip // Check if not in AirShip
if (player.isInAirShip() && !skill.hasEffectType(EffectType.REFUEL_AIRSHIP)) if (player.isInAirShip() && !skill.hasEffectType(EffectType.REFUEL_AIRSHIP))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addSkillName(skill); sm.addSkillName(skill);
player.sendPacket(sm); player.sendPacket(sm);
return false; return false;

View File

@@ -621,7 +621,7 @@ public class Formulas
{ {
case SHIELD_DEFENSE_SUCCEED: case SHIELD_DEFENSE_SUCCEED:
{ {
enemy.sendPacket(SystemMessageId.YOUR_SHIELD_DEFENSE_HAS_SUCCEEDED); enemy.sendPacket(SystemMessageId.YOU_VE_BLOCKED_THE_ATTACK);
break; break;
} }
case SHIELD_DEFENSE_PERFECT_BLOCK: case SHIELD_DEFENSE_PERFECT_BLOCK:

View File

@@ -68,7 +68,7 @@ public class Action implements ClientPacket
if (player.inObserverMode()) if (player.inObserverMode())
{ {
player.sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE); player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_FUNCTION_IN_THE_OBSERVER_MODE);
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

View File

@@ -49,13 +49,13 @@ public class AllyDismiss implements ClientPacket
} }
if (player.getClan() == null) if (player.getClan() == null)
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION); player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_2);
return; return;
} }
final Clan leaderClan = player.getClan(); final Clan leaderClan = player.getClan();
if (leaderClan.getAllyId() == 0) if (leaderClan.getAllyId() == 0)
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_AN_ALLIANCE);
return; return;
} }
if (!player.isClanLeader() || (leaderClan.getId() != leaderClan.getAllyId())) if (!player.isClanLeader() || (leaderClan.getId() != leaderClan.getAllyId()))

View File

@@ -35,7 +35,7 @@ public class AllyLeave implements ClientPacket
if (player.getClan() == null) if (player.getClan() == null)
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION); player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_2);
return; return;
} }
if (!player.isClanLeader()) if (!player.isClanLeader())
@@ -46,7 +46,7 @@ public class AllyLeave implements ClientPacket
final Clan clan = player.getClan(); final Clan clan = player.getClan();
if (clan.getAllyId() == 0) if (clan.getAllyId() == 0)
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_AN_ALLIANCE);
return; return;
} }
if (clan.getId() == clan.getAllyId()) if (clan.getId() == clan.getAllyId())

View File

@@ -60,7 +60,7 @@ public class AnswerCoupleAction implements ClientPacket
if (_answer == 0) // cancel if (_answer == 0) // cancel
{ {
target.sendPacket(SystemMessageId.THE_COUPLE_ACTION_WAS_DENIED); target.sendPacket(SystemMessageId.THE_COUPLE_ACTION_REQUEST_HAS_BEEN_DENIED);
} }
else if (_answer == 1) // approve else if (_answer == 1) // approve
{ {

View File

@@ -120,7 +120,7 @@ public class DlgAnswer implements ClientPacket
{ {
player.reviveAnswer(_answer); player.reviveAnswer(_answer);
} }
else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId()) else if (_messageId == SystemMessageId.C1_WANTS_TO_SUMMON_YOU_TO_S2_ACCEPT.getId())
{ {
final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class); final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId)) if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))

View File

@@ -138,7 +138,7 @@ public class MoveToLocationAirShip implements ClientPacket
{ {
if (fuelConsumption > ship.getFuel()) if (fuelConsumption > ship.getFuel())
{ {
player.sendPacket(SystemMessageId.YOUR_AIRSHIP_CANNOT_TELEPORT_BECAUSE_DUE_TO_LOW_FUEL); player.sendPacket(SystemMessageId.NOT_ENOUGH_FUEL_FOR_TELEPORTATION);
return; return;
} }
ship.setFuel(ship.getFuel() - fuelConsumption); ship.setFuel(ship.getFuel() - fuelConsumption);

View File

@@ -215,7 +215,7 @@ public class MultiSellChoose implements ClientPacket
// Check if clan exists for clan reputation products. // Check if clan exists for clan reputation products.
if ((clan == null) && (SpecialItemType.CLAN_REPUTATION.getClientId() == product.getId())) if ((clan == null) && (SpecialItemType.CLAN_REPUTATION.getClientId() == product.getId()))
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION); player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_2);
return; return;
} }
continue; continue;
@@ -264,7 +264,7 @@ public class MultiSellChoose implements ClientPacket
// Check for enchanted item if its present in the inventory. // Check for enchanted item if its present in the inventory.
if ((itemEnchantment != null) && (inventory.getItemByObjectId(itemEnchantment.getObjectId()) == null)) if ((itemEnchantment != null) && (inventory.getItemByObjectId(itemEnchantment.getObjectId()) == null))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_NEED_A_N_S1); final SystemMessage sm = new SystemMessage(SystemMessageId.REQUIRED_S1);
sm.addItemName(itemEnchantment.getItem().getId()); sm.addItemName(itemEnchantment.getItem().getId());
player.sendPacket(sm); player.sendPacket(sm);
return; return;
@@ -304,7 +304,7 @@ public class MultiSellChoose implements ClientPacket
if (found < ingredient.getCount()) if (found < ingredient.getCount())
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_NEED_A_N_S1); final SystemMessage sm = new SystemMessage(SystemMessageId.REQUIRED_S1);
sm.addString("+" + ingredient.getEnchantmentLevel() + " " + ItemTable.getInstance().getTemplate(ingredient.getId()).getName()); sm.addString("+" + ingredient.getEnchantmentLevel() + " " + ItemTable.getInstance().getTemplate(ingredient.getId()).getName());
player.sendPacket(sm); player.sendPacket(sm);
return; return;
@@ -392,7 +392,7 @@ public class MultiSellChoose implements ClientPacket
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_NEED_A_N_S1); final SystemMessage sm = new SystemMessage(SystemMessageId.REQUIRED_S1);
sm.addItemName(ingredient.getId()); sm.addItemName(ingredient.getId());
player.sendPacket(sm); player.sendPacket(sm);
return; return;
@@ -413,7 +413,7 @@ public class MultiSellChoose implements ClientPacket
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_NEED_A_N_S1); final SystemMessage sm = new SystemMessage(SystemMessageId.REQUIRED_S1);
sm.addItemName(ingredient.getId()); sm.addItemName(ingredient.getId());
player.sendPacket(sm); player.sendPacket(sm);
return; return;
@@ -638,7 +638,7 @@ public class MultiSellChoose implements ClientPacket
{ {
if (clan == null) if (clan == null)
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION); player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_2);
return false; return false;
} }
else if (!player.isClanLeader()) else if (!player.isClanLeader())

View File

@@ -96,7 +96,7 @@ public class RequestAllyInfo implements ClientPacket
} }
else else
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_AN_ALLIANCE);
} }
} }
} }

View File

@@ -92,7 +92,7 @@ public class RequestBlock implements ClientPacket
if (targetAL > 0) if (targetAL > 0)
{ {
// Cannot block a GM character. // Cannot block a GM character.
player.sendPacket(SystemMessageId.YOU_MAY_NOT_IMPOSE_A_BLOCK_ON_A_GM); player.sendPacket(SystemMessageId.YOU_CANNOT_BAN_A_GM);
return; return;
} }

View File

@@ -217,13 +217,13 @@ public class RequestCrystallizeItem implements ClientPacket
if (itemToRemove.getEnchantLevel() > 0) if (itemToRemove.getEnchantLevel() > 0)
{ {
sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(itemToRemove.getEnchantLevel()); sm.addInt(itemToRemove.getEnchantLevel());
sm.addItemName(itemToRemove); sm.addItemName(itemToRemove);
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_UNEQUIPPED);
sm.addItemName(itemToRemove); sm.addItemName(itemToRemove);
} }
player.sendPacket(sm); player.sendPacket(sm);

View File

@@ -180,14 +180,14 @@ public class RequestDestroyItem implements ClientPacket
{ {
if (itemToRemove.getEnchantLevel() > 0) if (itemToRemove.getEnchantLevel() > 0)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(itemToRemove.getEnchantLevel()); sm.addInt(itemToRemove.getEnchantLevel());
sm.addItemName(itemToRemove); sm.addItemName(itemToRemove);
player.sendPacket(sm); player.sendPacket(sm);
} }
else else
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_UNEQUIPPED);
sm.addItemName(itemToRemove); sm.addItemName(itemToRemove);
player.sendPacket(sm); player.sendPacket(sm);
} }

View File

@@ -54,7 +54,7 @@ public class RequestJoinAlly implements ClientPacket
final Clan clan = player.getClan(); final Clan clan = player.getClan();
if (clan == null) if (clan == null)
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION); player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_2);
return; return;
} }

View File

@@ -142,7 +142,7 @@ public class RequestJoinParty implements ClientPacket
if (BlockList.isBlocked(target, requestor)) if (BlockList.isBlocked(target, requestor))
{ {
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST); sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_THEIR_IGNORE_LIST);
sm.addString(target.getName()); sm.addString(target.getName());
requestor.sendPacket(sm); requestor.sendPacket(sm);
return; return;

View File

@@ -52,7 +52,7 @@ public class RequestOustPledgeMember implements ClientPacket
} }
if (player.getClan() == null) if (player.getClan() == null)
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION); player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_2);
return; return;
} }
if (!player.hasClanPrivilege(ClanPrivilege.CL_DISMISS)) if (!player.hasClanPrivilege(ClanPrivilege.CL_DISMISS))

View File

@@ -70,7 +70,7 @@ public class RequestPetUseItem implements ClientPacket
if (player.isAlikeDead() || pet.isDead()) if (player.isAlikeDead() || pet.isDead())
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addItemName(item); sm.addItemName(item);
player.sendPacket(sm); player.sendPacket(sm);
return; return;

View File

@@ -69,26 +69,26 @@ public class RequestPetition implements ClientPacket
if (!PetitionManager.getInstance().isPetitioningAllowed()) if (!PetitionManager.getInstance().isPetitioningAllowed())
{ {
player.sendPacket(SystemMessageId.THE_GAME_CLIENT_ENCOUNTERED_AN_ERROR_AND_WAS_UNABLE_TO_CONNECT_TO_THE_PETITION_SERVER); player.sendPacket(SystemMessageId.UNABLE_TO_CONNECT_TO_THE_GLOBAL_SUPPORT_SERVER);
return; return;
} }
if (PetitionManager.getInstance().isPlayerPetitionPending(player)) if (PetitionManager.getInstance().isPlayerPetitionPending(player))
{ {
player.sendPacket(SystemMessageId.YOU_MAY_ONLY_SUBMIT_ONE_PETITION_ACTIVE_AT_A_TIME); player.sendPacket(SystemMessageId.YOUR_GLOBAL_SUPPORT_REQUEST_WAS_RECEIVED);
return; return;
} }
if (PetitionManager.getInstance().getPendingPetitionCount() == Config.MAX_PETITIONS_PENDING) if (PetitionManager.getInstance().getPendingPetitionCount() == Config.MAX_PETITIONS_PENDING)
{ {
player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_EU_4GAMESUPPORT_COM); player.sendPacket(SystemMessageId.UNABLE_TO_SEND_YOUR_REQUEST_TO_THE_GLOBAL_SUPPORT_PLEASE_TRY_AGAIN_LATER);
return; return;
} }
final int totalPetitions = PetitionManager.getInstance().getPlayerTotalPetitionCount(player) + 1; final int totalPetitions = PetitionManager.getInstance().getPlayerTotalPetitionCount(player) + 1;
if (totalPetitions > Config.MAX_PETITIONS_PER_PLAYER) if (totalPetitions > Config.MAX_PETITIONS_PER_PLAYER)
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_THE_MAXIMUM_NUMBER_OF_PETITIONS_S1_TODAY_YOU_CANNOT_SUBMIT_MORE); final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_MAXIMUM_NUMBER_OF_S1_GLOBAL_SUPPORT_REQUESTS_TODAY_YOU_CANNOT_SUBMIT_MORE_REQUESTS);
sm.addInt(totalPetitions); sm.addInt(totalPetitions);
player.sendPacket(sm); player.sendPacket(sm);
return; return;
@@ -96,21 +96,21 @@ public class RequestPetition implements ClientPacket
if (_content.length() > 255) if (_content.length() > 255)
{ {
player.sendPacket(SystemMessageId.THE_PETITION_CAN_CONTAIN_UP_TO_800_CHARACTERS); player.sendPacket(SystemMessageId.YOUR_GLOBAL_SUPPORT_REQUEST_CAN_CONTAIN_UP_TO_800_CHARACTERS);
return; return;
} }
final int petitionId = PetitionManager.getInstance().submitPetition(player, _content, _type); final int petitionId = PetitionManager.getInstance().submitPetition(player, _content, _type);
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_RECEIPT_NO_IS_S1); SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_GLOBAL_SUPPORT_REQUEST_WAS_RECEIVED_REQUEST_NO_S1);
sm.addInt(petitionId); sm.addInt(petitionId);
player.sendPacket(sm); player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_S1_PETITION_S_YOU_MAY_SUBMIT_S2_MORE_PETITION_S_TODAY); sm = new SystemMessage(SystemMessageId.SUPPORT_RECEIVED_S1_TIME_S_GLOBAL_SUPPORT_REQUESTS_LEFT_FOR_TODAY_S2);
sm.addInt(totalPetitions); sm.addInt(totalPetitions);
sm.addInt(Config.MAX_PETITIONS_PER_PLAYER - totalPetitions); sm.addInt(Config.MAX_PETITIONS_PER_PLAYER - totalPetitions);
player.sendPacket(sm); player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.THERE_ARE_S1_PETITIONS_CURRENTLY_ON_THE_WAITING_LIST); sm = new SystemMessage(SystemMessageId.S1_USERS_ARE_IN_LINE_TO_GET_THE_GLOBAL_SUPPORT);
sm.addInt(PetitionManager.getInstance().getPendingPetitionCount()); sm.addInt(PetitionManager.getInstance().getPendingPetitionCount());
player.sendPacket(sm); player.sendPacket(sm);
} }

View File

@@ -54,7 +54,7 @@ public class RequestPetitionCancel implements ClientPacket
} }
else else
{ {
player.sendPacket(SystemMessageId.YOUR_PETITION_IS_BEING_PROCESSED); player.sendPacket(SystemMessageId.YOUR_GLOBAL_SUPPORT_REQUEST_IS_BEING_PROCESSED);
} }
} }
else if (PetitionManager.getInstance().isPlayerPetitionPending(player)) else if (PetitionManager.getInstance().isPlayerPetitionPending(player))
@@ -62,7 +62,7 @@ public class RequestPetitionCancel implements ClientPacket
if (PetitionManager.getInstance().cancelActivePetition(player)) if (PetitionManager.getInstance().cancelActivePetition(player))
{ {
final int numRemaining = Config.MAX_PETITIONS_PER_PLAYER - PetitionManager.getInstance().getPlayerTotalPetitionCount(player); final int numRemaining = Config.MAX_PETITIONS_PER_PLAYER - PetitionManager.getInstance().getPlayerTotalPetitionCount(player);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_PETITION_WAS_CANCELED_YOU_MAY_SUBMIT_S1_MORE_PETITION_S_TODAY); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_GLOBAL_SUPPORT_REQUEST_HAS_BEEN_REVOKED_NUMBER_OR_REQUESTS_YOU_CAN_SEND_S1);
sm.addString(String.valueOf(numRemaining)); sm.addString(String.valueOf(numRemaining));
player.sendPacket(sm); player.sendPacket(sm);
@@ -72,12 +72,12 @@ public class RequestPetitionCancel implements ClientPacket
} }
else else
{ {
player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_PETITION_PLEASE_TRY_AGAIN_LATER); player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_YOUR_GLOBAL_SUPPORT_REQUEST_PLEASE_TRY_AGAIN_LATER);
} }
} }
else else
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_NOT_SUBMITTED_A_PETITION); player.sendPacket(SystemMessageId.GLOBAL_SUPPORT_DOES_NOT_ACCEPT_REQUESTS_AT_THE_MOMENT);
} }
} }
} }

View File

@@ -167,7 +167,7 @@ public class RequestRecipeItemMakeSelf implements ClientPacket
{ {
if (craftingCritical) if (craftingCritical)
{ {
player.sendPacket(SystemMessageId.CRAFTING_CRITICAL); player.sendPacket(SystemMessageId.CRITICAL_CRAFT);
} }
} }
else // Failed craft. else // Failed craft.

View File

@@ -211,7 +211,7 @@ public class RequestRecipeShopMakeItem implements ClientPacket
{ {
if (craftingCritical) if (craftingCritical)
{ {
player.sendPacket(SystemMessageId.CRAFTING_CRITICAL); player.sendPacket(SystemMessageId.CRITICAL_CRAFT);
} }
if (craftedItem.getCount() > 1) if (craftedItem.getCount() > 1)
{ {

View File

@@ -108,12 +108,12 @@ public class RequestUnEquipItem implements ClientPacket
final Item unequippedItem = unequipped.get(0); final Item unequippedItem = unequipped.get(0);
if (unequippedItem.getEnchantLevel() > 0) if (unequippedItem.getEnchantLevel() > 0)
{ {
sm = new SystemMessage(SystemMessageId.ITEM_S1_S2_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
sm.addInt(unequippedItem.getEnchantLevel()); sm.addInt(unequippedItem.getEnchantLevel());
} }
else else
{ {
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); sm = new SystemMessage(SystemMessageId.S1_UNEQUIPPED);
} }
sm.addItemName(unequippedItem); sm.addItemName(unequippedItem);
player.sendPacket(sm); player.sendPacket(sm);

View File

@@ -40,7 +40,7 @@ public class RequestWithdrawalPledge implements ClientPacket
} }
if (player.getClan() == null) if (player.getClan() == null)
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION); player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_2);
return; return;
} }
if (player.isClanLeader()) if (player.isClanLeader())

View File

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

View File

@@ -130,7 +130,7 @@ public class UseItem implements ClientPacket
// Char cannot use item when dead // Char cannot use item when dead
if (player.isDead() || !player.getInventory().canManipulateWithItemId(item.getId())) if (player.isDead() || !player.getInventory().canManipulateWithItemId(item.getId()))
{ {
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_THE_FUNCTION_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
sm.addItemName(item); sm.addItemName(item);
player.sendPacket(sm); player.sendPacket(sm);
return; return;

View File

@@ -169,7 +169,7 @@ public class RequestAlchemyConversion implements ClientPacket
if (player.getInventory().getInventoryItemCount(ingredient.getId(), -1) < (ingredient.getCount() * _craftTimes)) if (player.getInventory().getInventoryItemCount(ingredient.getId(), -1) < (ingredient.getCount() * _craftTimes))
{ {
player.sendPacket(new ExAlchemyConversion(0, 0)); player.sendPacket(new ExAlchemyConversion(0, 0));
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_MATERIALS_TO_PERFORM_THAT_ACTION_2); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_MATERIALS_TO_PERFORM_THAT_ACTION);
return; return;
} }
} }

View File

@@ -149,7 +149,7 @@ public class RequestAlchemyTryMixCube implements ClientPacket
final long price = itemInstance.getReferencePrice(); final long price = itemInstance.getReferencePrice();
if (itemInstance.getReferencePrice() == 0) if (itemInstance.getReferencePrice() == 0)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_COMBINED); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_IN_COMPOUNDING);
player.sendPacket(new ExTryMixCube(TryMixCubeType.FAIL_ITEM_WRONG)); player.sendPacket(new ExTryMixCube(TryMixCubeType.FAIL_ITEM_WRONG));
return; return;
} }

View File

@@ -76,7 +76,7 @@ public class RequestVipAttendanceCheck implements ClientPacket
final long slots = itemTemplate.isStackable() ? 1 : reward.getCount(); final long slots = itemTemplate.isStackable() ? 1 : reward.getCount();
if (!player.getInventory().validateWeight(weight) || !player.getInventory().validateCapacity(slots)) if (!player.getInventory().validateWeight(weight) || !player.getInventory().validateCapacity(slots))
{ {
player.sendPacket(SystemMessageId.THE_ATTENDANCE_REWARD_CANNOT_BE_RECEIVED_BECAUSE_THE_INVENTORY_WEIGHT_QUANTITY_LIMIT_HAS_BEEN_EXCEEDED); player.sendPacket(SystemMessageId.THE_ATTENDANCE_REWARD_CANNOT_BE_RECEIVED_AS_YOUR_INVENTORY_S_WEIGHT_SLOT_LIMIT_HAS_BEEN_EXCEEDED);
return; return;
} }

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