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

Update content vectors to numerics (#17759)

Browse Source
This commit is contained in:
metalgearsloth
2023-07-08 14:08:32 +10:00
committed by GitHub
parent 15772478c9
commit 68480af109
383 changed files with 978 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Linq;
using System.Numerics;
using Content.Server.Administration.Commands;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking.Rules.Components;
@@ -640,7 +641,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
component.NukieOutpost = outpostGrids[0];
// Listen I just don't want it to overlap.
if (!_map.TryLoad(mapId, shuttlePath.ToString(), out var grids, new MapLoadOptions {Offset = Vector2.One*1000f}) || !grids.Any())
if (!_map.TryLoad(mapId, shuttlePath.ToString(), out var grids, new MapLoadOptions {Offset = Vector2.One * 1000f}) || !grids.Any())
{
Logger.ErrorS("nukies", $"Error loading grid {shuttlePath} for nukies!");
return false;

6
Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Linq;
using System.Numerics;
using Content.Server.Administration.Commands;
using Content.Server.Cargo.Systems;
using Content.Server.Chat.Managers;
@@ -160,9 +161,12 @@ public sealed class PiratesRuleSystem : GameRuleSystem<PiratesRuleComponent>
aabb.Union(aabbs[i]);
}
// (Not commented?)
var a = MathF.Max(aabb.Height / 2f, aabb.Width / 2f) * 2.5f;
var gridId = _map.LoadGrid(GameTicker.DefaultMap, map, new MapLoadOptions
{
Offset = aabb.Center + MathF.Max(aabb.Height / 2f, aabb.Width / 2f) * 2.5f
Offset = aabb.Center + new Vector2(a, a),
});
if (!gridId.HasValue)