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

NPC utility queries (#15843)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-02 04:57:11 +10:00
committed by GitHub
parent ac5afa794e
commit ca07522c03
50 changed files with 873 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/NPC/Queries/Considerations/FoodValueCon.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Content.Server.NPC.Queries.Considerations;
public sealed class FoodValueCon : UtilityConsideration
{
}

9
Content.Server/NPC/Queries/Considerations/TargetAccessibleCon.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Content.Server.NPC.Queries.Considerations;
/// <summary>
/// Returns 1f if the target is freely accessible (e.g. not in locked storage).
/// </summary>
public sealed class TargetAccessibleCon : UtilityConsideration
{
}

6
Content.Server/NPC/Queries/Considerations/TargetDistanceCon.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Content.Server.NPC.Queries.Considerations;
public sealed class TargetDistanceCon : UtilityConsideration
{
}

6
Content.Server/NPC/Queries/Considerations/TargetHealthCon.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Content.Server.NPC.Queries.Considerations;
public sealed class TargetHealthCon : UtilityConsideration
{
}

9
Content.Server/NPC/Queries/Considerations/TargetInLOSCon.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Content.Server.NPC.Queries.Considerations;
/// <summary>
/// Returns whether the target is in line-of-sight.
/// </summary>
public sealed class TargetInLOSCon : UtilityConsideration
{
}

9
Content.Server/NPC/Queries/Considerations/TargetInLOSOrCurrentCon.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Content.Server.NPC.Queries.Considerations;
/// <summary>
/// Placeholder considerations -> returns 1f if they're in LOS or the current target.
/// </summary>
public sealed class TargetInLOSOrCurrentCon : UtilityConsideration
{
}

9
Content.Server/NPC/Queries/Considerations/TargetIsAliveCon.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Content.Server.NPC.Queries.Considerations;
/// <summary>
/// Returns 1f if the target is alive or 0f if not.
/// </summary>
public sealed class TargetIsAliveCon : UtilityConsideration
{
}

9
Content.Server/NPC/Queries/Considerations/TargetIsCritCon.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Content.Server.NPC.Queries.Considerations;
/// <summary>
/// Returns 1f if the target is crit or 0f if not.
/// </summary>
public sealed class TargetIsCritCon : UtilityConsideration
{
}

9
Content.Server/NPC/Queries/Considerations/TargetIsDeadCon.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Content.Server.NPC.Queries.Considerations;
/// <summary>
/// Returns 1f if the target is dead or 0f if not.
/// </summary>
public sealed class TargetIsDeadCon : UtilityConsideration
{
}

11
Content.Server/NPC/Queries/Considerations/UtilityConsideration.cs Normal file
View File

@@ -0,0 +1,11 @@
using Content.Server.NPC.Queries.Curves;
using JetBrains.Annotations;
namespace Content.Server.NPC.Queries.Considerations;
[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
public abstract class UtilityConsideration
{
[DataField("curve", required: true)]
public IUtilityCurve Curve = default!;
}

5
Content.Server/NPC/Queries/Curves/BoolCurve.cs Normal file
View File

@@ -0,0 +1,5 @@
namespace Content.Server.NPC.Queries.Curves;
public sealed class BoolCurve : IUtilityCurve
{
}

7
Content.Server/NPC/Queries/Curves/IUtilityCurve.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace Content.Server.NPC.Queries.Curves;
[ImplicitDataDefinitionForInheritors]
public interface IUtilityCurve
{
}

6
Content.Server/NPC/Queries/Curves/InverseBoolCurve.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Content.Server.NPC.Queries.Curves;
public sealed class InverseBoolCurve : IUtilityCurve
{
}

8
Content.Server/NPC/Queries/Curves/PresetCurve.cs Normal file
View File

@@ -0,0 +1,8 @@
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
namespace Content.Server.NPC.Queries.Curves;
public sealed class PresetCurve : IUtilityCurve
{
[DataField("preset", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<UtilityCurvePresetPrototype>))] public readonly string Preset = default!;
}

12
Content.Server/NPC/Queries/Curves/QuadraticCurve.cs Normal file
View File

@@ -0,0 +1,12 @@
namespace Content.Server.NPC.Queries.Curves;
public sealed class QuadraticCurve : IUtilityCurve
{
[DataField("slope")] public readonly float Slope;
[DataField("exponent")] public readonly float Exponent;
[DataField("yOffset")] public readonly float YOffset;
[DataField("xOffset")] public readonly float XOffset;
}

11
Content.Server/NPC/Queries/Curves/UtilityCurvePresetPrototype.cs Normal file
View File

@@ -0,0 +1,11 @@
using Robust.Shared.Prototypes;
namespace Content.Server.NPC.Queries.Curves;
[Prototype("utilityCurvePreset")]
public sealed class UtilityCurvePresetPrototype : IPrototype
{
[IdDataField] public string ID { get; } = string.Empty;
[DataField("curve", required: true)] public IUtilityCurve Curve = default!;
}

6
Content.Server/NPC/Queries/Queries/ClothingSlotFilter.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Content.Server.NPC.Queries.Queries;
public sealed class ClothingSlotFilter : UtilityQueryFilter
{
}

12
Content.Server/NPC/Queries/Queries/ComponentQuery.cs Normal file
View File

@@ -0,0 +1,12 @@
using Robust.Shared.Prototypes;
namespace Content.Server.NPC.Queries.Queries;
/// <summary>
/// Returns nearby components that match the specified components.
/// </summary>
public sealed class ComponentQuery : UtilityQuery
{
[DataField("components", required: true)]
public EntityPrototype.ComponentRegistry Components = default!;
}

9
Content.Server/NPC/Queries/Queries/NearbyComponentsQuery.cs Normal file
View File

@@ -0,0 +1,9 @@
using Robust.Shared.Prototypes;
namespace Content.Server.NPC.Queries.Queries;
public sealed class NearbyComponentsQuery : UtilityQuery
{
[DataField("components")]
public EntityPrototype.ComponentRegistry Component = default!;
}

9
Content.Server/NPC/Queries/Queries/NearbyHostilesQuery.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Content.Server.NPC.Queries.Queries;
/// <summary>
/// Returns nearby entities considered hostile from <see cref="FactionSystem"/>
/// </summary>
public sealed class NearbyHostilesQuery : UtilityQuery
{
}

6
Content.Server/NPC/Queries/Queries/PuddlesQuery.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Content.Server.NPC.Queries.Queries;
public sealed class PuddlesQuery : UtilityQuery
{
}

10
Content.Server/NPC/Queries/Queries/UtilityQuery.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace Content.Server.NPC.Queries.Queries;
/// <summary>
/// Adds entities to a query.
/// </summary>
[ImplicitDataDefinitionForInheritors]
public abstract class UtilityQuery
{
}

9
Content.Server/NPC/Queries/Queries/UtilityQueryFilter.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Content.Server.NPC.Queries.Queries;
/// <summary>
/// Removes entities from a query.
/// </summary>
public abstract class UtilityQueryFilter : UtilityQuery
{
}

29
Content.Server/NPC/Queries/UtilityQueryPrototype.cs Normal file
View File

@@ -0,0 +1,29 @@
using Content.Server.NPC.Queries.Considerations;
using Content.Server.NPC.Queries.Queries;
using Robust.Shared.Prototypes;
namespace Content.Server.NPC.Queries;
/// <summary>
/// Stores data for generic queries.
/// Each query is run in turn to get the final available results.
/// These results are then run through the considerations.
/// </summary>
[Prototype("utilityQuery")]
public sealed class UtilityQueryPrototype : IPrototype
{
[IdDataField]
public string ID { get; } = default!;
[ViewVariables(VVAccess.ReadWrite), DataField("query")]
public List<UtilityQuery> Query = new();
[ViewVariables(VVAccess.ReadWrite), DataField("considerations")]
public List<UtilityConsideration> Considerations = new();
/// <summary>
/// How many entities we are allowed to consider. This is applied after all queries have run.
/// </summary>
[DataField("limit")]
public int Limit = 128;
}

34
Content.Server/NPC/Queries/UtilityService.cs Normal file
View File

@@ -0,0 +1,34 @@
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
namespace Content.Server.NPC.Queries;
/// <summary>
/// Utility queries that run regularly to update an NPC without re-doing their thinking logic.
/// </summary>
[DataDefinition]
public sealed class UtilityService
{
/// <summary>
/// Identifier to use for this service. This is used to track its cooldown.
/// </summary>
[DataField("id", required: true)]
public string ID = string.Empty;
/// <summary>
/// Prototype of the utility query.
/// </summary>
[DataField("proto", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<UtilityQueryPrototype>))]
public string Prototype = string.Empty;
[DataField("minCooldown")]
public float MinCooldown = 0.25f;
[DataField("maxCooldown")]
public float MaxCooldown = 0.60f;
/// <summary>
/// Key to update with the utility query.
/// </summary>
[DataField("key", required: true)]
public string Key = string.Empty;
}