Further adjustments for multiple fuels

Author: peternewell

Source/Orts.Simulation/Simulation/Confirmer.cs

@@ -226,7 +226,7 @@ public Confirmer(Simulator simulator, double defaultDurationS)
                 , new string [] { GetString("LargeEjector"), null, null, null, GetString("decrease"), GetString("increase") }
                 , new string [] { GetString("SmallEjector"), null, null, null, GetString("decrease"), GetString("increase") }
                 , new string [] { GetString("VacuumExhauster"), GetString("normal"), null, GetString("fast") }
-                , new string [] { GetString("Tender"), null, null, GetString("Coal re-filled"), null, GetString("Coal level") } 
+                , new string [] { GetString("Tender"), null, null, GetString("Fuel re-filled"), null, GetString("Fuel level") } 
                 , new string [] { GetString("Tender"), null, null, GetString("Water re-filled"), null, GetString("Water level") }
                 // General
                 , new string [] { GetString("Water Scoop"), GetString("up"), null, GetString("down") }

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

@@ -831,14 +831,14 @@ public MSTSSteamLocomotive(Simulator simulator, string wagFile)
             SteamEngines = new SteamEngines(this);
             PowerSupply = new SteamPowerSupply(this);
 
-            RefillTenderWithCoal();
+            RefillTenderWithFuel();
             RefillTenderWithWater();
         }
 
         /// <summary>
-        /// Sets the coal level to maximum.
+        /// Sets the fuel level to maximum.
         /// </summary>
-        public void RefillTenderWithCoal()
+        public void RefillTenderWithFuel()
         {
             FuelController.CurrentValue = 1.0f;
         }
@@ -934,6 +934,7 @@ public override void Parse(string lowercasetoken, STFReader stf)
                 case "engine(vacuumbrakessmallejectorusagerate": EjectorSmallSteamConsumptionLbpS = pS.FrompH(stf.ReadFloatBlock(STFReader.UNITS.MassRateDefaultLBpH, null)); break;
                 case "engine(ortssuperheatcutoffpressurefactor": SuperheatCutoffPressureFactor = stf.ReadFloatBlock(STFReader.UNITS.None, null); break;
                 case "engine(shovelcoalmass": ShovelMassKG = stf.ReadFloatBlock(STFReader.UNITS.Mass, null); break;
+                case "engine(ortsmaxtenderwoodmass":
                 case "engine(maxtendercoalmass": MaxTenderFuelMassKG = stf.ReadFloatBlock(STFReader.UNITS.Mass, null); break;
                 case "engine(ortsmaxtenderfueloilvolume": MaxTenderOilMassL = stf.ReadFloatBlock(STFReader.UNITS.Volume, null); break;
                 case "engine(maxtenderwatermass": MaxLocoTenderWaterMassKG = stf.ReadFloatBlock(STFReader.UNITS.Mass, null); break;
@@ -9826,7 +9827,7 @@ public override MSTSNotchController GetRefillController(uint type)
         public override void SetStepSize(PickupObj matchPickup)
         {
             uint type = matchPickup.PickupType;
-            if (type == (uint)PickupType.FuelCoal && MaxTenderFuelMassKG != 0)
+            if (type == (uint)PickupType.FuelCoal && type == (uint)PickupType.FuelWood && type == (uint)PickupType.FuelDiesel && MaxTenderFuelMassKG != 0)
                 FuelController.SetStepSize(matchPickup.PickupCapacity.FeedRateKGpS / MSTSNotchController.StandardBoost / MaxTenderFuelMassKG);
             else if (type == (uint)PickupType.FuelWater && MaxLocoTenderWaterMassKG != 0)
                 WaterController.SetStepSize(matchPickup.PickupCapacity.FeedRateKGpS / MSTSNotchController.StandardBoost / MaxLocoTenderWaterMassKG);
@@ -9838,7 +9839,7 @@ public override void SetStepSize(PickupObj matchPickup)
         /// </summary>
         public override void RefillImmediately()
         {
-            RefillTenderWithCoal();
+            RefillTenderWithFuel();
             RefillTenderWithWater();
         }
 

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -148,7 +148,7 @@ public enum WindowState
         public float TrailLocoResistanceFactor; // Factor to reduce base and wind resistance if locomotive is not leading - based upon original Davis drag coefficients
 
         bool TenderWeightInitialize = true;
-        float TenderWagonMaxCoalMassKG;
+        float TenderWagonMaxFuelMassKG;
         float TenderWagonMaxWaterMassKG;
 
         // Wind Impacts
@@ -1201,7 +1201,8 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
                     }
                     break;
                 case "wagon(ortsauxtenderwatermass": AuxTenderWaterMassKG = stf.ReadFloatBlock(STFReader.UNITS.Mass, null); break;
-                case "wagon(ortstenderwagoncoalmass": TenderWagonMaxCoalMassKG = stf.ReadFloatBlock(STFReader.UNITS.Mass, null); break;
+                case "wagon(ortstenderwagonwoodmass":
+                case "wagon(ortstenderwagoncoalmass": TenderWagonMaxFuelMassKG = stf.ReadFloatBlock(STFReader.UNITS.Mass, null); break;
                 case "wagon(ortstenderwagonwatermass": TenderWagonMaxWaterMassKG = stf.ReadFloatBlock(STFReader.UNITS.Mass, null); break;
                 case "wagon(ortsheatingwindowderatingfactor": WindowDeratingFactor = stf.ReadFloatBlock(STFReader.UNITS.None, null); break;
                 case "wagon(ortsheatingcompartmenttemperatureset": DesiredCompartmentTempSetpointC = stf.ReadFloatBlock(STFReader.UNITS.Temperature, null); break; 
@@ -1598,7 +1599,7 @@ public virtual void Copy(MSTSWagon copy)
             MaximumWheelFlangeAngleRad = copy.MaximumWheelFlangeAngleRad;
             WheelFlangeLengthM = copy.WheelFlangeLengthM;
             AuxTenderWaterMassKG = copy.AuxTenderWaterMassKG;
-            TenderWagonMaxCoalMassKG = copy.TenderWagonMaxCoalMassKG;
+            TenderWagonMaxFuelMassKG = copy.TenderWagonMaxFuelMassKG;
             TenderWagonMaxWaterMassKG = copy.TenderWagonMaxWaterMassKG;
             InitWagonNumAxles = copy.InitWagonNumAxles;
             WagonNumAxles = copy.WagonNumAxles;
@@ -1964,7 +1965,7 @@ public override void Update(float elapsedClockSeconds)
             ConfirmSteamLocomotiveTender(); // Confirms that a tender is connected to the steam locomotive
 
             // Adjusts water and coal mass based upon values assigned to the tender found in the WAG file rather then those defined in ENG file.
-            if (WagonType == WagonTypes.Tender && TenderWeightInitialize && TenderWagonMaxCoalMassKG != 0 && TenderWagonMaxWaterMassKG != 0)
+            if (WagonType == WagonTypes.Tender && TenderWeightInitialize && TenderWagonMaxFuelMassKG != 0 && TenderWagonMaxWaterMassKG != 0)
             {
 
                 // Find the associated steam locomotive for this tender
@@ -1986,7 +1987,7 @@ public override void Update(float elapsedClockSeconds)
                         float TempMaxCombinedWater = TendersSteamLocomotive.MaxTotalCombinedWaterVolumeUKG;
                         TendersSteamLocomotive.MaxTotalCombinedWaterVolumeUKG = (TempMaxCombinedWater - (Kg.ToLb(TendersSteamLocomotive.MaxLocoTenderWaterMassKG) / WaterLBpUKG)) + (Kg.ToLb(TenderWagonMaxWaterMassKG) / WaterLBpUKG);
 
-                        TendersSteamLocomotive.MaxTenderFuelMassKG = TenderWagonMaxCoalMassKG;
+                        TendersSteamLocomotive.MaxTenderFuelMassKG = TenderWagonMaxFuelMassKG;
                         TendersSteamLocomotive.MaxLocoTenderWaterMassKG = TenderWagonMaxWaterMassKG;
 
                         if (Simulator.Settings.VerboseConfigurationMessages)