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

почти важно (#135)

Browse Source 
* Add data field for id card microwave behaviour (#28087)

* Move replacement chance from ReplacementAccentComponent to ReplacementAccentPrototype (#28049)

Move replacement chance to ReplacementAccentPrototype

* Resolves Bible summon message being sent to all users (#28104)

* Changed PopupEntity overload used to ensure message is only sent to user

* Updated uid for PopupEntity call

* Updating _popupSystem.PopupEntity call in AttemptSummon

* Random book story generator refactor (#28082)

* Randomized book overhaul

* Fix prototype names

* Improved setting paper content

* Praise Ratvar

* Fix activatable UI popup message spam (#28123)

Fixed activatable UI popup message spam

* Modify battery assert to avoid floating point errors (#28007)

* Update component query benchmarks (#27967)

* Add more component query benchmarks.

* Rename benchmark

* Use non-generic `TryComp()` for metadata & transform (#28133)

* sleeper agent appear later into the round and only once (#28160)

---------

Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: double_b <40827162+benjamin-burges@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
This commit is contained in:
Jabak
2024-10-04 11:27:12 +03:00
committed by GitHub
parent 4c14eb3d3c
commit 381d904d4b
66 changed files with 652 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs
View File

@@ -30,8 +30,8 @@ public sealed partial class PathfindingSystem
if (end.GraphUid != start.GraphUid)
{
if (!TryComp<TransformComponent>(start.GraphUid, out var startXform) ||
!TryComp<TransformComponent>(end.GraphUid, out var endXform))
if (!TryComp(start.GraphUid, out TransformComponent? startXform) ||
!TryComp(end.GraphUid, out TransformComponent? endXform))
{
return Vector2.Zero;
}

2
Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
View File

@@ -261,7 +261,7 @@ public sealed partial class PathfindingSystem
private void OnBodyTypeChange(ref PhysicsBodyTypeChangedEvent ev)
{
if (TryComp<TransformComponent>(ev.Entity, out var xform) &&
if (TryComp(ev.Entity, out TransformComponent? xform) &&
xform.GridUid != null)
{
var aabb = _lookup.GetAABBNoContainer(ev.Entity, xform.Coordinates.Position, xform.LocalRotation);

10
Content.Server/NPC/Pathfinding/PathfindingSystem.cs
View File

@@ -264,7 +264,7 @@ namespace Content.Server.NPC.Pathfinding
int limit = 40,
PathFlags flags = PathFlags.None)
{
if (!TryComp<TransformComponent>(entity, out var start))
if (!TryComp(entity, out TransformComponent? start))
return new PathResultEvent(PathResult.NoPath, new List<PathPoly>());
var layer = 0;
@@ -294,7 +294,7 @@ namespace Content.Server.NPC.Pathfinding
CancellationToken cancelToken,
PathFlags flags = PathFlags.None)
{
if (!TryComp<TransformComponent>(entity, out var start))
if (!TryComp(entity, out TransformComponent? start))
return null;
var request = GetRequest(entity, start.Coordinates, end, range, cancelToken, flags);
@@ -325,8 +325,8 @@ namespace Content.Server.NPC.Pathfinding
CancellationToken cancelToken,
PathFlags flags = PathFlags.None)
{
if (!TryComp<TransformComponent>(entity, out var xform) ||
!TryComp<TransformComponent>(target, out var targetXform))
if (!TryComp(entity, out TransformComponent? xform) ||
!TryComp(target, out TransformComponent? targetXform))
return new PathResultEvent(PathResult.NoPath, new List<PathPoly>());
var request = GetRequest(entity, xform.Coordinates, targetXform.Coordinates, range, cancelToken, flags);
@@ -400,7 +400,7 @@ namespace Content.Server.NPC.Pathfinding
var gridUid = coordinates.GetGridUid(EntityManager);
if (!TryComp<GridPathfindingComponent>(gridUid, out var comp) ||
!TryComp<TransformComponent>(gridUid, out var xform))
!TryComp(gridUid, out TransformComponent? xform))
{
return null;
}

8
Content.Server/NPC/Systems/NPCUtilitySystem.cs
View File

@@ -260,8 +260,8 @@ public sealed class NPCUtilitySystem : EntitySystem
{
var radius = blackboard.GetValueOrDefault<float>(NPCBlackboard.VisionRadius, EntityManager);
if (!TryComp<TransformComponent>(targetUid, out var targetXform) ||
!TryComp<TransformComponent>(owner, out var xform))
if (!TryComp(targetUid, out TransformComponent? targetXform) ||
!TryComp(owner, out TransformComponent? xform))
{
return 0f;
}
@@ -308,8 +308,8 @@ public sealed class NPCUtilitySystem : EntitySystem
if (blackboard.TryGetValue<EntityUid>("Target", out var currentTarget, EntityManager) &&
currentTarget == targetUid &&
TryComp<TransformComponent>(owner, out var xform) &&
TryComp<TransformComponent>(targetUid, out var targetXform) &&
TryComp(owner, out TransformComponent? xform) &&
TryComp(targetUid, out TransformComponent? targetXform) &&
xform.Coordinates.TryDistance(EntityManager, _transform, targetXform.Coordinates, out var distance) &&
distance <= radius + bufferRange)
{