Update 2.1.0

This commit is contained in:
notGreg 2022-09-24 08:42:25 +02:00
parent 9fe689ef13
commit 7edad7d276
2 changed files with 21 additions and 14 deletions

View File

@ -32,23 +32,21 @@ namespace ScopeTweaks
"General",
"Main camera scale %",
80,
new ConfigDescription("Main camera resolution scale", new AcceptableValueRange<int>(25, 100)));
new ConfigDescription("Additional override applied on top of currently enabled resolution scaling method.", new AcceptableValueRange<int>(25, 100)));
scopeCameraResolutionScale = Config.Bind(
"General",
"Scope camera scale %",
80,
new ConfigDescription("Scope camera resolution scale", new AcceptableValueRange<int>(25, 100)));
new ConfigDescription("Additional override applied on top of currently enabled resolution scaling method.", new AcceptableValueRange<int>(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
/// </summary>
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
/// <summary>
/// IN-GAME SETTINGS
/// </summary>
float currentScalingFactor;
float currentScalingFactor = 1.0f;
float getCurrentScalingFactor()
{

View File

@ -31,6 +31,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Aki.Reflection">
<HintPath>E:\SPT-AKI\SPT-AKI 3.2.3\EscapeFromTarkov_Data\Managed\Aki.Reflection.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>E:\SPT-AKI\SPT-AKI 3.2.3\EscapeFromTarkov_Data\Managed\Assembly-CSharp.dll</HintPath>