Blueprints & Resources

Added the ability to associate simple commodities with resource maps
Added resource placement to zone generator
Added crafting blueprints and stat addressing system
Refactored Thrusters and Shields into Behaviors
Fixed server losing database connection
Updated icons
This commit is contained in:
hyperion51 2020-04-09 07:48:45 +01:00
commit fd92c80876
58 changed files with 1399 additions and 855 deletions

View file

@ -12,63 +12,50 @@ using Unity.Mathematics;
// TODO: USE THIS EVERYWHERE
using static Unity.Mathematics.math;
[Union(0, typeof(SimpleCommodity))]
[Union(1, typeof(CompoundCommodity))]
[Union(2, typeof(Gear))]
[JsonObject(MemberSerialization.OptIn)]
[JsonConverter(typeof(JsonKnownTypesConverter<ItemInstance>))]
[Union(0, typeof(SimpleCommodity)), Union(1, typeof(CompoundCommodity)), Union(2, typeof(Gear)),
JsonObject(MemberSerialization.OptIn), JsonConverter(typeof(JsonKnownTypesConverter<ItemInstance>))]
public abstract class ItemInstance : DatabaseEntry
{
[JsonProperty("data")] [Key(1)]
public Guid Data;
[JsonProperty("data"), Key(1)] public Guid Data;
public float Mass => Context.GetMass(this);
public float HeatCapacity => Context.GetHeatCapacity(this);
}
[Union(0, typeof(CompoundCommodity))]
[Union(1, typeof(Gear))]
[JsonObject(MemberSerialization.OptIn)]
[JsonConverter(typeof(JsonKnownTypesConverter<CraftedItemInstance>))]
[Union(0, typeof(CompoundCommodity)), Union(1, typeof(Gear)), JsonObject(MemberSerialization.OptIn),
JsonConverter(typeof(JsonKnownTypesConverter<CraftedItemInstance>))]
public abstract class CraftedItemInstance : ItemInstance
{
[JsonProperty("quality")] [Key(2)]
public float Quality;
[JsonProperty("quality"), Key(2)] public float Quality;
[JsonProperty("ingredients")] [Key(3)]
public List<ItemInstance> Ingredients = new List<ItemInstance>();
[JsonProperty("ingredients"), Key(3)] public List<ItemInstance> Ingredients = new List<ItemInstance>();
[JsonProperty("blueprint"), Key(4)] public BlueprintData Blueprint;
}
[MessagePackObject]
[JsonObject(MemberSerialization.OptIn)]
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class CompoundCommodity : CraftedItemInstance {}
[MessagePackObject]
[JsonObject(MemberSerialization.OptIn)]
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class SimpleCommodity : ItemInstance
{
[JsonProperty("quantity")] [Key(2)]
public int Quantity;
[JsonProperty("quantity"), Key(2)] public int Quantity;
public SimpleCommodityData ItemData => Context.GetData(this);
}
[MessagePackObject]
[JsonObject(MemberSerialization.OptIn)]
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class Gear : CraftedItemInstance
{
[JsonProperty("durability")] [Key(4)]
public float Durability;
[JsonProperty("durability"), Key(5)] public float Durability;
public EquippableItemData ItemData => Context.GetData(this);
}
[MessagePackObject]
[JsonObject(MemberSerialization.OptIn)]
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class Hardpoint
{
[JsonProperty("item")] [Key(0)]
public Gear Item;
[JsonProperty("item"), Key(0)] public Gear Item;
[IgnoreMember] public HardpointData HardpointData;
}