more sim param defaults

derail-valley-modding · Feb 16, 2022 · d3509ba · d3509ba
1 parent 3436415
commit d3509ba
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/CCL_GameScripts/SimParamsBase.cs b/CCL_GameScripts/SimParamsBase.cs
@@ -52,7 +52,6 @@ public abstract class SimParamsBase : MonoBehaviour
         public LocoRequiredLicense RequiredLicense = LocoRequiredLicense.None;
         public float MaxSpeed = 120f;
         public float SandCapacity = 200f;
-        public float SandValveSpeed = 10f;
         public float SandMaxFlow = 5f;
 
         [Header("Physics Curves")]

diff --git a/CCL_GameScripts/SimParamsDiesel.cs b/CCL_GameScripts/SimParamsDiesel.cs
@@ -45,6 +45,7 @@ public class SimParamsDiesel : SimParamsBase
 
         [Header("Other Equipment")]
         public float AirCompressorRate = 0.8f;
+        public float SandValveSpeed = 10f;
 
         public SimParamsDiesel()
         {
@@ -81,6 +82,9 @@ public void ApplyDE6Defaults()
             OilCapacity = 500;
             OilConsumptionEngineRpm = 1;
 
+            AirCompressorRate = 0.8f;
+            SandValveSpeed = 10;
+
             BrakePowerCurve =
                 new AnimationCurve(
                     new Keyframe(0, 0, 0.3512f, 0.3512f, 0.3333f, 0.1033f),
@@ -142,6 +146,9 @@ public void ApplyShunterDefaults()
             OilCapacity = 100;
             OilConsumptionEngineRpm = 0.3f;
 
+            AirCompressorRate = 0.8f;
+            SandValveSpeed = 10;
+
             BrakePowerCurve =
                 new AnimationCurve(
                     new Keyframe(0, 0, 0.2744f, 0.2744f, 0.3333f, 0.0561f),

diff --git a/CCL_GameScripts/SimParamsSteam.cs b/CCL_GameScripts/SimParamsSteam.cs
@@ -103,6 +103,7 @@ public void ApplySH282Defaults()
             InjectorMaxFlowLPS = 3000;
 
             FuelType = SteamFuelType.Coal;
+            IsTankLoco = false;
             BunkerWaterCapacity = 0;
             BunkerFuelCapacity = 0;
 

diff --git a/DVCustomCarLoader/LocoComponents/Steam/CustomLocoSimSteam.cs b/DVCustomCarLoader/LocoComponents/Steam/CustomLocoSimSteam.cs
@@ -314,7 +314,7 @@ protected virtual void SimulateSteam(float delta)
                 (boilerWater.value > 0) && 
                 (boilerPressure.value < boilerPressure.max * 0.999f))
             {
-                float evaporatedWater = VAPOR_RATE * (temperature.value - SteamLocoSimulation.WATER_BOIL_TEMP) * delta;
+                float evaporatedWater = simParams.VaporizationRate * (temperature.value - SteamLocoSimulation.WATER_BOIL_TEMP) * delta;
                 boilerWater.AddNextValue(-evaporatedWater);
                 boilerPressure.AddNextValue(evaporatedWater * PRESSURE_CONST);
             }