Drag and Drop + Zoooooooom

Refactored inventory drag & drop to use new global drag & drop management
Enabled Drag & Drop from inventory panel to action bar
Enabled gear and consumable item binding
Fixed stat modifier behavior to allow it to be toggled
Fixed Switch behavior to make it bindable
Added lambda multiplier to aether drive so that stat mod can target it
This commit is contained in:
Reinier Vens 2021-04-21 01:49:07 +01:00
commit 7cfc5cd04f
21 changed files with 352 additions and 323 deletions

View file

@ -21,6 +21,7 @@ using int2 = Unity.Mathematics.int2;
public class InventoryPanel : MonoBehaviour, IPointerClickHandler
{
public ConfirmationDialog Dialog;
public RectTransform DragParent;
public bool Flip;
public GameSettings Settings;
public ActionGameManager GameManager;
@ -52,19 +53,18 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
public float DoubleClickTime = .5f;
public float HitDamageThreshold = 1;
Subject<InventoryEventData> _onBeginDrag;
Subject<InventoryEventData> _onDrag;
Subject<InventoryEventData> _onEndDrag;
// Subject<InventoryEventData> _onBeginDrag;
// Subject<InventoryEventData> _onDrag;
// Subject<InventoryEventData> _onEndDrag;
Subject<(InventoryEventData data, int clickCount)> _onClick;
Subject<InventoryEventData> _onPointerEnter;
Subject<InventoryEventData> _onPointerExit;
// Subject<InventoryEventData> _onPointerEnter;
// Subject<InventoryEventData> _onPointerExit;
private Entity _displayedEntity;
private EquippedCargoBay _displayedCargo;
private Texture2D _temperatureTexture;
private RectTransform _firstRect;
public EquippedItem FakeEquipment;
public ItemInstance FakeItem;
public Shape FakeOccupancy;
public Shape IgnoreOccupancy;
@ -268,6 +268,10 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
public void Display(Entity entity, bool hud = false, bool thermal = false)
{
Clear();
_subscriptions.Add(entity.Equipment.ObserveAdd().Subscribe(_ => RefreshCells()));
_subscriptions.Add(entity.Equipment.ObserveRemove().Subscribe(_ => RefreshCells()));
_thermal = thermal;
_hud = hud;
@ -352,15 +356,105 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
_onClick?.OnNext((new InventoryEntityEventData(data, v, entity), _clickCount));
});
cell.BeginDragTrigger.OnBeginDragAsObservable()
.Subscribe(data => _onBeginDrag?.OnNext(new InventoryEntityEventData(data, v, entity)));
.Subscribe(data =>
{
//Debug.Log("Entity Drag Start");
var item = entity.GearOccupancy[v.x, v.y];
if (item != null)
{
var originalOccupancy = hullData.Shape.Inset(item.Data.Shape, item.Position, item.EquippableItem.Rotation);
_dragCells = originalOccupancy.Coordinates
.Select(v1 => Instantiate(CellInstances[v1], DragParent, true).transform).ToArray();
foreach(var dragCell in _dragCells)
{
DestroyImmediate(dragCell.GetComponent<Prototype>());
foreach (var component in dragCell.GetComponentsInChildren<ObservableTriggerBase>())
component.enabled = false;
foreach (var img in dragCell.GetComponentsInChildren<Image>())
img.color = new Color(img.color.r, img.color.g, img.color.b, img.color.a * .5f);
dragCell.GetComponentInChildren<Image>().raycastTarget = false;
}
_dragOffsets = _dragCells.Select(x => (Vector2) x.position - data.position).ToArray();
IgnoreOccupancy = originalOccupancy;
RefreshCells();
_originalRotation = item.EquippableItem.Rotation;
GameManager.BeginDrag(new EquippedItemDragObject(item, entity, item.Position - v));
AkSoundEngine.PostEvent("Pickup", gameObject);
}
});
cell.DragTrigger.OnDragAsObservable()
.Subscribe(data => _onDrag?.OnNext(new InventoryEntityEventData(data, v, entity)));
.Subscribe(data =>
{
for (var i = 0; i < _dragCells.Length; i++)
_dragCells[i].position = new Vector3(
data.position.x + _dragOffsets[i].x,
data.position.y + _dragOffsets[i].y,
_dragCells[i].position.z);
});
cell.EndDragTrigger.OnEndDragAsObservable()
.Subscribe(data => _onEndDrag?.OnNext(new InventoryEntityEventData(data, v, entity)));
.Subscribe(data =>
{
//Debug.Log("Entity Drag End");
IgnoreOccupancy = null;
if (!GameManager.EndDrag())
entity.GearOccupancy[v.x, v.y].EquippableItem.Rotation = _originalRotation;
foreach(var dragObject in _dragCells)
Destroy(dragObject.gameObject);
_dragCells = null;
RefreshCells();
});
cell.PointerEnterTrigger.OnPointerEnterAsObservable()
.Subscribe(data => _onPointerEnter?.OnNext(new InventoryEntityEventData(data, v, entity)));
.Subscribe(data =>
{
//Debug.Log("Entity Pointer Enter");
if (!(GameManager.DragObject is ItemDragObject itemDragObject)) return;
var item = itemDragObject.Item;
var itemData = item.Data.Value;
if (!(item is EquippableItem equippableItem)) return;
var placementPosition = v + itemDragObject.OriginCellOffset;
if (entity.ItemFits(equippableItem, placementPosition))
{
//foreach (var cell in _dragCells) cell.gameObject.SetActive(false);
FakeItem = item;
FakeOccupancy = hullData.Shape.Inset(itemData.Shape, placementPosition, item.Rotation);
RefreshCells();
GameManager.RegisterDragTarget(drag =>
{
//Debug.Log("Entity Drag Callback");
if (GameManager.DragObject is EquippedItemDragObject equippedItemDragObject)
{
if(equippedItemDragObject.OriginEntity.TryUnequip(equippedItemDragObject.EquippedItem) == null)
{
AkSoundEngine.PostEvent("UI_Fail", gameObject);
Dialog.Clear();
Dialog.Title.text = "Unable to move item!";
Dialog.AddProperty("Verify that cargo bays are empty before un-equipping them.");
Dialog.Show();
Dialog.MoveToCursor();
}
else
AkSoundEngine.PostEvent("Unequip", gameObject);
}
else if (GameManager.DragObject is ItemInstanceDragObject itemInstanceDragObject)
itemInstanceDragObject.OriginInventory.Remove(itemInstanceDragObject.Item);
FakeOccupancy = null;
entity.TryEquip(equippableItem, placementPosition);
RefreshCells();
AkSoundEngine.PostEvent("Equip", gameObject);
return false;
});
}
});
cell.PointerExitTrigger.OnPointerExitAsObservable()
.Subscribe(data => _onPointerExit?.OnNext(new InventoryEntityEventData(data, v, entity)));
.Subscribe(data =>
{
if (!(GameManager.DragObject is ItemDragObject)) return;
FakeItem = null;
FakeOccupancy = null;
RefreshCells();
GameManager.UnregisterDragTarget();
});
}
}
else
@ -448,6 +542,9 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
{
Clear();
_subscriptions.Add(cargo.Cargo.ObserveAdd().Subscribe(_ => RefreshCells()));
_subscriptions.Add(cargo.Cargo.ObserveRemove().Subscribe(_ => RefreshCells()));
_displayedCargo = cargo;
_displayedEntity = null;
@ -479,15 +576,103 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
_onClick?.OnNext((new InventoryCargoEventData(data, v, cargo), _clickCount));
});
cell.BeginDragTrigger.OnBeginDragAsObservable()
.Subscribe(data => _onBeginDrag?.OnNext(new InventoryCargoEventData(data, v, cargo)));
.Subscribe(data =>
{
//Debug.Log("Inventory Drag Start");
var item = cargo.Occupancy[v.x, v.y];
if (item != null)
{
var itemPosition = cargo.Cargo[item];
var itemData = item.Data.Value;
var originalOccupancy = cargo.Data.InteriorShape.Inset(itemData.Shape, itemPosition, item.Rotation);
_dragCells = originalOccupancy.Coordinates
.Select(v1 => Instantiate(CellInstances[v1], DragParent, true).transform).ToArray();
foreach(var dragCell in _dragCells)
{
DestroyImmediate(dragCell.GetComponent<Prototype>());
foreach (var component in dragCell.GetComponentsInChildren<ObservableTriggerBase>())
component.enabled = false;
foreach (var img in dragCell.GetComponentsInChildren<Image>())
img.color = new Color(img.color.r, img.color.g, img.color.b, img.color.a * .5f);
dragCell.GetComponentInChildren<Image>().raycastTarget = false;
}
_dragOffsets = _dragCells.Select(x => (Vector2) x.position - data.position).ToArray();
IgnoreOccupancy = originalOccupancy;
RefreshCells();
_originalRotation = item.Rotation;
GameManager.BeginDrag(new ItemInstanceDragObject(item, cargo, cargo.Cargo[item] - v));
AkSoundEngine.PostEvent("Pickup", gameObject);
}
});
cell.DragTrigger.OnDragAsObservable()
.Subscribe(data => _onDrag?.OnNext(new InventoryCargoEventData(data, v, cargo)));
.Subscribe(data =>
{
for (var i = 0; i < _dragCells.Length; i++)
_dragCells[i].position = new Vector3(
data.position.x + _dragOffsets[i].x,
data.position.y + _dragOffsets[i].y,
_dragCells[i].position.z);
});
cell.EndDragTrigger.OnEndDragAsObservable()
.Subscribe(data => _onEndDrag?.OnNext(new InventoryCargoEventData(data, v, cargo)));
.Subscribe(data =>
{
//Debug.Log("Inventory Drag End");
IgnoreOccupancy = null;
GameManager.EndDrag();
foreach(var dragObject in _dragCells)
Destroy(dragObject.gameObject);
_dragCells = null;
});
cell.PointerEnterTrigger.OnPointerEnterAsObservable()
.Subscribe(data => _onPointerEnter?.OnNext(new InventoryCargoEventData(data, v, cargo)));
.Subscribe(data =>
{
//Debug.Log("Inventory Pointer Enter");
if (!(GameManager.DragObject is ItemDragObject itemDragObject)) return;
var item = itemDragObject.Item;
var itemData = item.Data.Value;
var placementPosition = v + itemDragObject.OriginCellOffset;
if (cargo.ItemFits(item, placementPosition))
{
//foreach (var cell in _dragCells) cell.gameObject.SetActive(false);
FakeItem = item;
FakeOccupancy = cargo.Data.InteriorShape.Inset(itemData.Shape, placementPosition, item.Rotation);
RefreshCells();
GameManager.RegisterDragTarget(drag =>
{
//Debug.Log("Inventory Drag Callback");
if (GameManager.DragObject is EquippedItemDragObject equippedItemDragObject)
{
if(equippedItemDragObject.OriginEntity.TryUnequip(equippedItemDragObject.EquippedItem) == null)
{
AkSoundEngine.PostEvent("UI_Fail", gameObject);
Dialog.Clear();
Dialog.Title.text = "Unable to move item!";
Dialog.AddProperty("Verify that cargo bays are empty before un-equipping them.");
Dialog.Show();
Dialog.MoveToCursor();
}
else
AkSoundEngine.PostEvent("Unequip", gameObject);
}
else if (GameManager.DragObject is ItemInstanceDragObject itemInstanceDragObject)
itemInstanceDragObject.OriginInventory.Remove(itemInstanceDragObject.Item);
cargo.TryStore(item, placementPosition);
FakeOccupancy = null;
AkSoundEngine.PostEvent("Drop", gameObject);
return true;
});
}
});
cell.PointerExitTrigger.OnPointerExitAsObservable()
.Subscribe(data => _onPointerExit?.OnNext(new InventoryCargoEventData(data, v, cargo)));
.Subscribe(data =>
{
if (!(GameManager.DragObject is ItemDragObject)) return;
FakeItem = null;
FakeOccupancy = null;
RefreshCells();
GameManager.UnregisterDragTarget();
});
CellInstances.Add(v, cell);
}
}
@ -511,7 +696,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
var spriteIndex = 0;
var interior = hullData.InteriorCells[v];
var item = FakeOccupancy?[v]??false ? FakeEquipment : IgnoreOccupancy?[v]??false ? null : _displayedEntity.GearOccupancy[v.x, v.y];
var item = FakeOccupancy?[v]??false ? FakeItem : IgnoreOccupancy?[v]??false ? null : _displayedEntity.GearOccupancy[v.x, v.y]?.EquippableItem;
var hardpoint = _displayedEntity.Hardpoints[v.x, v.y];
bool HardpointMatch(int2 offset)
@ -520,7 +705,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
return !(
hullData.Shape[v2] &&
_displayedEntity.Hardpoints[v2.x, v2.y] == hardpoint &&
(FakeOccupancy?[v2]??false ? FakeEquipment : IgnoreOccupancy?[v2]??false ? null : _displayedEntity.GearOccupancy[v2.x, v2.y]) == item
(FakeOccupancy?[v2]??false ? FakeItem : IgnoreOccupancy?[v2]??false ? null : _displayedEntity.GearOccupancy[v2.x, v2.y]?.EquippableItem) == item
);
}
@ -531,7 +716,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
hullData.Shape[v2] && (
!interior && !hullData.InteriorCells[v2] && _displayedEntity.Hardpoints[v2.x, v2.y] == null ||
interior && item != null &&
(FakeOccupancy?[v2]??false ? FakeEquipment : IgnoreOccupancy?[v2]??false ? null : _displayedEntity.GearOccupancy[v2.x, v2.y]) == item
(FakeOccupancy?[v2]??false ? FakeItem : IgnoreOccupancy?[v2]??false ? null : _displayedEntity.GearOccupancy[v2.x, v2.y]?.EquippableItem) == item
)
);
}
@ -619,14 +804,15 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
var hullData = GameManager.ItemManager.GetData(_displayedEntity.Hull) as HullData;
var interior = hullData.InteriorCells[position];
var hardpoint = _displayedEntity.Hardpoints[position.x, position.y];
var item = FakeOccupancy?[position] ?? false ? FakeEquipment : IgnoreOccupancy?[position] ?? false ? null : _displayedEntity.GearOccupancy[position.x, position.y];
var item = (FakeOccupancy?[position] ?? false ? FakeItem :
IgnoreOccupancy?[position] ?? false ? null : _displayedEntity.GearOccupancy[position.x, position.y]?.EquippableItem) as EquippableItem;
if (_hud)
{
if (_displayedEntity.Armor[position.x, position.y] > .01f)
return Settings.ArmorGradient.Evaluate(_displayedEntity.Armor[position.x, position.y] / _displayedEntity.MaxArmor[position.x, position.y]);
if (item != null) return Settings.DurabilityGradient.Evaluate(item.EquippableItem.Durability / _displayedEntity.ItemManager.GetData(item.EquippableItem).Durability);
if (item != null) return Settings.DurabilityGradient.Evaluate(item.Durability / _displayedEntity.ItemManager.GetData(item).Durability);
return float3(.25f).ToColor();
}
@ -671,21 +857,6 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
}
}
public bool DropItem(ItemInstance item, int2 position)
{
if (_displayedEntity != null && item is EquippableItem equippableItem)
{
return _displayedEntity.TryEquip(equippableItem, position);
}
if(_displayedCargo != null)
{
return _displayedCargo.TryStore(item, position);
}
return false;
}
public bool CanDropItem(ItemInstance item)
{
if (_displayedEntity != null && item is EquippableItem equippableItem)
@ -717,12 +888,16 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
}
public Subject<PointerEventData> OnBackgroundClick = new Subject<PointerEventData>();
private Transform[] _dragCells;
private Vector2[] _dragOffsets;
private ItemRotation _originalRotation;
public Subject<(InventoryEventData data, int clickCount)> OnClickAsObservable() => _onClick ?? (_onClick = new Subject<(InventoryEventData data, int clickCount)>());
public UniRx.IObservable<InventoryEventData> OnBeginDragAsObservable() => _onBeginDrag ?? (_onBeginDrag = new Subject<InventoryEventData>());
public UniRx.IObservable<InventoryEventData> OnDragAsObservable() => _onDrag ?? (_onDrag = new Subject<InventoryEventData>());
public UniRx.IObservable<InventoryEventData> OnEndDragAsObservable() => _onEndDrag ?? (_onEndDrag = new Subject<InventoryEventData>());
public UniRx.IObservable<InventoryEventData> OnPointerEnterAsObservable() => _onPointerEnter ?? (_onPointerEnter = new Subject<InventoryEventData>());
public UniRx.IObservable<InventoryEventData> OnPointerExitAsObservable() => _onPointerExit ?? (_onPointerExit = new Subject<InventoryEventData>());
// public UniRx.IObservable<InventoryEventData> OnBeginDragAsObservable() => _onBeginDrag ?? (_onBeginDrag = new Subject<InventoryEventData>());
// public UniRx.IObservable<InventoryEventData> OnDragAsObservable() => _onDrag ?? (_onDrag = new Subject<InventoryEventData>());
// public UniRx.IObservable<InventoryEventData> OnEndDragAsObservable() => _onEndDrag ?? (_onEndDrag = new Subject<InventoryEventData>());
// public UniRx.IObservable<InventoryEventData> OnPointerEnterAsObservable() => _onPointerEnter ?? (_onPointerEnter = new Subject<InventoryEventData>());
// public UniRx.IObservable<InventoryEventData> OnPointerExitAsObservable() => _onPointerExit ?? (_onPointerExit = new Subject<InventoryEventData>());
public void OnPointerClick(PointerEventData eventData)
{