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

Add EffectBlockerExtensions

Browse Source
This commit is contained in:
DrSmugleaf
2020-12-20 04:31:04 +01:00
parent fcd52fa90c
commit a3fdcd3a68
11 changed files with 72 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
View File

@@ -8,6 +8,7 @@ using Content.Shared.GameObjects.Components.Body.Part;
using Content.Shared.GameObjects.Components.Buckle; using Content.Shared.GameObjects.Components.Buckle;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
using Content.Shared.Utility; using Content.Shared.Utility;
using NUnit.Framework; using NUnit.Framework;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;

1
Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
View File

@@ -8,6 +8,7 @@ using Content.Server.Interfaces.GameObjects;
using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.Inventory;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
using Content.Shared.Interfaces; using Content.Shared.Interfaces;
using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.Container;
using Robust.Shared.Containers; using Robust.Shared.Containers;

1
Content.Server/GameObjects/Components/Movement/NoSlipComponent.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
namespace Content.Server.GameObjects.Components.Movement namespace Content.Server.GameObjects.Components.Movement

1
Content.Shared/GameObjects/Components/Buckle/SharedBuckleComponent.cs
View File

@@ -3,6 +3,7 @@ using System;
using Content.Shared.GameObjects.Components.Strap; using Content.Shared.GameObjects.Components.Strap;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.ComponentDependencies; using Robust.Shared.GameObjects.ComponentDependencies;

1
Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
using Content.Shared.Physics; using Content.Shared.Physics;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;

51
Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerSystem.cs
View File

@@ -1,4 +1,5 @@
using JetBrains.Annotations; using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
using JetBrains.Annotations;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
@@ -15,9 +16,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canMove = true; var canMove = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canMove &= blockers.CanMove(); // Sets var to false if false canMove &= blocker.CanMove(); // Sets var to false if false
} }
return canMove; return canMove;
@@ -27,9 +28,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canInteract = true; var canInteract = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canInteract &= blockers.CanInteract(); canInteract &= blocker.CanInteract();
} }
return canInteract; return canInteract;
@@ -39,9 +40,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canUse = true; var canUse = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canUse &= blockers.CanUse(); canUse &= blocker.CanUse();
} }
return canUse; return canUse;
@@ -51,9 +52,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canThrow = true; var canThrow = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canThrow &= blockers.CanThrow(); canThrow &= blocker.CanThrow();
} }
return canThrow; return canThrow;
@@ -63,9 +64,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canSpeak = true; var canSpeak = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canSpeak &= blockers.CanSpeak(); canSpeak &= blocker.CanSpeak();
} }
return canSpeak; return canSpeak;
@@ -75,9 +76,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canDrop = true; var canDrop = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canDrop &= blockers.CanDrop(); canDrop &= blocker.CanDrop();
} }
return canDrop; return canDrop;
@@ -87,9 +88,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canPickup = true; var canPickup = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canPickup &= blockers.CanPickup(); canPickup &= blocker.CanPickup();
} }
return canPickup; return canPickup;
@@ -99,9 +100,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canEmote = true; var canEmote = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canEmote &= blockers.CanEmote(); canEmote &= blocker.CanEmote();
} }
return canEmote; return canEmote;
@@ -111,9 +112,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canAttack = true; var canAttack = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canAttack &= blockers.CanAttack(); canAttack &= blocker.CanAttack();
} }
return canAttack; return canAttack;
@@ -123,9 +124,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canEquip = true; var canEquip = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canEquip &= blockers.CanEquip(); canEquip &= blocker.CanEquip();
} }
return canEquip; return canEquip;
@@ -135,9 +136,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canUnequip = true; var canUnequip = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canUnequip &= blockers.CanUnequip(); canUnequip &= blocker.CanUnequip();
} }
return canUnequip; return canUnequip;
@@ -147,9 +148,9 @@ namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
var canChangeDirection = true; var canChangeDirection = true;
foreach (var blockers in entity.GetAllComponents<IActionBlocker>()) foreach (var blocker in entity.GetAllComponents<IActionBlocker>())
{ {
canChangeDirection &= blockers.CanChangeDirection(); canChangeDirection &= blocker.CanChangeDirection();
} }
return canChangeDirection; return canChangeDirection;

6
Content.Shared/GameObjects/EntitySystems/ActionBlocker/IActionBlocker.cs
View File

@@ -1,4 +1,6 @@
namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
{ {
/// <summary> /// <summary>
/// This interface gives components the ability to block certain actions from /// This interface gives components the ability to block certain actions from
@@ -34,4 +36,4 @@
bool CanSweat() => true; bool CanSweat() => true;
} }
} }

17
Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerExtensions.cs Normal file
View File

@@ -0,0 +1,17 @@
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Shared.GameObjects.EntitySystems.EffectBlocker
{
public static class EffectBlockerExtensions
{
public static bool CanFall(this IEntity entity)
{
return EffectBlockerSystem.CanFall(entity);
}
public static bool CanSlip(this IEntity entity)
{
return EffectBlockerSystem.CanSlip(entity);
}
}
}

16
Content.Shared/GameObjects/EntitySystems/EffectBlockerSystem.cs → Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerSystem.cs
View File

@@ -1,28 +1,21 @@
using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
using JetBrains.Annotations;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
namespace Content.Shared.GameObjects.EntitySystems namespace Content.Shared.GameObjects.EntitySystems.EffectBlocker
{ {
/// <summary>
/// This interface gives components the ability to block certain effects
/// from affecting the owning entity. For actions see <see cref="IActionBlocker"/>
/// </summary>
public interface IEffectBlocker
{
bool CanFall() => true;
bool CanSlip() => true;
}
/// <summary> /// <summary>
/// Utility methods to check if an effect is allowed to affect a specific entity. /// Utility methods to check if an effect is allowed to affect a specific entity.
/// For actions see <see cref="ActionBlockerSystem"/> /// For actions see <see cref="ActionBlockerSystem"/>
/// </summary> /// </summary>
[UsedImplicitly]
public class EffectBlockerSystem : EntitySystem public class EffectBlockerSystem : EntitySystem
{ {
public static bool CanFall(IEntity entity) public static bool CanFall(IEntity entity)
{ {
var canFall = true; var canFall = true;
foreach (var blocker in entity.GetAllComponents<IEffectBlocker>()) foreach (var blocker in entity.GetAllComponents<IEffectBlocker>())
{ {
canFall &= blocker.CanFall(); // Sets var to false if false canFall &= blocker.CanFall(); // Sets var to false if false
@@ -34,6 +27,7 @@ namespace Content.Shared.GameObjects.EntitySystems
public static bool CanSlip(IEntity entity) public static bool CanSlip(IEntity entity)
{ {
var canSlip = true; var canSlip = true;
foreach (var blocker in entity.GetAllComponents<IEffectBlocker>()) foreach (var blocker in entity.GetAllComponents<IEffectBlocker>())
{ {
canSlip &= blocker.CanSlip(); // Sets var to false if false canSlip &= blocker.CanSlip(); // Sets var to false if false

14
Content.Shared/GameObjects/EntitySystems/EffectBlocker/IEffectBlocker.cs Normal file
View File

@@ -0,0 +1,14 @@
using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
namespace Content.Shared.GameObjects.EntitySystems.EffectBlocker
{
/// <summary>
/// This interface gives components the ability to block certain effects
/// from affecting the owning entity. For actions see <see cref="IActionBlocker"/>
/// </summary>
public interface IEffectBlocker
{
bool CanFall() => true;
bool CanSlip() => true;
}
}

1
Content.Shared/GameObjects/EntitySystems/SharedStandingStateSystem.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;