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

Inventory Events

Browse source 
Added an event system allowing the UI to subscribe to changes in entity cargo, hardpoints or on specific items
Fixed bugs in colony tab caused by recent refactoring
This commit is contained in:
hyperion51 2020-06-06 03:21:03 +01:00
commit 39ce6809c0
11 changed files with 370 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,15 +75,25 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
// [IgnoreMember] public Dictionary<Gear, EquippableItemData> GearData;
// [IgnoreMember] public Dictionary<Gear, List<IBehavior>> ItemBehaviors;
private bool _inventoryChanged;
[IgnoreMember] public float Mass { get; private set; }
[IgnoreMember] public float OccupiedCapacity { get; private set; }
[IgnoreMember] public float ThermalMass { get; private set; }
[IgnoreMember] public float Visibility => VisibilitySources.Values.Sum();
public event Action OnInventoryUpdate;
public class InventoryEvent : IDynamicProperties
{
public event Action OnChanged;
public void Change()
{
OnChanged?.Invoke();
}
}
private bool _cargoChanged;
public InventoryEvent CargoEvent = new InventoryEvent();
private bool _gearChanged;
public InventoryEvent GearEvent = new InventoryEvent();
public float Capacity
{
get
@ -161,6 +171,8 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
return;
}
hardpoint.ItemData = hardpoint.Gear.ItemData;
hardpoint.Behaviors = hardpoint.Gear.ItemData.Behaviors
.Select(bd => bd.CreateInstance(Context, this, hardpoint.Gear))
.ToArray();
@ -184,11 +196,12 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
{
Gear.Remove(hardpoint.Gear.ID);
Cargo.Add(hardpoint.Gear.ID);
_cargoChanged = true;
}
hardpoint.Gear = gear;
HydrateHardpoint(hardpoint);
_inventoryChanged = true;
_gearChanged = true;
}
public bool Equip(Guid gearID, bool force = false)
@ -226,7 +239,7 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
Mass += item.Mass;
ThermalMass += item.ThermalMass;
OccupiedCapacity += item.Size;
_inventoryChanged = true;
_cargoChanged = true;
return item;
}
@ -238,7 +251,7 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
Mass -= item.Mass;
ThermalMass -= item.ThermalMass;
OccupiedCapacity -= item.Size;
_inventoryChanged = true;
_cargoChanged = true;
return item;
}
@ -260,12 +273,13 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
var existingCommodity = Context.Cache.Get<SimpleCommodity>(existingCommodityID);
existingCommodity.Quantity += item.Quantity;
Context.Cache.Delete(item);
_cargoChanged = true;
return existingCommodity;
}
// No match was found, simply add the item instance to the cargo
Cargo.Add(item.ID);
_inventoryChanged = true;
_cargoChanged = true;
return item;
}
@ -294,7 +308,7 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
ThermalMass -= item.ThermalMass;
OccupiedCapacity -= item.Size;
_inventoryChanged = true;
_cargoChanged = true;
return item;
}
@ -442,11 +456,6 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
Cargo.Select(i => Context.Cache.Get<ItemInstance>(i)).Sum(ii => ii.Size);
}
public void ClearInventoryListeners()
{
OnInventoryUpdate = null;
}
public T GetBehavior<T>() where T : class, IBehavior
{
foreach (var hardpoint in Hardpoints)
@ -605,6 +614,17 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
// foreach (var axis in ItemBehaviors[staleItem].Where(b => b is IAnalogBehavior).Cast<IAnalogBehavior>())
// Axes[axis] = 0;
// }
if (_cargoChanged)
{
CargoEvent.Change();
_cargoChanged = false;
}
if (_gearChanged)
{
GearEvent.Change();
_gearChanged = false;
}
}
public void SetMessage(string message)