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

0
Assets/Scripts/GameSettings.cs → Assets/Scripts/Gameplay/GameSettings.cs
View file

0
Assets/Scripts/GameSettings.cs.meta → Assets/Scripts/Gameplay/GameSettings.cs.meta
View file

4
Assets/Scripts/Gameplay/Weapons/GuidedProjectile.cs
View file

@ -65,7 +65,7 @@ public class GuidedProjectile : MonoBehaviour
}
var diff = Target.position - transform.position;
var targetDist = diff.magnitude;
var targetDist = diff.Flatland().magnitude;
if (_prevDist < targetDist)
{
@ -74,7 +74,7 @@ public class GuidedProjectile : MonoBehaviour
_prevDist = targetDist;
var position = (float3) t.position;
var sourceDist = length((float3) Source.position - position);
var sourceDist = length(((float3) Source.position).xz - position.xz);
var curveLerp = 1 - targetDist / (sourceDist + targetDist);
var dir = diff.normalized;
var right = cross(dir, float3(0, 1, 0));

2
Assets/Scripts/Sector Display/SectorRenderer.cs
View file

@ -660,7 +660,7 @@ public class SectorRenderer : MonoBehaviour
if (entity.Key.Target.Value != null && !EntityInstances.ContainsKey(entity.Key.Target.Value))
entity.Key.Target.Value = null;
entity.Value.LookAtPoint.position = entity.Value.Transform.position + (Vector3) entity.Key.LookDirection * (entity.Key.Target.Value != null
? (EntityInstances[entity.Key.Target.Value].Transform.position - entity.Value.Transform.position).magnitude : 10000);
? max((EntityInstances[entity.Key.Target.Value].Transform.position - entity.Value.Transform.position).magnitude,Settings.GameplaySettings.ConvergenceMinimumDistance) : 10000);
entity.Value.Transform.position = entity.Key.Position;
}
foreach(var e in hitList)

67
Assets/Scripts/ServerShared/AetheriaMath.cs Normal file
View file

@ -0,0 +1,67 @@
using System.Collections;
using System.Collections.Generic;
using Unity.Mathematics;
using static Unity.Mathematics.math;
public class AetheriaMath
{
//first-order intercept using absolute target position
public static float3 FirstOrderIntercept
(
float3 shooterPosition,
float3 shooterVelocity,
float shotSpeed,
float3 targetPosition,
float3 targetVelocity
) {
float3 targetRelativePosition = targetPosition - shooterPosition;
float3 targetRelativeVelocity = targetVelocity - shooterVelocity;
float t = FirstOrderInterceptTime
(
shotSpeed,
targetRelativePosition,
targetRelativeVelocity
);
return targetPosition + t*targetRelativeVelocity;
}
//first-order intercept using relative target position
public static float FirstOrderInterceptTime
(
float shotSpeed,
float3 targetRelativePosition,
float3 targetRelativeVelocity
) {
float velocitySquared = lengthsq(targetRelativeVelocity);
if(velocitySquared < 0.001f)
return 0f;
float a = velocitySquared - shotSpeed*shotSpeed;
//handle similar velocities
if (abs(a) < 0.001f)
{
float t = -lengthsq(targetRelativePosition)/ (2f*dot(targetRelativeVelocity, targetRelativePosition));
return max(t, 0f); //don't shoot back in time
}
float b = 2f*dot(targetRelativeVelocity, targetRelativePosition);
float c = lengthsq(targetRelativePosition);
float determinant = b*b - 4f*a*c;
if (determinant > 0f) { //determinant > 0; two intercept paths (most common)
float t1 = (-b + sqrt(determinant))/(2f*a),
t2 = (-b - sqrt(determinant))/(2f*a);
if (t1 > 0f) {
if (t2 > 0f)
return min(t1, t2); //both are positive
else
return t1; //only t1 is positive
} else
return max(t2, 0f); //don't shoot back in time
} else if (determinant < 0f) //determinant < 0; no intercept path
return 0f;
else //determinant = 0; one intercept path, pretty much never happens
return max(-b/(2f*a), 0f); //don't shoot back in time
}
}

11
Assets/Scripts/ServerShared/AetheriaMath.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 70c5f24f81c803248a4f682e6eb12ef2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

24
Assets/Scripts/ServerShared/Behaviors/TurretController.cs
View file

@ -9,6 +9,7 @@ using Newtonsoft.Json;
using UniRx;
using Unity.Mathematics;
using static Unity.Mathematics.math;
using float3 = Unity.Mathematics.float3;
[MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable]
public class TurretControllerData : BehaviorData
@ -23,6 +24,8 @@ public class TurretController : IBehavior
{
private TurretControllerData _data;
private List<Weapon> _weapons = new List<Weapon>();
private float _shotSpeed;
private bool _predictShots;
public Entity EquippedEntity { get; }
public EquippedItem Item { get; }
@ -55,7 +58,14 @@ public class TurretController : IBehavior
{
foreach (var b in item.Behaviors)
if (b is Weapon weapon)
{
_weapons.Add(weapon);
if (weapon.Data is ProjectileWeaponData projectileWeaponData)
{
_predictShots = true;
_shotSpeed = EquippedEntity.ItemManager.Evaluate(projectileWeaponData.Velocity, weapon.Item.EquippableItem, EquippedEntity);
}
}
}
public bool Execute(float delta)
@ -63,7 +73,19 @@ public class TurretController : IBehavior
if (EquippedEntity.Target.Value != null)
{
var diff = EquippedEntity.Target.Value.Position - EquippedEntity.Position;
EquippedEntity.LookDirection = normalize(diff);
if (_predictShots)
{
var targetHullData = EquippedEntity.ItemManager.GetData(EquippedEntity.Target.Value.Hull) as HullData;
var targetVelocity = float3(EquippedEntity.Target.Value.Velocity.x, 0, EquippedEntity.Target.Value.Velocity.y);
var predictedPosition = AetheriaMath.FirstOrderIntercept(
EquippedEntity.Position, float3.zero, _shotSpeed,
EquippedEntity.Target.Value.Position, targetVelocity
);
predictedPosition.y = EquippedEntity.Zone.GetHeight(predictedPosition.xz) + targetHullData.GridOffset;
EquippedEntity.LookDirection = normalize(predictedPosition - EquippedEntity.Position);
}
else
EquippedEntity.LookDirection = normalize(diff);
var dist = length(diff);
foreach (var x in _weapons)

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

@ -859,6 +859,15 @@ public class EquippedCargoBay : EquippedItem
return false;
}
public bool TryStore(ItemInstance item)
{
if (item is SimpleCommodity simpleCommodity)
return TryStore(simpleCommodity);
if (item is CraftedItemInstance craftedItem)
return TryStore(craftedItem);
return false;
}
public bool TryStore(ItemInstance item, int2 cargoCoord)
{

1
Assets/Scripts/ServerShared/Settings.cs
View file

@ -111,4 +111,5 @@ public class GameplaySettings
public float TorqueFloor;
public float TorqueMultiplier;
public float VisibilityDecay;
public float ConvergenceMinimumDistance;
}

90
Assets/Scripts/UI/InventoryMenu.cs
View file

@ -275,27 +275,43 @@ public class InventoryMenu : MonoBehaviour
var item = cargoEvent.CargoBay.Occupancy[cargoEvent.Position.x, cargoEvent.Position.y];
if(item!=null)
{
if (_selectedPanel != null)
if (Mouse.current.clickCount.ReadValue() == 2)
{
var otherPanel = panel == InventoryPanels[0] ? InventoryPanels[1] : InventoryPanels[0];
if (otherPanel.DropItem(item))
{
cargoEvent.CargoBay.Remove(item);
panel.RefreshCells();
otherPanel.RefreshCells();
}
}
else
{
if (_selectedPanel != null)
{
if (_selectedPanel.CellInstances.ContainsKey(_selectedPosition))
{
foreach (var v in _selectedItemData.Shape.Coordinates)
{
var v2 = _selectedItemData.Shape.Rotate(v, _selectedItem.Rotation) + _selectedPosition;
_selectedPanel.CellInstances[v2].Icon.color = _selectedPanel.GetColor(v2);
}
}
}
_selectedPanel = panel;
_selectedPosition = cargoEvent.Position;
PropertiesPanel.Clear();
PropertiesPanel.AddItemProperties(item);
_selectedPanel = panel;
_selectedPosition = cargoEvent.CargoBay.Cargo[item];
_selectedItem = item;
_selectedItemData = GameManager.ItemManager.GetData(item);
foreach (var v in _selectedItemData.Shape.Coordinates)
{
var v2 = _selectedItemData.Shape.Rotate(v, _selectedItem.Rotation) + _selectedPosition;
_selectedPanel.CellInstances[v2].Icon.color = _selectedPanel.GetColor(v2);
_selectedPanel.CellInstances[v2].Icon.color = _selectedPanel.GetColor(v2, true);
}
}
_selectedPanel = panel;
_selectedPosition = cargoEvent.Position;
PropertiesPanel.Clear();
PropertiesPanel.AddItemProperties(item);
_selectedPanel = panel;
_selectedPosition = cargoEvent.CargoBay.Cargo[item];
_selectedItem = item;
_selectedItemData = GameManager.ItemManager.GetData(item);
foreach (var v in _selectedItemData.Shape.Coordinates)
{
var v2 = _selectedItemData.Shape.Rotate(v, _selectedItem.Rotation) + _selectedPosition;
_selectedPanel.CellInstances[v2].Icon.color = _selectedPanel.GetColor(v2, true);
}
}
}
else if (data is InventoryEntityEventData entityEvent)
@ -303,26 +319,40 @@ public class InventoryMenu : MonoBehaviour
var item = entityEvent.Entity.GearOccupancy[entityEvent.Position.x, entityEvent.Position.y];
if (item != null)
{
if (_selectedPanel != null)
if (Mouse.current.clickCount.ReadValue() == 2)
{
if(_selectedPanel.CellInstances.ContainsKey(_selectedItemData.Shape.Coordinates.First()))
var otherPanel = panel == InventoryPanels[0] ? InventoryPanels[1] : InventoryPanels[0];
if (otherPanel.DropItem(item.EquippableItem))
{
foreach (var v in _selectedItemData.Shape.Coordinates)
{
var v2 = _selectedItemData.Shape.Rotate(v, _selectedItem.Rotation) + _selectedPosition;
_selectedPanel.CellInstances[v2].Icon.color = _selectedPanel.GetColor(v2);
}
entityEvent.Entity.Unequip(item);
panel.RefreshCells();
otherPanel.RefreshCells();
}
}
PropertiesPanel.Inspect(entityEvent.Entity, item);
_selectedPanel = panel;
_selectedPosition = item.Position;
_selectedItem = item.EquippableItem;
_selectedItemData = GameManager.ItemManager.GetData(item.EquippableItem);
foreach (var v in _selectedItemData.Shape.Coordinates)
else
{
var v2 = _selectedItemData.Shape.Rotate(v, _selectedItem.Rotation) + _selectedPosition;
_selectedPanel.CellInstances[v2].Icon.color = _selectedPanel.GetColor(v2, true);
if (_selectedPanel != null)
{
if (_selectedPanel.CellInstances.ContainsKey(_selectedPosition))
{
foreach (var v in _selectedItemData.Shape.Coordinates)
{
var v2 = _selectedItemData.Shape.Rotate(v, _selectedItem.Rotation) + _selectedPosition;
_selectedPanel.CellInstances[v2].Icon.color = _selectedPanel.GetColor(v2);
}
}
}
PropertiesPanel.Inspect(entityEvent.Entity, item);
_selectedPanel = panel;
_selectedPosition = item.Position;
_selectedItem = item.EquippableItem;
_selectedItemData = GameManager.ItemManager.GetData(item.EquippableItem);
foreach (var v in _selectedItemData.Shape.Coordinates)
{
var v2 = _selectedItemData.Shape.Rotate(v, _selectedItem.Rotation) + _selectedPosition;
_selectedPanel.CellInstances[v2].Icon.color = _selectedPanel.GetColor(v2, true);
}
}
}
}

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>());