mirror of
https://github.com/All-Of-Us-Mods/MiraAPI.git
synced 2026-10-20 01:46:15 +00:00
Make kill timer use whatever the gamemode sets
This commit is contained in:
1 parent
a57f40fa79
commit
6fe2750545
2 files changed
+13
-4
No files matched your search
@@ -7,6 +7,7 @@ using Assets.CoreScripts;
|
||||
using BepInEx.Unity.IL2CPP.Utils;
|
||||
using MiraAPI.Events;
|
||||
using MiraAPI.Events.Vanilla.Gameplay;
|
||||
using MiraAPI.GameModes;
|
||||
using MiraAPI.Utilities;
|
||||
using Reactor.Networking.Attributes;
|
||||
using Reactor.Networking.Rpc;
|
||||
@@ -209,7 +210,10 @@ public static class CustomMurderRpc
|
||||
if (resetKillTimer)
|
||||
{
|
||||
source.SetKillTimer(
|
||||
GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown) / 2f);
|
||||
CustomGameModeManager.ActiveMode != null
|
||||
? CustomGameModeManager.ActiveMode.DefaultImpostorKillCooldown / 2f
|
||||
: GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown) /
|
||||
2f);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -246,7 +250,9 @@ public static class CustomMurderRpc
|
||||
|
||||
if (resetKillTimer)
|
||||
{
|
||||
source.SetKillTimer(GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown));
|
||||
source.SetKillTimer(CustomGameModeManager.ActiveMode != null
|
||||
? CustomGameModeManager.ActiveMode.DefaultImpostorKillCooldown
|
||||
: GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -16,8 +16,11 @@ internal static class HudPatches
|
||||
[HarmonyPostfix, HarmonyPatch(nameof(HudManager.Update))]
|
||||
public static void HudUpdatePatch(HudManager __instance)
|
||||
{
|
||||
if (GameManager.Instance != null && GameManager.Instance.GameHasStarted)
|
||||
CustomGameModeManager.ActiveMode?.HudUpdate(__instance);
|
||||
if (GameManager.Instance != null && GameManager.Instance.GameHasStarted &&
|
||||
CustomGameModeManager.ActiveMode != null)
|
||||
{
|
||||
CustomGameModeManager.ActiveMode.HudUpdate(__instance);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user