diff --git a/AmongUsRevamped.cs b/AmongUsRevamped.cs index 441969f..7dc3c9f 100644 --- a/AmongUsRevamped.cs +++ b/AmongUsRevamped.cs @@ -44,7 +44,7 @@ public partial class Main : BasePlugin public static bool HasArgumentException; public static string CredentialsText; - public const string ModVersion = "v2.0.0"; + public const string ModVersion = "v2.0.1"; public static float GameTimer; public static float AfkTimer; diff --git a/AmongUsRevamped.csproj b/AmongUsRevamped.csproj index 8a534f8..42ff554 100644 --- a/AmongUsRevamped.csproj +++ b/AmongUsRevamped.csproj @@ -19,7 +19,7 @@ - + diff --git a/Modules/CustomOptionsHolder.cs b/Modules/CustomOptionsHolder.cs index 27fffd2..81a6981 100644 --- a/Modules/CustomOptionsHolder.cs +++ b/Modules/CustomOptionsHolder.cs @@ -569,7 +569,7 @@ namespace AmongUsRevamped DisableMushroomMixup = BooleanOptionItem.Create(60462, Translator.Get("disableMushroomMixup"), false, TabGroup.ModSettings, false) .SetParent(DisableSabotage) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableCloseDoor = BooleanOptionItem.Create(60566, Translator.Get("disableCloseDoor"), false, TabGroup.ModSettings, false) + DisableCloseDoor = BooleanOptionItem.Create(60463, Translator.Get("disableCloseDoor"), false, TabGroup.ModSettings, false) .SetColor(Color.red); TabGroupGameplayGeneral = TextOptionItem.Create(60564, Translator.Get("tabGroupGameplayGeneral"), TabGroup.ModSettings) diff --git a/Patches/IntroPatch.cs b/Patches/IntroPatch.cs index 8e329bb..18e4617 100644 --- a/Patches/IntroPatch.cs +++ b/Patches/IntroPatch.cs @@ -65,7 +65,7 @@ internal static class CoShowIntroPatch { if (Main.NormalOptions.roleOptions.TryGetRoleOptions(RoleTypes.GuardianAngel, out var GuardianAngelOptions)) { - GuardianAngelOptions.ProtectionDurationSeconds = 60f; + GuardianAngelOptions.ProtectionDurationSeconds = 10f; } OptionManager.SyncGameOptions(); diff --git a/Patches/JoinAndLeavePatches.cs b/Patches/JoinAndLeavePatches.cs index 727eea5..00d21b7 100644 --- a/Patches/JoinAndLeavePatches.cs +++ b/Patches/JoinAndLeavePatches.cs @@ -232,12 +232,14 @@ public static class ShowNotificationPatch case DisconnectReasons.Sanctions: case DisconnectReasons.Hacking: + case DisconnectReasons.Banned: Logger.Info($" {playerName} was banned from the game. ({reason})", "ShowNotificationPatch"); Logger.SendInGame($" {playerName} was banned from the game. ({reason})"); return false; case DisconnectReasons.DuplicateConnectionDetected: case DisconnectReasons.ClientTimeout: + case DisconnectReasons.Kicked: Logger.Info($" {playerName} was kicked from the game. ({reason})", "ShowNotificationPatch"); Logger.SendInGame($" {playerName} was kicked from the game. ({reason})"); return false; diff --git a/Patches/OnGameStartedPatch.cs b/Patches/OnGameStartedPatch.cs index 36b4307..07d5079 100644 --- a/Patches/OnGameStartedPatch.cs +++ b/Patches/OnGameStartedPatch.cs @@ -176,6 +176,7 @@ internal static class OnGameStartPatch public static void Postfix(IntroCutscene __instance, ref Il2CppSystem.Collections.IEnumerator __result) { if (!AmongUsClient.Instance.AmHost) return; + if ((Options.SNSChatInGameFast.GetBool() && Options.Gamemode.GetValue() == 1) || (Options.PNSChatInGameFast.GetBool() && Options.Gamemode.GetValue() == 3)) { __result = SkipIntro(__instance, __result).WrapToIl2Cpp(); @@ -203,6 +204,7 @@ internal static class OnGameStartPatch public static bool Prefix(ref NamePlateViewData __result) { if (!AmongUsClient.Instance.AmHost) return true; + if ((Options.SNSChatInGameFast.GetBool() && Options.Gamemode.GetValue() == 1) || (Options.PNSChatInGameFast.GetBool() && Options.Gamemode.GetValue() == 3)) { if (MeetingHud.Instance == null) return true; @@ -227,8 +229,11 @@ internal static class OnGameStartPatch { if (!AmongUsClient.Instance.AmHost) return; - if (meetingNameplate != null) Object.Destroy(meetingNameplate); - meetingNameplate = null; + if ((Options.SNSChatInGameFast.GetBool() && Options.Gamemode.GetValue() == 1) || (Options.PNSChatInGameFast.GetBool() && Options.Gamemode.GetValue() == 3)) + { + if (meetingNameplate != null) Object.Destroy(meetingNameplate); + meetingNameplate = null; + } } } diff --git a/Resources/Language/Russian.json b/Resources/Language/Russian.json index 354e530..211b427 100644 --- a/Resources/Language/Russian.json +++ b/Resources/Language/Russian.json @@ -341,6 +341,14 @@ "pnsDisableCloseDoor": "Выключить Саботажи Дверей В Режиме Фантомные Прятки", "tabGroupPNS": "Фантомные Прятки", "badMoveTimeToSuicide": "Файнтомы Самоубиваются После Видимого Движения После", - "snsImpostorCanVent": "Предатели могут уходить в люк", - "pnsDesc": "Отправляет информацию о Режиме Фантомных Прятках." + "snsImpostorCanVent": "Предатели Могут Уходить в Люк", + "pnsDesc": "Отправляет Информацию о Режиме Фантомных Прятках.", + "modeVoteDuration": "Врямя Голосования За Режим", + "snsChatInGameExtendTwo": "Отправить увеличенную инфо после начала игры", + "snsChatInGameFast": "Быстрые Собрания (экспериментальное+)", + "shieldFirstDeath": "Защищать Игрока Который Умер Первым", + "shieldFirstDeathDuration": "Длительность Щита", + "snsTwoDesc": "Отправить Увеличенное Описание Клона.", + "modeVoteDesc": "Начать Голосование между всеми режимами.", + "automaticModePoll": "Автоматический /gmvote После Перезахода" } diff --git a/Resources/Language/SimplifiedChinese.json b/Resources/Language/SimplifiedChinese.json index 15debe9..4541a65 100644 --- a/Resources/Language/SimplifiedChinese.json +++ b/Resources/Language/SimplifiedChinese.json @@ -323,10 +323,10 @@ "automaticMapPoll": "重新加入后自发起起 /mapvote", "automaticAllMapPoll": "重新加入后自动发起 /allmapvote", "timeBeforeMapPoll": "投票开始前等待時間", - - "pnsDisableSabotage": "Disable PnS Critical Sabotages", - "pnsDisableCloseDoor": "Disable PnS Door Sabotages", - "tabGroupPNS": "Poof and Seek", - "badMoveTimeToSuicide": "Phantom Suicides After Visibly Moving For", - "snsImpostorCanVent": "Impostors can vent" +"pnsDesc": "发送 Poof and Seek 幻象与躲藏 游戏模式说明。", +"pnsDisableSabotage": "禁用 PnS 紧急破坏。", +"pnsDisableCloseDoor": "禁用 PnS 关门破坏。", +"tabGroupPNS": "Poof and Seek", +"badMoveTimeToSuicide": "幻象师在明显移动后自杀的时间。", +"snsImpostorCanVent": "内鬼可以使用通风管。" }