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

Proper use of SystemMessage ids.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-11-23 03:09:34 +00:00
parent 8e40c9bb53
commit b329e89ec4
34 changed files with 164 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java
View File

@@ -48,7 +48,7 @@ public class SoulShots implements IItemHandler
Weapon weapon = activeChar.getActiveWeapon(); Weapon weapon = activeChar.getActiveWeapon();
if (weapon == null) if (weapon == null)
{ {
activeChar.sendPacket(new SystemMessage(339)); activeChar.sendPacket(new SystemMessage(SystemMessage.CANNOT_USE_SOULSHOTS));
return 0; return 0;
} }
int grade = weapon.getCrystalType(); int grade = weapon.getCrystalType();
@@ -56,21 +56,21 @@ public class SoulShots implements IItemHandler
int count = item.getCount(); int count = item.getCount();
if (soulShotConsumption == 0) if (soulShotConsumption == 0)
{ {
activeChar.sendPacket(new SystemMessage(339)); activeChar.sendPacket(new SystemMessage(SystemMessage.CANNOT_USE_SOULSHOTS));
return 0; return 0;
} }
if (((grade == 1) && (SoulshotId != 1835)) || ((grade == 2) && (SoulshotId != 1463)) || ((grade == 3) && (SoulshotId != 1464)) || ((grade == 4) && (SoulshotId != 1465)) || ((grade == 5) && (SoulshotId != 1466)) || ((grade == 6) && (SoulshotId != 1467))) if (((grade == 1) && (SoulshotId != 1835)) || ((grade == 2) && (SoulshotId != 1463)) || ((grade == 3) && (SoulshotId != 1464)) || ((grade == 4) && (SoulshotId != 1465)) || ((grade == 5) && (SoulshotId != 1466)) || ((grade == 6) && (SoulshotId != 1467)))
{ {
activeChar.sendPacket(new SystemMessage(337)); activeChar.sendPacket(new SystemMessage(SystemMessage.SOULSHOTS_GRADE_MISMATCH));
return 0; return 0;
} }
if (count < soulShotConsumption) if (count < soulShotConsumption)
{ {
activeChar.sendPacket(new SystemMessage(338)); activeChar.sendPacket(new SystemMessage(SystemMessage.NOT_ENOUGH_SOULSHOTS));
return 0; return 0;
} }
activeChar.setActiveSoulshotGrade(grade); activeChar.setActiveSoulshotGrade(grade);
activeChar.sendPacket(new SystemMessage(342)); activeChar.sendPacket(new SystemMessage(SystemMessage.ENABLED_SOULSHOT));
WorldObject OldTarget = activeChar.getTarget(); WorldObject OldTarget = activeChar.getTarget();
activeChar.setTarget(activeChar); activeChar.setTarget(activeChar);
MagicSkillUser MSU = new MagicSkillUser(activeChar, 2039, 1, 0, 0); MagicSkillUser MSU = new MagicSkillUser(activeChar, 2039, 1, 0, 0);

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/skillhandlers/DamageSkill.java
View File

@@ -62,7 +62,7 @@ public class DamageSkill implements ISkillHandler
mdef = 350; mdef = 350;
} }
int dmg = (int) ((91 * skill.getPower() * Math.sqrt(activeChar.getMagicalAttack())) / mdef); int dmg = (int) ((91 * skill.getPower() * Math.sqrt(activeChar.getMagicalAttack())) / mdef);
SystemMessage sm = new SystemMessage(35); SystemMessage sm = new SystemMessage(SystemMessage.YOU_DID_S1_DMG);
sm.addNumber(dmg); sm.addNumber(dmg);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
if (creature.getCurrentHp() > creature.getMaxHp()) if (creature.getCurrentHp() > creature.getMaxHp())

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/skillhandlers/HealSkill.java
View File

@@ -69,7 +69,7 @@ public class HealSkill implements ISkillHandler
StatusUpdate su = new StatusUpdate(player.getObjectId()); StatusUpdate su = new StatusUpdate(player.getObjectId());
su.addAttribute(StatusUpdate.CUR_HP, (int) hp); su.addAttribute(StatusUpdate.CUR_HP, (int) hp);
player.sendPacket(su); player.sendPacket(su);
player.sendPacket(new SystemMessage(25)); player.sendPacket(new SystemMessage(SystemMessage.REJUVENATING_HP));
} }
} }
else else
@@ -79,7 +79,7 @@ public class HealSkill implements ISkillHandler
StatusUpdate su = new StatusUpdate(activeChar.getObjectId()); StatusUpdate su = new StatusUpdate(activeChar.getObjectId());
su.addAttribute(StatusUpdate.CUR_HP, (int) hp); su.addAttribute(StatusUpdate.CUR_HP, (int) hp);
activeChar.sendPacket(su); activeChar.sendPacket(su);
activeChar.sendPacket(new SystemMessage(25)); activeChar.sendPacket(new SystemMessage(SystemMessage.REJUVENATING_HP));
} }
} }

20
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Party.java
View File

@@ -90,10 +90,10 @@ public class Party
PartySmallWindowAll window = new PartySmallWindowAll(); PartySmallWindowAll window = new PartySmallWindowAll();
window.setPartyList(_members); window.setPartyList(_members);
player.sendPacket(window); player.sendPacket(window);
SystemMessage msg = new SystemMessage(106); SystemMessage msg = new SystemMessage(SystemMessage.YOU_JOINED_S1_PARTY);
msg.addString(_members.get(0).getName()); msg.addString(_members.get(0).getName());
player.sendPacket(msg); player.sendPacket(msg);
msg = new SystemMessage(107); msg = new SystemMessage(SystemMessage.S1_JOINED_PARTY);
msg.addString(player.getName()); msg.addString(player.getName());
this.broadcastToPartyMembers(msg); this.broadcastToPartyMembers(msg);
this.broadcastToPartyMembers(new PartySmallWindowAdd(player)); this.broadcastToPartyMembers(new PartySmallWindowAdd(player));
@@ -107,11 +107,11 @@ public class Party
{ {
_members.remove(player); _members.remove(player);
_partyLvl -= player.getLevel() * player.getLevel(); _partyLvl -= player.getLevel() * player.getLevel();
SystemMessage msg = new SystemMessage(200); SystemMessage msg = new SystemMessage(SystemMessage.YOU_LEFT_PARTY);
player.sendPacket(msg); player.sendPacket(msg);
player.sendPacket(new PartySmallWindowDeleteAll()); player.sendPacket(new PartySmallWindowDeleteAll());
player.setParty(null); player.setParty(null);
msg = new SystemMessage(108); msg = new SystemMessage(SystemMessage.S1_LEFT_PARTY);
msg.addString(player.getName()); msg.addString(player.getName());
this.broadcastToPartyMembers(msg); this.broadcastToPartyMembers(msg);
this.broadcastToPartyMembers(new PartySmallWindowDelete(player)); this.broadcastToPartyMembers(new PartySmallWindowDelete(player));
@@ -169,7 +169,7 @@ public class Party
private void dissolveParty() private void dissolveParty()
{ {
SystemMessage msg = new SystemMessage(203); SystemMessage msg = new SystemMessage(SystemMessage.PARTY_DISPERSED);
for (int i = 0; i < _members.size(); ++i) for (int i = 0; i < _members.size(); ++i)
{ {
PlayerInstance temp = _members.get(i); PlayerInstance temp = _members.get(i);
@@ -186,21 +186,21 @@ public class Party
target = _randomLoot ? getRandomMember() : player; target = _randomLoot ? getRandomMember() : player;
if (item.getCount() == 1) if (item.getCount() == 1)
{ {
smsg = new SystemMessage(30); smsg = new SystemMessage(SystemMessage.YOU_PICKED_UP_S1);
smsg.addItemName(item.getItemId()); smsg.addItemName(item.getItemId());
target.sendPacket(smsg); target.sendPacket(smsg);
smsg = new SystemMessage(300); smsg = new SystemMessage(SystemMessage.S1_PICKED_UP_S2);
smsg.addString(target.getName()); smsg.addString(target.getName());
smsg.addItemName(item.getItemId()); smsg.addItemName(item.getItemId());
this.broadcastToPartyMembers(target, smsg); this.broadcastToPartyMembers(target, smsg);
} }
else else
{ {
smsg = new SystemMessage(29); smsg = new SystemMessage(SystemMessage.YOU_PICKED_UP_S1_S2);
smsg.addNumber(item.getCount()); smsg.addNumber(item.getCount());
smsg.addItemName(item.getItemId()); smsg.addItemName(item.getItemId());
target.sendPacket(smsg); target.sendPacket(smsg);
smsg = new SystemMessage(299); smsg = new SystemMessage(SystemMessage.S1_PICKED_UP_S2_S3);
smsg.addString(target.getName()); smsg.addString(target.getName());
smsg.addNumber(item.getCount()); smsg.addNumber(item.getCount());
smsg.addItemName(item.getItemId()); smsg.addItemName(item.getItemId());
@@ -224,7 +224,7 @@ public class Party
public void distributeAdena(ItemInstance adena) public void distributeAdena(ItemInstance adena)
{ {
adena.setCount(adena.getCount() / _members.size()); adena.setCount(adena.getCount() / _members.size());
SystemMessage smsg = new SystemMessage(28); SystemMessage smsg = new SystemMessage(SystemMessage.YOU_PICKED_UP_S1_ADENA);
smsg.addNumber(adena.getCount()); smsg.addNumber(adena.getCount());
for (int i = 0; i < _members.size(); ++i) for (int i = 0; i < _members.size(); ++i)
{ {

1
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/ShortCut.java
View File

@@ -22,6 +22,7 @@ public class ShortCut
public static final int TYPE_SKILL = 2; public static final int TYPE_SKILL = 2;
public static final int TYPE_ACTION = 3; public static final int TYPE_ACTION = 3;
public static final int TYPE_ITEM = 1; public static final int TYPE_ITEM = 1;
private int _slot; private int _slot;
private int _type; private int _type;
private int _id; private int _id;

8
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/TradeList.java
View File

@@ -269,23 +269,23 @@ public class TradeList
ItemInstance temp = buyerInv.addItem(newitem); ItemInstance temp = buyerInv.addItem(newitem);
if (amount == 1) if (amount == 1)
{ {
msg = new SystemMessage(378); msg = new SystemMessage(SystemMessage.S1_PURCHASED_S2);
msg.addString(buyer.getName()); msg.addString(buyer.getName());
msg.addItemName(((ItemInstance) sellerItem).getItemId()); msg.addItemName(((ItemInstance) sellerItem).getItemId());
sysmsgs.add(msg); sysmsgs.add(msg);
msg = new SystemMessage(378); msg = new SystemMessage(SystemMessage.S1_PURCHASED_S2);
msg.addString("You"); msg.addString("You");
msg.addItemName(((ItemInstance) sellerItem).getItemId()); msg.addItemName(((ItemInstance) sellerItem).getItemId());
sysmsgs.add(msg); sysmsgs.add(msg);
} }
else else
{ {
msg = new SystemMessage(380); msg = new SystemMessage(SystemMessage.S1_PURCHASED_S3_S2_s);
msg.addString(buyer.getName()); msg.addString(buyer.getName());
msg.addItemName(((ItemInstance) sellerItem).getItemId()); msg.addItemName(((ItemInstance) sellerItem).getItemId());
msg.addNumber(amount); msg.addNumber(amount);
sysmsgs.add(msg); sysmsgs.add(msg);
msg = new SystemMessage(380); msg = new SystemMessage(SystemMessage.S1_PURCHASED_S3_S2_s);
msg.addString("You"); msg.addString("You");
msg.addItemName(((ItemInstance) sellerItem).getItemId()); msg.addItemName(((ItemInstance) sellerItem).getItemId());
msg.addNumber(amount); msg.addNumber(amount);

8
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -511,7 +511,7 @@ public abstract class Creature extends WorldObject
StatusUpdate su = new StatusUpdate(getObjectId()); StatusUpdate su = new StatusUpdate(getObjectId());
su.addAttribute(StatusUpdate.LEVEL, _level); su.addAttribute(StatusUpdate.LEVEL, _level);
sendPacket(su); sendPacket(su);
sendPacket(new SystemMessage(96)); sendPacket(new SystemMessage(SystemMessage.YOU_INCREASED_YOUR_LEVEL));
SocialAction sa = new SocialAction(getObjectId(), 15); SocialAction sa = new SocialAction(getObjectId(), 15);
broadcastPacket(sa); broadcastPacket(sa);
sendPacket(sa); sendPacket(sa);
@@ -1099,7 +1099,7 @@ public abstract class Creature extends WorldObject
setCurrentState(CreatureState.IDLE); setCurrentState(CreatureState.IDLE);
ActionFailed af = new ActionFailed(); ActionFailed af = new ActionFailed();
sendPacket(af); sendPacket(af);
sendPacket(new SystemMessage(112)); sendPacket(new SystemMessage(SystemMessage.NOT_ENOUGH_ARROWS));
return; return;
} }
double distance = getDistance(target.getX(), target.getY()); double distance = getDistance(target.getX(), target.getY());
@@ -1170,7 +1170,7 @@ public abstract class Creature extends WorldObject
{ {
if (getCurrentMp() < weaponItem.getMpConsume()) if (getCurrentMp() < weaponItem.getMpConsume())
{ {
sendPacket(new SystemMessage(24)); sendPacket(new SystemMessage(SystemMessage.NOT_ENOUGH_MP));
setInCombat(false); setInCombat(false);
setCurrentState(CreatureState.IDLE); setCurrentState(CreatureState.IDLE);
ActionFailed af = new ActionFailed(); ActionFailed af = new ActionFailed();
@@ -1178,7 +1178,7 @@ public abstract class Creature extends WorldObject
return; return;
} }
reduceCurrentMp(weaponItem.getMpConsume()); reduceCurrentMp(weaponItem.getMpConsume());
sendPacket(new SystemMessage(41)); sendPacket(new SystemMessage(SystemMessage.GETTING_READY_TO_SHOOT_AN_ARROW));
SetupGauge sg = new SetupGauge(1, calculateAttackSpeed(weaponItem) * 2); SetupGauge sg = new SetupGauge(1, calculateAttackSpeed(weaponItem) * 2);
sendPacket(sg); sendPacket(sg);
_hitTimer.schedule(new HitTask(this, target, damage, crit, miss, false), calculateHitSpeed(weaponItem, 1)); _hitTimer.schedule(new HitTask(this, target, damage, crit, miss, false), calculateHitSpeed(weaponItem, 1));

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
View File

@@ -279,7 +279,7 @@ public class PetInstance extends Creature
broadcastPacket(su); broadcastPacket(su);
SocialAction sa = new SocialAction(getObjectId(), 15); SocialAction sa = new SocialAction(getObjectId(), 15);
broadcastPacket(sa); broadcastPacket(sa);
_owner.sendPacket(new SystemMessage(96)); _owner.sendPacket(new SystemMessage(SystemMessage.YOU_INCREASED_YOUR_LEVEL));
} }
public void followOwner(PlayerInstance owner) public void followOwner(PlayerInstance owner)

20
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -342,7 +342,7 @@ public class PlayerInstance extends Creature
su.addAttribute(StatusUpdate.EXP, _exp); su.addAttribute(StatusUpdate.EXP, _exp);
su.addAttribute(StatusUpdate.SP, _sp); su.addAttribute(StatusUpdate.SP, _sp);
sendPacket(su); sendPacket(su);
SystemMessage sm = new SystemMessage(95); SystemMessage sm = new SystemMessage(SystemMessage.YOU_EARNED_S1_EXP_AND_S2_SP);
sm.addNumber(addToExp); sm.addNumber(addToExp);
sm.addNumber(addToSp); sm.addNumber(addToSp);
sendPacket(sm); sendPacket(sm);
@@ -653,15 +653,15 @@ public class PlayerInstance extends Creature
{ {
if (crit) if (crit)
{ {
sendPacket(new SystemMessage(44)); sendPacket(new SystemMessage(SystemMessage.CRITICAL_HIT));
} }
if (miss) if (miss)
{ {
sendPacket(new SystemMessage(43)); sendPacket(new SystemMessage(SystemMessage.MISSED_TARGET));
} }
else else
{ {
SystemMessage sm = new SystemMessage(35); SystemMessage sm = new SystemMessage(SystemMessage.YOU_DID_S1_DMG);
sm.addNumber(damage); sm.addNumber(damage);
sendPacket(sm); sendPacket(sm);
} }
@@ -797,13 +797,13 @@ public class PlayerInstance extends Creature
SystemMessage smsg; SystemMessage smsg;
if (target.getItemId() == 57) if (target.getItemId() == 57)
{ {
smsg = new SystemMessage(28); smsg = new SystemMessage(SystemMessage.YOU_PICKED_UP_S1_ADENA);
smsg.addNumber(target.getCount()); smsg.addNumber(target.getCount());
sendPacket(smsg); sendPacket(smsg);
} }
else else
{ {
smsg = new SystemMessage(29); smsg = new SystemMessage(SystemMessage.YOU_PICKED_UP_S1_S2);
smsg.addNumber(target.getCount()); smsg.addNumber(target.getCount());
smsg.addItemName(target.getItemId()); smsg.addItemName(target.getItemId());
sendPacket(smsg); sendPacket(smsg);
@@ -889,7 +889,7 @@ public class PlayerInstance extends Creature
} }
// Damage message. // Damage message.
SystemMessage smsg = new SystemMessage(36); SystemMessage smsg = new SystemMessage(SystemMessage.S1_GAVE_YOU_S2_DMG);
if ((attacker instanceof MonsterInstance) || (attacker instanceof NpcInstance)) if ((attacker instanceof MonsterInstance) || (attacker instanceof NpcInstance))
{ {
int mobId = ((NpcInstance) attacker).getNpcTemplate().getNpcId(); int mobId = ((NpcInstance) attacker).getNpcTemplate().getNpcId();
@@ -1504,12 +1504,12 @@ public class PlayerInstance extends Creature
} }
if (getCurrentMp() < skill.getMpConsume()) if (getCurrentMp() < skill.getMpConsume())
{ {
sendPacket(new SystemMessage(24)); sendPacket(new SystemMessage(SystemMessage.NOT_ENOUGH_MP));
return; return;
} }
if (getCurrentHp() < skill.getHpConsume()) if (getCurrentHp() < skill.getHpConsume())
{ {
sendPacket(new SystemMessage(23)); sendPacket(new SystemMessage(SystemMessage.NOT_ENOUGH_HP));
return; return;
} }
setCurrentState(CreatureState.CASTING); setCurrentState(CreatureState.CASTING);
@@ -1528,7 +1528,7 @@ public class PlayerInstance extends Creature
sendPacket(msu); sendPacket(msu);
broadcastPacket(msu); broadcastPacket(msu);
sendPacket(new SetupGauge(0, skill.getHitTime())); sendPacket(new SetupGauge(0, skill.getHitTime()));
SystemMessage sm = new SystemMessage(46); SystemMessage sm = new SystemMessage(SystemMessage.USE_S1);
sm.addSkillName(magicId); sm.addSkillName(magicId);
sendPacket(sm); sendPacket(sm);
if (skill.getSkillTime() > 300) if (skill.getSkillTime() > 300)

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java
View File

@@ -73,7 +73,7 @@ public class TeleporterInstance extends NpcInstance
} }
else else
{ {
SystemMessage sm = new SystemMessage(279); SystemMessage sm = new SystemMessage(SystemMessage.YOU_NOT_ENOUGH_ADENA);
player.sendPacket(sm); player.sendPacket(sm);
} }
} }

10
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@@ -60,26 +60,26 @@ public class VillageMasterInstance extends NpcInstance
{ {
if (player.getLevel() < 10) if (player.getLevel() < 10)
{ {
SystemMessage sm = new SystemMessage(190); SystemMessage sm = new SystemMessage(SystemMessage.FAILED_TO_CREATE_CLAN);
player.sendPacket(sm); player.sendPacket(sm);
return; return;
} }
if (player.getClanId() != 0) if (player.getClanId() != 0)
{ {
SystemMessage sm = new SystemMessage(190); SystemMessage sm = new SystemMessage(SystemMessage.FAILED_TO_CREATE_CLAN);
player.sendPacket(sm); player.sendPacket(sm);
return; return;
} }
if (clanName.length() > 16) if (clanName.length() > 16)
{ {
SystemMessage sm = new SystemMessage(262); SystemMessage sm = new SystemMessage(SystemMessage.CLAN_NAME_TOO_LONG);
player.sendPacket(sm); player.sendPacket(sm);
return; return;
} }
Clan clan = ClanTable.getInstance().createClan(player, clanName); Clan clan = ClanTable.getInstance().createClan(player, clanName);
if (clan == null) if (clan == null)
{ {
SystemMessage sm = new SystemMessage(261); SystemMessage sm = new SystemMessage(SystemMessage.CLAN_NAME_INCORRECT);
player.sendPacket(sm); player.sendPacket(sm);
return; return;
} }
@@ -90,7 +90,7 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(pu); player.sendPacket(pu);
UserInfo ui = new UserInfo(player); UserInfo ui = new UserInfo(player);
player.sendPacket(ui); player.sendPacket(ui);
SystemMessage sm = new SystemMessage(189); SystemMessage sm = new SystemMessage(SystemMessage.CLAN_CREATED);
player.sendPacket(sm); player.sendPacket(sm);
} }
} }

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
View File

@@ -89,7 +89,7 @@ public class AddTradeItem extends ClientBasePacket
else else
{ {
player.sendPacket(new SendTradeDone(0)); player.sendPacket(new SendTradeDone(0));
SystemMessage msg = new SystemMessage(145); SystemMessage msg = new SystemMessage(SystemMessage.TARGET_IS_NOT_FOUND_IN_THE_GAME);
player.sendPacket(msg); player.sendPacket(msg);
player.setTransactionRequester(null); player.setTransactionRequester(null);
requestor.getTradeList().getItems().clear(); requestor.getTradeList().getItems().clear();

8
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
View File

@@ -38,7 +38,7 @@ public class AnswerTradeRequest extends ClientBasePacket
{ {
if (response == 1) if (response == 1)
{ {
SystemMessage msg = new SystemMessage(120); SystemMessage msg = new SystemMessage(SystemMessage.BEGIN_TRADE_WITH_S1);
msg.addString(player.getName()); msg.addString(player.getName());
requestor.sendPacket(msg); requestor.sendPacket(msg);
requestor.sendPacket(new TradeStart(requestor)); requestor.sendPacket(new TradeStart(requestor));
@@ -46,7 +46,7 @@ public class AnswerTradeRequest extends ClientBasePacket
{ {
requestor.setTradeList(new TradeList(0)); requestor.setTradeList(new TradeList(0));
} }
msg = new SystemMessage(120); msg = new SystemMessage(SystemMessage.BEGIN_TRADE_WITH_S1);
msg.addString(requestor.getName()); msg.addString(requestor.getName());
player.sendPacket(msg); player.sendPacket(msg);
player.sendPacket(new TradeStart(player)); player.sendPacket(new TradeStart(player));
@@ -57,7 +57,7 @@ public class AnswerTradeRequest extends ClientBasePacket
} }
else else
{ {
SystemMessage msg = new SystemMessage(119); SystemMessage msg = new SystemMessage(SystemMessage.S1_DENIED_TRADE_REQUEST);
msg.addString(player.getName()); msg.addString(player.getName());
requestor.sendPacket(msg); requestor.sendPacket(msg);
requestor.setTransactionRequester(null); requestor.setTransactionRequester(null);
@@ -67,7 +67,7 @@ public class AnswerTradeRequest extends ClientBasePacket
else if (response != 0) else if (response != 0)
{ {
player.sendPacket(new SendTradeDone(0)); player.sendPacket(new SendTradeDone(0));
SystemMessage msg = new SystemMessage(145); SystemMessage msg = new SystemMessage(SystemMessage.TARGET_IS_NOT_FOUND_IN_THE_GAME);
player.sendPacket(msg); player.sendPacket(msg);
player.setTransactionRequester(null); player.setTransactionRequester(null);
} }

10
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@@ -47,7 +47,7 @@ public class EnterWorld extends ClientBasePacket
activeChar.setIsGM(true); activeChar.setIsGM(true);
GmListManager.getInstance().addGm(activeChar); GmListManager.getInstance().addGm(activeChar);
} }
SystemMessage sm = new SystemMessage(34); SystemMessage sm = new SystemMessage(SystemMessage.WELCOME_TO_LINEAGE);
con.sendPacket(sm); con.sendPacket(sm);
Announcements.getInstance().showAnnouncements(activeChar); Announcements.getInstance().showAnnouncements(activeChar);
@@ -60,17 +60,17 @@ public class EnterWorld extends ClientBasePacket
{ {
switch (shortcut.getType()) switch (shortcut.getType())
{ {
case 3: case ShortCut.TYPE_ACTION:
{ {
sci.addActionShotCut(shortcut.getSlot(), shortcut.getId(), shortcut.getUnk()); sci.addActionShotCut(shortcut.getSlot(), shortcut.getId(), shortcut.getUnk());
continue; continue;
} }
case 2: case ShortCut.TYPE_SKILL:
{ {
sci.addSkillShotCut(shortcut.getSlot(), shortcut.getId(), shortcut.getLevel(), shortcut.getUnk()); sci.addSkillShotCut(shortcut.getSlot(), shortcut.getId(), shortcut.getLevel(), shortcut.getUnk());
continue; continue;
} }
case 1: case ShortCut.TYPE_ITEM:
{ {
sci.addItemShotCut(shortcut.getSlot(), shortcut.getId(), shortcut.getUnk()); sci.addItemShotCut(shortcut.getSlot(), shortcut.getId(), shortcut.getUnk());
continue; continue;
@@ -99,7 +99,7 @@ public class EnterWorld extends ClientBasePacket
if (clan != null) if (clan != null)
{ {
clan.getClanMember(activeChar.getName()).setPlayerInstance(activeChar); clan.getClanMember(activeChar.getName()).setPlayerInstance(activeChar);
SystemMessage msg = new SystemMessage(304); SystemMessage msg = new SystemMessage(SystemMessage.CLAN_MEMBER_S1_LOGGED_IN);
msg.addString(activeChar.getName()); msg.addString(activeChar.getName());
for (PlayerInstance clanMember : clan.getOnlineMembers(activeChar.getName())) for (PlayerInstance clanMember : clan.getOnlineMembers(activeChar.getName()))
{ {

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java
View File

@@ -40,7 +40,7 @@ public class RequestAnswerJoinParty extends ClientBasePacket
} }
else else
{ {
SystemMessage msg = new SystemMessage(305); SystemMessage msg = new SystemMessage(SystemMessage.PLAYER_DECLINED);
requestor.sendPacket(msg); requestor.sendPacket(msg);
if (requestor.getParty().getMemberCount() == 1) if (requestor.getParty().getMemberCount() == 1)
{ {

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
View File

@@ -52,11 +52,11 @@ public class RequestAnswerJoinPledge extends ClientBasePacket
activeChar.sendPacket(pu); activeChar.sendPacket(pu);
activeChar.sendPacket(new UserInfo(activeChar)); activeChar.sendPacket(new UserInfo(activeChar));
activeChar.broadcastPacket(new CharInfo(activeChar)); activeChar.broadcastPacket(new CharInfo(activeChar));
SystemMessage sm = new SystemMessage(195); SystemMessage sm = new SystemMessage(SystemMessage.ENTERED_THE_CLAN);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
// ClanMember[] members = clan.getMembers(); // ClanMember[] members = clan.getMembers();
PledgeShowMemberListAdd la = new PledgeShowMemberListAdd(activeChar); PledgeShowMemberListAdd la = new PledgeShowMemberListAdd(activeChar);
sm = new SystemMessage(222); sm = new SystemMessage(SystemMessage.S1_HAS_JOINED_CLAN);
sm.addString(activeChar.getName()); sm.addString(activeChar.getName());
clan.broadcastToOnlineMembers(la); clan.broadcastToOnlineMembers(la);
clan.broadcastToOnlineMembers(sm); clan.broadcastToOnlineMembers(sm);
@@ -64,7 +64,7 @@ public class RequestAnswerJoinPledge extends ClientBasePacket
} }
else else
{ {
SystemMessage sm = new SystemMessage(196); SystemMessage sm = new SystemMessage(SystemMessage.S1_REFUSED_TO_JOIN_CLAN);
sm.addString(activeChar.getName()); sm.addString(activeChar.getName());
requestor.sendPacket(sm); requestor.sendPacket(sm);
} }

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java
View File

@@ -61,7 +61,7 @@ public class RequestAquireSkill extends ClientBasePacket
StatusUpdate su = new StatusUpdate(player.getObjectId()); StatusUpdate su = new StatusUpdate(player.getObjectId());
su.addAttribute(StatusUpdate.SP, player.getSp()); su.addAttribute(StatusUpdate.SP, player.getSp());
player.sendPacket(su); player.sendPacket(su);
SystemMessage sm = new SystemMessage(277); SystemMessage sm = new SystemMessage(SystemMessage.LEARNED_SKILL_S1);
sm.addSkillName(id); sm.addSkillName(id);
player.sendPacket(sm); player.sendPacket(sm);
if (level > 1) if (level > 1)
@@ -79,7 +79,7 @@ public class RequestAquireSkill extends ClientBasePacket
} }
else else
{ {
SystemMessage sm = new SystemMessage(278); SystemMessage sm = new SystemMessage(SystemMessage.NOT_ENOUGH_SP_TO_LEARN_SKILL);
player.sendPacket(sm); player.sendPacket(sm);
} }
skills = SkillTreeTable.getInstance().getAvailableSkills(player); skills = SkillTreeTable.getInstance().getAvailableSkills(player);

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
View File

@@ -68,7 +68,7 @@ public class RequestBuyItem extends ClientBasePacket
} }
if ((neededMoney > currentMoney) || (neededMoney < 0.0) || (currentMoney <= 0L)) if ((neededMoney > currentMoney) || (neededMoney < 0.0) || (currentMoney <= 0L))
{ {
SystemMessage sm = new SystemMessage(279); SystemMessage sm = new SystemMessage(SystemMessage.YOU_NOT_ENOUGH_ADENA);
con.sendPacket(sm); con.sendPacket(sm);
return; return;
} }

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
View File

@@ -64,7 +64,7 @@ public class RequestDropItem extends ClientBasePacket
} }
if ((activeChar.getDistance(x, y) > 150.0) || (Math.abs(z - activeChar.getZ()) > 50)) if ((activeChar.getDistance(x, y) > 150.0) || (Math.abs(z - activeChar.getZ()) > 50))
{ {
SystemMessage sm = new SystemMessage(151); SystemMessage sm = new SystemMessage(SystemMessage.CANNOT_DISCARD_DISTANCE_TOO_FAR);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
return; return;
} }
@@ -102,7 +102,7 @@ public class RequestDropItem extends ClientBasePacket
iu.addModifiedItem(oldItem); iu.addModifiedItem(oldItem);
} }
con.sendPacket(iu); con.sendPacket(iu);
SystemMessage sm = new SystemMessage(298); SystemMessage sm = new SystemMessage(SystemMessage.YOU_DROPPED_S1);
sm.addItemName(dropedItem.getItemId()); sm.addItemName(dropedItem.getItemId());
con.sendPacket(sm); con.sendPacket(sm);
con.sendPacket(new UserInfo(activeChar)); con.sendPacket(new UserInfo(activeChar));
@@ -110,7 +110,7 @@ public class RequestDropItem extends ClientBasePacket
} }
else else
{ {
SystemMessage msg = new SystemMessage(61); SystemMessage msg = new SystemMessage(SystemMessage.NOTHING_HAPPENED);
client.getActiveChar().sendPacket(msg); client.getActiveChar().sendPacket(msg);
} }
} }

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
View File

@@ -40,7 +40,7 @@ public class RequestGiveNickName extends ClientBasePacket
PlayerInstance member; PlayerInstance member;
if (activeChar.getClan().getLevel() < 3) if (activeChar.getClan().getLevel() < 3)
{ {
SystemMessage sm = new SystemMessage(271); SystemMessage sm = new SystemMessage(SystemMessage.CLAN_LVL_3_NEEDED_TO_ENDOVE_TITLE);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
activeChar.sendMessage("But you can do it freely for now ;)"); activeChar.sendMessage("But you can do it freely for now ;)");
activeChar.sendPacket(sm); activeChar.sendPacket(sm);

16
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
View File

@@ -37,13 +37,13 @@ public class RequestJoinParty extends ClientBasePacket
PlayerInstance requestor = client.getActiveChar(); PlayerInstance requestor = client.getActiveChar();
if (requestor.isTransactionInProgress()) if (requestor.isTransactionInProgress())
{ {
SystemMessage msg = new SystemMessage(164); SystemMessage msg = new SystemMessage(SystemMessage.WAITING_FOR_REPLY);
requestor.sendPacket(msg); requestor.sendPacket(msg);
return; return;
} }
if (target.isInParty()) if (target.isInParty())
{ {
SystemMessage msg = new SystemMessage(160); SystemMessage msg = new SystemMessage(SystemMessage.S1_IS_ALREADY_IN_PARTY);
msg.addString(target.getName()); msg.addString(target.getName());
requestor.sendPacket(msg); requestor.sendPacket(msg);
return; return;
@@ -62,12 +62,12 @@ public class RequestJoinParty extends ClientBasePacket
{ {
if (requestor.getParty().getMemberCount() >= 9) if (requestor.getParty().getMemberCount() >= 9)
{ {
requestor.sendPacket(new SystemMessage(155)); requestor.sendPacket(new SystemMessage(SystemMessage.PARTY_FULL));
return; return;
} }
if (!requestor.getParty().isLeader(requestor)) if (!requestor.getParty().isLeader(requestor))
{ {
requestor.sendPacket(new SystemMessage(154)); requestor.sendPacket(new SystemMessage(SystemMessage.ONLY_LEADER_CAN_INVITE));
return; return;
} }
if (target.getKnownPlayers().contains(requestor)) if (target.getKnownPlayers().contains(requestor))
@@ -78,13 +78,13 @@ public class RequestJoinParty extends ClientBasePacket
requestor.setTransactionRequester(target); requestor.setTransactionRequester(target);
AskJoinParty ask = new AskJoinParty(requestor.getObjectId(), itemDistribution); AskJoinParty ask = new AskJoinParty(requestor.getObjectId(), itemDistribution);
target.sendPacket(ask); target.sendPacket(ask);
SystemMessage msg = new SystemMessage(105); SystemMessage msg = new SystemMessage(SystemMessage.YOU_INVITED_S1_TO_PARTY);
msg.addString(target.getName()); msg.addString(target.getName());
requestor.sendPacket(msg); requestor.sendPacket(msg);
} }
else else
{ {
SystemMessage msg = new SystemMessage(153); SystemMessage msg = new SystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
requestor.sendPacket(msg); requestor.sendPacket(msg);
_log.warning(requestor.getName() + " already received a party invitation"); _log.warning(requestor.getName() + " already received a party invitation");
} }
@@ -106,13 +106,13 @@ public class RequestJoinParty extends ClientBasePacket
requestor.setTransactionRequester(target); requestor.setTransactionRequester(target);
AskJoinParty ask = new AskJoinParty(requestor.getObjectId(), itemDistribution); AskJoinParty ask = new AskJoinParty(requestor.getObjectId(), itemDistribution);
target.sendPacket(ask); target.sendPacket(ask);
SystemMessage msg = new SystemMessage(105); SystemMessage msg = new SystemMessage(SystemMessage.YOU_INVITED_S1_TO_PARTY);
msg.addString(target.getName()); msg.addString(target.getName());
requestor.sendPacket(msg); requestor.sendPacket(msg);
} }
else else
{ {
SystemMessage msg = new SystemMessage(153); SystemMessage msg = new SystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
msg.addString(target.getName()); msg.addString(target.getName());
requestor.sendPacket(msg); requestor.sendPacket(msg);
_log.warning(requestor.getName() + " already received a party invitation"); _log.warning(requestor.getName() + " already received a party invitation");

8
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
View File

@@ -37,12 +37,12 @@ public class RequestJoinPledge extends ClientBasePacket
PlayerInstance activeChar = client.getActiveChar(); PlayerInstance activeChar = client.getActiveChar();
if (activeChar.isTransactionInProgress()) if (activeChar.isTransactionInProgress())
{ {
activeChar.sendPacket(new SystemMessage(164)); activeChar.sendPacket(new SystemMessage(SystemMessage.WAITING_FOR_REPLY));
return; return;
} }
if (target == activeChar.getObjectId()) if (target == activeChar.getObjectId())
{ {
SystemMessage sm = new SystemMessage(4); SystemMessage sm = new SystemMessage(SystemMessage.CANNOT_INVITE_YOURSELF);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
return; return;
} }
@@ -51,14 +51,14 @@ public class RequestJoinPledge extends ClientBasePacket
PlayerInstance member = (PlayerInstance) object; PlayerInstance member = (PlayerInstance) object;
if (member.getClanId() != 0) if (member.getClanId() != 0)
{ {
SystemMessage sm = new SystemMessage(10); SystemMessage sm = new SystemMessage(SystemMessage.S1_WORKING_WITH_ANOTHER_CLAN);
sm.addString(member.getName()); sm.addString(member.getName());
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
return; return;
} }
if (member.isTransactionInProgress()) if (member.isTransactionInProgress())
{ {
SystemMessage sm = new SystemMessage(153); SystemMessage sm = new SystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
sm.addString(member.getName()); sm.addString(member.getName());
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
return; return;

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
View File

@@ -50,7 +50,7 @@ public class RequestOustPledgeMember extends ClientBasePacket
} }
clan.removeClanMember(target); clan.removeClanMember(target);
clan.store(); clan.store();
SystemMessage msg = new SystemMessage(191); SystemMessage msg = new SystemMessage(SystemMessage.CLAN_MEMBER_S1_EXPELLED);
msg.addString(member.getName()); msg.addString(member.getName());
clan.broadcastToOnlineMembers(msg); clan.broadcastToOnlineMembers(msg);
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(target)); clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(target));
@@ -60,7 +60,7 @@ public class RequestOustPledgeMember extends ClientBasePacket
player.setClan(null); player.setClan(null);
player.setClanId(0); player.setClanId(0);
player.setTitle(""); player.setTitle("");
player.sendPacket(new SystemMessage(199)); player.sendPacket(new SystemMessage(SystemMessage.CLAN_MEMBERSHIP_TERMINATED));
player.sendPacket(new UserInfo(player)); player.sendPacket(new UserInfo(player));
player.broadcastPacket(new CharInfo(player)); player.broadcastPacket(new CharInfo(player));
player.sendPacket(new PledgeShowMemberListDeleteAll()); player.sendPacket(new PledgeShowMemberListDeleteAll());

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
View File

@@ -54,7 +54,7 @@ public class RequestUnEquipItem extends ClientBasePacket
activeChar.broadcastPacket(info); activeChar.broadcastPacket(info);
if (unequiped.size() > 0) if (unequiped.size() > 0)
{ {
SystemMessage sm = new SystemMessage(417); SystemMessage sm = new SystemMessage(SystemMessage.S1_DISARMED);
sm.addItemName(unequiped.stream().findFirst().get().getItemId()); sm.addItemName(unequiped.stream().findFirst().get().getItemId());
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
View File

@@ -43,7 +43,7 @@ public class RequestWithdrawalPledge extends ClientBasePacket
ClanMember member = clan.getClanMember(activeChar.getName()); ClanMember member = clan.getClanMember(activeChar.getName());
clan.removeClanMember(activeChar.getName()); clan.removeClanMember(activeChar.getName());
clan.store(); clan.store();
activeChar.sendPacket(new SystemMessage(199)); activeChar.sendPacket(new SystemMessage(SystemMessage.CLAN_MEMBERSHIP_TERMINATED));
PlayerInstance player = member.getPlayerInstance(); PlayerInstance player = member.getPlayerInstance();
player.setClan(null); player.setClan(null);
player.setClanId(0); player.setClanId(0);

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@@ -61,7 +61,7 @@ public class Say2 extends ClientBasePacket
} }
else else
{ {
SystemMessage sm = new SystemMessage(3); SystemMessage sm = new SystemMessage(SystemMessage.S1_IS_NOT_ONLINE);
sm.addString(target); sm.addString(target);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java
View File

@@ -67,7 +67,7 @@ public class SendPrivateStoreBuyList extends ClientBasePacket
} }
else else
{ {
SystemMessage msg = new SystemMessage(279); SystemMessage msg = new SystemMessage(SystemMessage.YOU_NOT_ENOUGH_ADENA);
buyer.sendPacket(msg); buyer.sendPacket(msg);
} }
} }

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
View File

@@ -43,7 +43,7 @@ public class SendWareHouseDepositList extends ClientBasePacket
int currentMoney = activeChar.getAdena(); int currentMoney = activeChar.getAdena();
if (neededMoney > currentMoney) if (neededMoney > currentMoney)
{ {
SystemMessage sm = new SystemMessage(279); SystemMessage sm = new SystemMessage(SystemMessage.YOU_NOT_ENOUGH_ADENA);
con.sendPacket(sm); con.sendPacket(sm);
return; return;
} }

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
View File

@@ -66,7 +66,7 @@ public class SendWareHouseWithDrawList extends ClientBasePacket
{ {
World.getInstance().removeVisibleObject(items[i]); World.getInstance().removeVisibleObject(items[i]);
} }
SystemMessage sm = new SystemMessage(422); SystemMessage sm = new SystemMessage(SystemMessage.WEIGHT_LIMIT_EXCEEDED);
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
} }
} }

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
View File

@@ -60,7 +60,7 @@ public class SetPrivateStoreListBuy extends ClientBasePacket
if (cost > player.getAdena()) if (cost > player.getAdena())
{ {
count = 0; count = 0;
SystemMessage msg = new SystemMessage(720); SystemMessage msg = new SystemMessage(SystemMessage.THE_PURCHASE_PRICE_IS_HIGHER_THAN_MONEY);
player.sendPacket(msg); player.sendPacket(msg);
} }
if (count != 0) if (count != 0)

8
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java
View File

@@ -45,7 +45,7 @@ public class TradeDone extends ClientBasePacket
player.sendPacket(new SendTradeDone(1)); player.sendPacket(new SendTradeDone(1));
requestor.getTradeList().getItems().clear(); requestor.getTradeList().getItems().clear();
player.getTradeList().getItems().clear(); player.getTradeList().getItems().clear();
SystemMessage msg = new SystemMessage(123); SystemMessage msg = new SystemMessage(SystemMessage.TRADE_SUCCESSFUL);
requestor.sendPacket(msg); requestor.sendPacket(msg);
player.sendPacket(msg); player.sendPacket(msg);
requestor.setTransactionRequester(null); requestor.setTransactionRequester(null);
@@ -53,7 +53,7 @@ public class TradeDone extends ClientBasePacket
} }
else else
{ {
SystemMessage msg = new SystemMessage(121); SystemMessage msg = new SystemMessage(SystemMessage.S1_CONFIRMED_TRADE);
msg.addString(player.getName()); msg.addString(player.getName());
requestor.sendPacket(msg); requestor.sendPacket(msg);
} }
@@ -64,7 +64,7 @@ public class TradeDone extends ClientBasePacket
requestor.sendPacket(new SendTradeDone(0)); requestor.sendPacket(new SendTradeDone(0));
player.setTradeList(null); player.setTradeList(null);
requestor.setTradeList(null); requestor.setTradeList(null);
SystemMessage msg = new SystemMessage(124); SystemMessage msg = new SystemMessage(SystemMessage.S1_CANCELED_TRADE);
msg.addString(player.getName()); msg.addString(player.getName());
requestor.sendPacket(msg); requestor.sendPacket(msg);
requestor.setTransactionRequester(null); requestor.setTransactionRequester(null);
@@ -74,7 +74,7 @@ public class TradeDone extends ClientBasePacket
else else
{ {
player.sendPacket(new SendTradeDone(0)); player.sendPacket(new SendTradeDone(0));
SystemMessage msg = new SystemMessage(145); SystemMessage msg = new SystemMessage(SystemMessage.TARGET_IS_NOT_FOUND_IN_THE_GAME);
player.sendPacket(msg); player.sendPacket(msg);
player.setTransactionRequester(null); player.setTransactionRequester(null);
requestor.setTradeList(null); requestor.setTradeList(null);

8
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
View File

@@ -37,12 +37,12 @@ public class TradeRequest extends ClientBasePacket
WorldObject target = world.findObject(objectId); WorldObject target = world.findObject(objectId);
if ((target == null) || !(target instanceof PlayerInstance) || (target.getObjectId() != objectId)) if ((target == null) || !(target instanceof PlayerInstance) || (target.getObjectId() != objectId))
{ {
player.sendPacket(new SystemMessage(144)); player.sendPacket(new SystemMessage(SystemMessage.TARGET_IS_INCORRECT));
return; return;
} }
if (client.getActiveChar().getTransactionRequester() != null) if (client.getActiveChar().getTransactionRequester() != null)
{ {
player.sendPacket(new SystemMessage(142)); player.sendPacket(new SystemMessage(SystemMessage.ALREADY_TRADING));
return; return;
} }
PlayerInstance pcTarget = (PlayerInstance) target; PlayerInstance pcTarget = (PlayerInstance) target;
@@ -51,13 +51,13 @@ public class TradeRequest extends ClientBasePacket
pcTarget.setTransactionRequester(player); pcTarget.setTransactionRequester(player);
player.setTransactionRequester(pcTarget); player.setTransactionRequester(pcTarget);
pcTarget.sendPacket(new SendTradeRequest(player.getObjectId())); pcTarget.sendPacket(new SendTradeRequest(player.getObjectId()));
SystemMessage sm = new SystemMessage(118); SystemMessage sm = new SystemMessage(SystemMessage.REQUEST_S1_FOR_TRADE);
sm.addString(pcTarget.getName()); sm.addString(pcTarget.getName());
player.sendPacket(sm); player.sendPacket(sm);
} }
else else
{ {
SystemMessage sm = new SystemMessage(153); SystemMessage sm = new SystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
sm.addString(pcTarget.getName()); sm.addString(pcTarget.getName());
player.sendPacket(sm); player.sendPacket(sm);
_log.info("transaction already in progress."); _log.info("transaction already in progress.");

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@@ -56,7 +56,7 @@ public class UseItem extends ClientBasePacket
{ {
activeChar.updateMDef(); activeChar.updateMDef();
} }
SystemMessage sm = new SystemMessage(49); SystemMessage sm = new SystemMessage(SystemMessage.S1_EQUIPPED);
sm.addItemName(item.getItemId()); sm.addItemName(item.getItemId());
activeChar.sendPacket(sm); activeChar.sendPacket(sm);
InventoryUpdate iu = new InventoryUpdate(items); InventoryUpdate iu = new InventoryUpdate(items);

132
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
View File

@@ -21,101 +21,107 @@ import java.util.Vector;
public class SystemMessage extends ServerBasePacket public class SystemMessage extends ServerBasePacket
{ {
private static final int TYPE_SKILL_NAME = 4;
private static final int TYPE_ITEM_NAME = 3;
private static final int TYPE_NPC_NAME = 2;
private static final int TYPE_NUMBER = 1;
private static final int TYPE_TEXT = 0;
private static final String _S__7A_SYSTEMMESSAGE = "[S] 7A SystemMessage"; private static final String _S__7A_SYSTEMMESSAGE = "[S] 7A SystemMessage";
private final int _messageId; public static final int S1_IS_NOT_ONLINE = 3;
private final Vector<Integer> _types = new Vector<>(); public static final int CANNOT_INVITE_YOURSELF = 4;
private final Vector<Object> _values = new Vector<>(); public static final int S1_WORKING_WITH_ANOTHER_CLAN = 10;
public static final int NOT_ENOUGH_HP = 23; public static final int NOT_ENOUGH_HP = 23;
public static final int NOT_ENOUGH_MP = 24; public static final int NOT_ENOUGH_MP = 24;
public static final int USE_S1 = 46;
public static final int YOU_FEEL_S1_EFFECT = 110;
public static final int REJUVENATING_HP = 25; public static final int REJUVENATING_HP = 25;
public static final int CANNOT_USE_ITEM_WHILE_USING_MAGIC = 104;
public static final int CASTING_INTERRUPTED = 27; public static final int CASTING_INTERRUPTED = 27;
public static final int YOU_PICKED_UP_S1_ADENA = 28;
public static final int YOU_PICKED_UP_S1_S2 = 29;
public static final int YOU_PICKED_UP_S1 = 30;
public static final int WELCOME_TO_LINEAGE = 34;
public static final int YOU_DID_S1_DMG = 35; public static final int YOU_DID_S1_DMG = 35;
public static final int S1_GAVE_YOU_S2_DMG = 36; public static final int S1_GAVE_YOU_S2_DMG = 36;
public static final int GETTING_READY_TO_SHOOT_AN_ARROW = 41;
public static final int MISSED_TARGET = 43; public static final int MISSED_TARGET = 43;
public static final int CRITICAL_HIT = 44; public static final int CRITICAL_HIT = 44;
public static final int USE_S1 = 46;
public static final int S1_EQUIPPED = 49;
public static final int NOTHING_HAPPENED = 61;
public static final int S1_INVITED_YOU_TO_PARTY = 66;
public static final int EFFECT_S1_DISAPPEARED = 92; public static final int EFFECT_S1_DISAPPEARED = 92;
public static final int YOU_EARNED_S1_EXP_AND_S2_SP = 95; public static final int YOU_EARNED_S1_EXP_AND_S2_SP = 95;
public static final int YOU_INCREASED_YOUR_LEVEL = 96; public static final int YOU_INCREASED_YOUR_LEVEL = 96;
public static final int NOTHING_HAPPENED = 61; public static final int CANNOT_USE_ITEM_WHILE_USING_MAGIC = 104;
public static final int ITEM_MISSING_TO_LEARN_SKILL = 276;
public static final int LEARNED_SKILL_S1 = 277;
public static final int NOT_ENOUGH_SP_TO_LEARN_SKILL = 278;
public static final int FALL_DAMAGE_S1 = 296;
public static final int DROWN_DAMAGE_S1 = 297;
public static final int YOU_DROPPED_S1 = 298;
public static final int TARGET_IS_NOT_FOUND_IN_THE_GAME = 145;
public static final int SOULSHOTS_GRADE_MISMATCH = 337;
public static final int NOT_ENOUGH_SOULSHOTS = 338;
public static final int CANNOT_USE_SOULSHOTS = 339;
public static final int S1_IS_NOT_ONLINE = 3;
public static final int GETTING_READY_TO_SHOOT_AN_ARROW = 41;
public static final int WAITING_FOR_REPLY = 164;
public static final int S1_INVITED_YOU_TO_PARTY_FINDER_KEEPER = 572;
public static final int S1_INVITED_YOU_TO_PARTY_RANDOM = 573;
public static final int S1_INVITED_YOU_TO_PARTY = 66;
public static final int YOU_INVITED_S1_TO_PARTY = 105; public static final int YOU_INVITED_S1_TO_PARTY = 105;
public static final int OTHER_PARTY_IS_DROZEN = 692;
public static final int YOU_JOINED_S1_PARTY = 106; public static final int YOU_JOINED_S1_PARTY = 106;
public static final int S1_JOINED_PARTY = 107; public static final int S1_JOINED_PARTY = 107;
public static final int S1_LEFT_PARTY = 108; public static final int S1_LEFT_PARTY = 108;
public static final int YOU_LEFT_PARTY = 200; public static final int YOU_FEEL_S1_EFFECT = 110;
public static final int ONLY_LEADER_CAN_INVITE = 154;
public static final int S1_DID_NOT_REPLY = 135;
public static final int YOU_DID_NOT_REPLY = 136;
public static final int PLAYER_DECLINED = 305;
public static final int PARTY_FULL = 155;
public static final int S1_IS_ALREADY_IN_PARTY = 160;
public static final int INVITED_USER_NOT_ONLINE = 161;
public static final int PARTY_DISPERSED = 203;
public static final int WEIGHT_LIMIT_EXCEEDED = 422;
public static final int NOT_ENOUGH_ARROWS = 112; public static final int NOT_ENOUGH_ARROWS = 112;
public static final int S1_IS_BUSY_TRY_LATER = 153;
public static final int TARGET_IS_INCORRECT = 144;
public static final int ALREADY_TRADING = 142;
public static final int REQUEST_S1_FOR_TRADE = 118; public static final int REQUEST_S1_FOR_TRADE = 118;
public static final int S1_DENIED_TRADE_REQUEST = 119; public static final int S1_DENIED_TRADE_REQUEST = 119;
public static final int BEGIN_TRADE_WITH_S1 = 120; public static final int BEGIN_TRADE_WITH_S1 = 120;
public static final int S1_CONFIRMED_TRADE = 121; public static final int S1_CONFIRMED_TRADE = 121;
public static final int TRADE_SUCCESSFUL = 123; public static final int TRADE_SUCCESSFUL = 123;
public static final int S1_CANCELED_TRADE = 124; public static final int S1_CANCELED_TRADE = 124;
public static final int S1_DID_NOT_REPLY = 135;
public static final int YOU_DID_NOT_REPLY = 136;
public static final int ALREADY_TRADING = 142;
public static final int TARGET_IS_INCORRECT = 144;
public static final int TARGET_IS_NOT_FOUND_IN_THE_GAME = 145;
public static final int CANNOT_DISCARD_DISTANCE_TOO_FAR = 151;
public static final int S1_IS_BUSY_TRY_LATER = 153;
public static final int ONLY_LEADER_CAN_INVITE = 154;
public static final int PARTY_FULL = 155;
public static final int S1_IS_ALREADY_IN_PARTY = 160;
public static final int INVITED_USER_NOT_ONLINE = 161;
public static final int WAITING_FOR_REPLY = 164;
public static final int CLAN_CREATED = 189;
public static final int FAILED_TO_CREATE_CLAN = 190;
public static final int CLAN_MEMBER_S1_EXPELLED = 191;
public static final int ENTERED_THE_CLAN = 195;
public static final int S1_REFUSED_TO_JOIN_CLAN = 196;
public static final int CLAN_MEMBERSHIP_TERMINATED = 199;
public static final int YOU_LEFT_PARTY = 200;
public static final int PARTY_DISPERSED = 203;
public static final int S1_HAS_JOINED_CLAN = 222;
public static final int CLAN_NAME_INCORRECT = 261;
public static final int CLAN_NAME_TOO_LONG = 262;
public static final int CLAN_LVL_3_NEEDED_TO_ENDOVE_TITLE = 271;
public static final int ITEM_MISSING_TO_LEARN_SKILL = 276;
public static final int LEARNED_SKILL_S1 = 277;
public static final int NOT_ENOUGH_SP_TO_LEARN_SKILL = 278;
public static final int YOU_NOT_ENOUGH_ADENA = 279;
public static final int FALL_DAMAGE_S1 = 296;
public static final int DROWN_DAMAGE_S1 = 297;
public static final int YOU_DROPPED_S1 = 298;
public static final int S1_PICKED_UP_S2_S3 = 299;
public static final int S1_PICKED_UP_S2 = 300;
public static final int CLAN_MEMBER_S1_LOGGED_IN = 304;
public static final int PLAYER_DECLINED = 305;
public static final int SOULSHOTS_GRADE_MISMATCH = 337;
public static final int NOT_ENOUGH_SOULSHOTS = 338;
public static final int CANNOT_USE_SOULSHOTS = 339;
public static final int ENABLED_SOULSHOT = 342;
public static final int S1_PURCHASED_S2 = 378; public static final int S1_PURCHASED_S2 = 378;
public static final int S1_PURCHASED_S2_S3 = 379; public static final int S1_PURCHASED_S2_S3 = 379;
public static final int S1_PURCHASED_S3_S2_s = 380; public static final int S1_PURCHASED_S3_S2_s = 380;
public static final int S1_DISARMED = 417;
public static final int WEIGHT_LIMIT_EXCEEDED = 422;
public static final int PURCHASED_S2_FROM_S1 = 559; public static final int PURCHASED_S2_FROM_S1 = 559;
public static final int PURCHASED_S2_S3_FROM_S1 = 560; public static final int PURCHASED_S2_S3_FROM_S1 = 560;
public static final int PURCHASED_S3_S2_s_FROM_S1 = 561; public static final int PURCHASED_S3_S2_s_FROM_S1 = 561;
public static final int S1_INVITED_YOU_TO_PARTY_FINDER_KEEPER = 572;
public static final int S1_INVITED_YOU_TO_PARTY_RANDOM = 573;
public static final int S1_S2 = 614;
public static final int OTHER_PARTY_IS_DROZEN = 692;
public static final int THE_PURCHASE_IS_COMPLETE = 700; public static final int THE_PURCHASE_IS_COMPLETE = 700;
public static final int THE_PURCHASE_PRICE_IS_HIGHER_THAN_MONEY = 720; public static final int THE_PURCHASE_PRICE_IS_HIGHER_THAN_MONEY = 720;
public static final int YOU_NOT_ENOUGH_ADENA = 279;
public static final int FAILED_TO_CREATE_CLAN = 190; private static final int TYPE_TEXT = 0;
public static final int CLAN_NAME_INCORRECT = 261; private static final int TYPE_NUMBER = 1;
public static final int CLAN_NAME_TOO_LONG = 262; private static final int TYPE_NPC_NAME = 2;
public static final int CLAN_CREATED = 189; private static final int TYPE_ITEM_NAME = 3;
public static final int CLAN_LVL_3_NEEDED_TO_ENDOVE_TITLE = 271; private static final int TYPE_SKILL_NAME = 4;
public static final int CANNOT_INVITE_YOURSELF = 4;
public static final int S1_WORKING_WITH_ANOTHER_CLAN = 10; private final int _messageId;
public static final int ENTERED_THE_CLAN = 195; private final Vector<Integer> _types = new Vector<>();
public static final int S1_REFUSED_TO_JOIN_CLAN = 196; private final Vector<Object> _values = new Vector<>();
public static final int S1_HAS_JOINED_CLAN = 222;
public static final int CLAN_MEMBER_S1_LOGGED_IN = 304;
public static final int CLAN_MEMBER_S1_EXPELLED = 191;
public static final int CLAN_MEMBERSHIP_TERMINATED = 199;
public static final int S1_S2 = 614;
public static final int YOU_PICKED_UP_S1_ADENA = 28;
public static final int YOU_PICKED_UP_S1_S2 = 29;
public static final int YOU_PICKED_UP_S1 = 30;
public static final int S1_PICKED_UP_S2_S3 = 299;
public static final int S1_PICKED_UP_S2 = 300;
public SystemMessage(int messageId) public SystemMessage(int messageId)
{ {