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

Increase wall HP (#1713)

Browse Source 
* Increase all walls hp by 5 times

* Increase reinforced and riveted wall hp as well

* Revert "Increase reinforced and riveted wall hp as well"

This reverts commit a9d95670e3f6c4d7fb2b2cf3c84503496f685e26.

* Increase reinforced and riveted wall hp as well

* Merge conflict fixes

* Reduced wall hp slightly
This commit is contained in:
DrSmugleaf
2020-08-18 18:00:36 +02:00
committed by GitHub
parent 7664b30951
commit e68c91a64c
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs
View File

@@ -20,9 +20,7 @@ namespace Content.Server.GameObjects.Components.Damage
[Dependency] private readonly IEntitySystemManager _entitySystemManager;
#pragma warning restore 649
protected ActSystem _actSystem;
protected string _spawnOnDestroy;
protected ActSystem ActSystem;
/// <inheritdoc />
public override string Name => "Destructible";
@@ -30,26 +28,26 @@ namespace Content.Server.GameObjects.Components.Damage
/// <summary>
/// Entity spawned upon destruction.
/// </summary>
public string SpawnOnDestroy => _spawnOnDestroy;
public string SpawnOnDestroy { get; set; }
void IDestroyAct.OnDestroy(DestructionEventArgs eventArgs)
{
if (!string.IsNullOrWhiteSpace(_spawnOnDestroy) && eventArgs.IsSpawnWreck)
if (!string.IsNullOrWhiteSpace(SpawnOnDestroy) && eventArgs.IsSpawnWreck)
{
Owner.EntityManager.SpawnEntity(_spawnOnDestroy, Owner.Transform.GridPosition);
Owner.EntityManager.SpawnEntity(SpawnOnDestroy, Owner.Transform.GridPosition);
}
}
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _spawnOnDestroy, "spawnondestroy", string.Empty);
serializer.DataField(this, d => d.SpawnOnDestroy, "spawnondestroy", string.Empty);
}
public override void Initialize()
{
base.Initialize();
_actSystem = _entitySystemManager.GetEntitySystem<ActSystem>();
ActSystem = _entitySystemManager.GetEntitySystem<ActSystem>();
}
@@ -58,7 +56,7 @@ namespace Content.Server.GameObjects.Components.Damage
if (!Owner.Deleted)
{
var pos = Owner.Transform.GridPosition;
_actSystem.HandleDestruction(Owner,
ActSystem.HandleDestruction(Owner,
true); //This will call IDestroyAct.OnDestroy on this component (and all other components on this entity)
if (DestroySound != string.Empty)
{