spt/modules
spt/modules
0
0
Fork 0
mirror of https://github.com/sp-tarkov/modules.git synced 2025-02-13 01:30:45 -05:00
Code

Remove patches that are now covered by BSG

Browse Source
This commit is contained in:
CWX 2024-08-02 15:01:44 +01:00
parent 5131a6ff68
commit c234e0d1d6
4 changed files with 1 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
project/SPT.Custom/Patches/AddEnemyTryCallFailureFixPatch.cs
View File

@ -1,49 +0,0 @@
using SPT.Reflection.Patching;
using EFT;
using HarmonyLib;
using System.Reflection;
namespace SPT.Custom.Patches
{
/**
* It's possible for `AddEnemy` to return false, in that case, further code in TryCall will fail,
* so we do the first bit of `TryCall` ourselves, and skip the original function if AddEnemy fails
*/
public class AddEnemyTryCallFailureFixPatch : ModulePatch
{
protected override MethodBase GetTargetMethod()
{
return AccessTools.Method(typeof(BotCalledData), nameof(BotCalledData.TryCall));
}
[PatchPrefix]
private static bool PatchPrefix(ref bool __result, BotOwner caller, BotOwner ___botOwner_0, BotOwner ____caller)
{
if (___botOwner_0.EnemiesController.IsEnemy(caller.AIData.Player) || ____caller != null)
{
__result = false;
// Skip original
return false;
}
if (caller.Memory.GoalEnemy != null)
{
IPlayer person = caller.Memory.GoalEnemy.Person;
if (!___botOwner_0.BotsGroup.Enemies.ContainsKey(person))
{
if (!___botOwner_0.BotsGroup.AddEnemy(person, EBotEnemyCause.callBot))
{
__result = false;
// Skip original
return false;
}
}
}
// Allow original
return true;
}
}
}

53
project/SPT.Custom/Patches/BotCallForHelpWrongTargetLocationPatch.cs
View File

@ -1,53 +0,0 @@
using SPT.Reflection.Patching;
using EFT;
using HarmonyLib;
using System.Reflection;
using UnityEngine;
namespace SPT.Custom.Patches
{
/**
* BSG passes the wrong target location into the TryCall method for BotCallForHelp, it's passing in
* the bots current target instead of the target of the bot calling for help
*
* This results in both an NRE, and the called bots target location being wrong
*/
public class BotCallForHelpWrongTargetLocationPatch : ModulePatch
{
private static FieldInfo _originalPanicTypeField;
protected override MethodBase GetTargetMethod()
{
_originalPanicTypeField = AccessTools.Field(typeof(BotCallForHelp), "_originalPanicType");
return AccessTools.FirstMethod(typeof(BotCallForHelp), IsTargetMethod);
}
protected bool IsTargetMethod(MethodBase method)
{
var parameters = method.GetParameters();
return (parameters.Length == 1
&& parameters[0].Name == "calledBot");
}
[PatchPrefix]
private static bool PatchPrefix(ref bool __result, BotCallForHelp __instance, BotOwner calledBot, BotOwner ___botOwner_0)
{
if (__instance.method_2(calledBot) && ___botOwner_0.Memory.GoalEnemy != null)
{
_originalPanicTypeField.SetValue(calledBot.CallForHelp, calledBot.DangerPointsData.PanicType);
calledBot.DangerPointsData.PanicType = PanicType.none;
calledBot.Brain.BaseBrain.CalcActionNextFrame();
// Note: This differs from BSG's implementation in that we pass in botOwner_0's enemy pos instead of calledBot's enemy pos
calledBot.CalledData.TryCall(new Vector3?(___botOwner_0.Memory.GoalEnemy.Person.Position), ___botOwner_0, true);
__result = true;
}
else
{
__result = false;
}
return false; // Skip original
}
}
}

28
project/SPT.Custom/Patches/BotOwnerDisposePatch.cs
View File

@ -1,28 +0,0 @@
using SPT.Reflection.Patching;
using EFT;
using HarmonyLib;
using System.Reflection;
namespace SPT.Custom.Patches
{
/**
* BotOwner doesn't call SetOff on the CalledData object when a bot is disposed, this can result
* in bots that are no longer alive having their `OnEnemyAdd` method called
*/
public class BotOwnerDisposePatch : ModulePatch
{
protected override MethodBase GetTargetMethod()
{
return AccessTools.Method(typeof(BotOwner), nameof(BotOwner.Dispose));
}
[PatchPrefix]
private static void PatchPrefix(BotOwner __instance)
{
if (__instance.CalledData != null)
{
__instance.CalledData.SetOff();
}
}
}
}

5
project/SPT.Custom/SPTCustomPlugin.cs
View File

@ -22,10 +22,7 @@ namespace SPT.Custom
new EasyBundlePatch().Enable();
// TODO: check if these patches are needed
//new AddEnemyTryCallFailureFixPatch().Enable(); // NOT NEEDED bsg do it now
new BotCallForHelpWrongTargetLocationPatch().Enable();
//new BotOwnerDisposePatch().Enable(); // NOT NEEDED bsg do it now
new BotsGroupLetBossesShootPmcsPatch().Enable();
// new BotsGroupLetBossesShootPmcsPatch().Enable();
new CustomAiPatch().Enable();
new AddTraitorScavsPatch().Enable();
new PmcTakesAgesToHealLimbsPatch().Enable();