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

sharpness reduce on throw hit (#1164)

Browse Source 
* sharpness reduce on throw hit

* kill me please, submod update

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
This commit is contained in:
Gagarinten-Noverdo
2025-04-18 13:51:15 +03:00
committed by GitHub
parent 39ca6175e6
commit e1326c00b1
3 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ using Content.Server.Administration.Logs;
using Content.Server.Damage.Components;
using Content.Server.Weapons.Ranged.Systems;
using Content.Shared._CP14.MeleeWeapon.Components;
using Content.Shared._CP14.MeleeWeapon.EntitySystems;
using Content.Shared.CombatMode.Pacification;
using Content.Shared.Camera;
using Content.Shared.Damage;
@@ -44,6 +45,7 @@ namespace Content.Server.Damage.Systems
if (TryComp<CP14SharpenedComponent>(uid, out var sharp))
{
CP14SharpeningSystem.ReduceSharpness((uid, sharp), damage);
damage.DamageDict["Slash"] = slashDamage * sharp.Sharpness;
damage.DamageDict["Piercing"] = piercingDamage * sharp.Sharpness;
damage.DamageDict["Blunt"] = (slashDamage + piercingDamage) / 2 * (1f - sharp.Sharpness);

9
Content.Shared/_CP14/MeleeWeapon/Components/CP14SharpenedComponent.cs
View File

@@ -12,6 +12,15 @@ public sealed partial class CP14SharpenedComponent : Component
[DataField, AutoNetworkedField]
public float Sharpness = 1f;
[DataField]
public Dictionary<float, string> SharpnessExamineThresholds { get; private set; } = new()
{
{ 0.95f, "sharpening-examined-95" },
{ 0.75f, "sharpening-examined-75" },
{ 0.5f, "sharpening-examined-50" },
{ 0, "sharpening-examined-25" },
};
[DataField]
public float SharpnessDamageBy1Damage = 0.001f; //1000 damage
}

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

@@ -25,7 +25,8 @@ public sealed class CP14SharpeningSystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<CP14SharpenedComponent, GetMeleeDamageEvent>(OnGetMeleeDamage, after: new[] { typeof(SharedWieldableSystem) });
SubscribeLocalEvent<CP14SharpenedComponent, GetMeleeDamageEvent>(OnGetMeleeDamage,
after: [typeof(SharedWieldableSystem)]);
SubscribeLocalEvent<CP14SharpenedComponent, ExaminedEvent>(OnExamined);
SubscribeLocalEvent<CP14SharpenedComponent, MeleeHitEvent>(OnMeleeHit);
@@ -33,12 +34,18 @@ public sealed class CP14SharpeningSystem : EntitySystem
SubscribeLocalEvent<CP14SharpeningStoneComponent, ActivateInWorldEvent>(OnInteract);
}
private void OnMeleeHit(Entity<CP14SharpenedComponent> sharpened, ref MeleeHitEvent args)
public static void ReduceSharpness(Entity<CP14SharpenedComponent> ent, DamageSpecifier dmg)
{
ent.Comp.Sharpness =
MathHelper.Clamp(ent.Comp.Sharpness - dmg.GetTotal().Float() * ent.Comp.SharpnessDamageBy1Damage, 0.1f, 1f);
}
private static void OnMeleeHit(Entity<CP14SharpenedComponent> sharpened, ref MeleeHitEvent args)
{
if (!args.HitEntities.Any())
return;
sharpened.Comp.Sharpness = MathHelper.Clamp(sharpened.Comp.Sharpness - args.BaseDamage.GetTotal().Float() * sharpened.Comp.SharpnessDamageBy1Damage, 0.1f, 1f);
ReduceSharpness(sharpened, args.BaseDamage);
}
private void OnInteract(Entity<CP14SharpeningStoneComponent> stone, ref ActivateInWorldEvent args)
@@ -73,9 +80,12 @@ public sealed class CP14SharpeningSystem : EntitySystem
SharpThing(stone, args.Target.Value, sharpened, args.User);
}
private void SharpThing(Entity<CP14SharpeningStoneComponent> stone, EntityUid target, CP14SharpenedComponent component, EntityUid user)
private void SharpThing(Entity<CP14SharpeningStoneComponent> stone,
EntityUid target,
CP14SharpenedComponent component,
EntityUid user)
{
var ev = new SharpingEvent()
var ev = new SharpingEvent
{
User = user,
Target = target,
@@ -104,28 +114,16 @@ public sealed class CP14SharpeningSystem : EntitySystem
private void OnExamined(Entity<CP14SharpenedComponent> sharpened, ref ExaminedEvent args)
{
if (sharpened.Comp.Sharpness > 0.95f)
foreach (var (threshold, locString) in sharpened.Comp.SharpnessExamineThresholds.OrderByDescending(x => x.Key))
{
args.PushMarkup(Loc.GetString("sharpening-examined-95"));
if (!(sharpened.Comp.Sharpness > threshold) && threshold != 0)
continue;
args.PushMarkup(Loc.GetString(locString));
return;
}
if (sharpened.Comp.Sharpness > 0.75f)
{
args.PushMarkup(Loc.GetString("sharpening-examined-75"));
return;
}
if (sharpened.Comp.Sharpness > 0.5f)
{
args.PushMarkup(Loc.GetString("sharpening-examined-50"));
return;
}
args.PushMarkup(Loc.GetString("sharpening-examined-25"));
}
private void OnGetMeleeDamage(Entity<CP14SharpenedComponent> sharpened, ref GetMeleeDamageEvent args)
private static void OnGetMeleeDamage(Entity<CP14SharpenedComponent> sharpened, ref GetMeleeDamageEvent args)
{
var slashDamage = args.Damage.DamageDict.GetValueOrDefault("Slash");
var piercingDamage = args.Damage.DamageDict.GetValueOrDefault("Piercing");
@@ -134,7 +132,6 @@ public sealed class CP14SharpeningSystem : EntitySystem
args.Damage.DamageDict["Piercing"] = piercingDamage * sharpened.Comp.Sharpness;
args.Damage.DamageDict["Blunt"] = (slashDamage + piercingDamage) / 2 * (1f - sharpened.Comp.Sharpness);
}
}
/// <summary>