From 37af460a89f09e198c500aa733b150e2e69c1868 Mon Sep 17 00:00:00 2001 From: FateJH Date: Wed, 26 Aug 2020 22:42:07 -0400 Subject: [PATCH] fireball burn effect should always be 1 as long as it does damage, despite radial degrade --- src/main/scala/net/psforever/objects/GlobalDefinitions.scala | 4 ++-- .../net/psforever/objects/vital/damage/DamageModifiers.scala | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index a68fbcf6..49a85a07 100644 --- a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala +++ b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala @@ -2628,8 +2628,8 @@ object GlobalDefinitions { flamethrower_fireball.Modifiers = List( DamageModifiers.InfantryAggravatedDirect, DamageModifiers.InfantryAggravatedSplash, - DamageModifiers.FireballAggravatedBurn, - DamageModifiers.RadialDegrade + DamageModifiers.RadialDegrade, + DamageModifiers.FireballAggravatedBurn ) flamethrower_projectile.Name = "flamethrower_projectile" diff --git a/src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala b/src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala index 24c7fdca..8c7ed433 100644 --- a/src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala +++ b/src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala @@ -287,7 +287,8 @@ object DamageModifiers { def Calculate: DamageModifiers.Format = formula private def formula(damage: Int, data: ResolvedProjectile): Int = { - if (data.resolution == ProjectileResolution.AggravatedDirectBurn || + if (damage > 0 && + data.resolution == ProjectileResolution.AggravatedDirectBurn || data.resolution == ProjectileResolution.AggravatedSplashBurn) { //add resist to offset resist subtraction later 1 + data.damage_model.ResistUsing(data)(data)