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

Revert "Refactor Damage to use Protoypes (#4262)"

Browse Source 
This reverts commit 20bf5739a9.
This commit is contained in:
Silver
2021-08-24 00:50:39 -06:00
committed by Silver
parent 20bf5739a9
commit e708091518
121 changed files with 711 additions and 10237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
View File

@@ -2,8 +2,6 @@ using Content.Shared.Damage;
using Robust.Shared.Analyzers;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Prototypes;
using Robust.Shared.IoC;
namespace Content.Server.Damage.Components
{
@@ -13,47 +11,13 @@ namespace Content.Server.Damage.Components
{
public override string Name => "DamageOtherOnHit";
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
<<<<<<< refs/remotes/origin/master
[DataField("damageType")]
public DamageType DamageType { get; } = DamageType.Blunt;
=======
[DataField("damageType",required: true)]
private readonly string _damageType = default!;
>>>>>>> update damagecomponent across shared and server
=======
>>>>>>> Refactor damageablecomponent update (#4406)
=======
>>>>>>> refactor-damageablecomponent
[DataField("amount")]
public int Amount { get; } = 1;
[DataField("ignoreResistances")]
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
<<<<<<< refs/remotes/origin/master
public bool IgnoreResistances { get; } = false;
=======
private bool _ignoreResistances;
=======
public bool IgnoreResistances { get; } = false;
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
public bool IgnoreResistances { get; } = false;
>>>>>>> refactor-damageablecomponent
// TODO PROTOTYPE Replace this datafield variable with prototype references, once they are supported.
// Also remove Initialize override, if no longer needed.
[DataField("damageType")]
private readonly string _damageTypeID = "Blunt";
public DamageTypePrototype DamageType { get; set; } = default!;
protected override void Initialize()
{
base.Initialize();
DamageType = IoCManager.Resolve<IPrototypeManager>().Index<DamageTypePrototype>(_damageTypeID);
}
>>>>>>> update damagecomponent across shared and server
}
}