Minor formula adjustments.

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -141,7 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		double damage = (91 * power * Math.sqrt(mAtk * shotsBonus)) / mDef;
+		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -1382,9 +1382,7 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
 		
-		damage = Math.max(0, damage);
+		return Math.max(0, damage);
-		
-		return damage;
 	}
 	
 	public static double getAbnormalResist(BasicProperty basicProperty, Creature target)

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats.finalizers;
 
 import java.util.OptionalDouble;
 
-import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -50,6 +49,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
 				rubyBonus = player.getActiveRubyJewel().getBonus();
 			}
 		}
-		return Stats.defaultValue(creature, stat, CommonUtil.constrain(baseValue, 1.0, 1.21) + rubyBonus);
+		return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
 	}
 }

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -141,7 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		double damage = (91 * power * Math.sqrt(mAtk * shotsBonus)) / mDef;
+		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -1382,9 +1382,7 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
 		
-		damage = Math.max(0, damage);
+		return Math.max(0, damage);
-		
-		return damage;
 	}
 	
 	public static double getAbnormalResist(BasicProperty basicProperty, Creature target)

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats.finalizers;
 
 import java.util.OptionalDouble;
 
-import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -50,6 +49,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
 				rubyBonus = player.getActiveRubyJewel().getBonus();
 			}
 		}
-		return Stats.defaultValue(creature, stat, CommonUtil.constrain(baseValue, 1.0, 1.21) + rubyBonus);
+		return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
 	}
 }

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -141,7 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		double damage = (91 * power * Math.sqrt(mAtk * shotsBonus)) / mDef;
+		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -1382,9 +1382,7 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
 		
-		damage = Math.max(0, damage);
+		return Math.max(0, damage);
-		
-		return damage;
 	}
 	
 	public static double getAbnormalResist(BasicProperty basicProperty, Creature target)

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats.finalizers;
 
 import java.util.OptionalDouble;
 
-import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -50,6 +49,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
 				rubyBonus = player.getActiveRubyJewel().getBonus();
 			}
 		}
-		return Stats.defaultValue(creature, stat, CommonUtil.constrain(baseValue, 1.0, 1.21) + rubyBonus);
+		return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
 	}
 }

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -141,7 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		double damage = (91 * power * Math.sqrt(mAtk * shotsBonus)) / mDef;
+		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -1382,9 +1382,7 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
 		
-		damage = Math.max(0, damage);
+		return Math.max(0, damage);
-		
-		return damage;
 	}
 	
 	public static double getAbnormalResist(BasicProperty basicProperty, Creature target)

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats.finalizers;
 
 import java.util.OptionalDouble;
 
-import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -50,6 +49,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
 				rubyBonus = player.getActiveRubyJewel().getBonus();
 			}
 		}
-		return Stats.defaultValue(creature, stat, CommonUtil.constrain(baseValue, 1.0, 1.21) + rubyBonus);
+		return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
 	}
 }

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -141,7 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		double damage = (91 * power * Math.sqrt(mAtk * shotsBonus)) / mDef;
+		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -1382,9 +1382,7 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
 		
-		damage = Math.max(0, damage);
+		return Math.max(0, damage);
-		
-		return damage;
 	}
 	
 	public static double getAbnormalResist(BasicProperty basicProperty, Creature target)

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats.finalizers;
 
 import java.util.OptionalDouble;
 
-import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -50,6 +49,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
 				rubyBonus = player.getActiveRubyJewel().getBonus();
 			}
 		}
-		return Stats.defaultValue(creature, stat, CommonUtil.constrain(baseValue, 1.0, 1.21) + rubyBonus);
+		return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
 	}
 }

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -141,7 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		double damage = (91 * power * Math.sqrt(mAtk * shotsBonus)) / mDef;
+		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -1382,9 +1382,7 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
 		
-		damage = Math.max(0, damage);
+		return Math.max(0, damage);
-		
-		return damage;
 	}
 	
 	public static double getAbnormalResist(BasicProperty basicProperty, Creature target)

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats.finalizers;
 
 import java.util.OptionalDouble;
 
-import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -50,6 +49,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
 				rubyBonus = player.getActiveRubyJewel().getBonus();
 			}
 		}
-		return Stats.defaultValue(creature, stat, CommonUtil.constrain(baseValue, 1.0, 1.21) + rubyBonus);
+		return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
 	}
 }

L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -141,7 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		double damage = (91 * power * Math.sqrt(mAtk * shotsBonus)) / mDef;
+		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -1382,9 +1382,7 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
 		
-		damage = Math.max(0, damage);
+		return Math.max(0, damage);
-		
-		return damage;
 	}
 	
 	public static double getAbnormalResist(BasicProperty basicProperty, Creature target)

L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats.finalizers;
 
 import java.util.OptionalDouble;
 
-import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -50,6 +49,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
 				rubyBonus = player.getActiveRubyJewel().getBonus();
 			}
 		}
-		return Stats.defaultValue(creature, stat, CommonUtil.constrain(baseValue, 1.0, 1.21) + rubyBonus);
+		return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -141,7 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		double damage = (91 * power * Math.sqrt(mAtk * shotsBonus)) / mDef;
+		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -1382,9 +1382,7 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
 		
-		damage = Math.max(0, damage);
+		return Math.max(0, damage);
-		
-		return damage;
 	}
 	
 	public static double getAbnormalResist(BasicProperty basicProperty, Creature target)

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats.finalizers;
 
 import java.util.OptionalDouble;
 
-import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -50,6 +49,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
 				rubyBonus = player.getActiveRubyJewel().getBonus();
 			}
 		}
-		return Stats.defaultValue(creature, stat, CommonUtil.constrain(baseValue, 1.0, 1.21) + rubyBonus);
+		return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
 	}
 }

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -141,7 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		double damage = (91 * power * Math.sqrt(mAtk * shotsBonus)) / mDef;
+		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -1382,9 +1382,7 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
 		
-		damage = Math.max(0, damage);
+		return Math.max(0, damage);
-		
-		return damage;
 	}
 	
 	public static double getAbnormalResist(BasicProperty basicProperty, Creature target)

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats.finalizers;
 
 import java.util.OptionalDouble;
 
-import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -50,6 +49,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
 				rubyBonus = player.getActiveRubyJewel().getBonus();
 			}
 		}
-		return Stats.defaultValue(creature, stat, CommonUtil.constrain(baseValue, 1.0, 1.21) + rubyBonus);
+		return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
 	}
 }

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -141,7 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		double damage = (91 * power * Math.sqrt(mAtk * shotsBonus)) / mDef;
+		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -1382,9 +1382,7 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
 		
-		damage = Math.max(0, damage);
+		return Math.max(0, damage);
-		
-		return damage;
 	}
 	
 	public static double getAbnormalResist(BasicProperty basicProperty, Creature target)

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats.finalizers;
 
 import java.util.OptionalDouble;
 
-import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -50,6 +49,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
 				rubyBonus = player.getActiveRubyJewel().getBonus();
 			}
 		}
-		return Stats.defaultValue(creature, stat, CommonUtil.constrain(baseValue, 1.0, 1.21) + rubyBonus);
+		return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
 	}
 }

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java

@@ -141,7 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		double damage = (91 * power * Math.sqrt(mAtk * shotsBonus)) / mDef;
+		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -1382,9 +1382,7 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		damage *= calculatePvpPveBonus(attacker, target, null, crit);
 		
-		damage = Math.max(0, damage);
+		return Math.max(0, damage);
-		
-		return damage;
 	}
 	
 	public static double getAbnormalResist(BasicProperty basicProperty, Creature target)

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats.finalizers;
 
 import java.util.OptionalDouble;
 
-import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -50,6 +49,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
 				rubyBonus = player.getActiveRubyJewel().getBonus();
 			}
 		}
-		return Stats.defaultValue(creature, stat, CommonUtil.constrain(baseValue, 1.0, 1.21) + rubyBonus);
+		return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
 	}
 }