diff --git a/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/JourneyBootDirector.cs b/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/JourneyBootDirector.cs index 0fdc23d..6d9bafa 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/JourneyBootDirector.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/JourneyBootDirector.cs @@ -23,8 +23,6 @@ namespace Intrepid.Gameplay.Journey.Runtime [GroupInjections, SerializeField] private JourneyGameplayGate gameplayGate; [GroupInjections, SerializeField] private JourneyLandingService landingService; - public bool IsBooted { get; private set; } - public void StartBoot( JourneyRuntimeBootMode bootMode, Action onFinished, diff --git a/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/Loading/StageStateMachine.cs b/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/Loading/StageStateMachine.cs index 10ee148..a238180 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/Loading/StageStateMachine.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/Loading/StageStateMachine.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using Intrepid.Diagnostics; using Intrepid.FSM; @@ -9,7 +10,8 @@ namespace Intrepid.Gameplay.Journey.Runtime.Loading private FStateMachine StateMachine { get; } = new(); private IState CurrentState => StateMachine.GetCurrentState(); - public StageTag CurrentStageTag => CurrentState.GetStateKey(); + public StageTag CurrentStageTag => CurrentState?.GetStateKey(); + public bool HasCurrentStage => CurrentStageTag.IsNotNull(); public bool IsLoadingFinished => CurrentState?.Implementation()?.IsLoadingFinished ?? false; public bool IsRunning => StateMachine.IsRunning; diff --git a/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/Transition/JourneyTransitionDirector.cs b/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/Transition/JourneyTransitionDirector.cs index 5b07bfe..dc21b39 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/Transition/JourneyTransitionDirector.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Journey/Runtime/Transition/JourneyTransitionDirector.cs @@ -28,10 +28,7 @@ namespace Intrepid.Gameplay.Journey.Runtime.Transition private Action OnFinished { get; set; } private Action OnFailed { get; set; } - - public JourneyStageLoader StageLoader => stageLoader; - public JourneyLandingService LandingService => landingService; - public JourneyGameplayGate GameplayGate => gameplayGate; + public bool IsRunning => CurrentRequest is not null; public bool IsProcessFinished => CurrentRequest is not null &&