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

[Classic] Updating datapack to match latest core.

Browse Source
This commit is contained in:
MobiusDev
2015-10-16 07:50:19 +00:00
parent 9c1bf1a059
commit 88f99f3341
7 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/dist/game/data_classic/scripts/custom/events/TvT/TvTManager/TvTManager.java vendored
View File

@@ -81,7 +81,7 @@ public final class TvTManager extends AbstractNpcAI implements IVoicedCommandHan
{ {
htmltext = getHtm(player.getHtmlPrefix(), "Olympiad.html"); htmltext = getHtm(player.getHtmlPrefix(), "Olympiad.html");
} }
else if (player.getKarma() > 0) else if (player.getReputation() < 0)
{ {
htmltext = getHtm(player.getHtmlPrefix(), "Karma.html"); htmltext = getHtm(player.getHtmlPrefix(), "Karma.html");
} }

40
trunk/dist/game/data_classic/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -989,7 +989,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%z%", String.valueOf(player.getZ())); adminReply.replace("%z%", String.valueOf(player.getZ()));
adminReply.replace("%currenthp%", String.valueOf((int) player.getCurrentHp())); adminReply.replace("%currenthp%", String.valueOf((int) player.getCurrentHp()));
adminReply.replace("%maxhp%", String.valueOf(player.getMaxHp())); 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("%currentmp%", String.valueOf((int) player.getCurrentMp()));
adminReply.replace("%maxmp%", String.valueOf(player.getMaxMp())); adminReply.replace("%maxmp%", String.valueOf(player.getMaxMp()));
adminReply.replace("%pvpflag%", String.valueOf(player.getPvpFlag())); adminReply.replace("%pvpflag%", String.valueOf(player.getPvpFlag()));
@@ -1033,31 +1033,19 @@ public class AdminEditChar implements IAdminCommandHandler
return; 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 _log.fine("[SET KARMA] [GM]" + activeChar.getName() + " Changed karma for " + player.getName() + " from (" + oldKarma + ") to (" + newKarma + ").");
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() + ".");
}
} }
} }
@@ -1447,7 +1435,7 @@ public class AdminEditChar implements IAdminCommandHandler
html.replace("%ai%", target.hasAI() ? String.valueOf(target.getAI().getIntention().name()) : "NULL"); html.replace("%ai%", target.hasAI() ? String.valueOf(target.getAI().getIntention().name()) : "NULL");
html.replace("%hp%", (int) target.getStatus().getCurrentHp() + "/" + target.getStat().getMaxHp()); html.replace("%hp%", (int) target.getStatus().getCurrentHp() + "/" + target.getStat().getMaxHp());
html.replace("%mp%", (int) target.getStatus().getCurrentMp() + "/" + target.getStat().getMaxMp()); 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()); html.replace("%race%", target.getTemplate().getRace().toString());
if (target instanceof L2PetInstance) if (target instanceof L2PetInstance)
{ {

2
trunk/dist/game/data_classic/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@@ -639,7 +639,7 @@ public class AdminEffects implements IAdminCommandHandler
{ {
String type = st.nextToken(); String type = st.nextToken();
int diplayeffect = Integer.parseInt(type); int diplayeffect = Integer.parseInt(type);
npc.setState(diplayeffect); npc.setDisplayEffect(diplayeffect);
} }
catch (Exception e) catch (Exception e)
{ {

2
trunk/dist/game/data_classic/scripts/handlers/communityboard/HomeBoard.java vendored
View File

@@ -73,7 +73,7 @@ public final class HomeBoard implements IParseBoardHandler
activeChar.sendMessage("You can't use the Community Board right now."); activeChar.sendMessage("You can't use the Community Board right now.");
return false; 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."); activeChar.sendMessage("Players with Karma cannot use the Community Board.");
return false; return false;

2
trunk/dist/game/data_classic/scripts/handlers/targethandlers/AreaFriendly.java vendored
View File

@@ -146,7 +146,7 @@ public class AreaFriendly implements ITargetTypeHandler
return true; return true;
} }
if ((targetPlayer.getPvpFlag() > 0) || (targetPlayer.getKarma() > 0)) if ((targetPlayer.getPvpFlag() > 0) || (targetPlayer.getReputation() < 0))
{ {
return false; return false;
} }

2
trunk/dist/game/data_classic/scripts/handlers/targethandlers/AuraFriendly.java vendored
View File

@@ -101,7 +101,7 @@ public class AuraFriendly implements ITargetTypeHandler
return true; return true;
} }
if ((targetPlayer.getPvpFlag() > 0) || (targetPlayer.getKarma() > 0)) if ((targetPlayer.getPvpFlag() > 0) || (targetPlayer.getReputation() < 0))
{ {
return false; return false;
} }

2
trunk/dist/game/data_classic/scripts/handlers/targethandlers/EnemySummon.java vendored
View File

@@ -37,7 +37,7 @@ public class EnemySummon implements ITargetTypeHandler
if (target.isSummon()) if (target.isSummon())
{ {
L2Summon targetSummon = (L2Summon) target; 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[] return new L2Character[]
{ {