From 7a2d799dc32902f488c6b3baf34c3e3f4da0dd9b Mon Sep 17 00:00:00 2001 From: ceikry Date: Thu, 22 Jul 2021 13:57:18 -0500 Subject: [PATCH] Corrected melee and ranged damage formulas --- .../game/node/entity/combat/handlers/MeleeSwingHandler.kt | 5 +++-- .../game/node/entity/combat/handlers/RangeSwingHandler.kt | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt index 6128d4b84..562f64a3f 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt @@ -193,8 +193,9 @@ open class MeleeSwingHandler cumulativeStr += 1.0 } cumulativeStr *= getSetMultiplier(entity, Skills.STRENGTH) - val hit = (16 + cumulativeStr + bonus / 8 + cumulativeStr * bonus * 0.016865) * modifier - return (hit / 10).toInt() + 1 + /*val hit = (16 + cumulativeStr + bonus / 8 + cumulativeStr * bonus * 0.016865) * modifier + return (hit / 10).toInt() + 1*/ + return (1.3 + (cumulativeStr / 10) + (bonus / 80) + ((cumulativeStr * bonus) / 640)).toInt() } override fun calculateDefence(entity: Entity?, attacker: Entity?): Int { diff --git a/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt index 777833444..e484a200a 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt @@ -281,7 +281,8 @@ open class RangeSwingHandler cumulativeStr += 1.0 } cumulativeStr *= getSetMultiplier(entity, Skills.RANGE) - return ((14 + cumulativeStr + bonus / 8 + cumulativeStr * bonus * 0.016865) * modifier).toInt() / 10 + 1 + return (1.3 + (cumulativeStr / 10) + (bonus / 80) + ((cumulativeStr * bonus) / 640)).toInt() + //return ((14 + cumulativeStr + bonus / 8 + cumulativeStr * bonus * 0.016865) * modifier).toInt() / 10 + 1 } override fun calculateDefence(entity: Entity?, attacker: Entity?): Int {