diff --git a/CameraResolutionScale/Plugin.cs b/CameraResolutionScale/Plugin.cs index 94499bc..b990745 100644 --- a/CameraResolutionScale/Plugin.cs +++ b/CameraResolutionScale/Plugin.cs @@ -32,23 +32,21 @@ namespace ScopeTweaks "General", "Main camera scale %", 80, - new ConfigDescription("Main camera resolution scale", new AcceptableValueRange(25, 100))); + new ConfigDescription("Additional override applied on top of currently enabled resolution scaling method.", new AcceptableValueRange(25, 100))); scopeCameraResolutionScale = Config.Bind( "General", "Scope camera scale %", 80, - new ConfigDescription("Scope camera resolution scale", new AcceptableValueRange(25, 100))); + new ConfigDescription("Additional override applied on top of currently enabled resolution scaling method.", new AcceptableValueRange(25, (int)(100f / currentScalingFactor)))); scopeFixType = Config.Bind("General", "High FOV sight tweak", EFOVScalingMode.ScopesOnly, new ConfigDescription("")); } - Camera FPSCamera = null; - Camera scopeCamera = null; - SSAA ssaaInstance = null; - FieldInfo _nextSSRation = null; - WaitForSeconds myDelaySec = new WaitForSeconds(1); + + + void Update() { @@ -125,6 +123,13 @@ namespace ScopeTweaks /// CAMERA SETUP /// + Camera FPSCamera = null; + Camera scopeCamera = null; + + SSAA ssaaInstance = null; + FieldInfo _nextSSRation = null; + + WaitForSeconds myDelaySec = new WaitForSeconds(1); IEnumerator tryGetMainCamera() { string cameraName = "FPS Camera"; @@ -191,18 +196,17 @@ namespace ScopeTweaks void subscribeOnAimingChangedEvent() { + Logger.LogInfo("Subscribing to OnAimingChanged Event"); mainPlayer.HandsController.OnAimingChanged += (aimingArgs) => { currentScalingFactor = getCurrentScalingFactor(); StartCoroutine(tryGetScopeCamera()); - Logger.LogInfo("AimingChanged: notAiming"); if (!mainPlayer.ProceduralWeaponAnimation.IsAiming) { - - switch(scopeFixType.Value) + switch(scopeFixType.Value) { case EFOVScalingMode.Disabled: { @@ -212,14 +216,14 @@ namespace ScopeTweaks case EFOVScalingMode.ScopesOnly: { setMainCameraResolutionScale(); - GClass1774.Instance.SetFov(90, 0.33f, false); + GClass1774.Instance.SetFov(inGameFOV, 0.33f, false); setInGameFOV(inGameFOV); break; } case EFOVScalingMode.All: { setMainCameraResolutionScale(); - GClass1774.Instance.SetFov(90, 0.33f, false); + GClass1774.Instance.SetFov(inGameFOV, 0.33f, false); setInGameFOV(inGameFOV); break; } @@ -271,8 +275,8 @@ namespace ScopeTweaks /// /// IN-GAME SETTINGS /// - - float currentScalingFactor; + + float currentScalingFactor = 1.0f; float getCurrentScalingFactor() { diff --git a/CameraResolutionScale/notGreg.ScopeTweaks.csproj b/CameraResolutionScale/notGreg.ScopeTweaks.csproj index 0d0bbdf..220c76c 100644 --- a/CameraResolutionScale/notGreg.ScopeTweaks.csproj +++ b/CameraResolutionScale/notGreg.ScopeTweaks.csproj @@ -31,6 +31,9 @@ 4 + + E:\SPT-AKI\SPT-AKI 3.2.3\EscapeFromTarkov_Data\Managed\Aki.Reflection.dll + False E:\SPT-AKI\SPT-AKI 3.2.3\EscapeFromTarkov_Data\Managed\Assembly-CSharp.dll