Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

1 do_after for ore veins (#14083)

Browse Source 
* Ore veins

I dislike rocks just providing generic drops and this factors into mining more.

* fixes

* descriptions

* comment

* every flipping time

* Make mining destroy rocks with 1 hit

Having to click 3 times was pretty annoying.

* a
This commit is contained in:
metalgearsloth
2023-02-14 02:32:09 +11:00
committed by GitHub
parent 44a0888c15
commit bfbb1a689f
5 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Server/Gatherable/GatherableSystem.cs
View File

@@ -1,7 +1,9 @@
using System.Threading;
using Content.Server.Destructible;
using Content.Server.DoAfter;
using Content.Server.Gatherable.Components;
using Content.Shared.Damage;
using Content.Shared.Destructible;
using Content.Shared.EntityList;
using Content.Shared.Interaction;
using Content.Shared.Tag;
@@ -12,12 +14,13 @@ namespace Content.Server.Gatherable;
public sealed class GatherableSystem : EntitySystem
{
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly TagSystem _tagSystem = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly DestructibleSystem _destructible = default!;
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly TagSystem _tagSystem = default!;
public override void Initialize()
{
@@ -39,10 +42,14 @@ public sealed class GatherableSystem : EntitySystem
if (tool.MaxGatheringEntities < tool.GatheringEntities.Count + 1)
return;
var damageRequired = _destructible.DestroyedAt(uid);
var damageTime = (damageRequired / tool.Damage.Total).Float();
damageTime = Math.Max(1f, damageTime);
cancelToken = new CancellationTokenSource();
tool.GatheringEntities[uid] = cancelToken;
var doAfter = new DoAfterEventArgs(args.User, tool.GatheringTime, cancelToken.Token, uid)
var doAfter = new DoAfterEventArgs(args.User, damageTime, cancelToken.Token, uid)
{
BreakOnDamage = true,
BreakOnStun = true,
@@ -62,7 +69,7 @@ public sealed class GatherableSystem : EntitySystem
return;
// Complete the gathering process
_damageableSystem.TryChangeDamage(ev.Resource, tool.Damage, origin: ev.Player);
_destructible.DestroyEntity(uid);
_audio.PlayPvs(tool.GatheringSound, ev.Resource);
tool.GatheringEntities.Remove(ev.Resource);