juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Weapon Sharpening System Update & Bread Slicing Fix (#915)

Browse Source 
* SharpeningUpdate

* BreadSlicingFix

Before that, bread slices could be cut endlessly into new bread slices.

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
This commit is contained in:
Арт
2025-03-19 13:36:46 +03:00
committed by GitHub
parent d71fd8ef80
commit 709b78080f
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14SharpeningSystem.cs
View File

@@ -127,7 +127,12 @@ public sealed class CP14SharpeningSystem : EntitySystem
private void OnGetMeleeDamage(Entity<CP14SharpenedComponent> sharpened, ref GetMeleeDamageEvent args)
{
args.Damage *= sharpened.Comp.Sharpness;
var slashDamage = args.Damage.DamageDict.GetValueOrDefault("Slash");
var piercingDamage = args.Damage.DamageDict.GetValueOrDefault("Piercing");
args.Damage.DamageDict["Slash"] = slashDamage * sharpened.Comp.Sharpness;
args.Damage.DamageDict["Piercing"] = piercingDamage * sharpened.Comp.Sharpness;
args.Damage.DamageDict["Blunt"] = (slashDamage + piercingDamage) / 2 * (1f - sharpened.Comp.Sharpness);
}
}