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

Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14

Browse Source
This commit is contained in:
Ed
2025-03-19 14:04:35 +03:00
parent 4002b0a41c 709b78080f
commit a951193dba
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
View File

@@ -39,9 +39,15 @@ namespace Content.Server.Damage.Systems
{
//CrystallEdge Melee upgrade
var damage = component.Damage;
var slashDamage = damage.DamageDict.GetValueOrDefault("Slash");
var piercingDamage = damage.DamageDict.GetValueOrDefault("Piercing");
if (TryComp<CP14SharpenedComponent>(uid, out var sharp))
damage *= sharp.Sharpness;
{
damage.DamageDict["Slash"] = slashDamage * sharp.Sharpness;
damage.DamageDict["Piercing"] = piercingDamage * sharp.Sharpness;
damage.DamageDict["Blunt"] = (slashDamage + piercingDamage) / 2 * (1f - sharp.Sharpness);
}
var dmg = _damageable.TryChangeDamage(args.Target, damage * _damageable.UniversalThrownDamageModifier, component.IgnoreResistances, origin: args.Component.Thrower);
//CrystallEdge Melee upgrade end
@@ -66,11 +72,16 @@ namespace Content.Server.Damage.Systems
private void OnDamageExamine(EntityUid uid, DamageOtherOnHitComponent component, ref DamageExamineEvent args)
{
//CP14 Sharpening damage apply
var damage = component.Damage * _damageable.UniversalThrownDamageModifier;
var slashDamage = damage.DamageDict.GetValueOrDefault("Slash");
var piercingDamage = damage.DamageDict.GetValueOrDefault("Piercing");
if (TryComp<CP14SharpenedComponent>(uid, out var sharp))
damage *= sharp.Sharpness;
{
damage.DamageDict["Slash"] = slashDamage * sharp.Sharpness;
damage.DamageDict["Piercing"] = piercingDamage * sharp.Sharpness;
damage.DamageDict["Blunt"] = (slashDamage + piercingDamage) / 2 * (1f - sharp.Sharpness);
}
_damageExamine.AddDamageExamine(args.Message, damage, Loc.GetString("damage-throw"));
//CP14 Sharpening damage apply end

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);
}
}

2
Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml
View File

@@ -59,7 +59,7 @@
- type: entity
id: CP14FoodBreadSlice
parent: CP14FoodBread
parent: CP14FoodDoughMedium
name: bread slice
components:
- type: Sprite