Ws local content

Source/Documentation/Manual/driving.rst

@@ -676,20 +676,17 @@ Dispatcher Window
 =================
 
 The dispatcher window is a very useful tool to monitor and control train 
-operation. The :ref:`Dispatcher window <options-dispatcher>` option 
-must be selected.
-
-The dispatcher window is actually created by pressing ``<Ctrl+9>``. The 
-window is created in a minimized state, so to display it in front of the OR 
-window you must click on ``<Alt+Tab>`` and select the dispatcher window 
-icon, or click on one of the OR icons in the taskbar. If you are running OR 
-in full-screen mode, you must also have the :ref:`Fast full screen Alt+Tab 
-<options-fullscreen>` option selected to have both the OR and the 
-dispatcher windows displayed at the same time. After the dispatcher window 
-has been selected with ``<Alt+Tab>``, successive Alt_Tabs will toggle 
-between the OR window and the dispatcher window.
+operation. operation. To use it, select the :ref:`Dispatcher window 
+<options-dispatcher>` option before you start the route.
+
+Open the dispatcher window by pressing ``<Ctrl+9>``. You can toggle 
+between the OR window and the dispatcher window by pressing ``<Alt+Tab>`` .
+
+If you have unchecked the option ``Windowed``, then the game window opens
+full screen and the dispatch window opens out of sight behind it. You can
+prevent this by checking the option Fast full-screen alt-tab in Options > Video.
 
-The dispatcher window is resizable and can also be maximized, e.g. on a 
+The dispatcher window is not resizable but can be maximized, e.g. on a 
 second display. You can define the level of zoom either by changing the 
 value within the ``Res`` box or by using the mouse wheel. You can pan 
 through the route by moving the mouse while pressing the left button. You 

Source/Documentation/Manual/operation.rst

@@ -1800,6 +1800,10 @@ On the other hand, a horn blow waiting point may be positioned just after a
 normal WP (thus achieving the effect that the train blows the horn when it 
 restarts).
 
+If the lead locomotive of the AI train has parameter DoesHornTriggerBell 
+set to 1 in the .eng file, the bell is played for further 30 seconds after 
+the end of the horn blow.
+
 To implement this feature it is not necessary to proceed as described in the 
 first three paragraphs of this chapter. It is enough to insert the waiting 
 points within the paths with either the MSTS AE or through TrackViewer.
@@ -1824,6 +1828,10 @@ the route with TrackViewer allows identification of the true level crossings.
 If a horn blow is also desired for a *simple* road crossing, the feature *AI 
 Train Horn Blow* described above must be used.
 
+If the lead locomotive of the AI train has parameter DoesHornTriggerBell 
+set to 1 in the .eng file, the bell is played for further 30 seconds after 
+the end of the horn blow.
+
 .. _operation-event-triggered-by-ai-train:
 
 Location Event triggered by AI Train

Source/Menu/Options.cs

@@ -148,9 +148,11 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, bool init
             comboPressureUnit.Text = Settings.PressureUnit;
             comboBoxOtherUnits.Text = settings.Units;
             checkDisableTCSScripts.Checked = Settings.DisableTCSScripts;
-
+            checkEnableWebServer.Checked = Settings.WebServer;
+            numericWebServerPort.Value = Settings.WebServerPort;
 
             // Audio tab
+
             checkMSTSBINSound.Checked = Settings.MSTSBINSound;
             numericSoundVolumePercent.Value = Settings.SoundVolumePercent;
             numericSoundDetailLevel.Value = Settings.SoundDetailLevel;
@@ -436,6 +438,7 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.PressureUnit = comboPressureUnit.SelectedValue.ToString();
             Settings.Units = comboBoxOtherUnits.SelectedValue.ToString();
             Settings.DisableTCSScripts = checkDisableTCSScripts.Checked;
+            Settings.WebServer = checkEnableWebServer.Checked;
 
             // Audio tab
             Settings.MSTSBINSound = checkMSTSBINSound.Checked;
@@ -739,5 +742,6 @@ private void checkPerformanceTuner_Click(object sender, EventArgs e)
             numericPerformanceTunerTarget.Enabled = checkPerformanceTuner.Checked;
             labelPerformanceTunerTarget.Enabled = checkPerformanceTuner.Checked;
         }
+
     }
 }

Source/Menu/Options.resx

@@ -112,18 +112,18 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="bindingSourceContent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="bindingSourceContent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>114, 17</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>

Source/ORTS.Settings/UserSettings.cs

@@ -112,6 +112,12 @@ public enum Menu_SelectionIndex
         public int Multiplayer_Port { get; set; }
 
         // General settings:
+
+        [Default(false)]
+        public bool WebServer { get; set; }
+        [Default(2150)]
+        public int WebServerPort { get; set; }
+
         [Default(false)]
         public bool Alerter { get; set; }
         [Default(true)]

Source/Orts.Simulation/Simulation/AIs/AIAuxAction.cs

@@ -144,16 +144,44 @@ public void Save(BinaryWriter outf, int currentClock)
             {
 
                 if (ThisTrain is AITrain && ((aiTrain.MovementState == AITrain.AI_MOVEMENT_STATE.HANDLE_ACTION && aiTrain.nextActionInfo != null &&
-                aiTrain.nextActionInfo.NextAction == AIActionItem.AI_ACTION_TYPE.AUX_ACTION && aiTrain.nextActionInfo != null && aiTrain.nextActionInfo is AuxActionWPItem)
+                aiTrain.nextActionInfo.NextAction == AIActionItem.AI_ACTION_TYPE.AUX_ACTION && aiTrain.nextActionInfo is AuxActionWPItem)
                 || ( aiTrain.AuxActionsContain.SpecAuxActions.Count > 0 &&
                 aiTrain.AuxActionsContain.SpecAuxActions[0] is AIActionWPRef && (aiTrain.AuxActionsContain.SpecAuxActions[0] as AIActionWPRef).keepIt != null &&
                 (aiTrain.AuxActionsContain.SpecAuxActions[0] as AIActionWPRef).keepIt.currentMvmtState == AITrain.AI_MOVEMENT_STATE.HANDLE_ACTION)))
                 // WP is running
                 {
-                    int remainingDelay;                  
-                    if (aiTrain.nextActionInfo != null && aiTrain.nextActionInfo is AuxActionWPItem) remainingDelay = ((AuxActionWPItem)aiTrain.nextActionInfo).ActualDepart - currentClock;
-                    else remainingDelay = ((AIActionWPRef)SpecAuxActions[0]).keepIt.ActualDepart - currentClock;
-                    ((AIActionWPRef)SpecAuxActions[0]).SetDelay(remainingDelay);
+                    // Do nothing if it is an absolute WP
+                    if (!(aiTrain.AuxActionsContain.SpecAuxActions.Count > 0 && aiTrain.AuxActionsContain.SpecAuxActions[0] is AIActionWPRef && 
+                        (aiTrain.AuxActionsContain.SpecAuxActions[0] as AIActionWPRef).Delay >= 30000 && (aiTrain.AuxActionsContain.SpecAuxActions[0] as AIActionWPRef).Delay < 40000))
+                    {
+                        int remainingDelay;
+                        if (aiTrain.nextActionInfo != null && aiTrain.nextActionInfo is AuxActionWPItem) remainingDelay = ((AuxActionWPItem)aiTrain.nextActionInfo).ActualDepart - currentClock;
+                        else remainingDelay = ((AIActionWPRef)SpecAuxActions[0]).keepIt.ActualDepart - currentClock;
+                        ((AIActionWPRef)SpecAuxActions[0]).SetDelay(remainingDelay);
+                    }
+                }
+            }
+            // check for horn actions
+            if (ThisTrain is AITrain && aiTrain.AuxActionsContain.specRequiredActions.Count > 0)
+            {
+                foreach (AITrain.DistanceTravelledItem specRequiredAction in aiTrain.AuxActionsContain.specRequiredActions)
+                {
+                    if (specRequiredAction is AuxActionHornItem)
+                    {
+                        if (SpecAuxActions.Count > 0)
+                        {
+                            foreach (AuxActionRef specAuxAction in SpecAuxActions)
+                            {
+                                if (specAuxAction is AIActionHornRef)
+                                {
+                                    (specAuxAction as AIActionHornRef).Delay = (specRequiredAction as AuxActionHornItem).ActualDepart - currentClock;
+                                    break;
+                                }
+                            }
+                            break;
+                        }
+                        else break;
+                    }
                 }
             }
             foreach (var action in SpecAuxActions)
@@ -1901,6 +1929,7 @@ public class AuxActionHornItem : AuxActionItem
         int Delay;
         [JsonIgnore]
         public int ActualDepart;
+        private const int BellPlayTime = 30;
 
 
         //================================================================================================//
@@ -1977,36 +2006,43 @@ public override AITrain.AI_MOVEMENT_STATE InitAction(Train thisTrain, int presen
             Processing = true;
             int correctedTime = presentTime;
             ActualDepart = correctedTime + Delay;
+            if (!Triggered)
+            {
+#if WITH_PATH_DEBUG
+                    File.AppendAllText(@"C:\temp\checkpath.txt", "Do Horn for AITRain " + thisTrain.Number + " , mvt state " + movementState.ToString() + " at " + presentTime + "\n");
+#endif
+                TrainCar locomotive = thisTrain.FindLeadLocomotive();
+                ((MSTSLocomotive)locomotive).ManualHorn = true;
+                Triggered = true;
+            }
             return AITrain.AI_MOVEMENT_STATE.HANDLE_ACTION;
         }
 
         public override AITrain.AI_MOVEMENT_STATE HandleAction(Train thisTrain, int presentTime, float elapsedClockSeconds, AITrain.AI_MOVEMENT_STATE movementState)
         {
             if (ActualDepart >= presentTime)
             {
-                if (!Triggered)
-                {
-#if WITH_PATH_DEBUG
-                    File.AppendAllText(@"C:\temp\checkpath.txt", "Do Horn for AITRain " + thisTrain.Number + " , mvt state " + movementState.ToString() + " at " + presentTime + "\n");
-#endif
-                    TrainCar locomotive = thisTrain.FindLeadLocomotive();
-                    ((MSTSLocomotive)locomotive).ManualHorn = true;
-                    Triggered = true;
-                }
                 movementState = AITrain.AI_MOVEMENT_STATE.HANDLE_ACTION;
             }
             else
             {
-                thisTrain.AuxActionsContain.Remove(this);
-
+                TrainCar locomotive = thisTrain.FindLeadLocomotive();
                 if (Triggered)
                 {
 #if WITH_PATH_DEBUG
                 File.AppendAllText(@"C:\temp\checkpath.txt", "Stop Horn for AITRain " + thisTrain.Number + " : mvt state " + movementState.ToString() + " at " + presentTime + "\n");
 #endif
-                    TrainCar locomotive = thisTrain.FindLeadLocomotive();
                     ((MSTSLocomotive)locomotive).ManualHorn = false;
+                    Triggered = false;
                 }
+                if (((MSTSLocomotive)locomotive).DoesHornTriggerBell && ActualDepart + BellPlayTime >= presentTime)
+                {
+                    movementState = AITrain.AI_MOVEMENT_STATE.HANDLE_ACTION;
+                    return movementState;
+                }
+                else if (((MSTSLocomotive)locomotive).DoesHornTriggerBell && ActualDepart + BellPlayTime < presentTime)
+                    ((MSTSLocomotive)locomotive).BellState = MSTSLocomotive.SoundState.Stopped;
+                thisTrain.AuxActionsContain.Remove(this);
                 return currentMvmtState;    //  Restore previous MovementState
             }
             return movementState;

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -1403,6 +1403,7 @@ public override void Update(float elapsedClockSeconds)
 
             ApplyDirectionToMotiveForce();
 
+            // Update dynamic brake force
             if (DynamicBrakePercent > 0 && DynamicBrakeForceCurves != null && AbsSpeedMpS > 0)
             {
                 float f = DynamicBrakeForceCurves.Get(.01f * DynamicBrakePercent, AbsSpeedMpS);
@@ -1415,7 +1416,8 @@ public override void Update(float elapsedClockSeconds)
                     DynamicBrakeForceN = 0f;
                 }
             }
-//            else if (DynamicBrakePercent == -1) DynamicBrakeForceN = 0;
+            else
+                DynamicBrakeForceN = 0; // Set dynamic brake force to zero if in Notch 0 position
 
             UpdateFrictionCoefficient(elapsedClockSeconds); // Find the current coefficient of friction depending upon the weather
 
@@ -3796,6 +3798,10 @@ public virtual float GetDataOf(CabViewControl cvc)
                             data = this.FilteredMotiveForceN;
                         else
                             data = this.LocomotiveAxle.AxleForceN;
+                        if (DynamicBrakePercent > 0)
+                        {
+                            data = DynamicBrakeForceN;
+                        }
                         data = Math.Abs(data);
                         switch (cvc.Units)
                         {