Combat melee max hit formula

Author: hydrozoa-yt

src/main/java/io/luna/game/model/mob/combat/CombatAction.java

@@ -26,8 +26,9 @@ public boolean run() {
             if (mob.getInteractingWith() instanceof Mob) {
                 Mob target = (Mob) mob.getInteractingWith();
 
-                target.damage(1, Hit.HitType.NORMAL);
-                target.getCombat().getDamageStack().push(mob, CombatDamage.simple(1, Hit.HitType.NORMAL, CombatDamageType.MELEE));
+                CombatDamage dmg = CombatDamage.calculated(target, mob, Hit.HitType.NORMAL, CombatDamageType.MELEE);
+                target.damage(dmg.getAmount(), Hit.HitType.NORMAL);
+                target.getCombat().getDamageStack().push(mob, dmg);
 
                 if (target.getHealth() <= 0) {
                     return true;

src/main/java/io/luna/game/model/mob/combat/CombatDamage.java

@@ -1,6 +1,10 @@
 package io.luna.game.model.mob.combat;
 
+import engine.combat.prayer.CombatPrayer;
+import io.luna.game.model.item.Equipment;
 import io.luna.game.model.mob.Mob;
+import io.luna.game.model.mob.Player;
+import io.luna.game.model.mob.Skill;
 import io.luna.game.model.mob.block.Hit.HitType;
 import io.luna.util.RandomUtils;
 
@@ -11,8 +15,24 @@ public static CombatDamage simple(int damage, HitType hitType, CombatDamageType
     }
 
     // apply damage based on target
-    public static CombatDamage calculated(Mob target, HitType hitType, CombatDamageType damageType) {
-        int maxHit = -1;
+    public static CombatDamage calculated(Mob target, Mob source, HitType hitType, CombatDamageType damageType) {
+        int maxHit = 1;
+
+        if (source instanceof Player) {
+            Player p = source.asPlr();
+            double equipmentStrengthBonus = p.getEquipment().getBonus(Equipment.EquipmentBonus.STRENGTH);
+            double strength = p.skill(Skill.STRENGTH).getStaticLevel();
+            if (p.getCombat().getPrayers().isActive(CombatPrayer.BURST_OF_STRENGTH)) {
+                strength *= 1.05d;
+            } else if (p.getCombat().getPrayers().isActive(CombatPrayer.SUPERHUMAN_STRENGTH)) {
+                strength *= 1.1d;
+            } else if (p.getCombat().getPrayers().isActive(CombatPrayer.ULTIMATE_STRENGTH)) {
+                strength *= 1.15d;
+            }
+            strength += 8d;
+            maxHit = (int)(0.5d + strength * ((equipmentStrengthBonus + 64d)/640d));
+        }
+
         return new CombatDamage(RandomUtils.inclusive(maxHit), hitType, damageType);
     }