From e4902a317c3c9e38f4d6b2bd10832500483a0cdf Mon Sep 17 00:00:00 2001 From: Mazo Date: Mon, 9 Mar 2020 22:14:28 +0000 Subject: [PATCH] Stamina drain on health damage --- .../src/main/scala/net/psforever/objects/Player.scala | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/common/src/main/scala/net/psforever/objects/Player.scala b/common/src/main/scala/net/psforever/objects/Player.scala index d3ad3738..080a6b43 100644 --- a/common/src/main/scala/net/psforever/objects/Player.scala +++ b/common/src/main/scala/net/psforever/objects/Player.scala @@ -127,7 +127,16 @@ class Player(private val core : Avatar) extends PlanetSideServerObject def Health : Int = health def Health_=(assignHealth : Int) : Int = { - health = math.min(math.max(0, assignHealth), MaxHealth) + val newHealth = math.min(math.max(0, assignHealth), MaxHealth) + val delta = health - newHealth + + health = newHealth + + if (delta > 0) // If Health has decreased drain stamina too at half the amount of Health damage + { + Stamina -= math.floor(delta / 2).toInt + } + Health }