diff --git a/trunk/dist/game/data_classic/scripts/custom/events/TvT/TvTManager/TvTManager.java b/trunk/dist/game/data_classic/scripts/custom/events/TvT/TvTManager/TvTManager.java index c9cc0a39f8..0ce6fe2fbf 100644 --- a/trunk/dist/game/data_classic/scripts/custom/events/TvT/TvTManager/TvTManager.java +++ b/trunk/dist/game/data_classic/scripts/custom/events/TvT/TvTManager/TvTManager.java @@ -81,7 +81,7 @@ public final class TvTManager extends AbstractNpcAI implements IVoicedCommandHan { htmltext = getHtm(player.getHtmlPrefix(), "Olympiad.html"); } - else if (player.getKarma() > 0) + else if (player.getReputation() < 0) { htmltext = getHtm(player.getHtmlPrefix(), "Karma.html"); } diff --git a/trunk/dist/game/data_classic/scripts/handlers/admincommandhandlers/AdminEditChar.java b/trunk/dist/game/data_classic/scripts/handlers/admincommandhandlers/AdminEditChar.java index 9894cea787..361136078f 100644 --- a/trunk/dist/game/data_classic/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/trunk/dist/game/data_classic/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -989,7 +989,7 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%z%", String.valueOf(player.getZ())); adminReply.replace("%currenthp%", String.valueOf((int) player.getCurrentHp())); adminReply.replace("%maxhp%", String.valueOf(player.getMaxHp())); - adminReply.replace("%karma%", String.valueOf(player.getKarma())); + adminReply.replace("%karma%", String.valueOf(player.getReputation())); adminReply.replace("%currentmp%", String.valueOf((int) player.getCurrentMp())); adminReply.replace("%maxmp%", String.valueOf(player.getMaxMp())); adminReply.replace("%pvpflag%", String.valueOf(player.getPvpFlag())); @@ -1033,31 +1033,19 @@ public class AdminEditChar implements IAdminCommandHandler return; } - if (newKarma >= 0) + // for display + int oldKarma = player.getReputation(); + // update reputation + player.setKarma(newKarma); + // Common character information + SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_REPUTATION_HAS_BEEN_CHANGED_TO_S1); + sm.addInt(newKarma); + player.sendPacket(sm); + // Admin information + activeChar.sendMessage("Successfully Changed karma for " + player.getName() + " from (" + oldKarma + ") to (" + newKarma + ")."); + if (Config.DEBUG) { - // for display - int oldKarma = player.getKarma(); - // update karma - player.setKarma(newKarma); - // Common character information - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_REPUTATION_HAS_BEEN_CHANGED_TO_S1); - sm.addInt(newKarma); - player.sendPacket(sm); - // Admin information - activeChar.sendMessage("Successfully Changed karma for " + player.getName() + " from (" + oldKarma + ") to (" + newKarma + ")."); - if (Config.DEBUG) - { - _log.fine("[SET KARMA] [GM]" + activeChar.getName() + " Changed karma for " + player.getName() + " from (" + oldKarma + ") to (" + newKarma + ")."); - } - } - else - { - // tell admin of mistake - activeChar.sendMessage("You must enter a value for karma greater than or equal to 0."); - if (Config.DEBUG) - { - _log.fine("[SET KARMA] ERROR: [GM]" + activeChar.getName() + " entered an incorrect value for new karma: " + newKarma + " for " + player.getName() + "."); - } + _log.fine("[SET KARMA] [GM]" + activeChar.getName() + " Changed karma for " + player.getName() + " from (" + oldKarma + ") to (" + newKarma + ")."); } } @@ -1447,7 +1435,7 @@ public class AdminEditChar implements IAdminCommandHandler html.replace("%ai%", target.hasAI() ? String.valueOf(target.getAI().getIntention().name()) : "NULL"); html.replace("%hp%", (int) target.getStatus().getCurrentHp() + "/" + target.getStat().getMaxHp()); html.replace("%mp%", (int) target.getStatus().getCurrentMp() + "/" + target.getStat().getMaxMp()); - html.replace("%karma%", Integer.toString(target.getKarma())); + html.replace("%karma%", Integer.toString(target.getReputation())); html.replace("%race%", target.getTemplate().getRace().toString()); if (target instanceof L2PetInstance) { diff --git a/trunk/dist/game/data_classic/scripts/handlers/admincommandhandlers/AdminEffects.java b/trunk/dist/game/data_classic/scripts/handlers/admincommandhandlers/AdminEffects.java index f74655365a..4c489a3922 100644 --- a/trunk/dist/game/data_classic/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/trunk/dist/game/data_classic/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -639,7 +639,7 @@ public class AdminEffects implements IAdminCommandHandler { String type = st.nextToken(); int diplayeffect = Integer.parseInt(type); - npc.setState(diplayeffect); + npc.setDisplayEffect(diplayeffect); } catch (Exception e) { diff --git a/trunk/dist/game/data_classic/scripts/handlers/communityboard/HomeBoard.java b/trunk/dist/game/data_classic/scripts/handlers/communityboard/HomeBoard.java index cc53b0ecc4..0b077fdad6 100644 --- a/trunk/dist/game/data_classic/scripts/handlers/communityboard/HomeBoard.java +++ b/trunk/dist/game/data_classic/scripts/handlers/communityboard/HomeBoard.java @@ -73,7 +73,7 @@ public final class HomeBoard implements IParseBoardHandler activeChar.sendMessage("You can't use the Community Board right now."); return false; } - if (Config.COMMUNITYBOARD_KARMA_DISABLED && (activeChar.getKarma() > 0)) + if (Config.COMMUNITYBOARD_KARMA_DISABLED && (activeChar.getReputation() < 0)) { activeChar.sendMessage("Players with Karma cannot use the Community Board."); return false; diff --git a/trunk/dist/game/data_classic/scripts/handlers/targethandlers/AreaFriendly.java b/trunk/dist/game/data_classic/scripts/handlers/targethandlers/AreaFriendly.java index a690809f6e..0b8f85add9 100644 --- a/trunk/dist/game/data_classic/scripts/handlers/targethandlers/AreaFriendly.java +++ b/trunk/dist/game/data_classic/scripts/handlers/targethandlers/AreaFriendly.java @@ -146,7 +146,7 @@ public class AreaFriendly implements ITargetTypeHandler return true; } - if ((targetPlayer.getPvpFlag() > 0) || (targetPlayer.getKarma() > 0)) + if ((targetPlayer.getPvpFlag() > 0) || (targetPlayer.getReputation() < 0)) { return false; } diff --git a/trunk/dist/game/data_classic/scripts/handlers/targethandlers/AuraFriendly.java b/trunk/dist/game/data_classic/scripts/handlers/targethandlers/AuraFriendly.java index 4aba14538c..5529604813 100644 --- a/trunk/dist/game/data_classic/scripts/handlers/targethandlers/AuraFriendly.java +++ b/trunk/dist/game/data_classic/scripts/handlers/targethandlers/AuraFriendly.java @@ -101,7 +101,7 @@ public class AuraFriendly implements ITargetTypeHandler return true; } - if ((targetPlayer.getPvpFlag() > 0) || (targetPlayer.getKarma() > 0)) + if ((targetPlayer.getPvpFlag() > 0) || (targetPlayer.getReputation() < 0)) { return false; } diff --git a/trunk/dist/game/data_classic/scripts/handlers/targethandlers/EnemySummon.java b/trunk/dist/game/data_classic/scripts/handlers/targethandlers/EnemySummon.java index 28461b971c..cb9a2aa7fd 100644 --- a/trunk/dist/game/data_classic/scripts/handlers/targethandlers/EnemySummon.java +++ b/trunk/dist/game/data_classic/scripts/handlers/targethandlers/EnemySummon.java @@ -37,7 +37,7 @@ public class EnemySummon implements ITargetTypeHandler if (target.isSummon()) { L2Summon targetSummon = (L2Summon) target; - if ((activeChar.isPlayer() && (activeChar.getPet() != targetSummon) && activeChar.hasServitor(targetSummon.getObjectId()) && !targetSummon.isDead() && ((targetSummon.getOwner().getPvpFlag() != 0) || (targetSummon.getOwner().getKarma() > 0))) || (targetSummon.getOwner().isInsideZone(ZoneId.PVP) && activeChar.getActingPlayer().isInsideZone(ZoneId.PVP)) || (targetSummon.getOwner().isInDuel() && activeChar.getActingPlayer().isInDuel() && (targetSummon.getOwner().getDuelId() == activeChar.getActingPlayer().getDuelId()))) + if ((activeChar.isPlayer() && (activeChar.getPet() != targetSummon) && activeChar.hasServitor(targetSummon.getObjectId()) && !targetSummon.isDead() && ((targetSummon.getOwner().getPvpFlag() != 0) || (targetSummon.getOwner().getReputation() < 0))) || (targetSummon.getOwner().isInsideZone(ZoneId.PVP) && activeChar.getActingPlayer().isInsideZone(ZoneId.PVP)) || (targetSummon.getOwner().isInDuel() && activeChar.getActingPlayer().isInDuel() && (targetSummon.getOwner().getDuelId() == activeChar.getActingPlayer().getDuelId()))) { return new L2Character[] {