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

Modular landmines (#8351)

Browse Source
This commit is contained in:
Kara
2022-06-01 01:39:06 -07:00
committed by GitHub
parent 19778cc664
commit da07d91895
14 changed files with 190 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/Destructible/DestructibleSystem.cs
View File

@@ -24,6 +24,7 @@ namespace Content.Server.Destructible
[Dependency] public readonly ConstructionSystem ConstructionSystem = default!;
[Dependency] public readonly ExplosionSystem ExplosionSystem = default!;
[Dependency] public readonly StackSystem StackSystem = default!;
[Dependency] public readonly TriggerSystem TriggerSystem = default!;
[Dependency] public readonly IPrototypeManager PrototypeManager = default!;
[Dependency] public readonly IComponentFactory ComponentFactory = default!;

10
Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace Content.Server.Destructible.Thresholds.Behaviors;
[DataDefinition]
public sealed class TriggerBehavior : IThresholdBehavior
{
public void Execute(EntityUid owner, DestructibleSystem system)
{
system.TriggerSystem.Trigger(owner);
}
}

8
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
View File

@@ -12,6 +12,7 @@ using Robust.Shared.Player;
using Content.Shared.Sound;
using Content.Shared.Trigger;
using Content.Shared.Database;
using Content.Shared.Explosion;
using Content.Shared.Interaction;
namespace Content.Server.Explosion.EntitySystems
@@ -60,6 +61,7 @@ namespace Content.Server.Explosion.EntitySystems
private void HandleExplodeTrigger(EntityUid uid, ExplodeOnTriggerComponent component, TriggerEvent args)
{
_explosions.TriggerExplosive(uid, user: args.User);
args.Handled = true;
}
#region Flash
@@ -67,12 +69,14 @@ namespace Content.Server.Explosion.EntitySystems
{
// TODO Make flash durations sane ffs.
_flashSystem.FlashArea(uid, args.User, component.Range, component.Duration * 1000f);
args.Handled = true;
}
#endregion
private void HandleDeleteTrigger(EntityUid uid, DeleteOnTriggerComponent component, TriggerEvent args)
{
EntityManager.QueueDeleteEntity(uid);
args.Handled = true;
}
private void OnTriggerCollide(EntityUid uid, TriggerOnCollideComponent component, StartCollideEvent args)
@@ -84,12 +88,14 @@ namespace Content.Server.Explosion.EntitySystems
private void OnActivate(EntityUid uid, TriggerOnActivateComponent component, ActivateInWorldEvent args)
{
Trigger(component.Owner, args.User);
args.Handled = true;
}
public void Trigger(EntityUid trigger, EntityUid? user = null)
public bool Trigger(EntityUid trigger, EntityUid? user = null)
{
var triggerEvent = new TriggerEvent(trigger, user);
EntityManager.EventBus.RaiseLocalEvent(trigger, triggerEvent);
return triggerEvent.Handled;
}
public void HandleTimerTrigger(EntityUid uid, EntityUid? user, float delay , float beepInterval, float? initialBeepDelay, SoundSpecifier? beepSound, AudioParams beepParams)

2
Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs
View File

@@ -20,5 +20,7 @@ public sealed class GhostKickUserOnTriggerSystem : EntitySystem
_ghostKickManager.DoDisconnect(
actor.PlayerSession.ConnectedClient,
"Tripped over a kick mine, crashed through the fourth wall");
args.Handled = true;
}
}

3
Content.Server/LandMines/LandMineComponent.cs
View File

@@ -3,5 +3,6 @@
[RegisterComponent]
public sealed class LandMineComponent : Component
{
[DataField("deleteOnActivate")]
public bool DeleteOnActivate = true;
}

16
Content.Server/LandMines/LandMineSystem.cs
View File

@@ -27,14 +27,16 @@ public sealed class LandMineSystem : EntitySystem
private void HandleTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredEvent args)
{
_popupSystem.PopupCoordinates(
Loc.GetString("land-mine-triggered", ("mine", uid)),
Transform(uid).Coordinates,
Filter.Entities(args.Tripper));
if (_trigger.Trigger(uid, args.Tripper))
{
_popupSystem.PopupCoordinates(
Loc.GetString("land-mine-triggered", ("mine", uid)),
Transform(uid).Coordinates,
Filter.Entities(args.Tripper));
}
_trigger.Trigger(uid, args.Tripper);
QueueDel(uid);
if (component.DeleteOnActivate)
QueueDel(uid);
}
}

46
Content.Server/Payload/EntitySystems/PayloadSystem.cs
View File

@@ -1,8 +1,10 @@
using System.Linq;
using Content.Server.Administration.Logs;
using Content.Server.Chemistry.EntitySystems;
using Content.Server.Explosion.EntitySystems;
using Content.Shared.Chemistry.Components;
using Content.Shared.Database;
using Content.Shared.Examine;
using Content.Shared.Payload.Components;
using Content.Shared.Tag;
using Robust.Shared.Containers;
@@ -27,22 +29,34 @@ public sealed class PayloadSystem : EntitySystem
SubscribeLocalEvent<PayloadTriggerComponent, TriggerEvent>(OnTriggerTriggered);
SubscribeLocalEvent<PayloadCaseComponent, EntInsertedIntoContainerMessage>(OnEntityInserted);
SubscribeLocalEvent<PayloadCaseComponent, EntRemovedFromContainerMessage>(OnEntityRemoved);
SubscribeLocalEvent<PayloadCaseComponent, ExaminedEvent>(OnExamined);
SubscribeLocalEvent<ChemicalPayloadComponent, TriggerEvent>(HandleChemicalPayloadTrigger);
}
public IEnumerable<EntityUid> GetAllPayloads(EntityUid uid, ContainerManagerComponent? contMan=null)
{
if (!Resolve(uid, ref contMan, false))
yield break;
foreach (var container in contMan.Containers.Values)
{
foreach (var entity in container.ContainedEntities)
{
if (_tagSystem.HasTag(entity, "Payload"))
yield return entity;
}
}
}
private void OnCaseTriggered(EntityUid uid, PayloadCaseComponent component, TriggerEvent args)
{
if (!TryComp(uid, out ContainerManagerComponent? contMan))
return;
// Pass trigger event onto all contained payloads. Payload capacity configurable by construction graphs.
foreach (var container in contMan.Containers.Values)
foreach (var ent in GetAllPayloads(uid, contMan))
{
foreach (var entity in container.ContainedEntities)
{
if (_tagSystem.HasTag(entity, "Payload"))
RaiseLocalEvent(entity, args, false);
}
RaiseLocalEvent(ent, args, false);
}
}
@@ -106,6 +120,24 @@ public sealed class PayloadSystem : EntitySystem
trigger.GrantedComponents.Clear();
}
private void OnExamined(EntityUid uid, PayloadCaseComponent component, ExaminedEvent args)
{
if (!args.IsInDetailsRange)
{
args.PushMarkup(Loc.GetString("payload-case-not-close-enough", ("ent", uid)));
return;
}
if (GetAllPayloads(uid).Any())
{
args.PushMarkup(Loc.GetString("payload-case-has-payload", ("ent", uid)));
}
else
{
args.PushMarkup(Loc.GetString("payload-case-does-not-have-payload", ("ent", uid)));
}
}
private void HandleChemicalPayloadTrigger(EntityUid uid, ChemicalPayloadComponent component, TriggerEvent args)
{
if (component.BeakerSlotA.Item is not EntityUid beakerA
@@ -135,5 +167,7 @@ public sealed class PayloadSystem : EntitySystem
_solutionSystem.TryAddSolution(beakerB, solutionB, tmpSol);
solutionA.MaxVolume -= solutionB.MaxVolume;
_solutionSystem.UpdateChemicals(beakerA, solutionA, false);
args.Handled = true;
}
}

1
Content.Server/Sound/EmitSoundSystem.cs
View File

@@ -40,6 +40,7 @@ namespace Content.Server.Sound
private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent component, TriggerEvent args)
{
TryEmitSound(component);
args.Handled = true;
}
private void HandleEmitSoundOnLand(EntityUid eUI, BaseEmitSoundComponent component, LandEvent arg)