Database Inspector Features

Aetheria Database Tools now has the ability to customize the shapes of items and hardpoints, and displays hardpoints when editing hull shape List elements now have foldouts Lists are presented in the Database Inspector with colors when the list type implements ITintInspector interface
2020-12-12 00:02:00 +00:00 · 2020-12-12 00:02:00 +00:00 · 1debe67958
commit 1debe67958
parent f643f6cc8a
35 changed files with 3066 additions and 499 deletions
--- a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
@ -112,4 +112,11 @@ public abstract class BehaviorData
    public int Group;
    
    public abstract IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item);
+
+    public override string ToString()
+    {
+        var className = base.ToString();
+        var dataIndex = className.IndexOf("data", StringComparison.InvariantCultureIgnoreCase);
+        return dataIndex>0 ? className.Substring(0,dataIndex).SplitCamelCase() : className;
+    }
 }
--- a/Assets/Scripts/ServerShared/Entity.cs
+++ b/Assets/Scripts/ServerShared/Entity.cs
@ -231,7 +231,8 @@ public abstract class Entity
                if (!hardpoint.Shape[i]) return false;
            
                // If there is any gear already occupying that space, it won't fit
-                var itemCoord = hardpoint.Position + i;
+                // Items placed in hardpoints are automatically aligned to hardpoint rotation
+                var itemCoord = hardpoint.Position + itemData.Shape.Rotate(i, hardpoint.Rotation);
                if (_gearOccupancy[itemCoord.x, itemCoord.y] != null) return false;
            }
        }
--- a/Assets/Scripts/ServerShared/Enums.cs
+++ b/Assets/Scripts/ServerShared/Enums.cs
@ -1,5 +1,13 @@
 using System;

+public enum ItemRotation
+{
+    None = 0,
+    Clockwise = 1,
+    Reversed = 2,
+    CounterClockwise = 3
+}
+
 public enum LauncherCaliber
 {
    Micro,
--- a/Assets/Scripts/ServerShared/Extensions.cs
+++ b/Assets/Scripts/ServerShared/Extensions.cs
@ -35,6 +35,31 @@ public static class Extensions
    //         (temperature - itemData.MinimumTemperature) /
    //         (itemData.MaximumTemperature - itemData.MinimumTemperature))));
    // }
+    
+    // Thanks, https://stackoverflow.com/a/48599119
+    public static bool ByteArrayCompare(ReadOnlySpan<byte> a1, ReadOnlySpan<byte> a2)
+    {
+        return a1.SequenceEqual(a2);
+    }
+
+    public static bool ByteEquals(this byte[] a, byte[] b) => ByteArrayCompare(a, b);
+
+    public static char Arrow(this ItemRotation rot)
+    {
+        switch (rot)
+        {
+            case ItemRotation.None:
+                return '\u2191';
+            case ItemRotation.Clockwise:
+                return '\u2192';
+            case ItemRotation.Reversed:
+                return '\u2193';
+            case ItemRotation.CounterClockwise:
+                return '\u2190';
+            default:
+                throw new ArgumentOutOfRangeException(nameof(rot), rot, null);
+        }
+    }
 	
    public static string SplitCamelCase( this string str )
    {
--- a/Assets/Scripts/ServerShared/ItemData.cs
+++ b/Assets/Scripts/ServerShared/ItemData.cs
@ -9,35 +9,67 @@ using Unity.Mathematics;
 using static Unity.Mathematics.math;
 using int2 = Unity.Mathematics.int2;

+[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class Shape
 {
    [JsonProperty("name"), Key(0)] public bool[,] Cells;
    
    private bool _dirty = true;

+    public Shape()
+    {
+        Cells = new bool[1,1];
+        Cells[0, 0] = true;
+    }
+
    public Shape(int width, int height)
    {
        Cells = new bool[width, height];
    }
    
-    public int Width => Cells.GetLength(0);
+    [IgnoreMember]
+    public int Width
+    {
+        get { return Cells.GetLength(0); }
+        set { Resize(value, Height); }
+    }

-    public int Height => Cells.GetLength(1);
+    [IgnoreMember]
+    public int Height
+    {
+        get { return Cells.GetLength(1); }
+        set { Resize(Width, value); }
+    }
+
+    public void Resize(int width, int height)
+    {
+        var newCells = new bool[width, height];
+        
+        for (int x = 0; x < width && x < Width; x++)
+        {
+            for (int y = 0; y < height && y < Height; y++)
+            {
+                newCells[x, y] = Cells[x, y];
+            }
+        }
+
+        Cells = newCells;
+    }

    private static int mod(int x, int m) {
        int r = x%m;
        return r<0 ? r+m : r;
    }
    
-    public int2 Rotate(int2 position, int rotation)
+    public int2 Rotate(int2 position, ItemRotation rotation)
    {
-        switch (mod(rotation, 4))
+        switch (rotation)
        {
-            case 1:
+            case ItemRotation.Clockwise:
                return int2(position.y, Width - 1 - position.x);
-            case 2:
+            case ItemRotation.Reversed:
                return int2(Width - 1 - position.x, Height - 1 - position.y);
-            case 3:
+            case ItemRotation.CounterClockwise:
                return int2(Height - 1 - position.y, position.x);
            default:
                return int2(position.x, position.y);
@ -58,9 +90,9 @@ public class Shape

    private IEnumerable<int2> EnumerateShapeCoordinates()
    {
-        for(int x = 0; x < Cells.GetLength(0); x++)
+        for(int x = 0; x < Width; x++)
        {
-            for (int y = 0; y < Cells.GetLength(0); y++)
+            for (int y = 0; y < Height; y++)
            {
                if(Cells[x,y]) yield return int2(x, y);
            }
@ -141,7 +173,7 @@ public class SimpleCommodityData : ItemData
    // public float Floor = 5f;

    [InspectableField, JsonProperty("maxStackSize"), Key(6)]
-    public int MaxStack;
+    public int MaxStack = 10;

    [InspectableField, JsonProperty("category"), Key(7)]  
    public SimpleCommodityCategory Category;
@ -174,19 +206,22 @@ public class CompoundCommodityData : CraftedItemData
 JsonObject(MemberSerialization.OptIn), JsonConverter(typeof(JsonKnownTypesConverter<EquippableItemData>))]
 public abstract class EquippableItemData : CraftedItemData
 {
-    [InspectableField, JsonProperty("behaviors"), Key(7)]  
+    [InspectableTexture, JsonProperty("schematic"), Key(7)]
+    public string Schematic;
+    
+    [InspectableField, JsonProperty("behaviors"), Key(8)]  
    public List<BehaviorData> Behaviors = new List<BehaviorData>();

-    [InspectableField, JsonProperty("durability"), Key(8)]
+    [InspectableField, JsonProperty("durability"), Key(9)]
    public float Durability;
    
-    [TemperatureInspectable, JsonProperty("minTemp"), Key(9)]
+    [TemperatureInspectable, JsonProperty("minTemp"), Key(10)]
    public float MinimumTemperature;

-    [TemperatureInspectable, JsonProperty("maxTemp"), Key(10)]
+    [TemperatureInspectable, JsonProperty("maxTemp"), Key(11)]
    public float MaximumTemperature;

-    [InspectableField, JsonProperty("durabilityExponent"), Key(11), SimplePerformanceStat]
+    [InspectableField, JsonProperty("durabilityExponent"), Key(12), SimplePerformanceStat]
    public PerformanceStat DurabilityExponent = new PerformanceStat();
    
    [IgnoreMember]
@ -200,7 +235,7 @@ public abstract class EquippableItemData : CraftedItemData
 [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class GearData : EquippableItemData
 {
-    [InspectableField, JsonProperty("hardpointType"), Key(12)]
+    [InspectableField, JsonProperty("hardpointType"), Key(13)]
    public HardpointType Hardpoint;

    [IgnoreMember] public override HardpointType HardpointType => Hardpoint;
@ -209,7 +244,7 @@ public class GearData : EquippableItemData
 [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class CargoBayData : EquippableItemData
 {
-    [InspectableField, JsonProperty("interiorShape"), Key(12)]
+    [InspectableField, JsonProperty("interiorShape"), Key(13)]
    public Shape InteriorShape;
    [IgnoreMember] public override HardpointType HardpointType => HardpointType.Tool;
 }
@ -217,13 +252,13 @@ public class CargoBayData : EquippableItemData
 [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class HullData : EquippableItemData
 {
-    [InspectableField, JsonProperty("hardpoints"), Key(12)]  
+    [InspectableField, JsonProperty("hardpoints"), Key(13)]  
    public List<HardpointData> Hardpoints = new List<HardpointData>();

-    [InspectablePrefab, JsonProperty("prefab"), Key(13)]  
+    [InspectablePrefab, JsonProperty("prefab"), Key(14)]  
    public string Prefab;

-    [InspectableField, JsonProperty("hullType"), Key(14)]
+    [InspectableField, JsonProperty("hullType"), Key(15)]
    public HullType HullType;

    [IgnoreMember]
@ -246,12 +281,35 @@ public class HullData : EquippableItemData
 }

 [InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
-public class HardpointData
+public class HardpointData : ITintInspector
 {
    [InspectableField, JsonProperty("type"), Key(0)] public HardpointType Type;
    [InspectableField, JsonProperty("position"), Key(1)] public int2 Position;
-    [InspectableField, JsonProperty("shape"), Key(2)] public Shape Shape;
+    [InspectableField, JsonProperty("shape"), Key(2)] public Shape Shape = new Shape();
    [InspectableField, JsonProperty("transform"), Key(3)] public string Transform;
+    [InspectableField, JsonProperty("rotation"), Key(4)] public ItemRotation Rotation;
+
+    public override string ToString()
+    {
+        return $"{Enum.GetName(typeof(HardpointType), Type)} Hardpoint {Rotation.Arrow()}";
+    }
+
+    [IgnoreMember]
+    public float3 TintColor
+    {
+        get
+        {
+            if (_tintColors == null)
+            {
+                var hardpointTypes = ((HardpointType[]) Enum.GetValues(typeof(HardpointType)));
+                _tintColors = hardpointTypes.ToDictionary(x => x,
+                    x => ColorMath.HsvToRgb(float3((float)(int)x/hardpointTypes.Length, 1, 1)));
+            }
+
+            return _tintColors[Type];
+        }
+    }
+    private static Dictionary<HardpointType, float3> _tintColors;
 }

 [MessagePackObject, JsonObject(MemberSerialization.OptIn)]
@ -319,4 +377,9 @@ public class PersonalityAttribute : DatabaseEntry, INamedEntry
        get => Name;
        set => Name = value;
    }
+}
+
+public interface ITintInspector
+{
+    float3 TintColor { get; }
 }
--- a/Assets/Scripts/ServerShared/ItemInstance.cs
+++ b/Assets/Scripts/ServerShared/ItemInstance.cs
@ -19,7 +19,7 @@ using static Unity.Mathematics.math;
 public abstract class ItemInstance
 {
    [JsonProperty("data"), Key(0)] public Guid Data;
-    [JsonProperty("rotation"), Key(1)] public int Rotation;
+    [JsonProperty("rotation"), Key(1)] public ItemRotation Rotation;
 }

 [Union(0, typeof(CompoundCommodity)), 
--- a/Assets/Scripts/ServerShared/JsonConverters.cs
+++ b/Assets/Scripts/ServerShared/JsonConverters.cs
@ -32,6 +32,17 @@ public class MathJsonConverter : JsonConverter
            writer.WriteEndArray();
        };

+        writers[typeof(int2)] = (writer, o) =>
+        {
+            if (!(o is int2 v))
+                throw new JsonReaderException();
+
+            writer.WriteStartArray();
+            writer.WriteValue(v.x);
+            writer.WriteValue(v.y);
+            writer.WriteEndArray();
+        };
+
        writers[typeof(float3)] = (writer, o) =>
        {
            if (!(o is float3 v))
@ -76,6 +87,19 @@ public class MathJsonConverter : JsonConverter
                array[0].ToObject<float>(),
                array[1].ToObject<float>());
        };
+        
+        readers[typeof(int2)] = array =>
+        {
+            if (array.Count < 2)
+            {
+                throw new JsonReaderException(
+                    $"Could not read {typeof(float2)} from json, expected a json array with 2 elements");
+            }
+
+            return int2(
+                array[0].ToObject<int>(),
+                array[1].ToObject<int>());
+        };

        readers[typeof(float3)] = array =>
        {