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

Merge branch 'master' into 20-06-24-movement-prediction

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-06-24 04:04:43 +02:00
parent da45a52325 78085855db
commit f3a816321c
2259 changed files with 16436 additions and 11772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/AI/Operators/AiOperator.cs
View File

@@ -5,6 +5,7 @@ namespace Content.Server.AI.Operators
{
public abstract class AiOperator
{
public bool HasStartup => _hasStartup;
private bool _hasStartup = false;
private bool _hasShutdown = false;

100
Content.Server/AI/Operators/Combat/Ranged/ShootAtEntityOperator.cs
View File

@@ -1,100 +0,0 @@
using Content.Server.GameObjects;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Movement;
using Content.Server.GameObjects.Components.Weapon.Ranged;
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Server.AI.Operators.Combat.Ranged
{
public class ShootAtEntityOperator : AiOperator
{
private IEntity _owner;
private IEntity _target;
private float _accuracy;
private float _burstTime;
private float _elapsedTime;
public ShootAtEntityOperator(IEntity owner, IEntity target, float accuracy, float burstTime = 0.5f)
{
_owner = owner;
_target = target;
_accuracy = accuracy;
_burstTime = burstTime;
}
public override bool TryStartup()
{
if (!base.TryStartup())
{
return true;
}
if (!_owner.TryGetComponent(out CombatModeComponent combatModeComponent))
{
return false;
}
if (!combatModeComponent.IsInCombatMode)
{
combatModeComponent.IsInCombatMode = true;
}
return true;
}
public override void Shutdown(Outcome outcome)
{
base.Shutdown(outcome);
if (_owner.TryGetComponent(out CombatModeComponent combatModeComponent))
{
combatModeComponent.IsInCombatMode = false;
}
}
public override Outcome Execute(float frameTime)
{
// TODO: Probably just do all the checks on first try and then after that repeat the fire.
if (_burstTime <= _elapsedTime)
{
return Outcome.Success;
}
_elapsedTime += frameTime;
if (_target.TryGetComponent(out DamageableComponent damageableComponent))
{
if (damageableComponent.IsDead())
{
return Outcome.Success;
}
}
if (!_owner.TryGetComponent(out HandsComponent hands) || hands.GetActiveHand == null)
{
return Outcome.Failed;
}
var equippedWeapon = hands.GetActiveHand.Owner;
if ((_target.Transform.GridPosition.Position - _owner.Transform.GridPosition.Position).Length >
_owner.GetComponent<AiControllerComponent>().VisionRadius)
{
// Not necessarily a hard fail, more of a soft fail
return Outcome.Failed;
}
// Unless RangedWeaponComponent is removed from hitscan weapons this shouldn't happen
if (!equippedWeapon.TryGetComponent(out RangedWeaponComponent rangedWeaponComponent))
{
return Outcome.Failed;
}
// TODO: Accuracy
rangedWeaponComponent.AiFire(_owner, _target.Transform.GridPosition);
return Outcome.Continuing;
}
}
}

41
Content.Server/AI/Operators/Combat/Ranged/WaitForHitscanChargeOperator.cs
View File

@@ -1,41 +0,0 @@
using System;
using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan;
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Server.AI.Operators.Combat.Ranged
{
public class WaitForHitscanChargeOperator : AiOperator
{
private float _lastCharge = 0.0f;
private float _lastFill = 0.0f;
private HitscanWeaponComponent _hitscan;
public WaitForHitscanChargeOperator(IEntity entity)
{
if (!entity.TryGetComponent(out HitscanWeaponComponent hitscanWeaponComponent))
{
throw new InvalidOperationException();
}
_hitscan = hitscanWeaponComponent;
}
public override Outcome Execute(float frameTime)
{
if (_hitscan.CapacitorComponent.Capacity - _hitscan.CapacitorComponent.Charge < 0.01f)
{
return Outcome.Success;
}
// If we're not charging then just stop
_lastFill = _hitscan.CapacitorComponent.Charge - _lastCharge;
_lastCharge = _hitscan.CapacitorComponent.Charge;
if (_lastFill == 0.0f)
{
return Outcome.Failed;
}
return Outcome.Continuing;
}
}
}

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

@@ -21,7 +21,7 @@ namespace Content.Server.AI.Operators.Inventory
/// <returns></returns>
public override Outcome Execute(float frameTime)
{
if (!_owner.TryGetComponent(out HandsComponent handsComponent))
if (!_owner.TryGetComponent(out HandsComponent handsComponent) || handsComponent.FindHand(_entity) == null)
{
return Outcome.Failed;
}

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

@@ -3,6 +3,7 @@ using Content.Server.AI.WorldState.States.Inventory;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Utility;
using Content.Shared.GameObjects.EntitySystems;
using Robust.Shared.Containers;
using Robust.Shared.Interfaces.GameObjects;
@@ -24,15 +25,15 @@ namespace Content.Server.AI.Operators.Inventory
public override Outcome Execute(float frameTime)
{
if (!InteractionChecks.InRangeUnobstructed(_owner, _target.Transform.MapPosition))
{
return Outcome.Failed;
}
if (!ContainerHelpers.TryGetContainer(_target, out var container))
{
return Outcome.Success;
}
if (!InteractionChecks.InRangeUnobstructed(_owner, container.Owner.Transform.MapPosition, ignoredEnt: container.Owner))
{
return Outcome.Failed;
}
if (!container.Owner.TryGetComponent(out EntityStorageComponent storageComponent) ||
storageComponent.IsWeldedShut)

4
Content.Server/AI/Operators/Movement/BaseMover.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Threading;
using Content.Server.GameObjects.Components.Access;
using Content.Server.GameObjects.Components.Movement;
using Content.Server.GameObjects.EntitySystems.AI.Pathfinding;
using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
@@ -240,10 +241,11 @@ namespace Content.Server.AI.Operators.Movement
var startGrid = _mapManager.GetGrid(Owner.Transform.GridID).GetTileRef(Owner.Transform.GridPosition);
var endGrid = _mapManager.GetGrid(TargetGrid.GridID).GetTileRef(TargetGrid);;
// _routeCancelToken = new CancellationTokenSource();
var access = AccessReader.FindAccessTags(Owner);
RouteJob = _pathfinder.RequestPath(new PathfindingArgs(
Owner.Uid,
access,
collisionMask,
startGrid,
endGrid,