diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stats.java index 5d47890fd7..7b4d20559e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stats.java index 5d47890fd7..7b4d20559e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stats.java index 5d47890fd7..7b4d20559e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stats.java index a1d19e87a3..789123f3d7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stats.java index cb2423a5f2..d94bdce5c2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stats.java index 1e0ee1e719..f0d5e323de 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stats.java index 1e0ee1e719..f0d5e323de 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stats.java index bc7646d6d2..1b216a2637 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stats.java index bc7646d6d2..1b216a2637 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stats.java index bbac700765..dccf380a5b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stats.java index 48ddf549af..d1defb05d5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 248bedc57d..952f2343ff 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 68e773c139..5beafe8006 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.stats.Stats; /** - * @author Sdw + * @author Sdw, Mobius */ public class HealEffect extends AbstractStatEffect { public HealEffect(StatsSet params) { - super(params, Stats.HEAL_EFFECT); + super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 93a4426890..90e9edd0b9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect if (!skill.isStatic()) { amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); - amount = effected.getStat().getValue(Stats.HEAL_EFFECT, amount); + amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1); + amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0); // Heal critic, since CT2.3 Gracia Final if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stats.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stats.java index 48ddf549af..d1defb05d5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stats.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stats.java @@ -73,6 +73,7 @@ public enum Stats ADDITIONAL_POTION_CP("addPotionCp"), MANA_CHARGE("manaCharge"), HEAL_EFFECT("healEffect"), + HEAL_EFFECT_ADD("healEffectAdd"), // ATTACK & DEFENCE PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),