Make Saltern driveable (#4257)

* Broadphase refactor (content)

* Shuttle jank

* Fixes

* Testing jank

* Features and things

* Balance stuffsies

* AHHHHHHHHHHHHHHHH

* Mass and stuff working

* Fix drops

* Another balance pass

* Balance AGEN

* Add in stuff for rotating shuttles for debugging

* Nothing to see here

* Testbed stuffsies

* Fix some tests

* Fixen test

* Try fixing map

* Shuttle movement balance pass

* lasaggne

* Basic Helmsman console working

* Slight docking cleanup

* Helmsman requires power

* Basic shuttle test

* Stuff

* Fix computations

* Add shuttle console to saltern

* Rename helmsman to shuttleconsole

* Final stretch

* More tweaks

* Fix piloting prediction for now.
This commit is contained in:
metalgearsloth
2021-07-21 21:15:12 +10:00
committed by GitHub
parent 55087a6f16
commit 500b9cb1ea
44 changed files with 1042 additions and 1601 deletions

View File

@@ -126,8 +126,7 @@ namespace Content.IntegrationTests.Tests.Doors
server.Assert(() =>
{
var mapId = new MapId(1);
mapManager.CreateNewMapEntity(mapId);
var mapId = mapManager.CreateMap();
var humanCoordinates = new MapCoordinates((physicsDummyStartingX, 0), mapId);
physicsDummy = entityManager.SpawnEntity("PhysicsDummy", humanCoordinates);
@@ -159,6 +158,7 @@ namespace Content.IntegrationTests.Tests.Doors
// Sanity check
// Sloth: Okay I'm sorry but I hate having to rewrite tests for every refactor
// If you see this yell at me in discord so I can continue to pretend this didn't happen.
// REMINDER THAT I STILL HAVE TO FIX THIS TEST EVERY OTHER PHYSICS PR
// Assert.That(physicsDummy.Transform.MapPosition.X, Is.GreaterThan(physicsDummyStartingX));
// Blocked by the airlock

View File

@@ -27,12 +27,12 @@ namespace Content.IntegrationTests.Tests
var mapLoader = server.ResolveDependency<IMapLoader>();
var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>();
var resManager = server.ResolveDependency<IResourceManager>();
server.Post(() =>
{
var dir = new ResourcePath(mapPath).Directory;
IoCManager.Resolve<IResourceManager>()
.UserData.CreateDir(dir);
resManager.UserData.CreateDir(dir);
var mapId = mapManager.CreateMap(new MapId(5));

View File

@@ -0,0 +1,49 @@
#nullable enable
using System.Threading.Tasks;
using Content.Server.Shuttles;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
namespace Content.IntegrationTests.Tests
{
[TestFixture]
public class ShuttleTest : ContentIntegrationTest
{
[Test]
public async Task Test()
{
var server = StartServer();
await server.WaitIdleAsync();
var entMan = server.ResolveDependency<IEntityManager>();
var mapMan = server.ResolveDependency<IMapManager>();
IEntity? gridEnt = null;
await server.WaitAssertion(() =>
{
var mapId = mapMan.CreateMap();
var grid = mapMan.CreateGrid(mapId);
gridEnt = entMan.GetEntity(grid.GridEntityId);
Assert.That(gridEnt.TryGetComponent(out ShuttleComponent? shuttleComponent));
Assert.That(gridEnt.TryGetComponent(out PhysicsComponent? physicsComponent));
Assert.That(physicsComponent!.BodyType, Is.EqualTo(BodyType.Dynamic));
Assert.That(gridEnt.Transform.LocalPosition, Is.EqualTo(Vector2.Zero));
physicsComponent.ApplyLinearImpulse(Vector2.One);
});
// TODO: Should have tests that collision + rendertree + pointlights work on a moved grid but I'll deal with that
// when we get rotations.
await server.WaitRunTicks(1);
await server.WaitAssertion(() =>
{
Assert.That(gridEnt?.Transform.LocalPosition, Is.Not.EqualTo(Vector2.Zero));
});
}
}
}

View File

@@ -5,6 +5,7 @@ using Content.Shared.Spawning;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Broadphase;
namespace Content.IntegrationTests.Tests.Utility
@@ -39,7 +40,7 @@ namespace Content.IntegrationTests.Tests.Utility
var sMapManager = server.ResolveDependency<IMapManager>();
var sEntityManager = server.ResolveDependency<IEntityManager>();
var broady = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<SharedBroadPhaseSystem>();
var broady = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<SharedBroadphaseSystem>();
await server.WaitAssertion(() =>
{