diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/appearance/PcAppearance.java b/trunk/java/com/l2jserver/gameserver/model/actor/appearance/PcAppearance.java index 2769fe1a7c..79487ba603 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/appearance/PcAppearance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/appearance/PcAppearance.java @@ -50,6 +50,10 @@ public class PcAppearance /** The default title color is 0xECF9A2. */ private int _titleColor = DEFAULT_TITLE_COLOR; + /** Karma and Reputation colors */ + private final int _redColor = 255; + private final int _greenColor = 65280; + public PcAppearance(byte face, byte hColor, byte hStyle, boolean sex) { _face = face; @@ -173,6 +177,14 @@ public class PcAppearance public int getNameColor() { + if (_owner.getKarma() > 0) + { + return _redColor; + } + if (_owner.getReputation() > 0) + { + return _greenColor; + } return _nameColor; } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java index 33af42fc15..9d4adebcd5 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java @@ -68,7 +68,7 @@ public final class RelationChanged extends L2GameServerPacket _singled._objId = activeChar.getObjectId(); _singled._relation = relation; _singled._autoAttackable = autoattackable ? 1 : 0; - _singled._reputation = activeChar.getKarma() > 0 ? activeChar.getKarma() * -1 : activeChar.getReputation(); + _singled._reputation = activeChar.getReputation(); _singled._pvpFlag = activeChar.getPvpFlag(); setInvisible(activeChar.isInvisible()); } @@ -91,7 +91,7 @@ public final class RelationChanged extends L2GameServerPacket r._objId = activeChar.getObjectId(); r._relation = relation; r._autoAttackable = autoattackable ? 1 : 0; - r._reputation = activeChar.getKarma() > 0 ? activeChar.getKarma() * -1 : activeChar.getReputation(); + r._reputation = activeChar.getReputation(); r._pvpFlag = activeChar.getPvpFlag(); _multi.add(r); } diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java index 7caaf5e72e..267061802d 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java @@ -300,7 +300,7 @@ public class UserInfo extends AbstractMaskPacket { writeH(22); writeC(_activeChar.getPvpFlag()); - writeD(_activeChar.getKarma() > 0 ? _activeChar.getKarma() * -1 : _activeChar.getReputation()); + writeD(_activeChar.getReputation()); writeC(_activeChar.isNoble() ? 0x01 : 0x00); writeC(_activeChar.isHero() ? 0x01 : 0x00); writeC(_activeChar.getPledgeClass());