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

Fixed HealEffect bonuses.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-06-07 10:34:22 +00:00
parent 479b69ddb2
commit 25d199e044
48 changed files with 84 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),

3
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),

3
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),

3
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),

3
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),

3
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),

3
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),

3
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),

3
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),

3
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -107,7 +107,8 @@ public final class Heal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill)) if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{ {

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java vendored
View File

@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.model.stats.Stats;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public class HealEffect extends AbstractStatEffect public class HealEffect extends AbstractStatEffect
{ {
public HealEffect(StatsSet params) public HealEffect(StatsSet params)
{ {
super(params, Stats.HEAL_EFFECT); super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
} }
} }

3
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -103,7 +103,8 @@ public final class HpCpHeal extends AbstractEffect
if (!skill.isStatic()) if (!skill.isStatic())
{ {
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk()); 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 // Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL))) if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{ {

1
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stats.java
View File

@ -73,6 +73,7 @@ public enum Stats
ADDITIONAL_POTION_CP("addPotionCp"), ADDITIONAL_POTION_CP("addPotionCp"),
MANA_CHARGE("manaCharge"), MANA_CHARGE("manaCharge"),
HEAL_EFFECT("healEffect"), HEAL_EFFECT("healEffect"),
HEAL_EFFECT_ADD("healEffectAdd"),
// ATTACK & DEFENCE // ATTACK & DEFENCE
PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()), PHYSICAL_DEFENCE("pDef", new PDefenseFinalizer()),