diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index a64b2d84d..8d57690d9 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -61,7 +61,7 @@ jobs: uses: microsoft/setup-msbuild@v2 - name: Setup VS Dev Environment - uses: seanmiddleditch/gha-setup-vsdevenv@v4 + uses: seanmiddleditch/gha-setup-vsdevenv@v5 - name: Navigate to Workspace run: cd $GITHUB_WORKSPACE diff --git a/Aircraft AH-64D Plugin/Gauges/IAS/IAS.cs b/Aircraft AH-64D Plugin/Gauges/IAS/IAS.cs index 081e82ff8..5fcaf80bc 100644 --- a/Aircraft AH-64D Plugin/Gauges/IAS/IAS.cs +++ b/Aircraft AH-64D Plugin/Gauges/IAS/IAS.cs @@ -24,9 +24,9 @@ namespace GadrocsWorkshop.Helios.Gauges.AH64D [HeliosControl("Helios.AH64D.IAS", "Standby IAS Gauge", "AH-64D", typeof(GaugeRenderer),HeliosControlFlags.NotShownInUI)] public class IAS : BaseGauge { - private HeliosValue _indicatedAirSpeed; - private GaugeNeedle _needle; - private CalibrationPointCollectionDouble _needleCalibration; + private readonly HeliosValue _indicatedAirSpeed; + private readonly GaugeNeedle _needle; + private readonly CalibrationPointCollectionDouble _needleCalibration; public IAS() : base("Standby IAS Gauge", new Size(300, 300)) diff --git a/Aircraft CH-47F Plugin/Gauges/MFD/MFD.cs b/Aircraft CH-47F Plugin/Gauges/MFD/MFD.cs index d65889079..8c43e35fa 100644 --- a/Aircraft CH-47F Plugin/Gauges/MFD/MFD.cs +++ b/Aircraft CH-47F Plugin/Gauges/MFD/MFD.cs @@ -50,10 +50,9 @@ public MFD(string interfaceDevice) switch (_interfaceDevice) { case "MFD (Pilot Left)": - _vpName = "CH47F_MFD_PILOT_LEFT"; + _vpName = "LEFT_MFCD"; break; case "MFD (Pilot Right)": - //_vpName = "CH47F_MFD_PILOT_RIGHT"; _vpName = "RIGHT_MFCD"; break; case "MFD (Copilot Left)": @@ -63,7 +62,7 @@ public MFD(string interfaceDevice) _vpName = "CH47F_MFD_COPILOT_RIGHT"; break; case "MFD (Center)": - _vpName = "CH47F_MFD_CENTER"; + _vpName = "CENTER_MFCD"; break; default: break; @@ -144,7 +143,7 @@ public string ViewportName } public bool RequiresPatches { - get => _vpName != "" ? true : false; + get => _vpName.Contains("CH47F_") ? true : false; set => _ = value; } public double GlassReflectionOpacity diff --git a/Aircraft CH-47F Plugin/Gauges/SFD/SFD.cs b/Aircraft CH-47F Plugin/Gauges/SFD/SFD.cs index 862d52c91..504859e14 100644 --- a/Aircraft CH-47F Plugin/Gauges/SFD/SFD.cs +++ b/Aircraft CH-47F Plugin/Gauges/SFD/SFD.cs @@ -50,10 +50,10 @@ public RWR(string interfaceDevice) switch (_interfaceDevice) { case "SFD (Right)": - _vpName = "CH47F_SFD_PILOT"; + _vpName = "RIGHT_SFD"; break; case "SFD (Left)": - _vpName = "CH47F_SFD_COPILOT"; + _vpName = "LEFT_SFD"; break; default: break; @@ -108,7 +108,7 @@ public string ViewportName } public bool RequiresPatches { - get => _vpName != "" ? true : false; + get => false; set => _ = value; } public double GlassReflectionOpacity diff --git a/Aircraft F-15E Plugin/Aircraft F-15E Plugin.csproj b/Aircraft F-15E Plugin/Aircraft F-15E Plugin.csproj index a7a3c3707..e2618fefc 100644 --- a/Aircraft F-15E Plugin/Aircraft F-15E Plugin.csproj +++ b/Aircraft F-15E Plugin/Aircraft F-15E Plugin.csproj @@ -952,5 +952,11 @@ Designer + + + MSBuild:Compile + Designer + + \ No newline at end of file diff --git a/Aircraft F-15E Plugin/Gauges/Instruments/ADI_Pointer.xaml b/Aircraft F-15E Plugin/Gauges/Instruments/ADI_Pointer.xaml new file mode 100644 index 000000000..e0ac7bbea --- /dev/null +++ b/Aircraft F-15E Plugin/Gauges/Instruments/ADI_Pointer.xaml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/Aircraft F-15E Plugin/Gauges/Instruments/ADI_V1.cs b/Aircraft F-15E Plugin/Gauges/Instruments/ADI_V1.cs index 7d5772e53..bc8698c39 100644 --- a/Aircraft F-15E Plugin/Gauges/Instruments/ADI_V1.cs +++ b/Aircraft F-15E Plugin/Gauges/Instruments/ADI_V1.cs @@ -48,7 +48,7 @@ public ADIGauge_V1(string name, Size size, string device) _ball.Clip = new EllipseGeometry(center, 150d, 150d); Components.Add(_ball); - Components.Add(new GaugeImage("{F-15E}/Gauges/Instruments/ADI_Gradiant.xaml", new Rect(50d, 50d, 300d, 300d))); + Components.Add(new GaugeImage("{helios}/Gauges/Common/Circular-Shading.xaml", new Rect(50d, 50d, 300d, 300d))); _pitchAdjustCalibaration = new CalibrationPointCollectionDouble(-1.0d, -30d, 1.0d, 30d); _wingsNeedle = new GaugeNeedle("{F-15E}/Gauges/Instruments/ADI_Wings.xaml", new Point(50d, 194d), new Size(300d, 55d), new Point(0d, 0d)); diff --git a/Aircraft Ka-50 Plugin/Gauges/ADI/ADI.cs b/Aircraft Ka-50 Plugin/Gauges/ADI/ADI.cs index c164a8cfe..ff6a9c0bc 100644 --- a/Aircraft Ka-50 Plugin/Gauges/ADI/ADI.cs +++ b/Aircraft Ka-50 Plugin/Gauges/ADI/ADI.cs @@ -20,7 +20,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.ADI using System.Windows; using System.Windows.Media; - [HeliosControl("Helios.KA50.ADI", "ADI", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.ADI", "ADI", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class ADI : BaseGauge { GaugeNeedle _pitchBallNeedle; diff --git a/Aircraft Ka-50 Plugin/Gauges/Accelerometer/Accelerometer.cs b/Aircraft Ka-50 Plugin/Gauges/Accelerometer/Accelerometer.cs index 9e415538d..5319ca04a 100644 --- a/Aircraft Ka-50 Plugin/Gauges/Accelerometer/Accelerometer.cs +++ b/Aircraft Ka-50 Plugin/Gauges/Accelerometer/Accelerometer.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.Accelerometer using System; using System.Windows; - [HeliosControl("Helios.KA50.Accelerometer", "Accelerometer", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.Accelerometer", "Accelerometer", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class Accelerometer : BaseGauge { private GaugeNeedle _lowNeedle; diff --git a/Aircraft Ka-50 Plugin/Gauges/BaroAltimeter/BaroAltimeter.cs b/Aircraft Ka-50 Plugin/Gauges/BaroAltimeter/BaroAltimeter.cs index f1267b026..df832fb16 100644 --- a/Aircraft Ka-50 Plugin/Gauges/BaroAltimeter/BaroAltimeter.cs +++ b/Aircraft Ka-50 Plugin/Gauges/BaroAltimeter/BaroAltimeter.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.BaroAltimeter using System; using System.Windows; - [HeliosControl("Helios.KA50.BarometricAltimeter", "Barometric Altimeter", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.BarometricAltimeter", "Barometric Altimeter", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class BarometricAltimeter : BaseGauge { private GaugeNeedle _qfeCard; diff --git a/Aircraft Ka-50 Plugin/Gauges/BladeAngle/BladeAngle.cs b/Aircraft Ka-50 Plugin/Gauges/BladeAngle/BladeAngle.cs index b4791f041..f420e4834 100644 --- a/Aircraft Ka-50 Plugin/Gauges/BladeAngle/BladeAngle.cs +++ b/Aircraft Ka-50 Plugin/Gauges/BladeAngle/BladeAngle.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.BladeAngle using System; using System.Windows; - [HeliosControl("Helios.KA50.BladeAngle", "Blade Angle", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.BladeAngle", "Blade Angle", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class BladeAngle : BaseGauge { private GaugeNeedle _needle; diff --git a/Aircraft Ka-50 Plugin/Gauges/Clock/Clock.cs b/Aircraft Ka-50 Plugin/Gauges/Clock/Clock.cs index 6e4a09b1a..a47a4f804 100644 --- a/Aircraft Ka-50 Plugin/Gauges/Clock/Clock.cs +++ b/Aircraft Ka-50 Plugin/Gauges/Clock/Clock.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.Clock using System; using System.Windows; - [HeliosControl("Helios.KA50.Clock", "Clock", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.Clock", "Clock", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class Clock : BaseGauge { private GaugeImage _flightTimeIndicatorLight; diff --git a/Aircraft Ka-50 Plugin/Gauges/EGT/EGT.cs b/Aircraft Ka-50 Plugin/Gauges/EGT/EGT.cs index 68e970c56..5098c3683 100644 --- a/Aircraft Ka-50 Plugin/Gauges/EGT/EGT.cs +++ b/Aircraft Ka-50 Plugin/Gauges/EGT/EGT.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.EGT using System; using System.Windows; - [HeliosControl("Helios.KA50.EGT", "Exhaust Gas Temperature", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.EGT", "Exhaust Gas Temperature", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class EGT : BaseGauge { private GaugeNeedle _leftLargeNeedle; diff --git a/Aircraft Ka-50 Plugin/Gauges/FuelGauge/FuelGauge.cs b/Aircraft Ka-50 Plugin/Gauges/FuelGauge/FuelGauge.cs index ececb99a6..3433edaa8 100644 --- a/Aircraft Ka-50 Plugin/Gauges/FuelGauge/FuelGauge.cs +++ b/Aircraft Ka-50 Plugin/Gauges/FuelGauge/FuelGauge.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.FuelGauge using System; using System.Windows; - [HeliosControl("Helios.KA50.Fuel", "Fuel Quantity Indicator", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.Fuel", "Fuel Quantity Indicator", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class FuelGauge : BaseGauge { private GaugeNeedle _needleFwd; diff --git a/Aircraft Ka-50 Plugin/Gauges/HSI/HSI.cs b/Aircraft Ka-50 Plugin/Gauges/HSI/HSI.cs index a05d29320..c74d1ddf7 100644 --- a/Aircraft Ka-50 Plugin/Gauges/HSI/HSI.cs +++ b/Aircraft Ka-50 Plugin/Gauges/HSI/HSI.cs @@ -20,7 +20,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.HSI using System.Windows; using System.Windows.Media; - [HeliosControl("Helios.KA50.HSI", "HSI", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.HSI", "HSI", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class HSI : BaseGauge { private GaugeNeedle _longDeviationNeedle; diff --git a/Aircraft Ka-50 Plugin/Gauges/IAS/IAS.cs b/Aircraft Ka-50 Plugin/Gauges/IAS/IAS.cs index 765ddd6ad..42da8ec8d 100644 --- a/Aircraft Ka-50 Plugin/Gauges/IAS/IAS.cs +++ b/Aircraft Ka-50 Plugin/Gauges/IAS/IAS.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.IAS using System; using System.Windows; - [HeliosControl("Helios.KA50.IAS", "IAS", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.IAS", "IAS", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class IAS : BaseGauge { private GaugeNeedle _needle; diff --git a/Aircraft Ka-50 Plugin/Gauges/RadarAltimeter/RadarAltimeter.cs b/Aircraft Ka-50 Plugin/Gauges/RadarAltimeter/RadarAltimeter.cs index 362daaca6..2e1c78476 100644 --- a/Aircraft Ka-50 Plugin/Gauges/RadarAltimeter/RadarAltimeter.cs +++ b/Aircraft Ka-50 Plugin/Gauges/RadarAltimeter/RadarAltimeter.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.RadarAltimeter using System; using System.Windows; - [HeliosControl("Helios.KA50.RadarAltimeter", "Radar Altimeter", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.RadarAltimeter", "Radar Altimeter", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class RadarAltimeter : BaseGauge { private GaugeNeedle _needle; diff --git a/Aircraft Ka-50 Plugin/Gauges/RotorRPM/RotorRPM.cs b/Aircraft Ka-50 Plugin/Gauges/RotorRPM/RotorRPM.cs index 8bf2218d0..37f03d570 100644 --- a/Aircraft Ka-50 Plugin/Gauges/RotorRPM/RotorRPM.cs +++ b/Aircraft Ka-50 Plugin/Gauges/RotorRPM/RotorRPM.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.RotorRPM using System; using System.Windows; - [HeliosControl("Helios.KA50.RotorRPM", "Rotor RPM", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.RotorRPM", "Rotor RPM", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class RotorRPM : BaseGauge { private GaugeNeedle _needle; diff --git a/Aircraft Ka-50 Plugin/Gauges/Tachometer/Tachometer.cs b/Aircraft Ka-50 Plugin/Gauges/Tachometer/Tachometer.cs index 23ea08196..2659b63ca 100644 --- a/Aircraft Ka-50 Plugin/Gauges/Tachometer/Tachometer.cs +++ b/Aircraft Ka-50 Plugin/Gauges/Tachometer/Tachometer.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.Tachometer using System; using System.Windows; - [HeliosControl("Helios.KA50.Tachometer", "Tachometer", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.Tachometer", "Tachometer", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class Tachometer : BaseGauge { private GaugeNeedle _needle1; diff --git a/Aircraft Ka-50 Plugin/Gauges/VVI/VVI.cs b/Aircraft Ka-50 Plugin/Gauges/VVI/VVI.cs index 520ab2e77..161a889a4 100644 --- a/Aircraft Ka-50 Plugin/Gauges/VVI/VVI.cs +++ b/Aircraft Ka-50 Plugin/Gauges/VVI/VVI.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.KA_50.VVI using System; using System.Windows; - [HeliosControl("Helios.KA50.VVI", "VVI", "KA-50 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.KA50.VVI", "VVI", "Ka-50 Black Shark", typeof(GaugeRenderer))] public class VVI : BaseGauge { private GaugeNeedle _needle; diff --git a/Aircraft Mi-8 Plugin/Gauges/ADI/ADI.cs b/Aircraft Mi-8 Plugin/Gauges/ADI/ADI.cs index 729434ee8..2224fa025 100644 --- a/Aircraft Mi-8 Plugin/Gauges/ADI/ADI.cs +++ b/Aircraft Mi-8 Plugin/Gauges/ADI/ADI.cs @@ -20,7 +20,7 @@ namespace GadrocsWorkshop.Helios.Gauges.Mi_8.ADI using System.Windows; using System.Windows.Media; - [HeliosControl("Helios.Mi-8.ADI", "ADI", "Mi-8 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.Mi-8.ADI", "ADI", "Mi-8", typeof(GaugeRenderer))] public class ADI : BaseGauge { GaugeNeedle _pitchBallNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/AOA/AOA.cs b/Aircraft MiG-21 Plugin/Gauges/AOA/AOA.cs index 599c74a6e..6c14e30c9 100644 --- a/Aircraft MiG-21 Plugin/Gauges/AOA/AOA.cs +++ b/Aircraft MiG-21 Plugin/Gauges/AOA/AOA.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.AOA using System; using System.Windows; - [HeliosControl("Helios.MiG-21.AOA", "AOA", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.AOA", "AOA", "MiG-21", typeof(GaugeRenderer))] public class AOA : BaseGauge { diff --git a/Aircraft MiG-21 Plugin/Gauges/ARU3VM/ARU3VM.cs b/Aircraft MiG-21 Plugin/Gauges/ARU3VM/ARU3VM.cs index a8bdb64f7..5b6d70b04 100644 --- a/Aircraft MiG-21 Plugin/Gauges/ARU3VM/ARU3VM.cs +++ b/Aircraft MiG-21 Plugin/Gauges/ARU3VM/ARU3VM.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.ARU3VM using System; using System.Windows; - [HeliosControl("Helios.MiG-21.ARU3VM", "ARU", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.ARU3VM", "ARU", "MiG-21", typeof(GaugeRenderer))] public class ARU3VM : BaseGauge { diff --git a/Aircraft MiG-21 Plugin/Gauges/Accelerometer/Accelerometer.cs b/Aircraft MiG-21 Plugin/Gauges/Accelerometer/Accelerometer.cs index 3591123c5..2b142a45c 100644 --- a/Aircraft MiG-21 Plugin/Gauges/Accelerometer/Accelerometer.cs +++ b/Aircraft MiG-21 Plugin/Gauges/Accelerometer/Accelerometer.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.Accelerometer using System; using System.Windows; - [HeliosControl("Helios.MiG-21.Accelerometer", "Accelerometer", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.Accelerometer", "Accelerometer", "MiG-21", typeof(GaugeRenderer))] public class Accelerometer : BaseGauge { private GaugeNeedle _lowNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/BaroAltimeter/BaroAltimeter.cs b/Aircraft MiG-21 Plugin/Gauges/BaroAltimeter/BaroAltimeter.cs index cc6a0af5a..f4338ee09 100644 --- a/Aircraft MiG-21 Plugin/Gauges/BaroAltimeter/BaroAltimeter.cs +++ b/Aircraft MiG-21 Plugin/Gauges/BaroAltimeter/BaroAltimeter.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.BaroAltimeter using System; using System.Windows; - [HeliosControl("Helios.MiG21.BarometricAltimeter", "Barometric Altimeter", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG21.BarometricAltimeter", "Barometric Altimeter", "MiG-21", typeof(GaugeRenderer))] public class BarometricAltimeter : BaseGauge { private GaugeNeedle _qfeCard; diff --git a/Aircraft MiG-21 Plugin/Gauges/BatteryCapacity/BatteryCapacity.cs b/Aircraft MiG-21 Plugin/Gauges/BatteryCapacity/BatteryCapacity.cs index dbc52811b..1ae7aa46b 100644 --- a/Aircraft MiG-21 Plugin/Gauges/BatteryCapacity/BatteryCapacity.cs +++ b/Aircraft MiG-21 Plugin/Gauges/BatteryCapacity/BatteryCapacity.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.BatteryCapacity using System; using System.Windows; - [HeliosControl("Helios.MiG-21.BatteryCapacity", "Battery Capacity", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.BatteryCapacity", "Battery Capacity", "MiG-21", typeof(GaugeRenderer))] public class BatteryCapacity : BaseGauge { diff --git a/Aircraft MiG-21 Plugin/Gauges/DA200/DA200.cs b/Aircraft MiG-21 Plugin/Gauges/DA200/DA200.cs index 49b227746..4b9e389d8 100644 --- a/Aircraft MiG-21 Plugin/Gauges/DA200/DA200.cs +++ b/Aircraft MiG-21 Plugin/Gauges/DA200/DA200.cs @@ -20,7 +20,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.DA200 using System; using System.Windows; - [HeliosControl("Helios.MiG-21.DA200", "DA200", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.DA200", "DA200", "MiG-21", typeof(GaugeRenderer))] public class DA200 : BaseGauge { private GaugeNeedle _vviNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/EngExhaustTemp/EngExhaustTemp.cs b/Aircraft MiG-21 Plugin/Gauges/EngExhaustTemp/EngExhaustTemp.cs index 3095a97fb..7c7cb4fe8 100644 --- a/Aircraft MiG-21 Plugin/Gauges/EngExhaustTemp/EngExhaustTemp.cs +++ b/Aircraft MiG-21 Plugin/Gauges/EngExhaustTemp/EngExhaustTemp.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.EngExhaustTempGauge using System; using System.Windows; - [HeliosControl("Helios.MiG-21.EngExhaustTempGauge", "Engine Temp Gauge", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.EngExhaustTempGauge", "Engine Temp Gauge", "MiG-21", typeof(GaugeRenderer))] public class EngExhaustTempGauge : BaseGauge { private GaugeNeedle _currentNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/EngineO2/EngineO2.cs b/Aircraft MiG-21 Plugin/Gauges/EngineO2/EngineO2.cs index a49515957..01cecf907 100644 --- a/Aircraft MiG-21 Plugin/Gauges/EngineO2/EngineO2.cs +++ b/Aircraft MiG-21 Plugin/Gauges/EngineO2/EngineO2.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.EngineO2 using System; using System.Windows; - [HeliosControl("Helios.MiG-21.EngineO2", "Enginge O2", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.EngineO2", "Enginge O2", "MiG-21", typeof(GaugeRenderer))] public class EngineO2 : BaseGauge { private GaugeNeedle _needle; diff --git a/Aircraft MiG-21 Plugin/Gauges/EngineRpm/EngineRpm.cs b/Aircraft MiG-21 Plugin/Gauges/EngineRpm/EngineRpm.cs index b6ce88522..fd3c447ea 100644 --- a/Aircraft MiG-21 Plugin/Gauges/EngineRpm/EngineRpm.cs +++ b/Aircraft MiG-21 Plugin/Gauges/EngineRpm/EngineRpm.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.EngingeRpm using System; using System.Windows; - [HeliosControl("Helios.MiG-21.EngingeRpm", "Enginge RPM", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.EngingeRpm", "Enginge RPM", "MiG-21", typeof(GaugeRenderer))] public class EngingeRpm : BaseGauge { private GaugeNeedle _oneNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/FuelGauge/FuelGauge.cs b/Aircraft MiG-21 Plugin/Gauges/FuelGauge/FuelGauge.cs index 27b5c4fe3..a355f19e6 100644 --- a/Aircraft MiG-21 Plugin/Gauges/FuelGauge/FuelGauge.cs +++ b/Aircraft MiG-21 Plugin/Gauges/FuelGauge/FuelGauge.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.FuelGauge using System; using System.Windows; - [HeliosControl("Helios.MiG-21.FuelGauge", "Fuel Gauge", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.FuelGauge", "Fuel Gauge", "MiG-21", typeof(GaugeRenderer))] public class FuelGauge : BaseGauge { private GaugeNeedle _currentNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/HydroPressure/HydroPressure.cs b/Aircraft MiG-21 Plugin/Gauges/HydroPressure/HydroPressure.cs index cc761f904..af28d75bb 100644 --- a/Aircraft MiG-21 Plugin/Gauges/HydroPressure/HydroPressure.cs +++ b/Aircraft MiG-21 Plugin/Gauges/HydroPressure/HydroPressure.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.HydroPressure using System; using System.Windows; - [HeliosControl("Helios.MiG-21.HydroPressure", "Hydraulic Pressure", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.HydroPressure", "Hydraulic Pressure", "MiG-21", typeof(GaugeRenderer))] public class HydroPressure : BaseGauge { private GaugeNeedle _oneNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/IAS/IAS.cs b/Aircraft MiG-21 Plugin/Gauges/IAS/IAS.cs index 45707a052..0bbf6af11 100644 --- a/Aircraft MiG-21 Plugin/Gauges/IAS/IAS.cs +++ b/Aircraft MiG-21 Plugin/Gauges/IAS/IAS.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.IAS using System; using System.Windows; - [HeliosControl("Helios.MiG-21.IAS", "IAS", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.IAS", "IAS", "MiG-21", typeof(GaugeRenderer))] public class IAS : BaseGauge { diff --git a/Aircraft MiG-21 Plugin/Gauges/KPP/KPP.cs b/Aircraft MiG-21 Plugin/Gauges/KPP/KPP.cs index 6b33677e7..c835600b1 100644 --- a/Aircraft MiG-21 Plugin/Gauges/KPP/KPP.cs +++ b/Aircraft MiG-21 Plugin/Gauges/KPP/KPP.cs @@ -20,7 +20,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.ADI using System.Windows; using System.Windows.Media; - [HeliosControl("Helios.MiG21.KPP", "KPP", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG21.KPP", "KPP", "MiG-21", typeof(GaugeRenderer))] public class KPP : BaseGauge { GaugeNeedle _pitchBallNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/NPP/NPP.cs b/Aircraft MiG-21 Plugin/Gauges/NPP/NPP.cs index ed84b2aa3..39e012827 100644 --- a/Aircraft MiG-21 Plugin/Gauges/NPP/NPP.cs +++ b/Aircraft MiG-21 Plugin/Gauges/NPP/NPP.cs @@ -20,7 +20,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.NPP using System.Windows; using System.Windows.Media; - [HeliosControl("Helios.MiG-21.NPP", "NPP", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.NPP", "NPP", "MiG-21", typeof(GaugeRenderer))] public class NPP : BaseGauge { private GaugeNeedle _glideslopeDeviationNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/Nosecone/Nosecone.cs b/Aircraft MiG-21 Plugin/Gauges/Nosecone/Nosecone.cs index 5a953bd1a..a0c7d5c03 100644 --- a/Aircraft MiG-21 Plugin/Gauges/Nosecone/Nosecone.cs +++ b/Aircraft MiG-21 Plugin/Gauges/Nosecone/Nosecone.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.Nosecone using System; using System.Windows; - [HeliosControl("Helios.MiG-21.Nosecone", "Nosecone", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.Nosecone", "Nosecone", "MiG-21", typeof(GaugeRenderer))] public class Nosecone : BaseGauge { private GaugeNeedle _currentNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/O2Level/O2Level.cs b/Aircraft MiG-21 Plugin/Gauges/O2Level/O2Level.cs index 762ffdfd5..073655f49 100644 --- a/Aircraft MiG-21 Plugin/Gauges/O2Level/O2Level.cs +++ b/Aircraft MiG-21 Plugin/Gauges/O2Level/O2Level.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.O2Level using System; using System.Windows; - [HeliosControl("Helios.MiG-21.O2Level", "O2 Level", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.O2Level", "O2 Level", "MiG-21", typeof(GaugeRenderer))] public class O2Level : BaseGauge { private GaugeNeedle _currentNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/O2Pressure/O2Pressure.cs b/Aircraft MiG-21 Plugin/Gauges/O2Pressure/O2Pressure.cs index f26fa3cac..3e42c0d9a 100644 --- a/Aircraft MiG-21 Plugin/Gauges/O2Pressure/O2Pressure.cs +++ b/Aircraft MiG-21 Plugin/Gauges/O2Pressure/O2Pressure.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.O2Pressure using System; using System.Windows; - [HeliosControl("Helios.MiG-21.O2Pressure", "O2 Pressure", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.O2Pressure", "O2 Pressure", "MiG-21", typeof(GaugeRenderer))] public class O2Pressure : BaseGauge { diff --git a/Aircraft MiG-21 Plugin/Gauges/OilPressure/OilPressure.cs b/Aircraft MiG-21 Plugin/Gauges/OilPressure/OilPressure.cs index 12f6589db..c03e9811a 100644 --- a/Aircraft MiG-21 Plugin/Gauges/OilPressure/OilPressure.cs +++ b/Aircraft MiG-21 Plugin/Gauges/OilPressure/OilPressure.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.OilPressure using System; using System.Windows; - [HeliosControl("Helios.MiG-21.OilPressure", "Oil Pressure", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.OilPressure", "Oil Pressure", "MiG-21", typeof(GaugeRenderer))] public class OilPressure : BaseGauge { private GaugeNeedle _currentNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/RSBNDistance/RSBNDistance.cs b/Aircraft MiG-21 Plugin/Gauges/RSBNDistance/RSBNDistance.cs index 0687ac91d..77896b697 100644 --- a/Aircraft MiG-21 Plugin/Gauges/RSBNDistance/RSBNDistance.cs +++ b/Aircraft MiG-21 Plugin/Gauges/RSBNDistance/RSBNDistance.cs @@ -20,7 +20,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.RSBNDistance using System.Windows; using System.Windows.Media; - [HeliosControl("Helios.MiG-21.RSBNDistance", "RSBN Distance", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.RSBNDistance", "RSBN Distance", "MiG-21", typeof(GaugeRenderer))] public class RSBNDistance : BaseGauge { private HeliosValue _ones; diff --git a/Aircraft MiG-21 Plugin/Gauges/RadioAltimeter/RadioAltimeter.cs b/Aircraft MiG-21 Plugin/Gauges/RadioAltimeter/RadioAltimeter.cs index ba435aad0..159450528 100644 --- a/Aircraft MiG-21 Plugin/Gauges/RadioAltimeter/RadioAltimeter.cs +++ b/Aircraft MiG-21 Plugin/Gauges/RadioAltimeter/RadioAltimeter.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.RadioAltimeter using System; using System.Windows; - [HeliosControl("Helios.MiG-21.RadioAltimeter", "Radio Altimeter", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.RadioAltimeter", "Radio Altimeter", "MiG-21", typeof(GaugeRenderer))] public class RadioAltimeter : BaseGauge { diff --git a/Aircraft MiG-21 Plugin/Gauges/RadioChannelDisplay/RadioChannelDisplay.cs b/Aircraft MiG-21 Plugin/Gauges/RadioChannelDisplay/RadioChannelDisplay.cs index bb9b0847b..c2eb67963 100644 --- a/Aircraft MiG-21 Plugin/Gauges/RadioChannelDisplay/RadioChannelDisplay.cs +++ b/Aircraft MiG-21 Plugin/Gauges/RadioChannelDisplay/RadioChannelDisplay.cs @@ -20,7 +20,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.ChannelDisplay using System.Windows; using System.Windows.Media; - [HeliosControl("Helios.MiG-21.ChannelDisplay", "Radio/RSBN Land & Nav Channel Displays", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.ChannelDisplay", "Radio/RSBN Land & Nav Channel Displays", "MiG-21", typeof(GaugeRenderer))] public class ChannelDisplay : BaseGauge { private HeliosValue _val; diff --git a/Aircraft MiG-21 Plugin/Gauges/TAS/TAS.cs b/Aircraft MiG-21 Plugin/Gauges/TAS/TAS.cs index 3b1698bd3..c9b8305b4 100644 --- a/Aircraft MiG-21 Plugin/Gauges/TAS/TAS.cs +++ b/Aircraft MiG-21 Plugin/Gauges/TAS/TAS.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.TAS using System; using System.Windows; - [HeliosControl("Helios.MiG-21.TAS", "TAS", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.TAS", "TAS", "MiG-21", typeof(GaugeRenderer))] public class TAS : BaseGauge { private GaugeNeedle _currentTasNeedle; diff --git a/Aircraft MiG-21 Plugin/Gauges/Voltmeter/Voltmeter.cs b/Aircraft MiG-21 Plugin/Gauges/Voltmeter/Voltmeter.cs index 6f363cd85..f584cd238 100644 --- a/Aircraft MiG-21 Plugin/Gauges/Voltmeter/Voltmeter.cs +++ b/Aircraft MiG-21 Plugin/Gauges/Voltmeter/Voltmeter.cs @@ -19,7 +19,7 @@ namespace GadrocsWorkshop.Helios.Gauges.MiG21.Voltmeter using System; using System.Windows; - [HeliosControl("Helios.MiG-21.Voltmeter", "Voltmeter", "MiG-21 Gauges", typeof(GaugeRenderer))] + [HeliosControl("Helios.MiG-21.Voltmeter", "Voltmeter", "MiG-21", typeof(GaugeRenderer))] public class Voltmeter : BaseGauge { private GaugeNeedle _currentNeedle; diff --git a/Helios/Controls/CustomGaugeNeedle.cs b/Helios/Controls/CustomGaugeNeedle.cs index a4305f21d..7c393a9ab 100644 --- a/Helios/Controls/CustomGaugeNeedle.cs +++ b/Helios/Controls/CustomGaugeNeedle.cs @@ -204,7 +204,7 @@ protected override void OnRender(System.Windows.Media.DrawingContext drawingCont drawingContext.PushTransform(transform); - drawingContext.DrawImage(_image, _rectangle); + DrawImage(drawingContext, _image, _rectangle); drawingContext.Pop(); } diff --git a/Helios/Controls/CustomGaugeRenderer.cs b/Helios/Controls/CustomGaugeRenderer.cs index e4ce019ac..0accd313d 100644 --- a/Helios/Controls/CustomGaugeRenderer.cs +++ b/Helios/Controls/CustomGaugeRenderer.cs @@ -25,7 +25,7 @@ public class CustomGaugeRenderer : HeliosVisualRenderer private Rect _imageRect, _backgroundRect; private Point _center, _nextToCenter; private double _rotation; - private readonly Brush _scopeBrush = new SolidColorBrush(Color.FromRgb(255, 0, 0)); + private readonly Brush _scopeBrush = new SolidColorBrush(Color.FromRgb(127, 0, 0)); private readonly Pen _scopePen; private CustomGauge _gauge; diff --git a/Helios/Controls/RotarySwitchRenderer.cs b/Helios/Controls/RotarySwitchRenderer.cs index 4f82fdfe0..8e369a978 100644 --- a/Helios/Controls/RotarySwitchRenderer.cs +++ b/Helios/Controls/RotarySwitchRenderer.cs @@ -67,7 +67,7 @@ protected override void OnRender(System.Windows.Media.DrawingContext drawingCont DrawingContext tempDrawingContext = visual.RenderOpen(); tempDrawingContext.DrawDrawing(_lines); tempDrawingContext.Close(); - RenderVisual(drawingContext, visual, _imageRect); + RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : _imageRect); } } if (!needsEffect) @@ -82,10 +82,10 @@ protected override void OnRender(System.Windows.Media.DrawingContext drawingCont DrawingContext tempDrawingContext = visual.RenderOpen(); foreach (SwitchPositionLabel label in _labels) { - tempDrawingContext.DrawText(label.Text, new Point(label.Location.X * 1.25, label.Location.Y * 1.25)); + tempDrawingContext.DrawText(label.Text, new Point(label.Location.X, label.Location.Y)); } tempDrawingContext.Close(); - RenderVisual(drawingContext, visual, new Rect(_imageRect.X - (_imageRect.Width * 0.25), _imageRect.Y - (_imageRect.Height * 0.25), _imageRect.Width * 1.5, _imageRect.Height * 1.5)); + RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : _imageRect); } drawingContext.PushTransform(new RotateTransform(rotarySwitch.KnobRotation, _center.X, _center.Y)); diff --git a/Helios/Gauges/GaugeNeedle.cs b/Helios/Gauges/GaugeNeedle.cs index d2cbc54f0..135432221 100644 --- a/Helios/Gauges/GaugeNeedle.cs +++ b/Helios/Gauges/GaugeNeedle.cs @@ -133,7 +133,7 @@ public double VerticalOffset #endregion - protected override void OnRender(System.Windows.Media.DrawingContext drawingContext) + protected override void OnRender(DrawingContext drawingContext) { TransformGroup transform = new TransformGroup(); transform.Children.Add(new TranslateTransform((-_center.X + HorizontalOffset) * _xScale, (-_center.Y + VerticalOffset) * _yScale)); diff --git a/Helios/Helios.csproj b/Helios/Helios.csproj index 93fb4eae0..29bcce736 100644 --- a/Helios/Helios.csproj +++ b/Helios/Helios.csproj @@ -443,6 +443,93 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + @@ -545,21 +632,6 @@ - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -1778,93 +1850,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest diff --git a/Helios/HeliosVisual.cs b/Helios/HeliosVisual.cs index 7be63c518..9523e3d44 100644 --- a/Helios/HeliosVisual.cs +++ b/Helios/HeliosVisual.cs @@ -196,7 +196,7 @@ public bool IsDefaultHidden } } /// - /// Whether this control will have effects applied to is on rendering. + /// Whether this control will have effects applied to it on rendering. /// public virtual bool EffectsExclusion { @@ -210,13 +210,20 @@ public virtual bool EffectsExclusion { hv.EffectsExclusion = value; } - if(this is BaseGauge bg) + if (this is BaseGauge bg) { foreach (GaugeComponent gc in bg.Components) { gc.EffectsExclusion = value; } } + if (this is CompositeBaseGauge cbg) + { + foreach (GaugeComponent gc in cbg.Components) + { + gc.EffectsExclusion = value; + } + } OnPropertyChanged("EffectsExclusion", !value, value, true); OnEffectsExclusionChanged(); Refresh(); diff --git a/Helios/HeliosVisualRenderer.cs b/Helios/HeliosVisualRenderer.cs index f072ac577..a1251551f 100644 --- a/Helios/HeliosVisualRenderer.cs +++ b/Helios/HeliosVisualRenderer.cs @@ -120,9 +120,15 @@ private void CheckRefresh() protected virtual void OnRender(DrawingContext drawingContext, double scaleX, double scaleY) { - drawingContext.PushTransform(new ScaleTransform(scaleX, scaleY)); + if (scaleX != 1d || scaleY != 1d) + { + drawingContext.PushTransform(new ScaleTransform(scaleX, scaleY)); + } OnRender(drawingContext); - drawingContext.Pop(); + if (scaleX != 1d || scaleY != 1d) + { + drawingContext.Pop(); + } } @@ -152,7 +158,7 @@ private void UpdateTransform() /// /// /// - private void RenderEffect(DrawingContext drawingContext, ImageSource image, Rect imageRectangle) + private void RenderEffect(DrawingContext drawingContext, DrawingVisual image, Rect imageRectangle) { // ShaderEffect can be deleted in Profile Editor so we always need to get it from ProfileManager if (!_designTimeChecked) @@ -174,19 +180,12 @@ private void RenderEffect(DrawingContext drawingContext, ImageSource image, Rect _effect = ConfigManager.ProfileManager.CurrentEffect as Effects.ColorAdjustEffect; } - System.Windows.Controls.Image imageControl = new System.Windows.Controls.Image - { - Source = image, - Width = image != null ? image.Width : 0, - Height = image != null ? image.Width : 0, - - }; if (!Visual.EffectsExclusion) { - imageControl.Effect = _effect; + image.Effect = _effect; } - VisualBrush visualBrush = new VisualBrush(imageControl); - drawingContext.DrawRectangle(visualBrush, null, imageRectangle); + + drawingContext.DrawRectangle(new VisualBrush(image), null, imageRectangle); } /// @@ -197,16 +196,12 @@ private void RenderEffect(DrawingContext drawingContext, ImageSource image, Rect /// protected void RenderVisual(DrawingContext drawingContext, DrawingVisual visual, Rect rectangle) { - if(visual.ContentBounds.IsEmpty || rectangle.Width == 0 || rectangle.Height == 0) { return; } - RenderTargetBitmap rtb = new RenderTargetBitmap(Convert.ToInt32(rectangle.Width), Convert.ToInt32(rectangle.Height), 96, 96, PixelFormats.Pbgra32); - rtb.Render(visual); - //drawingContext.DrawImage(rtb, rectangle); - RenderEffect(drawingContext, rtb, rectangle); - - // Address MILERR_WIN32ERROR (Exception from HRESULT: 0x88980003 in PresentationCore - (rtb.GetType().GetField("_renderTargetBitmap", BindingFlags.Instance | BindingFlags.NonPublic)? -.GetValue(rtb) as IDisposable)?.Dispose(); // from https://github.com/dotnet/wpf/issues/3067 + if(visual.ContentBounds.IsEmpty || rectangle.Width == 0 || rectangle.Height == 0) + { + return; + } + RenderEffect(drawingContext, visual, rectangle); } #region Draw Proxies @@ -231,7 +226,7 @@ protected void DrawImage(DrawingContext drawingContext, ImageSource image, Rect DrawingContext tempDrawingContext = visual.RenderOpen(); tempDrawingContext.DrawImage(image, rectangle); tempDrawingContext.Close(); - RenderVisual(drawingContext, visual, rectangle); + RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle); } } @@ -258,7 +253,7 @@ protected void DrawGeometry(DrawingContext drawingContext, Brush brush, Pen pen, DrawingContext tempDrawingContext = visual.RenderOpen(); tempDrawingContext.DrawGeometry(brush, pen, path); tempDrawingContext.Close(); - RenderVisual(drawingContext, visual, rectangle); + RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle); } } /// @@ -283,7 +278,7 @@ protected void DrawRectangle(DrawingContext drawingContext, Brush brush, Pen pen DrawingContext tempDrawingContext = visual.RenderOpen(); tempDrawingContext.DrawRectangle(brush, pen, rectangle); tempDrawingContext.Close(); - RenderVisual(drawingContext, visual, rectangle); + RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle); } } /// @@ -308,7 +303,7 @@ protected void DrawRoundedRectangle(DrawingContext drawingContext, Brush brush, DrawingContext tempDrawingContext = visual.RenderOpen(); tempDrawingContext.DrawRoundedRectangle(brush, pen, rectangle, radiusX, radiusY); tempDrawingContext.Close(); - RenderVisual(drawingContext, visual, rectangle); + RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle); } } /// @@ -336,7 +331,7 @@ protected void DrawText(DrawingContext drawingContext, ITextControl textVisual, DrawingContext tempDrawingContext = visual.RenderOpen(); textVisual.TextFormat.RenderText(tempDrawingContext, brush, text, rectangle); tempDrawingContext.Close(); - RenderVisual(drawingContext, visual, rectangle); + RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle); } } #endregion Draw Proxies diff --git a/Helios/ImageManager.cs b/Helios/ImageManager.cs index 14448a60c..6892e9bc3 100644 --- a/Helios/ImageManager.cs +++ b/Helios/ImageManager.cs @@ -13,21 +13,23 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +using GadrocsWorkshop.Helios.Util; +using NLog; using System; using System.Collections; using System.Collections.Generic; using System.Globalization; using System.IO; +using System.Linq; +using System.Reflection; +using System.Resources; using System.Security.Policy; using System.Windows; using System.Windows.Controls; using System.Windows.Markup; using System.Windows.Media; using System.Windows.Media.Imaging; -using System.Windows.Media.Media3D; using System.Windows.Resources; -using GadrocsWorkshop.Helios.Util; -using NLog; namespace GadrocsWorkshop.Helios { @@ -364,6 +366,8 @@ private Uri GetImageUri(string path) { string packPath = MakeImagePathAbsolute(path); Uri imageUri = new Uri(packPath, UriKind.Absolute); + // ListResources(imageUri); //WiP + if (CanOpenPackUri(imageUri)) { @@ -388,7 +392,42 @@ private Uri GetImageUri(string path) return null; } + private void ListResources(Uri uri) + { + string[] parts = uri.AbsolutePath.TrimStart('/').Split(new[] { ";component/" }, StringSplitOptions.None); + string assemblyName = parts[0]; + string resourcePrefix = Path.GetDirectoryName(parts.Length > 1 ? parts[1] : string.Empty).Replace('\\', '/'); + string fileNameTemplate = Path.GetFileNameWithoutExtension(parts.Length > 1 ? parts[1] : string.Empty).Replace('\\', '/'); + + // Try to find the already loaded assembly + Assembly asm = AppDomain.CurrentDomain + .GetAssemblies() + .FirstOrDefault(a => a.GetName().Name.Equals(assemblyName, StringComparison.OrdinalIgnoreCase)); + if(asm != null) + { + + Logger.Info("Loaded assembly: " + asm.FullName); + Logger.Info("Manifest resources:"); + foreach (var r in asm.GetManifestResourceNames()) + Logger.Info($" - {r}"); + + string resourceName = assemblyName.ToLower() + ".g.resources"; + Logger.Info($"Attempting to extract {resourceName}"); + + var rm = new ResourceManager(assemblyName.ToLower() + ".g", asm); + + ResourceSet set = rm.GetResourceSet(CultureInfo.CurrentUICulture, true, true); + Logger.Info($"Resources under \'{resourcePrefix}\':"); + + foreach (DictionaryEntry entry in set) + { + string key = (string)entry.Key; + if (key.StartsWith(resourcePrefix, StringComparison.OrdinalIgnoreCase)) + Logger.Info(" " + key); + } + } + } public string MakeImagePathRelative(string filename) { string newFilename = filename; diff --git a/Keypress Receiver Installer/Keypress Receiver Installer.vdproj b/Keypress Receiver Installer/Keypress Receiver Installer.vdproj index 80b273b2f..bcfdaa8d1 100644 --- a/Keypress Receiver Installer/Keypress Receiver Installer.vdproj +++ b/Keypress Receiver Installer/Keypress Receiver Installer.vdproj @@ -1,4 +1,4 @@ -"DeployProject" +"DeployProject" { "VSVersion" = "3:800" "ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.gpatch new file mode 100644 index 000000000..7fa4369db --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -1623,12 +1623,141 @@ + _RWR%22%0D%0A%7D%0D%0A%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_RWR_SCREEN%22%2C %22RWR_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.grevert new file mode 100644 index 000000000..15f70f0fe --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -1631,133 +1631,4 @@ + %0D%0A%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_RWR_SCREEN%22%2C %22RWR_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CDU/indicator/CDU_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CDU/indicator/CDU_init.lua.gpatch new file mode 100644 index 000000000..1c03b5495 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CDU/indicator/CDU_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -914,12 +914,141 @@ + U%22%2C%0D%0A%7D%0D%0A%0D%0A%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_CDU_SCREEN%22%2C %22CDU_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CDU/indicator/CDU_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CDU/indicator/CDU_init.lua.grevert new file mode 100644 index 000000000..cefdfac55 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CDU/indicator/CDU_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -922,133 +922,4 @@ + %0D%0A%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_CDU_SCREEN%22%2C %22CDU_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.gpatch new file mode 100644 index 000000000..049450084 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -567,12 +567,143 @@ + GENERAL%7D%0D%0A%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_CMSC_SCREEN%22%2C %22CMSC_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.grevert new file mode 100644 index 000000000..eff78a332 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -575,135 +575,4 @@ + %0D%0A%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_CMSC_SCREEN%22%2C %22CMSC_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.gpatch new file mode 100644 index 000000000..3b90d9d0c --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -568,12 +568,143 @@ + GENERAL%7D%0D%0A%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_CMSP_SCREEN%22%2C %22CMSP_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.grevert new file mode 100644 index 000000000..02b32c947 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -576,135 +576,4 @@ + %0D%0A%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_CMSP_SCREEN%22%2C %22CMSP_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.gpatch new file mode 100644 index 000000000..049c8025f --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -984,8 +984,139 @@ + E_MAIN%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_DIGIT_CLOCK%22%2C %22DIGIT_CLOCK%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.grevert new file mode 100644 index 000000000..80adde1fd --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -988,135 +988,4 @@ + IN%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_DIGIT_CLOCK%22%2C %22DIGIT_CLOCK%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.gpatch new file mode 100644 index 000000000..81d4a0a60 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -16977,20 +16977,135 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.grevert new file mode 100644 index 000000000..ec2bb3d0d --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -16993,119 +16993,4 @@ + 5%7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.gpatch new file mode 100644 index 000000000..2fbfb293e --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -275,8 +275,135 @@ + T.lua%22%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_LEFT_MFCD%22%2C %22LEFT_MFCD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.grevert new file mode 100644 index 000000000..71c353356 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -279,131 +279,4 @@ + a%22%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_LEFT_MFCD%22%2C %22LEFT_MFCD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.gpatch new file mode 100644 index 000000000..1f54367e2 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -278,8 +278,137 @@ + lua%22%0D%0A%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_RIGHT_MFCD%22%2C %22RIGHT_MFCD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.grevert new file mode 100644 index 000000000..700ee5f61 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -282,133 +282,4 @@ + %0D%0A%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_RIGHT_MFCD%22%2C %22RIGHT_MFCD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.gpatch new file mode 100644 index 000000000..27a101ca3 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -185,8 +185,157 @@ + STATUS%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_UHF_FREQUENCY_STATUS%22%2C %22UHF_FREQUENCY_STATUS%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.grevert new file mode 100644 index 000000000..d6d907015 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -189,153 +189,4 @@ + US%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_UHF_FREQUENCY_STATUS%22%2C %22UHF_FREQUENCY_STATUS%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.gpatch new file mode 100644 index 000000000..601d951c2 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -183,8 +183,153 @@ + HANNEL%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_UHF_PRESET_CHANNEL%22%2C %22UHF_PRESET_CHANNEL%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.grevert new file mode 100644 index 000000000..c17eeec48 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -187,149 +187,4 @@ + EL%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_UHF_PRESET_CHANNEL%22%2C %22UHF_PRESET_CHANNEL%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.gpatch new file mode 100644 index 000000000..285eeccfc --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -177,8 +177,141 @@ + PEATER%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_UHF_REPEATER%22%2C %22UHF_REPEATER%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.grevert new file mode 100644 index 000000000..3fddcb8aa --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -181,137 +181,4 @@ + ER%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_UHF_REPEATER%22%2C %22UHF_REPEATER%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.gpatch new file mode 100644 index 000000000..40755603a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -1623,12 +1623,143 @@ + _RWR%22%0D%0A%7D%0D%0A%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_RWR_SCREEN%22%2C %22RWR_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.grevert new file mode 100644 index 000000000..0bdbea15d --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/AN_ALR69V/indicator/AN_ALR69V_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -1631,135 +1631,4 @@ + %0D%0A%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_RWR_SCREEN%22%2C %22RWR_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/ARC_210/Indicator/ARC_210_Init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/ARC_210/Indicator/ARC_210_Init.lua.gpatch new file mode 100644 index 000000000..230d4036a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/ARC_210/Indicator/ARC_210_Init.lua.gpatch @@ -0,0 +1,8 @@ +@@ -108,16 +108,83 @@ + s.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Aindic +@@ -27230,16 +27230,86 @@ + OIZE%0D%0A%0D%0A ++try_find_assigned_viewport(%22A_10C_2_ARC210_SCREEN%22%2C %22ARC210_SCREEN%22)%0D%0A + %0D%0Afuncti diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/ARC_210/Indicator/ARC_210_Init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/ARC_210/Indicator/ARC_210_Init.lua.grevert new file mode 100644 index 000000000..82a2f18f1 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/ARC_210/Indicator/ARC_210_Init.lua.grevert @@ -0,0 +1,8 @@ +@@ -112,75 +112,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ai +@@ -27167,78 +27167,8 @@ + %0D%0A%0D%0A +-try_find_assigned_viewport(%22A_10C_2_ARC210_SCREEN%22%2C %22ARC210_SCREEN%22)%0D%0A + %0D%0Afu diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CDU/indicator/CDU_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CDU/indicator/CDU_init.lua.gpatch new file mode 100644 index 000000000..405ac2e9f --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CDU/indicator/CDU_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -914,12 +914,143 @@ + U%22%2C%0D%0A%7D%0D%0A%0D%0A%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_CDU_SCREEN%22%2C %22CDU_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CDU/indicator/CDU_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CDU/indicator/CDU_init.lua.grevert new file mode 100644 index 000000000..301a333dc --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CDU/indicator/CDU_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -922,135 +922,4 @@ + %0D%0A%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_CDU_SCREEN%22%2C %22CDU_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.gpatch new file mode 100644 index 000000000..78dfa09fa --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -567,12 +567,145 @@ + GENERAL%7D%0D%0A%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_CMSC_SCREEN%22%2C %22CMSC_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.grevert new file mode 100644 index 000000000..2d89ac41d --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSC/indicator/CMSC_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -575,137 +575,4 @@ + %0D%0A%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_CMSC_SCREEN%22%2C %22CMSC_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.gpatch new file mode 100644 index 000000000..5f984c484 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -568,12 +568,145 @@ + GENERAL%7D%0D%0A%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_CMSP_SCREEN%22%2C %22CMSP_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.grevert new file mode 100644 index 000000000..8d9ae3628 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/CMSP/indicator/CMSP_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -576,137 +576,4 @@ + %0D%0A%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_CMSP_SCREEN%22%2C %22CMSP_SCREEN%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.gpatch new file mode 100644 index 000000000..7fc801aa4 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -983,16 +983,149 @@ + GE_MAIN%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_DIGIT_CLOCK%22%2C %22DIGIT_CLOCK%22)%0D + %0A%0D%0Aopaci diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.grevert new file mode 100644 index 000000000..ada0727f1 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/DigitalClock/Indicator/DIGIT_CLK_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -987,141 +987,8 @@ + AIN%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_DIGIT_CLOCK%22%2C %22DIGIT_CLOCK%22)%0D + %0A%0D%0Ao diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.gpatch new file mode 100644 index 000000000..f4236efa5 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -16979,20 +16979,137 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.grevert new file mode 100644 index 000000000..d6dba494e --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/HUD/Indicator/HUD_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -16995,121 +16995,4 @@ + 5%7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.gpatch new file mode 100644 index 000000000..3d6b77c0d --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -275,8 +275,137 @@ + T.lua%22%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_LEFT_MFCD%22%2C %22LEFT_MFCD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.grevert new file mode 100644 index 000000000..c2e15f8dd --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_left_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -279,133 +279,4 @@ + a%22%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_LEFT_MFCD%22%2C %22LEFT_MFCD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.gpatch new file mode 100644 index 000000000..06b6d397a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -278,8 +278,139 @@ + lua%22%0D%0A%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_RIGHT_MFCD%22%2C %22RIGHT_MFCD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.grevert new file mode 100644 index 000000000..d33ea313a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/MFCD/indicator/MFCD_right_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -282,135 +282,4 @@ + %0D%0A%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_RIGHT_MFCD%22%2C %22RIGHT_MFCD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.gpatch new file mode 100644 index 000000000..d27bea485 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -185,8 +185,159 @@ + STATUS%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_UHF_FREQUENCY_STATUS%22%2C %22UHF_FREQUENCY_STATUS%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.grevert new file mode 100644 index 000000000..3c6655740 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/freq_status_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -189,155 +189,4 @@ + US%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_UHF_FREQUENCY_STATUS%22%2C %22UHF_FREQUENCY_STATUS%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.gpatch new file mode 100644 index 000000000..8249067ec --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -183,8 +183,155 @@ + HANNEL%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_UHF_PRESET_CHANNEL%22%2C %22UHF_PRESET_CHANNEL%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.grevert new file mode 100644 index 000000000..332f9ff3c --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/preset_channel_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -187,151 +187,4 @@ + EL%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_UHF_PRESET_CHANNEL%22%2C %22UHF_PRESET_CHANNEL%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.gpatch new file mode 100644 index 000000000..17d3b9a94 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -177,8 +177,143 @@ + PEATER%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_UHF_REPEATER%22%2C %22UHF_REPEATER%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.grevert new file mode 100644 index 000000000..cbc3c25bd --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/A-10C_2/Cockpit/Scripts/UHF_Radio/indicator/repeater_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -181,139 +181,4 @@ + ER%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22A_10C_2_UHF_REPEATER%22%2C %22UHF_REPEATER%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/ASE/CMWS/CMWS_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/ASE/CMWS/CMWS_init.lua.gpatch new file mode 100644 index 000000000..c20c36834 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/ASE/CMWS/CMWS_init.lua.gpatch @@ -0,0 +1,8 @@ +@@ -123,16 +123,83 @@ + t.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Aopaci +@@ -620,10 +620,73 @@ + KPIT%0D%0A%0D%0A ++--ViewportHandling%0D%0Atry_find_assigned_viewport(%22AH_64D_CMWS%22)%0D%0A + %0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/ASE/CMWS/CMWS_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/ASE/CMWS/CMWS_init.lua.grevert new file mode 100644 index 000000000..f82f0dfd5 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/ASE/CMWS/CMWS_init.lua.grevert @@ -0,0 +1,8 @@ +@@ -127,75 +127,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ao +@@ -557,69 +557,6 @@ + %0D%0A%0D%0A +---ViewportHandling%0D%0Atry_find_assigned_viewport(%22AH_64D_CMWS%22)%0D%0A + %0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_cpg_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_cpg_init.lua.gpatch new file mode 100644 index 000000000..8332dabb4 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_cpg_init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -121,32 +121,99 @@ + ges_Init.lua%22)%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofile(LockOn_Op +@@ -515,8 +515,77 @@ + FD_cpg%22) ++%0D%0A%0D%0A--ViewportHandling%0D%0Atry_find_assigned_viewport(%22AH_64D_EUFD_CPG%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_cpg_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_cpg_init.lua.grevert new file mode 100644 index 000000000..73fe423f8 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_cpg_init.lua.grevert @@ -0,0 +1,7 @@ +@@ -133,75 +133,8 @@ + %22)%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofi +@@ -452,73 +452,4 @@ + pg%22) +-%0D%0A%0D%0A--ViewportHandling%0D%0Atry_find_assigned_viewport(%22AH_64D_EUFD_CPG%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_plt_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_plt_init.lua.gpatch new file mode 100644 index 000000000..b31706042 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_plt_init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -121,32 +121,99 @@ + ges_Init.lua%22)%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofile(LockOn_Op +@@ -515,8 +515,77 @@ + FD_plt%22) ++%0D%0A%0D%0A--ViewportHandling%0D%0Atry_find_assigned_viewport(%22AH_64D_EUFD_PLT%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_plt_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_plt_init.lua.grevert new file mode 100644 index 000000000..74acb2452 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/EUFD/EUFD_plt_init.lua.grevert @@ -0,0 +1,7 @@ +@@ -133,75 +133,8 @@ + %22)%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofi +@@ -452,73 +452,4 @@ + lt%22) +-%0D%0A%0D%0A--ViewportHandling%0D%0Atry_find_assigned_viewport(%22AH_64D_EUFD_PLT%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_left_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_left_init.lua.gpatch new file mode 100644 index 000000000..59bc81ea6 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_left_init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -148,32 +148,99 @@ + aterials.lua%22)%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofile(LockOn_Op +@@ -602,12 +602,142 @@ + LMFD_%22 )%0D%0A%0D%0A ++--ViewportHandling Helios Patch%0D%0Atry_find_assigned_viewport(%22AH_64D_LEFT_MFCD_CPG%22%2C%22LEFT_MFCD%22)%0D%0A--ViewportHandling Helios Patch%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_left_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_left_init.lua.grevert new file mode 100644 index 000000000..9c6ec7d8a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_left_init.lua.grevert @@ -0,0 +1,7 @@ +@@ -160,75 +160,8 @@ + %22)%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofi +@@ -543,134 +543,4 @@ + %0D%0A%0D%0A +---ViewportHandling Helios Patch%0D%0Atry_find_assigned_viewport(%22AH_64D_LEFT_MFCD_CPG%22%2C%22LEFT_MFCD%22)%0D%0A--ViewportHandling Helios Patch%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_right_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_right_init.lua.gpatch new file mode 100644 index 000000000..76f86e9fe --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_right_init.lua.gpatch @@ -0,0 +1,8 @@ +@@ -148,32 +148,99 @@ + aterials.lua%22)%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofile(LockOn_Op +@@ -606,10 +606,140 @@ + _%22 )%0D%0A%0D%0A ++--ViewportHandling Helios Patch%0D%0Atry_find_assigned_viewport(%22AH_64D_RIGHT_MFCD_CPG%22%2C%22RIGHT_MFCD%22)%0D%0A--ViewportHandling Helios Patch + %0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_right_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_right_init.lua.grevert new file mode 100644 index 000000000..69c3aeea1 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_cpg_right_init.lua.grevert @@ -0,0 +1,8 @@ +@@ -160,75 +160,8 @@ + %22)%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofi +@@ -543,136 +543,6 @@ + %0D%0A%0D%0A +---ViewportHandling Helios Patch%0D%0Atry_find_assigned_viewport(%22AH_64D_RIGHT_MFCD_CPG%22%2C%22RIGHT_MFCD%22)%0D%0A--ViewportHandling Helios Patch + %0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_left_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_left_init.lua.gpatch new file mode 100644 index 000000000..0fc122d06 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_left_init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -148,32 +148,99 @@ + aterials.lua%22)%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofile(LockOn_Op +@@ -602,12 +602,144 @@ + LMFD_%22 )%0D%0A%0D%0A ++--ViewportHandling Helios Patch%0D%0Atry_find_assigned_viewport(%22AH_64D_LEFT_MFCD_PLT%22%2C %22LEFT_MFCD%22) %0D%0A--ViewportHandling Helios Patch%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_left_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_left_init.lua.grevert new file mode 100644 index 000000000..55ecb6ee0 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_left_init.lua.grevert @@ -0,0 +1,7 @@ +@@ -160,75 +160,8 @@ + %22)%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofi +@@ -543,136 +543,4 @@ + %0D%0A%0D%0A +---ViewportHandling Helios Patch%0D%0Atry_find_assigned_viewport(%22AH_64D_LEFT_MFCD_PLT%22%2C %22LEFT_MFCD%22) %0D%0A--ViewportHandling Helios Patch%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_right_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_right_init.lua.gpatch new file mode 100644 index 000000000..a39248ba6 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_right_init.lua.gpatch @@ -0,0 +1,8 @@ +@@ -148,32 +148,99 @@ + aterials.lua%22)%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofile(LockOn_Op +@@ -606,10 +606,142 @@ + _%22 )%0D%0A%0D%0A ++--ViewportHandling Helios Patch%0D%0Atry_find_assigned_viewport(%22AH_64D_RIGHT_MFCD_PLT%22%2C %22RIGHT_MFCD%22) %0D%0A--ViewportHandling Helios Patch + %0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_right_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_right_init.lua.grevert new file mode 100644 index 000000000..d9bb0d64f --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AH-64D/Cockpit/Scripts/Displays/MFD/indicator/MFD_plt_right_init.lua.grevert @@ -0,0 +1,8 @@ +@@ -160,75 +160,8 @@ + %22)%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + dofi +@@ -543,138 +543,6 @@ + %0D%0A%0D%0A +---ViewportHandling Helios Patch%0D%0Atry_find_assigned_viewport(%22AH_64D_RIGHT_MFCD_PLT%22%2C %22RIGHT_MFCD%22) %0D%0A--ViewportHandling Helios Patch + %0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Data/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Data/Indicator/init.lua.gpatch new file mode 100644 index 000000000..d190395ea --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Data/Indicator/init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -56,16 +56,83 @@ + .lua%22)%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + indicato +@@ -560,12 +560,54 @@ + %0A%09 %7D%2C%0D%0A%7D%0D%0A%0D%0A ++try_find_assigned_viewport(%22AJS37_DATA%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Data/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Data/Indicator/init.lua.grevert new file mode 100644 index 000000000..6966cf66c --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Data/Indicator/init.lua.grevert @@ -0,0 +1,7 @@ +@@ -60,75 +60,8 @@ + %22)%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + indi +@@ -501,46 +501,4 @@ + %0D%0A%0D%0A +-try_find_assigned_viewport(%22AJS37_DATA%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Destination/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Destination/Indicator/init.lua.gpatch new file mode 100644 index 000000000..2da124ce3 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Destination/Indicator/init.lua.gpatch @@ -0,0 +1,8 @@ +@@ -89,16 +89,85 @@ + .lua%22)%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A%0D%0A + indicato +@@ -613,16 +613,67 @@ + %2C%0D%0A%7D%0D%0A%0D%0A ++try_find_assigned_viewport(%22AJS37_DESTINATION%22)%0D%0A%0D%0A + print(%22F diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Destination/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Destination/Indicator/init.lua.grevert new file mode 100644 index 000000000..4aa667dad --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/Destination/Indicator/init.lua.grevert @@ -0,0 +1,8 @@ +@@ -93,77 +93,8 @@ + %22)%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A%0D%0A + indi +@@ -548,59 +548,8 @@ + %0D%0A%0D%0A +-try_find_assigned_viewport(%22AJS37_DESTINATION%22)%0D%0A%0D%0A + prin diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/TV-Indicator/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/TV-Indicator/Indicator/init.lua.gpatch new file mode 100644 index 000000000..03925626c --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/TV-Indicator/Indicator/init.lua.gpatch @@ -0,0 +1,8 @@ +@@ -56,16 +56,83 @@ + .lua%22)%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + indicato +@@ -595,10 +595,68 @@ + %7D%2C%0D%0A%7D%0D%0A ++try_find_assigned_viewport(%22AJS37_VIGGEN_TV%22%2C %22VIGGEN_TV%22) + %0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/TV-Indicator/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/TV-Indicator/Indicator/init.lua.grevert new file mode 100644 index 000000000..63c90acdc --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/TV-Indicator/Indicator/init.lua.grevert @@ -0,0 +1,8 @@ +@@ -60,75 +60,8 @@ + %22)%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A + indi +@@ -532,64 +532,6 @@ + %0A%7D%0D%0A +-try_find_assigned_viewport(%22AJS37_VIGGEN_TV%22%2C %22VIGGEN_TV%22) + %0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/radar/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/radar/Indicator/init.lua.gpatch new file mode 100644 index 000000000..dd1533d95 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/radar/Indicator/init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -56,16 +56,85 @@ + .lua%22)%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A%0D%0A + indicato +@@ -548,12 +548,57 @@ + %0A%09 %7D%2C%0D%0A%7D%0D%0A%0D%0A ++try_find_assigned_viewport(%22AJS37_RADAR%22)%0D%0A%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/radar/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/radar/Indicator/init.lua.grevert new file mode 100644 index 000000000..a13e3d3dd --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AJS37/Cockpit/scripts/radar/Indicator/init.lua.grevert @@ -0,0 +1,7 @@ +@@ -60,77 +60,8 @@ + %22)%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A%0D%0A + indi +@@ -487,49 +487,4 @@ + %0D%0A%0D%0A +-try_find_assigned_viewport(%22AJS37_RADAR%22)%0D%0A%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDL_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDL_init.lua.gpatch new file mode 100644 index 000000000..997eb99f2 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDL_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -99,32 +99,51 @@ + igned_viewport(%22 ++AV8BNA_LEFT_MFCD%22%2C%22 + LEFT_MFCD%22)%0D%0A%0D%0Ab diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDL_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDL_init.lua.grevert new file mode 100644 index 000000000..89e93cbfa --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDL_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -111,27 +111,8 @@ + rt(%22 +-AV8BNA_LEFT_MFCD%22%2C%22 + LEFT diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDR_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDR_init.lua.gpatch new file mode 100644 index 000000000..32d1add92 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDR_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -99,32 +99,52 @@ + igned_viewport(%22 ++AV8BNA_RIGHT_MFCD%22%2C%22 + RIGHT_MFCD%22)%0D%0A%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDR_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDR_init.lua.grevert new file mode 100644 index 000000000..a9127d326 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/AV8BNA/Cockpit/MPCD/indicator/MPCDR_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -111,28 +111,8 @@ + rt(%22 +-AV8BNA_RIGHT_MFCD%22%2C%22 + RIGH diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/ASE/APR39_indicator/BAKE/APR39_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/ASE/APR39_indicator/BAKE/APR39_init.lua.gpatch new file mode 100644 index 000000000..6fff06acc --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/ASE/APR39_indicator/BAKE/APR39_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -337,8 +337,125 @@ + %3D 1%0D%0A ++-- Added by Helios%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 1)%0D%0Atry_find_assigned_viewport(%22CH47F_RWR%22%2C%22RWR%22)%0D%0A-- End diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/ASE/APR39_indicator/BAKE/APR39_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/ASE/APR39_indicator/BAKE/APR39_init.lua.grevert new file mode 100644 index 000000000..d49517c4a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/ASE/APR39_indicator/BAKE/APR39_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -341,121 +341,4 @@ + 1%0D%0A +--- Added by Helios%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 1)%0D%0Atry_find_assigned_viewport(%22CH47F_RWR%22%2C%22RWR%22)%0D%0A-- End diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init1.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init1.lua.gpatch new file mode 100644 index 000000000..9e75e2e67 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init1.lua.gpatch @@ -0,0 +1,3 @@ +@@ -59,8 +59,210 @@ + ua%22)%0D%0A%0D%0A ++-- Updated by Helios at 002_009_00021_16362_00000%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 1)%0D%0Atry_find_assigned_viewport(%22LEFT_SFD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init1.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init1.lua.grevert new file mode 100644 index 000000000..e6219e705 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init1.lua.grevert @@ -0,0 +1,3 @@ +@@ -63,206 +63,4 @@ + %0D%0A%0D%0A +--- Updated by Helios at 002_009_00021_16362_00000%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 1)%0D%0Atry_find_assigned_viewport(%22LEFT_SFD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init2.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init2.lua.gpatch new file mode 100644 index 000000000..04a1f794a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init2.lua.gpatch @@ -0,0 +1,3 @@ +@@ -59,8 +59,209 @@ + ua%22)%0D%0A%0D%0A ++-- Updated by Helios at 002_009_00021_16362_00000%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 1)%0D%0Atry_find_assigned_viewport(%22RIGHT_SFD%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init2.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init2.lua.grevert new file mode 100644 index 000000000..5888a37af --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init2.lua.grevert @@ -0,0 +1,3 @@ +@@ -63,205 +63,4 @@ + %0D%0A%0D%0A +--- Updated by Helios at 002_009_00021_16362_00000%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 1)%0D%0Atry_find_assigned_viewport(%22RIGHT_SFD%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCC_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCC_init.lua.gpatch new file mode 100644 index 000000000..ac43d1e44 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCC_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -115,16 +115,40 @@ + ewport(%22 ++F_15E_CENTER_MPCD_PLT%22%2C%22 + CENTER_M diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCC_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCC_init.lua.grevert new file mode 100644 index 000000000..26086c7ec --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCC_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -119,32 +119,8 @@ + rt(%22 +-F_15E_CENTER_MPCD_PLT%22%2C%22 + CENT diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCL_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCL_init.lua.gpatch new file mode 100644 index 000000000..1a14523a0 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCL_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -115,16 +115,37 @@ + ewport(%22 ++F_15E_LEFT_MPD_PLT%22%2C%22 + LEFT_MFC diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCL_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCL_init.lua.grevert new file mode 100644 index 000000000..dd19c809e --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCL_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -119,29 +119,8 @@ + rt(%22 +-F_15E_LEFT_MPD_PLT%22%2C%22 + LEFT diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCR_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCR_init.lua.gpatch new file mode 100644 index 000000000..2dbd02827 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCR_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -115,16 +115,38 @@ + ewport(%22 ++F_15E_RIGHT_MPD_PLT%22%2C%22 + RIGHT_MF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCR_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCR_init.lua.grevert new file mode 100644 index 000000000..243bcb168 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_FCR_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -119,30 +119,8 @@ + rt(%22 +-F_15E_RIGHT_MPD_PLT%22%2C%22 + RIGH diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLI_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLI_init.lua.gpatch new file mode 100644 index 000000000..89a7f8b4d --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLI_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -116,16 +116,37 @@ + ewport(%22 ++F_15E_LEFT_MPD_WSO%22%2C%22 + LEFT_MFC diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLI_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLI_init.lua.grevert new file mode 100644 index 000000000..fdf20d770 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLI_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -120,29 +120,8 @@ + rt(%22 +-F_15E_LEFT_MPD_WSO%22%2C%22 + LEFT diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLO_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLO_init.lua.gpatch new file mode 100644 index 000000000..713a0b135 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLO_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -116,16 +116,38 @@ + ewport(%22 ++F_15E_LEFT_MPCD_WSO%22%2C%22 + OUTER_LE diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLO_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLO_init.lua.grevert new file mode 100644 index 000000000..38a057a00 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCLO_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -120,30 +120,8 @@ + rt(%22 +-F_15E_LEFT_MPCD_WSO%22%2C%22 + OUTE diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRI_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRI_init.lua.gpatch new file mode 100644 index 000000000..1a22e477b --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRI_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -116,16 +116,38 @@ + ewport(%22 ++F_15E_RIGHT_MPD_WSO%22%2C%22 + RIGHT_MF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRI_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRI_init.lua.grevert new file mode 100644 index 000000000..ee1b36ec7 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRI_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -120,30 +120,8 @@ + rt(%22 +-F_15E_RIGHT_MPD_WSO%22%2C%22 + RIGH diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRO_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRO_init.lua.gpatch new file mode 100644 index 000000000..4acb38f08 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRO_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -116,16 +116,39 @@ + ewport(%22 ++F_15E_RIGHT_MPCD_WSO%22%2C%22 + OUTER_RI diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRO_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRO_init.lua.grevert new file mode 100644 index 000000000..ece7f8667 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-15E/Cockpit/Bake/MFDG/Bake_RCRO_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -120,31 +120,8 @@ + rt(%22 +-F_15E_RIGHT_MPCD_WSO%22%2C%22 + OUTE diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/DED/indicator/DED_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/DED/indicator/DED_init.lua.gpatch new file mode 100644 index 000000000..ac4589293 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/DED/indicator/DED_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -438,16 +438,131 @@ + ometry%09%3D false%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_16C_DED%22%2C %22DED%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/DED/indicator/DED_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/DED/indicator/DED_init.lua.grevert new file mode 100644 index 000000000..73f494096 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/DED/indicator/DED_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -450,119 +450,4 @@ + se%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_16C_DED%22%2C %22DED%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/EHSI_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/EHSI_init.lua.gpatch new file mode 100644 index 000000000..3ae4764b5 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/EHSI_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -956,16 +956,30 @@ + iewport( ++%22F_16C_EHSI%22%2C + %22EHSI%22)%0D diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/EHSI_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/EHSI_init.lua.grevert new file mode 100644 index 000000000..f4adb5cf3 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/EHSI_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -960,22 +960,8 @@ + ort( +-%22F_16C_EHSI%22%2C + %22EHS diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/LCD/EHSI_LCD.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/LCD/EHSI_LCD.lua.gpatch new file mode 100644 index 000000000..d308e47f4 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/LCD/EHSI_LCD.lua.gpatch @@ -0,0 +1,4 @@ +@@ -457,16 +457,30 @@ + iewport( ++%22F_16C_EHSI%22%2C + %22EHSI%22)%0D diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/LCD/EHSI_LCD.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/LCD/EHSI_LCD.lua.grevert new file mode 100644 index 000000000..b372232cf --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/EHSI/indicator/LCD/EHSI_LCD.lua.grevert @@ -0,0 +1,4 @@ +@@ -461,22 +461,8 @@ + ort( +-%22F_16C_EHSI%22%2C + %22EHS diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/HUD/indicator/HUD_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/HUD/indicator/HUD_init.lua.gpatch new file mode 100644 index 000000000..42166ac5f --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/HUD/indicator/HUD_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -905,8 +905,123 @@ + 2)%2C 0%7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_16C_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/HUD/indicator/HUD_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/HUD/indicator/HUD_init.lua.grevert new file mode 100644 index 000000000..f92e22818 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/HUD/indicator/HUD_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -909,119 +909,4 @@ + 0%7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_16C_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/LCD/MFD_LCD.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/LCD/MFD_LCD.lua.gpatch new file mode 100644 index 000000000..2fa2f5157 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/LCD/MFD_LCD.lua.gpatch @@ -0,0 +1,8 @@ +@@ -610,16 +610,35 @@ + iewport( ++%22F_16C_LEFT_MFCD%22%2C + %22LEFT_MF +@@ -679,16 +679,36 @@ + iewport( ++%22F_16C_RIGHT_MFCD%22%2C + %22RIGHT_M diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/LCD/MFD_LCD.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/LCD/MFD_LCD.lua.grevert new file mode 100644 index 000000000..8cfeb6986 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/LCD/MFD_LCD.lua.grevert @@ -0,0 +1,8 @@ +@@ -614,27 +614,8 @@ + ort( +-%22F_16C_LEFT_MFCD%22%2C + %22LEF +@@ -664,28 +664,8 @@ + ort( +-%22F_16C_RIGHT_MFCD%22%2C + %22RIG diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_left_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_left_init.lua.gpatch new file mode 100644 index 000000000..f796ea01a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_left_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -1500,16 +1500,35 @@ + iewport( ++%22F_16C_LEFT_MFCD%22%2C + %22LEFT_MF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_left_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_left_init.lua.grevert new file mode 100644 index 000000000..a3c2ffd62 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_left_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -1504,27 +1504,8 @@ + ort( +-%22F_16C_LEFT_MFCD%22%2C + %22LEF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_right_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_right_init.lua.gpatch new file mode 100644 index 000000000..9732cb4d4 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_right_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -1500,16 +1500,36 @@ + iewport( ++%22F_16C_RIGHT_MFCD%22%2C + %22RIGHT_M diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_right_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_right_init.lua.grevert new file mode 100644 index 000000000..556a04856 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/Displays/MFD/indicator/MFD_right_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -1504,28 +1504,8 @@ + ort( +-%22F_16C_RIGHT_MFCD%22%2C + %22RIG diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/EWS/RWR/indicator/RWR_ALR56_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/EWS/RWR/indicator/RWR_ALR56_init.lua.gpatch new file mode 100644 index 000000000..093c810fb --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/EWS/RWR/indicator/RWR_ALR56_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -1608,8 +1608,123 @@ + GE_BIT%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_16C_RWR%22%2C %22RWR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/EWS/RWR/indicator/RWR_ALR56_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/EWS/RWR/indicator/RWR_ALR56_init.lua.grevert new file mode 100644 index 000000000..6402c60ed --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-16C/Cockpit/Scripts/EWS/RWR/indicator/RWR_ALR56_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -1612,119 +1612,4 @@ + IT%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_16C_RWR%22%2C %22RWR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_Pilot/init_bake.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_Pilot/init_bake.lua.gpatch new file mode 100644 index 000000000..20bde5b93 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_Pilot/init_bake.lua.gpatch @@ -0,0 +1,8 @@ +@@ -113,71 +113,202 @@ + %22)%0D%0A +-%0D%0Aindicator_type %3D indicator_types.COMMON%0D%0Apurposes %09 %3D %7B100%7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A%0D%0Aindicator_type %3D indicator_types.COMMON%0D%0Apurposes %09 %3D %7B100%7D%0D%0Apurposes %3D %7Brender_purpose.GENERAL%2Crender_purpose.HUD_ONLY_VIEW%7D + %0D%0A%0D%0A +@@ -587,12 +587,74 @@ + ID %3D 2%0D%0A ++%0D%0Atry_find_assigned_viewport(%22F_4E_DSCG_PILOT%22%2C %22DSCG_BOTH%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_Pilot/init_bake.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_Pilot/init_bake.lua.grevert new file mode 100644 index 000000000..59bf75aee --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_Pilot/init_bake.lua.grevert @@ -0,0 +1,8 @@ +@@ -113,202 +113,71 @@ + %22)%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0A%0D%0Aindicator_type %3D indicator_types.COMMON%0D%0Apurposes %09 %3D %7B100%7D%0D%0Apurposes %3D %7Brender_purpose.GENERAL%2Crender_purpose.HUD_ONLY_VIEW%7D ++%0D%0Aindicator_type %3D indicator_types.COMMON%0D%0Apurposes %09 %3D %7B100%7D%0D%0A + %0D%0A%0D%0A +@@ -464,66 +464,4 @@ + 2%0D%0A +-%0D%0Atry_find_assigned_viewport(%22F_4E_DSCG_PILOT%22%2C %22DSCG_BOTH%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_WSO/init_bake.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_WSO/init_bake.lua.gpatch new file mode 100644 index 000000000..5c44f8f21 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_WSO/init_bake.lua.gpatch @@ -0,0 +1,7 @@ +@@ -238,16 +238,82 @@ + %3D %7B100%7D%0D ++%0Apurposes %3D %7Brender_purpose.GENERAL%2Crender_purpose.HUD_ONLY_VIEW%7D%0D + %0A%0D%0ABASE +@@ -583,12 +583,72 @@ + geID %3D 1 ++%0D%0A%0D%0Atry_find_assigned_viewport(%22F_4E_DSCG_WSO%22%2C %22DSCG_BOTH%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_WSO/init_bake.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_WSO/init_bake.lua.grevert new file mode 100644 index 000000000..88b8e1ac7 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/DSCG/indicator/DSCG_WSO/init_bake.lua.grevert @@ -0,0 +1,7 @@ +@@ -242,74 +242,8 @@ + 00%7D%0D +-%0Apurposes %3D %7Brender_purpose.GENERAL%2Crender_purpose.HUD_ONLY_VIEW%7D%0D + %0A%0D%0AB +@@ -525,64 +525,4 @@ + %3D 1 +-%0D%0A%0D%0Atry_find_assigned_viewport(%22F_4E_DSCG_WSO%22%2C %22DSCG_BOTH%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/RHAW/indicator/init_bake.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/RHAW/indicator/init_bake.lua.gpatch new file mode 100644 index 000000000..c91a89043 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/RHAW/indicator/init_bake.lua.gpatch @@ -0,0 +1,7 @@ +@@ -108,16 +108,83 @@ + s.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Aindic +@@ -400,12 +400,66 @@ + ID %3D 1%0D%0A ++%0D%0Atry_find_assigned_viewport(%22F_4E_RHAW_PILOT%22%2C %22RWR%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/RHAW/indicator/init_bake.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/RHAW/indicator/init_bake.lua.grevert new file mode 100644 index 000000000..4fc9aa38d --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-4E/Cockpit/Scripts/RHAW/indicator/init_bake.lua.grevert @@ -0,0 +1,7 @@ +@@ -112,75 +112,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ai +@@ -341,58 +341,4 @@ + 1%0D%0A +-%0D%0Atry_find_assigned_viewport(%22F_4E_RHAW_PILOT%22%2C %22RWR%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-5E 2024/Cockpit/Scripts/AN_ALR87/indicator/AN_ALR87_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-5E 2024/Cockpit/Scripts/AN_ALR87/indicator/AN_ALR87_init.lua.gpatch new file mode 100644 index 000000000..0b45a3fb0 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-5E 2024/Cockpit/Scripts/AN_ALR87/indicator/AN_ALR87_init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -55,16 +55,83 @@ + s.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Aindic +@@ -1948,8 +1948,106 @@ + _RWR%22%0D%0A%7D ++%0D%0A%0D%0A-- Added by Helios%0D%0Atry_find_assigned_viewport(%22F_5E_2024_RWR%22%2C%22LEFT_MFCD%22)%0D%0A-- End Addition%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-5E 2024/Cockpit/Scripts/AN_ALR87/indicator/AN_ALR87_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-5E 2024/Cockpit/Scripts/AN_ALR87/indicator/AN_ALR87_init.lua.grevert new file mode 100644 index 000000000..28ae9604b --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F-5E 2024/Cockpit/Scripts/AN_ALR87/indicator/AN_ALR87_init.lua.grevert @@ -0,0 +1,7 @@ +@@ -59,75 +59,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ai +@@ -1885,102 +1885,4 @@ + %22%0D%0A%7D +-%0D%0A%0D%0A-- Added by Helios%0D%0Atry_find_assigned_viewport(%22F_5E_2024_RWR%22%2C%22LEFT_MFCD%22)%0D%0A-- End Addition%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/HeadUpDisplay/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/HeadUpDisplay/Indicator/init.lua.gpatch new file mode 100644 index 000000000..2bdc9b79c --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/HeadUpDisplay/Indicator/init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -1935,28 +1935,144 @@ + LOW_C%22%2C%0D%0A%22HUD_GLOW_NC%22%2C%0D%0A%7D%0D%0A ++%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_14_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/HeadUpDisplay/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/HeadUpDisplay/Indicator/init.lua.grevert new file mode 100644 index 000000000..abb571892 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/HeadUpDisplay/Indicator/init.lua.grevert @@ -0,0 +1,3 @@ +@@ -1959,120 +1959,4 @@ + %0A%7D%0D%0A +-%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_14_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/Pilot/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/Pilot/init.lua.gpatch new file mode 100644 index 000000000..d4d6a907c --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/Pilot/init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -1331,8 +1331,136 @@ + E_MAIN%0D%0A ++%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_14_RWR_PILOT%22%2C %22RWR_PILOT%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/Pilot/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/Pilot/init.lua.grevert new file mode 100644 index 000000000..f40ed8c18 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/Pilot/init.lua.grevert @@ -0,0 +1,3 @@ +@@ -1335,132 +1335,4 @@ + IN%0D%0A +-%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_14_RWR_PILOT%22%2C %22RWR_PILOT%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/RIO/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/RIO/init.lua.gpatch new file mode 100644 index 000000000..75c7fa915 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/RIO/init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -1321,8 +1321,132 @@ + E_MAIN%0D%0A ++%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_14_RWR_RIO%22%2C %22RWR_RIO%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/RIO/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/RIO/init.lua.grevert new file mode 100644 index 000000000..7b42649b5 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/RWR/Indicator/RIO/init.lua.grevert @@ -0,0 +1,3 @@ +@@ -1325,128 +1325,4 @@ + IN%0D%0A +-%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22F_14_RWR_RIO%22%2C %22RWR_RIO%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/Main/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/Main/init.lua.gpatch new file mode 100644 index 000000000..1484f6166 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/Main/init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -2223,16 +2223,37 @@ + iewport( ++%22F_14_UHF_ARC159_M%22%2C + %22F14_UHF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/Main/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/Main/init.lua.grevert new file mode 100644 index 000000000..b38297b7b --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/Main/init.lua.grevert @@ -0,0 +1,4 @@ +@@ -2227,29 +2227,8 @@ + ort( +-%22F_14_UHF_ARC159_M%22%2C + %22F14 diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemotePilot/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemotePilot/init.lua.gpatch new file mode 100644 index 000000000..3d91291d8 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemotePilot/init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -2230,16 +2230,38 @@ + iewport( ++%22F_14_UHF_ARC159_RP%22%2C + %22F14_UHF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemotePilot/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemotePilot/init.lua.grevert new file mode 100644 index 000000000..6c251e067 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemotePilot/init.lua.grevert @@ -0,0 +1,4 @@ +@@ -2234,30 +2234,8 @@ + ort( +-%22F_14_UHF_ARC159_RP%22%2C + %22F14 diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemoteRIO/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemoteRIO/init.lua.gpatch new file mode 100644 index 000000000..0234020e9 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemoteRIO/init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -2228,16 +2228,38 @@ + iewport( ++%22F_14_UHF_ARC159_RR%22%2C + %22F14_UHF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemoteRIO/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemoteRIO/init.lua.grevert new file mode 100644 index 000000000..386381f66 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/UHF_Radio/Indicator/RemoteRIO/init.lua.grevert @@ -0,0 +1,4 @@ +@@ -2232,30 +2232,8 @@ + ort( +-%22F_14_UHF_ARC159_RR%22%2C + %22F14 diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/Main/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/Main/init.lua.gpatch new file mode 100644 index 000000000..fe760f025 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/Main/init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -2223,16 +2223,37 @@ + iewport( ++%22F_14_VHF_ARC182_M%22%2C + %22F14_VHF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/Main/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/Main/init.lua.grevert new file mode 100644 index 000000000..8236e85dd --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/Main/init.lua.grevert @@ -0,0 +1,4 @@ +@@ -2227,29 +2227,8 @@ + ort( +-%22F_14_VHF_ARC182_M%22%2C + %22F14 diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/RemotePilot/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/RemotePilot/init.lua.gpatch new file mode 100644 index 000000000..cc656186c --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/RemotePilot/init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -2230,16 +2230,38 @@ + iewport( ++%22F_14_VHF_ARC182_RP%22%2C + %22F14_VHF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/RemotePilot/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/RemotePilot/init.lua.grevert new file mode 100644 index 000000000..f68478140 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/F14/Cockpit/Scripts/VHF_Radio/Indicator/RemotePilot/init.lua.grevert @@ -0,0 +1,4 @@ +@@ -2234,30 +2234,8 @@ + ort( +-%22F_14_VHF_ARC182_RP%22%2C + %22F14 diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/IFEI/indicator/IFEI_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/IFEI/indicator/IFEI_init.lua.gpatch new file mode 100644 index 000000000..3e8b887d8 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/IFEI/indicator/IFEI_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -1723,8 +1723,126 @@ + ME_SET%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22FA_18C_IFEI%22%2C %22IFEI%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/IFEI/indicator/IFEI_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/IFEI/indicator/IFEI_init.lua.grevert new file mode 100644 index 000000000..27133f4c7 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/IFEI/indicator/IFEI_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -1727,122 +1727,4 @@ + ET%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22FA_18C_IFEI%22%2C %22IFEI%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/AMPCD_viewport_cfg.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/AMPCD_viewport_cfg.lua.gpatch new file mode 100644 index 000000000..e9181ece9 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/AMPCD_viewport_cfg.lua.gpatch @@ -0,0 +1,4 @@ +@@ -688,16 +688,38 @@ + iewport( ++%22FA_18C_CENTER_MFCD%22%2C + %22CENTER_ diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/AMPCD_viewport_cfg.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/AMPCD_viewport_cfg.lua.grevert new file mode 100644 index 000000000..3fd7f59b7 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/AMPCD_viewport_cfg.lua.grevert @@ -0,0 +1,4 @@ +@@ -692,30 +692,8 @@ + ort( +-%22FA_18C_CENTER_MFCD%22%2C + %22CEN diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/BAKE/AMPCD_bake_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/BAKE/AMPCD_bake_init.lua.gpatch new file mode 100644 index 000000000..d96f0df78 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/BAKE/AMPCD_bake_init.lua.gpatch @@ -0,0 +1,5 @@ +@@ -678,17 +678,17 @@ + day %3D 1. +-0 ++8 + -- day diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/BAKE/AMPCD_bake_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/BAKE/AMPCD_bake_init.lua.grevert new file mode 100644 index 000000000..8a0d3de4c --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/AMPCD/indicator/BAKE/AMPCD_bake_init.lua.grevert @@ -0,0 +1,5 @@ +@@ -678,17 +678,17 @@ + day %3D 1. +-8 ++0 + -- day diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/Common/indicator/BAKE/MPD_common_bake_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/Common/indicator/BAKE/MPD_common_bake_init.lua.gpatch new file mode 100644 index 000000000..e074aa311 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/Common/indicator/BAKE/MPD_common_bake_init.lua.gpatch @@ -0,0 +1,5 @@ +@@ -449,17 +449,17 @@ + day %3D 1. +-0 ++8 + -- day diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/Common/indicator/BAKE/MPD_common_bake_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/Common/indicator/BAKE/MPD_common_bake_init.lua.grevert new file mode 100644 index 000000000..65d0320ac --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/Common/indicator/BAKE/MPD_common_bake_init.lua.grevert @@ -0,0 +1,5 @@ +@@ -453,9 +453,9 @@ + %3D 1. +-8 ++0 + -- diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/HUD_AVQ32/indicator/AVQ32_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/HUD_AVQ32/indicator/AVQ32_init.lua.gpatch new file mode 100644 index 000000000..3fc628d20 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/HUD_AVQ32/indicator/AVQ32_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -1894,8 +1894,126 @@ + 4)%2C 0%7D%0D%0A ++%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22FA_18C_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/HUD_AVQ32/indicator/AVQ32_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/HUD_AVQ32/indicator/AVQ32_init.lua.grevert new file mode 100644 index 000000000..9511097c6 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/HUD_AVQ32/indicator/AVQ32_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -1898,122 +1898,4 @@ + 0%7D%0D%0A +-%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22FA_18C_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_left_viewport_cfg.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_left_viewport_cfg.lua.gpatch new file mode 100644 index 000000000..8e63e939b --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_left_viewport_cfg.lua.gpatch @@ -0,0 +1,4 @@ +@@ -151,16 +151,36 @@ + iewport( ++%22FA_18C_LEFT_MFCD%22%2C + %22LEFT_MF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_left_viewport_cfg.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_left_viewport_cfg.lua.grevert new file mode 100644 index 000000000..e25ad7d8e --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_left_viewport_cfg.lua.grevert @@ -0,0 +1,4 @@ +@@ -155,28 +155,8 @@ + ort( +-%22FA_18C_LEFT_MFCD%22%2C + %22LEF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_right_viewport_cfg.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_right_viewport_cfg.lua.gpatch new file mode 100644 index 000000000..8ea71bfa0 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_right_viewport_cfg.lua.gpatch @@ -0,0 +1,4 @@ +@@ -152,16 +152,37 @@ + iewport( ++%22FA_18C_RIGHT_MFCD%22%2C + %22RIGHT_M diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_right_viewport_cfg.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_right_viewport_cfg.lua.grevert new file mode 100644 index 000000000..3a76838da --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/Multipurpose_Display_Group/MDI_IP1556A/indicator/MDI_right_viewport_cfg.lua.grevert @@ -0,0 +1,4 @@ +@@ -156,29 +156,8 @@ + ort( +-%22FA_18C_RIGHT_MFCD%22%2C + %22RIG diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/TEWS/indicator/BAKE/RWR_ALR67_bake_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/TEWS/indicator/BAKE/RWR_ALR67_bake_init.lua.gpatch new file mode 100644 index 000000000..ea4c7d880 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/TEWS/indicator/BAKE/RWR_ALR67_bake_init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -55,16 +55,83 @@ + s.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Apurpo +@@ -341,8 +341,92 @@ + %3D 1%0D%0A ++-- Added by Helios%0D%0Atry_find_assigned_viewport(%22FA_18C_RWR%22%2C %22RWR%22)%0D%0A-- End Addition diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/TEWS/indicator/BAKE/RWR_ALR67_bake_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/TEWS/indicator/BAKE/RWR_ALR67_bake_init.lua.grevert new file mode 100644 index 000000000..eedf23a6d --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/TEWS/indicator/BAKE/RWR_ALR67_bake_init.lua.grevert @@ -0,0 +1,7 @@ +@@ -59,75 +59,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ap +@@ -278,88 +278,4 @@ + 1%0D%0A +--- Added by Helios%0D%0Atry_find_assigned_viewport(%22FA_18C_RWR%22%2C %22RWR%22)%0D%0A-- End Addition diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/UFC/indicator/UFC_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/UFC/indicator/UFC_init.lua.gpatch new file mode 100644 index 000000000..23ae18bff --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/UFC/indicator/UFC_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -635,12 +635,130 @@ + etry %3D false ++%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22FA_18C_UFC%22%2C %22UFC%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/UFC/indicator/UFC_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/UFC/indicator/UFC_init.lua.grevert new file mode 100644 index 000000000..a713ad6d6 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/UFC/indicator/UFC_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -643,122 +643,4 @@ + alse +-%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22FA_18C_UFC%22%2C %22UFC%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/fonts.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/fonts.lua.gpatch new file mode 100644 index 000000000..eb9282816 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/fonts.lua.gpatch @@ -0,0 +1,24 @@ +@@ -2311,24 +2311,121 @@ + ke_font%22%2C%0D%0A%09 ++-- alternate values that can be used with Helios%0D%0A%09-- thickness %3D 0.4%2C%0D%0A%09-- fuzziness %3D 0.2%2C%0D%0A%09 + thickness %3D +@@ -4784,32 +4784,187 @@ + _stroke_MDG%22%5D)%0D%0A ++-- modified by Helios%0D%0Afontdescription%5B%22font_stroke_MDG_DMC_outline%22%5D.thickness %3D 3.0%0D%0Afontdescription%5B%22font_stroke_MDG_DMC_outline%22%5D.fuzziness %3D 0.85%0D%0A-- + fontdescription%5B +@@ -5021,32 +5021,35 @@ + line_thickness%0D%0A ++-- + fontdescription%5B +@@ -5114,18 +5114,16 @@ + ziness%0D%0A +-%0D%0A + -- DMC g +@@ -5284,16 +5284,194 @@ + MDG%22%5D)%0D%0A ++-- alternate values that can be used with Helios%0D%0A-- fontdescription%5B%22font_stroke_MDG_DMC_main%22%5D.thickness %3D 0.4%0D%0A-- fontdescription%5B%22font_stroke_MDG_DMC_main%22%5D.fuzziness %3D 0.2%0D%0A + fontdesc +@@ -5618,18 +5618,16 @@ + ziness%0D%0A +-%0D%0A + UFC_xsiz diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/fonts.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/fonts.lua.grevert new file mode 100644 index 000000000..393b0d56f --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/FA-18C/Cockpit/Scripts/fonts.lua.grevert @@ -0,0 +1,24 @@ +@@ -2319,105 +2319,8 @@ + %2C%0D%0A%09 +--- alternate values that can be used with Helios%0D%0A%09-- thickness %3D 0.4%2C%0D%0A%09-- fuzziness %3D 0.2%2C%0D%0A%09 + thic +@@ -4699,163 +4699,8 @@ + %5D)%0D%0A +--- modified by Helios%0D%0Afontdescription%5B%22font_stroke_MDG_DMC_outline%22%5D.thickness %3D 3.0%0D%0Afontdescription%5B%22font_stroke_MDG_DMC_outline%22%5D.fuzziness %3D 0.85%0D%0A-- + font +@@ -4777,19 +4777,16 @@ + ckness%0D%0A +--- + fontdesc +@@ -4859,16 +4859,18 @@ + ziness%0D%0A ++%0D%0A + -- DMC g +@@ -5035,186 +5035,8 @@ + %5D)%0D%0A +--- alternate values that can be used with Helios%0D%0A-- fontdescription%5B%22font_stroke_MDG_DMC_main%22%5D.thickness %3D 0.4%0D%0A-- fontdescription%5B%22font_stroke_MDG_DMC_main%22%5D.fuzziness %3D 0.2%0D%0A + font +@@ -5187,16 +5187,18 @@ + ziness%0D%0A ++%0D%0A + UFC_xsiz diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_left.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_left.lua.gpatch new file mode 100644 index 000000000..96bea03b6 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_left.lua.gpatch @@ -0,0 +1,3 @@ +@@ -230,12 +230,63 @@ + init.lua%22)%0D%0A ++%0D%0Atry_find_assigned_viewport(%22CH47F_CDU_COPILOT%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_left.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_left.lua.grevert new file mode 100644 index 000000000..ce2c78cb3 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_left.lua.grevert @@ -0,0 +1,3 @@ +@@ -238,55 +238,4 @@ + %22)%0D%0A +-%0D%0Atry_find_assigned_viewport(%22CH47F_CDU_COPILOT%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_right.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_right.lua.gpatch new file mode 100644 index 000000000..0721769d8 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_right.lua.gpatch @@ -0,0 +1,3 @@ +@@ -231,12 +231,61 @@ + init.lua%22)%0D%0A ++%0D%0Atry_find_assigned_viewport(%22CH47F_CDU_PILOT%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_right.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_right.lua.grevert new file mode 100644 index 000000000..c489303bb --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/BAKE/init_right.lua.grevert @@ -0,0 +1,3 @@ +@@ -239,53 +239,4 @@ + %22)%0D%0A +-%0D%0Atry_find_assigned_viewport(%22CH47F_CDU_PILOT%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_in.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_in.lua.gpatch new file mode 100644 index 000000000..007d0949b --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_in.lua.gpatch @@ -0,0 +1,3 @@ +@@ -236,12 +236,69 @@ + init.lua%22)%0D%0A ++%0D%0Atry_find_assigned_viewport(%22CH47F_MFD_COPILOT_RIGHT%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_in.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_in.lua.grevert new file mode 100644 index 000000000..c4d883a62 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_in.lua.grevert @@ -0,0 +1,3 @@ +@@ -244,61 +244,4 @@ + %22)%0D%0A +-%0D%0Atry_find_assigned_viewport(%22CH47F_MFD_COPILOT_RIGHT%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_out.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_out.lua.gpatch new file mode 100644 index 000000000..5dd335a11 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_out.lua.gpatch @@ -0,0 +1,3 @@ +@@ -237,12 +237,68 @@ + init.lua%22)%0D%0A ++%0D%0Atry_find_assigned_viewport(%22CH47F_MFD_COPILOT_LEFT%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_out.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_out.lua.grevert new file mode 100644 index 000000000..e8d734229 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/init_copilot_out.lua.grevert @@ -0,0 +1,3 @@ +@@ -245,60 +245,4 @@ + %22)%0D%0A +-%0D%0Atry_find_assigned_viewport(%22CH47F_MFD_COPILOT_LEFT%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/chronometer_indicator_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/chronometer_indicator_init.lua.gpatch new file mode 100644 index 000000000..6d0549bbd --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/chronometer_indicator_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -531,8 +531,170 @@ + zation%0D%0A ++%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 1)%0D%0Atry_find_assigned_viewport(%22CH47F_CHRONOMETER%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/chronometer_indicator_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/chronometer_indicator_init.lua.grevert new file mode 100644 index 000000000..899b36969 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/GCBase/Cockpit/Scripts/chronometer_indicator_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -535,166 +535,4 @@ + on%0D%0A +-%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 1)%0D%0Atry_find_assigned_viewport(%22CH47F_CHRONOMETER%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/ABRIS/BAKE/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/ABRIS/BAKE/init.lua.gpatch new file mode 100644 index 000000000..e53e12743 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/ABRIS/BAKE/init.lua.gpatch @@ -0,0 +1,6 @@ +@@ -332,15 +332,22 @@ + rt(%22 ++KA_50_ + ABRIS%22%2C ++ + %22RIG diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/ABRIS/BAKE/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/ABRIS/BAKE/init.lua.grevert new file mode 100644 index 000000000..e5790735e --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/ABRIS/BAKE/init.lua.grevert @@ -0,0 +1,6 @@ +@@ -332,22 +332,15 @@ + rt(%22 +-KA_50_ + ABRIS%22%2C +- + %22RIG diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/HUD/HUD_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/HUD/HUD_init.lua.gpatch new file mode 100644 index 000000000..cccb05f48 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/HUD/HUD_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -8008,12 +8008,127 @@ + %0A%09end%0D%0Aend%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22KA_50_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/HUD/HUD_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/HUD/HUD_init.lua.grevert new file mode 100644 index 000000000..873c7f15b --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/HUD/HUD_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -8016,119 +8016,4 @@ + nd%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22KA_50_HUD%22%2C %22HUD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/SHKVAL/BAKE/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/SHKVAL/BAKE/init.lua.gpatch new file mode 100644 index 000000000..f37699dcf --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/SHKVAL/BAKE/init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -314,16 +314,23 @@ + rt(%22 +-Shkval ++KA_50_SHKVAL + %22%2C ++ + %22LEF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/SHKVAL/BAKE/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/SHKVAL/BAKE/init.lua.grevert new file mode 100644 index 000000000..28defd38f --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/SHKVAL/BAKE/init.lua.grevert @@ -0,0 +1,7 @@ +@@ -314,23 +314,16 @@ + rt(%22 +-KA_50_SHKVAL ++Shkval + %22%2C +- + %22LEF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/device_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/device_init.lua.gpatch new file mode 100644 index 000000000..cd14a750f --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/device_init.lua.gpatch @@ -0,0 +1,8 @@ +@@ -24326,32 +24326,68 @@ + %22HUD-RIGHT%22%7D%7D%7D%0D%0A ++-- Helios Viewport Patch Change%0D%0A-- + indicators%5B#indi +@@ -24589,24 +24589,271 @@ + 9138832%7D%7D%7D%0D%0A ++indicators%5B#indicators %2B 1%5D %3D %7B%22Ka50%3A%3AccHUD%22 %2C LockOn_Options.script_path..%22HUD%2FHUD_init.lua%22 %2Cdevices.HUD %2C%7B%7B%22HUD-CENTER%22%2C %22HUD-DOWN%22%2C %22HUD-RIGHT%22%7D%2C%7Bsy_l %3D 0.0%7D%7D%7D%0D%0A-- Helios Viewport Patch Change%0D%0A + indicators%5B# diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/device_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/device_init.lua.grevert new file mode 100644 index 000000000..4ce420d13 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50/Cockpit/Scripts/device_init.lua.grevert @@ -0,0 +1,8 @@ +@@ -24338,44 +24338,8 @@ + %7D%7D%0D%0A +--- Helios Viewport Patch Change%0D%0A-- + indi +@@ -24561,255 +24561,8 @@ + %7D%7D%0D%0A +-indicators%5B#indicators %2B 1%5D %3D %7B%22Ka50%3A%3AccHUD%22 %2C LockOn_Options.script_path..%22HUD%2FHUD_init.lua%22 %2Cdevices.HUD %2C%7B%7B%22HUD-CENTER%22%2C %22HUD-DOWN%22%2C %22HUD-RIGHT%22%7D%2C%7Bsy_l %3D 0.0%7D%7D%7D%0D%0A-- Helios Viewport Patch Change%0D%0A + indi diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/ABRIS/BAKE/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/ABRIS/BAKE/init.lua.gpatch new file mode 100644 index 000000000..93f3f55a0 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/ABRIS/BAKE/init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -328,16 +328,24 @@ + ewport(%22 ++KA_50_3_ + ABRIS%22%2C%22 diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/ABRIS/BAKE/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/ABRIS/BAKE/init.lua.grevert new file mode 100644 index 000000000..cb9644206 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/ABRIS/BAKE/init.lua.grevert @@ -0,0 +1,4 @@ +@@ -332,16 +332,8 @@ + rt(%22 +-KA_50_3_ + ABRI diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/HUD/HUD_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/HUD/HUD_init.lua.gpatch new file mode 100644 index 000000000..2dfe97c64 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/HUD/HUD_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -8058,12 +8058,127 @@ + %0A%09end%0D%0Aend%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22KA_50_3_HUD%22%2C %22HUD%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/HUD/HUD_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/HUD/HUD_init.lua.grevert new file mode 100644 index 000000000..5ce1651a9 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/HUD/HUD_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -8066,119 +8066,4 @@ + nd%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22KA_50_3_HUD%22%2C %22HUD%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/SHKVAL/BAKE/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/SHKVAL/BAKE/init.lua.gpatch new file mode 100644 index 000000000..a7de46eb5 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/SHKVAL/BAKE/init.lua.gpatch @@ -0,0 +1,5 @@ +@@ -316,14 +316,22 @@ + rt(%22 +-Shkval ++KA_50_3_SHKVAL + %22%2C%22L diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/SHKVAL/BAKE/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/SHKVAL/BAKE/init.lua.grevert new file mode 100644 index 000000000..b54bae48d --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/SHKVAL/BAKE/init.lua.grevert @@ -0,0 +1,5 @@ +@@ -316,22 +316,14 @@ + rt(%22 +-KA_50_3_SHKVAL ++Shkval + %22%2C%22L diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/device_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/device_init.lua.gpatch new file mode 100644 index 000000000..1f924112d --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/device_init.lua.gpatch @@ -0,0 +1,8 @@ +@@ -28221,33 +28221,24 @@ + %2C%7Bsy_l %3D 0.0 +-499138832 + %7D%7D%7D%0D%0Aelse%0D%0A%09 +@@ -28450,17 +28450,8 @@ + 0.0 +-499138832 + %7D%7D%7D%0D diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/device_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/device_init.lua.grevert new file mode 100644 index 000000000..a2bc1f6df --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Ka-50_3/Cockpit/Scripts/device_init.lua.grevert @@ -0,0 +1,8 @@ +@@ -28221,24 +28221,33 @@ + %2C%7Bsy_l %3D 0.0 ++499138832 + %7D%7D%7D%0D%0Aelse%0D%0A%09 +@@ -28455,16 +28455,25 @@ + _l %3D 0.0 ++499138832 + %7D%7D%7D%0D%0Aend diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_GreenBox_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_GreenBox_init.lua.gpatch new file mode 100644 index 000000000..f9cb352af --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_GreenBox_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -615,28 +615,164 @@ + ont%22%2C %22COM_greenbox_font%22%2C %7D ++%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_COM_GREENBOX%22%2C %22COM_GREENBOX%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_GreenBox_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_GreenBox_init.lua.grevert new file mode 100644 index 000000000..0abaff8da --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_GreenBox_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -639,140 +639,4 @@ + %22%2C %7D +-%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_COM_GREENBOX%22%2C %22COM_GREENBOX%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_init.lua.gpatch new file mode 100644 index 000000000..9b758f9fd --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -544,8 +544,124 @@ + nt%22%2C %7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_COM%22%2C %22COM%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_init.lua.grevert new file mode 100644 index 000000000..d3164a7ee --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/COM/COM_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -548,120 +548,4 @@ + %7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_COM%22%2C %22COM%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/FUEL/FUEL_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/FUEL/FUEL_init.lua.gpatch new file mode 100644 index 000000000..ba389873a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/FUEL/FUEL_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -509,8 +509,126 @@ + nt%22%2C %7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_FUEL%22%2C %22FUEL%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/FUEL/FUEL_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/FUEL/FUEL_init.lua.grevert new file mode 100644 index 000000000..956cefb9a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/FUEL/FUEL_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -513,122 +513,4 @@ + %7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_FUEL%22%2C %22FUEL%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_BR_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_BR_init.lua.gpatch new file mode 100644 index 000000000..c5b4634a8 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_BR_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -542,8 +542,130 @@ + nt%22%2C %7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_PCA_BR%22%2C %22PCA_BR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_BR_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_BR_init.lua.grevert new file mode 100644 index 000000000..5c4c6d322 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_BR_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -546,126 +546,4 @@ + %7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_PCA_BR%22%2C %22PCA_BR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_UR_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_UR_init.lua.gpatch new file mode 100644 index 000000000..94e844f63 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_UR_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -541,8 +541,130 @@ + nt%22%2C %7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_PCA_UR%22%2C %22PCA_UR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_UR_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_UR_init.lua.grevert new file mode 100644 index 000000000..a97bd2363 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PCA_UR_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -545,126 +545,4 @@ + %7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_PCA_UR%22%2C %22PCA_UR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PPA_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PPA_init.lua.gpatch new file mode 100644 index 000000000..18ab1381a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PPA_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -527,8 +527,124 @@ + nt%22%2C %7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_PPA%22%2C %22PPA%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PPA_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PPA_init.lua.grevert new file mode 100644 index 000000000..b7343183c --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCA_PPA/PPA_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -531,120 +531,4 @@ + %7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_PPA%22%2C %22PPA%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_BR_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_BR_init.lua.gpatch new file mode 100644 index 000000000..00ef5126e --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_BR_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -444,8 +444,134 @@ + ont%22 %7D%0D%0A ++%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_PCN_BR%22%2C %22PCN_BR%22)%0D%0A%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_BR_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_BR_init.lua.grevert new file mode 100644 index 000000000..27090c868 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_BR_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -448,130 +448,4 @@ + %7D%0D%0A +-%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_PCN_BR%22%2C %22PCN_BR%22)%0D%0A%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_UR_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_UR_init.lua.gpatch new file mode 100644 index 000000000..b2034e600 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_UR_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -444,8 +444,132 @@ + ont%22 %7D%0D%0A ++%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_PCN_UR%22%2C %22PCN_UR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_UR_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_UR_init.lua.grevert new file mode 100644 index 000000000..aa4000c78 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/PCN/PCN_UR_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -448,128 +448,4 @@ + %7D%0D%0A +-%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_PCN_UR%22%2C %22PCN_UR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VCM/VCM_screen_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VCM/VCM_screen_init.lua.gpatch new file mode 100644 index 000000000..9dc622355 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VCM/VCM_screen_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -424,8 +424,56 @@ + image%22 %7D ++%0D%0Atry_find_assigned_viewport(%22M2000C_RWR%22%2C%22RWR%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VCM/VCM_screen_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VCM/VCM_screen_init.lua.grevert new file mode 100644 index 000000000..2256aa620 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VCM/VCM_screen_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -428,52 +428,4 @@ + e%22 %7D +-%0D%0Atry_find_assigned_viewport(%22M2000C_RWR%22%2C%22RWR%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTB/VTB_viewport_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTB/VTB_viewport_init.lua.gpatch new file mode 100644 index 000000000..2ac96ca4f --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTB/VTB_viewport_init.lua.gpatch @@ -0,0 +1,4 @@ +@@ -307,16 +307,29 @@ + ewport(%22 ++M2000C_VTB%22%2C%22 + RIGHT_MF diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTB/VTB_viewport_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTB/VTB_viewport_init.lua.grevert new file mode 100644 index 000000000..689d9004c --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTB/VTB_viewport_init.lua.grevert @@ -0,0 +1,4 @@ +@@ -311,21 +311,8 @@ + rt(%22 +-M2000C_VTB%22%2C%22 + RIGH diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTH/HUD_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTH/HUD_init.lua.gpatch new file mode 100644 index 000000000..26c1287d0 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTH/HUD_init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -2135,12 +2135,132 @@ + green%22%2C%0D%0A%7D%0D%0A ++%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_HUD%22%2C %22HUD%22)%0D%0A%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTH/HUD_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTH/HUD_init.lua.grevert new file mode 100644 index 000000000..6a87edcb3 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/M-2000C/Cockpit/VTH/HUD_init.lua.grevert @@ -0,0 +1,3 @@ +@@ -2143,124 +2143,4 @@ + %0A%7D%0D%0A +-%0D%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22M2000C_HUD%22%2C %22HUD%22)%0D%0A%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/9K113_CAM/9K113_CAM_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/9K113_CAM/9K113_CAM_init.lua.gpatch new file mode 100644 index 000000000..f9d9c35a0 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/9K113_CAM/9K113_CAM_init.lua.gpatch @@ -0,0 +1,15 @@ +@@ -504,17 +504,472 @@ + CE%7D%0D%0A%09%0D%0A +-%09 ++ if try_find_assigned_viewport(%22Mi_24P_TV%22) %7E%3D nil then%0D%0A -- this does not currently export the view image%2C only the reticle. To see the reticle use RCtl%2BL to turn on back-lighting %0D%0A%09-- Looking for improvements to this implementation.%0D%0A%09indicator_type %3D indicator_types.COMMON%0D%0A%09purposes %3D %7Brender_purpose.AUXILLARY_SIGHT_SCREENSPACE%2C render_purpose.GENERAL%2C render_purpose.SCREENSPACE_OUTSIDE_COCKPIT%7D%0D%0A%09render_target_always %3D true%0D%0A else %0D%0A + local x%2C +@@ -1084,16 +1084,19 @@ + ale%0D%0A%09%0D%0A ++ + %09dedicat +@@ -1177,13 +1177,26 @@ + rt%0D%0A ++ + end%0D%0A ++end%0D%0A%0D%0A + %0D%0Apa diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/9K113_CAM/9K113_CAM_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/9K113_CAM/9K113_CAM_init.lua.grevert new file mode 100644 index 000000000..0484b3145 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/9K113_CAM/9K113_CAM_init.lua.grevert @@ -0,0 +1,15 @@ +@@ -508,464 +508,9 @@ + %0A%09%0D%0A +- if try_find_assigned_viewport(%22Mi_24P_TV%22) %7E%3D nil then%0D%0A -- this does not currently export the view image%2C only the reticle. To see the reticle use RCtl%2BL to turn on back-lighting %0D%0A%09-- Looking for improvements to this implementation.%0D%0A%09indicator_type %3D indicator_types.COMMON%0D%0A%09purposes %3D %7Brender_purpose.AUXILLARY_SIGHT_SCREENSPACE%2C render_purpose.GENERAL%2C render_purpose.SCREENSPACE_OUTSIDE_COCKPIT%7D%0D%0A%09render_target_always %3D true%0D%0A else %0D%0A ++%09 + loca +@@ -629,19 +629,16 @@ + ale%0D%0A%09%0D%0A +- + %09dedicat +@@ -719,26 +719,13 @@ + rt%0D%0A +- + end%0D%0A +-end%0D%0A%0D%0A + %0D%0Apa diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/MapDisplay/bake/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/MapDisplay/bake/init.lua.gpatch new file mode 100644 index 000000000..5dde76e0d --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/MapDisplay/bake/init.lua.gpatch @@ -0,0 +1,8 @@ +@@ -56,18 +56,16 @@ + .lua%22)%0D%0A +--- + dofile(L +@@ -290,16 +290,60 @@ + rue)%0D%0A%0D%0A ++try_find_assigned_viewport(%22Mi_24P_MAP%22)%0D%0A%0D%0A + page_sub diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/MapDisplay/bake/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/MapDisplay/bake/init.lua.grevert new file mode 100644 index 000000000..a8e90b380 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mi-24P/Cockpit/Scripts/MapDisplay/bake/init.lua.grevert @@ -0,0 +1,8 @@ +@@ -56,16 +56,18 @@ + .lua%22)%0D%0A ++-- + dofile(L +@@ -296,52 +296,8 @@ + %0D%0A%0D%0A +-try_find_assigned_viewport(%22Mi_24P_MAP%22)%0D%0A%0D%0A + page diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Common/ALR_300/Indicator/Baked/ALR_300_bake_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Common/ALR_300/Indicator/Baked/ALR_300_bake_init.lua.gpatch new file mode 100644 index 000000000..4bc6309dc --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Common/ALR_300/Indicator/Baked/ALR_300_bake_init.lua.gpatch @@ -0,0 +1,8 @@ +@@ -568,16 +568,32 @@ + ewport(%22 ++Mirage_F1_RWR%22%2C%22 + RIGHT_MF +@@ -687,16 +687,32 @@ + ewport(%22 ++Mirage_F1_RWR%22%2C%22 + LEFT_MFC diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Common/ALR_300/Indicator/Baked/ALR_300_bake_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Common/ALR_300/Indicator/Baked/ALR_300_bake_init.lua.grevert new file mode 100644 index 000000000..c8abc2b6a --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Common/ALR_300/Indicator/Baked/ALR_300_bake_init.lua.grevert @@ -0,0 +1,8 @@ +@@ -568,32 +568,16 @@ + ewport(%22 +-Mirage_F1_RWR%22%2C%22 + RIGHT_MF +@@ -675,24 +675,8 @@ + rt(%22 +-Mirage_F1_RWR%22%2C%22 + LEFT diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Mirage-F1/Mirage-F1_Common/Radar_Cyrano_IV_legacy/Indicator/BakedGeneral/CyranoLegacy_bake_general_init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Mirage-F1/Mirage-F1_Common/Radar_Cyrano_IV_legacy/Indicator/BakedGeneral/CyranoLegacy_bake_general_init.lua.gpatch new file mode 100644 index 000000000..bdaa583fc --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Mirage-F1/Mirage-F1_Common/Radar_Cyrano_IV_legacy/Indicator/BakedGeneral/CyranoLegacy_bake_general_init.lua.gpatch @@ -0,0 +1,8 @@ +@@ -622,16 +622,34 @@ + ewport(%22 ++Mirage_F1_RADAR%22%2C%22 + RIGHT_MF +@@ -743,16 +743,34 @@ + ewport(%22 ++Mirage_F1_RADAR%22%2C%22 + LEFT_MFC diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Mirage-F1/Mirage-F1_Common/Radar_Cyrano_IV_legacy/Indicator/BakedGeneral/CyranoLegacy_bake_general_init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Mirage-F1/Mirage-F1_Common/Radar_Cyrano_IV_legacy/Indicator/BakedGeneral/CyranoLegacy_bake_general_init.lua.grevert new file mode 100644 index 000000000..b1533063b --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/Mirage-F1/Cockpit/Mirage-F1/Mirage-F1_Common/Radar_Cyrano_IV_legacy/Indicator/BakedGeneral/CyranoLegacy_bake_general_init.lua.grevert @@ -0,0 +1,8 @@ +@@ -622,34 +622,16 @@ + ewport(%22 +-Mirage_F1_RADAR%22%2C%22 + RIGHT_MF +@@ -729,26 +729,8 @@ + rt(%22 +-Mirage_F1_RADAR%22%2C%22 + LEFT diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CI/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CI/Indicator/init.lua.gpatch new file mode 100644 index 000000000..3eb5b8bf3 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CI/Indicator/init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -55,16 +55,83 @@ + s.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Aindic +@@ -1225,20 +1225,108 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_CMWS%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CI/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CI/Indicator/init.lua.grevert new file mode 100644 index 000000000..bc13a4368 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CI/Indicator/init.lua.grevert @@ -0,0 +1,7 @@ +@@ -59,75 +59,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ai +@@ -1174,92 +1174,4 @@ + 5%7D%0D%0A +-%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_CMWS%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CLOCK/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CLOCK/Indicator/init.lua.gpatch new file mode 100644 index 000000000..12f8606aa --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CLOCK/Indicator/init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -55,16 +55,83 @@ + s.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Aindic +@@ -1137,20 +1137,109 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_CLOCK%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CLOCK/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CLOCK/Indicator/init.lua.grevert new file mode 100644 index 000000000..9dac05850 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/CLOCK/Indicator/init.lua.grevert @@ -0,0 +1,7 @@ +@@ -59,75 +59,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ai +@@ -1086,93 +1086,4 @@ + 5%7D%0D%0A +-%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_CLOCK%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/L2MUMS/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/L2MUMS/Indicator/init.lua.gpatch new file mode 100644 index 000000000..09afd0305 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/L2MUMS/Indicator/init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -55,16 +55,83 @@ + s.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Aindic +@@ -2242,12 +2242,101 @@ + %2C 150%2F255%7D%0D%0A ++%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_L2MUMS%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/L2MUMS/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/L2MUMS/Indicator/init.lua.grevert new file mode 100644 index 000000000..4a6843b37 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/L2MUMS/Indicator/init.lua.grevert @@ -0,0 +1,7 @@ +@@ -59,75 +59,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ai +@@ -2183,93 +2183,4 @@ + 5%7D%0D%0A +-%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_L2MUMS%22) diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/MPD/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/MPD/Indicator/init.lua.gpatch new file mode 100644 index 000000000..eb116c4db --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/MPD/Indicator/init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -55,16 +55,83 @@ + s.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Aindic +@@ -1031,20 +1031,107 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_MPD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/MPD/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/MPD/Indicator/init.lua.grevert new file mode 100644 index 000000000..22499c9a5 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/MPD/Indicator/init.lua.grevert @@ -0,0 +1,7 @@ +@@ -59,75 +59,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ai +@@ -980,91 +980,4 @@ + 5%7D%0D%0A +-%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_MPD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RFD/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RFD/Indicator/init.lua.gpatch new file mode 100644 index 000000000..77144c006 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RFD/Indicator/init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -55,16 +55,83 @@ + s.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Aindic +@@ -1300,20 +1300,107 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_RFD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RFD/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RFD/Indicator/init.lua.grevert new file mode 100644 index 000000000..c5d5af7e1 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RFD/Indicator/init.lua.grevert @@ -0,0 +1,7 @@ +@@ -59,75 +59,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ai +@@ -1249,91 +1249,4 @@ + 5%7D%0D%0A +-%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_RFD%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RPMTRQ/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RPMTRQ/Indicator/init.lua.gpatch new file mode 100644 index 000000000..9078c3ca2 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RPMTRQ/Indicator/init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -55,16 +55,83 @@ + s.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Aindic +@@ -1040,20 +1040,115 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_RPM_TORQUE%22) %0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RPMTRQ/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RPMTRQ/Indicator/init.lua.grevert new file mode 100644 index 000000000..5ee831d47 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RPMTRQ/Indicator/init.lua.grevert @@ -0,0 +1,7 @@ +@@ -59,75 +59,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ai +@@ -989,99 +989,4 @@ + 5%7D%0D%0A +-%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_RPM_TORQUE%22) %0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RWR/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RWR/Indicator/init.lua.gpatch new file mode 100644 index 000000000..aaa844665 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RWR/Indicator/init.lua.gpatch @@ -0,0 +1,7 @@ +@@ -55,16 +55,83 @@ + s.lua%22)%0D ++%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Aindic +@@ -858,20 +858,107 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_RWR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RWR/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RWR/Indicator/init.lua.grevert new file mode 100644 index 000000000..943a186ff --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/OH-58D/Cockpit/RWR/Indicator/init.lua.grevert @@ -0,0 +1,7 @@ +@@ -59,75 +59,8 @@ + a%22)%0D +-%0Adofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D + %0A%0D%0Ai +@@ -807,91 +807,4 @@ + 5%7D%0D%0A +-%0D%0Aupdate_screenspace_diplacement(1%2C true%2C 0)%0D%0Atry_find_assigned_viewport(%22OH58D_RWR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/NADIR/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/NADIR/init.lua.gpatch new file mode 100644 index 000000000..fbd7d37bc --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/NADIR/init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -940,20 +940,139 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_NADIR%22%2C %22NADIR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/NADIR/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/NADIR/init.lua.grevert new file mode 100644 index 000000000..6c52db821 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/NADIR/init.lua.grevert @@ -0,0 +1,3 @@ +@@ -956,123 +956,4 @@ + 5%7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_NADIR%22%2C %22NADIR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/RWR/indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/RWR/indicator/init.lua.gpatch new file mode 100644 index 000000000..daa2ce5af --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/RWR/indicator/init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -1054,20 +1054,135 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_RWR%22%2C %22RWR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/RWR/indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/RWR/indicator/init.lua.grevert new file mode 100644 index 000000000..5a9738684 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/RWR/indicator/init.lua.grevert @@ -0,0 +1,3 @@ +@@ -1070,119 +1070,4 @@ + 5%7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_RWR%22%2C %22RWR%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/FM/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/FM/init.lua.gpatch new file mode 100644 index 000000000..91f42e0fb --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/FM/init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -979,20 +979,133 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_FM%22%2C %22FM%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/FM/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/FM/init.lua.grevert new file mode 100644 index 000000000..aeba75e66 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/FM/init.lua.grevert @@ -0,0 +1,3 @@ +@@ -995,117 +995,4 @@ + 5%7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_FM%22%2C %22FM%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/UHF/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/UHF/init.lua.gpatch new file mode 100644 index 000000000..6b03a8c24 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/UHF/init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -982,20 +982,135 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_UHF%22%2C %22UHF%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/UHF/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/UHF/init.lua.grevert new file mode 100644 index 000000000..4b4951982 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/Radio/Indicator/UHF/init.lua.grevert @@ -0,0 +1,3 @@ +@@ -998,119 +998,4 @@ + 5%7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_UHF%22%2C %22UHF%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/TV/Indicator/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/TV/Indicator/init.lua.gpatch new file mode 100644 index 000000000..152c9b7d8 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/TV/Indicator/init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -1685,20 +1685,133 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_TV%22%2C %22TV%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/TV/Indicator/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/TV/Indicator/init.lua.grevert new file mode 100644 index 000000000..b49ebe2f8 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/TV/Indicator/init.lua.grevert @@ -0,0 +1,3 @@ +@@ -1701,117 +1701,4 @@ + 5%7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_TV%22%2C %22TV%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/WP1/init.lua.gpatch b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/WP1/init.lua.gpatch new file mode 100644 index 000000000..7043dbccb --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/WP1/init.lua.gpatch @@ -0,0 +1,3 @@ +@@ -934,20 +934,135 @@ + %2C 13%2F255%2C 255%2F255%7D%0D%0A ++dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_WP1%22%2C %22WP1%22)%0D%0A diff --git a/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/WP1/init.lua.grevert b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/WP1/init.lua.grevert new file mode 100644 index 000000000..b885daf17 --- /dev/null +++ b/Patching/Patches/DCS/002_009_00021_16362_00000/Viewports/mods/Aircraft/SA342/Cockpit/WP1/init.lua.grevert @@ -0,0 +1,3 @@ +@@ -950,119 +950,4 @@ + 5%7D%0D%0A +-dofile(LockOn_Options.common_script_path..%22ViewportHandling.lua%22)%0D%0Atry_find_assigned_viewport(%22SA342_WP1%22%2C %22WP1%22)%0D%0A diff --git a/Patching/Patching.csproj b/Patching/Patching.csproj index ab1434b8d..b72ea21d5 100644 --- a/Patching/Patching.csproj +++ b/Patching/Patching.csproj @@ -10111,291 +10111,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -11020,18 +10735,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -11692,30 +11395,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -11728,15 +11407,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -12457,33 +12127,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -13216,10 +12859,1069 @@ PreserveNewest - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + PreserveNewest - + PreserveNewest diff --git a/Tools Installer/Tools Installer.vdproj b/Tools Installer/Tools Installer.vdproj index 553ccd1c8..ac777b1b4 100644 --- a/Tools Installer/Tools Installer.vdproj +++ b/Tools Installer/Tools Installer.vdproj @@ -1,4 +1,4 @@ -"DeployProject" +"DeployProject" { "VSVersion" = "3:800" "ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" diff --git a/Tools/GenerateSimulatorViewportTemplates/GenerateSimulatorViewportTemplates.cs b/Tools/GenerateSimulatorViewportTemplates/GenerateSimulatorViewportTemplates.cs index 7a15df111..6f6c77fe8 100644 --- a/Tools/GenerateSimulatorViewportTemplates/GenerateSimulatorViewportTemplates.cs +++ b/Tools/GenerateSimulatorViewportTemplates/GenerateSimulatorViewportTemplates.cs @@ -57,7 +57,7 @@ private static void Generate(string jsonPath, string templatePath, bool usesPatc HashSet generated = new HashSet(); // HACK: instead of reading the specified file, read all versions of it - foreach (string jsonFilePath in Directory.EnumerateFiles(Path.GetDirectoryName(jsonPath) ?? ".", Path.GetFileName(jsonPath).Replace("Templates.json", "Templates*.json"))) + foreach (string jsonFilePath in Directory.EnumerateFiles(Path.GetDirectoryName(jsonPath) ?? ".", Path.GetFileName(jsonPath).Replace("Templates.json", "Templates*.json")).Reverse()) { Console.WriteLine($"reading {jsonFilePath}"); string json = File.ReadAllText(jsonFilePath); @@ -69,13 +69,13 @@ private static void Generate(string jsonPath, string templatePath, bool usesPatc int colorIndex = Math.Abs(template.TemplateDisplayName.GetHashCode()) % _colors.Length; // generate all valid viewports as templates - foreach (Viewport viewport in template.Viewports.Where(v => v.IsValid || !usesPatches)) + foreach (Viewport viewport in template.Viewports.Where(v => v.IsValid || template.IsAdditionalTemplate || !usesPatches)) { string viewportName = viewport.ViewportName; string category = "Simulator Viewports"; - if (usesPatches) + if (usesPatches || template.IsAdditionalTemplate) { - viewportName = $"{(viewport.SuppressViewportNamePrefix? "" : template.ViewportPrefix+"_")}{viewport.ViewportName}"; + viewportName = $"{(viewport.SuppressViewportNamePrefix ? "" : template.ViewportPrefix+"_")}{viewport.ViewportName}"; category = $"{template.TemplateCategory}"; } @@ -111,10 +111,10 @@ private static void Generate(string jsonPath, string templatePath, bool usesPatc lines.Add(" 0"); lines.Add(" "); lines.Add(" "); - lines.Add($" {viewportName}"); + lines.Add($" {template.DisplayName(viewport)}"); lines.Add(" None"); - lines.Add(FormattableString.Invariant($" {viewport.X},{viewport.Y}")); + lines.Add(FormattableString.Invariant($" {viewport.X},{viewport.Y}")); int width = viewport.Width; if (width < 1) { @@ -140,16 +140,18 @@ private static void Generate(string jsonPath, string templatePath, bool usesPatc lines.Add(""); string outputDirectoryPath = Path.Combine(templatePath, - usesPatches ? "Additional Simulator Viewports" : "Simulator Viewports"); + (usesPatches || template.IsAdditionalTemplate) ? "Additional Simulator Viewports" : "Simulator Viewports"); if (!Directory.Exists(outputDirectoryPath)) { Directory.CreateDirectory(outputDirectoryPath); } - File.WriteAllLines(Path.Combine(outputDirectoryPath, $"{(viewport.SuppressViewportNamePrefix ? template.ViewportPrefix + "_" + viewportName : viewportName)}.htpl"), lines); + /// The "9" in the filename is used to order the viewports to the end of the Toolbox category + File.WriteAllLines(Path.Combine(outputDirectoryPath, $"9 {(viewport.SuppressViewportNamePrefix ? template.ViewportPrefix + "_" + viewportName : viewportName)}.htpl"), lines); + Console.WriteLine($"File Written {outputDirectoryPath}/{(viewport.SuppressViewportNamePrefix ? template.ViewportPrefix + "_" + viewportName : viewportName)}.htpl"); + } } } - } } } } \ No newline at end of file diff --git a/Tools/ToolsCommon/Data/Viewports/ExistingViewportTemplates.json b/Tools/ToolsCommon/Data/Viewports/ExistingViewportTemplates.json index 50aea6594..d31531a4e 100644 --- a/Tools/ToolsCommon/Data/Viewports/ExistingViewportTemplates.json +++ b/Tools/ToolsCommon/Data/Viewports/ExistingViewportTemplates.json @@ -127,6 +127,7 @@ { "templateName": "Ka-50 Unmodified", "moduleId": "Ka-50", + "categoryName": "Ka-50 Black Shark", "viewports": [ { "viewportName": "ABRIS", diff --git a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates.json b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates.json index 87049f52f..8c1f5db94 100644 --- a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates.json +++ b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates.json @@ -235,8 +235,9 @@ ] }, { - "templateName": "KA-50 (Helios 16/9)", - "moduleId": "KA-50", + "templateName": "Ka-50 (Helios 16/9)", + "moduleId": "Ka-50", + "categoryName": "Ka-50 Black Shark", "isHeliosTemplate": true, "viewports": [ { @@ -384,6 +385,7 @@ { "templateName": "A-10C (Helios 16/9)", "moduleId": "A-10C", + "categoryName": "A-10C Warthog", "isHeliosTemplate": true, "viewports": [ { @@ -512,6 +514,7 @@ { "templateName": "A-10C II", "moduleId": "A-10C_2", + "categoryName": "A-10C Warthog", "isHeliosTemplate": true, "viewports": [ { diff --git a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00005_41371_00000.json b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00005_41371_00000.json index a546242f1..8ab1f55eb 100644 --- a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00005_41371_00000.json +++ b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00005_41371_00000.json @@ -1,7 +1,8 @@ [ { - "templateName": "KA-50 (Helios 16/9)", - "moduleId": "KA-50", + "templateName": "Ka-50 (Helios 16/9)", + "moduleId": "Ka-50", + "categoryName": "Ka-50 Black Shark", "isHeliosTemplate": true, "viewports": [ { diff --git a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00006_47404_00000.json b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00006_47404_00000.json index 5a331e08e..f3cfb3039 100644 --- a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00006_47404_00000.json +++ b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00006_47404_00000.json @@ -1,7 +1,8 @@ [ { - "templateName": "KA-50 (Helios 16/9)", - "moduleId": "KA-50", + "templateName": "Ka-50 (Helios 16/9)", + "moduleId": "Ka-50", + "categoryName": "Ka-50 Black Shark", "isHeliosTemplate": true, "viewports": [ { diff --git a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00006_52196_00000.json b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00006_52196_00000.json index e387c0871..1120e44be 100644 --- a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00006_52196_00000.json +++ b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_005_00006_52196_00000.json @@ -74,8 +74,9 @@ ] }, { - "templateName": "KA-50 (Helios 16/9)", - "moduleId": "KA-50", + "templateName": "Ka-50 (Helios 16/9)", + "moduleId": "Ka-50", + "categoryName": "Ka-50 Black Shark", "isHeliosTemplate": true, "viewports": [ { diff --git a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_007_00006_13436_00000.json b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_007_00006_13436_00000.json index 0a5a3f6c4..595c72008 100644 --- a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_007_00006_13436_00000.json +++ b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_007_00006_13436_00000.json @@ -162,8 +162,9 @@ ] }, { - "templateName": "KA-50 (Helios 16/9)", - "moduleId": "KA-50", + "templateName": "Ka-50 (Helios 16/9)", + "moduleId": "Ka-50", + "categoryName": "Ka-50 Black Shark", "isHeliosTemplate": true, "viewports": [ { @@ -311,6 +312,7 @@ { "templateName": "A-10C (Helios 16/9)", "moduleId": "A-10C", + "categoryName": "A-10C Warthog", "isHeliosTemplate": true, "viewports": [ { @@ -439,6 +441,7 @@ { "templateName": "A-10C II", "moduleId": "A-10C_2", + "categoryName": "A-10C Warthog", "isHeliosTemplate": true, "viewports": [ { diff --git a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_008_00001_33667_00000.json b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_008_00001_33667_00000.json index ca41ba7d1..f5de928e3 100644 --- a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_008_00001_33667_00000.json +++ b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_008_00001_33667_00000.json @@ -1,6 +1,7 @@ [ { - "templateName": "KA-50 III (Helios 16/9)", + "templateName": "Ka-50 III (Helios 16/9)", + "categoryName": "Ka-50 Black Shark", "moduleId": "KA-50_3", "isHeliosTemplate": true, "viewports": [ diff --git a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_008_00003_37854_00000.json b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_008_00003_37854_00000.json index b9d6ec7eb..6e31388b3 100644 --- a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_008_00003_37854_00000.json +++ b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_008_00003_37854_00000.json @@ -2,6 +2,7 @@ { "templateName": "A-10C II", "moduleId": "A-10C_2", + "categoryName": "A-10C Warthog", "isHeliosTemplate": true, "viewports": [ { diff --git a/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_009_00021_16362_00000.json b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_009_00021_16362_00000.json new file mode 100644 index 000000000..24bd71beb --- /dev/null +++ b/Tools/ToolsCommon/Data/Viewports/ViewportTemplates_002_009_00021_16362_00000.json @@ -0,0 +1,159 @@ +[ + { + "templateName": "CH47F", + "moduleId": "CH47F", + "isHeliosTemplate": true, + "categoryName": "CH-47F Chinook", + "isAdditionalTemplate": true, + "viewports": [ + { + "viewportDisplayName": "CH47F MFD PILOT LEFT", + "viewportName": "LEFT_MFCD", + "SuppressViewportNamePrefix": true, + "requiresPatch": false, + "relativeInitFilePath": "", + "originalDisplayWidth": 1920, + "originalDisplayHeight": 1080, + "seatIndex": 1, + "x": 0, + "y": 0, + "width": 400, + "height": 533 + }, + { + "viewportDisplayName": "CH47F MFD PILOT RIGHT", + "viewportName": "RIGHT_MFCD", + "SuppressViewportNamePrefix": true, + "relativeInitFilePath": "", + "requiresPatch": false, + "originalDisplayWidth": 1920, + "originalDisplayHeight": 1080, + "seatIndex": 1, + "x": 0, + "y": 0, + "width": 400, + "height": 533 + }, + { + "viewportName": "MFD_COPILOT_LEFT", + "SuppressViewportNamePrefix": false, + "requiresPatch": true, + "relativeInitFilePath": "Mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/MFD_init_copilot_out.lua", + "originalDisplayWidth": 1920, + "originalDisplayHeight": 1080, + "seatIndex": 2, + "x": 0, + "y": 0, + "width": 400, + "height": 533 + }, + { + "viewportName": "MFD_COPILOT_RIGHT", + "SuppressViewportNamePrefix": false, + "requiresPatch": true, + "relativeInitFilePath": "Mods/Aircraft/GCBase/Cockpit/Scripts/MFD/indicator/BAKE/MFD_init_copilot_in.lua", + "originalDisplayWidth": 1920, + "originalDisplayHeight": 1080, + "seatIndex": 2, + "x": 0, + "y": 0, + "width": 400, + "height": 533 + }, + { + "viewportDisplayName": "CH47F MFD CENTER", + "viewportName": "CENTER_MFCD", + "SuppressViewportNamePrefix": true, + "requiresPatch": false, + "relativeInitFilePath": "", + "originalDisplayWidth": 1920, + "originalDisplayHeight": 1080, + "seatIndex": 1, + "x": 0, + "y": 0, + "width": 400, + "height": 533 + }, + { + "viewportName": "CDU_PILOT", + "SuppressViewportNamePrefix": false, + "requiresPatch": true, + "relativeInitFilePath": "Mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/CDU_init_right.lua", + "originalDisplayWidth": 1920, + "originalDisplayHeight": 1080, + "seatIndex": 1, + "x": 0, + "y": 0, + "width": 354, + "height": 470 + }, + { + "viewportName": "CDU_COPILOT", + "SuppressViewportNamePrefix": false, + "requiresPatch": true, + "relativeInitFilePath": "Mods/Aircraft/GCBase/Cockpit/Scripts/CDU/indicator/CDU_init_left.lua", + "originalDisplayHeight": 1080, + "originalDisplayWidth": 1920, + "seatIndex": 2, + "x": 0, + "y": 0, + "width": 354, + "height": 470 + }, + { + "viewportName": "RWR", + "SuppressViewportNamePrefix": false, + "requiresPatch": true, + "relativeInitFilePath": "Mods/Aircraft/CH-47F/Cockpit/Scripts/ASE/APR39_indicator/APR39_init.lua", + "originalDisplayHeight": 1080, + "originalDisplayWidth": 1920, + "seatIndex": 1, + "x": 0, + "y": 0, + "width": 400, + "height": 400 + }, + { + "viewportName": "CHRONOMETER", + "SuppressViewportNamePrefix": false, + "requiresPatch": true, + "relativeInitFilePath": "Mods/Aircraft/GCBase/Cockpit/Scripts/chronometer_indicator_init.lua", + "originalDisplayHeight": 1080, + "originalDisplayWidth": 1920, + "seatIndex": 1, + "x": 0, + "y": 0, + "width": 200, + "height": 100 + }, + { + "viewportDisplayName": "CH47F SFD COPILOT", + "viewportName": "LEFT_SFD", + "SuppressViewportNamePrefix": true, + "relativeInitFilePath": "Mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init1.lua", + "requiresPatch": true, + "originalDisplayHeight": 1080, + "originalDisplayWidth": 1920, + "seatIndex": 2, + "x": 0, + "y": 0, + "width": 150, + "height": 250 + }, + { + "viewportDisplayName": "CH47F SFD PILOT", + "viewportName": "RIGHT_SFD", + "SuppressViewportNamePrefix": true, + "relativeInitFilePath": "Mods/Aircraft/CH-47F/Cockpit/Scripts/SFD/indicator/init2.lua", + "requiresPatch": true, + "originalDisplayHeight": 1080, + "originalDisplayWidth": 1920, + "seatIndex": 1, + "x": 0, + "y": 0, + "width": 150, + "height": 250 + } + ] + } +] \ No newline at end of file diff --git a/Tools/ToolsCommon/ToolsCommon.csproj b/Tools/ToolsCommon/ToolsCommon.csproj index 10ce0ba30..bbaff6067 100644 --- a/Tools/ToolsCommon/ToolsCommon.csproj +++ b/Tools/ToolsCommon/ToolsCommon.csproj @@ -77,7 +77,7 @@ - PreserveNewest + Always PreserveNewest @@ -86,10 +86,17 @@ PreserveNewest - PreserveNewest + Always + + + Always + + + Always + + + Always - - diff --git a/Tools/ToolsCommon/Viewport.cs b/Tools/ToolsCommon/Viewport.cs index 300cfe242..9a7b11790 100644 --- a/Tools/ToolsCommon/Viewport.cs +++ b/Tools/ToolsCommon/Viewport.cs @@ -53,6 +53,7 @@ public class Viewport [JsonProperty("SuppressViewportNamePrefix")] public bool SuppressViewportNamePrefix { get; set; } = false; [JsonProperty("requiresPatch")] public bool RequiresPatch { get; set; } = true; + [JsonProperty("viewportDisplayName")] public string ViewportDisplayName { get; set; } [JsonIgnore] public bool IsValid => RelativeInitFilePath != null && RelativeInitFilePath.Length > 0; } diff --git a/Tools/ToolsCommon/ViewportTemplate.cs b/Tools/ToolsCommon/ViewportTemplate.cs index 8b099cf9e..d34e90415 100644 --- a/Tools/ToolsCommon/ViewportTemplate.cs +++ b/Tools/ToolsCommon/ViewportTemplate.cs @@ -54,6 +54,7 @@ public class ViewportTemplate [JsonProperty("categoryName")] public string CategoryName { get; set; } = string.Empty; [JsonProperty("isHeliosTemplate")] public bool IsHeliosTemplate { get; set; } + [JsonProperty("isAdditionalTemplate")] public bool IsAdditionalTemplate { get; set; } = false; [JsonProperty("moduleId")] public string ModuleId { get; set; } @@ -85,10 +86,10 @@ public object TemplateCategory if (_moduleCategories.TryGetValue(ModuleId, out string category)) { - return $"{category} Simulator Viewports"; + return $"{category}"; } - return $"{ModuleId} Simulator Viewports"; + return $"{ModuleId}"; } } @@ -104,6 +105,6 @@ public object TemplateCategory /// /// public string DisplayName(Viewport viewport) => - $"{TemplateDisplayName} {(viewport.Description ?? viewport.ViewportName).Replace("-", " ")}"; + $"{viewport.ViewportDisplayName ?? TemplateDisplayName} {(viewport.Description ?? viewport.ViewportName).Replace("-", " ").Replace("_", " ")}"; } } \ No newline at end of file