Server Initialization and Serverside Galaxy/Zone Delivery
Made the master server connect to the database and now it's listening for and responding correctly to GalaxyRequestMessages and ZoneRequestMessages, generating the zone contents if they do not yet exist.
This commit is contained in:
parent
95947355c2
commit
f8a6582154
34 changed files with 845 additions and 115 deletions
|
|
@ -76,7 +76,7 @@ public class DatabaseCache
|
|||
return _types[typeof(T)].Values.Cast<T>();
|
||||
}
|
||||
|
||||
public void Delete(DatabaseEntry entry)
|
||||
public void Delete(DatabaseEntry entry, bool remote = false)
|
||||
{
|
||||
_entries.Remove(entry.ID);
|
||||
foreach (var type in _types.Values)
|
||||
|
|
@ -84,6 +84,7 @@ public class DatabaseCache
|
|||
type.Remove(entry.ID);
|
||||
}
|
||||
|
||||
OnDataDeleteLocal?.Invoke(entry);
|
||||
if (!remote)
|
||||
OnDataDeleteLocal?.Invoke(entry);
|
||||
}
|
||||
}
|
||||
|
|
@ -6,11 +6,22 @@ using static Unity.Mathematics.math;
|
|||
|
||||
public class GameContext
|
||||
{
|
||||
private DatabaseCache _databaseCache;
|
||||
private DatabaseCache _cache;
|
||||
|
||||
public GlobalData GlobalData => _databaseCache.GetAll<GlobalData>().FirstOrDefault();
|
||||
public GlobalData GlobalData => _cache.GetAll<GlobalData>().FirstOrDefault();
|
||||
|
||||
private readonly Dictionary<CraftedItemData, int> Tier = new Dictionary<CraftedItemData, int>();
|
||||
|
||||
public GameContext(DatabaseCache cache)
|
||||
{
|
||||
_cache = cache;
|
||||
var globalData = _cache.GetAll<GlobalData>().FirstOrDefault();
|
||||
if (globalData == null)
|
||||
{
|
||||
globalData = new GlobalData();
|
||||
_cache.Add(globalData);
|
||||
}
|
||||
}
|
||||
|
||||
public float PlanetRadius(float mass)
|
||||
{
|
||||
|
|
@ -21,29 +32,29 @@ public class GameContext
|
|||
{
|
||||
if (Tier.ContainsKey(itemData)) return Tier[itemData];
|
||||
|
||||
Tier[itemData] = itemData.Ingredients.Keys.Max(ci => _databaseCache.Get<ItemData>(ci) is CraftedItemData craftableIngredient ? ItemTier(craftableIngredient) : 0);
|
||||
Tier[itemData] = itemData.Ingredients.Keys.Max(ci => _cache.Get<ItemData>(ci) is CraftedItemData craftableIngredient ? ItemTier(craftableIngredient) : 0);
|
||||
|
||||
return Tier[itemData];
|
||||
}
|
||||
|
||||
public ItemData GetData(ItemInstance item)
|
||||
{
|
||||
return _databaseCache.Get<ItemData>(item.Data);
|
||||
return _cache.Get<ItemData>(item.Data);
|
||||
}
|
||||
|
||||
public SimpleCommodityData GetData(SimpleCommodity item)
|
||||
{
|
||||
return _databaseCache.Get<SimpleCommodityData>(item.Data);
|
||||
return _cache.Get<SimpleCommodityData>(item.Data);
|
||||
}
|
||||
|
||||
public CraftedItemData GetData(CraftedItemInstance item)
|
||||
{
|
||||
return _databaseCache.Get<CraftedItemData>(item.Data);
|
||||
return _cache.Get<CraftedItemData>(item.Data);
|
||||
}
|
||||
|
||||
public EquippableItemData GetData(Gear gear)
|
||||
{
|
||||
return _databaseCache.Get<EquippableItemData>(gear.Data);
|
||||
return _cache.Get<EquippableItemData>(gear.Data);
|
||||
}
|
||||
|
||||
public float GetMass(ItemInstance item)
|
||||
|
|
@ -128,7 +139,7 @@ public class GameContext
|
|||
|
||||
public SimpleCommodity CreateInstance(Guid data, int count)
|
||||
{
|
||||
var item = _databaseCache.Get<SimpleCommodityData>(data);
|
||||
var item = _cache.Get<SimpleCommodityData>(data);
|
||||
if (item != null)
|
||||
return new SimpleCommodity
|
||||
{
|
||||
|
|
@ -142,7 +153,7 @@ public class GameContext
|
|||
|
||||
public CraftedItemInstance CreateInstance(Guid data, float quality)
|
||||
{
|
||||
var item = _databaseCache.Get<CraftedItemData>(data);
|
||||
var item = _cache.Get<CraftedItemData>(data);
|
||||
if (item == null)
|
||||
{
|
||||
throw new InvalidOperationException("Attempted to create crafted item instance using missing or incorrect item id");
|
||||
|
|
@ -150,7 +161,7 @@ public class GameContext
|
|||
|
||||
var ingredients = item.Ingredients.SelectMany(ci =>
|
||||
{
|
||||
var ingredient = _databaseCache.Get(ci.Key);
|
||||
var ingredient = _cache.Get(ci.Key);
|
||||
return ingredient is SimpleCommodityData
|
||||
? (IEnumerable<ItemInstance>) new[] {CreateInstance(ci.Key, ci.Value)}
|
||||
: Enumerable.Range(0, ci.Value).Select(i => CreateInstance(ci.Key, quality));
|
||||
|
|
|
|||
|
|
@ -3,18 +3,19 @@ using System.Collections.Generic;
|
|||
using MessagePack;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
[RethinkTable("Galaxy")]
|
||||
[MessagePackObject]
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
public class GlobalData : DatabaseEntry
|
||||
{
|
||||
[InspectableField] [JsonProperty("targetPersistenceDuration")] [Key(1)]
|
||||
public float TargetPersistenceDuration;
|
||||
public float TargetPersistenceDuration = 3;
|
||||
|
||||
[InspectableField] [JsonProperty("heatRadiationPower")] [Key(2)]
|
||||
public float HeatRadiationPower;
|
||||
public float HeatRadiationPower = 1;
|
||||
|
||||
[InspectableField] [JsonProperty("heatRadiationMultiplier")] [Key(3)]
|
||||
public float HeatRadiationMultiplier;
|
||||
public float HeatRadiationMultiplier = 1;
|
||||
|
||||
[InspectableField] [JsonProperty("radiusPower")] [Key(4)]
|
||||
public float RadiusPower = 1.75f;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||
using MessagePack;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[InspectableField]
|
||||
[MessagePackObject]
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using MessagePack;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[InspectableField]
|
||||
[MessagePackObject]
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using MessagePack;
|
|||
using Newtonsoft.Json;
|
||||
using Unity.Mathematics;
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[InspectableField]
|
||||
[MessagePackObject]
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using MessagePack;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[MessagePackObject]
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
public class ReactorBehaviorData : IItemBehaviorData
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using MessagePack;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[InspectableField]
|
||||
[MessagePackObject]
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ public abstract class ItemData : DatabaseEntry, INamedEntry
|
|||
}
|
||||
}
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[Inspectable]
|
||||
[MessagePackObject]
|
||||
public class SimpleCommodityData : ItemData {}
|
||||
|
|
@ -54,6 +55,7 @@ public abstract class CraftedItemData : ItemData
|
|||
public Dictionary<Guid, int> Ingredients = new Dictionary<Guid, int>();
|
||||
}
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[Inspectable]
|
||||
[MessagePackObject]
|
||||
public class CompoundCommodityData : CraftedItemData {}
|
||||
|
|
@ -123,6 +125,7 @@ public abstract class EquippableItemData : CraftedItemData
|
|||
}
|
||||
}
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[Inspectable]
|
||||
[MessagePackObject]
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
|
|
@ -133,6 +136,7 @@ public class GearData : EquippableItemData
|
|||
[IgnoreMember] public override HardpointType HardpointType => Hardpoint;
|
||||
}
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[Inspectable]
|
||||
[MessagePackObject]
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
|
|
@ -165,6 +169,7 @@ public class HullData : EquippableItemData
|
|||
[IgnoreMember] public override HardpointType HardpointType => HardpointType.Hull;
|
||||
}
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[InspectableField]
|
||||
[MessagePackObject]
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
|
|
@ -174,6 +179,7 @@ public class HardpointData
|
|||
public HardpointType Type;
|
||||
}
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[Inspectable]
|
||||
[MessagePackObject]
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
|
|
@ -188,6 +194,7 @@ public class ShieldData : EquippableItemData
|
|||
[IgnoreMember] public override HardpointType HardpointType => HardpointType.Shield;
|
||||
}
|
||||
|
||||
[RethinkTable("Items")]
|
||||
[Inspectable]
|
||||
[MessagePackObject]
|
||||
[JsonObject(MemberSerialization.OptIn)]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using LiteNetLib;
|
||||
using MessagePack;
|
||||
using Unity.Mathematics;
|
||||
|
||||
[Union(0,typeof(PingMessage))]
|
||||
[Union(1,typeof(LoginMessage))]
|
||||
|
|
@ -75,4 +76,35 @@ public class ChatBroadcastMessage : Message
|
|||
public class ChangeNameMessage : Message
|
||||
{
|
||||
[Key(0)] public string Name;
|
||||
}
|
||||
|
||||
[MessagePackObject]
|
||||
public class GalaxyRequestMessage : Message { }
|
||||
|
||||
[MessagePackObject]
|
||||
public class GalaxyResponseMessage : Message
|
||||
{
|
||||
[Key(0)] public GalaxyResponseZone[] Zones;
|
||||
}
|
||||
|
||||
[MessagePackObject]
|
||||
public class GalaxyResponseZone
|
||||
{
|
||||
[Key(0)] public Guid ZoneID;
|
||||
[Key(1)] public Guid[] Links;
|
||||
[Key(2)] public string Name;
|
||||
[Key(3)] public float2 Position;
|
||||
}
|
||||
|
||||
[MessagePackObject]
|
||||
public class ZoneRequestMessage : Message
|
||||
{
|
||||
[Key(0)] public Guid ZoneID;
|
||||
}
|
||||
|
||||
[MessagePackObject]
|
||||
public class ZoneResponseMessage : Message
|
||||
{
|
||||
[Key(0)] public ZoneData Zone;
|
||||
[Key(1)] public DatabaseEntry[] Contents;
|
||||
}
|
||||
|
|
@ -99,7 +99,7 @@ public class PlanetData : DatabaseEntry, INamedEntry
|
|||
public class OrbitData : DatabaseEntry
|
||||
{
|
||||
[JsonProperty("parent")] [Key(1)]
|
||||
public Guid Parent;
|
||||
public Guid? Parent;
|
||||
|
||||
[JsonProperty("distance")] [Key(2)]
|
||||
public float Distance;
|
||||
|
|
|
|||
Loading…
Reference in a new issue