Updated system message and npc string ids.
This commit is contained in:
parent
0a92ce9d0f
commit
427fc1ed48
@ -120,7 +120,7 @@ public final class MasterOfEnchanting extends LongTimeEvent
|
||||
final int minutes = ((int) remainingTime % 3600) / 60;
|
||||
if (hours > 0)
|
||||
{
|
||||
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S1_HOUR_S_AND_S2_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
|
||||
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S1_HR_AND_S2_MIN_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
|
||||
sm.addInt(hours);
|
||||
sm.addInt(minutes);
|
||||
player.sendPacket(sm);
|
||||
@ -128,7 +128,7 @@ public final class MasterOfEnchanting extends LongTimeEvent
|
||||
}
|
||||
else if (minutes > 0)
|
||||
{
|
||||
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S1_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
|
||||
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S1_MIN_REMAINING_UNTIL_THE_ITEM_CAN_BE_OBTAINED);
|
||||
sm.addInt(minutes);
|
||||
player.sendPacket(sm);
|
||||
htmltext = "32599-scroll24.htm";
|
||||
|
@ -112,7 +112,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
|
||||
{
|
||||
if (instance.getTemplateId() != templateId)
|
||||
{
|
||||
player.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON);
|
||||
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON).addString(player.getName()));
|
||||
return;
|
||||
}
|
||||
onEnter(player, instance, false);
|
||||
@ -155,7 +155,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
|
||||
{
|
||||
if (getPlayerInstance(member) != null)
|
||||
{
|
||||
enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON));
|
||||
enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON).addString(p.getName())));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -536,7 +536,7 @@ public class DimensionalWrap extends AbstractInstance
|
||||
}
|
||||
case "NEXT_STAGE":
|
||||
{
|
||||
world.broadcastPacket(new ExShowScreenMessage(NpcStringId.S1_SECONDS_HAVE_BEEN_ADDED_TO_THE_INSTANCE_ZONE_DURATION, ExShowScreenMessage.TOP_CENTER, 5000, true, String.valueOf(180)));
|
||||
world.broadcastPacket(new ExShowScreenMessage(NpcStringId.S1_SECONDS_HAVE_BEEN_ADDED_TO_THE_INSTANCED_ZONE_DURATION, ExShowScreenMessage.TOP_CENTER, 5000, true, String.valueOf(180)));
|
||||
world.setDuration((int) ((world.getRemainingTime() / 60000) + 3));
|
||||
startQuestTimer("START_STAGE", 8000, npc, null);
|
||||
for (L2Npc n : world.getAliveNpcs())
|
||||
@ -579,7 +579,7 @@ public class DimensionalWrap extends AbstractInstance
|
||||
}
|
||||
else if (npc.getId() == ABYSSAL_MAKKUM)
|
||||
{
|
||||
world.broadcastPacket(new ExShowScreenMessage(NpcStringId.THE_INSTANCE_ZONE_WILL_CLOSE_SOON, ExShowScreenMessage.TOP_CENTER, 10000, true));
|
||||
world.broadcastPacket(new ExShowScreenMessage(NpcStringId.THE_INSTANCED_ZONE_WILL_CLOSE_SOON, ExShowScreenMessage.TOP_CENTER, 10000, true));
|
||||
world.finishInstance(3);
|
||||
Clean();
|
||||
}
|
||||
|
@ -518,7 +518,7 @@ public final class Kamaloka extends AbstractInstance
|
||||
// but not in kamaloka
|
||||
if ((player.getInstanceId() == 0) || (world.getTemplateId() != templateId))
|
||||
{
|
||||
player.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON);
|
||||
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON).addString(player.getName()));
|
||||
return;
|
||||
}
|
||||
// check for level difference again on reenter
|
||||
|
@ -523,7 +523,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
||||
}
|
||||
if (leaderName.length() > 16)
|
||||
{
|
||||
player.sendPacket(SystemMessageId.YOUR_TITLE_CANNOT_EXCEED_16_CHARACTERS_IN_LENGTH_PLEASE_TRY_AGAIN);
|
||||
player.sendPacket(SystemMessageId.YOUR_TITLE_MUST_BE_AT_LEAST_1_CHARACTER_AND_CANNOT_EXCEED_16_CHARACTERS_IN_LENGTH_PLEASE_TRY_AGAIN);
|
||||
return;
|
||||
}
|
||||
if (player.getName().equals(leaderName))
|
||||
|
@ -33,7 +33,7 @@ public final class ConditionGroupMin extends Condition
|
||||
public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml)
|
||||
{
|
||||
super(template, parameters, true, showMessageAndHtml);
|
||||
setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCE_ZONE, (msg, player) -> msg.addInt(getLimit()));
|
||||
setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCED_ZONE, (msg, player) -> msg.addInt(getLimit()));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user