From 90921ff786cd12df239dd008a550ac21eae86d7e Mon Sep 17 00:00:00 2001 From: amber Date: Thu, 11 Jun 2026 22:37:10 -0400 Subject: [PATCH] Remove UseVanillaVentButton as it's unnecessary --- MiraAPI.Example/Roles/NeutralKillerRole.cs | 3 +-- MiraAPI/Patches/Roles/HudManagerPatches.cs | 2 +- MiraAPI/Patches/VentCanUsePatch.cs | 2 +- MiraAPI/Roles/CustomRoleConfiguration.cs | 11 ++--------- MiraAPI/Roles/CustomRoleManager.cs | 2 +- 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/MiraAPI.Example/Roles/NeutralKillerRole.cs b/MiraAPI.Example/Roles/NeutralKillerRole.cs index 640e86c..1afa4eb 100644 --- a/MiraAPI.Example/Roles/NeutralKillerRole.cs +++ b/MiraAPI.Example/Roles/NeutralKillerRole.cs @@ -18,8 +18,7 @@ public class NeutralKillerRole : ImpostorRole, ICustomRole { UseVanillaKillButton = true, CanGetKilled = true, - GetsVentData = true, - UseVanillaVentButton = true, + CanUseVent = true, }; public RoleOptionsGroup RoleOptionsGroup { get; } = new("Outcast", Color.gray); diff --git a/MiraAPI/Patches/Roles/HudManagerPatches.cs b/MiraAPI/Patches/Roles/HudManagerPatches.cs index 6d274f9..d8ac9e1 100644 --- a/MiraAPI/Patches/Roles/HudManagerPatches.cs +++ b/MiraAPI/Patches/Roles/HudManagerPatches.cs @@ -34,7 +34,7 @@ public static class HudManagerPatches if (role is ICustomRole customRole) { __instance.KillButton.ToggleVisible(isActive && customRole.Configuration.UseVanillaKillButton && !flag); - __instance.ImpostorVentButton.ToggleVisible(isActive && (customRole.Configuration.CanUseVent || customRole.Configuration.UseVanillaVentButton) && !flag); + __instance.ImpostorVentButton.ToggleVisible(isActive && (customRole.Configuration.CanUseVent) && !flag); __instance.SabotageButton.gameObject.SetActive(isActive && customRole.Configuration.CanUseSabotage); } diff --git a/MiraAPI/Patches/VentCanUsePatch.cs b/MiraAPI/Patches/VentCanUsePatch.cs index b2bea09..ff584b7 100644 --- a/MiraAPI/Patches/VentCanUsePatch.cs +++ b/MiraAPI/Patches/VentCanUsePatch.cs @@ -28,7 +28,7 @@ internal static class VentCanUsePatch var @object = pc.Object; var role = @object.Data.Role; - var canVent = role is ICustomRole customRole ? customRole.Configuration.CanUseVent || customRole.Configuration.GetsVentData || customRole.Configuration.UseVanillaVentButton : role.CanVent; + var canVent = role is ICustomRole customRole ? customRole.Configuration.CanUseVent || customRole.Configuration.GetsVentData : role.CanVent; couldUse = canVent; var modifiers = @object.GetModifierComponent().ActiveModifiers; diff --git a/MiraAPI/Roles/CustomRoleConfiguration.cs b/MiraAPI/Roles/CustomRoleConfiguration.cs index 9c58103..d597fa8 100644 --- a/MiraAPI/Roles/CustomRoleConfiguration.cs +++ b/MiraAPI/Roles/CustomRoleConfiguration.cs @@ -39,8 +39,7 @@ public record struct CustomRoleConfiguration GhostRole = role.Team is ModdedRoleTeams.Impostor ? RoleTypes.ImpostorGhost : RoleTypes.CrewmateGhost; CanGetKilled = roleBehaviour?.IsDead == false && role.Team is not ModdedRoleTeams.Impostor; UseVanillaKillButton = role.Team is ModdedRoleTeams.Impostor; - GetsVentData = role.Team is ModdedRoleTeams.Impostor; - UseVanillaVentButton = role.Team is ModdedRoleTeams.Impostor; + CanUseVent = role.Team is ModdedRoleTeams.Impostor; CanUseSabotage = role.Team is ModdedRoleTeams.Impostor; TasksCountForProgress = role.Team is ModdedRoleTeams.Crewmate; HideSettings = roleBehaviour?.IsDead == true; @@ -110,9 +109,8 @@ public record struct CustomRoleConfiguration public bool UseVanillaKillButton { get; set; } /// - /// Gets or sets a value indicating whether the role can use vents. + /// Gets or sets a value indicating whether the role can use vents. Also sends vanilla vent data. /// - [Obsolete("The equivalent of having both GetsVentData and UseVanillaVentButton as true. Only remains for compatability.")] public bool CanUseVent { get; set; } /// @@ -120,11 +118,6 @@ public record struct CustomRoleConfiguration /// public bool GetsVentData { get; set; } - /// - /// Gets or sets a value indicating whether the role can use the vanilla vent button. - /// - public bool UseVanillaVentButton { get; set; } - /// /// Gets or sets a value indicating whether the role can use the sabotage button. /// diff --git a/MiraAPI/Roles/CustomRoleManager.cs b/MiraAPI/Roles/CustomRoleManager.cs index 458654f..f306c68 100644 --- a/MiraAPI/Roles/CustomRoleManager.cs +++ b/MiraAPI/Roles/CustomRoleManager.cs @@ -139,7 +139,7 @@ public static class CustomRoleManager roleBehaviour.CanBeKilled = customRole.Configuration.CanGetKilled; roleBehaviour.CanUseKillButton = customRole.Configuration.UseVanillaKillButton; roleBehaviour.TasksCountTowardProgress = customRole.Configuration.TasksCountForProgress; - roleBehaviour.CanVent = customRole.Configuration.CanUseVent || customRole.Configuration.GetsVentData || customRole.Configuration.UseVanillaVentButton; + roleBehaviour.CanVent = customRole.Configuration.CanUseVent || customRole.Configuration.GetsVentData; roleBehaviour.DefaultGhostRole = customRole.Configuration.GhostRole; roleBehaviour.MaxCount = customRole.Configuration.MaxRoleCount; roleBehaviour.RoleScreenshot = customRole.Configuration.OptionsScreenshot?.LoadAsset();