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

Nuke spaceshroom ore (#28110)

Browse Source 
nuke spaceshroom ore
This commit is contained in:
Ed
2024-05-18 19:17:46 +03:00
committed by GitHub
parent 8bbd2394ef
commit 225a05ecdb
6 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,9 @@
using Content.Server.Destructible;
using Content.Server.Gatherable.Components;
using Content.Shared.EntityList;
using Content.Shared.Interaction;
using Content.Shared.Tag;
using Content.Shared.Weapons.Melee.Events;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
@@ -14,7 +12,7 @@ namespace Content.Server.Gatherable;
public sealed partial class GatherableSystem : EntitySystem
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly DestructibleSystem _destructible = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -30,20 +28,20 @@ public sealed partial class GatherableSystem : EntitySystem
InitializeProjectile();
}
private void OnAttacked(EntityUid uid, GatherableComponent component, AttackedEvent args)
private void OnAttacked(Entity<GatherableComponent> gatherable, ref AttackedEvent args)
{
if (component.ToolWhitelist?.IsValid(args.Used, EntityManager) != true)
if (gatherable.Comp.ToolWhitelist?.IsValid(args.Used, EntityManager) != true)
return;
Gather(uid, args.User, component);
Gather(gatherable, args.User);
}
private void OnActivate(EntityUid uid, GatherableComponent component, ActivateInWorldEvent args)
private void OnActivate(Entity<GatherableComponent> gatherable, ref ActivateInWorldEvent args)
{
if (component.ToolWhitelist?.IsValid(args.User, EntityManager) != true)
if (gatherable.Comp.ToolWhitelist?.IsValid(args.User, EntityManager) != true)
return;
Gather(uid, args.User, component);
Gather(gatherable, args.User);
}
public void Gather(EntityUid gatheredUid, EntityUid? gatherer = null, GatherableComponent? component = null)
@@ -60,25 +58,22 @@ public sealed partial class GatherableSystem : EntitySystem
_destructible.DestroyEntity(gatheredUid);
// Spawn the loot!
if (component.MappedLoot == null)
if (component.Loot == null)
return;
var pos = _transform.GetMapCoordinates(gatheredUid);
foreach (var (tag, table) in component.MappedLoot)
foreach (var (tag, table) in component.Loot)
{
if (tag != "All")
{
if (gatherer != null && !_tagSystem.HasTag(gatherer.Value, tag))
continue;
}
var getLoot = _prototypeManager.Index<EntityLootTablePrototype>(table);
var getLoot = _proto.Index(table);
var spawnLoot = getLoot.GetSpawns(_random);
var spawnPos = pos.Offset(_random.NextVector2(0.3f));
var spawnPos = pos.Offset(_random.NextVector2(component.GatherOffset));
Spawn(spawnLoot[0], spawnPos);
}
}
}