From 2cc2a497d44f56213f4d91e5e5a1ac2b4aca4b5c Mon Sep 17 00:00:00 2001 From: vk Date: Wed, 17 Nov 2021 11:04:58 -0800 Subject: [PATCH] Correctly factor in the damage modifier (mostly used by special attacks) --- CHANGELOG | 3 ++- .../rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt | 2 +- .../rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 60fc28373..4918f9e15 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -109,4 +109,5 @@ - Removed server monitor as it was blowing up in headless environments - ryannathans < --- ABOVE Released January 11th, 2022 https://gitlab.com/2009scape/2009scape/-/tags/Jan-11-2022 ---- > - Removed regular bones from wolf drop table - Lethimyr -- Fix Gertrude's Cat quest not completing - ryannathans \ No newline at end of file +- Fix Gertrude's Cat quest not completing - ryannathans +- Fix missing special attack damage modifiers for range and melee attacks - vk 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 6e6ad9e3c..f70117506 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 @@ -194,7 +194,7 @@ open class MeleeSwingHandler /*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() + return ((1.3 + (cumulativeStr / 10) + (bonus / 80) + ((cumulativeStr * bonus) / 640)) * modifier).toInt() } override fun calculateDefence(victim: 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 8d3450ff5..a6ab317df 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 @@ -222,7 +222,7 @@ open class RangeSwingHandler } cumulativeStr *= getSetMultiplier(entity, Skills.RANGE) cumulativeStr *= (bonus + 64) - return floor(1.5 + (ceil(cumulativeStr) / 640.0)).toInt() + return floor((1.5 + (ceil(cumulativeStr) / 640.0)) * modifier).toInt() //return ((14 + cumulativeStr + bonus / 8 + cumulativeStr * bonus * 0.016865) * modifier).toInt() / 10 + 1 }