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
+14 -4
View File
@@ -5234,11 +5234,21 @@ public final class L2PcInstance extends L2Playable
setReputation(0); setReputation(0);
setPkKills(getPkKills() + 1); setPkKills(getPkKills() + 1);
} }
else else // Calculate new karma and increase pk count
{ {
// Calculate new karma and increase pk count if (Config.FACTION_SYSTEM_ENABLED)
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); {
setPkKills(getPkKills() + 1); if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
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); final UserInfo ui = new UserInfo(this, false);
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+14 -4
View File
@@ -5240,11 +5240,21 @@ public final class L2PcInstance extends L2Playable
setReputation(0); setReputation(0);
setPkKills(getPkKills() + 1); setPkKills(getPkKills() + 1);
} }
else else // Calculate new karma and increase pk count
{ {
// Calculate new karma and increase pk count if (Config.FACTION_SYSTEM_ENABLED)
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); {
setPkKills(getPkKills() + 1); if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
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); final UserInfo ui = new UserInfo(this, false);
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+14 -4
View File
@@ -5242,11 +5242,21 @@ public final class L2PcInstance extends L2Playable
setReputation(0); setReputation(0);
setPkKills(getPkKills() + 1); setPkKills(getPkKills() + 1);
} }
else else // Calculate new karma and increase pk count
{ {
// Calculate new karma and increase pk count if (Config.FACTION_SYSTEM_ENABLED)
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); {
setPkKills(getPkKills() + 1); if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
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); final UserInfo ui = new UserInfo(this, false);
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+14 -4
View File
@@ -5240,11 +5240,21 @@ public final class L2PcInstance extends L2Playable
setReputation(0); setReputation(0);
setPkKills(getPkKills() + 1); setPkKills(getPkKills() + 1);
} }
else else // Calculate new karma and increase pk count
{ {
// Calculate new karma and increase pk count if (Config.FACTION_SYSTEM_ENABLED)
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); {
setPkKills(getPkKills() + 1); if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
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); final UserInfo ui = new UserInfo(this, false);
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+14 -4
View File
@@ -5241,11 +5241,21 @@ public final class L2PcInstance extends L2Playable
setReputation(0); setReputation(0);
setPkKills(getPkKills() + 1); setPkKills(getPkKills() + 1);
} }
else else // Calculate new karma and increase pk count
{ {
// Calculate new karma and increase pk count if (Config.FACTION_SYSTEM_ENABLED)
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); {
setPkKills(getPkKills() + 1); if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
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); final UserInfo ui = new UserInfo(this, false);
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+14 -4
View File
@@ -5241,11 +5241,21 @@ public final class L2PcInstance extends L2Playable
setReputation(0); setReputation(0);
setPkKills(getPkKills() + 1); setPkKills(getPkKills() + 1);
} }
else else // Calculate new karma and increase pk count
{ {
// Calculate new karma and increase pk count if (Config.FACTION_SYSTEM_ENABLED)
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); {
setPkKills(getPkKills() + 1); if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
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); final UserInfo ui = new UserInfo(this, false);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+11 -1
View File
@@ -5371,7 +5371,17 @@ public final class L2PcInstance extends L2Playable
} }
else if (targetPlayer.getPvpFlag() == 0) // Target player doesn't have karma else if (targetPlayer.getPvpFlag() == 0) // Target player doesn't have karma
{ {
increasePkKillsAndKarma(target); if (Config.FACTION_SYSTEM_ENABLED)
{
if ((_isGood && targetPlayer.isGood()) || (_isEvil && targetPlayer.isEvil()))
{
increasePkKillsAndKarma(target);
}
}
else
{
increasePkKillsAndKarma(target);
}
checkItemRestriction(); // Unequip adventurer items checkItemRestriction(); // Unequip adventurer items
} }
} }
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+14 -4
View File
@@ -5205,11 +5205,21 @@ public final class L2PcInstance extends L2Playable
setReputation(0); setReputation(0);
setPkKills(getPkKills() + 1); setPkKills(getPkKills() + 1);
} }
else else // Calculate new karma and increase pk count
{ {
// Calculate new karma and increase pk count if (Config.FACTION_SYSTEM_ENABLED)
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); {
setPkKills(getPkKills() + 1); if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
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); final UserInfo ui = new UserInfo(this, false);
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+14 -4
View File
@@ -5206,11 +5206,21 @@ public final class L2PcInstance extends L2Playable
setReputation(0); setReputation(0);
setPkKills(getPkKills() + 1); setPkKills(getPkKills() + 1);
} }
else else // Calculate new karma and increase pk count
{ {
// Calculate new karma and increase pk count if (Config.FACTION_SYSTEM_ENABLED)
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); {
setPkKills(getPkKills() + 1); if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
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); final UserInfo ui = new UserInfo(this, false);
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+14 -4
View File
@@ -5207,11 +5207,21 @@ public final class L2PcInstance extends L2Playable
setReputation(0); setReputation(0);
setPkKills(getPkKills() + 1); setPkKills(getPkKills() + 1);
} }
else else // Calculate new karma and increase pk count
{ {
// Calculate new karma and increase pk count if (Config.FACTION_SYSTEM_ENABLED)
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); {
setPkKills(getPkKills() + 1); if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
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); final UserInfo ui = new UserInfo(this, false);
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+14 -4
View File
@@ -5207,11 +5207,21 @@ public final class L2PcInstance extends L2Playable
setReputation(0); setReputation(0);
setPkKills(getPkKills() + 1); setPkKills(getPkKills() + 1);
} }
else else // Calculate new karma and increase pk count
{ {
// Calculate new karma and increase pk count if (Config.FACTION_SYSTEM_ENABLED)
setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); {
setPkKills(getPkKills() + 1); if ((_isGood && killedPlayer.isGood()) || (_isEvil && killedPlayer.isEvil()))
{
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); final UserInfo ui = new UserInfo(this, false);