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

Improves FlammableComponent, allow mobs to collide with each other.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-03-16 12:55:35 +01:00
parent b4493575cc
commit 3affd1118e
5 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
View File

@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Content.Server.Atmos;
using Content.Server.GameObjects.Components.Interactable;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Temperature;
using Content.Shared.Alert;
@@ -24,7 +26,7 @@ using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Atmos
{
[RegisterComponent]
public class FlammableComponent : SharedFlammableComponent, IStartCollide, IFireAct, IReagentReaction
public class FlammableComponent : SharedFlammableComponent, IStartCollide, IFireAct, IReagentReaction, IInteractUsing
{
private bool _resisting = false;
private readonly List<EntityUid> _collided = new();
@@ -67,7 +69,7 @@ namespace Content.Server.GameObjects.Components.Atmos
public void AdjustFireStacks(float relativeFireStacks)
{
FireStacks = MathF.Max(MathF.Min(-10f, FireStacks + relativeFireStacks), 20f);
FireStacks = MathF.Min(MathF.Max(-10f, FireStacks + relativeFireStacks), 20f);
if (OnFire && FireStacks <= 0)
Extinguish();
@@ -199,7 +201,7 @@ namespace Content.Server.GameObjects.Components.Atmos
Owner.SpawnTimer(2000, () =>
{
_resisting = false;
FireStacks -= 2f;
FireStacks -= 3f;
UpdateAppearance();
});
}
@@ -224,5 +226,19 @@ namespace Content.Server.GameObjects.Components.Atmos
return ReagentUnit.Zero;
}
}
public async Task<bool> InteractUsing(InteractUsingEventArgs eventArgs)
{
foreach (var hotItem in eventArgs.Using.GetAllComponents<IHotItem>())
{
if (hotItem.IsCurrentlyHot())
{
Ignite();
return true;
}
}
return false;
}
}
}