GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename runtime entity blueprint projector

Browse source
This commit is contained in:
Meta Vens 2026-06-13 19:12:56 +01:00
commit a9abfe0c68
9 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Assets/Scripts/Gameplay/ActionGameManager.cs
View file

@ -754,7 +754,7 @@ public class ActionGameManager : MonoBehaviour
nearestFaction,
.5f);
var turret = EntitySerializer.InstantiateFromBlueprint(ItemManager, Zone, loadoutGenerator.GenerateTurretLoadout(), true);
var turret = RuntimeEntityBlueprintProjector.InstantiateFromBlueprint(ItemManager, Zone, loadoutGenerator.GenerateTurretLoadout(), true);
turret.Position.xz = _currentEntity.Position.xz +
ItemManager.Random.NextFloat2Direction() * ItemManager.Random.NextFloat(50, 500);
turret.Zone = Zone;
@ -786,7 +786,7 @@ public class ActionGameManager : MonoBehaviour
//
// for (int i = 0; i < 8; i++)
// {
// var ship = EntitySerializer.InstantiateFromBlueprint(ItemManager, Zone, loadoutGenerator.GenerateShipLoadout(), true);
// var ship = RuntimeEntityBlueprintProjector.InstantiateFromBlueprint(ItemManager, Zone, loadoutGenerator.GenerateShipLoadout(), true);
// ship.Position.xz = _currentEntity.Position.xz +
// ItemManager.Random.NextFloat2Direction() * ItemManager.Random.NextFloat(50, 500);
// ship.Zone = Zone;
@ -796,7 +796,7 @@ public class ActionGameManager : MonoBehaviour
//
// for (int i = 0; i < 8; i++)
// {
// var turret = EntitySerializer.InstantiateFromBlueprint(ItemManager, Zone, loadoutGenerator.GenerateTurretLoadout(), true);
// var turret = RuntimeEntityBlueprintProjector.InstantiateFromBlueprint(ItemManager, Zone, loadoutGenerator.GenerateTurretLoadout(), true);
// turret.Position.xz = _currentEntity.Position.xz +
// ItemManager.Random.NextFloat2Direction() * ItemManager.Random.NextFloat(50, 500);
// turret.Zone = Zone;
@ -961,12 +961,12 @@ public class ActionGameManager : MonoBehaviour
SectorMap.QueueZoneReveal(CurrentGalaxy.Entrance.AdjacentZones.Prepend(CurrentGalaxy.Entrance));
PopulateLevel(CurrentGalaxy.Entrance);
var loadoutGenerator = new LoadoutGenerator(ref ItemManager.Random, ItemManager, RuntimeCatalog, CurrentGalaxy, Zone.GalaxyZone, IsTutorial ? CurrentGalaxy.ResolveFaction(Settings.TutorialGenerationSettings.ProtagonistFaction) : null, 2);
var ship = EntitySerializer.InstantiateFromBlueprint(
var ship = RuntimeEntityBlueprintProjector.InstantiateFromBlueprint(
ItemManager,
Zone,
loadoutGenerator.GenerateShipLoadout(data => string.IsNullOrEmpty(Settings.StartingHullName) || data.Name==Settings.StartingHullName ),
true);
// EntitySerializer.InstantiateFromBlueprint(ItemManager, Zone, LoadoutBlueprints.First(x => x.Name == StarterShipTemplate), true);
// RuntimeEntityBlueprintProjector.InstantiateFromBlueprint(ItemManager, Zone, LoadoutBlueprints.First(x => x.Name == StarterShipTemplate), true);
((Ship) ship).IsPlayerShip = true;
ship.Position = float3.zero;
ship.Zone = Zone;

6
Assets/Scripts/ServerShared/LoadoutGenerator.cs
View file

@ -61,7 +61,7 @@ public class LoadoutGenerator
var entity = new Ship(ItemManager, null, hull, ItemManager.GameplaySettings.DefaultEntitySettings);
entity.Faction = Faction;
OutfitEntity(entity);
return EntitySerializer.CaptureBlueprint(entity);
return RuntimeEntityBlueprintProjector.CaptureBlueprint(entity);
}
public RuntimeOrbitalEntityBlueprint GenerateTurretLoadout()
@ -76,7 +76,7 @@ public class LoadoutGenerator
var entity = new OrbitalEntity(ItemManager, null, hull, Guid.Empty, ItemManager.GameplaySettings.DefaultEntitySettings);
entity.Faction = Faction;
OutfitEntity(entity);
return EntitySerializer.CaptureBlueprint(entity) as RuntimeOrbitalEntityBlueprint;
return RuntimeEntityBlueprintProjector.CaptureBlueprint(entity) as RuntimeOrbitalEntityBlueprint;
}
public RuntimeOrbitalEntityBlueprint GenerateStationLoadout()
@ -119,7 +119,7 @@ public class LoadoutGenerator
entity.CanTow = hullData.CanTow;
return EntitySerializer.CaptureBlueprint(entity) as RuntimeOrbitalEntityBlueprint;
return RuntimeEntityBlueprintProjector.CaptureBlueprint(entity) as RuntimeOrbitalEntityBlueprint;
}
public HullData RandomHull(HullType type, Predicate<HullData> hullFilter = null)

2
Assets/Scripts/ServerShared/EntitySerializer.cs → Assets/Scripts/ServerShared/RuntimeEntityBlueprintProjector.cs
View file

@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.Linq;
using Unity.Mathematics;
public static class EntitySerializer
public static class RuntimeEntityBlueprintProjector
{
public static RuntimeEntityBlueprint CaptureBlueprint(Entity entity)
{

0
Assets/Scripts/ServerShared/EntitySerializer.cs.meta → Assets/Scripts/ServerShared/RuntimeEntityBlueprintProjector.cs.meta
View file

4
Assets/Scripts/ServerShared/Zone.cs
View file

@ -81,7 +81,7 @@ public class Zone
foreach (var entityBlueprint in blueprint.Entities)
{
var entity = EntitySerializer.InstantiateFromBlueprint(_itemManager, this, entityBlueprint);
var entity = RuntimeEntityBlueprintProjector.InstantiateFromBlueprint(_itemManager, this, entityBlueprint);
Entities.Add(entity);
entity.Activate();
if (entity is Ship {IsPlayerShip: false} ship)
@ -110,7 +110,7 @@ public class Zone
{
Radius = Blueprint.Radius,
Mass = Blueprint.Mass,
Entities = Entities.Select(EntitySerializer.CaptureBlueprint).ToList(),
Entities = Entities.Select(RuntimeEntityBlueprintProjector.CaptureBlueprint).ToList(),
Orbits = Orbits.Values.Select(o=>o.Data).ToList(),
Planets = Planets.Values.ToList(),
Time = _time

4
Assets/Scripts/UI/Menu/InventoryPanel.cs
View file

@ -170,7 +170,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
ContextMenu.AddOption("Save Loadout",
() =>
{
GameManager.QueueRuntimeLoadoutTemplateCommit(EntitySerializer.CaptureBlueprint(_displayedEntity));
GameManager.QueueRuntimeLoadoutTemplateCommit(RuntimeEntityBlueprintProjector.CaptureBlueprint(_displayedEntity));
});
if (GameManager.LoadoutBlueprints.Any())
@ -180,7 +180,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
(
$"{blueprint.Name} - {blueprint.Price(GameManager.ItemManager):n0}", () =>
{
var entity = EntitySerializer.InstantiateFromBlueprint(GameManager.ItemManager, GameManager.Zone, blueprint, true);
var entity = RuntimeEntityBlueprintProjector.InstantiateFromBlueprint(GameManager.ItemManager, GameManager.Zone, blueprint, true);
entity.SetParent(GameManager.DockedEntity);
GameManager.Credits -= blueprint.Price(GameManager.ItemManager);
GameManager.CurrentEntity = entity;