From 71b67d0e46e930f8a04779ca24da4ad149e76483 Mon Sep 17 00:00:00 2001 From: EricPlayZ Date: Mon, 13 May 2024 02:20:55 +0300 Subject: [PATCH] prepare for v1.2.0 release --- EGameTools/source/config/config.cpp | 2 +- EGameTools/source/menu/camera.cpp | 18 +++++----- EGameTools/source/menu/init.cpp | 2 +- Extra Files/Default Config/EGameTools.ini | 42 +++++++++++++++++++++-- 4 files changed, 52 insertions(+), 12 deletions(-) diff --git a/EGameTools/source/config/config.cpp b/EGameTools/source/config/config.cpp index 35172b5..2723a0d 100644 --- a/EGameTools/source/config/config.cpp +++ b/EGameTools/source/config/config.cpp @@ -4379,7 +4379,7 @@ namespace Config { { "Player:Misc", "UnlimitedStamina", false, &Menu::Player::unlimitedStamina, OPTION }, { "Player:Misc", "UnlimitedItems", false, &Menu::Player::unlimitedItems, OPTION }, { "Player:Misc", "OneHitKill", false, &Menu::Player::oneHitKill, OPTION }, - { "Player:Misc", "InvisibleToEnemies", true, &Menu::Player::invisibleToEnemies, OPTION }, + { "Player:Misc", "InvisibleToEnemies", false, &Menu::Player::invisibleToEnemies, OPTION }, { "Player:Misc", "DisableOutOfBoundsTimer", true, &Menu::Player::disableOutOfBoundsTimer, OPTION }, { "Player:Misc", "NightrunnerMode", false, &Menu::Player::nightrunnerMode, OPTION }, { "Player:Misc", "OneHandedMode", false, &Menu::Player::oneHandedMode, OPTION }, diff --git a/EGameTools/source/menu/camera.cpp b/EGameTools/source/menu/camera.cpp index d4eef16..53cc232 100644 --- a/EGameTools/source/menu/camera.cpp +++ b/EGameTools/source/menu/camera.cpp @@ -29,6 +29,7 @@ namespace Menu { float tpHorizontalDistanceFromPlayer = 0.0f; float lensDistortion = 20.0f; + static float altLensDistortion = 20.0f; KeyBindOption goProMode{ VK_NONE }; KeyBindOption disableSafezoneFOVReduction{ VK_NONE }; KeyBindOption disablePhotoModeLimits{ VK_NONE }; @@ -167,17 +168,18 @@ namespace Menu { GamePH::PlayerVariables::ManagePlayerVarOption("CameraDefaultFOVReduction", 0.0f, baseSafezoneFOVReduction, &disableSafezoneFOVReduction, true); static float prevLensDistortion = lensDistortion; + static bool lensDistortionJustEnabled = false; if (goProMode.GetValue()) { - if (goProMode.HasChangedTo(true)) { + if (!lensDistortionJustEnabled) { prevLensDistortion = lensDistortion; - goProMode.SetPrevValue(true); + lensDistortionJustEnabled = true; } - lensDistortion = 100.0f; - } else if (goProMode.HasChangedTo(false)) { - lensDistortion = prevLensDistortion; - goProMode.SetPrevValue(false); + altLensDistortion = 100.0f; + } else if (lensDistortionJustEnabled) { + altLensDistortion = prevLensDistortion; + lensDistortionJustEnabled = false; } - GamePH::PlayerVariables::ChangePlayerVar("FOVCorrection", lensDistortion / 100.0f); + GamePH::PlayerVariables::ChangePlayerVar("FOVCorrection", goProMode.GetValue() ? (altLensDistortion / 100.0f) : (lensDistortion / 100.0f)); GamePH::PlayerVariables::ManagePlayerVarOption("HeadBobFactor", 1.25f, 1.0f, &goProMode, true); GamePH::PlayerVariables::ManagePlayerVarOption("SprintHeadCorrectionFactor", 0.0f, baseSprintHeadCorrectionFactor, goProMode.GetValue() ? &goProMode : &disableHeadCorrection, true); @@ -246,7 +248,7 @@ namespace Menu { ImGui::EndDisabled(); } ImGui::BeginDisabled(goProMode.GetValue()); { - ImGui::SliderFloat("Lens Distortion", "Default game value is 20%", &lensDistortion, 0.0f, 100.0f, "%.1f%%"); + ImGui::SliderFloat("Lens Distortion", "Default game value is 20%", goProMode.GetValue() ? &altLensDistortion : &lensDistortion, 0.0f, 100.0f, "%.1f%%"); ImGui::EndDisabled(); } ImGui::CheckboxHotkey("GoPro Mode *", &goProMode, "Makes the camera behave similar to a GoPro mounted on the forehead"); diff --git a/EGameTools/source/menu/init.cpp b/EGameTools/source/menu/init.cpp index 636740a..fed49eb 100644 --- a/EGameTools/source/menu/init.cpp +++ b/EGameTools/source/menu/init.cpp @@ -81,7 +81,7 @@ namespace Menu { ImGui::SeparatorTextColored("Custom File Loading", IM_COL32(200, 0, 0, 255)); ImGui::NewLine(); ImGui::TextCentered("The mod always creates a folder \"EGameTools\\UserModFiles\" inside the same folder as the game executable (exe) or in the same folder as the mod file."); - ImGui::TextCentered("This folder is used for custom file loading. It can load .PAKs and it can also load files extracted from these .PAKs. The latter only been tested with a few mods that change some .scr files, .gpufx files, and other files included inside .PAK game archives, or files like .rpack files."); + ImGui::TextCentered("This folder is used for custom file loading. It can load .PAKs and it can also load files extracted from these .PAKs. The latter has only been tested with a few mods that change some .scr files, .gpufx files, and other files included inside .PAK game archives, or files such as .rpack files."); ImGui::TextCentered("If you put .PAKs inside this folder, they can be named whatever. If you put any other kind of files, they must have the same names as the ones from the game files, otherwise the game won't know it should load those files. Files in subfolders of the \"EGameTools\\UserModFiles\" folder will automatically be detected, so you can sort all your mods in different folders!"); ImGui::Spacing(ImVec2(0.0f, 5.0f)); ImGui::TextCentered("The game will reload a lot of the files upon a load of your savegame, so if you want to edit those files and reload them without having to restart the game, just reload your savegame and the game should automatically reload most of those files!"); diff --git a/Extra Files/Default Config/EGameTools.ini b/Extra Files/Default Config/EGameTools.ini index bb7d45a..658415c 100644 --- a/Extra Files/Default Config/EGameTools.ini +++ b/Extra Files/Default Config/EGameTools.ini @@ -2,8 +2,11 @@ Speed=2 TeleportPlayerToCamera=0 [Camera:Misc] +DisableHeadCorrection=0 DisablePhotoModeLimits=1 DisableSafezoneFOVReduction=1 +GoProMode=0 +LensDistortion=20 [Camera:ThirdPerson] DistanceBehindPlayer=2 Enabled=0 @@ -16,33 +19,68 @@ HasSeenChangelog=0 Opacity=99 Scale=1 [Menu:Keybinds] +AllowGrappleHookInSafezoneToggleKey=VK_NONE +DisableAirControlToggleKey=VK_NONE DisableGamePauseWhileAFKToggleKey=VK_NONE DisableHUDToggleKey=VK_F8 +DisableHeadCorrectionToggleKey=VK_NONE DisableOutOfBoundsTimerToggleKey=VK_NONE DisablePhotoModeLimits=VK_NONE DisableSafezoneFOVReduction=VK_NONE FreeCamToggleKey=VK_F3 -FreezePlayerToggleKey=VK_F7 +FreezePlayerToggleKey=VK_NONE FreezeTimeToggleKey=VK_NONE +GoProMode=VK_NONE GodModeToggleKey=VK_F6 +InstantReloadToggleKey=VK_NONE MenuToggleKey=VK_F5 -NightrunnerModeToggleKey=VK_F9 +NightrunnerModeToggleKey=VK_F7 +NoRecoilToggleKey=VK_NONE +NoSpreadToggleKey=VK_NONE OneHandedModeToggleKey=VK_NONE +OneHitKillToggleKey=VK_NONE SlowMotionToggleKey=VK_4 TeleportPlayerToCameraToggleKey=VK_F4 +TeleportToCoordsToggleKey=VK_NONE +TeleportToSelectedLocationToggleKey=VK_F9 ThirdPersonToggleKey=VK_F1 +UnlimitedAmmoToggleKey=VK_NONE +UnlimitedDurabilityToggleKey=VK_NONE +UnlimitedImmunityToggleKey=VK_NONE +UnlimitedItemsToggleKey=VK_NONE +UnlimitedStaminaToggleKey=VK_NONE UseTPPModelToggleKey=VK_F2 +[Misc:GameChecks] +DisableDataPAKsCRCCheck=1 +DisableSavegameCRCCheck=1 +IncreaseDataPAKsLimit=1 [Misc:Misc] DisableGamePauseWhileAFK=1 [Player:Misc] +AllowGrappleHookInSafezone=0 DisableOutOfBoundsTimer=1 GodMode=0 +InvisibleToEnemies=0 NightrunnerMode=0 OneHandedMode=0 +OneHitKill=0 +UnlimitedImmunity=0 +UnlimitedItems=0 +UnlimitedStamina=0 +[Player:PlayerJumpParameters] +DisableAirControl=0 [Player:PlayerVariables] Enabled=0 LastLoadSCRFilePath= LastSaveSCRPath= +[Teleport:SavedLocations] +SavedTeleportLocations=Bazaar - Highest Point:1944,123.6,932.8;Bazaar - Main Entrance:1962.9,50.1,927.9;Colonel Williams Stronghold - Main Entrance Bridge:994.3,22.8,-1138.6;Dynamo Cars Factory - Main Entrance:2295.9,-2.1,-78.6;Fish Eye - Player Safehouse:1180.4,32.4,-146.8;Fish Eye - Top of The Baloon:1122.6,98.8,-101.2;Observatory - Meeting Room:1951.2,-13.4,-329.6;Observatory - The 2 Domes (No Chemicals):1985.4,19.9,-357.2;Out of Bounds - Cut Road Quest:2693.3,-4.7,-241.5;PK Metro Station - Main Entrance:1886.9,50,628.9;PK Ship - Main Entrance:801.8,4.2,139.8;St. Paul Cathedral - GRE Entrance:463.4,4.2,-421;Tolga & Fatin Quest - Underground Loot Box:2343.9,12.2,-661.5;VNC Tower - "V" Logo:1434.2,4.3,-319.3;VNC Tower - Highest Player Safehouse:1424.7,354.6,-455;VNC Tower - Highest Point:1403.8,446.7,-389.8;X13 - Tunnel Near the City Walls Towards Facility:2407.9,36.2,-461.7;X13 - Underground Facility:2437.8,12.2,-649.9;X13 - Waltz Arena:2551.9,15.3,-569.1 +[Weapon:Misc] +InstantReload=0 +NoRecoil=0 +NoSpread=0 +UnlimitedAmmo=0 +UnlimitedDurability=0 [World:Time] SlowMotionSpeed=0.4 SlowMotionTransitionTime=1