Build 0.18.13.0

2022-07-01 12:16:36 +09:00
parent 8e6c601162
commit 497045de7e
79 changed files with 717 additions and 361 deletions
@@ -184,24 +184,9 @@ namespace Barotrauma
                },
                OnClicked = (btn, userdata) =>
                {
-                    var availableTransition = GetAvailableTransition(out _, out _);
-                    if (Character.Controlled != null &&
-                        availableTransition == TransitionType.ReturnToPreviousLocation &&
-                        Character.Controlled?.Submarine == Level.Loaded?.StartOutpost)
-                    {
-                        TryEndRound();
-                    }
-                    else if (Character.Controlled != null &&
-                        availableTransition == TransitionType.ProgressToNextLocation &&
-                        Character.Controlled?.Submarine == Level.Loaded?.EndOutpost)
-                    {
-                        TryEndRound();
-                    }
-                    else
-                    {
-                        ShowCampaignUI = true;
-                        CampaignUI.SelectTab(InteractionType.Map);
-                    }
+                    TryEndRoundWithFuelCheck(
+                        onConfirm: () => TryEndRound(),
+                        onReturnToMapScreen: () => { ShowCampaignUI = true; CampaignUI.SelectTab(InteractionType.Map); });
                    return true;
                }
            };