Updated messages according to client.

This commit is contained in:
MobiusDevelopment
2019-09-27 16:57:40 +00:00
parent bf322b07e1
commit b22969aa50
94 changed files with 5440 additions and 3933 deletions

View File

@@ -61,11 +61,11 @@ public class CemeteryMonsters extends AbstractNpcAI
NpcStringId.DO_NOT_DEFILE_THIS_PLACE_WITH_YOUR_PRESENCE,
NpcStringId.HEH_INTERESTING_TRICK_YOU_USE_THERE,
NpcStringId.I_WILL_REMEMBER_YOU,
NpcStringId.I_WON_T_BEG_FOR_MY_LIFE_DO_WHAT_YOU_WILL,
NpcStringId.I_WILL_NOT_LOSE,
NpcStringId.BEHOLD_MY_POWER,
NpcStringId.HIS_MAJESTY_TRAVIS_HAS_ORDERED_IMMEDIATE_EXECUTION,
NpcStringId.ARE_YOU_TRYING_TO_MAKE_ME_DIE_A_SECOND_DEATH,
NpcStringId.WHAT_FOOLISHNESS,
NpcStringId.HOW_DARE_YOU_TRY_TO_HARM_ME_WITH_YOUR_EVIL_SCHEMES_2,
NpcStringId.YOU_IDIOT_2,
NpcStringId.FOOL,
NpcStringId.REMEMBER_OUR_HISTORY_OUR_GLORIOUS_HISTORY,
NpcStringId.WHO_ARE_YOU_YOU_WEREN_T_HERE_BEFORE,

View File

@@ -69,7 +69,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
@Override
public String onKill(Npc npc, PlayerInstance player, boolean isSummon)
{
final NpcStringId msg = getRandomBoolean() ? NpcStringId.UGH_A_CURSE_UPON_YOU : NpcStringId.I_REALLY_DIDN_T_WANT_TO_FIGHT;
final NpcStringId msg = getRandomBoolean() ? NpcStringId.A_CURSE_UPON_YOU_2 : NpcStringId.I_REALLY_DIDN_T_WANT_TO_FIGHT;
npc.broadcastSay(ChatType.NPC_GENERAL, msg);
cancelQuestTimer("say", npc, null);
cancelQuestTimer("reward", npc, player);

View File

@@ -93,7 +93,7 @@ public class Rooney extends AbstractNpcAI
{
case 1:
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HURRY_HURRY);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HURRY);
break;
}
case 2:

View File

@@ -126,7 +126,7 @@ public class Theorn extends AbstractNpcAI
if ((player != null) && !player.isDead() && (player.getEffectList().getBuffInfoBySkillId(REWARD_BUFF_X2) != null))
{
addExpAndSp(player, 0, 1000000);
showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X_2, ExShowScreenMessage.TOP_CENTER, 5000);
showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X2, ExShowScreenMessage.TOP_CENTER, 5000);
player.getEffectList().stopEffects(AbnormalType.STAR_AGATHION_EXP_SP_BUFF1);
}
break;
@@ -136,7 +136,7 @@ public class Theorn extends AbstractNpcAI
if ((player != null) && !player.isDead() && (player.getEffectList().getBuffInfoBySkillId(REWARD_BUFF_X4) != null))
{
addExpAndSp(player, 0, 2000000);
showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X_4, ExShowScreenMessage.TOP_CENTER, 5000);
showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X4, ExShowScreenMessage.TOP_CENTER, 5000);
player.getEffectList().stopEffects(AbnormalType.STAR_AGATHION_EXP_SP_BUFF1);
}
break;
@@ -146,7 +146,7 @@ public class Theorn extends AbstractNpcAI
if ((player != null) && !player.isDead() && (player.getEffectList().getBuffInfoBySkillId(REWARD_BUFF_X8) != null))
{
addExpAndSp(player, 0, 4000000);
showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X_8, ExShowScreenMessage.TOP_CENTER, 5000);
showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X8, ExShowScreenMessage.TOP_CENTER, 5000);
player.getEffectList().stopEffects(AbnormalType.STAR_AGATHION_EXP_SP_BUFF1);
}
break;
@@ -156,7 +156,7 @@ public class Theorn extends AbstractNpcAI
if ((player != null) && !player.isDead() && (player.getEffectList().getBuffInfoBySkillId(REWARD_BUFF_X16) != null))
{
addExpAndSp(player, 0, 8000000);
showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X_16, ExShowScreenMessage.TOP_CENTER, 5000);
showOnScreenMsg(player, NpcStringId.YOU_HAVE_ACQUIRED_SP_X16, ExShowScreenMessage.TOP_CENTER, 5000);
player.getEffectList().stopEffects(AbnormalType.STAR_AGATHION_EXP_SP_BUFF1);
}
break;

View File

@@ -71,7 +71,7 @@ public class BloodySuccubus extends AbstractNpcAI
{
NpcStringId.FOR_THE_GODDESS,
NpcStringId.YOU_WILL_DIE,
NpcStringId.DIE_2,
NpcStringId.DIE,
NpcStringId.YOU_WILL_BE_DESTROYED,
NpcStringId.OOOOH,
NpcStringId.DO_NOT_INTERFERE

View File

@@ -475,7 +475,7 @@ public class PrimevalIsle extends AbstractNpcAI
}
else
{
showOnScreenMsg(player, NpcStringId.THE_DEINONYCHUS_MESOZOIC_STONE_CANNOT_BE_OBTAINED_WHEN_INVENTORY_WEIGHT_VOLUME_IS_AT_80_OR_MORE, 2, 6000);
showOnScreenMsg(player, NpcStringId.WHEN_INVENTORY_WEIGHT_NUMBER_ARE_MORE_THAN_80_THE_LIFE_STONE_FROM_THE_BEGINNING_CANNOT_BE_ACQUIRED, 2, 6000);
}
}
return super.onKill(npc, killer, isSummon);

View File

@@ -247,7 +247,7 @@ public class AwakeningMaster extends AbstractNpcAI
if (!player.isInventoryUnder80(false))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_AWAKEN_DUE_TO_YOUR_CURRENT_INVENTORY_WEIGHT_PLEASE_REDUCE_YOUR_INVENTORY_WEIGHT_AND_TRY_AGAIN_DWARVES_MUST_BE_AT_20_OR_BELOW_THE_WEIGHT_MAX_TO_AWAKEN);
player.sendPacket(SystemMessageId.YOU_CANNOT_AWAKEN_DUE_TO_YOUR_CURRENT_INVENTORY_WEIGHT_PLEASE_ORGANIZE_YOUR_INVENTORY_AND_TRY_AGAIN_DWARVEN_CHARACTERS_MUST_BE_AT_20_OR_BELOW_THE_INVENTORY_MAX_TO_AWAKEN);
return;
}

View File

@@ -63,7 +63,7 @@ public class BoyAndGirl extends AbstractNpcAI
}
else if (event.equals("NPC_SHOUT"))
{
npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WEEE : NpcStringId.BOYS_ARE_SO_ANNOYING);
npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WOW_2 : NpcStringId.BOYS_ARE_SO_ANNOYING);
startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
}
return super.onAdvEvent(event, npc, player);

View File

@@ -506,7 +506,7 @@ public class Raina extends AbstractNpcAI
player.setActiveClass(player.getTotalSubClasses());
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.NEW_SLOT_USED));
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
break;
}
@@ -571,7 +571,7 @@ public class Raina extends AbstractNpcAI
player.setActiveClass(classIndex);
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
}
break;
}
@@ -648,7 +648,7 @@ public class Raina extends AbstractNpcAI
{
player.setActiveClass(player.getTotalSubClasses());
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.NEW_SLOT_USED));
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
player.sendPacket(new AcquireSkillList(player));

View File

@@ -274,7 +274,7 @@ public class Baium extends AbstractNpcAI
{
if (players.isHero())
{
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.YOU_DARE_CHALLENGE_ME_AND_MY_DARK_POWERS_S1_HOW_FOOLISH, 2, 4000, players.getName()));
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.NOT_EVEN_THE_GODS_THEMSELVES_COULD_TOUCH_ME_BUT_YOU_S1_YOU_DARE_CHALLENGE_ME_IGNORANT_MORTAL, 2, 4000, players.getName()));
break;
}
}

View File

@@ -96,10 +96,10 @@ public class Fafurion extends AbstractNpcAI
{
if (player.calculateDistance2D(FAFURION_SPAWN_LOC) < 5000)
{
player.sendPacket(new ExShowScreenMessage(NpcStringId.ALL_WHO_FEAR_FAFURION_LEAVE_THIS_PLACE_AT_ONCE, ExShowScreenMessage.TOP_CENTER, 10000, true));
player.sendPacket(new ExShowScreenMessage(NpcStringId.ALL_WHO_FEAR_OF_FAFURION_LEAVE_THIS_PLACE_AT_ONCE, ExShowScreenMessage.TOP_CENTER, 10000, true));
for (PlayerInstance plr : World.getInstance().getVisibleObjectsInRange(player, PlayerInstance.class, 5000))
{
plr.sendPacket(new ExShowScreenMessage(NpcStringId.ALL_WHO_FEAR_FAFURION_LEAVE_THIS_PLACE_AT_ONCE, ExShowScreenMessage.TOP_CENTER, 10000, true));
plr.sendPacket(new ExShowScreenMessage(NpcStringId.ALL_WHO_FEAR_OF_FAFURION_LEAVE_THIS_PLACE_AT_ONCE, ExShowScreenMessage.TOP_CENTER, 10000, true));
}
}
break;

View File

@@ -130,9 +130,9 @@ public class LastImperialTomb extends AbstractInstance
static
{
SKILL_MSG.put(1, NpcStringId.REQUIEM_OF_HATRED);
SKILL_MSG.put(2, NpcStringId.RONDO_OF_LONELINESS);
SKILL_MSG.put(3, NpcStringId.GALLOPING_TOCCATA);
SKILL_MSG.put(4, NpcStringId.FUGUE_OF_RAPTURE);
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(5, NpcStringId.HYPNOTIC_MAZURKA);
}
// Spawns

View File

@@ -1231,7 +1231,7 @@ public class CastleChamberlain extends AbstractNpcAI
{
if (manor.isManorApproved())
{
player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_4_30_AM_AND_8_PM);
player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_6_00_AM_AND_8_00_PM);
return;
}
player.sendPacket(new ExShowSeedSetting(castleId));
@@ -1241,7 +1241,7 @@ public class CastleChamberlain extends AbstractNpcAI
{
if (manor.isManorApproved())
{
player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_4_30_AM_AND_8_PM);
player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_6_00_AM_AND_8_00_PM);
return;
}
player.sendPacket(new ExShowCropSetting(castleId));

View File

@@ -337,7 +337,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
final ClanHall playerClanHall = ClanHallData.getInstance().getClanHallByClan(clan);
if (playerClanHall != null)
{
player.sendPacket(SystemMessageId.YOU_ALREADY_HAVE_A_CLAN_HALL_SO_YOU_CANNOT_BID);
player.sendPacket(SystemMessageId.YOU_ALREADY_HAVE_A_CLAN_HALL_SO_YOU_CANNOT_BET);
return;
}

View File

@@ -75,7 +75,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI
{
NpcStringId.PREPARE_TO_DIE,
NpcStringId.I_LL_DOUBLE_MY_STRENGTH,
NpcStringId.YOU_HAVE_MORE_SKILL_THAN_I_THOUGHT
NpcStringId.IT_S_STRONGER_THAN_EXPECTED_2
}
};

View File

@@ -80,7 +80,7 @@ public class HappyHours extends LongTimeEvent
{
_lastRewardTime = System.currentTimeMillis();
final ExShowScreenMessage screenMsg = new ExShowScreenMessage("You obtained 20 Sibi's coins.", ExShowScreenMessage.TOP_CENTER, 7000, 0, true, true);
final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_SIBI_S_COINS);
final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_VE_OBTAINED_S1_LUCKY_COINS);
systemMsg.addInt(20);
for (PlayerInstance plr : World.getInstance().getPlayers())
{

View File

@@ -120,7 +120,7 @@ public class MasterOfEnchanting extends LongTimeEvent
final int minutes = ((int) remainingTime % 3600) / 60;
if (hours > 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.THERE_ARE_S1_HR_AND_S2_MIN_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THERE_ARE_S1_HOUR_S_AND_S2_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
sm.addInt(hours);
sm.addInt(minutes);
player.sendPacket(sm);
@@ -128,7 +128,7 @@ public class MasterOfEnchanting extends LongTimeEvent
}
else if (minutes > 0)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.THERE_ARE_S1_MIN_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THERE_ARE_S1_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
sm.addInt(minutes);
player.sendPacket(sm);
htmltext = "32599-scroll24.htm";

View File

@@ -76,7 +76,7 @@ public class ChatWorld implements IChatHandler
}
else if (activeChar.getWorldChatUsed() >= activeChar.getWorldChatPoints())
{
activeChar.sendPacket(SystemMessageId.YOU_HAVE_SPENT_YOUR_WORLD_CHAT_QUOTA_FOR_THE_DAY_THE_WORLD_CHAT_QUOTA_RESETS_AT_7_AM_EVERY_DAY);
activeChar.sendPacket(SystemMessageId.YOU_HAVE_SPENT_YOUR_WORLD_CHAT_QUOTA_FOR_THE_DAY_A_NEW_DAY_STARTS_EVERY_DAY_AT_18_30);
}
else
{

View File

@@ -153,7 +153,7 @@ public class ConvertItem extends AbstractEffect
}
else
{
msg = new SystemMessage(SystemMessageId.EQUIPPED_S1);
msg = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
msg.addItemName(newItem);
}
player.sendPacket(msg);

View File

@@ -129,7 +129,7 @@ public class Disarmor extends AbstractEffect
}
else
{
sm = new SystemMessage(SystemMessageId.EQUIPPED_S1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(item);
}
player.sendPacket(sm);

View File

@@ -90,7 +90,7 @@ public class Harvesting extends AbstractEffect
{
if (item.getCount() == 1)
{
sm = new SystemMessage(SystemMessageId.C1_HARVESTED_S2);
sm = new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_2);
sm.addString(player.getName());
sm.addItemName(harvestedItem.getId());
}

View File

@@ -166,7 +166,7 @@ public class RestorationRandom extends AbstractEffect
}
else if (item.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
}

View File

@@ -49,7 +49,7 @@ public class BeastSoulShot implements IItemHandler
final PlayerInstance activeOwner = playable.getActingPlayer();
if (!activeOwner.hasSummon())
{
activeOwner.sendPacket(SystemMessageId.PETS_AND_SERVITORS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
activeOwner.sendPacket(SystemMessageId.SERVITORS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
return false;
}
@@ -99,7 +99,7 @@ public class BeastSoulShot implements IItemHandler
// Not enough Soulshots to use.
if (!activeOwner.disableAutoShot(itemId))
{
activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_SERVITOR);
}
return false;
}
@@ -109,7 +109,7 @@ public class BeastSoulShot implements IItemHandler
{
if (!activeOwner.disableAutoShot(itemId))
{
activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_SERVITOR);
}
return false;
}

View File

@@ -49,7 +49,7 @@ public class BeastSpiritShot implements IItemHandler
final PlayerInstance activeOwner = playable.getActingPlayer();
if (!activeOwner.hasSummon())
{
activeOwner.sendPacket(SystemMessageId.PETS_AND_SERVITORS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
activeOwner.sendPacket(SystemMessageId.SERVITORS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
return false;
}

View File

@@ -60,7 +60,7 @@ public class ExtractableItems implements IItemHandler
if (!player.isInventoryUnder80(false))
{
player.sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_ITEM_OWNERSHIP_LIMIT_AND_YOU_CANNOT_TAKE_THE_ITEM_CHECK_ITEM_OWNERSHIP_TIME_LIMITS_FOR_THE_INVENTORY_PLEASE);
return false;
}
@@ -230,7 +230,7 @@ public class ExtractableItems implements IItemHandler
}
else if (item.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
}

View File

@@ -59,7 +59,7 @@ public class FatedSupportBox implements IItemHandler
if (!player.isInventoryUnder80(false))
{
player.sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_ITEM_OWNERSHIP_LIMIT_AND_YOU_CANNOT_TAKE_THE_ITEM_CHECK_ITEM_OWNERSHIP_TIME_LIMITS_FOR_THE_INVENTORY_PLEASE);
return false;
}

View File

@@ -81,7 +81,7 @@ public class ItemSkillsTemplate implements IItemHandler
{
if (itemSkill.hasEffectType(EffectType.EXTRACT_ITEM) && (playable.getActingPlayer() != null) && !playable.getActingPlayer().isInventoryUnder80(false))
{
playable.getActingPlayer().sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);
playable.getActingPlayer().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_ITEM_OWNERSHIP_LIMIT_AND_YOU_CANNOT_TAKE_THE_ITEM_CHECK_ITEM_OWNERSHIP_TIME_LIMITS_FOR_THE_INVENTORY_PLEASE);
return false;
}

View File

@@ -138,7 +138,7 @@ public class PaulinasSupportBox implements IItemHandler
if (!player.isInventoryUnder80(false))
{
player.sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_ITEM_OWNERSHIP_LIMIT_AND_YOU_CANNOT_TAKE_THE_ITEM_CHECK_ITEM_OWNERSHIP_TIME_LIMITS_FOR_THE_INVENTORY_PLEASE);
return false;
}

View File

@@ -64,7 +64,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition
}
else if (player.isInAirShip())
{
player.sendPacket(SystemMessageId.A_SERVITOR_OR_PET_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
player.sendPacket(SystemMessageId.A_SERVITOR_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
canSummon = false;
}
else if ((player.getSummonPoints() + _summonPoints) > player.getMaxSummonPoints())

View File

@@ -71,7 +71,7 @@ public class CanSummonPetSkillCondition implements ISkillCondition
}
else if (player.isInAirShip())
{
player.sendPacket(SystemMessageId.A_SERVITOR_OR_PET_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
player.sendPacket(SystemMessageId.A_SERVITOR_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
canSummon = false;
}
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())

View File

@@ -50,7 +50,7 @@ public class CanSummonSkillCondition implements ISkillCondition
}
else if (player.isInAirShip())
{
player.sendPacket(SystemMessageId.A_SERVITOR_OR_PET_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
player.sendPacket(SystemMessageId.A_SERVITOR_CANNOT_BE_SUMMONED_WHILE_ON_AN_AIRSHIP);
canSummon = false;
}

View File

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

View File

@@ -112,7 +112,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
{
if (instance.getTemplateId() != templateId)
{
player.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON).addString(player.getName()));
player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
return;
}
onEnter(player, instance, false);
@@ -146,7 +146,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
// Check if maximum world count limit is exceeded
if ((template.getMaxWorlds() != -1) && (manager.getWorldCount(templateId) >= template.getMaxWorlds()))
{
player.sendPacket(SystemMessageId.THE_NUMBER_OF_INSTANT_ZONES_THAT_CAN_BE_CREATED_HAS_BEEN_EXCEEDED_PLEASE_TRY_AGAIN_LATER);
player.sendPacket(SystemMessageId.THE_NUMBER_OF_INSTANCE_ZONES_THAT_CAN_BE_CREATED_HAS_BEEN_EXCEEDED_PLEASE_TRY_AGAIN_LATER);
return;
}
@@ -155,7 +155,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
{
if (getPlayerInstance(member) != null)
{
enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON).addString(p.getName())));
enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(p.getName())));
return;
}

View File

@@ -536,7 +536,7 @@ public class DimensionalWrap extends AbstractInstance
}
case "NEXT_STAGE":
{
world.broadcastPacket(new ExShowScreenMessage(NpcStringId.S1_SECONDS_HAVE_BEEN_ADDED_TO_THE_INSTANCED_ZONE_DURATION, ExShowScreenMessage.TOP_CENTER, 5000, true, String.valueOf(180)));
world.broadcastPacket(new ExShowScreenMessage(NpcStringId.S1_SECONDS_HAVE_BEEN_ADDED_TO_THE_INSTANCE_ZONE_DURATION, ExShowScreenMessage.TOP_CENTER, 5000, true, String.valueOf(180)));
world.setDuration((int) ((world.getRemainingTime() / 60000) + 3));
startQuestTimer("START_STAGE", 8000, npc, null);
for (Npc n : world.getAliveNpcs())

View File

@@ -518,7 +518,7 @@ public class Kamaloka extends AbstractInstance
// but not in kamaloka
if ((player.getInstanceId() == 0) || (world.getTemplateId() != templateId))
{
player.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON).addString(player.getName()));
player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
return;
}
// check for level difference again on reenter
@@ -836,7 +836,7 @@ public class Kamaloka extends AbstractInstance
}
reenter.set(Calendar.HOUR_OF_DAY, RESET_HOUR);
final SystemMessage sm = new SystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE);
final SystemMessage sm = new SystemMessage(SystemMessageId.INSTANCE_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE);
sm.addInstanceName(world.getTemplateId());
// set instance reenter time for all allowed players

View File

@@ -174,7 +174,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI
// NPC has low HP Skill and HP is < 50% HP
if (!npc.isAffectedBySkill(lowHpSkill.getSkillId()) && (SkillCaster.checkUseConditions(npc, lowHpSkill.getSkill())))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.IT_S_NOT_OVER);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.IT_S_NOT_OVER_YET_2);
npc.doCast(lowHpSkill.getSkill());
}
}
@@ -207,7 +207,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI
{
if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3);
npc.doCast(skill_02.getSkill(), null, true, false);
}
break;

View File

@@ -198,7 +198,7 @@ public class KartiaHelperBarton extends AbstractNpcAI
{
if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3);
npc.doCast(skill_02.getSkill(), null, true, false);
}
break;

View File

@@ -197,7 +197,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI
{
if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3);
npc.doCast(skill_02.getSkill(), null, true, false);
}
break;

View File

@@ -170,14 +170,14 @@ public class MemoryOfDisaster extends AbstractInstance
NpcStringId.DWARVES_FOREVER,
NpcStringId.SAVE_THE_DWARVEN_VILLAGE,
NpcStringId.WHOAAAAAA,
NpcStringId.FIGHT
NpcStringId.COME_ONE_2
};
private static final NpcStringId[] SHOUT_SILVERA_DEATH =
{
NpcStringId.SILVERA,
NpcStringId.WE_CAN_T_TAKE_ANY_MORE_LOSSES,
NpcStringId.TOO_LATE_3,
NpcStringId.NO_WAY_4,
NpcStringId.INCREDIBLE,
NpcStringId.ANOTHER_ONE_OVER_THERE
};
private static final NpcStringId[] SACRIFICED_DARK_ELF_SUICIDE_MESSAGES =
@@ -870,7 +870,7 @@ public class MemoryOfDisaster extends AbstractInstance
}
case SILVERA:
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.MY_GOD);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WHOAAAAAA);
npc.doDie(null);
world.getNpc(SIEGE_GOLEM).doAutoAttack(attacker);
break;

View File

@@ -367,7 +367,7 @@ public class PrisonOfDarkness extends AbstractInstance
case 0:
takeItems(creature.getActingPlayer(), GIANT_CANNONBALL, -1);
creature.teleToLocation(PLAYERS_RANDOM_LOCS[getRandom(PLAYERS_RANDOM_LOCS.length)]);
showOnScreenMsg(creature.getActingPlayer(), NpcStringId.YOU_NEED_TO_FIND_ESCAPE_DEVICE_RE_ENTRY_IS_NOT_ALLOWED_ONCE_YOU_VE_LEFT_THE_INSTANT_ZONE, ExShowScreenMessage.TOP_CENTER, 4000);
showOnScreenMsg(creature.getActingPlayer(), NpcStringId.YOU_NEED_TO_FIND_ESCAPE_DEVICE_RE_ENTRY_IS_NOT_ALLOWED_ONCE_YOU_VE_LEFT_THE_INSTANCE_ZONE, ExShowScreenMessage.TOP_CENTER, 4000);
instance.getParameters().increaseInt("PLAYERS_COUNT", 0, 1);
break;
case 1:

View File

@@ -133,7 +133,7 @@ public abstract class AirShipController extends AbstractNpcAI
}
if (_isBusy)
{
player.sendPacket(SystemMessageId.ANOTHER_AIRSHIP_HAS_ALREADY_BEEN_SUMMONED_PLEASE_TRY_AGAIN_LATER);
player.sendPacket(SystemMessageId.ANOTHER_AIRSHIP_HAS_BEEN_SUMMONED_TO_THE_WHARF_PLEASE_TRY_AGAIN_LATER);
return null;
}
if (!player.hasClanPrivilege(ClanPrivilege.CL_SUMMON_AIRSHIP))

View File

@@ -153,10 +153,10 @@ public class BoatGludinRune implements Runnable
BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED);
BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED);
ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES);
ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES);
ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES);
ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE);
ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES_2);
ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES_2);
ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES_2);
ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE_2);
ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES);
ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES);
ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES);