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>
52 lines
1.9 KiB
C#
52 lines
1.9 KiB
C#
using Aki.Reflection.Patching;
|
|
using EFT;
|
|
using System.Reflection;
|
|
using HarmonyLib;
|
|
|
|
namespace Aki.Custom.Patches
|
|
{
|
|
public class AddEnemyToAllGroupsInBotZonePatch : ModulePatch
|
|
{
|
|
protected override MethodBase GetTargetMethod()
|
|
{
|
|
return AccessTools.Method(typeof(BotsController), nameof(BotsController.AddEnemyToAllGroupsInBotZone));
|
|
}
|
|
|
|
/// <summary>
|
|
/// AddEnemyToAllGroupsInBotZone()
|
|
/// Goal: by default, AddEnemyToAllGroupsInBotZone doesn't check if the bot group is on the same side as the player.
|
|
/// The effect of this is that when you are a Scav and kill a Usec, every bot group in the zone will aggro you including other Scavs.
|
|
/// This should fix that.
|
|
/// </summary>
|
|
[PatchPrefix]
|
|
private static bool PatchPrefix(BotsController __instance, IPlayer aggressor, IPlayer groupOwner, IPlayer target)
|
|
{
|
|
BotZone botZone = groupOwner.AIData.BotOwner.BotsGroup.BotZone;
|
|
foreach (var item in __instance.Groups())
|
|
{
|
|
if (item.Key != botZone)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
foreach (var group in item.Value.GetGroups(notNull: true))
|
|
{
|
|
bool differentSide = aggressor.Side != group.Side;
|
|
bool sameSide = aggressor.Side == target.Side;
|
|
|
|
if (!group.Enemies.ContainsKey(aggressor)
|
|
&& (differentSide || !sameSide)
|
|
&& !group.HaveMemberWithRole(WildSpawnType.gifter)
|
|
&& group.ShallRevengeFor(target)
|
|
)
|
|
{
|
|
group.AddEnemy(aggressor, EBotEnemyCause.AddEnemyToAllGroupsInBotZone);
|
|
}
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
}
|
|
}
|