From 1b3218bb6711fbf8bb48f6fc110a794f305b2e3a Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Thu, 7 Jul 2022 19:32:25 +0200
Subject: [PATCH] Added fadein/fadeout limit argument

@Screen.ScreenFadeColor also defaults to Black if there's no argument
---
 .../V2/ScriptCommands/DoScreen.vb             | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb
index 9c6eb297c..ff0b807f0 100644
--- a/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb
+++ b/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb
@@ -81,13 +81,19 @@
                     CanContinue = False
                 Case "fadein"
                     Dim fadeSpeed As Integer = 5
+                    Dim fadeLimit As Integer = 0
                     If argument <> "" Then
-                        fadeSpeed = int(argument)
+                        If argument.Contains(",") Then
+                            fadeSpeed = int(argument.GetSplit(0, ","))
+                            fadeLimit = int(argument.GetSplit(1, ","))
+                        Else
+                            fadeSpeed = int(argument)
+                        End If
                     End If
-                    If OverworldScreen.FadeValue > 0 Then
+                    If OverworldScreen.FadeValue > fadeLimit Then
                         OverworldScreen.FadeValue -= fadeSpeed
-                        If OverworldScreen.FadeValue <= 0 Then
-                            OverworldScreen.FadeValue = 0
+                        If OverworldScreen.FadeValue <= fadeLimit Then
+                            OverworldScreen.FadeValue = fadeLimit
                             IsReady = True
                         End If
                     Else
@@ -95,13 +101,19 @@
                     End If
                 Case "fadeout"
                     Dim fadeSpeed As Integer = 5
+                    Dim fadeLimit As Integer = 255
                     If argument <> "" Then
-                        fadeSpeed = int(argument)
+                        If argument.Contains(",") Then
+                            fadeSpeed = int(argument.GetSplit(0, ","))
+                            fadeLimit = int(argument.GetSplit(1, ","))
+                        Else
+                            fadeSpeed = int(argument)
+                        End If
                     End If
-                    If OverworldScreen.FadeValue < 255 Then
+                    If OverworldScreen.FadeValue < fadeLimit Then
                         OverworldScreen.FadeValue += fadeSpeed
-                        If OverworldScreen.FadeValue >= 255 Then
-                            OverworldScreen.FadeValue = 255
+                        If OverworldScreen.FadeValue >= fadeLimit Then
+                            OverworldScreen.FadeValue = fadeLimit
                             IsReady = True
                         End If
                     Else
@@ -113,6 +125,8 @@
                         Dim colorG As Integer = int(argument.GetSplit(1))
                         Dim colorB As Integer = int(argument.GetSplit(2))
                         OverworldScreen.FadeColor = New Color(colorR, colorG, colorB)
+                    Else
+                        OverworldScreen.FadeColor = Color.Black
                     End If
                     IsReady = True
                 Case "setfade"