diff --git a/Gamemodes/Deathrace.cs b/Gamemodes/Deathrace.cs index 60ced0d6e..6d834493e 100644 --- a/Gamemodes/Deathrace.cs +++ b/Gamemodes/Deathrace.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; +using System.Globalization; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; @@ -159,7 +160,7 @@ public static class Deathrace .SetColor(color) .SetGameMode(gameMode); - PowerUpSpawnFrequencyOption = new IntegerOptionItem(id++, "Deathrace.PowerUpSpawnFrequencyOption", new(1, 60, 1), 10, tab) + PowerUpSpawnFrequencyOption = new IntegerOptionItem(id++, "Deathrace.PowerUpSpawnFrequencyOption", new(1, 60, 1), 15, tab) .SetParent(SpawnPowerUpsOption) .SetColor(color) .SetGameMode(gameMode) @@ -318,7 +319,7 @@ public static class Deathrace Suffix.Append($"\n<#ffff44>{Translator.GetString("Deathrace.VentUse")}"); if (coordinateCheck) - Suffix.Append($"\n<#ffff44>{string.Format(Translator.GetString($"Deathrace.CoordinateCheckInfo.{(int)nextRoomType}"), Math.Round(Vector2.Distance(coordinates, seer.Pos()), 1))}"); + Suffix.Append($"\n<#ffff44>{string.Format(CultureInfo.CurrentCulture, Translator.GetString($"Deathrace.CoordinateCheckInfo.{(int)nextRoomType}"), Math.Round(Vector2.Distance(coordinates, seer.Pos()), 1))}"); if (data.PowerUps.Count > 0) { @@ -511,7 +512,7 @@ public static class Deathrace public static class FixedUpdatePatch { - private static Stopwatch NotifyTimer = new(); + private static readonly Stopwatch NotifyTimer = new(); public static void Postfix() { @@ -616,7 +617,7 @@ public static class Deathrace Data.Remove(removeId); - if (NotifyTimer.Elapsed.TotalSeconds >= 1) + if (NotifyTimer.Elapsed.TotalSeconds >= (SpawnPowerUps ? 2 : 1)) { NotifyTimer.Reset(); Utils.NotifyRoles(); diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json index dca876dfb..9b4c02e59 100644 --- a/Resources/Lang/en_US.json +++ b/Resources/Lang/en_US.json @@ -9656,6 +9656,7 @@ "CommandForms.Level": "level", "CommandForms.MTHY": "mt,hy", "CommandForms.MapPoll": "mp,mpoll,pollm,mappoll", + "CommandForms.Mark": "mark", "CommandForms.Medium": "ms,mediumship,medium", "CommandForms.MessageWait": "mw,messagewait", "CommandForms.Mute": "mute", diff --git a/Roles/Standard/Coven/Tundra.cs b/Roles/Standard/Coven/Tundra.cs index 7f6f7922e..59108b6df 100644 --- a/Roles/Standard/Coven/Tundra.cs +++ b/Roles/Standard/Coven/Tundra.cs @@ -17,6 +17,8 @@ public class Tundra : CovenBase private static OptionItem KillCooldown; private static OptionItem FrigidCountdown; private static OptionItem FreezeRange; + private static OptionItem CanVentBeforeNecronomicon; + private static OptionItem CanVentAfterNecronomicon; public override void SetupCustomOption() { @@ -24,7 +26,9 @@ public class Tundra : CovenBase .AutoSetupOption(ref AbilityCooldown, 30f, new FloatValueRule(0f, 120f, 0.5f), OptionFormat.Seconds) .AutoSetupOption(ref KillCooldown, 30f, new FloatValueRule(0f, 120f, 0.5f), OptionFormat.Seconds) .AutoSetupOption(ref FrigidCountdown, 10, new IntegerValueRule(1, 60, 1), OptionFormat.Seconds) - .AutoSetupOption(ref FreezeRange, 2f, new FloatValueRule(0.1f, 10f, 0.1f), OptionFormat.Multiplier); + .AutoSetupOption(ref FreezeRange, 2f, new FloatValueRule(0.1f, 10f, 0.1f), OptionFormat.Multiplier) + .AutoSetupOption(ref CanVentBeforeNecronomicon, false) + .AutoSetupOption(ref CanVentAfterNecronomicon, true); } public override void Init()