lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated system messages and NPC strings.

Browse Source
This commit is contained in:
MobiusDev
2018-03-13 16:07:06 +00:00
parent 702c86935e
commit 55dfe422e2
497 changed files with 313051 additions and 320214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java vendored
View File

@@ -71,7 +71,7 @@ public final class BloodySuccubus extends AbstractNpcAI
{
NpcStringId.FOR_THE_GODDESS,
NpcStringId.YOU_WILL_DIE,
NpcStringId.DIE2,
NpcStringId.DIE_2,
NpcStringId.YOU_WILL_BE_DESTROYED,
NpcStringId.OOOOH,
NpcStringId.DO_NOT_INTERFERE
@@ -106,7 +106,7 @@ public final class BloodySuccubus extends AbstractNpcAI
};
private static final NpcStringId[] ON_FAILED_MSG_SUCCUBUS_OF_SILENCE =
{
NpcStringId.IS_THIS_THE_END2,
NpcStringId.IS_THIS_THE_END_2,
NpcStringId.OH_GODDESS,
NpcStringId.NO_I_DIDN_T_STAY_SILENT_ALL_THIS_TIME_JUST_TO_DISAPPEAR_NOW_LIKE_THIS
};

10
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java vendored
View File

@@ -141,27 +141,27 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
}
case 1:
{
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.SECONDS_LEFT, ExShowScreenMessage.TOP_CENTER, 3000));
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.TWENTY_FIVE_SECONDS_LEFT, ExShowScreenMessage.TOP_CENTER, 3000));
break;
}
case 2:
{
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.SECONDS_LEFT2, ExShowScreenMessage.TOP_CENTER, 3000));
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.TWENTY_SECONDS_LEFT, ExShowScreenMessage.TOP_CENTER, 3000));
break;
}
case 3:
{
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.SECONDS_LEFT3, ExShowScreenMessage.TOP_CENTER, 3000));
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.FIFTEEN_SECONDS_LEFT, ExShowScreenMessage.TOP_CENTER, 3000));
break;
}
case 4:
{
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.SECONDS_LEFT4, ExShowScreenMessage.TOP_CENTER, 3000));
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.TEN_SECONDS_LEFT, ExShowScreenMessage.TOP_CENTER, 3000));
break;
}
case 5:
{
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.SECONDS_LEFT5, ExShowScreenMessage.TOP_CENTER, 3000));
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.FIVE_SECONDS_LEFT, ExShowScreenMessage.TOP_CENTER, 3000));
break;
}
case 6:

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java vendored
View File

@@ -486,7 +486,7 @@ public final class ClanHallManager extends AbstractNpcAI
}
else
{
htmltext = htmltext.replaceAll("%" + name + "recovery%", "<fstring p1=\"\" p2=\"\">" + NpcStringId.NONE2.getId() + "</fstring>");
htmltext = htmltext.replaceAll("%" + name + "recovery%", "<fstring p1=\"\" p2=\"\">" + NpcStringId.NONE_2.getId() + "</fstring>");
htmltext = htmltext.replaceAll("%" + name + "price%", "");
htmltext = htmltext.replaceAll("%" + name + "expire%", "");
htmltext = htmltext.replaceAll("%" + name + "deactive%", "");

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java vendored
View File

@@ -82,7 +82,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
{
activeChar.sendMessage(" Don't exist in the world.");
}
activeChar.sendPacket(SystemMessageId.EMPTY3);
activeChar.sendPacket(SystemMessageId.EMPTY_3);
}
}
else

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java vendored
View File

@@ -620,7 +620,7 @@ public class AdminMobGroup implements IAdminCommandHandler
activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getId() + " (" + mobGroup.getStatus() + ")");
}
activeChar.sendPacket(SystemMessageId.EMPTY3);
activeChar.sendPacket(SystemMessageId.EMPTY_3);
}
@Override

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java vendored
View File

@@ -133,7 +133,7 @@ public final class CallPc extends AbstractEffect
if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING_2);
sm.addString(target.getName());
activeChar.sendPacket(sm);
return false;

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java vendored
View File

@@ -94,7 +94,7 @@ public class TeleportToPlayer extends AbstractEffect
if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING_2);
sm.addString(target.getName());
effector.sendPacket(sm);
return;

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -153,7 +153,7 @@ public class ItemSkillsTemplate implements IItemHandler
{
if (!playable.destroyItem("Consume", item.getObjectId(), 1, playable, false))
{
playable.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
playable.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
return false;
}
}

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/SocialAction.java vendored
View File

@@ -84,7 +84,7 @@ public final class SocialAction implements IPlayerActionHandler
{
if (activeChar.isFishing())
{
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING3);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
return false;
}
@@ -167,7 +167,7 @@ public final class SocialAction implements IPlayerActionHandler
if (player.isFishing())
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING3);
player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
return;
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java vendored
View File

@@ -115,7 +115,7 @@ public class ClanWarsList implements IUserCommandHandler
}
}
}
activeChar.sendPacket(SystemMessageId.EMPTY3);
activeChar.sendPacket(SystemMessageId.EMPTY_3);
}
catch (Exception e)
{

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java vendored
View File

@@ -81,7 +81,7 @@ public class PartyInfo implements IUserCommandHandler
// activeChar.sendPacket(sm);
// }
}
activeChar.sendPacket(SystemMessageId.EMPTY3);
activeChar.sendPacket(SystemMessageId.EMPTY_3);
return true;
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java vendored
View File

@@ -61,7 +61,7 @@ public class Time implements IUserCommandHandler
SystemMessage sm;
if (GameTimeController.getInstance().isNight())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CURRENT_TIME_IS_S1_S22);
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CURRENT_TIME_IS_S1_S2_2);
sm.addString(h);
sm.addString(m);
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java vendored
View File

@@ -399,7 +399,7 @@ public final class ChamberOfDelusion extends AbstractInstance
final L2Npc gatekeeper = world.getNpc(raidGatekeeper);
if (gatekeeper != null)
{
gatekeeper.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.MINUTES_ARE_ADDED_TO_THE_REMAINING_TIME_IN_THE_INSTANT_ZONE);
gatekeeper.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TWENTY_MINUTES_ARE_ADDED_TO_THE_REMAINING_TIME_IN_THE_INSTANT_ZONE);
}
}
else

20
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java vendored
View File

@@ -411,52 +411,52 @@ public final class HarnakUndergroundRuins extends AbstractInstance
{
case 0:
{
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.SECONDS_ARE_REMAINING41);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.FIFTY_SECONDS_ARE_REMAINING);
break;
}
case 1:
{
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.SECONDS_ARE_REMAINING42);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.FOURTY_SECONDS_ARE_REMAINING_2);
break;
}
case 2:
{
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.SECONDS_ARE_REMAINING43);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.THIRTY_SECONDS_ARE_REMAINING_2);
break;
}
case 3:
{
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.SECONDS_ARE_REMAINING44);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.TWENTY_SECONDS_ARE_REMAINING_2);
break;
}
case 4:
{
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.SECONDS_ARE_REMAINING45);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.TEN_SECONDS_ARE_REMAINING_2);
break;
}
case 5:
{
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.SECONDS);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.FIVE_SECONDS);
break;
}
case 6:
{
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.SECONDS2);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.FOUR_SECONDS);
break;
}
case 7:
{
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.SECONDS3);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.THREE_SECONDS);
break;
}
case 8:
{
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.SECONDS4);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.TWO_SECONDS);
break;
}
case 9:
{
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.SECOND);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.ONE_SECOND);
break;
}
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java vendored
View File

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

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java vendored
View File

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

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java vendored
View File

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

14
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java vendored
View File

@@ -161,8 +161,8 @@ public final class MemoryOfDisaster extends AbstractInstance
{
NpcStringId.BRONK,
NpcStringId.CHIEF,
NpcStringId.BRONK2,
NpcStringId.NO_WAY3
NpcStringId.BRONK_2,
NpcStringId.NO_WAY_3
};
private static final NpcStringId[] SHOUT_RUN =
{
@@ -176,8 +176,8 @@ public final class MemoryOfDisaster extends AbstractInstance
{
NpcStringId.SILVERA,
NpcStringId.WE_CAN_T_TAKE_ANY_MORE_LOSSES,
NpcStringId.TOO_LATE3,
NpcStringId.NO_WAY4,
NpcStringId.TOO_LATE_3,
NpcStringId.NO_WAY_4,
NpcStringId.ANOTHER_ONE_OVER_THERE
};
private static final NpcStringId[] SACRIFICED_DARK_ELF_SUICIDE_MESSAGES =
@@ -747,7 +747,7 @@ public final class MemoryOfDisaster extends AbstractInstance
}
case WIRPHY:
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HELP_ME3);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HELP_ME_3);
npc.getInstanceWorld().getAliveNpcs(TEREDOR).stream().filter(n -> n.isScriptValue(2)).forEach(n -> addAttackDesire(n, npc));
break;
}
@@ -863,7 +863,7 @@ public final class MemoryOfDisaster extends AbstractInstance
}
case WIRPHY:
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NO_WAY2);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NO_WAY_2);
npc.doDie(null);
attacker.doAutoAttack(world.getNpc(SILVERA));
break;
@@ -889,7 +889,7 @@ public final class MemoryOfDisaster extends AbstractInstance
{
if (dwarf.getId() == ROGIN)
{
dwarf.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.CHIEF2);
dwarf.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.CHIEF_2);
}
else
{

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java vendored
View File

@@ -83,8 +83,8 @@ public final class TaintedDimension extends AbstractInstance
{
NpcStringId.UH_AH_AH_AH_AH,
NpcStringId.AH_UH_AH_UH_AH,
NpcStringId.KRRRR2,
NpcStringId.AH_AH_AH_UH_UH3,
NpcStringId.KRRRR_2,
NpcStringId.AH_AH_AH_UH_UH_3,
};
private static final int TEMPLATE_ID = 192;

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java vendored
View File

@@ -259,7 +259,7 @@ public final class Q10323_TrainLikeItsReal extends Quest
}
else if (qs.isCond(6) || qs.isCond(7))
{
npcLogList.add(new NpcLogListHolder(NpcStringId.ELIMINATE_THE_TRAINING_GOLEM2, qs.getMemoState()));
npcLogList.add(new NpcLogListHolder(NpcStringId.ELIMINATE_THE_TRAINING_GOLEM_2, qs.getMemoState()));
}
return npcLogList;
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java vendored
View File

@@ -169,7 +169,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest
wizzard.setSummoner(player);
wizzard.setTitle(player.getAppearance().getVisibleName());
wizzard.broadcastInfo();
showOnScreenMsg(player, NpcStringId.TALK_TO_THE_MYSTERIOUS_WIZARD2, ExShowScreenMessage.TOP_CENTER, 10000);
showOnScreenMsg(player, NpcStringId.TALK_TO_THE_MYSTERIOUS_WIZARD_2, ExShowScreenMessage.TOP_CENTER, 10000);
npc.deleteMe();
}
htmltext = null;

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java vendored
View File

@@ -79,7 +79,7 @@ public final class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest
{
qs.setCond(2, true);
giveItems(player, SOE_CRUMA_TOWER, 1);
showOnScreenMsg(player, NpcStringId.TRY_USING_THE_TELEPORT_SCROLL_SYLVAIN_GAVE_YOU_TO_GO_TO_CRUMA_TOWER2, ExShowScreenMessage.TOP_CENTER, 8000);
showOnScreenMsg(player, NpcStringId.TRY_USING_THE_TELEPORT_SCROLL_SYLVAIN_GAVE_YOU_TO_GO_TO_CRUMA_TOWER_2, ExShowScreenMessage.TOP_CENTER, 8000);
}
break;
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java vendored
View File

@@ -167,7 +167,7 @@ public final class Q10839_BlackbirdsNameValue extends Quest
if (killCount > 0)
{
final Set<NpcLogListHolder> holder = new HashSet<>();
holder.add(new NpcLogListHolder(NpcStringId.DEFEAT_THE_EMBRYO2, killCount));
holder.add(new NpcLogListHolder(NpcStringId.DEFEAT_THE_EMBRYO_2, killCount));
return holder;
}
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java vendored
View File

@@ -168,7 +168,7 @@ public final class Q10840_TimeToRecover extends Quest
if (killCount > 0)
{
final Set<NpcLogListHolder> holder = new HashSet<>();
holder.add(new NpcLogListHolder(NpcStringId.DEFEAT_THE_EMBRYO3, killCount));
holder.add(new NpcLogListHolder(NpcStringId.DEFEAT_THE_EMBRYO_3, killCount));
return holder;
}
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatGludinRune.java vendored
View File

@@ -142,7 +142,7 @@ public class BoatGludinRune implements Runnable
ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES);
LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES);
LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE);
LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY2);
LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2);
LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE);
ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR);
ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES);

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@@ -953,7 +953,7 @@ public class L2Npc extends L2Character
final String msg = Config.ANNOUNCE_PK_MSG.replace("$killer", player.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
@@ -985,7 +985,7 @@ public class L2Npc extends L2Character
final String msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", player.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@@ -721,7 +721,7 @@ public abstract class L2Summon extends L2Playable
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4);
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addNpcName(this);
sm.addString(target.getName());
sm.addInt(damage);

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
View File

@@ -152,7 +152,7 @@ public class DoppelgangerInstance extends L2Npc
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4);
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addNpcName(this);
sm.addString(target.getName());
sm.addInt(damage);

24
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -3086,7 +3086,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@@ -3414,7 +3414,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@@ -3470,7 +3470,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -3495,7 +3495,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -3527,7 +3527,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -3710,7 +3710,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -3799,7 +3799,7 @@ public final class L2PcInstance extends L2Playable
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return null;
@@ -5013,7 +5013,7 @@ public final class L2PcInstance extends L2Playable
msg = Config.ANNOUNCE_PK_MSG.replace("$killer", killer.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
@@ -5027,7 +5027,7 @@ public final class L2PcInstance extends L2Playable
msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", killer.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
@@ -6146,7 +6146,7 @@ public final class L2PcInstance extends L2Playable
{
// You can't mount, dismount, break and drop items while fishing
sendPacket(ActionFailed.STATIC_PACKET);
sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING2);
sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
return false;
}
else if (isTransformed() || isCursedWeaponEquipped())
@@ -11572,7 +11572,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4);
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this);
sm.addString(target.getName());
sm.addInt(damage);
@@ -13801,7 +13801,7 @@ public final class L2PcInstance extends L2Playable
if (AdminData.getInstance().requireConfirm(command))
{
setAdminConfirmCmd(fullCommand);
final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S13);
final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
dlg.addString("Are you sure you want execute command " + fullCommand.substring(6) + " ?");
addAction(PlayerAction.ADMIN_COMMAND);
sendPacket(dlg);

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
View File

@@ -393,7 +393,7 @@ public class L2PetInstance extends L2Summon
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
@@ -441,7 +441,7 @@ public class L2PetInstance extends L2Summon
{
if (sendMessage)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
View File

@@ -271,7 +271,7 @@ public final class L2TrapInstance extends L2Npc
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addString(getName());
sm.addString(target.getName());
sm.addInt(damage);

72718
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/NpcStringId.java
View File

File diff suppressed because it is too large Load Diff

31497
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/SystemMessageId.java
View File

File diff suppressed because it is too large Load Diff

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
View File

@@ -65,7 +65,7 @@ public final class DlgAnswer implements IClientIncomingPacket
return;
}
if (_messageId == SystemMessageId.S13.getId())
if (_messageId == SystemMessageId.S1_3.getId())
{
if (activeChar.removeAction(PlayerAction.ADMIN_COMMAND))
{

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -706,7 +706,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
private void giveSkill(L2PcInstance player, L2Npc trainer, Skill skill, boolean store)
{
// Send message.
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S12);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_2);
sm.addSkillName(skill);
player.sendPacket(sm);

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
View File

@@ -96,10 +96,10 @@ public final class RequestAllyInfo implements IClientIncomingPacket
sm.addInt(aci.getTotal());
client.sendPacket(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.EMPTY4);
sm = SystemMessage.getSystemMessage(SystemMessageId.EMPTY_4);
}
sm = SystemMessage.getSystemMessage(SystemMessageId.EMPTY5);
sm = SystemMessage.getSystemMessage(SystemMessageId.EMPTY_5);
client.sendPacket(sm);
}
else

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
View File

@@ -126,7 +126,7 @@ public final class RequestDropItem implements IClientIncomingPacket
if (activeChar.isFishing())
{
// You can't mount, dismount, break and drop items while fishing
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING2);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
return;
}
if (activeChar.isFlying())

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -137,7 +137,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket
// attempting to destroy scroll
if (activeChar.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, activeChar, item) == null)
{
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH);
activeChar.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
@@ -149,7 +149,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket
{
if (activeChar.getInventory().destroyItem("Enchant", support.getObjectId(), 1, activeChar, item) == null)
{
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH);
activeChar.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
@@ -268,7 +268,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket
if (scrollTemplate.isSafe())
{
// safe enchant - remain old value
client.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_SKILL_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
client.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_VALUE_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
client.sendPacket(new EnchantResult(EnchantResult.SAFE_FAIL, item));
if (Config.LOG_ITEM_ENCHANTS)

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java
View File

@@ -113,7 +113,7 @@ public final class RequestGiveItemToPet implements IClientIncomingPacket
if (!pet.getInventory().validateWeight(item, _amount))
{
player.sendPacket(SystemMessageId.YOUR_PET_CANNOT_CARRY_ANY_MORE_ITEMS2);
player.sendPacket(SystemMessageId.YOUR_PET_CANNOT_CARRY_ANY_MORE_ITEMS_2);
return;
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
View File

@@ -69,7 +69,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket
{
try
{
activeChar.sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_TRYING_ON_EQUIPMENT2);
activeChar.sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_TRYING_ON_EQUIPMENT_2);
activeChar.sendPacket(new ExUserInfoEquipSlot(activeChar));
}
catch (Exception e)

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -71,7 +71,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
}
else
{
requestor.sendPacket(SystemMessageId.THE_S1_CLAN_DID_NOT_RESPOND_WAR_PROCLAMATION_HAS_BEEN_REFUSED2);
requestor.sendPacket(SystemMessageId.THE_S1_CLAN_DID_NOT_RESPOND_WAR_PROCLAMATION_HAS_BEEN_REFUSED_2);
}
activeChar.setActiveRequester(null);
requestor.onTransactionResponse();

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@@ -131,7 +131,7 @@ public final class UseItem implements IClientIncomingPacket
if (activeChar.isFishing() && ((_itemId < 6535) || (_itemId > 6540)))
{
// You cannot do anything else while fishing
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING3);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
return;
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
View File

@@ -65,7 +65,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (activeChar.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, activeChar, item) == null)
{
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
client.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendList.java
View File

@@ -81,6 +81,6 @@ public final class RequestFriendList implements IClientIncomingPacket
}
// =========================
activeChar.sendPacket(SystemMessageId.EMPTY3);
activeChar.sendPacket(SystemMessageId.EMPTY_3);
}
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java
View File

@@ -41,7 +41,7 @@ public class ConfirmDlg extends AbstractMessagePacket<ConfirmDlg>
public ConfirmDlg(String text)
{
this(SystemMessageId.S13);
this(SystemMessageId.S1_3);
addString(text);
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
View File

@@ -37,7 +37,7 @@ public final class SystemMessage extends AbstractMessagePacket<SystemMessage>
throw new NullPointerException();
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S13);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
sm.addString(text);
return sm;
}