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

Misc. Improvements

Browse source 
Turrets lead their projectiles
Double click to equip/unequip/move
Minimum weapon convergence distance
This commit is contained in:
Reinier Vens 2021-01-27 16:14:41 +00:00
commit 922c8ea460
18 changed files with 240 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Assets/Scripts/UI/InventoryPanel.cs
View file

@ -144,6 +144,9 @@ public class InventoryPanel : MonoBehaviour
ship.SetParent(GameManager.CurrentShip.Parent);
GameManager.PlayerShips.Add(ship);
GameManager.Credits -= pack.Price(GameManager.ItemManager);
GameManager.CurrentShip = ship;
GameManager.DockingBay.DockedShip = ship;
Display(ship);
}, pack.Price(GameManager.ItemManager) < GameManager.Credits
)));
}
@ -630,6 +633,21 @@ public class InventoryPanel : MonoBehaviour
return false;
}
public bool DropItem(ItemInstance item)
{
if (_displayedEntity != null && item is EquippableItem equippableItem)
{
return _displayedEntity.TryEquip(equippableItem);
}
if(_displayedCargo != null)
{
return _displayedCargo.TryStore(item);
}
return false;
}
public UniRx.IObservable<InventoryEventData> OnClickAsObservable() => _onClick ?? (_onClick = new Subject<InventoryEventData>());
public UniRx.IObservable<InventoryEventData> OnBeginDragAsObservable() => _onBeginDrag ?? (_onBeginDrag = new Subject<InventoryEventData>());