From 2a244f6cc43061bb1692bea329f66eae3102d921 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 11 Feb 2022 06:24:38 +0000
Subject: [PATCH] Addition of AutoAttackDamageBonus effect. Contributed by
 nasseka.

---
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/30500-30599.xml    | 11 ++-----
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 .../scripts/handlers/EffectMasterHandler.java |  1 +
 .../effecthandlers/AutoAttackDamageBonus.java | 31 +++++++++++++++++++
 .../game/data/stats/skills/documentation.txt  |  1 +
 .../gameserver/model/stats/Formulas.java      |  1 +
 .../gameserver/model/stats/Stat.java          |  1 +
 117 files changed, 771 insertions(+), 96 deletions(-)
 create mode 100644 L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
 create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java

diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java
index c8c7119d6b..74b1bfdaed 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -48,6 +48,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml
index 79b400233b..cad1687c68 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml
@@ -1296,14 +1296,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Damage Up -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt
index af9a2e1b53..b11b1ac16a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt
@@ -18,6 +18,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index e4458cec1e..a690c10f03 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 82eabb04ad..fd67c5a494 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -88,6 +88,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java
index c8c7119d6b..74b1bfdaed 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -48,6 +48,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30500-30599.xml
index c691973b88..4c71ce8905 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30500-30599.xml
@@ -1431,14 +1431,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Damage Up -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt
index af9a2e1b53..b11b1ac16a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt
@@ -18,6 +18,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index e4458cec1e..a690c10f03 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 82eabb04ad..fd67c5a494 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -88,6 +88,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java
index c8c7119d6b..74b1bfdaed 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -48,6 +48,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30500-30599.xml
index b5ec36856c..54567dc079 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30500-30599.xml
@@ -1447,14 +1447,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Damage Up -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt
index af9a2e1b53..b11b1ac16a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt
@@ -18,6 +18,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index e4458cec1e..a690c10f03 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 82eabb04ad..fd67c5a494 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -88,6 +88,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java
index c7062b879c..5e397f9a94 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -48,6 +48,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml
index a859299675..642baf8fbe 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml
@@ -1447,14 +1447,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Damage Up -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt
index 2557fc3c79..5ddb905d4f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt
@@ -18,6 +18,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index e4458cec1e..a690c10f03 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java
index e4cb22c9a5..bcad6fd357 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -88,6 +88,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 485e45d5d3..e03408370e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -49,6 +49,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30500-30599.xml
index 625341e6cd..e200d57860 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30500-30599.xml
@@ -1447,14 +1447,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Damage Up -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt
index d84a64eb73..df9ffc582f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt
@@ -19,6 +19,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index e4458cec1e..a690c10f03 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 8ddf4b571d..d9a19da141 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -88,6 +88,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 6ce877f7d0..2c6350195a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -50,6 +50,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml
index 1dfbef3368..d4933634b6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml
@@ -1447,14 +1447,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Damage Up -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt
index 45ae92e482..b49f6d2859 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt
@@ -20,6 +20,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index e4458cec1e..a690c10f03 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java
index c88dca5498..6bc89a4baf 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -88,6 +88,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 6ce877f7d0..2c6350195a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -50,6 +50,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml
index 97310e39c8..23365aab82 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml
@@ -1504,14 +1504,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Damage Up -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt
index 45ae92e482..b49f6d2859 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt
@@ -20,6 +20,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index e4458cec1e..a690c10f03 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java
index c88dca5498..6bc89a4baf 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -88,6 +88,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java
index fe76568704..b7d6256710 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -51,6 +51,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml
index f76edcc814..956cf5ec99 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml
@@ -1504,14 +1504,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Damage Up -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt
index 4ee4b62443..57c7e34d70 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt
@@ -21,6 +21,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index c8369b7605..4211b94981 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java
index ec7924aa7c..62ae1d78c4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -88,6 +88,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java
index e95f7f8b9e..313a90f199 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -51,6 +51,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30500-30599.xml
index 51c1a4e4f9..e6edf13c3f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30500-30599.xml
@@ -1529,14 +1529,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Damage Up -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt
index 8fa31c55fb..6c4ba5435e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt
@@ -21,6 +21,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index c8369b7605..4211b94981 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 9cafdbce42..2c6d0f375a 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -90,6 +90,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 0455e5730c..bd468ec7be 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -52,6 +52,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml
index 142aa2452b..0f3a8876ee 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml
@@ -1529,14 +1529,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Reliable Hit -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt
index 2b321c39e4..84f0378f1a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt
@@ -21,6 +21,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index c8369b7605..4211b94981 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 9cafdbce42..2c6d0f375a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -90,6 +90,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 5dc2d43dfe..44e49639f7 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -52,6 +52,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30500-30599.xml
index 142aa2452b..0f3a8876ee 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30500-30599.xml
@@ -1529,14 +1529,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Reliable Hit -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/documentation.txt
index 1d6da91b44..d94aa5967d 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/documentation.txt
@@ -21,6 +21,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index e1d26ce44f..400dec6f4c 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 9cafdbce42..2c6d0f375a 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -90,6 +90,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 18c2dd0e4c..ab828ead33 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -47,6 +47,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt
index ef014364c8..dac36ca3ca 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt
@@ -17,6 +17,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index f755b2f097..d2145e1564 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 519d0fad43..f580daf33c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -87,6 +87,7 @@ public enum Stat
 	CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 18c2dd0e4c..ab828ead33 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -47,6 +47,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt
index ef014364c8..dac36ca3ca 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt
@@ -17,6 +17,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index f755b2f097..d2145e1564 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 519d0fad43..f580daf33c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -87,6 +87,7 @@ public enum Stat
 	CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 0a83da5b18..30b5e925e5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -48,6 +48,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt
index 900c2081bc..4034913276 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt
@@ -18,6 +18,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index f755b2f097..d2145e1564 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java
index d97a0bb172..cf65ada6f4 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -87,6 +87,7 @@ public enum Stat
 	CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 7d15e6b147..85ecb14327 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -49,6 +49,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt
index 7f740ce72e..7dffdf682d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt
@@ -19,6 +19,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index db781f0616..b1151e5b05 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1446,6 +1446,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java
index e80f792ed8..4972a1139f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -87,6 +87,7 @@ public enum Stat
 	CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// ELEMENTAL SPIRITS
 	ELEMENTAL_SPIRIT_FIRE_ATTACK("elementalSpiritFireAttack"),
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 7d15e6b147..85ecb14327 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -49,6 +49,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt
index 7f740ce72e..7dffdf682d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt
@@ -19,6 +19,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index db781f0616..b1151e5b05 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1446,6 +1446,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java
index e80f792ed8..4972a1139f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -87,6 +87,7 @@ public enum Stat
 	CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// ELEMENTAL SPIRITS
 	ELEMENTAL_SPIRIT_FIRE_ATTACK("elementalSpiritFireAttack"),
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 01f09ec6e6..b99e752d13 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -50,6 +50,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt
index 3842e301c6..c8ba01a656 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt
@@ -20,6 +20,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index db781f0616..b1151e5b05 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1446,6 +1446,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 9e06b77030..ad75668c44 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -88,6 +88,7 @@ public enum Stat
 	CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// ELEMENTAL SPIRITS
 	ELEMENTAL_SPIRIT_FIRE_ATTACK("elementalSpiritFireAttack"),
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java
index bfb7f4aa4f..7eb5f87226 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -48,6 +48,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30500-30599.xml
index a859299675..642baf8fbe 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30500-30599.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30500-30599.xml
@@ -1447,14 +1447,9 @@
 				<AIRBIND>90</AIRBIND>
 				<AGGRESSION>90</AGGRESSION>
 			</effect>
-			<effect name="TriggerSkillByAttack">
-				<!-- Damage Up -->
-				<chance>100</chance>
-				<targetType>TARGET</targetType>
-				<affectScope>SINGLE</affectScope>
-				<minDamage>100</minDamage>
-				<skillId>30521</skillId> <!-- Damage Up -->
-				<skillLevel>1</skillLevel>
+			<effect name="AutoAttackDamageBonus">
+				<amount>400</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="IgnoreDeath" />
 			<effect name="PAtk">
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt
index 2bdee92e2f..49f325c6fb 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt
@@ -18,6 +18,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index f755b2f097..d2145e1564 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1445,6 +1445,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 9d81854f8b..fbf158a1e7 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -87,6 +87,7 @@ public enum Stat
 	CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 856e1d3d2a..0b084b99d9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -50,6 +50,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt
index 13d774471a..5c43271aa8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt
@@ -20,6 +20,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index db781f0616..b1151e5b05 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1446,6 +1446,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 5d8b6f8684..dde19c73a6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -90,6 +90,7 @@ public enum Stat
 	CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// ELEMENTAL SPIRITS
 	ELEMENTAL_SPIRIT_FIRE_ATTACK("elementalSpiritFireAttack"),
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java
index c0c5ceb4ef..e22369ccee 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -50,6 +50,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt
index a841806151..1cb25fdbaf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt
@@ -20,6 +20,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index db781f0616..b1151e5b05 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1446,6 +1446,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 5d8b6f8684..dde19c73a6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -90,6 +90,7 @@ public enum Stat
 	CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// ELEMENTAL SPIRITS
 	ELEMENTAL_SPIRIT_FIRE_ATTACK("elementalSpiritFireAttack"),
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java
index bc1b223ded..881293f6f4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -50,6 +50,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new);
 		EffectHandler.getInstance().registerHandler("AttackBehind", AttackBehind::new);
 		EffectHandler.getInstance().registerHandler("AttackTrait", AttackTrait::new);
+		EffectHandler.getInstance().registerHandler("AutoAttackDamageBonus", AutoAttackDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("Backstab", Backstab::new);
 		EffectHandler.getInstance().registerHandler("Betray", Betray::new);
 		EffectHandler.getInstance().registerHandler("Blink", Blink::new);
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
new file mode 100644
index 0000000000..0690fbd1f4
--- /dev/null
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AutoAttackDamageBonus.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author NasSeKa
+ */
+public class AutoAttackDamageBonus extends AbstractStatPercentEffect
+{
+	public AutoAttackDamageBonus(StatSet params)
+	{
+		super(params, Stat.AUTO_ATTACK_DAMAGE_BONUS);
+	}
+}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/documentation.txt
index bf0aa4111b..697499fede 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/documentation.txt
@@ -20,6 +20,7 @@ AttackAttribute: Stat that increases specific attack attribute.
 AttackAttributeAdd: Stat that increases all attack attribute.
 AttackBehind: Enables all attacks regardless of position to land towards the back.
 AttackTrait: Stat that manages all attack traits.
+AutoAttackDamageBonus: Auto attack damage modifier. (l2jmobius)
 Backstab: Inflicts physical damage according to the backstab formula.
 Betray: Causes the target summon to attack its owner.
 Blink: Teleport to location effect.
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index f737c260a3..4a321218ba 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1446,6 +1446,7 @@ public class Formulas
 		damage *= calcAttackTraitBonus(attacker, target);
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
+		damage *= attacker.getStat().getMul(Stat.AUTO_ATTACK_DAMAGE_BONUS);
 		
 		return Math.max(0, damage);
 	}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 7e32a49937..183ebae1fd 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -90,6 +90,7 @@ public enum Stat
 	CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
+	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
 	
 	// ELEMENTAL SPIRITS
 	ELEMENTAL_SPIRIT_FIRE_ATTACK("elementalSpiritFireAttack"),