From fe0083c8d94560ebab16f565df6c1bdc911e20d9 Mon Sep 17 00:00:00 2001 From: SokyranTheDragon Date: Tue, 26 Dec 2023 16:37:48 +0100 Subject: [PATCH] Fix compatibility issues due to ModsConfig.IsActive The issue occurs when checking if a mod is active with `ModsConfig.IsActive` when running the workshop version of a mod while there's a local copy in the mods directory. In those cases the `ModsConfig.IsActive` will return false as the running mod will have the `_steam` postfix. The simple fix is to simply check for mod ID, as well as the mod ID with the `_steam` postfix. --- .../CompAbilityEffect_BloodfeederBite_Valid_Patch.cs | 2 +- 1.4/Source/Utilities/ModCompatibility.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/1.4/Source/HarmonyPatches/CompAbilityEffect_BloodfeederBite_Valid_Patch.cs b/1.4/Source/HarmonyPatches/CompAbilityEffect_BloodfeederBite_Valid_Patch.cs index e647146..cc3571d 100644 --- a/1.4/Source/HarmonyPatches/CompAbilityEffect_BloodfeederBite_Valid_Patch.cs +++ b/1.4/Source/HarmonyPatches/CompAbilityEffect_BloodfeederBite_Valid_Patch.cs @@ -9,7 +9,7 @@ namespace VREAndroids [HarmonyPatch] public static class CompAbilityEffect_BloodfeederBite_Valid_Patch { - public static bool VanillaRacesExpandedSanguophageActive = ModsConfig.IsActive("vanillaracesexpanded.sanguophage"); + public static bool VanillaRacesExpandedSanguophageActive = ModsConfig.IsActive("vanillaracesexpanded.sanguophage") || ModsConfig.IsActive("vanillaracesexpanded.sanguophage_steam"); [HarmonyTargetMethods] public static IEnumerable TargetMethods() diff --git a/1.4/Source/Utilities/ModCompatibility.cs b/1.4/Source/Utilities/ModCompatibility.cs index 2e427ae..29e5d67 100644 --- a/1.4/Source/Utilities/ModCompatibility.cs +++ b/1.4/Source/Utilities/ModCompatibility.cs @@ -8,9 +8,9 @@ namespace VREAndroids [StaticConstructorOnStartup] public static class ModCompatibility { - public static bool DubsMintMenusActive = ModsConfig.IsActive("Dubwise.DubsMintMenus"); - public static bool SnapOutActive = ModsConfig.IsActive("weilbyte.snapout"); - public static bool MSE2Active = ModsConfig.IsActive("MSE2.Core"); + public static bool DubsMintMenusActive = ModsConfig.IsActive("Dubwise.DubsMintMenus") || ModsConfig.IsActive("Dubwise.DubsMintMenus_steam"); + public static bool SnapOutActive = ModsConfig.IsActive("weilbyte.snapout") || ModsConfig.IsActive("weilbyte.snapout_steam"); + public static bool MSE2Active = ModsConfig.IsActive("MSE2.Core") || ModsConfig.IsActive("MSE2.Core_steam"); public static Type ignoreSubPartsExtensionType; static ModCompatibility() {