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.5 KiB
C#
42 lines
1.5 KiB
C#
using Aki.Reflection.Patching;
|
|
using Aki.Reflection.Utils;
|
|
using EFT;
|
|
using System;
|
|
using System.Reflection;
|
|
using HarmonyLib;
|
|
|
|
namespace Aki.SinglePlayer.Patches.RaidFix
|
|
{
|
|
/// <summary>
|
|
/// Prevent BotSpawnerClass from adjusting the spawn process value to be below 0
|
|
/// This fixes aiamount = high spawning 80+ bots on maps like streets/customs
|
|
/// int_0 = all bots alive
|
|
/// int_1 = followers alive
|
|
/// int_2 = bosses currently alive
|
|
/// int_3 = spawn process? - current guess is open spawn positions - bsg doesnt seem to handle negative vaues well
|
|
/// int_4 = max bots
|
|
/// </summary>
|
|
class SpawnProcessNegativeValuePatch : ModulePatch
|
|
{
|
|
protected override MethodBase GetTargetMethod()
|
|
{
|
|
return AccessTools.Method(typeof(BotSpawner), nameof(BotSpawner.CheckOnMax));
|
|
}
|
|
|
|
[PatchPrefix]
|
|
private static bool PatchPreFix(int wantSpawn, ref int toDelay, ref int toSpawn, ref int ____maxBots, int ____allBotsCount, int ____inSpawnProcess)
|
|
{
|
|
// Set bots to delay if alive bots + spawning bots count > maxbots
|
|
// ____inSpawnProcess can be negative, don't go below 0 when calculating
|
|
if ((____allBotsCount + Math.Max(____inSpawnProcess, 0)) > ____maxBots)
|
|
{
|
|
toDelay += wantSpawn;
|
|
toSpawn = 0;
|
|
|
|
return false; // Skip original
|
|
}
|
|
|
|
return true; // Do original
|
|
}
|
|
}
|
|
} |