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

shield values examine (#17245)

Browse Source
This commit is contained in:
Slava0135
2023-06-17 05:07:58 +03:00
committed by GitHub
parent 99cfe77557
commit 8ed4dcf0fb
7 changed files with 172 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Shared/Blocking/Components/BlockingComponent.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.Actions.ActionTypes;
using Content.Shared.Damage;
using Robust.Shared.Audio;
using Robust.Shared.Physics.Collision.Shapes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -31,24 +32,22 @@ public sealed class BlockingComponent : Component
/// <summary>
/// The shape of the blocking fixture that will be dynamically spawned
/// </summary>
[ViewVariables(VVAccess.ReadWrite)] [DataField("shape")]
[DataField("shape"), ViewVariables(VVAccess.ReadWrite)]
public IPhysShape Shape = new PhysShapeCircle(0.5f);
/// <summary>
/// The damage modifer to use while passively blocking
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("passiveBlockModifier")]
public string PassiveBlockDamageModifer = "Metallic";
[DataField("passiveBlockModifier", required: true)]
public DamageModifierSet PassiveBlockDamageModifer = default!;
/// <summary>
/// The damage modifier to use while actively blocking.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("activeBlockModifier")]
public string ActiveBlockDamageModifier = "Metallic";
[DataField("activeBlockModifier", required: true)]
public DamageModifierSet ActiveBlockDamageModifier = default!;
[DataField("blockingToggleActionId", customTypeSerializer:typeof(PrototypeIdSerializer<InstantActionPrototype>))]
[DataField("blockingToggleActionId", customTypeSerializer: typeof(PrototypeIdSerializer<InstantActionPrototype>))]
public string BlockingToggleActionId = "ToggleBlock";
[DataField("blockingToggleAction")]

7
Content.Shared/Blocking/Components/BlockingUserComponent.cs
View File

@@ -1,5 +1,4 @@
using Content.Shared.Damage;
using Robust.Shared.Physics;
using Robust.Shared.Physics;
namespace Content.Shared.Blocking;
@@ -15,14 +14,10 @@ public sealed class BlockingUserComponent : Component
[DataField("blockingItem")]
public EntityUid? BlockingItem;
[DataField("modifiers")]
public DamageModifierSet Modifiers = default!;
/// <summary>
/// Stores the entities original bodytype
/// Used so that it can be put back to what it was after anchoring
/// </summary>
[DataField("originalBodyType")]
public BodyType OriginalBodyType;
}