Aetheric Drive
Added Aetheric Drive hardpoint and item behavior Added Drive RPM UI to HUD Fixed death not disabling continue option Disabling global input when dialog is visible Fixed loadout generator failure when zero price item present Replaced fixed top speed with drag coefficients
This commit is contained in:
parent
b171b940dc
commit
11bfc739fe
65 changed files with 2312 additions and 320 deletions
|
|
@ -49,6 +49,7 @@ public class ConfirmationDialog : PropertiesPanel
|
|||
else _onCancel?.Invoke();
|
||||
CancelClickCatcher?.gameObject.SetActive(false);
|
||||
gameObject.SetActive(false);
|
||||
ActionGameManager.Instance?.Input.Global.Enable();
|
||||
}
|
||||
|
||||
public void MoveToCursor()
|
||||
|
|
@ -71,5 +72,6 @@ public class ConfirmationDialog : PropertiesPanel
|
|||
ButtonGroup.SetActive(onConfirm!=null || onCancel!=null);
|
||||
|
||||
CancelClickCatcher?.gameObject.SetActive(true);
|
||||
ActionGameManager.Instance?.Input.Global.Disable();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -136,7 +136,11 @@ public class ConsoleView : MonoBehaviour {
|
|||
LogTextArea.text = string.Join("\n", newLog);
|
||||
// if (AcceptingInput)
|
||||
// LogTextArea.text += "\n\n> " + _inputString;
|
||||
Observable.NextFrame().Subscribe(_ => Scroll.verticalNormalizedPosition = 0);
|
||||
Observable.NextFrame().Subscribe(_ =>
|
||||
{
|
||||
if(Scroll)
|
||||
Scroll.verticalNormalizedPosition = 0;
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ public class ContextMenu : MonoBehaviour
|
|||
Destroy(_dropdown);
|
||||
CancelClickCatcher.gameObject.SetActive(false);
|
||||
gameObject.SetActive(false);
|
||||
ActionGameManager.Instance?.Input.Global.Enable();
|
||||
}
|
||||
|
||||
public void Clear()
|
||||
|
|
@ -128,5 +129,6 @@ public class ContextMenu : MonoBehaviour
|
|||
rect.position = (Parent != null ? ForcePosition : (Vector3) mousePosition) + Vector3.up * deltaY;
|
||||
if (Parent==null)
|
||||
CancelClickCatcher.gameObject.SetActive(true);
|
||||
ActionGameManager.Instance?.Input.Global.Disable();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ public class DropdownMenu : MonoBehaviour
|
|||
{
|
||||
CancelClickCatcher.gameObject.SetActive(false);
|
||||
gameObject.SetActive(false);
|
||||
ActionGameManager.Instance?.Input.Global.Enable();
|
||||
}
|
||||
|
||||
public void Clear()
|
||||
|
|
@ -74,5 +75,6 @@ public class DropdownMenu : MonoBehaviour
|
|||
rect.sizeDelta = parent.sizeDelta;
|
||||
rect.position = pivotTop ? corners[0] : corners[1];
|
||||
CancelClickCatcher.gameObject.SetActive(true);
|
||||
ActionGameManager.Instance?.Input.Global.Disable();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,11 +92,11 @@ public class MainMenu : MonoBehaviour
|
|||
_nextMenu.panel.Title.text = TitleSubtitle("aetheria", "terminus");
|
||||
if (!InGame)
|
||||
{
|
||||
if(ActionGameManager.PlayerSettings.CurrentRun != null)
|
||||
if(ActionGameManager.PlayerSettings.SavedRun != null)
|
||||
_nextMenu.panel.AddButton("Continue",
|
||||
() =>
|
||||
{
|
||||
ActionGameManager.CurrentSector = new Sector(ActionGameManager.CultCache, ActionGameManager.PlayerSettings.CurrentRun);
|
||||
ActionGameManager.CurrentSector = new Sector(ActionGameManager.CultCache, ActionGameManager.PlayerSettings.SavedRun);
|
||||
SceneManager.LoadScene("ARPG");
|
||||
});
|
||||
else
|
||||
|
|
@ -119,7 +119,7 @@ public class MainMenu : MonoBehaviour
|
|||
var task = Task.Run(() => new Sector(Settings.SectorGenerationSettings, ActionGameManager.CultCache, 0, setState));
|
||||
task.ContinueWith(task => Observable.NextFrame().Subscribe(_ =>
|
||||
{
|
||||
ActionGameManager.PlayerSettings.CurrentRun = null;
|
||||
ActionGameManager.PlayerSettings.SavedRun = null;
|
||||
ActionGameManager.CurrentSector = task.Result;
|
||||
SceneManager.LoadScene("ARPG");
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -23,14 +23,20 @@ public class SchematicDisplay : MonoBehaviour
|
|||
public GameObject ShieldIcon;
|
||||
public Image HeatsinkBackground;
|
||||
|
||||
public GameObject AetherDriveUi;
|
||||
public GameObject AetherDriveUiSpacer;
|
||||
|
||||
public TextMeshProUGUI EnergyLabel;
|
||||
public TextMeshProUGUI CockpitTemperatureLabel;
|
||||
public TextMeshProUGUI RadiatorTemperatureLabel;
|
||||
[FormerlySerializedAs("HeatsinkTemperatureLabel")] public TextMeshProUGUI HeatStorageTemperatureLabel;
|
||||
public TextMeshProUGUI HeatStorageTemperatureLabel;
|
||||
public TextMeshProUGUI CargoTemperatureLabel;
|
||||
public TextMeshProUGUI VisibilityLabel;
|
||||
public TextMeshProUGUI HullDurabilityLabel;
|
||||
public TextMeshProUGUI DistanceLabel;
|
||||
public TextMeshProUGUI ForwardRPMLabel;
|
||||
public TextMeshProUGUI StrafeRPMLabel;
|
||||
public TextMeshProUGUI TurnRPMLabel;
|
||||
|
||||
public RectTransform SensorCooldownFill;
|
||||
public RectTransform EnergyFill;
|
||||
|
|
@ -38,6 +44,9 @@ public class SchematicDisplay : MonoBehaviour
|
|||
public RectTransform HeatstrokeMeterFill;
|
||||
public RectTransform HypothermiaMeterFill;
|
||||
public RectTransform HeatstrokeLimitFill;
|
||||
public RectTransform ForwardRPMFill;
|
||||
public RectTransform StrafeRPMFill;
|
||||
public RectTransform TurnRPMFill;
|
||||
|
||||
public CanvasGroup TriggerGroups;
|
||||
public float TriggerGroupsFadeDuration = .5f;
|
||||
|
|
@ -55,6 +64,7 @@ public class SchematicDisplay : MonoBehaviour
|
|||
private EquippedCargoBay[] _cargoBays;
|
||||
private SchematicDisplayItem[] _schematicItems;
|
||||
private Graphic[] _groupGraphics;
|
||||
private AetherDrive _aetherDrive;
|
||||
|
||||
private int _selectedGroupIndex;
|
||||
private int _selectedItemIndex;
|
||||
|
|
@ -116,6 +126,9 @@ public class SchematicDisplay : MonoBehaviour
|
|||
_cockpit = entity.GetBehavior<Cockpit>();
|
||||
_reactor = entity.GetBehavior<Reactor>();
|
||||
_capacitors = entity.GetBehaviors<Capacitor>().ToArray();
|
||||
_aetherDrive = entity.GetBehavior<AetherDrive>();
|
||||
AetherDriveUi.SetActive(_aetherDrive != null);
|
||||
AetherDriveUiSpacer.SetActive(_aetherDrive != null);
|
||||
|
||||
_radiators = entity.GetBehaviors<Radiator>().ToArray();
|
||||
if (_radiators.Length == 0)
|
||||
|
|
@ -268,6 +281,18 @@ public class SchematicDisplay : MonoBehaviour
|
|||
EnergyFill.anchorMax = new Vector2(charge / maxCharge, 1);
|
||||
EnergyLabel.text = $"{((int)charge).ToString()}/{((int)maxCharge).ToString()} + ({((int)_reactor.Draw).ToString()})";
|
||||
}
|
||||
|
||||
if (_aetherDrive != null)
|
||||
{
|
||||
ForwardRPMLabel.text = ActionGameManager.PlayerSettings.Format(_aetherDrive.Rpm.x);
|
||||
ForwardRPMFill.anchorMax = new Vector2(_aetherDrive.Rpm.x / _aetherDrive.MaximumRpm, 1);
|
||||
|
||||
StrafeRPMLabel.text = ActionGameManager.PlayerSettings.Format(_aetherDrive.Rpm.y);
|
||||
StrafeRPMFill.anchorMax = new Vector2(_aetherDrive.Rpm.y / _aetherDrive.MaximumRpm, 1);
|
||||
|
||||
TurnRPMLabel.text = ActionGameManager.PlayerSettings.Format(_aetherDrive.Rpm.z);
|
||||
TurnRPMFill.anchorMax = new Vector2(_aetherDrive.Rpm.z / _aetherDrive.MaximumRpm, 1);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue