Murder Satellites
Created TurretController, which performs basic combat for fixed orbital installations Projectiles self-destruct at maximum range Created turret prefab Outfitted turret in game manager Entity position is now 3D Entities responsible for updating their own position and orientation Barrel positions and orientations available from entity code Inventory code will display modal dialog for invalid item moves instead of breaking Yaw articulation working (full 360 rotation still borked)
This commit is contained in:
parent
8aaccac2b5
commit
ef816cc7e0
60 changed files with 2536 additions and 244 deletions
|
|
@ -388,16 +388,19 @@ public class InventoryPanel : MonoBehaviour
|
|||
}
|
||||
}
|
||||
|
||||
public void DropItem(ItemInstance item, int2 position)
|
||||
public bool DropItem(ItemInstance item, int2 position)
|
||||
{
|
||||
if (_displayedEntity != null && item is EquippableItem equippableItem)
|
||||
{
|
||||
_displayedEntity.TryEquip(equippableItem, position);
|
||||
return _displayedEntity.TryEquip(equippableItem, position);
|
||||
}
|
||||
else
|
||||
|
||||
if(_displayedCargo != null)
|
||||
{
|
||||
_displayedCargo?.TryStore(item, position);
|
||||
return _displayedCargo.TryStore(item, position);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public UniRx.IObservable<InventoryEventData> OnClickAsObservable() => _onClick ?? (_onClick = new Subject<InventoryEventData>());
|
||||
|
|
|
|||
Loading…
Reference in a new issue