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

Updated NpcStringId and SystemMessageId.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-02-26 02:17:44 +00:00
parent e60be2e247
commit bad68718e8
40 changed files with 2348 additions and 1481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java vendored
View File

@@ -154,7 +154,7 @@ public class CastleTeleporter extends AbstractNpcAI
case "MASS_TELEPORT":
{
final int region = MapRegionManager.getInstance().getMapRegionLocId(npc.getX(), npc.getY());
final NpcSay msg = new NpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.THE_DEFENDERS_OF_S1_CASTLE_WILL_BE_TELEPORTED_TO_THE_INNER_CASTLE);
final NpcSay msg = new NpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.THE_DEFENDERS_OF_S1_CASTLE_WILL_BE_TELEPORTED_INSIDE);
msg.addStringParameter(npc.getCastle().getName());
npc.getCastle().oustAllPlayers();
npc.setScriptValue(0);

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java vendored
View File

@@ -372,7 +372,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
}
else if (clan.getWarehouse().destroyItemByItemId("Clan Hall Auction", Inventory.ADENA_ID, bid, player, null) == null)
{
player.sendPacket(SystemMessageId.THERE_IS_NOT_ENOUGH_ADENA_IN_THE_CLAN_HALL_WAREHOUSE);
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA_IN_THE_CLAN_WAREHOUSE_2);
return;
}

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/bypasshandlers/Observation.java vendored
View File

@@ -135,7 +135,7 @@ public class Observation implements IBypassHandler
}
else
{
player.sendPacket(SystemMessageId.OBSERVATION_IS_ONLY_POSSIBLE_DURING_A_SIEGE);
player.sendPacket(SystemMessageId.SPECTATOR_MODE_IS_ONLY_AVAILABLE_DURING_A_SIEGE);
}
return true;
}

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java vendored
View File

@@ -83,7 +83,7 @@ public class ChatGeneral implements IChatHandler
if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
{
activeChar.sendPacket(new SystemMessage(SystemMessageId.GENERAL_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
activeChar.sendPacket(new SystemMessage(SystemMessageId.GENERAL_CHAT_CANNOT_BE_USED_BY_CHARACTERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
return;
}

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/chathandlers/ChatShout.java vendored
View File

@@ -54,7 +54,7 @@ public class ChatShout implements IChatHandler
}
if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
{
activeChar.sendPacket(new SystemMessage(SystemMessageId.SHOUT_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
activeChar.sendPacket(new SystemMessage(SystemMessageId.SHOUT_CANNOT_BE_USED_BY_CHARACTERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
return;
}

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java vendored
View File

@@ -54,7 +54,7 @@ public class ChatTrade implements IChatHandler
}
if (activeChar.getLevel() < 20)
{
activeChar.sendPacket(new SystemMessage(SystemMessageId.TRADE_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(20));
activeChar.sendPacket(new SystemMessage(SystemMessageId.TRADE_CHAT_CANNOT_BE_USED_BY_CHARACTERS_LV_S1_OR_LOWER).addInt(20));
return;
}

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java vendored
View File

@@ -108,7 +108,7 @@ public class ChatWhisper implements IChatHandler
}
if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.getWhisperers().contains(receiver.getObjectId()) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
{
activeChar.sendPacket(new SystemMessage(SystemMessageId.NON_PREMIUM_USERS_LV_S1_OR_LOWER_CAN_RESPOND_TO_A_WHISPER_BUT_CANNOT_INITIATE_IT).addInt(Config.MINIMUM_CHAT_LEVEL));
activeChar.sendPacket(new SystemMessage(SystemMessageId.CHARACTERS_LV_S1_OR_LOWER_CAN_RESPOND_TO_A_WHISPER_BUT_CANNOT_INITIATE_IT).addInt(Config.MINIMUM_CHAT_LEVEL));
return;
}
if (!BlockList.isBlocked(receiver, activeChar))

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java vendored
View File

@@ -44,7 +44,7 @@ public class ChannelLeave implements IUserCommandHandler
if (!player.isInParty() || !player.getParty().isLeader(player))
{
player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_LEAVE_A_COMMAND_CHANNEL);
player.sendPacket(SystemMessageId.ONLY_THE_PARTY_LEADER_CAN_LEAVE_THE_COMMAND_CHANNEL);
return false;
}

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java vendored
View File

@@ -117,7 +117,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
addExpAndSp(player, 600000, 13500);
if (CategoryData.getInstance().isInCategory(CategoryType.FIRST_CLASS_GROUP, player.getClassId().getId()))
{
showOnScreenMsg(player, NpcStringId.YOU_VE_FINISHED_THE_TUTORIAL_NTAKE_YOUR_1ST_CLASS_TRANSFER_AND_COMPLETE_YOUR_TRAINING_WITH_MATHORN_TO_BECOME_STRONGER, ExShowScreenMessage.TOP_CENTER, 10000);
showOnScreenMsg(player, NpcStringId.YOU_VE_FINISHED_THE_TUTORIAL_NTAKE_YOUR_FIRST_CLASS_TRANSFER_AND_COMPLETE_YOUR_TRAINING_WITH_MATHORN_TO_BECOME_STRONGER, ExShowScreenMessage.TOP_CENTER, 10000);
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}
qs.exitQuest(false, true);

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10966_ATripBegins/Q10966_ATripBegins.java vendored
View File

@@ -141,7 +141,7 @@ public class Q10966_ATripBegins extends Quest
{
if (qs.isCond(3))
{
showOnScreenMsg(player, NpcStringId.YOU_VE_GOT_ADVENTURER_S_BRACELET_AND_TALISMAN_OF_ADEN_NCOMPLETE_THE_TUTORIAL_AND_TRY_TO_USE_THE_TALISMAN, ExShowScreenMessage.TOP_CENTER, 10000);
showOnScreenMsg(player, NpcStringId.YOU_VE_GOT_ADVENTURER_S_BRACELET_AND_ADVENTURER_S_TALISMAN_NCOMPLETE_THE_TUTORIAL_AND_TRY_TO_USE_THE_TALISMAN, ExShowScreenMessage.TOP_CENTER, 10000);
addExpAndSp(player, 1000000, 27000);
giveItems(player, SOE_NOVICE);
giveItems(player, TALISMAN_OF_ADEN);

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java vendored
View File

@@ -48,7 +48,7 @@ public class Q10968_ThePowerOfTheMagicLamp extends Quest
addStartNpc(MAXIMILLIAN);
addTalkId(MAXIMILLIAN);
addCondMinLevel(MIN_LEVEL, "no_lvl.html");
setQuestNameNpcStringId(NpcStringId.LV_39_THE_MAGIC_LANTERN_POWER);
setQuestNameNpcStringId(NpcStringId.LV_40_THE_MAGIC_LANTERN_POWER);
}
@Override

6
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10969_SporeInfestedPlace/Q10969_SporeInfestedPlace.java vendored
View File

@@ -61,7 +61,7 @@ public class Q10969_SporeInfestedPlace extends Quest
addTalkId(MAXIMILLIAN, ORVEN);
addKillId(GIANT_FUNGUS, GIANT_MONSTER_EYE, DIRE_WYRM, ROTTING_TREE, ROTTING_GOLEM, SPIDER_TRISALIM, TRISALIM_TARANTULA, SPORE_ZOMBIE, EARTH_GUARDIAN_WYRM);
addCondMinLevel(MIN_LEVEL, "no_lvl.html");
setQuestNameNpcStringId(NpcStringId.LV_40_45_SPORE_INFECTED_PLACE);
setQuestNameNpcStringId(NpcStringId.LV_40_44_SPORE_INFESTED_PLACE);
}
@Override
@@ -151,7 +151,7 @@ public class Q10969_SporeInfestedPlace extends Quest
{
htmltext = "30857.html";
}
else if (qs.isCond(3) && (player.getLevel() >= 45))
else if (qs.isCond(3) && (player.getLevel() >= 44))
{
htmltext = "30857-04.html";
}
@@ -203,7 +203,7 @@ public class Q10969_SporeInfestedPlace extends Quest
{
final Set<NpcLogListHolder> holder = new HashSet<>();
holder.add(new NpcLogListHolder(NpcStringId.KILL_MONSTERS_IN_THE_SEA_OF_SPORES.getId(), true, qs.getInt(KILL_COUNT_VAR)));
holder.add(new NpcLogListHolder(NpcStringId.REACH_LV_45, player.getLevel() > 44 ? 1 : 0));
holder.add(new NpcLogListHolder(NpcStringId.REACH_LV_44, player.getLevel() > 43 ? 1 : 0));
return holder;
}
return super.getNpcLogList(player);

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10970_RespectForGraves/Q10970_RespectForGraves.java vendored
View File

@@ -60,7 +60,7 @@ public class Q10970_RespectForGraves extends Quest
addTalkId(ORVEN);
addKillId(TAIK_ORC_WATCHMAN, GRAVE_GUARD, TAIK_ORC_SUPPLY_OFFICER, TAIRIM, TORTURED_UNDEAD, SPITEFUL_GHOST_OF_RUINS, SOLDIER_OF_GRIEF, CRUEL_PUNISHER, ROVING_SOUL, SOUL_OF_RUNIS);
addCondMinLevel(MIN_LEVEL, "no_lvl.html");
setQuestNameNpcStringId(NpcStringId.LV_45_RESPECT_FOR_GRAVES);
setQuestNameNpcStringId(NpcStringId.LV_45_52_RESPECT_FOR_GRAVES);
}
@Override

4
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10975_LetsPayRespectsToOurFallenBrethren/Q10975_LetsPayRespectsToOurFallenBrethren.java vendored
View File

@@ -54,7 +54,7 @@ public class Q10975_LetsPayRespectsToOurFallenBrethren extends Quest
private static final ItemHolder SAYHA_GUST = new ItemHolder(91776, 9);
private static final ItemHolder SPIRIT_ORE = new ItemHolder(3031, 450);
// Misc
private static final int MIN_LEVEL = 45;
private static final int MIN_LEVEL = 52;
private static final String KILL_COUNT_VAR = "KillCount";
public Q10975_LetsPayRespectsToOurFallenBrethren()
@@ -64,7 +64,7 @@ public class Q10975_LetsPayRespectsToOurFallenBrethren extends Quest
addTalkId(ORVEN);
addKillId(ACHER_OF_DESTRUCTION, GRAVEYARD_LICH, DISMAL_POLE, GRAVEYARD_PREDATOR, DOOM_KNIGHT, DOOM_SCOUT, DOOM_SERVANT, DOOM_GUARD, DOOM_ARCHER, DOOM_TROOPER, DOOM_WARRIOR, GUARD_BUTCHER);
addCondMinLevel(MIN_LEVEL, "no_lvl.html");
setQuestNameNpcStringId(NpcStringId.LV_45_LET_S_PAY_RESPECTS_TO_FALLEN_BRETHREN);
setQuestNameNpcStringId(NpcStringId.LV_52_58_LET_S_PAY_RESPECTS_TO_OUR_FALLEN_BRETHREN);
}
@Override

4
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10976_MemoryOfTheGloriousPast/Q10976_MemoryOfTheGloriousPast.java vendored
View File

@@ -50,7 +50,7 @@ public class Q10976_MemoryOfTheGloriousPast extends Quest
private static final ItemHolder SAYHA_GUST = new ItemHolder(91776, 9);
private static final ItemHolder SPIRIT_ORE = new ItemHolder(3031, 450);
// Misc
private static final int MIN_LEVEL = 45;
private static final int MIN_LEVEL = 58;
private static final String KILL_COUNT_VAR = "KillCount";
public Q10976_MemoryOfTheGloriousPast()
@@ -60,7 +60,7 @@ public class Q10976_MemoryOfTheGloriousPast extends Quest
addTalkId(ORVEN);
addKillId(VANOR_SILENOS, VANOR_SILENOS_SOLDIER, VANOR_SILENOS_SCOUT, VANOR_SILENOS_WARRIOR, VANOR_SILENOS_SHAMAN, VANOR_SILENOS_CHIEFTAIN, VANOR_MERCENARY_OF_GLORY, GUARD_OF_HONOR);
addCondMinLevel(MIN_LEVEL, "no_lvl.html");
setQuestNameNpcStringId(NpcStringId.LV_45_MEMORY_OF_THE_GLORIOUS_PAST);
setQuestNameNpcStringId(NpcStringId.LV_58_64_MEMORY_OF_THE_GLORIOUS_PAST);
}
@Override

4
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10977_TracesOfBattle/Q10977_TracesOfBattle.java vendored
View File

@@ -51,7 +51,7 @@ public class Q10977_TracesOfBattle extends Quest
private static final ItemHolder SAYHA_GUST = new ItemHolder(91776, 9);
private static final ItemHolder SPIRIT_ORE = new ItemHolder(3031, 450);
// Misc
private static final int MIN_LEVEL = 45;
private static final int MIN_LEVEL = 64;
private static final String KILL_COUNT_VAR = "KillCount";
public Q10977_TracesOfBattle()
@@ -61,7 +61,7 @@ public class Q10977_TracesOfBattle extends Quest
addTalkId(ORVEN);
addKillId(GRAVEYARD_WANDERER, ARCHER_OF_GREED, HATAR_RATMAN_THIEF, HATAR_RATMAN_BOSS, HATAR_HANISHEE, DEPRIVE, TAIK_ORC_SUPPLY, VIOLLENT_FARCRAN, FIERCE_GUARD);
addCondMinLevel(MIN_LEVEL, "no_lvl.html");
setQuestNameNpcStringId(NpcStringId.LV_45_TRACES_OF_BATTLE);
setQuestNameNpcStringId(NpcStringId.LV_64_70_TRACES_OF_BATTLE);
}
@Override

12
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java
View File

@@ -301,7 +301,7 @@ public class CommissionManager
commissionItem.setSaleEndTask(saleEndTask);
_commissionItems.put(commissionItem.getCommissionId(), commissionItem);
player.getLastCommissionInfos().put(itemInstance.getId(), new ExResponseCommissionInfo(itemInstance.getId(), pricePerUnit, itemCount, (byte) ((durationInDays - 1) / 2)));
player.sendPacket(SystemMessageId.THE_ITEM_HAS_BEEN_SUCCESSFULLY_REGISTERED);
player.sendPacket(SystemMessageId.THE_ITEM_HAS_BEEN_REGISTERED);
player.sendPacket(ExResponseCommissionRegister.SUCCEED);
}
@@ -326,7 +326,7 @@ public class CommissionManager
final CommissionItem commissionItem = getCommissionItem(commissionId);
if (commissionItem == null)
{
player.sendPacket(SystemMessageId.CANCELLATION_OF_SALE_HAS_FAILED_BECAUSE_REQUIREMENTS_ARE_NOT_MET);
player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_THE_SALE);
player.sendPacket(ExResponseCommissionDelete.FAILED);
return;
}
@@ -340,14 +340,14 @@ public class CommissionManager
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.CANCELLATION_OF_SALE_HAS_FAILED_BECAUSE_REQUIREMENTS_ARE_NOT_MET);
player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_THE_SALE);
player.sendPacket(ExResponseCommissionDelete.FAILED);
return;
}
if ((_commissionItems.remove(commissionId) == null) || !commissionItem.getSaleEndTask().cancel(false))
{
player.sendPacket(SystemMessageId.CANCELLATION_OF_SALE_HAS_FAILED_BECAUSE_REQUIREMENTS_ARE_NOT_MET);
player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_THE_SALE);
player.sendPacket(ExResponseCommissionDelete.FAILED);
return;
}
@@ -355,12 +355,12 @@ public class CommissionManager
if (deleteItemFromDB(commissionId))
{
player.getInventory().addItem("Commission Cancellation", commissionItem.getItemInstance(), player, null);
player.sendPacket(SystemMessageId.CANCELLATION_OF_SALE_FOR_THE_ITEM_IS_SUCCESSFUL);
player.sendPacket(SystemMessageId.THE_SALE_IS_CANCELLED);
player.sendPacket(ExResponseCommissionDelete.SUCCEED);
}
else
{
player.sendPacket(SystemMessageId.CANCELLATION_OF_SALE_HAS_FAILED_BECAUSE_REQUIREMENTS_ARE_NOT_MET);
player.sendPacket(SystemMessageId.FAILED_TO_CANCEL_THE_SALE);
player.sendPacket(ExResponseCommissionDelete.FAILED);
}
}

4
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Summon.java
View File

@@ -765,7 +765,7 @@ public abstract class Summon extends Playable
}
else
{
sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm = new SystemMessage(SystemMessageId.C1_HAS_DEALT_S3_DAMAGE_TO_C2);
sm.addNpcName(this);
sm.addString(target.getName());
sm.addInt(damage);
@@ -783,7 +783,7 @@ public abstract class Summon extends Playable
if (!isDead() && !isHpBlocked() && (_owner != null) && (attacker != null) && (!_owner.isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF)))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_RECEIVES_S3_DAMAGE_FROM_TARGET_C2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2);
sm.addNpcName(this);
sm.addString(attacker.getName());
sm.addInt((int) damage);

4
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
View File

@@ -150,7 +150,7 @@ public class DoppelgangerInstance extends Npc
}
else
{
sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm = new SystemMessage(SystemMessageId.C1_HAS_DEALT_S3_DAMAGE_TO_C2);
sm.addNpcName(this);
sm.addString(target.getName());
sm.addInt(damage);
@@ -168,7 +168,7 @@ public class DoppelgangerInstance extends Npc
if ((getSummoner() != null) && getSummoner().isPlayer() && (attacker != null) && !isDead() && !isHpBlocked())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_RECEIVES_S3_DAMAGE_FROM_TARGET_C2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2);
sm.addNpcName(this);
sm.addString(attacker.getName());
sm.addInt((int) damage);

10
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -9297,12 +9297,12 @@ public class PlayerInstance extends Playable
}
if (_isInDuel || _startingDuel)
{
_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL;
_noDuelReason = SystemMessageId.C1_IS_ALREADY_IN_A_DUEL;
return false;
}
if (_inOlympiadMode || isOnEvent(CeremonyOfChaosEvent.class))
{
_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_OR_THE_CEREMONY_OF_CHAOS;
_noDuelReason = SystemMessageId.C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_OR_THE_CEREMONY_OF_CHAOS_AND_THEREFORE_CANNOT_DUEL;
return false;
}
if (isOnEvent()) // custom event message
@@ -9312,7 +9312,7 @@ public class PlayerInstance extends Playable
}
if (isCursedWeaponEquipped())
{
_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_IN_A_CHAOTIC_OR_PURPLE_STATE;
_noDuelReason = SystemMessageId.C1_IS_IN_A_CHAOTIC_OR_PURPLE_STATE_AND_CANNOT_PARTICIPATE_IN_A_DUEL;
return false;
}
if (_privateStoreType != PrivateStoreType.NONE)
@@ -9322,7 +9322,7 @@ public class PlayerInstance extends Playable
}
if (isMounted() || isInBoat())
{
_noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_RIDING_A_BOAT_FENRIR_OR_STRIDER;
_noDuelReason = SystemMessageId.C1_IS_RIDING_A_BOAT_FENRIR_OR_STRIDER_AND_THEREFORE_CANNOT_DUEL;
return false;
}
if (isFishing())
@@ -11573,7 +11573,7 @@ public class PlayerInstance extends Playable
}
else
{
sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm = new SystemMessage(SystemMessageId.C1_HAS_DEALT_S3_DAMAGE_TO_C2);
}
sm.addPcName(this);

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -275,7 +275,7 @@ public class TrapInstance extends Npc
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_DEALT_S3_DAMAGE_TO_C2);
sm.addString(getName());
sm.addString(target.getName());
sm.addInt(damage);

4
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@@ -578,7 +578,7 @@ public class VillageMasterInstance extends NpcInstance
player.setActiveClass(player.getTotalSubClasses());
html.setFile(player, "data/html/villagemaster/SubClass_AddOk.htm");
player.sendPacket(SystemMessageId.THE_NEW_DUAL_CLASS_S1_HAS_BEEN_ADDED_CONGRATS); // Subclass added.
player.sendPacket(SystemMessageId.YOU_HAVE_ACHIEVED_THE_SECOND_CLASS_S1_CONGRATS); // Subclass added.
}
else
{
@@ -690,7 +690,7 @@ public class VillageMasterInstance extends NpcInstance
html.setFile(player, "data/html/villagemaster/SubClass_ModifyOk.htm");
html.replace("%name%", ClassListData.getInstance().getClass(paramTwo).getClientCode());
player.sendPacket(SystemMessageId.THE_NEW_DUAL_CLASS_S1_HAS_BEEN_ADDED_CONGRATS); // Subclass added.
player.sendPacket(SystemMessageId.YOU_HAVE_ACHIEVED_THE_SECOND_CLASS_S1_CONGRATS); // Subclass added.
}
else
{

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/status/PetStatus.java
View File

@@ -51,7 +51,7 @@ public class PetStatus extends SummonStatus
{
if (!isDOT && (getActiveChar().getOwner() != null))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_BY_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_DEALS_S2_DAMAGE_TO_THE_PET);
sm.addString(attacker.getName());
sm.addInt((int) value);
getActiveChar().sendPacket(sm);

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
View File

@@ -250,7 +250,7 @@ public class PlayerStatus extends PlayableStatus
if ((fullValue > 0) && !isDOT)
{
// Send a System Message to the PlayerInstance
SystemMessage smsg = new SystemMessage(SystemMessageId.C1_RECEIVES_S3_DAMAGE_FROM_TARGET_C2);
SystemMessage smsg = new SystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2);
smsg.addString(getActiveChar().getName());
// Localisation related.

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@@ -56,7 +56,7 @@ public class OlympiadAnnouncer implements Runnable
}
case CLASSED:
{
npcString = NpcStringId.OLYMPIAD_CLASS_INDIVIDUAL_MATCH_IS_GOING_TO_BEGIN_IN_ARENA_S1_IN_A_MOMENT;
npcString = NpcStringId.THE_CLASS_DUELS_WILL_START_SHORTLY_IN_ARENA_S1;
break;
}
default:

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/residences/ClanHall.java
View File

@@ -374,7 +374,7 @@ public class ClanHall extends AbstractResidence
else
{
_checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day
final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_DEPOSIT_THE_NECESSARY_AMOUNT_OF_ADENA_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
sm.addInt(_lease);
_owner.broadcastToOnlineMembers(sm);
}

2856
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/NpcStringId.java
View File

File diff suppressed because it is too large Load Diff

855
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/SystemMessageId.java
View File

File diff suppressed because it is too large Load Diff

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@@ -370,7 +370,7 @@ public class EnterWorld implements IClientIncomingPacket
final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan);
if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_DEPOSIT_THE_NECESSARY_AMOUNT_OF_ADENA_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
sm.addInt(ch.getLease());
player.sendPacket(sm);
}

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
View File

@@ -187,7 +187,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
playerIU.addNewItem(newItem);
}
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(item.getId());
sm.addLong(count);
player.sendPacket(sm);

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
View File

@@ -64,7 +64,7 @@ public class RequestDuelAnswerStart implements IClientIncomingPacket
SystemMessage msg2 = null;
if (requestor.isInDuel())
{
msg1 = new SystemMessage(SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL);
msg1 = new SystemMessage(SystemMessageId.C1_IS_ALREADY_IN_A_DUEL);
msg1.addString(requestor.getName());
player.sendPacket(msg1);
return;

6
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -122,7 +122,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
// first validation check - also over enchant check
if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit())))))
{
client.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
client.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
@@ -163,7 +163,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
// last validation check
if ((item.getOwnerId() != player.getObjectId()) || !item.isEnchantable())
{
client.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
client.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
@@ -174,7 +174,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
{
case ERROR:
{
client.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
client.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
break;

4
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java
View File

@@ -66,7 +66,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket
if ((item == null) || (scroll == null))
{
// message may be custom
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.sendPacket(new ExPutEnchantScrollItemResult(0));
request.setEnchantingItem(PlayerInstance.ID_NONE);
request.setEnchantingScroll(PlayerInstance.ID_NONE);
@@ -77,7 +77,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket
if ((scrollTemplate == null))
{
// message may be custom
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.sendPacket(new ExPutEnchantScrollItemResult(0));
request.setEnchantingScroll(PlayerInstance.ID_NONE);
return;

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
View File

@@ -216,7 +216,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
}
else
{
sm = new SystemMessage(SystemMessageId.S2_ELEMENTAL_POWER_HAS_BEEN_ADDED_SUCCESSFULLY_TO_S1);
sm = new SystemMessage(SystemMessageId.S2_ATTRIBUTE_HAS_BEEN_ADDED_TO_S1);
}
sm.addItemName(item);
sm.addAttribute(realElement.getClientId());

4
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
View File

@@ -68,7 +68,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke
if ((item == null) || (scroll == null) || (support == null))
{
// message may be custom
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
request.setEnchantingItem(PlayerInstance.ID_NONE);
request.setSupportItem(PlayerInstance.ID_NONE);
return;
@@ -79,7 +79,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke
if ((scrollTemplate == null) || (supportTemplate == null) || !scrollTemplate.isValid(item, supportTemplate))
{
// message may be custom
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
request.setSupportItem(PlayerInstance.ID_NONE);
player.sendPacket(new ExPutEnchantSupportItemResult(0));
return;

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
View File

@@ -216,7 +216,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
playerIU.addNewItem(newItem);
}
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2);
sm.addItemName(item.getId());
sm.addLong(count);
client.sendPacket(sm);

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
View File

@@ -117,7 +117,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
}
else if ((warehouse instanceof ClanWarehouse) && !player.isClanLeader())
{
player.sendPacket(SystemMessageId.ITEMS_LEFT_AT_THE_CLAN_HALL_WAREHOUSE_CAN_ONLY_BE_RETRIEVED_BY_THE_CLAN_LEADER_DO_YOU_WANT_TO_CONTINUE);
player.sendPacket(SystemMessageId.ITEMS_LEFT_IN_THE_CLAN_WAREHOUSE_CAN_ONLY_BE_RETRIEVED_BY_THE_CLAN_LEADER_CONTINUE);
return;
}

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritAbsorb.java
View File

@@ -74,7 +74,7 @@ public class ExElementalSpiritAbsorb implements IClientIncomingPacket
final boolean canAbsorb = checkConditions(player, spirit);
if (canAbsorb)
{
client.sendPacket(SystemMessageId.SUCCESFUL_ABSORPTION);
client.sendPacket(SystemMessageId.SUCCESSFUL_ABSORPTION);
spirit.addExperience(absorbItem.getExperience() * _amount);
final UserInfo userInfo = new UserInfo(player);
userInfo.addComponentType(UserInfoType.ATT_SPIRITS);

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/elementalspirits/ExElementalSpiritChangeType.java
View File

@@ -60,6 +60,6 @@ public class ExElementalSpiritChangeType implements IClientIncomingPacket
player.changeElementalSpirit(_element);
client.sendPacket(new ElementalSpiritInfo(player, _element, _type));
client.sendPacket(new SystemMessage(SystemMessageId.S1_WILL_BE_YOUR_ATTRIBUTE_ATTACK_FROM_NOW_ON).addElementalSpirit(_element));
client.sendPacket(new SystemMessage(SystemMessageId.S1_WILL_BE_YOUR_ATTACK_ATTRIBUTE_FROM_NOW_ON).addElementalSpirit(_element));
}
}

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java
View File

@@ -159,7 +159,7 @@ public class RequestLuckyGamePlay implements IClientIncomingPacket
iu.addItem(item);
if (reward.getKey() == LuckyGameItemType.UNIQUE)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_OF_S3_THROUGH_FORTUNE_READING);
final SystemMessage sm = new SystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_X_S3_IN_THE_STANDARD_LUCKY_GAME);
sm.addPcName(player);
sm.addLong(r.getCount());
sm.addItemName(item);