tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ReadExecute perms to all of DamageableComponent (#8800)

Browse Source
This commit is contained in:
Leon Friedrich
2022-06-13 11:19:49 +12:00
committed by GitHub
parent 2d882e78bb
commit 90c224a1c1
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Damage/Components/DamageableComponent.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Shared.Damage
/// </remarks> /// </remarks>
[RegisterComponent] [RegisterComponent]
[NetworkedComponent()] [NetworkedComponent()]
[Access(typeof(DamageableSystem))] [Access(typeof(DamageableSystem), Other = AccessPermissions.ReadExecute)]
public sealed class DamageableComponent : Component public sealed class DamageableComponent : Component
{ {
/// <summary> /// <summary>
@@ -24,7 +24,6 @@ namespace Content.Shared.Damage
/// If null, all damage types will be supported. /// If null, all damage types will be supported.
/// </summary> /// </summary>
[DataField("damageContainer", customTypeSerializer: typeof(PrototypeIdSerializer<DamageContainerPrototype>))] [DataField("damageContainer", customTypeSerializer: typeof(PrototypeIdSerializer<DamageContainerPrototype>))]
[Access(typeof(DamageableSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
public string? DamageContainerID; public string? DamageContainerID;
/// <summary> /// <summary>
@@ -35,7 +34,6 @@ namespace Content.Shared.Damage
/// Though DamageModifierSets can be deserialized directly, we only want to use the prototype version here /// Though DamageModifierSets can be deserialized directly, we only want to use the prototype version here
/// to reduce duplication. /// to reduce duplication.
/// </remarks> /// </remarks>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("damageModifierSet", customTypeSerializer: typeof(PrototypeIdSerializer<DamageModifierSetPrototype>))] [DataField("damageModifierSet", customTypeSerializer: typeof(PrototypeIdSerializer<DamageModifierSetPrototype>))]
public string? DamageModifierSetId; public string? DamageModifierSetId;
@@ -46,8 +44,6 @@ namespace Content.Shared.Damage
/// If this data-field is specified, this allows damageable components to be initialized with non-zero damage. /// If this data-field is specified, this allows damageable components to be initialized with non-zero damage.
/// </remarks> /// </remarks>
[DataField("damage")] [DataField("damage")]
[ViewVariables(VVAccess.ReadWrite)]
[Access(typeof(DamageableSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
public DamageSpecifier Damage = new(); public DamageSpecifier Damage = new();
/// <summary> /// <summary>
@@ -63,16 +59,10 @@ namespace Content.Shared.Damage
/// The sum of all damages in the DamageableComponent. /// The sum of all damages in the DamageableComponent.
/// </summary> /// </summary>
[ViewVariables] [ViewVariables]
[Access(typeof(DamageableSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
public FixedPoint2 TotalDamage; public FixedPoint2 TotalDamage;
// Really these shouldn't be here. OnExplosion() and RadiationAct() should be handled elsewhere.
[ViewVariables]
[DataField("radiationDamageTypes", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageTypePrototype>))] [DataField("radiationDamageTypes", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageTypePrototype>))]
public List<string> RadiationDamageTypeIDs = new() {"Radiation"}; public List<string> RadiationDamageTypeIDs = new() {"Radiation"};
[ViewVariables]
[DataField("explosionDamageTypes", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageTypePrototype>))]
public List<string> ExplosionDamageTypeIDs = new() { "Piercing", "Heat" };
} }
[Serializable, NetSerializable] [Serializable, NetSerializable]