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

Should not gain karma when killing opposing faction player.

Browse Source
This commit is contained in:
MobiusDev
2019-02-23 09:54:56 +00:00
parent fa9922dd4e
commit ffd24341a1
11 changed files with 151 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+12 -2
View File
@@ -5234,12 +5234,22 @@ public final class L2PcInstance extends L2Playable
setReputation(0);
setPkKills(getPkKills() + 1);
}
else
else // Calculate new karma and increase pk count
{
if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
// Calculate new karma and increase pk count
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
else
{
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
final UserInfo ui = new UserInfo(this, false);
ui.addComponentType(UserInfoType.SOCIAL);
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+12 -2
View File
@@ -5240,12 +5240,22 @@ public final class L2PcInstance extends L2Playable
setReputation(0);
setPkKills(getPkKills() + 1);
}
else
else // Calculate new karma and increase pk count
{
if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
// Calculate new karma and increase pk count
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
else
{
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
final UserInfo ui = new UserInfo(this, false);
ui.addComponentType(UserInfoType.SOCIAL);
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+12 -2
View File
@@ -5242,12 +5242,22 @@ public final class L2PcInstance extends L2Playable
setReputation(0);
setPkKills(getPkKills() + 1);
}
else
else // Calculate new karma and increase pk count
{
if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
// Calculate new karma and increase pk count
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
else
{
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
final UserInfo ui = new UserInfo(this, false);
ui.addComponentType(UserInfoType.SOCIAL);
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+12 -2
View File
@@ -5240,12 +5240,22 @@ public final class L2PcInstance extends L2Playable
setReputation(0);
setPkKills(getPkKills() + 1);
}
else
else // Calculate new karma and increase pk count
{
if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
// Calculate new karma and increase pk count
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
else
{
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
final UserInfo ui = new UserInfo(this, false);
ui.addComponentType(UserInfoType.SOCIAL);
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+12 -2
View File
@@ -5241,12 +5241,22 @@ public final class L2PcInstance extends L2Playable
setReputation(0);
setPkKills(getPkKills() + 1);
}
else
else // Calculate new karma and increase pk count
{
if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
// Calculate new karma and increase pk count
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
else
{
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
final UserInfo ui = new UserInfo(this, false);
ui.addComponentType(UserInfoType.SOCIAL);
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+12 -2
View File
@@ -5241,12 +5241,22 @@ public final class L2PcInstance extends L2Playable
setReputation(0);
setPkKills(getPkKills() + 1);
}
else
else // Calculate new karma and increase pk count
{
if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
// Calculate new karma and increase pk count
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
else
{
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
final UserInfo ui = new UserInfo(this, false);
ui.addComponentType(UserInfoType.SOCIAL);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+10
View File
@@ -5370,8 +5370,18 @@ public final class L2PcInstance extends L2Playable
}
}
else if (targetPlayer.getPvpFlag() == 0) // Target player doesn't have karma
{
if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && targetPlayer.isGood()) || (_isEvil && targetPlayer.isEvil()))
{
increasePkKillsAndKarma(target);
}
}
else
{
increasePkKillsAndKarma(target);
}
checkItemRestriction(); // Unequip adventurer items
}
}
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+12 -2
View File
@@ -5205,12 +5205,22 @@ public final class L2PcInstance extends L2Playable
setReputation(0);
setPkKills(getPkKills() + 1);
}
else
else // Calculate new karma and increase pk count
{
if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
// Calculate new karma and increase pk count
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
else
{
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
final UserInfo ui = new UserInfo(this, false);
ui.addComponentType(UserInfoType.SOCIAL);
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+12 -2
View File
@@ -5206,12 +5206,22 @@ public final class L2PcInstance extends L2Playable
setReputation(0);
setPkKills(getPkKills() + 1);
}
else
else // Calculate new karma and increase pk count
{
if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
// Calculate new karma and increase pk count
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
else
{
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
final UserInfo ui = new UserInfo(this, false);
ui.addComponentType(UserInfoType.SOCIAL);
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+12 -2
View File
@@ -5207,12 +5207,22 @@ public final class L2PcInstance extends L2Playable
setReputation(0);
setPkKills(getPkKills() + 1);
}
else
else // Calculate new karma and increase pk count
{
if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
// Calculate new karma and increase pk count
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
else
{
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
final UserInfo ui = new UserInfo(this, false);
ui.addComponentType(UserInfoType.SOCIAL);
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+12 -2
View File
@@ -5207,12 +5207,22 @@ public final class L2PcInstance extends L2Playable
setReputation(0);
setPkKills(getPkKills() + 1);
}
else
else // Calculate new karma and increase pk count
{
if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
// Calculate new karma and increase pk count
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
else
{
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon()));
setPkKills(getPkKills() + 1);
}
}
final UserInfo ui = new UserInfo(this, false);
ui.addComponentType(UserInfoType.SOCIAL);