Updated system messages and NPC strings.

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

View File

@@ -73,7 +73,7 @@ public final class TalentShow extends AbstractNpcAI
NpcStringId.DID_YOU_LIKE_IT_THAT_WAS_SO_AMAZING,
NpcStringId.NOW_WE_ALSO_INVITED_INDIVIDUALS_WITH_SPECIAL_TALENTS,
NpcStringId.LET_S_WELCOME_THE_FIRST_PERSON_HERE,
NpcStringId.EMPTY3,
NpcStringId.OH,
NpcStringId.OKAY_NOW_HERE_COMES_THE_NEXT_PERSON_COME_ON_UP_PLEASE,
NpcStringId.OH_IT_LOOKS_LIKE_SOMETHING_GREAT_IS_GOING_TO_HAPPEN_RIGHT,
NpcStringId.OH_MY,

View File

@@ -186,7 +186,7 @@ public final class Core extends AbstractNpcAI
npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, objId, npc.getX(), npc.getY(), npc.getZ()));
npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.A_FATAL_ERROR_HAS_OCCURRED));
npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN));
npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DOT_DOT_DOT_DOT_DOT_DOT));
npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.EMPTY));
_firstAttacked = false;
GrandBossManager.getInstance().setBossStatus(CORE, DEAD);

View File

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

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.FRIEND_LIST_FOOTER);
activeChar.sendPacket(SystemMessageId.EMPTY_3);
}
@Override

View File

@@ -181,7 +181,7 @@ public class QuestLink implements IBypassHandler
{
if (((q.getId() >= 1) && (q.getId() < 20000)) && ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(true)))
{
player.sendPacket(SystemMessageId.PROGRESS_IN_A_QUEST_IS_POSSIBLE_ONLY_WHEN_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
return;
}

View File

@@ -39,7 +39,7 @@ public class ReceivePremium implements IBypassHandler
if (activeChar.getPremiumItemList().isEmpty())
{
activeChar.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_VITAMIN_ITEMS_TO_BE_FOUND);
activeChar.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
return false;
}

View File

@@ -95,8 +95,8 @@ public final class Lethal extends AbstractEffect
if (target.isPlayer())
{
target.setCurrentCp(1);
target.sendPacket(SystemMessageId.CP_SIPHON);
target.sendPacket(SystemMessageId.YOUR_CP_WAS_DRAINED_BECAUSE_YOU_WERE_HIT_WITH_A_CP_SIPHON_SKILL);
target.sendPacket(SystemMessageId.HALF_KILL);
target.sendPacket(SystemMessageId.YOUR_CP_WAS_DRAINED_BECAUSE_YOU_WERE_HIT_WITH_A_HALF_KILL_SKILL);
}
// for Monsters HP is set to 50%.
else if (target.isMonster() || target.isSummon())
@@ -104,7 +104,7 @@ public final class Lethal extends AbstractEffect
target.notifyDamageReceived(target.getCurrentHp() * 0.5, info.getEffector(), info.getSkill(), true, false);
target.setCurrentHp(target.getCurrentHp() * 0.5);
}
activeChar.sendPacket(SystemMessageId.CP_SIPHON);
activeChar.sendPacket(SystemMessageId.HALF_KILL);
}
}
}

View File

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

View File

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

View File

@@ -44,7 +44,7 @@ public class MyBirthday implements IUserCommandHandler
final Calendar date = activeChar.getCreateDate();
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_CHARACTER_BIRTHDAY_IS_S3_S4_S2);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_BIRTHDAY_IS_S3_S4_S2);
sm.addPcName(activeChar);
sm.addString(Integer.toString(date.get(Calendar.YEAR)));
sm.addString(Integer.toString(date.get(Calendar.MONTH) + 1));

View File

@@ -62,14 +62,14 @@ public class OlympiadStat implements IUserCommandHandler
return false;
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_CURRENT_RECORD_FOR_THIS_GRAND_OLYMPIAD_IS_S1_MATCH_ES_S2_WIN_S_AND_S3_DEFEAT_S_YOU_HAVE_EARNED_S4_OLYMPIAD_POINT_S);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FOR_THE_CURRENT_GRAND_OLYMPIAD_YOU_HAVE_PARTICIPATED_IN_S1_MATCH_ES_S2_WIN_S_AND_S3_DEFEAT_S_YOU_CURRENTLY_HAVE_S4_OLYMPIAD_POINT_S);
sm.addInt(Olympiad.getInstance().getCompetitionDone(nobleObjId));
sm.addInt(Olympiad.getInstance().getCompetitionWon(nobleObjId));
sm.addInt(Olympiad.getInstance().getCompetitionLost(nobleObjId));
sm.addInt(Olympiad.getInstance().getNoblePoints(nobleObjId));
activeChar.sendPacket(sm);
final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.THE_MATCHES_THIS_WEEK_ARE_ALL_CLASS_BATTLES_THE_NUMBER_OF_MATCHES_THAT_ARE_ALLOWED_TO_PARTICIPATE_IS_S1);
final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_S1_MATCH_ES_REMAINING_THAT_YOU_CAN_PARTICIPATE_IN_THIS_WEEK_S2_1_VS_1_CLASS_MATCHES_S3_1_VS_1_MATCHES_S4_3_VS_3_TEAM_MATCHES);
sm2.addInt(Olympiad.getInstance().getRemainingWeeklyMatches(nobleObjId));
sm2.addInt(Olympiad.getInstance().getRemainingWeeklyMatchesClassed(nobleObjId));
sm2.addInt(Olympiad.getInstance().getRemainingWeeklyMatchesNonClassed(nobleObjId));

View File

@@ -82,7 +82,7 @@ public class PartyInfo implements IUserCommandHandler
}
activeChar.sendMessage("Members: " + party.getMemberCount() + "/9"); // TODO: Custom?
}
activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
activeChar.sendPacket(SystemMessageId.EMPTY_3);
return true;
}

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);
}

View File

@@ -143,7 +143,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);