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

Visual Behavior Sorting

Browse source 
Behaviors in DB Inspector now visibly sort according to their execution order
This commit is contained in:
hyperion51 2020-05-13 22:35:56 +01:00
commit 3ffd88ade5
13 changed files with 45 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,11 +21,11 @@ public class RethinkTableAttribute : Attribute
}
}
public class UpdateOrderAttribute : Attribute
public class OrderAttribute : Attribute
{
public int Order;
public UpdateOrderAttribute(int order)
public OrderAttribute(int order)
{
Order = order;
}

3
Assets/Scripts/ServerShared/Behaviors/Cooldown.cs
View file

@ -3,7 +3,7 @@ using System.Linq;
using MessagePack;
using Newtonsoft.Json;
[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn), Order(-10)]
public class CooldownData : BehaviorData
{
[InspectableField, JsonProperty("cooldown"), Key(1)]
@ -15,7 +15,6 @@ public class CooldownData : BehaviorData
}
}
[UpdateOrder(-10)]
public class Cooldown : IBehavior, IAlwaysUpdatedBehavior
{
private CooldownData _data;

3
Assets/Scripts/ServerShared/Behaviors/Heat.cs
View file

@ -3,7 +3,7 @@ using System.Linq;
using MessagePack;
using Newtonsoft.Json;
[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn), Order(10)]
public class HeatData : BehaviorData
{
[InspectableField, JsonProperty("heat"), Key(1)]
@ -15,7 +15,6 @@ public class HeatData : BehaviorData
}
}
[UpdateOrder(10)]
public class Heat : IBehavior
{
private HeatData _data;

3
Assets/Scripts/ServerShared/Behaviors/ItemUsage.cs
View file

@ -4,7 +4,7 @@ using System.Linq;
using MessagePack;
using Newtonsoft.Json;
[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn), Order(-5)]
public class ItemUsageData : BehaviorData
{
[InspectableDatabaseLink(typeof(SimpleCommodityData)), JsonProperty("item"), Key(1)]
@ -16,7 +16,6 @@ public class ItemUsageData : BehaviorData
}
}
[UpdateOrder(-5)]
public class ItemUsage : IBehavior
{
private ItemUsageData _data;

3
Assets/Scripts/ServerShared/Behaviors/PatrolController.cs
View file

@ -6,7 +6,7 @@ using Newtonsoft.Json;
using Unity.Mathematics;
using static Unity.Mathematics.math;
[MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship)]
[MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), Order(-100)]
public class PatrolControllerData : ControllerData
{
[InspectableField, JsonProperty("targetDistance"), Key(5)]
@ -18,7 +18,6 @@ public class PatrolControllerData : ControllerData
}
}
[UpdateOrder(-100)]
public class PatrolController : IBehavior, IController, IInitializableBehavior
{
public TaskType TaskType => TaskType.Tow;

2
Assets/Scripts/ServerShared/Behaviors/StatModifier.cs
View file

@ -24,7 +24,7 @@ public class StatModifierData : BehaviorData
}
}
[UpdateOrder(-4)]
[Order(-4)]
public class StatModifier : IBehavior, IInitializableBehavior, IDisposableBehavior
{
private StatModifierData _data;

3
Assets/Scripts/ServerShared/Behaviors/Switch.cs
View file

@ -3,7 +3,7 @@ using System.Linq;
using MessagePack;
using Newtonsoft.Json;
[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn), Order(-25)]
public class SwitchData : BehaviorData
{
public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
@ -12,7 +12,6 @@ public class SwitchData : BehaviorData
}
}
[UpdateOrder(-25)]
public class Switch : IBehavior
{
private SwitchData _data;

3
Assets/Scripts/ServerShared/Behaviors/TowingController.cs
View file

@ -7,7 +7,7 @@ using Newtonsoft.Json;
using Unity.Mathematics;
using static Unity.Mathematics.math;
[MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship)]
[MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), Order(-100)]
public class TowingControllerData : ControllerData
{
public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
@ -16,7 +16,6 @@ public class TowingControllerData : ControllerData
}
}
[UpdateOrder(-100)]
public class TowingController : IBehavior, IPersistentBehavior, IController, IInitializableBehavior
{
public TaskType TaskType => TaskType.Tow;

3
Assets/Scripts/ServerShared/Behaviors/Trigger.cs
View file

@ -3,7 +3,7 @@ using System.Linq;
using MessagePack;
using Newtonsoft.Json;
[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn), Order(-20)]
public class TriggerData : BehaviorData
{
public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
@ -12,7 +12,6 @@ public class TriggerData : BehaviorData
}
}
[UpdateOrder(-20)]
public class Trigger : IBehavior
{
private TriggerData _data;

2
Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs
View file

@ -15,7 +15,7 @@ public class VelocityLimitData : BehaviorData
}
}
[UpdateOrder(100)]
[Order(100)]
public class VelocityLimit : IBehavior
{
public Entity Entity { get; }

5
Assets/Scripts/ServerShared/Entity.cs
View file

@ -70,14 +70,13 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
ItemBehaviors = gear
.Where(i=> gearData[i].ItemData.Behaviors?.Any()??false)
.ToDictionary(i=> gearData[i], i => gearData[i].ItemData.Behaviors
.OrderBy(bd => bd.GetType().GetCustomAttribute<OrderAttribute>()?.Order ?? 0)
.Select(bd => bd.CreateInstance(Context, this, gearData[i]))
.OrderBy(b => b.GetType().GetCustomAttribute<UpdateOrderAttribute>()?.Order ?? 0)
.ToList());
var behaviorGroups = ItemBehaviors
.SelectMany(x => x.Value
.Select(b => new {item = x.Key, behavior = b})
.OrderBy(ib => ib.behavior.GetType().GetCustomAttribute<UpdateOrderAttribute>()?.Order ?? 0))
.Select(b => new {item = x.Key, behavior = b}))
.GroupBy(ib => new {ib.item, ib.behavior.Data.Group});
Behaviors = behaviorGroups