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

6
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java vendored
View File

@@ -337,7 +337,7 @@ public final 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.EMPTY_462);
return;
}
@@ -360,7 +360,7 @@ public final class ClanHallAuctioneer extends AbstractNpcAI
player.sendPacket(SystemMessageId.YOU_HAVE_REGISTERED_FOR_A_CLAN_HALL_AUCTION);
if (bid > Inventory.MAX_ADENA)
{
player.sendPacket(SystemMessageId.BIDDING_IS_NOT_ALLOWED_BECAUSE_THE_MAXIMUM_BIDDING_PRICE_EXCEEDS_100_BILLION);
player.sendPacket(SystemMessageId.THE_HIGHEST_BID_IS_OVER_999_9_BILLION_THEREFORE_YOU_CANNOT_PLACE_A_BID);
return;
}
final ClanHallAuction auction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId);
@@ -382,7 +382,7 @@ public final class ClanHallAuctioneer extends AbstractNpcAI
final L2PcInstance leader = bidder.get().getClan().getLeader().getPlayerInstance();
if ((leader != null) && leader.isOnline())
{
leader.sendPacket(SystemMessageId.YOU_HAVE_BEEN_OUTBID);
leader.sendPacket(SystemMessageId.YOU_WERE_OUTBID_THE_NEW_HIGHEST_BID_IS_S1_ADENA);
}
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java vendored
View File

@@ -477,7 +477,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_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java vendored
View File

@@ -71,7 +71,7 @@ public final 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
}
};

2
L2J_Mobius_Classic_2.0_Zaken/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_Classic_2.0_Zaken/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_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Observation.java vendored
View File

@@ -96,7 +96,7 @@ public class Observation implements IBypassHandler
if (activeChar.hasSummon())
{
activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_OBSERVE_A_SIEGE_WITH_A_PET_OR_SERVITOR_SUMMONED);
activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_OBSERVE_A_SIEGE_WITH_A_SERVITOR_SUMMONED);
return false;
}
if (activeChar.isOnEvent())

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java vendored
View File

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

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatShout.java vendored
View File

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

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java vendored
View File

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

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java vendored
View File

@@ -109,7 +109,7 @@ public final class ChatWhisper implements IChatHandler
}
if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.getWhisperers().contains(receiver.getObjectId()) && !activeChar.canOverrideCond(PcCondOverride.CHAT_CONDITIONS))
{
activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PLAYERS_CAN_RESPOND_TO_A_WHISPER_BUT_CANNOT_INITIATE_A_WHISPER_UNTIL_LV_S1).addInt(Config.MINIMUM_CHAT_LEVEL));
activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NON_PREMIUM_USERS_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_Classic_2.0_Zaken/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_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java vendored
View File

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

2
L2J_Mobius_Classic_2.0_Zaken/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;

10
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java vendored
View File

@@ -49,21 +49,21 @@ public class BeastSoulShot implements IItemHandler
final L2PcInstance 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;
}
final L2Summon pet = playable.getPet();
if ((pet != null) && pet.isDead())
{
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_SERVITOR_SAD_ISN_T_IT);
return false;
}
final List<L2Summon> aliveServitor = playable.getServitors().values().stream().filter(s -> !s.isDead()).collect(Collectors.toList());
if ((pet == null) && aliveServitor.isEmpty())
{
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_SERVITOR_SAD_ISN_T_IT);
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;
}

10
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java vendored
View File

@@ -49,21 +49,21 @@ public class BeastSpiritShot implements IItemHandler
final L2PcInstance 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;
}
final L2Summon pet = playable.getPet();
if ((pet != null) && pet.isDead())
{
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_SERVITOR_SAD_ISN_T_IT);
return false;
}
final List<L2Summon> aliveServitor = playable.getServitors().values().stream().filter(s -> !s.isDead()).collect(Collectors.toList());
if ((pet == null) && aliveServitor.isEmpty())
{
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_SERVITOR_SAD_ISN_T_IT);
return false;
}
@@ -102,7 +102,7 @@ public class BeastSpiritShot implements IItemHandler
// Not enough SpiritShots to use.
if (!activeOwner.disableAutoShot(itemId))
{
activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SPIRITSHOTS_NEEDED_FOR_A_PET_SERVITOR);
activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SPIRITSHOTS_NEEDED_FOR_A_SERVITOR);
}
return false;
}
@@ -111,7 +111,7 @@ public class BeastSpiritShot implements IItemHandler
{
if (!activeOwner.disableAutoShot(itemId))
{
activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SPIRITSHOTS_NEEDED_FOR_A_PET_SERVITOR);
activeOwner.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SPIRITSHOTS_NEEDED_FOR_A_SERVITOR);
}
return false;
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -60,7 +60,7 @@ public class ExtractableItems implements IItemHandler
if (!activeChar.isInventoryUnder80(false))
{
activeChar.sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);
activeChar.sendPacket(SystemMessageId.EMPTY_463);
return false;
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java vendored
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.EMPTY_463);
return false;
}

4
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -81,7 +81,7 @@ public class ItemSkillsTemplate implements IItemHandler
{
if (itemSkill.hasEffectType(L2EffectType.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.EMPTY_463);
return false;
}
@@ -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;
}
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java vendored
View File

@@ -46,7 +46,7 @@ public class SummonItems extends ItemSkillsTemplate
if (activeChar.isSitting())
{
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_ACTIONS_AND_SKILLS_WHILE_THE_CHARACTER_IS_SITTING);
return false;
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/playeractions/PetAttack.java vendored
View File

@@ -44,7 +44,7 @@ public final class PetAttack implements IPlayerActionHandler
}
else if (pet.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
}
else if (pet.canAttack(activeChar.getTarget(), ctrlPressed))
{

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/playeractions/PetHold.java vendored
View File

@@ -45,7 +45,7 @@ public final class PetHold implements IPlayerActionHandler
}
else if (pet.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
}
else
{

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/playeractions/PetMove.java vendored
View File

@@ -45,7 +45,7 @@ public final class PetMove implements IPlayerActionHandler
}
else if (pet.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
}
else if ((activeChar.getTarget() != null) && (pet != activeChar.getTarget()) && !pet.isMovementDisabled())
{

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java vendored
View File

@@ -50,7 +50,7 @@ public final class PetSkillUse implements IPlayerActionHandler
}
else if (pet.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
}
else if ((pet.getLevel() - activeChar.getLevel()) > 20)
{

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/playeractions/PetStop.java vendored
View File

@@ -44,7 +44,7 @@ public final class PetStop implements IPlayerActionHandler
}
else if (pet.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
}
else
{

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorHold.java vendored
View File

@@ -41,7 +41,7 @@ public final class ServitorHold implements IPlayerActionHandler
{
if (s.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
return;
}

4
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorMode.java vendored
View File

@@ -45,7 +45,7 @@ public final class ServitorMode implements IPlayerActionHandler
{
if (s.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
return;
}
@@ -59,7 +59,7 @@ public final class ServitorMode implements IPlayerActionHandler
{
if (s.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
return;
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorMove.java vendored
View File

@@ -43,7 +43,7 @@ public final class ServitorMove implements IPlayerActionHandler
{
if (s.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
return;
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java vendored
View File

@@ -49,7 +49,7 @@ public final class ServitorSkillUse implements IPlayerActionHandler
{
if (summon.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
return;
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorStop.java vendored
View File

@@ -40,7 +40,7 @@ public final class ServitorStop implements IPlayerActionHandler
{
if (s.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
return;
}

4
L2J_Mobius_Classic_2.0_Zaken/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_Classic_2.0_Zaken/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -39,7 +39,7 @@ public final class UnsummonServitor implements IPlayerActionHandler
{
if (s.isBetrayed())
{
activeChar.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
activeChar.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
canUnsummon = false;
break;
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java vendored
View File

@@ -97,7 +97,7 @@ public class BuildCampSkillCondition implements ISkillCondition
}
else if (!player.isInsideZone(ZoneId.HQ))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_HERE);
player.sendPacket(SystemMessageId.YOU_CAN_T_BUILD_HEADQUARTERS_HERE);
canCreateBase = false;
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java vendored
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())

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java vendored
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())

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java vendored
View File

@@ -55,7 +55,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;
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java vendored
View File

@@ -69,7 +69,7 @@ public class OpCheckFlagSkillCondition implements ISkillCondition
}
else if (!Util.checkIfInRange(200, player, target, true))
{
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeFort = false;
}
return canTakeFort;

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java vendored
View File

@@ -68,7 +68,7 @@ public class PossessHolythingSkillCondition implements ISkillCondition
}
else if (!Util.checkIfInRange(skill.getCastRange(), player, target, true))
{
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
canTakeCastle = false;
}
return canTakeCastle;

4
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/targethandlers/Enemy.java vendored
View File

@@ -95,7 +95,7 @@ public class Enemy implements ITargetTypeHandler
{
if (sendMessage)
{
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
}
return null;
@@ -118,7 +118,7 @@ public class Enemy implements ITargetTypeHandler
{
if (sendMessage)
{
activeChar.sendPacket(SystemMessageId.A_MALICIOUS_SKILL_CANNOT_BE_USED_IN_A_PEACE_ZONE);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILLS_THAT_MAY_HARM_OTHER_PLAYERS_IN_HERE);
}
return null;

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java vendored
View File

@@ -66,7 +66,7 @@ public class EnemyNot implements ITargetTypeHandler
{
if (sendMessage)
{
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
}
return null;

4
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java vendored
View File

@@ -95,7 +95,7 @@ public class EnemyOnly implements ITargetTypeHandler
{
if (sendMessage)
{
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
}
return null;
@@ -118,7 +118,7 @@ public class EnemyOnly implements ITargetTypeHandler
{
if (sendMessage)
{
activeChar.sendPacket(SystemMessageId.A_MALICIOUS_SKILL_CANNOT_BE_USED_IN_A_PEACE_ZONE);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILLS_THAT_MAY_HARM_OTHER_PLAYERS_IN_HERE);
}
return null;

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@@ -66,7 +66,7 @@ public class Ground implements ITargetTypeHandler
{
if (sendMessage)
{
activeChar.sendPacket(SystemMessageId.A_MALICIOUS_SKILL_CANNOT_BE_USED_IN_A_PEACE_ZONE);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILLS_THAT_MAY_HARM_OTHER_PLAYERS_IN_HERE);
}
return null;
}

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/targethandlers/NpcBody.java vendored
View File

@@ -72,7 +72,7 @@ public class NpcBody implements ITargetTypeHandler
{
if (sendMessage)
{
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
}
return null;

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/targethandlers/PcBody.java vendored
View File

@@ -99,7 +99,7 @@ public class PcBody implements ITargetTypeHandler
{
if (sendMessage)
{
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
}
return null;

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/targethandlers/Self.java vendored
View File

@@ -43,7 +43,7 @@ public class Self implements ITargetTypeHandler
{
if (sendMessage)
{
activeChar.sendPacket(SystemMessageId.A_MALICIOUS_SKILL_CANNOT_BE_USED_IN_A_PEACE_ZONE);
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILLS_THAT_MAY_HARM_OTHER_PLAYERS_IN_HERE);
}
return null;

2
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/targethandlers/Target.java vendored
View File

@@ -68,7 +68,7 @@ public class Target implements ITargetTypeHandler
{
if (sendMessage)
{
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
activeChar.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_CANCELLED);
}
return null;

2
L2J_Mobius_Classic_2.0_Zaken/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)
{

4
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java vendored
View File

@@ -44,9 +44,9 @@ public class OlympiadStat implements IUserCommandHandler
final int nobleObjId = activeChar.getObjectId();
final L2Object target = activeChar.getTarget();
if ((target == null) || !target.isPlayer() || !target.getActingPlayer().isNoble())
if ((target == null) || !target.isPlayer() || (target.getActingPlayer().getClassId().level() < 2))
{
activeChar.sendPacket(SystemMessageId.THIS_COMMAND_CAN_ONLY_BE_USED_WHEN_THE_TARGET_IS_AN_AWAKENED_NOBLESSE_EXALTED);
activeChar.sendPacket(SystemMessageId.COMMAND_AVAILABLE_FOR_THOSE_WHO_HAVE_COMPLETED_2ND_CLASS_TRANSFER);
return false;
}

2
L2J_Mobius_Classic_2.0_Zaken/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;
}

4
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java vendored
View File

@@ -48,7 +48,7 @@ public class SiegeStatus implements IUserCommandHandler
if (!activeChar.isNoble() || !activeChar.isClanLeader())
{
activeChar.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_THAT_IS_A_NOBLESSE_EXALTED_CAN_VIEW_THE_SIEGE_WAR_STATUS_WINDOW_DURING_A_SIEGE_WAR);
activeChar.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_THAT_IS_A_NOBLESSE_OR_EXALTED_CAN_VIEW_THE_SIEGE_STATUS_WINDOW_DURING_A_SIEGE_WAR);
return false;
}
@@ -86,7 +86,7 @@ public class SiegeStatus implements IUserCommandHandler
return true;
}
activeChar.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_THAT_IS_A_NOBLESSE_EXALTED_CAN_VIEW_THE_SIEGE_WAR_STATUS_WINDOW_DURING_A_SIEGE_WAR);
activeChar.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_THAT_IS_A_NOBLESSE_OR_EXALTED_CAN_VIEW_THE_SIEGE_STATUS_WINDOW_DURING_A_SIEGE_WAR);
return false;
}

2
L2J_Mobius_Classic_2.0_Zaken/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);
}