stuff

Author: ShizCalev

.github/workflows/create_release.yaml

@@ -1,4 +1,4 @@
-name: create-release
+name: Create Release
 
 on:
   workflow_dispatch:

README.md

@@ -1,6 +1,8 @@
 # Metal Gear Solid Master Collection Fix
 [![Patreon-Button](https://github.com/Lyall/FISTFix/assets/695941/19c468ac-52af-4790-b4eb-5187c06af949)](https://www.patreon.com/Wintermance) [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/W7W01UAI9)<br />
-[![Github All Releases](https://img.shields.io/github/downloads/Lyall/MGSHDFix/total.svg)](https://github.com/Lyall/MGSHDFix/releases)<br />
+
+[![Releases](https://img.shields.io/github/v/release/Lyall/MGSHDFix)](https://github.com/Lyall/MGSHDFix/releases) [![Downloads](https://img.shields.io/github/downloads/Lyall/MGSHDFix/total)](https://github.com/Lyall/MGSHDFix/releases) ![Commits](https://img.shields.io/github/commit-activity/t/Lyall/MGSHDFix) ![License](https://img.shields.io/github/license/Lyall/MGSHDFix)
+
 
 [MG1 / MG2 Nexus Page](https://www.nexusmods.com/metalgearandmetalgear2mc/mods/9) | [MGS2 Nexus Page](https://www.nexusmods.com/metalgearsolid2mc/mods/49) | [MGS3 Nexus Page](https://www.nexusmods.com/metalgearsolid3mc/mods/139) | **GitHub Repo (You're already here!)**<br />
 
@@ -34,7 +36,7 @@ This is a fix that adds custom resolutions, ultrawide support and much more to t
 
 ## Installation
 - Grab the latest release of MGSHDFix from [here.](https://github.com/Lyall/MGSHDFix/releases)
-- Extract the contents of the release zip in to the the game folder.<br />(e.g. "**steamapps\common\MGS2**" or "**steamapps\common\MGS3**" for Steam).
+- Extract the contents of the release zip into the game folder.<br />(e.g. "**steamapps\common\MGS2**" or "**steamapps\common\MGS3**" for Steam).
 
 ### Steam Deck/Linux Additional Instructions
 🚩**You do not need to do this if you are using Windows!**
@@ -71,6 +73,15 @@ This list will contain bugs which may or may not be fixed.
 ![vlcsnap-2025-04-30-01h48m54s182](https://github.com/user-attachments/assets/725a0b36-1862-4e91-b524-82aff39616ef)
 | Metal Gear Solid 3 |
 
+## Building
+```bash
+git clone --recursive https://github.com/Lyall/MGSHDFix.git
+cd MGSHDFix
+```
+
+### Windows
+Open MGSFPSUnlock.sln in Visual Studio (2022) and build.
+
 ## Credits
 [@Lyall](https://codeberg.org/Lyall) for their amazing work making widescreen fix mods, and most importantly, the original creation of this mod!<br />
 [@ShizCalev/Afevis](https://github.com/shizcalev) for long-term maintenance and contributing fixes.<br />

src/fixes/effect_speeds.cpp

@@ -39,12 +39,11 @@ int64_t __fastcall MGS2_solidusFireDashAct(int64_t work)
             g_EffectSpeedFix.solidusDashAct_NextUpdate = current_time;
         }
 
-        double duration = (PS2_IOP_CLOCKSPEED-1); // Slightly slower than PS2_IOP_CLOCKSPEED to account for particle related performance slowdown on PS2 hardware had during closeup shots.
-                                // !!!!! PCSX2 doesn't properly emulate the PS2's slowdown during these scenes either, so do any comparisons against real PS2 hardware if you change this value. !!!!!
-        if (strcmp(g_GameVars.GetCurrentStage(), "d045p01") != 0)
+        constexpr double duration = (PS2_IOP_CLOCKSPEED - 1); 
+        /*if (strcmp(g_GameVars.GetCurrentStage(), "d045p01") != 0) //P045_01P01 enter the Harrier 1 polygon demo 1 (MC) - Connecting bridge between Shells 1 and 2
         {
-            duration = 30.0;
-        }
+            duration -= 1; // Slightly slower than PS2_IOP_CLOCKSPEED to account for particle related performance slowdown on PS2 hardware had during closeup shots.
+        }*/
         g_EffectSpeedFix.solidusDashAct_NextUpdate += std::chrono::microseconds(static_cast<int64_t>(std::chrono::microseconds::period::den / duration));
         return solidusFireDashAct_hook.fastcall<int64_t>(work);
     }
@@ -81,6 +80,9 @@ int64_t __fastcall MGS2_splashPartsSlow(DWORD* a1, __int16* a2, float duration)
 }
 */
 #endif
+safetyhook::MidHook debrisVelocityHook;
+
+float g_VelocityScale = (1.0f * FRAME_IOP_DIVIDER);
 
 void EffectSpeedFix::Initialize() const
 {
@@ -189,7 +191,9 @@ void EffectSpeedFix::Initialize() const
         flyingSmokeSlow_MidHook = safetyhook::create_mid(MGS2_flyingSmokeSlowScanResult,
             [](SafetyHookContext& ctx)
             {
-                ctx.r8 = (unsigned int)(ctx.r8 * g_GameVars.ActorWaitMultiplier() * (g_GameVars.InCutscene() ? 2 : 1)); // double the duration in cutscenes
+                //spdlog::info("flying_smoke_slow before {}", reghelpers::Getr8d(ctx));
+                reghelpers::Setr8d(ctx, static_cast<unsigned int>((g_GameVars.ActorWaitMultiplier() * (g_GameVars.InCutscene() ? 2.0 : 1.0)) * reghelpers::Getr8d(ctx)));
+                spdlog::info("flying_smoke_slow after {}", reghelpers::Getr8d(ctx));
             });
         LOG_HOOK(flyingSmokeSlow_MidHook, "MGS 2: Effect Speed Fix: effect3\\flying_smoke_slow.c", NULL, NULL)
     }
@@ -199,6 +203,48 @@ void EffectSpeedFix::Initialize() const
         spdlog::info("MGS 2: Effect Speed Fix: Outdated version of MGSFPSUnlock detected, Large explosion & Solidus's Firedash fixes are disabled.");
         return;
     }
+
+    if (uint8_t* MGS2_DEMO_CreateDebrisTex_SetupResult = Memory::PatternScan(baseModule,"F3 0F 58 43 ?? 48 83 C6","MGS2_DEMO_CreateDebrisTex_Setup velocity",nullptr,nullptr))
+    {
+        debrisVelocityHook = safetyhook::create_mid(MGS2_DEMO_CreateDebrisTex_SetupResult,
+        [](SafetyHookContext& ctx)
+            {
+                if (strcmp(g_GameVars.GetCurrentStage(), "d12t3") == 0) // T12a1D The Seizure of Metal gear Demo (liquid ocelot first encounter)
+                {
+                    switch (g_EffectSpeedFix.iDebrisIteration) //28 total, last 3 are at the end.
+                    {
+                    case 1:
+                    case 2:
+                    case 3:
+                        ctx.xmm0.f32[0] /= 4.0f;
+                        break;
+                    case 15:
+                    case 16:
+                    case 17:
+                    case 18:
+                    case 26:
+                    case 27:
+                    case 28:
+                        ctx.xmm0.f32[0] /= 2.0f;
+                        break;
+                    default:
+                        break;
+                    }
+                    
+                }
+                else if (strcmp(g_GameVars.GetCurrentStage(), "d012p01") == 0) // P012_01_P01 Fortune encounter 1 polygon demo 1 (BC connecting bridge - Fortune vs Seals encounter)
+                {
+                    ctx.xmm0.f32[0] /= 4.0f;
+                }
+                else
+                {
+                    ctx.xmm0.f32[0] /= 2.0f;
+                }
+            }
+        );
+        LOG_HOOK(debrisVelocityHook, "MGS 2: Effect Speed Fix: demo\\debris_tex.c\\CreateDebrisTexture velocity", NULL, NULL);
+    }
+
 
     if (uint8_t* MGS2_createDebrisTexOffset = Memory::PatternScan(baseModule, "45 89 46 ?? E8", "MGS 2: Effect Speed Fix : demo\\debris_tex.c\\CreateDebrisTexture()", NULL, NULL))
     {
@@ -207,10 +253,9 @@ void EffectSpeedFix::Initialize() const
             [](SafetyHookContext& ctx)
             {
                 g_EffectSpeedFix.iDebrisIteration++;
-                g_EffectSpeedFix.iExplosionDuration = 150; //default to double
-                // Adjust duration based on cutscene
-                
-                if (strcmp(g_GameVars.GetCurrentStage(), "d12t3") == 0) // T12a1D The Seizure of Metal gear Demo (liquid ocelot first encounter)
+                g_EffectSpeedFix.iExplosionDuration = 75.0 * FRAME_IOP_MULTIPLIER; //default to double
+
+                /*if (strcmp(g_GameVars.GetCurrentStage(), "d12t3") == 0) // T12a1D The Seizure of Metal gear Demo (liquid ocelot first encounter)
                 {                    
                     switch (g_EffectSpeedFix.iDebrisIteration) //28 total, last 3 are at the end.
                     {
@@ -236,7 +281,7 @@ void EffectSpeedFix::Initialize() const
                     }
 
                 }
-                else if (strcmp(g_GameVars.GetCurrentStage(), "d012p01") == 0)
+                else */if (strcmp(g_GameVars.GetCurrentStage(), "d012p01") == 0)
                 {
                     // P012_01_P01 Fortune encounter 1 polygon demo 1 (BC connecting bridge - Fortune vs Seals encounter)
                     g_EffectSpeedFix.iExplosionDuration *= (int)FRAME_IOP_MULTIPLIER * 10;
@@ -258,11 +303,12 @@ void EffectSpeedFix::Initialize() const
         solidusFireDashAct_hook = safetyhook::create_inline(reinterpret_cast<void*>(MGS2_solidusFireDashActScanResult), reinterpret_cast<void*>(MGS2_solidusFireDashAct));
         LOG_HOOK(solidusFireDashAct_hook, "MGS 2: Effect Speed Fix: effect\\solidas_dash_fire.c", NULL, NULL)
     }
-
+    
 }
 
 void EffectSpeedFix::Reset()
 {
+    spdlog::info("MGS 2: Effect Speed Fix: Resetting effect speed fix variables. Level: {}", g_GameVars.GetCurrentStage());
     iDebrisIteration = 0;
 }
 

src/resources/RegStateHelpers.hpp

@@ -126,8 +126,8 @@ inline uint8_t Get##reg##l(const safetyhook::Context& regs) { return regs.reg &
 
         // R8 - R15 low 8 bits
 #define DEFINE_R8_15_8BIT_HELPERS(num) \
-inline void SetR##num##b(safetyhook::Context& regs, uint8_t val) { regs.r##num = (regs.r##num & ~0xFFULL) | val; } \
-inline uint8_t GetR##num##b(const safetyhook::Context& regs) { return regs.r##num & 0xFF; }
+inline void Setr##num##b(safetyhook::Context& regs, uint8_t val) { regs.r##num = (regs.r##num & ~0xFFULL) | val; } \
+inline uint8_t Getr##num##b(const safetyhook::Context& regs) { return regs.r##num & 0xFF; }
 
         DEFINE_R8_15_8BIT_HELPERS(8)
         DEFINE_R8_15_8BIT_HELPERS(9)

src/resources/helper.cpp

@@ -264,6 +264,7 @@ namespace Util
     {
         std::array<std::string, 4> paths = { "", "plugins", "scripts", "update" };
         std::filesystem::path foundPath;
+        bool bFoundOnce = false;
         for (const auto& path : paths)
         {
             auto filePath = sExePath / path / (fileName + ".asi");
@@ -279,18 +280,18 @@ namespace Util
                     ss >> std::get_time(&checkDate, "%Y-%m-%d");
                     if (ss.fail() || std::mktime(&fileCreationTime) >= std::mktime(&checkDate))
                     {
-                        continue; // Skip this file if it doesn't meet the creation date requirement
+                        continue;
                     }
                 }
-                if (!foundPath.empty()) // multiple versions found
+                if (bFoundOnce)
                 {
                     AllocConsole();
                     FILE* dummy;
                     freopen_s(&dummy, "CONOUT$", "w", stdout);
                     std::string errorMessage = "DUPLICATE FILE ERROR: Duplicate " + fileName + ".asi installations found! Please make sure to delete any old versions!\n";
-                    errorMessage.append("DUPLICATE FILE ERROR - Installation 1: ").append((sExePath / foundPath / (fileName + ".asi\n")).string());
-                    errorMessage.append("DUPLICATE FILE ERROR - Installation 2: ").append((sExePath / path / (fileName + ".asi\n")).string());
-                    std::cout << errorMessage;
+                    errorMessage.append("DUPLICATE FILE ERROR - Installation 1: ").append((sExePath / foundPath / (fileName + ".asi")).string().append("\n"));
+                    errorMessage.append("DUPLICATE FILE ERROR - Installation 2: ").append(filePath.string());
+                    std::cout << errorMessage << std::endl;
                     spdlog::error("{}", errorMessage);
                     FreeLibraryAndExitThread(baseModule, 1);
                 }
@@ -303,6 +304,7 @@ namespace Util
                 {
                     return TRUE;
                 }
+                bFoundOnce = true;
             }
         }
         return FALSE;