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

Save/Load and Main Menu Submenus

Browse source 
Redid all of the property panel UI prefabs (oof)
Implemented saving and loading of the game state
Moved sector generation to sector constructor (along with loading from save file)
Entity settings now separate from player settings
Player settings (incl. saved run) now statically accessible from game manager
Added animations and submenus to the main menu
Unified main menu settings and properties panel styles for prefab reusability
This commit is contained in:
Reinier Vens 2021-03-14 03:56:49 +00:00
commit b6828a975a
63 changed files with 2007 additions and 1158 deletions
Download patch file Download diff file Expand all files Collapse all files

110
Assets/Scripts/ServerShared/EntitySerializer.cs
View file

@ -13,8 +13,17 @@ public static class EntitySerializer
{
EntityPack pack;
if (entity is OrbitalEntity orbital)
pack = new OrbitalEntityPack {Orbit = orbital.OrbitData};
else pack = new ShipPack();
pack = new OrbitalEntityPack
{
Orbit = orbital.OrbitData
};
else if (entity is Ship ship)
pack = new ShipPack
{
Position = ship.Position,
Direction = ship.Direction
};
else throw new ArgumentException("Attempted to pack an instance of abstract class Entity!");
// Filter item behavior collections by those with any persistent behaviors
// For each item create an object containing the item position and a list of persistent behaviors
@ -37,7 +46,6 @@ public static class EntitySerializer
pack.Armor = entity.Armor;
pack.Temperature = entity.Temperature;
pack.Conductivity = entity.HullConductivity;
var hullData = entity.ItemManager.GetData(entity.Hull) as HullData;
pack.Children = entity.Children.Select(Pack).ToArray();
return pack;
}
@ -51,30 +59,30 @@ public static class EntitySerializer
_ => null
};
}
public static Ship Unpack(ItemManager itemManager, Zone zone, ShipPack pack, bool instantiate = false)
private static Ship Unpack(ItemManager itemManager, Zone zone, ShipPack pack, bool instantiate = false)
{
var entity = new Ship(itemManager, zone, instantiate ? (EquippableItem) itemManager.Instantiate(pack.Hull) : pack.Hull);
var entity = new Ship(itemManager, zone, instantiate ? (EquippableItem) itemManager.Instantiate(pack.Hull) : pack.Hull, pack.Settings);
Restore(itemManager, zone, pack, entity, instantiate);
return entity;
}
public static OrbitalEntity Unpack(ItemManager itemManager, Zone zone, OrbitalEntityPack pack, bool instantiate = false)
private static OrbitalEntity Unpack(ItemManager itemManager, Zone zone, OrbitalEntityPack pack, bool instantiate = false)
{
var entity = new OrbitalEntity(itemManager, zone, instantiate ? (EquippableItem) itemManager.Instantiate(pack.Hull) : pack.Hull, pack.Orbit);
var entity = new OrbitalEntity(itemManager, zone, instantiate ? (EquippableItem) itemManager.Instantiate(pack.Hull) : pack.Hull, pack.Orbit, pack.Settings);
Restore(itemManager, zone, pack, entity, instantiate);
return entity;
}
public static void Restore(ItemManager itemManager, Zone zone, EntityPack pack, Entity entity, bool instantiate = false)
private static void Restore(ItemManager itemManager, Zone zone, EntityPack pack, Entity entity, bool instantiate = false)
{
entity.Name = pack.Name;
entity.Children = pack.Children.Select(c =>
{
var child = Unpack(itemManager, zone, c, instantiate);
child.Parent = entity;
return (Entity) child;
return child;
}).ToList();
foreach (var (position, item) in pack.Equipment) entity.TryEquip(instantiate ? (EquippableItem) itemManager.Instantiate(item) : item, position);
foreach (var (position, item) in pack.CargoBays) entity.TryEquip(instantiate ? (EquippableItem) itemManager.Instantiate(item) : item, position);
@ -120,12 +128,19 @@ public static class EntitySerializer
}
[MessagePackObject]
public class ShipPack : EntityPack { }
public class ShipPack : EntityPack
{
[Key(15)]
public float3 Position;
[Key(16)]
public float2 Direction;
}
[MessagePackObject]
public class OrbitalEntityPack : EntityPack
{
[Key(14)]
[Key(15)]
public Guid Orbit;
}
@ -173,51 +188,56 @@ public class EntityPack
[Key(13)]
public EntityPack[] Children;
[Key(14)]
public EntitySettings Settings;
private int _price;
public int Price(ItemManager itemManager)
{
if (_price == 0)
if (_price != 0) return _price;
var hullData = itemManager.GetData(Hull);
_price = hullData.Price;
foreach (var (_, item) in Equipment)
{
var hullData = itemManager.GetData(Hull);
_price = hullData.Price;
var itemData = itemManager.GetData(item);
_price += itemData.Price;
}
foreach (var (_, item) in CargoBays)
{
var itemData = itemManager.GetData(item);
_price += itemData.Price;
}
foreach (var (_, item) in DockingBays)
{
var itemData = itemManager.GetData(item);
_price += itemData.Price;
}
foreach (var (_, item) in Equipment)
foreach (var t in CargoContents)
{
foreach (var (_, item) in t)
{
var itemData = itemManager.GetData(item);
_price += itemData.Price;
if (item is SimpleCommodity s)
_price += itemData.Price * s.Quantity;
else
_price += itemData.Price;
}
foreach (var (_, item) in CargoBays)
}
foreach (var t in DockingBayContents)
{
foreach (var (_, item) in t)
{
var itemData = itemManager.GetData(item);
_price += itemData.Price;
if (item is SimpleCommodity s)
_price += itemData.Price * s.Quantity;
else
_price += itemData.Price;
}
foreach (var (_, item) in DockingBays)
{
var itemData = itemManager.GetData(item);
_price += itemData.Price;
}
for (var bayIndex = 0; bayIndex < CargoContents.Length; bayIndex++)
foreach (var (_, item) in CargoContents[bayIndex])
{
var itemData = itemManager.GetData(item);
if (item is SimpleCommodity s)
_price += itemData.Price * s.Quantity;
else
_price += itemData.Price;
}
for (var bayIndex = 0; bayIndex < DockingBayContents.Length; bayIndex++)
foreach (var (_, item) in DockingBayContents[bayIndex])
{
var itemData = itemManager.GetData(item);
if (item is SimpleCommodity s)
_price += itemData.Price * s.Quantity;
else
_price += itemData.Price;
}
}
return _price;