mirror of
https://github.com/sp-tarkov/modules.git
synced 2025-02-13 09:50:43 -05:00
Terkoiz
337a0733ae
Depends on SPT-AKI/SPT-AssemblyTool#3 * Refactored Modules for better consistency and general readability, along with preparing the code for a publicized assembly * Added `PublicDeclaredFlags` to `PatchConstants` to cover a set of commonly used flags to get methods post-publicizing * Added a replacement to LINQ's `.Single()` - `.SingleCustom()` which has improved logging to help with debugging Module code. Replaced all `.Single()` usages where applicable * Replaced most method info fetching with `AccessTools` for consistency and better readability, especially in places where methods were being retrieved by their name anyways **NOTE:** As a side effect of publicizing all properties, some property access code such as `Player.Position` will now show "ambiguous reference" errors during compile, due to there being multiple interfaces with the Property name being defined on the class. The way to get around this is to use a cast to an explicit interface Example: ```cs Singleton<GameWorld>.Instance.MainPlayer.Position ``` will now need to be ```cs ((IPlayer)Singleton<GameWorld>.Instance.MainPlayer).Position ``` Co-authored-by: Terkoiz <terkoiz@spt.dev> Reviewed-on: SPT-AKI/Modules#58 Co-authored-by: Terkoiz <terkoiz@noreply.dev.sp-tarkov.com> Co-committed-by: Terkoiz <terkoiz@noreply.dev.sp-tarkov.com>
42 lines
1.7 KiB
C#
42 lines
1.7 KiB
C#
using System.Reflection;
|
|
using Aki.Reflection.Patching;
|
|
using Comfort.Common;
|
|
using EFT;
|
|
using EFT.Interactive;
|
|
using HarmonyLib;
|
|
|
|
namespace Aki.SinglePlayer.Patches.ScavMode
|
|
{
|
|
public class ScavExfilPatch : ModulePatch
|
|
{
|
|
protected override MethodBase GetTargetMethod()
|
|
{
|
|
return AccessTools.Method(typeof(ExfiltrationControllerClass), nameof(ExfiltrationControllerClass.EligiblePoints), new[] { typeof(Profile) });
|
|
}
|
|
|
|
[PatchPrefix]
|
|
private static bool PatchPrefix(Profile profile, ExfiltrationControllerClass __instance, ref ExfiltrationPoint[] __result)
|
|
{
|
|
if (profile.Info.Side != EPlayerSide.Savage)
|
|
{
|
|
return true; // Not a scav - don't do anything and run original method
|
|
}
|
|
|
|
// We are on a map with zero scav exfil points, enable all of them.
|
|
if (__instance.ScavExfiltrationPoints.Length == 0)
|
|
{
|
|
__result = __instance.ExfiltrationPoints;
|
|
return false;
|
|
}
|
|
|
|
// Running this prepares all the data for getting scav exfil points
|
|
__instance.ScavExfiltrationClaim(((IPlayer)Singleton<GameWorld>.Instance.MainPlayer).Position, profile.Id, profile.FenceInfo.AvailableExitsCount);
|
|
|
|
// 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);
|
|
|
|
return false; // Don't run the original method anymore, as that will overwrite our new exfil points with ones meant for a PMC
|
|
}
|
|
}
|
|
} |