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

Merge branch 'master' into buckle-locker-fix-1262

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-07 00:20:07 +02:00
parent abfe86be81 c78ce3e27a
commit b850ac2437
267 changed files with 3520 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs
View File

@@ -2,6 +2,7 @@ using Content.Server.GameObjects;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Weapon.Melee;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.EntitySystems.Click;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
@@ -28,7 +29,7 @@ namespace Content.Server.AI.Operators.Combat.Melee
{
return true;
}
if (!_owner.TryGetComponent(out CombatModeComponent combatModeComponent))
{
return false;
@@ -41,7 +42,7 @@ namespace Content.Server.AI.Operators.Combat.Melee
return true;
}
public override void Shutdown(Outcome outcome)
{
base.Shutdown(outcome);

7
Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs
View File

@@ -2,6 +2,7 @@ using Content.Server.GameObjects;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Weapon.Melee;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.EntitySystems.Click;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
@@ -29,7 +30,7 @@ namespace Content.Server.AI.Operators.Combat.Melee
{
return true;
}
if (!_owner.TryGetComponent(out CombatModeComponent combatModeComponent))
{
return false;
@@ -39,7 +40,7 @@ namespace Content.Server.AI.Operators.Combat.Melee
{
combatModeComponent.IsInCombatMode = true;
}
if (_owner.TryGetComponent(out UnarmedCombatComponent unarmedCombatComponent))
{
_unarmedCombat = unarmedCombatComponent;
@@ -85,4 +86,4 @@ namespace Content.Server.AI.Operators.Combat.Melee
return Outcome.Continuing;
}
}
}
}

13
Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs
View File

@@ -1,8 +1,7 @@
using Content.Server.AI.Utility;
using Content.Server.AI.WorldState.States.Inventory;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.GameObjects.Components.Interaction;
using Content.Server.Utility;
using Robust.Shared.Interfaces.GameObjects;
@@ -28,7 +27,7 @@ namespace Content.Server.AI.Operators.Inventory
{
return true;
}
var blackboard = UtilityAiHelpers.GetBlackboard(_owner);
if (blackboard == null)
@@ -37,7 +36,7 @@ namespace Content.Server.AI.Operators.Inventory
}
_target = blackboard.GetState<LastOpenedStorageState>().GetValue();
return _target != null;
}
@@ -56,12 +55,12 @@ namespace Content.Server.AI.Operators.Inventory
return Outcome.Failed;
}
if (!_target.TryGetComponent(out EntityStorageComponent storageComponent) ||
if (!_target.TryGetComponent(out EntityStorageComponent storageComponent) ||
storageComponent.IsWeldedShut)
{
return Outcome.Failed;
}
if (storageComponent.Open)
{
var activateArgs = new ActivateEventArgs {User = _owner, Target = _target};
@@ -71,4 +70,4 @@ namespace Content.Server.AI.Operators.Inventory
return Outcome.Success;
}
}
}
}

2
Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs
View File

@@ -1,5 +1,5 @@
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.EntitySystems.Click;
using Content.Server.Utility;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;

17
Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs
View File

@@ -1,8 +1,7 @@
using Content.Server.AI.Utility;
using Content.Server.AI.WorldState.States.Inventory;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.GameObjects.Components.Interaction;
using Content.Server.Utility;
using Content.Shared.GameObjects.EntitySystems;
using Robust.Shared.Containers;
@@ -17,13 +16,13 @@ namespace Content.Server.AI.Operators.Inventory
{
private readonly IEntity _owner;
private readonly IEntity _target;
public OpenStorageOperator(IEntity owner, IEntity target)
{
_owner = owner;
_target = target;
}
public override Outcome Execute(float frameTime)
{
if (!ContainerHelpers.TryGetContainer(_target, out var container))
@@ -36,22 +35,22 @@ namespace Content.Server.AI.Operators.Inventory
return Outcome.Failed;
}
if (!container.Owner.TryGetComponent(out EntityStorageComponent storageComponent) ||
if (!container.Owner.TryGetComponent(out EntityStorageComponent storageComponent) ||
storageComponent.IsWeldedShut)
{
return Outcome.Failed;
}
if (!storageComponent.Open)
{
var activateArgs = new ActivateEventArgs {User = _owner, Target = _target};
storageComponent.Activate(activateArgs);
}
var blackboard = UtilityAiHelpers.GetBlackboard(_owner);
blackboard?.GetState<LastOpenedStorageState>().SetValue(container.Owner);
return Outcome.Success;
}
}
}
}

3
Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs
View File

@@ -1,6 +1,5 @@
using Content.Server.GameObjects;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.EntitySystems.Click;
using Content.Server.Utility;
using Robust.Shared.Containers;
using Robust.Shared.Interfaces.GameObjects;

2
Content.Server/AI/Operators/Inventory/UseItemInHandsOperator.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.AI.Operators.Inventory
return Outcome.Failed;
}
if (_target.TryGetComponent(out ItemComponent itemComponent))
if (!_target.TryGetComponent(out ItemComponent itemComponent))
{
return Outcome.Failed;
}