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

CollidableComponent and ICollideableComponent namespace was changed in the engine.

Browse Source 
Minor code cleanup.
This commit is contained in:
Acruid
2020-01-11 14:12:20 -08:00
parent 51f7f14c08
commit 32103979ed
15 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/GameObjects/Components/Mobs/DamageStates.cs
View File

@@ -1,6 +1,7 @@
using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Mobs;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Server.GameObjects
@@ -8,7 +9,7 @@ namespace Content.Server.GameObjects
/// <summary>
/// Defines the blocking effect of each damage state, and what effects to apply upon entering or exiting the state
/// </summary>
public interface DamageState : IActionBlocker
public interface IDamageState : IActionBlocker
{
void EnterState(IEntity entity);
@@ -20,7 +21,7 @@ namespace Content.Server.GameObjects
/// <summary>
/// Standard state that a species is at with no damage or negative effect
/// </summary>
public struct NormalState : DamageState
public struct NormalState : IDamageState
{
public void EnterState(IEntity entity)
{
@@ -71,7 +72,7 @@ namespace Content.Server.GameObjects
/// <summary>
/// A state in which you are disabled from acting due to damage
/// </summary>
public struct CriticalState : DamageState
public struct CriticalState : IDamageState
{
public void EnterState(IEntity entity)
{
@@ -122,7 +123,7 @@ namespace Content.Server.GameObjects
/// <summary>
/// A damage state which will allow ghosting out of mobs
/// </summary>
public struct DeadState : DamageState
public struct DeadState : IDamageState
{
public void EnterState(IEntity entity)
{

2
Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/DamageThresholdTemplates.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Server.GameObjects
/// <summary>
/// Map of ALL POSSIBLE damage states to the threshold enum value that will trigger them, normal state wont be triggered by this value but is a default that is fell back onto
/// </summary>
public static Dictionary<ThresholdType, DamageState> StateThresholdMap = new Dictionary<ThresholdType, DamageState>()
public static Dictionary<ThresholdType, IDamageState> StateThresholdMap = new Dictionary<ThresholdType, IDamageState>()
{
{ ThresholdType.None, new NormalState() },
{ ThresholdType.Critical, new CriticalState() },

2
Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Server.GameObjects
/// <summary>
/// Damagestates are reached by reaching a certain damage threshold, they will block actions after being reached
/// </summary>
public DamageState CurrentDamageState { get; private set; } = new NormalState();
public IDamageState CurrentDamageState { get; private set; } = new NormalState();
/// <summary>
/// Damage state enum for current health, set only via change damage state //TODO: SETTER