Addition of WeaponBonusMAtk and WeaponBonusPAtk effect handlers.

Thanks to Sero, nassseka and Enryu.

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -402,6 +402,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("VitalityPointsRate", VitalityPointsRate::new);
 		EffectHandler.getInstance().registerHandler("VitalityPointUp", VitalityPointUp::new);
 		EffectHandler.getInstance().registerHandler("WeaponAttackAngleBonus", WeaponAttackAngleBonus::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusMAtk", WeaponBonusMAtk::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusPAtk", WeaponBonusPAtk::new);
 		EffectHandler.getInstance().registerHandler("WeightLimit", WeightLimit::new);
 		EffectHandler.getInstance().registerHandler("WeightPenalty", WeightPenalty::new);
 		EffectHandler.getInstance().registerHandler("WorldChatPoints", WorldChatPoints::new);

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.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 Sero
+ */
+public class WeaponBonusMAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusMAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+}

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.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 Sero
+ */
+public class WeaponBonusPAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusPAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+}

L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30800-30899.xml

@@ -2969,21 +2969,21 @@
 		<!-- Weapon P. Atk. +$s1. -->
 		<icon>icon.skill30882</icon>
 		<operateType>P</operateType>
-		<!--
 		<effects>
-			Need to find out how to add the "Weapon" P./M. Attack
+			<effect name="WeaponBonusPAtk">
+				<amount>50</amount>
+			</effect>
 		</effects>
-		-->
 	</skill>
 	<skill id="30883" toLevel="1" name="Improved Dual Certification - M. Atk.">
 		<!-- Weapon M. Atk. +$s1. -->
 		<icon>icon.skill30883</icon>
 		<operateType>P</operateType>
-		<!--
 		<effects>
-			Need to find out how to add the "Weapon" P./M. Attack
+			<effect name="WeaponBonusMAtk">
+				<amount>50</amount>
+			</effect>
 		</effects>
-		-->
 	</skill>
 	<skill id="30884" toLevel="1" name="Improved Dual Certification - Vital">
 		<!-- Vitality Bonus +$s1. -->

L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35600-35699.xml

@@ -2045,11 +2045,26 @@
 			<value level="5">icon.agathion_fire_dragon_star_2</value>
 		</icon>
 		<operateType>P</operateType>
-		<!--
 		<effects>
-			Need to find out how to add the "Weapon" P./M. Attack
+			<effect name="WeaponBonusPAtk">
+				<amount>
+					<value level="1">30</value>
+					<value level="2">40</value>
+					<value level="3">50</value>
+					<value level="4">70</value>
+					<value level="5">100</value>
+				</amount>
+			</effect>
+			<effect name="WeaponBonusMAtk">
+				<amount>
+					<value level="1">30</value>
+					<value level="2">40</value>
+					<value level="3">50</value>
+					<value level="4">70</value>
+					<value level="5">100</value>
+				</amount>
+			</effect>
 		</effects>
-		-->
 	</skill>
 	<skill id="35634" toLevel="1" name="Summon Agathion Fire Dragon">
 		<!-- Summons Agathion Fire Dragon. -->
@@ -2347,7 +2362,21 @@
 	<skill id="35643" toLevel="1" name="Blessed Exalted Ring - Critical Damage">
 		<!-- Infection Atk. Rate and Resistance +20%, P. Critical Damage and P./ M. Skill Critical Damage +15%. -->
 		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="CriticalDamage">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="SkillCriticalDamage">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="35644" toLevel="1" name="Blessed Exalted Seed Bracelet">
 		<!-- Unlocks the agathion's main slot. STR/ DEX/ CON/ INT/ WIT/ MEN +$s1, Attribute Attack +$s2, Attribute Resistance +$s3. Additionally, P./ M. Atk. and P./ M. Def. +$s4. -->

L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt

@@ -369,6 +369,8 @@ VitalityExpRate: Sets the vitality exp rate. (l2jmobius)
 VitalityPointsRate: Vitality points consume rate.
 VitalityPointUp: Increases vitality points.
 WeaponAttackAngleBonus: Additional range for weapon attack angle. (l2jmobius)
+WeaponBonusMAtk: Additional MAtk for weapons. (l2jmobius)
+WeaponBonusPAtk: Additional PAtk for weapons. (l2jmobius)
 WeightLimit: Maximum weight stat.
 WeightPenalty: Weight penalty level stat.
 WorldChatPoints: Modify world chat points to use per day.

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -273,6 +273,11 @@ public class CreatureStat
 		return (int) getValue(Stat.MAGIC_ATTACK);
 	}
 	
+	public int getWeaponBonusMAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+	
 	/**
 	 * @return the MAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */
@@ -382,6 +387,11 @@ public class CreatureStat
 		return (int) getValue(Stat.PHYSICAL_ATTACK);
 	}
 	
+	public int getWeaponBonusPAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+	
 	/**
 	 * @return the PAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -79,6 +79,8 @@ public enum Stat
 	MAGICAL_DEFENCE("mDef", new MDefenseFinalizer()),
 	PHYSICAL_ATTACK("pAtk", new PAttackFinalizer()),
 	MAGIC_ATTACK("mAtk", new MAttackFinalizer()),
+	WEAPON_BONUS_PHYSICAL_ATTACK("weaponBonusPAtk"),
+	WEAPON_BONUS_MAGIC_ATTACK("weaponBonusMAtk"),
 	PHYSICAL_ATTACK_SPEED("pAtkSpd", new PAttackSpeedFinalizer()),
 	MAGIC_ATTACK_SPEED("mAtkSpd", new MAttackSpeedFinalizer()), // Magic Skill Casting Time Rate
 	ATK_REUSE("atkReuse"), // Bows Hits Reuse Rate

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

@@ -36,6 +36,7 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusMAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{

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

@@ -36,6 +36,7 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusPAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -404,6 +404,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("VitalityPointsRate", VitalityPointsRate::new);
 		EffectHandler.getInstance().registerHandler("VitalityPointUp", VitalityPointUp::new);
 		EffectHandler.getInstance().registerHandler("WeaponAttackAngleBonus", WeaponAttackAngleBonus::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusMAtk", WeaponBonusMAtk::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusPAtk", WeaponBonusPAtk::new);
 		EffectHandler.getInstance().registerHandler("WeightLimit", WeightLimit::new);
 		EffectHandler.getInstance().registerHandler("WeightPenalty", WeightPenalty::new);
 		EffectHandler.getInstance().registerHandler("WorldChatPoints", WorldChatPoints::new);

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.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 Sero
+ */
+public class WeaponBonusMAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusMAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.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 Sero
+ */
+public class WeaponBonusPAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusPAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml

@@ -2974,21 +2974,21 @@
 		<!-- Weapon P. Atk. +$s1. -->
 		<icon>icon.skill30882</icon>
 		<operateType>P</operateType>
-		<!--
 		<effects>
-			Need to find out how to add the "Weapon" P./M. Attack
+			<effect name="WeaponBonusPAtk">
+				<amount>50</amount>
+			</effect>
 		</effects>
-		-->
 	</skill>
 	<skill id="30883" toLevel="1" name="Improved Dual Certification - M. Atk.">
 		<!-- Weapon M. Atk. +$s1. -->
 		<icon>icon.skill30883</icon>
 		<operateType>P</operateType>
-		<!--
 		<effects>
-			Need to find out how to add the "Weapon" P./M. Attack
+			<effect name="WeaponBonusMAtk">
+				<amount>50</amount>
+			</effect>
 		</effects>
-		-->
 	</skill>
 	<skill id="30884" toLevel="1" name="Improved Dual Certification - Vital">
 		<!-- Vitality bonus +$s1. -->

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30900-30999.xml

@@ -554,6 +554,14 @@
 	<skill id="30930" toLevel="5" name="Eraton's Spear">
 		<!-- For 30 min., Eraton's energy makes Weapon P./ M. Atk. +50. Consumes Spirit Ore (250 pcs.) -->
 		<icon>icon.skill0000</icon>
+		<operateType>A2</operateType>
+		<magicLevel>
+			<value level="1">115</value>
+			<value level="2">116</value>
+			<value level="3">117</value>
+			<value level="4">118</value>
+			<value level="5">119</value>
+		</magicLevel>
 		<abnormalLevel>
 			<value level="1">1</value>
 			<value level="2">2</value>
@@ -571,28 +579,27 @@
 		<coolTime>3000</coolTime>
 		<effectPoint>100</effectPoint>
 		<reuseDelay>30000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<itemConsumeCount>250</itemConsumeCount>
-		<itemConsumeId>3031</itemConsumeId>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<effects>
-			<effect name="PAtk">
+			<effect name="WeaponBonusPAtk">
 				<amount>
-					<value level="1">1.73</value>
+					<value level="1">50</value>
-					<value level="2">2.42</value>
+					<value level="2">70</value>
-					<value level="3">3.12</value>
+					<value level="3">90</value>
-					<value level="4">4.16</value>
+					<value level="4">120</value>
-					<value level="5">5.2</value>
+					<value level="5">150</value>
 				</amount>
-				<mode>PER</mode>
 			</effect>
-			<effect name="MAtk">
+			<effect name="WeaponBonusMAtk">
 				<amount>
-					<value level="1">1.73</value>
+					<value level="1">50</value>
-					<value level="2">2.42</value>
+					<value level="2">70</value>
-					<value level="3">3.12</value>
+					<value level="3">90</value>
-					<value level="4">4.16</value>
+					<value level="4">120</value>
-					<value level="5">5.2</value>
+					<value level="5">150</value>
 				</amount>
-				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35600-35699.xml

@@ -2103,11 +2103,26 @@
 			<value level="5">icon.agathion_fire_dragon_star_2</value>
 		</icon>
 		<operateType>P</operateType>
-		<!--
 		<effects>
-			Need to find out how to add the "Weapon" P./M. Attack
+			<effect name="WeaponBonusPAtk">
+				<amount>
+					<value level="1">30</value>
+					<value level="2">40</value>
+					<value level="3">50</value>
+					<value level="4">70</value>
+					<value level="5">100</value>
+				</amount>
+			</effect>
+			<effect name="WeaponBonusMAtk">
+				<amount>
+					<value level="1">30</value>
+					<value level="2">40</value>
+					<value level="3">50</value>
+					<value level="4">70</value>
+					<value level="5">100</value>
+				</amount>
+			</effect>
 		</effects>
-		-->
 	</skill>
 	<skill id="35634" toLevel="1" name="Summon Agathion Fire Dragon">
 		<!-- Summons Agathion Fire Dragon. -->
@@ -2405,7 +2420,21 @@
 	<skill id="35643" toLevel="1" name="Blessed Exalted Ring - Critical Damage">
 		<!-- Infection Atk. Rate and Resistance +20%, P. Critical Damage and P./ M. Skill Critical Damage +15%. -->
 		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="CriticalDamage">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="SkillCriticalDamage">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="35644" toLevel="1" name="Blessed Exalted Seed Bracelet">
 		<!-- Unlocks the agathion's main slot. STR/ DEX/ CON/ INT/ WIT/ MEN +$s1, Attribute Attack +$s2, Attribute Resistance +$s3. Additionally, P./ M. Atk. and P./ M. Def. +$s4. -->

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt

@@ -370,6 +370,8 @@ VitalityExpRate: Sets the vitality exp rate. (l2jmobius)
 VitalityPointsRate: Vitality points consume rate.
 VitalityPointUp: Increases vitality points.
 WeaponAttackAngleBonus: Additional range for weapon attack angle. (l2jmobius)
+WeaponBonusMAtk: Additional MAtk for weapons. (l2jmobius)
+WeaponBonusPAtk: Additional PAtk for weapons. (l2jmobius)
 WeightLimit: Maximum weight stat.
 WeightPenalty: Weight penalty level stat.
 WorldChatPoints: Modify world chat points to use per day.

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -273,6 +273,11 @@ public class CreatureStat
 		return (int) getValue(Stat.MAGIC_ATTACK);
 	}
 	
+	public int getWeaponBonusMAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+	
 	/**
 	 * @return the MAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */
@@ -382,6 +387,11 @@ public class CreatureStat
 		return (int) getValue(Stat.PHYSICAL_ATTACK);
 	}
 	
+	public int getWeaponBonusPAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+	
 	/**
 	 * @return the PAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -79,6 +79,8 @@ public enum Stat
 	MAGICAL_DEFENCE("mDef", new MDefenseFinalizer()),
 	PHYSICAL_ATTACK("pAtk", new PAttackFinalizer()),
 	MAGIC_ATTACK("mAtk", new MAttackFinalizer()),
+	WEAPON_BONUS_PHYSICAL_ATTACK("weaponBonusPAtk"),
+	WEAPON_BONUS_MAGIC_ATTACK("weaponBonusMAtk"),
 	PHYSICAL_ATTACK_SPEED("pAtkSpd", new PAttackSpeedFinalizer()),
 	MAGIC_ATTACK_SPEED("mAtkSpd", new MAttackSpeedFinalizer()), // Magic Skill Casting Time Rate
 	ATK_REUSE("atkReuse"), // Bows Hits Reuse Rate

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

@@ -36,6 +36,7 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusMAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{

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

@@ -36,6 +36,7 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusPAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -406,6 +406,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("VitalityPointsRate", VitalityPointsRate::new);
 		EffectHandler.getInstance().registerHandler("VitalityPointUp", VitalityPointUp::new);
 		EffectHandler.getInstance().registerHandler("WeaponAttackAngleBonus", WeaponAttackAngleBonus::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusMAtk", WeaponBonusMAtk::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusPAtk", WeaponBonusPAtk::new);
 		EffectHandler.getInstance().registerHandler("WeightLimit", WeightLimit::new);
 		EffectHandler.getInstance().registerHandler("WeightPenalty", WeightPenalty::new);
 		EffectHandler.getInstance().registerHandler("WorldChatPoints", WorldChatPoints::new);

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.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 Sero
+ */
+public class WeaponBonusMAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusMAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.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 Sero
+ */
+public class WeaponBonusPAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusPAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+}

L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30800-30899.xml

@@ -2974,21 +2974,21 @@
 		<!-- Weapon P. Atk. +$s1. -->
 		<icon>icon.skill30882</icon>
 		<operateType>P</operateType>
-		<!--
 		<effects>
-			Need to find out how to add the "Weapon" P./M. Attack
+			<effect name="WeaponBonusPAtk">
+				<amount>50</amount>
+			</effect>
 		</effects>
-		-->
 	</skill>
 	<skill id="30883" toLevel="1" name="Improved Dual Certification - M. Atk.">
 		<!-- Weapon M. Atk. +$s1. -->
 		<icon>icon.skill30883</icon>
 		<operateType>P</operateType>
-		<!--
 		<effects>
-			Need to find out how to add the "Weapon" P./M. Attack
+			<effect name="WeaponBonusMAtk">
+				<amount>50</amount>
+			</effect>
 		</effects>
-		-->
 	</skill>
 	<skill id="30884" toLevel="1" name="Improved Dual Certification - Vital">
 		<!-- Vitality bonus +$s1. -->

L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30900-30999.xml

@@ -574,6 +574,14 @@
 	<skill id="30930" toLevel="5" name="Eraton's Spear">
 		<!-- For 30 min., Eraton's energy makes Weapon P./ M. Atk. +50. Consumes Spirit Ore (250 pcs.) -->
 		<icon>icon.skill0000</icon>
+		<operateType>A2</operateType>
+		<magicLevel>
+			<value level="1">115</value>
+			<value level="2">116</value>
+			<value level="3">117</value>
+			<value level="4">118</value>
+			<value level="5">119</value>
+		</magicLevel>
 		<abnormalLevel>
 			<value level="1">1</value>
 			<value level="2">2</value>
@@ -591,28 +599,27 @@
 		<coolTime>3000</coolTime>
 		<effectPoint>100</effectPoint>
 		<reuseDelay>30000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<itemConsumeCount>250</itemConsumeCount>
-		<itemConsumeId>3031</itemConsumeId>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<effects>
-			<effect name="PAtk">
+			<effect name="WeaponBonusPAtk">
 				<amount>
-					<value level="1">1.73</value>
+					<value level="1">50</value>
-					<value level="2">2.42</value>
+					<value level="2">70</value>
-					<value level="3">3.12</value>
+					<value level="3">90</value>
-					<value level="4">4.16</value>
+					<value level="4">120</value>
-					<value level="5">5.2</value>
+					<value level="5">150</value>
 				</amount>
-				<mode>PER</mode>
 			</effect>
-			<effect name="MAtk">
+			<effect name="WeaponBonusMAtk">
 				<amount>
-					<value level="1">1.73</value>
+					<value level="1">50</value>
-					<value level="2">2.42</value>
+					<value level="2">70</value>
-					<value level="3">3.12</value>
+					<value level="3">90</value>
-					<value level="4">4.16</value>
+					<value level="4">120</value>
-					<value level="5">5.2</value>
+					<value level="5">150</value>
 				</amount>
-				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>

L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/35600-35699.xml

@@ -2103,11 +2103,26 @@
 			<value level="5">icon.agathion_fire_dragon_star_2</value>
 		</icon>
 		<operateType>P</operateType>
-		<!--
 		<effects>
-			Need to find out how to add the "Weapon" P./M. Attack
+			<effect name="WeaponBonusPAtk">
+				<amount>
+					<value level="1">30</value>
+					<value level="2">40</value>
+					<value level="3">50</value>
+					<value level="4">70</value>
+					<value level="5">100</value>
+				</amount>
+			</effect>
+			<effect name="WeaponBonusMAtk">
+				<amount>
+					<value level="1">30</value>
+					<value level="2">40</value>
+					<value level="3">50</value>
+					<value level="4">70</value>
+					<value level="5">100</value>
+				</amount>
+			</effect>
 		</effects>
-		-->
 	</skill>
 	<skill id="35634" toLevel="1" name="Summon Agathion Fire Dragon">
 		<!-- Summons Agathion Fire Dragon. -->
@@ -2405,7 +2420,21 @@
 	<skill id="35643" toLevel="1" name="Blessed Exalted Ring - Critical Damage">
 		<!-- Infection Atk. Rate and Resistance +20%, P. Critical Damage and P./ M. Skill Critical Damage +15%. -->
 		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="CriticalDamage">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="SkillCriticalDamage">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="35644" toLevel="1" name="Blessed Exalted Seed Bracelet">
 		<!-- Unlocks the agathion's main slot. STR/ DEX/ CON/ INT/ WIT/ MEN +$s1, Attribute Attack +$s2, Attribute Resistance +$s3. Additionally, P./ M. Atk. and P./ M. Def. +$s4. -->

L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/documentation.txt

@@ -372,6 +372,8 @@ VitalityExpRate: Sets the vitality exp rate. (l2jmobius)
 VitalityPointsRate: Vitality points consume rate.
 VitalityPointUp: Increases vitality points.
 WeaponAttackAngleBonus: Additional range for weapon attack angle. (l2jmobius)
+WeaponBonusMAtk: Additional MAtk for weapons. (l2jmobius)
+WeaponBonusPAtk: Additional PAtk for weapons. (l2jmobius)
 WeightLimit: Maximum weight stat.
 WeightPenalty: Weight penalty level stat.
 WorldChatPoints: Modify world chat points to use per day.

L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -273,6 +273,11 @@ public class CreatureStat
 		return (int) getValue(Stat.MAGIC_ATTACK);
 	}
 	
+	public int getWeaponBonusMAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+	
 	/**
 	 * @return the MAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */
@@ -382,6 +387,11 @@ public class CreatureStat
 		return (int) getValue(Stat.PHYSICAL_ATTACK);
 	}
 	
+	public int getWeaponBonusPAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+	
 	/**
 	 * @return the PAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */

L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -79,6 +79,8 @@ public enum Stat
 	MAGICAL_DEFENCE("mDef", new MDefenseFinalizer()),
 	PHYSICAL_ATTACK("pAtk", new PAttackFinalizer()),
 	MAGIC_ATTACK("mAtk", new MAttackFinalizer()),
+	WEAPON_BONUS_PHYSICAL_ATTACK("weaponBonusPAtk"),
+	WEAPON_BONUS_MAGIC_ATTACK("weaponBonusMAtk"),
 	PHYSICAL_ATTACK_SPEED("pAtkSpd", new PAttackSpeedFinalizer()),
 	MAGIC_ATTACK_SPEED("mAtkSpd", new MAttackSpeedFinalizer()), // Magic Skill Casting Time Rate
 	ATK_REUSE("atkReuse"), // Bows Hits Reuse Rate

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

@@ -36,6 +36,7 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusMAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{

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

@@ -36,6 +36,7 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusPAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -400,6 +400,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("VitalityPointsRate", VitalityPointsRate::new);
 		EffectHandler.getInstance().registerHandler("VitalityPointUp", VitalityPointUp::new);
 		EffectHandler.getInstance().registerHandler("WeaponAttackAngleBonus", WeaponAttackAngleBonus::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusMAtk", WeaponBonusMAtk::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusPAtk", WeaponBonusPAtk::new);
 		EffectHandler.getInstance().registerHandler("WeightLimit", WeightLimit::new);
 		EffectHandler.getInstance().registerHandler("WeightPenalty", WeightPenalty::new);
 		EffectHandler.getInstance().registerHandler("WorldChatPoints", WorldChatPoints::new);

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.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 Sero
+ */
+public class WeaponBonusMAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusMAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+}

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.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 Sero
+ */
+public class WeaponBonusPAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusPAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+}

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt

@@ -367,6 +367,8 @@ VitalityExpRate: Sets the vitality exp rate. (l2jmobius)
 VitalityPointsRate: Vitality points consume rate.
 VitalityPointUp: Increases vitality points.
 WeaponAttackAngleBonus: Additional range for weapon attack angle. (l2jmobius)
+WeaponBonusMAtk: Additional MAtk for weapons. (l2jmobius)
+WeaponBonusPAtk: Additional PAtk for weapons. (l2jmobius)
 WeightLimit: Maximum weight stat.
 WeightPenalty: Weight penalty level stat.
 WorldChatPoints: Modify world chat points to use per day.

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -273,6 +273,11 @@ public class CreatureStat
 		return (int) getValue(Stat.MAGIC_ATTACK);
 	}
 	
+	public int getWeaponBonusMAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+	
 	/**
 	 * @return the MAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */
@@ -372,6 +377,11 @@ public class CreatureStat
 		return (int) getValue(Stat.PHYSICAL_ATTACK);
 	}
 	
+	public int getWeaponBonusPAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+	
 	/**
 	 * @return the PAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -79,6 +79,8 @@ public enum Stat
 	MAGICAL_DEFENCE("mDef", new MDefenseFinalizer()),
 	PHYSICAL_ATTACK("pAtk", new PAttackFinalizer()),
 	MAGIC_ATTACK("mAtk", new MAttackFinalizer()),
+	WEAPON_BONUS_PHYSICAL_ATTACK("weaponBonusPAtk"),
+	WEAPON_BONUS_MAGIC_ATTACK("weaponBonusMAtk"),
 	MAGIC_ATTACK_BY_PHYSICAL_ATTACK("mAtkByPAtk", Stat::defaultValue, MathUtil::add, MathUtil::mul, 0, 0),
 	PHYSICAL_ATTACK_SPEED("pAtkSpd", new PAttackSpeedFinalizer()),
 	MAGIC_ATTACK_SPEED("mAtkSpd", new MAttackSpeedFinalizer()), // Magic Skill Casting Time Rate

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

@@ -36,6 +36,7 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusMAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{

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

@@ -36,6 +36,7 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusPAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -403,6 +403,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("VitalityPointsRate", VitalityPointsRate::new);
 		EffectHandler.getInstance().registerHandler("VitalityPointUp", VitalityPointUp::new);
 		EffectHandler.getInstance().registerHandler("WeaponAttackAngleBonus", WeaponAttackAngleBonus::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusMAtk", WeaponBonusMAtk::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusPAtk", WeaponBonusPAtk::new);
 		EffectHandler.getInstance().registerHandler("WeightLimit", WeightLimit::new);
 		EffectHandler.getInstance().registerHandler("WeightPenalty", WeightPenalty::new);
 		EffectHandler.getInstance().registerHandler("WorldChatPoints", WorldChatPoints::new);

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.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 Sero
+ */
+public class WeaponBonusMAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusMAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+}

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.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 Sero
+ */
+public class WeaponBonusPAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusPAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+}

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt

@@ -369,6 +369,8 @@ VitalityExpRate: Sets the vitality exp rate. (l2jmobius)
 VitalityPointsRate: Vitality points consume rate.
 VitalityPointUp: Increases vitality points.
 WeaponAttackAngleBonus: Additional range for weapon attack angle. (l2jmobius)
+WeaponBonusMAtk: Additional MAtk for weapons. (l2jmobius)
+WeaponBonusPAtk: Additional PAtk for weapons. (l2jmobius)
 WeightLimit: Maximum weight stat.
 WeightPenalty: Weight penalty level stat.
 WorldChatPoints: Modify world chat points to use per day.

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -273,6 +273,11 @@ public class CreatureStat
 		return (int) getValue(Stat.MAGIC_ATTACK);
 	}
 	
+	public int getWeaponBonusMAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+	
 	/**
 	 * @return the MAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */
@@ -372,6 +377,11 @@ public class CreatureStat
 		return (int) getValue(Stat.PHYSICAL_ATTACK);
 	}
 	
+	public int getWeaponBonusPAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+	
 	/**
 	 * @return the PAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -79,6 +79,8 @@ public enum Stat
 	MAGICAL_DEFENCE("mDef", new MDefenseFinalizer()),
 	PHYSICAL_ATTACK("pAtk", new PAttackFinalizer()),
 	MAGIC_ATTACK("mAtk", new MAttackFinalizer()),
+	WEAPON_BONUS_PHYSICAL_ATTACK("weaponBonusPAtk"),
+	WEAPON_BONUS_MAGIC_ATTACK("weaponBonusMAtk"),
 	MAGIC_ATTACK_BY_PHYSICAL_ATTACK("mAtkByPAtk", Stat::defaultValue, MathUtil::add, MathUtil::mul, 0, 0),
 	PHYSICAL_ATTACK_SPEED("pAtkSpd", new PAttackSpeedFinalizer()),
 	MAGIC_ATTACK_SPEED("mAtkSpd", new MAttackSpeedFinalizer()), // Magic Skill Casting Time Rate

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

@@ -36,6 +36,7 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusMAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{

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

@@ -36,6 +36,7 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusPAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{

L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -405,6 +405,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("VitalityPointsRate", VitalityPointsRate::new);
 		EffectHandler.getInstance().registerHandler("VitalityPointUp", VitalityPointUp::new);
 		EffectHandler.getInstance().registerHandler("WeaponAttackAngleBonus", WeaponAttackAngleBonus::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusMAtk", WeaponBonusMAtk::new);
+		EffectHandler.getInstance().registerHandler("WeaponBonusPAtk", WeaponBonusPAtk::new);
 		EffectHandler.getInstance().registerHandler("WeightLimit", WeightLimit::new);
 		EffectHandler.getInstance().registerHandler("WeightPenalty", WeightPenalty::new);
 		EffectHandler.getInstance().registerHandler("WorldChatPoints", WorldChatPoints::new);

L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.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 Sero
+ */
+public class WeaponBonusMAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusMAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+}

L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.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 Sero
+ */
+public class WeaponBonusPAtk extends AbstractStatAddEffect
+{
+	public WeaponBonusPAtk(StatSet params)
+	{
+		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+}

L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/documentation.txt

@@ -370,6 +370,8 @@ VitalityExpRate: Sets the vitality exp rate. (l2jmobius)
 VitalityPointsRate: Vitality points consume rate.
 VitalityPointUp: Increases vitality points.
 WeaponAttackAngleBonus: Additional range for weapon attack angle. (l2jmobius)
+WeaponBonusMAtk: Additional MAtk for weapons. (l2jmobius)
+WeaponBonusPAtk: Additional PAtk for weapons. (l2jmobius)
 WeightLimit: Maximum weight stat.
 WeightPenalty: Weight penalty level stat.
 WorldChatPoints: Modify world chat points to use per day.

L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -273,6 +273,11 @@ public class CreatureStat
 		return (int) getValue(Stat.MAGIC_ATTACK);
 	}
 	
+	public int getWeaponBonusMAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_MAGIC_ATTACK);
+	}
+	
 	/**
 	 * @return the MAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */
@@ -372,6 +377,11 @@ public class CreatureStat
 		return (int) getValue(Stat.PHYSICAL_ATTACK);
 	}
 	
+	public int getWeaponBonusPAtk()
+	{
+		return (int) getValue(Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
+	}
+	
 	/**
 	 * @return the PAtk Speed (base+modifier) of the Creature in function of the Armour Expertise Penalty.
 	 */

L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -79,6 +79,8 @@ public enum Stat
 	MAGICAL_DEFENCE("mDef", new MDefenseFinalizer()),
 	PHYSICAL_ATTACK("pAtk", new PAttackFinalizer()),
 	MAGIC_ATTACK("mAtk", new MAttackFinalizer()),
+	WEAPON_BONUS_PHYSICAL_ATTACK("weaponBonusPAtk"),
+	WEAPON_BONUS_MAGIC_ATTACK("weaponBonusMAtk"),
 	MAGIC_ATTACK_BY_PHYSICAL_ATTACK("mAtkByPAtk", Stat::defaultValue, MathUtil::add, MathUtil::mul, 0, 0),
 	PHYSICAL_ATTACK_SPEED("pAtkSpd", new PAttackSpeedFinalizer()),
 	MAGIC_ATTACK_SPEED("mAtkSpd", new MAttackSpeedFinalizer()), // Magic Skill Casting Time Rate

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

@@ -36,6 +36,7 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusMAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{

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

@@ -36,6 +36,7 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
+		baseValue += creature.getStat().getWeaponBonusPAtk();
 		baseValue += calcEnchantedItemBonus(creature, stat);
 		if (creature.isPlayer())
 		{