2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-21 09:02:07 -07:00
Code Issues Projects Releases Packages Wiki Activity

Corrected melee and ranged damage formulas

Browse source
This commit is contained in:
ceikry 2021-07-22 13:57:18 -05:00
parent 571383757d
commit 7a2d799dc3
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt
View file

@ -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 {

3
Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt
View file

@ -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 {