Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update WorldObjectDamageWorker.cs #2751

Merged
merged 5 commits into from
Oct 26, 2023
Merged

Update WorldObjectDamageWorker.cs #2751

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c99709b
Update WorldObjectDamageWorker.cs
CMDR-Bill-Doors Sep 12, 2023
c5121a8
Update WorldObjectDamageWorker.cs
CMDR-Bill-Doors Sep 13, 2023
7e6f693
remove a log I forgot to remove
CMDR-Bill-Doors Sep 19, 2023
ba96587
Update WorldObjectDamageWorker.cs
CMDR-Bill-Doors Oct 10, 2023
cb03bbb
Merge branch 'Development' of https://github.com/CombatExtended-Conti…
N7Huntsman Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Source/CombatExtended/CombatExtended/WorldObjects/WorldObjectDamageWorker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ public virtual float CalculateDamage(ThingDef projectile, Faction faction)
}
}
var result = FragmentsPotentialDamage(projectile) + ExplosionPotentialDamage(projectile) + FirePotentialDamage(projectile) + EMPPotentialDamage(projectile, empModifier);
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);
if (projectile.projectile is ProjectilePropertiesCE projectileProperties && projectileProperties.shellingProps.damage > 0f)
{
result *= projectileProperties.shellingProps.damage;
}
return result;
}
protected const float fragDamageMultipler = 0.04f;
Expand Down