Treat zone details as managed facts
This commit is contained in:
parent
e58cc2a5e8
commit
0e10805e33
4 changed files with 71 additions and 67 deletions
|
|
@ -1226,7 +1226,7 @@ public class DaemonRuntimeDocumentTests
|
|||
}
|
||||
|
||||
[Test]
|
||||
public void ZoneDetailsProjectionReadsMassRadiusAndContentsFromDaemonZone()
|
||||
public void ZoneDetailsFactsReadMassRadiusAndContentsFromDaemonZone()
|
||||
{
|
||||
var zone = new AetheriaRuntimeZoneSnapshotCommit
|
||||
{
|
||||
|
|
@ -1245,23 +1245,23 @@ public class DaemonRuntimeDocumentTests
|
|||
}
|
||||
};
|
||||
|
||||
var projection = AetheriaRuntimeZoneDetailsSurfaceBuilder.ProjectDaemonZone(
|
||||
var facts = AetheriaRuntimeZoneDetailsSurfaceBuilder.Facts(
|
||||
zone,
|
||||
key => key == "station-hull" ? "Station" : "Ship");
|
||||
var state = AetheriaRuntimeZoneDetailsSurfaceBuilder.Project(
|
||||
var state = AetheriaRuntimeZoneDetailsSurfaceBuilder.Compose(
|
||||
zone.Name,
|
||||
"GameCult",
|
||||
projection.Mass.ToString("0"),
|
||||
projection.Radius.ToString("0"),
|
||||
facts.Mass.ToString("0"),
|
||||
facts.Radius.ToString("0"),
|
||||
new[] { "A", "B" },
|
||||
projection.Bodies,
|
||||
projection.Entities,
|
||||
projection.HasContents,
|
||||
facts.Bodies,
|
||||
facts.Entities,
|
||||
facts.HasContents,
|
||||
"");
|
||||
|
||||
Assert.AreEqual(40, projection.Mass, 0.0001);
|
||||
Assert.AreEqual(420, projection.Radius, 0.0001);
|
||||
Assert.IsTrue(projection.HasContents);
|
||||
Assert.AreEqual(40, facts.Mass, 0.0001);
|
||||
Assert.AreEqual(420, facts.Radius, 0.0001);
|
||||
Assert.IsTrue(facts.HasContents);
|
||||
Assert.AreEqual("1", state.Planets);
|
||||
Assert.AreEqual("1", state.GasGiants);
|
||||
Assert.AreEqual("1", state.AsteroidBelts);
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS
|
|||
transform,
|
||||
_zoneDetailsSurfaceDocument,
|
||||
"Aetheria Sector Zone Details Surface",
|
||||
AetheriaRuntimeZoneDetailsSurfaceBuilder.Build(ProjectZoneDetailsSurfaceState(zoneIndex)),
|
||||
AetheriaRuntimeZoneDetailsSurfaceBuilder.Build(ComposeZoneDetailsSurfaceState(zoneIndex)),
|
||||
HandleZoneDetailsSurfaceCommand,
|
||||
_zoneDetailsSurfaceChrome);
|
||||
}
|
||||
|
|
@ -128,7 +128,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS
|
|||
AetheriaEveUnitySurfaceHost.Hide(_zoneDetailsSurfaceDocument);
|
||||
}
|
||||
|
||||
private AetheriaRuntimeZoneDetailsSurfaceState ProjectZoneDetailsSurfaceState(int zoneIndex)
|
||||
private AetheriaRuntimeZoneDetailsSurfaceState ComposeZoneDetailsSurfaceState(int zoneIndex)
|
||||
{
|
||||
var sectorZone = ResolveSectorZone(zoneIndex);
|
||||
var zoneDetails = ResolveZoneDetails(zoneIndex);
|
||||
|
|
@ -139,18 +139,18 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS
|
|||
.Select(FormatFaction)
|
||||
.ToArray();
|
||||
|
||||
var daemonProjection = AetheriaRuntimeZoneDetailsSurfaceBuilder.ProjectDaemonZone(
|
||||
var zoneFacts = AetheriaRuntimeZoneDetailsSurfaceBuilder.Facts(
|
||||
zoneDetails,
|
||||
ResolveHullType);
|
||||
return AetheriaRuntimeZoneDetailsSurfaceBuilder.Project(
|
||||
return AetheriaRuntimeZoneDetailsSurfaceBuilder.Compose(
|
||||
ResolveZoneName(sectorZone, zoneDetails),
|
||||
ownerFactionIndex >= 0 ? FormatFaction(ownerFactionIndex) : "None",
|
||||
FormatValue((float)daemonProjection.Mass),
|
||||
FormatValue((float)daemonProjection.Radius),
|
||||
FormatValue((float)zoneFacts.Mass),
|
||||
FormatValue((float)zoneFacts.Radius),
|
||||
otherFactions,
|
||||
daemonProjection.Bodies,
|
||||
daemonProjection.Entities,
|
||||
daemonProjection.HasContents,
|
||||
zoneFacts.Bodies,
|
||||
zoneFacts.Entities,
|
||||
zoneFacts.HasContents,
|
||||
updatedAtUtc: DateTime.UtcNow.ToString("O"));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue