From 6857c290c08fa6dcba4a0bf3074e6fe66f88c70a Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 16 Feb 2018 16:50:23 +0000 Subject: [PATCH] Reuse of rear damage rate effect. --- .../com/l2jmobius/gameserver/model/actor/L2Character.java | 7 +++++-- .../com/l2jmobius/gameserver/model/actor/L2Character.java | 7 +++++-- .../com/l2jmobius/gameserver/model/actor/L2Character.java | 7 +++++-- .../com/l2jmobius/gameserver/model/actor/L2Character.java | 7 +++++-- .../com/l2jmobius/gameserver/model/actor/L2Character.java | 7 +++++-- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java index eee62b70f8..656087b1a3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -55,7 +55,6 @@ import com.l2jmobius.gameserver.enums.BasicProperty; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.ItemSkillType; -import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.StatusUpdateType; @@ -4303,7 +4302,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!reflect && !isDOT) { - damage *= getStat().getPositionTypeValue(Stats.ATTACK_DAMAGE, Position.getPosition(this, target)); + // RearDamage effect bonus. + if (isBehind(target)) + { + damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + } // Counterattacks happen before damage received. if (!target.isDead() && (skill != null)) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java index eee62b70f8..656087b1a3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -55,7 +55,6 @@ import com.l2jmobius.gameserver.enums.BasicProperty; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.ItemSkillType; -import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.StatusUpdateType; @@ -4303,7 +4302,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!reflect && !isDOT) { - damage *= getStat().getPositionTypeValue(Stats.ATTACK_DAMAGE, Position.getPosition(this, target)); + // RearDamage effect bonus. + if (isBehind(target)) + { + damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + } // Counterattacks happen before damage received. if (!target.isDead() && (skill != null)) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java index eee62b70f8..656087b1a3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -55,7 +55,6 @@ import com.l2jmobius.gameserver.enums.BasicProperty; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.ItemSkillType; -import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.StatusUpdateType; @@ -4303,7 +4302,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!reflect && !isDOT) { - damage *= getStat().getPositionTypeValue(Stats.ATTACK_DAMAGE, Position.getPosition(this, target)); + // RearDamage effect bonus. + if (isBehind(target)) + { + damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + } // Counterattacks happen before damage received. if (!target.isDead() && (skill != null)) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java index eee62b70f8..656087b1a3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -55,7 +55,6 @@ import com.l2jmobius.gameserver.enums.BasicProperty; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.ItemSkillType; -import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.StatusUpdateType; @@ -4303,7 +4302,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!reflect && !isDOT) { - damage *= getStat().getPositionTypeValue(Stats.ATTACK_DAMAGE, Position.getPosition(this, target)); + // RearDamage effect bonus. + if (isBehind(target)) + { + damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + } // Counterattacks happen before damage received. if (!target.isDead() && (skill != null)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java index eee62b70f8..656087b1a3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -55,7 +55,6 @@ import com.l2jmobius.gameserver.enums.BasicProperty; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.ItemSkillType; -import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.StatusUpdateType; @@ -4303,7 +4302,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!reflect && !isDOT) { - damage *= getStat().getPositionTypeValue(Stats.ATTACK_DAMAGE, Position.getPosition(this, target)); + // RearDamage effect bonus. + if (isBehind(target)) + { + damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + } // Counterattacks happen before damage received. if (!target.isDead() && (skill != null))