spt/modules
spt/modules
0
0
Fork 0
mirror of https://github.com/sp-tarkov/modules.git synced 2025-02-12 21:10:45 -05:00
Code

renamed and reenabled some required patches

Browse Source
This commit is contained in:
CWX 2024-07-12 15:59:37 +01:00
parent f8ce8129e6
commit ccad89df05
4 changed files with 69 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/SPT.SinglePlayer/Patches/ScavMode/ExfilPointManagerPatch.cs → project/SPT.SinglePlayer/Patches/ScavMode/DisablePMCExtractsForScavsPatch.cs
View File

@ -11,7 +11,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode
/// <summary>
/// Disable PMC exfil points when playing as pscav
/// </summary>
public class ExfilPointManagerPatch : ModulePatch
public class DisablePMCExtractsForScavsPatch : ModulePatch
{
protected override MethodBase GetTargetMethod()
{

2
project/SPT.SinglePlayer/Patches/ScavMode/ScavExfilPatch.cs
View File

@ -34,7 +34,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode
// Get the required mask value and retrieve a list of exfil points, setting it as the result
var mask = __instance.GetScavExfiltrationMask(profile.Id);
__result = __instance.ScavExfiltrationClaim(mask, profile.Id);
__result = __instance.ScavExfiltrationClaim(mask, profile.Id);
return false; // Don't run the original method anymore, as that will overwrite our new exfil points with ones meant for a PMC
}

80
project/SPT.SinglePlayer/Patches/ScavMode/ScavProfileLoadPatch.cs
View File

@ -13,30 +13,78 @@ namespace SPT.SinglePlayer.Patches.ScavMode
{
public class ScavProfileLoadPatch : ModulePatch
{
/// <summary>
/// This was changed from an IL Patch,
/// aim is just to replace loaded profile with the Scav profile when creating a game
/// </summary>
/// <returns></returns>
protected override MethodBase GetTargetMethod()
{
return AccessTools.Method(typeof(LocalGame), nameof(LocalGame.smethod_6));
// Struct331 - 20575
var desiredType = typeof(TarkovApplication)
.GetNestedTypes(PatchConstants.PublicDeclaredFlags)
.SingleCustom(x => x.GetField("timeAndWeather") != null
&& x.GetField("timeHasComeScreenController") != null
&& x.Name.Contains("Struct"));
var desiredMethod = desiredType.GetMethods(PatchConstants.PublicDeclaredFlags)
.FirstOrDefault(x => x.Name == "MoveNext");
Logger.LogDebug($"{this.GetType().Name} Type: {desiredType?.Name}");
Logger.LogDebug($"{this.GetType().Name} Method: {desiredMethod?.Name}");
return desiredMethod;
}
[PatchPrefix]
public static void PatchPrefix(ref Profile profile, LocalRaidSettings raidSettings)
[PatchTranspiler]
private static IEnumerable<CodeInstruction> PatchTranspile(ILGenerator generator, IEnumerable<CodeInstruction> instructions)
{
// check raidsettings to see if its a pmc raid
if (raidSettings.playerSide == ESideType.Pmc)
var codes = new List<CodeInstruction>(instructions);
// Search for code where backend.Session.getProfile() is called.
var searchCode = new CodeInstruction(OpCodes.Callvirt, AccessTools.Method(PatchConstants.BackendProfileInterfaceType, "get_Profile"));
var searchIndex = -1;
for (var i = 0; i < codes.Count; i++)
{
Logger.LogInfo("Side was PMC, returning");
return;
if (codes[i].opcode == searchCode.opcode && codes[i].operand == searchCode.operand)
{
searchIndex = i;
break;
}
}
// if not get scav profile
// load that into the profile param
Logger.LogInfo("Side was Scav, setting profile");
profile = PatchConstants.BackEndSession.ProfileOfPet;
// Patch failed.
if (searchIndex == -1)
{
Logger.LogError($"Patch {MethodBase.GetCurrentMethod()} failed: Could not find reference code.");
return instructions;
}
// Move back by 2. This is the start of this method call.
searchIndex -= 2;
var brFalseLabel = generator.DefineLabel();
var brLabel = generator.DefineLabel();
var newCodes = CodeGenerator.GenerateInstructions(new List<Code>()
{
new Code(OpCodes.Ldloc_1),
new Code(OpCodes.Call, typeof(ClientApplication<ISession>), "get_Session"),
new Code(OpCodes.Ldloc_1),
new Code(OpCodes.Ldfld, typeof(TarkovApplication), "_raidSettings"),
new Code(OpCodes.Callvirt, typeof(RaidSettings), "get_IsPmc"),
new Code(OpCodes.Brfalse, brFalseLabel),
new Code(OpCodes.Callvirt, PatchConstants.BackendProfileInterfaceType, "get_Profile"),
new Code(OpCodes.Br, brLabel),
new CodeWithLabel(OpCodes.Callvirt, brFalseLabel, PatchConstants.BackendProfileInterfaceType, "get_ProfileOfPet"),
new CodeWithLabel(OpCodes.Stfld, brLabel, typeof(TarkovApplication).GetNestedTypes(BindingFlags.Public).SingleCustom(IsTargetNestedType), "profile")
});
codes.RemoveRange(searchIndex, 4);
codes.InsertRange(searchIndex, newCodes);
return codes.AsEnumerable();
}
private static bool IsTargetNestedType(System.Type nestedType)
{
return nestedType.GetMethods(PatchConstants.PublicDeclaredFlags)
.Count(x => x.GetParameters().Length == 1 && x.GetParameters()[0].ParameterType == typeof(IResult)) > 0 && nestedType.GetField("savageProfile") != null;
}
}
}

6
project/SPT.SinglePlayer/SPTSingleplayerPlugin.cs
View File

@ -24,18 +24,18 @@ namespace SPT.SinglePlayer
new EmptyInfilFixPatch().Enable();
new MaxBotPatch().Enable();
new PostRaidHealingPricePatch().Enable();
new ExfilPointManagerPatch().Enable();
new HideoutQuestIgnorePatch().Enable();
new SpawnProcessNegativeValuePatch().Enable();
new SpawnPmcPatch().Enable();
// new ScavExperienceGainPatch().Enable();
// new ScavExfilPatch().Enable();
// new ScavRepAdjustmentPatch().Enable();
// new ScavSellAllPriceStorePatch().Enable();
// new ScavSellAllRequestPatch().Enable();
// Still need
new ScavExperienceGainPatch().Enable();
new DisablePMCExtractsForScavsPatch().Enable();
new ScavExfilPatch().Enable();
new ScavProfileLoadPatch().Enable();
new ScavPrefabLoadPatch().Enable();
new DisableReadyLocationReadyPatch().Enable();