Updated system message and npc string ids.
This commit is contained in:
@@ -44,7 +44,7 @@ public class MercenaryCaptain extends AbstractNpcAI
|
||||
{
|
||||
if (event.equals("BROADCAST_TEXT") && (npc != null))
|
||||
{
|
||||
npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_EASTERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_WEST_BE_CAREFUL));
|
||||
npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_SOUTHERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_NORTHERN_BE_CAREFUL));
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
}
|
||||
|
@@ -54,12 +54,12 @@ public class Apprentice extends AbstractNpcAI
|
||||
}
|
||||
else
|
||||
{
|
||||
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_T_RIDE_A_KUKURI_NOW);
|
||||
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_T_RIDE_KUKURU_NOW);
|
||||
}
|
||||
}
|
||||
else if (event.equals("SPAM_TEXT") && (npc != null))
|
||||
{
|
||||
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURI, 1000);
|
||||
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURU, 1000);
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
}
|
||||
|
@@ -42,7 +42,6 @@ import org.l2jmobius.gameserver.model.skill.SkillCaster;
|
||||
import org.l2jmobius.gameserver.model.variables.NpcVariables;
|
||||
import org.l2jmobius.gameserver.model.zone.type.EffectZone;
|
||||
import org.l2jmobius.gameserver.model.zone.type.NoSummonFriendZone;
|
||||
import org.l2jmobius.gameserver.network.NpcStringId;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.OnEventTrigger;
|
||||
|
||||
import ai.AbstractNpcAI;
|
||||
@@ -390,7 +389,7 @@ public class Ramona extends AbstractNpcAI
|
||||
{
|
||||
if (ZONE.getCharactersInside().size() < Config.RAMONA_MIN_PLAYER)
|
||||
{
|
||||
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WHAT_S_UP_WITH_YOUR_EYES_YOU_NEED_MORE_ENERGY);
|
||||
npc.broadcastSay(ChatType.NPC_GENERAL, "What's up with your eyes? You need more energy."); // NpcStringId.WHAT_S_UP_WITH_YOUR_EYES_YOU_NEED_MORE_ENERGY
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
@@ -512,7 +512,7 @@ public class ClanHallManager extends AbstractNpcAI
|
||||
}
|
||||
else
|
||||
{
|
||||
htmltext = htmltext.replaceAll("%" + name + "recovery%", "<fstring p1=\"\" p2=\"\">" + NpcStringId.NONE_2.getId() + "</fstring>");
|
||||
htmltext = htmltext.replaceAll("%" + name + "recovery%", "<fstring p1=\"\" p2=\"\">" + NpcStringId.DISABLED.getId() + "</fstring>");
|
||||
htmltext = htmltext.replaceAll("%" + name + "price%", "");
|
||||
htmltext = htmltext.replaceAll("%" + name + "expire%", "");
|
||||
htmltext = htmltext.replaceAll("%" + name + "deactive%", "");
|
||||
|
@@ -47,7 +47,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
|
||||
// NPC Strings
|
||||
private static final NpcStringId[] NPC_STRINGS_ON_SPAWN =
|
||||
{
|
||||
NpcStringId.CROAK_ROAK_IS_THERE_FOOD_LIKE_S1_HERE,
|
||||
NpcStringId.CROAK_CROAK_IS_THERE_FOOD_LIKE_S1_HERE,
|
||||
NpcStringId.S1_HOW_LUCKY_I_AM,
|
||||
NpcStringId.PRAY_THAT_YOU_CAUGHT_A_WRONG_FISH_S1
|
||||
};
|
||||
|
@@ -35,7 +35,7 @@ public class ItemAction implements IActionHandler
|
||||
final Castle castle = CastleManager.getInstance().getCastle(target);
|
||||
if ((castle != null) && (SiegeGuardManager.getInstance().getSiegeGuardByItem(castle.getResidenceId(), target.getId()) != null) && ((player.getClan() == null) || (castle.getOwnerId() != player.getClanId()) || !player.hasClanPrivilege(ClanPrivilege.CS_MERCENARIES)))
|
||||
{
|
||||
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_AUTHORITY_TO_CANCEL_MERCENARY_POSITIONING);
|
||||
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_CHANGE_MERCENARY_POSITIONS);
|
||||
player.setTarget(target);
|
||||
player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
|
||||
return false;
|
||||
|
@@ -85,7 +85,7 @@ public class EnergyAttack extends AbstractEffect
|
||||
final int charge = Math.min(_chargeConsume, attacker.getCharges());
|
||||
if (!attacker.decreaseCharges(charge))
|
||||
{
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addSkillName(skill);
|
||||
attacker.sendPacket(sm);
|
||||
return;
|
||||
|
@@ -78,7 +78,7 @@ public class Harvesting extends AbstractEffect
|
||||
}
|
||||
else
|
||||
{
|
||||
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
|
||||
sm = new SystemMessage(SystemMessageId.YOU_VE_OBTAINED_S1_X_S2);
|
||||
sm.addItemName(item.getId());
|
||||
sm.addLong(harvestedItem.getCount());
|
||||
}
|
||||
|
@@ -69,7 +69,7 @@ public class MagicalSoulAttack extends AbstractEffect
|
||||
final int chargedSouls = Math.min(skill.getMaxSoulConsumeCount(), effector.getActingPlayer().getCharges());
|
||||
if (!effector.getActingPlayer().decreaseCharges(chargedSouls))
|
||||
{
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addSkillName(skill);
|
||||
effector.sendPacket(sm);
|
||||
return;
|
||||
|
@@ -89,7 +89,7 @@ public class PhysicalSoulAttack extends AbstractEffect
|
||||
final int souls = Math.min(skill.getMaxSoulConsumeCount(), effector.getActingPlayer().getCharges());
|
||||
if (!effector.getActingPlayer().decreaseCharges(souls))
|
||||
{
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addSkillName(skill);
|
||||
effector.sendPacket(sm);
|
||||
return;
|
||||
|
@@ -160,7 +160,7 @@ public class RestorationRandom extends AbstractEffect
|
||||
final SystemMessage sm;
|
||||
if (count > 1)
|
||||
{
|
||||
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
|
||||
sm = new SystemMessage(SystemMessageId.YOU_VE_OBTAINED_S1_X_S2);
|
||||
sm.addItemName(item);
|
||||
sm.addLong(count);
|
||||
}
|
||||
|
@@ -68,7 +68,7 @@ public class CharmOfCourage implements IItemHandler
|
||||
|
||||
if (itemLevel < level)
|
||||
{
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addItemName(item.getId());
|
||||
player.sendPacket(sm);
|
||||
return false;
|
||||
|
@@ -69,7 +69,7 @@ public class EventItem implements IItemHandler
|
||||
final int blockCheckerArena = castor.getBlockCheckerArena();
|
||||
if (blockCheckerArena == -1)
|
||||
{
|
||||
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
msg.addItemName(item);
|
||||
castor.sendPacket(msg);
|
||||
return false;
|
||||
|
@@ -241,7 +241,7 @@ public class ExtractableItems implements IItemHandler
|
||||
final SystemMessage sm;
|
||||
if (count > 1)
|
||||
{
|
||||
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
|
||||
sm = new SystemMessage(SystemMessageId.YOU_VE_OBTAINED_S1_X_S2);
|
||||
sm.addItemName(item);
|
||||
sm.addLong(count);
|
||||
}
|
||||
|
@@ -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.
|
||||
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_DUE_TO_UNSUITABLE_TERMS).addItemName(item));
|
||||
player.sendPacket(new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET).addItemName(item));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -60,7 +60,7 @@ public class MercTicket extends AbstractNpcAI implements IItemHandler
|
||||
final Castle castle = CastleManager.getInstance().getCastle(player);
|
||||
if ((castle == null) || (player.getClan() == null) || (castle.getOwnerId() != player.getClanId()) || !player.hasClanPrivilege(ClanPrivilege.CS_MERCENARIES))
|
||||
{
|
||||
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_AUTHORITY_TO_POSITION_MERCENARIES);
|
||||
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_POSITION_MERCENARIES);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -88,7 +88,7 @@ public class PetFood implements IItemHandler
|
||||
return true;
|
||||
}
|
||||
}
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addItemName(item);
|
||||
player.sendPacket(sm);
|
||||
}
|
||||
|
@@ -61,35 +61,35 @@ public class BuildCampSkillCondition implements ISkillCondition
|
||||
final SystemMessage sm;
|
||||
if ((castle == null) && (fort == null))
|
||||
{
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addSkillName(skill);
|
||||
player.sendPacket(sm);
|
||||
canCreateBase = false;
|
||||
}
|
||||
else if (((castle != null) && !castle.getSiege().isInProgress()) || ((fort != null) && !fort.getSiege().isInProgress()))
|
||||
{
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addSkillName(skill);
|
||||
player.sendPacket(sm);
|
||||
canCreateBase = false;
|
||||
}
|
||||
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_DUE_TO_UNSUITABLE_TERMS);
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addSkillName(skill);
|
||||
player.sendPacket(sm);
|
||||
canCreateBase = false;
|
||||
}
|
||||
else if (!player.isClanLeader())
|
||||
{
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addSkillName(skill);
|
||||
player.sendPacket(sm);
|
||||
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())))
|
||||
{
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addSkillName(skill);
|
||||
player.sendPacket(sm);
|
||||
canCreateBase = false;
|
||||
|
@@ -56,7 +56,7 @@ public class OpCheckFlagSkillCondition implements ISkillCondition
|
||||
final SystemMessage sm;
|
||||
if ((fort == null) || (fort.getResidenceId() <= 0) || !fort.getSiege().isInProgress() || (fort.getSiege().getAttackerClan(player.getClan()) == null))
|
||||
{
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addSkillName(skill);
|
||||
player.sendPacket(sm);
|
||||
canTakeFort = false;
|
||||
|
@@ -57,7 +57,7 @@ public class OpResurrectionSkillCondition implements ISkillCondition
|
||||
canResurrect = false;
|
||||
if (caster.isPlayer())
|
||||
{
|
||||
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
msg.addSkillName(skill);
|
||||
caster.sendPacket(msg);
|
||||
}
|
||||
@@ -88,7 +88,7 @@ public class OpResurrectionSkillCondition implements ISkillCondition
|
||||
canResurrect = false;
|
||||
if (caster.isPlayer())
|
||||
{
|
||||
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
msg.addSkillName(skill);
|
||||
caster.sendPacket(msg);
|
||||
}
|
||||
|
@@ -56,7 +56,7 @@ public class PossessHolythingSkillCondition implements ISkillCondition
|
||||
SystemMessage sm;
|
||||
if ((castle == null) || (castle.getResidenceId() <= 0) || !castle.getSiege().isInProgress() || (castle.getSiege().getAttackerClan(player.getClan()) == null))
|
||||
{
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
|
||||
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_AS_CERTAIN_REQUIREMENTS_ARE_NOT_MET);
|
||||
sm.addSkillName(skill);
|
||||
player.sendPacket(sm);
|
||||
canTakeCastle = false;
|
||||
|
@@ -98,7 +98,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
|
||||
final Instance world = player.getInstanceWorld();
|
||||
if (isInInstance(world))
|
||||
{
|
||||
showOnScreenMsg(world, NpcStringId.THE_FIGHTING_AGAINST_GOLDBERG_WILL_BEGIN_IN_10_SECONDS, ExShowScreenMessage.TOP_CENTER, 5000, true);
|
||||
showOnScreenMsg(world, NpcStringId.THE_BATTLE_WITH_GOLDBERG_STARTS_IN_10_SEC, ExShowScreenMessage.TOP_CENTER, 5000, true);
|
||||
startQuestTimer("ANNOUNCE_5", 5000, null, player);
|
||||
}
|
||||
break;
|
||||
|
@@ -99,7 +99,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
|
||||
final Instance world = player.getInstanceWorld();
|
||||
if (isInInstance(world))
|
||||
{
|
||||
showOnScreenMsg(world, NpcStringId.THE_FIGHTING_AGAINST_MARY_REED_WILL_BEGIN_IN_10_SECONDS, ExShowScreenMessage.TOP_CENTER, 5000, true);
|
||||
showOnScreenMsg(world, NpcStringId.THE_BATTLE_WITH_MARY_REED_STARTS_IN_10_SEC, ExShowScreenMessage.TOP_CENTER, 5000, true);
|
||||
startQuestTimer("ANNOUNCE_5", 10000, null, player);
|
||||
}
|
||||
break;
|
||||
|
@@ -96,7 +96,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
|
||||
final Instance world = player.getInstanceWorld();
|
||||
if (isInInstance(world))
|
||||
{
|
||||
showOnScreenMsg(world, NpcStringId.THE_FIGHTING_AGAINST_TAUTI_WILL_BEGIN_IN_10_SECONDS, ExShowScreenMessage.TOP_CENTER, 5000, true);
|
||||
showOnScreenMsg(world, NpcStringId.THE_BATTLE_WITH_TAUTI_STARTS_IN_10_SEC, ExShowScreenMessage.TOP_CENTER, 5000, true);
|
||||
startQuestTimer("ANNOUNCE_5", 10000, null, player);
|
||||
}
|
||||
break;
|
||||
|
@@ -51,7 +51,7 @@ public class Q10885_SaviorsPathDiscovery extends Quest
|
||||
private static final int LEONA_BLACKBIRDS_MESSAGE = 48545;
|
||||
// Misc
|
||||
private static final int MIN_LEVEL = 103;
|
||||
private final NpcStringId _startMessage = NpcStringId.YOU_VE_GOT_A_MESSAGE_FROM_LEONA_BLACKBIRD_CLICK_THE_QUESTION_MARK_ICON_TO_READ;
|
||||
private final NpcStringId _startMessage = NpcStringId.YOU_VE_GOT_A_LETTER_FROM_LEONA_BLACKBIRD_CLICK_THE_QUESTION_MARK_ICON_TO_READ_IT;
|
||||
|
||||
public Q10885_SaviorsPathDiscovery()
|
||||
{
|
||||
|
Reference in New Issue
Block a user