Merge pull request #2751 from CombatExtended-Continued/world-tile-dam…

…age-change Update WorldObjectDamageWorker.cs
CombatExtended-Continued · Oct 26, 2023 · 9f6588a · 9f6588a
2 parents c08ac4e + cb03bbb
commit 9f6588a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/WorldObjectDamageWorker.cs b/Source/CombatExtended/CombatExtended/WorldObjects/WorldObjectDamageWorker.cs
@@ -37,12 +37,13 @@ public virtual float CalculateDamage(ThingDef projectile, Faction faction)
             var result = FragmentsPotentialDamage(projectile) + FirePotentialDamage(projectile) + EMPPotentialDamage(projectile, empModifier) + OtherPotentialDamage(projectile);
             //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);
+            //manual overwrite
             if (projectile.projectile is ProjectilePropertiesCE projectileProperties && projectileProperties.shellingProps.damage > 0f)
             {
-                result *= projectileProperties.shellingProps.damage;
+                result = projectileProperties.shellingProps.damage;
             }
+            //Crit/Miss imitation
+            result *= Rand.Range(0.4f, 1.5f);
             return result;
         }
         protected const float fragDamageMultipler = 0.04f;