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

GatherableSystem/Component (#8041)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Chris V
2022-05-12 05:53:31 -07:00
committed by GitHub
parent 0de06cb9c0
commit 6cb2a01723
12 changed files with 244 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Mining/Components/MineableComponent.cs
View File

@@ -1,12 +0,0 @@
using System.Threading;
using Content.Shared.Storage;
namespace Content.Server.Mining.Components;
[RegisterComponent]
[Friend(typeof(MineableSystem))]
public sealed class MineableComponent : Component
{
[DataField("ores")] public List<EntitySpawnEntry> Ores = new();
public float BaseMineTime = 1.0f;
}

38
Content.Server/Mining/Components/PickaxeComponent.cs
View File

@@ -1,38 +0,0 @@
using System.Threading;
using Content.Shared.Damage;
using Content.Shared.Sound;
namespace Content.Server.Mining.Components
{
/// <summary>
/// When interacting with an <see cref="MineableComponent"/> allows it to spawn entities.
/// </summary>
[RegisterComponent]
public sealed class PickaxeComponent : Component
{
[ViewVariables(VVAccess.ReadWrite)]
[DataField("sound")]
public SoundSpecifier MiningSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Mining/pickaxe.ogg");
[ViewVariables(VVAccess.ReadWrite)]
[DataField("timeMultiplier")]
public float MiningTimeMultiplier { get; set; } = 1f;
/// <summary>
/// What damage should be given to objects when
/// mined using a pickaxe?
/// </summary>
[DataField("damage", required: true)]
public DamageSpecifier Damage { get; set; } = default!;
/// <summary>
/// How many entities can this pickaxe mine at once?
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("maxEntities")]
public int MaxMiningEntities = 1;
[ViewVariables]
public readonly Dictionary<EntityUid, CancellationTokenSource> MiningEntities = new();
}
}

99
Content.Server/Mining/MineableSystem.cs
View File

@@ -1,99 +0,0 @@
using System.Threading;
using Content.Server.DoAfter;
using Content.Server.Mining.Components;
using Content.Shared.Damage;
using Content.Shared.Interaction;
using Content.Shared.Storage;
using Robust.Shared.Audio;
using Robust.Shared.Player;
using Robust.Shared.Random;
namespace Content.Server.Mining;
public sealed class MineableSystem : EntitySystem
{
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly IRobustRandom _random = null!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<MineableComponent, InteractUsingEvent>(OnInteractUsing);
SubscribeLocalEvent<MiningDoafterCancel>(OnDoafterCancel);
SubscribeLocalEvent<MineableComponent, MiningDoafterSuccess>(OnDoafterSuccess);
}
private void OnInteractUsing(EntityUid uid, MineableComponent component, InteractUsingEvent args)
{
if (!TryComp<PickaxeComponent>(args.Used, out var pickaxe))
return;
if (pickaxe.MiningEntities.TryGetValue(uid, out var cancelToken))
{
cancelToken.Cancel();
pickaxe.MiningEntities.Remove(uid);
return;
}
// Can't mine too many entities at once.
if (pickaxe.MaxMiningEntities < pickaxe.MiningEntities.Count + 1)
return;
cancelToken = new CancellationTokenSource();
pickaxe.MiningEntities[uid] = cancelToken;
var doAfter = new DoAfterEventArgs(args.User, component.BaseMineTime * pickaxe.MiningTimeMultiplier, cancelToken.Token, uid)
{
BreakOnDamage = true,
BreakOnStun = true,
BreakOnTargetMove = true,
BreakOnUserMove = true,
MovementThreshold = 0.25f,
BroadcastCancelledEvent = new MiningDoafterCancel { Pickaxe = args.Used, Rock = uid },
TargetFinishedEvent = new MiningDoafterSuccess { Pickaxe = args.Used, Rock = uid, Player = args.User }
};
_doAfterSystem.DoAfter(doAfter);
}
private void OnDoafterSuccess(EntityUid uid, MineableComponent component, MiningDoafterSuccess ev)
{
if (!TryComp(ev.Pickaxe, out PickaxeComponent? pickaxe))
return;
_damageableSystem.TryChangeDamage(ev.Rock, pickaxe.Damage);
SoundSystem.Play(Filter.Pvs(ev.Rock, entityManager: EntityManager), pickaxe.MiningSound.GetSound(), ev.Rock);
pickaxe.MiningEntities.Remove(ev.Rock);
var spawnOre = EntitySpawnCollection.GetSpawns(component.Ores, _random);
var playerPos = Transform(ev.Player).MapPosition;
var spawnPos = playerPos.Offset(_random.NextVector2(0.3f));
EntityManager.SpawnEntity(spawnOre[0], spawnPos);
pickaxe.MiningEntities.Remove(uid);
}
private void OnDoafterCancel(MiningDoafterCancel ev)
{
if (!TryComp<PickaxeComponent>(ev.Pickaxe, out var pickaxe))
return;
pickaxe.MiningEntities.Remove(ev.Rock);
}
private sealed class MiningDoafterCancel : EntityEventArgs
{
public EntityUid Pickaxe;
public EntityUid Rock;
}
}
// grumble grumble
public sealed class MiningDoafterSuccess : EntityEventArgs
{
public EntityUid Pickaxe;
public EntityUid Rock;
public EntityUid Player;
}