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

Creature should have an active weapon to receive weapon bonus.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-02-10 10:09:10 +00:00
parent 617ca7533a
commit 5d100672c1
12 changed files with 72 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusMAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusMAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus

7
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusPAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusPAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus

7
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusMAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusMAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus

7
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusPAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusPAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus

7
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusMAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusMAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus

7
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusPAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusPAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus

7
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusMAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusMAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus

7
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusPAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusPAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus

7
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusMAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusMAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus

7
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusPAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusPAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus

7
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusMAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusMAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus

7
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
throwIfPresent(base); throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat); double baseValue = calcWeaponBaseValue(creature, stat);
baseValue += creature.getStat().getWeaponBonusPAtk(); if (creature.getActiveWeaponInstance() != null)
{
baseValue += creature.getStat().getWeaponBonusPAtk();
}
baseValue += calcEnchantedItemBonus(creature, stat); baseValue += calcEnchantedItemBonus(creature, stat);
if (creature.isPlayer()) if (creature.isPlayer())
{ {
// Enchanted chest bonus // Enchanted chest bonus