diff --git a/Modules/Utils.cs b/Modules/Utils.cs index 6320932a0..3d6a6488e 100644 --- a/Modules/Utils.cs +++ b/Modules/Utils.cs @@ -229,27 +229,21 @@ public static class Utils { if (HasImpVision) { - opt.SetFloat( - FloatOptionNames.CrewLightMod, - opt.GetFloat(FloatOptionNames.ImpostorLightMod)); + opt.SetFloat(FloatOptionNames.CrewLightMod, opt.GetFloat(FloatOptionNames.ImpostorLightMod)); + if (IsActive(SystemTypes.Electrical)) { - opt.SetFloat( - FloatOptionNames.CrewLightMod, - opt.GetFloat(FloatOptionNames.CrewLightMod) * 5); + opt.SetFloat(FloatOptionNames.CrewLightMod, opt.GetFloat(FloatOptionNames.CrewLightMod) * 5); } return; } - opt.SetFloat( - FloatOptionNames.ImpostorLightMod, - opt.GetFloat(FloatOptionNames.CrewLightMod)); + opt.SetFloat(FloatOptionNames.ImpostorLightMod, opt.GetFloat(FloatOptionNames.CrewLightMod)); + if (IsActive(SystemTypes.Electrical)) { - opt.SetFloat( - FloatOptionNames.ImpostorLightMod, - opt.GetFloat(FloatOptionNames.ImpostorLightMod) / 5); + opt.SetFloat(FloatOptionNames.ImpostorLightMod, opt.GetFloat(FloatOptionNames.ImpostorLightMod) / 5); } } diff --git a/Roles/Neutral/Evolver.cs b/Roles/Neutral/Evolver.cs index 97cb46924..cc6d3a718 100644 --- a/Roles/Neutral/Evolver.cs +++ b/Roles/Neutral/Evolver.cs @@ -58,14 +58,14 @@ namespace EHR.Neutral } public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = Stats.KillCooldown; - public override bool CanUseImpostorVentButton(PlayerControl pc) => Stats is { CanVent: true, VentUseLimit: > 0 }; + public override bool CanUseImpostorVentButton(PlayerControl pc) => pc.inVent || Stats is { CanVent: true, VentUseLimit: > 0 }; public override bool CanUseSabotage(PlayerControl pc) => Stats is { CanSabotage: true, SabotageUseLimit: > 0 }; public override void ApplyGameOptions(IGameOptions opt, byte playerId) { - opt.SetVision(Stats.ImpostorVision); opt.SetFloat(FloatOptionNames.CrewLightMod, Stats.Vision); opt.SetFloat(FloatOptionNames.ImpostorLightMod, Stats.Vision); + opt.SetVision(Stats.ImpostorVision); Main.AllPlayerSpeed[playerId] = Stats.Speed; opt.SetInt(Int32OptionNames.KillDistance, Stats.KillDistance); }