diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/ScavEncyclopediaPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/ScavEncyclopediaPatch.cs deleted file mode 100644 index 6db0b85..0000000 --- a/project/SPT.SinglePlayer/Patches/ScavMode/ScavEncyclopediaPatch.cs +++ /dev/null @@ -1,47 +0,0 @@ -using SPT.Reflection.Patching; -using SPT.Reflection.Utils; -using SPT.SinglePlayer.Utils.InRaid; -using EFT; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; - -namespace SPT.SinglePlayer.Patches.ScavMode -{ - /** - * At the start of a scav raid, copy the PMC encyclopedia to the scav profile, and - * make sure the scav knows all of the items it has in its inventory - */ - internal class ScavEncyclopediaPatch : ModulePatch - { - protected override MethodBase GetTargetMethod() - { - return typeof(GameWorld).GetMethod(nameof(GameWorld.OnGameStarted)); - } - - [PatchPostfix] - public static void PatchPostFix() - { - if (RaidChangesUtil.IsScavRaid) - { - var scavProfile = PatchConstants.BackEndSession.ProfileOfPet; - var pmcProfile = PatchConstants.BackEndSession.Profile; - - // Handle old profiles where the scav doesn't have an encyclopedia - if (scavProfile.Encyclopedia == null) - { - scavProfile.Encyclopedia = new Dictionary(); - } - - // Sync the PMC encyclopedia to the scav profile - foreach (var item in pmcProfile.Encyclopedia.Where(item => !scavProfile.Encyclopedia.ContainsKey(item.Key))) - { - scavProfile.Encyclopedia.Add(item.Key, item.Value); - } - - // Auto examine any items the scav doesn't know that are in their inventory - scavProfile.LearnAll(); - } - } - } -} diff --git a/project/SPT.SinglePlayer/SPTSingleplayerPlugin.cs b/project/SPT.SinglePlayer/SPTSingleplayerPlugin.cs index 720a74e..981da5f 100644 --- a/project/SPT.SinglePlayer/SPTSingleplayerPlugin.cs +++ b/project/SPT.SinglePlayer/SPTSingleplayerPlugin.cs @@ -28,26 +28,27 @@ namespace SPT.SinglePlayer new HideoutQuestIgnorePatch().Enable(); new SpawnProcessNegativeValuePatch().Enable(); new SpawnPmcPatch().Enable(); - new ScavExperienceGainPatch().Enable(); - new ScavEncyclopediaPatch().Enable(); - new ScavProfileLoadPatch().Enable(); - new ScavPrefabLoadPatch().Enable(); - new ScavExfilPatch().Enable(); + // new ScavExperienceGainPatch().Enable(); + // new ScavExfilPatch().Enable(); + // new ScavRepAdjustmentPatch().Enable(); + // new ScavSellAllPriceStorePatch().Enable(); + // new ScavSellAllRequestPatch().Enable(); + // Still need + new ScavProfileLoadPatch().Enable(); + new ScavPrefabLoadPatch().Enable(); new DisableReadyLocationReadyPatch().Enable(); new BotTemplateLimitPatch().Enable(); new LoadOfflineRaidScreenPatch().Enable(); new AmmoUsedCounterPatch().Enable(); new ArmorDamageCounterPatch().Enable(); - new ScavRepAdjustmentPatch().Enable(); new PluginErrorNotifierPatch().Enable(); new GetNewBotTemplatesPatch().Enable(); new LabsKeycardRemovalPatch().Enable(); new MapReadyButtonPatch().Enable(); new RemoveUsedBotProfilePatch().Enable(); - new ScavSellAllPriceStorePatch().Enable(); - new ScavSellAllRequestPatch().Enable(); + new ScavLateStartPatch().Enable(); // 3.10.0 new PVEModeWelcomeMessagePatch().Enable();