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

Revert "Explosion refactor TEST MERG (#6995)" (#7005)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-06 06:02:34 +13:00
committed by GitHub
parent cd1902cdf2
commit c95516e5b2
71 changed files with 766 additions and 3964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs
View File

@@ -1,8 +1,40 @@
using Content.Server.Throwing;
using Content.Shared.Acts;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
namespace Content.Server.Explosion.Components;
// TODO EXPLOSION make this a tag? or just get rid of it and launch all unanchored physics entities?
[RegisterComponent]
public sealed class ExplosionLaunchedComponent : Component
namespace Content.Server.Explosion.Components
{
[RegisterComponent]
public sealed class ExplosionLaunchedComponent : Component, IExAct
{
[Dependency] private readonly IEntityManager _entMan = default!;
void IExAct.OnExplosion(ExplosionEventArgs eventArgs)
{
if (_entMan.Deleted(Owner))
return;
var sourceLocation = eventArgs.Source;
var targetLocation = _entMan.GetComponent<TransformComponent>(eventArgs.Target).Coordinates;
if (sourceLocation.Equals(targetLocation)) return;
var offset = (targetLocation.ToMapPos(_entMan) - sourceLocation.ToMapPos(_entMan));
//Don't throw if the direction is center (0,0)
if (offset == Vector2.Zero) return;
var direction = offset.Normalized;
var throwForce = eventArgs.Severity switch
{
ExplosionSeverity.Heavy => 30,
ExplosionSeverity.Light => 20,
_ => 0,
};
Owner.TryThrow(direction, throwForce);
}
}
}

30
Content.Server/Explosion/Components/ExplosionResistanceComponent.cs
View File

@@ -1,30 +0,0 @@
using Content.Server.Explosion.EntitySystems;
using Content.Shared.Explosion;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
namespace Content.Server.Explosion.Components;
/// <summary>
/// Component that provides entities with explosion resistance.
/// </summary>
/// <remarks>
/// This is desirable over just using damage modifier sets, given that equipment like bomb-suits need to
/// significantly reduce the damage, but shouldn't be silly overpowered in regular combat.
/// </remarks>
[RegisterComponent]
[Friend(typeof(ExplosionSystem))]
public sealed class ExplosionResistanceComponent : Component
{
/// <summary>
/// The resistance values for this component, This fraction is added to the total resistance.
/// </summary>
[DataField("resistance")]
public float GlobalResistance = 0;
/// <summary>
/// Like <see cref="GlobalResistance"/>, but specified specific to each explosion type for more customizability.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("resistances", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<float, ExplosionPrototype>))]
public Dictionary<string, float> Resistances = new();
}

77
Content.Server/Explosion/Components/ExplosiveComponent.cs
View File

@@ -1,59 +1,34 @@
using Content.Server.Explosion.EntitySystems;
using Content.Shared.Explosion;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Content.Server.Chemistry.ReactionEffects;
using Content.Server.Destructible.Thresholds.Behaviors;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Explosion.Components;
/// <summary>
/// Specifies an explosion that can be spawned by this entity. The explosion itself is spawned via <see
/// cref="ExplosionSystem.TriggerExplosive"/>.
/// </summary>
/// <remarks>
/// The total intensity may be overridden by whatever system actually calls TriggerExplosive(), but this
/// component still determines the explosion type and other properties.
/// </remarks>
[RegisterComponent]
public sealed class ExplosiveComponent : Component
namespace Content.Server.Explosion.Components
{
public override string Name => "Explosive";
/// <summary>
/// The explosion prototype. This determines the damage types, the tile-break chance, and some visual
/// information (e.g., the light that the explosion gives off).
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("explosionType", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
public string ExplosionType = default!;
/// <summary>
/// The maximum intensity the explosion can have on a single time. This limits the maximum damage and tile
/// break chance the explosion can achieve at any given location.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("maxIntensity")]
public float MaxIntensity = 4;
/// <summary>
/// How quickly the intensity drops off as you move away from the epicenter.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("intensitySlope")]
public float IntensitySlope = 1;
/// <summary>
/// The total intensity of this explosion. The radius of the explosion scales like the cube root of this
/// number (see <see cref="ExplosionSystem.RadiusToIntensity"/>).
/// Specifies an explosion range should this entity be exploded.
/// </summary>
/// <remarks>
/// This number can be overridden by passing optional argument to <see
/// cref="ExplosionSystem.TriggerExplosive"/>.
/// Explosions can be caused by:
/// <list type="bullet">
/// <item>Reaching a damage threshold that causes a <see cref="ExplodeBehavior"/></item>
/// <item>Being triggered via the <see cref="ExplodeOnTriggerComponent"/></item>
/// <item>Manually by some other system via functions in <see cref="ExplosionHelper"/> (for example, chemistry's
/// <see cref="ExplosionReactionEffect"/>).</item>
/// </list>
/// </remarks>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("totalIntensity")]
public float TotalIntensity = 10;
[RegisterComponent]
public sealed class ExplosiveComponent : Component
{
[DataField("devastationRange")]
public int DevastationRange;
[DataField("heavyImpactRange")]
public int HeavyImpactRange;
[DataField("lightImpactRange")]
public int LightImpactRange;
[DataField("flashRange")]
public int FlashRange;
/// <summary>
/// Avoid somehow double-triggering this explosion (e.g. by damaging this entity from it's own explosion.
/// </summary>
public bool Exploded;
public bool Exploding { get; set; } = false;
}
}