diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/WorldObjectDamageWorker.cs b/Source/CombatExtended/CombatExtended/WorldObjects/WorldObjectDamageWorker.cs index 6d615890b8..2da6521235 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/WorldObjectDamageWorker.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/WorldObjectDamageWorker.cs @@ -35,12 +35,13 @@ public virtual float CalculateDamage(ThingDef projectile, Faction faction) } } var result = FragmentsPotentialDamage(projectile) + ExplosionPotentialDamage(projectile) + FirePotentialDamage(projectile) + EMPPotentialDamage(projectile, empModifier); + //Damage calculated as in-map damage, needs to be converted into world object damage. 3500f experimentally obtained + result /= 3500f; + //manual overwrite if (projectile.projectile is ProjectilePropertiesCE projectileProperties && projectileProperties.shellingProps.damage > 0f) { result = projectileProperties.shellingProps.damage; } - //Damage calculated as in-map damage, needs to be converted into world object damage. 3500f experimentally obtained - result /= 3500f; //Crit/Miss imitation result *= Rand.Range(0.4f, 1.5f); return result;