Develop 5.1.4

Modules/CustomWinnerHolder.cs

@@ -57,38 +57,38 @@ public static void ResetAndSetWinner(CustomWinner winner)
 
         public static MessageWriter WriteTo(MessageWriter writer)
         {
-            writer.Write((int)WinnerTeam);
+            writer.WritePacked((int)WinnerTeam);
 
-            writer.Write(AdditionalWinnerRoles.Count);
+            writer.WritePacked(AdditionalWinnerRoles.Count);
             foreach (var wr in AdditionalWinnerRoles)
-                writer.Write((int)wr);
+                writer.WritePacked((int)wr);
 
-            writer.Write(WinnerRoles.Count);
+            writer.WritePacked(WinnerRoles.Count);
             foreach (var wr in WinnerRoles)
-                writer.Write((int)wr);
+                writer.WritePacked((int)wr);
 
-            writer.Write(WinnerIds.Count);
+            writer.WritePacked(WinnerIds.Count);
             foreach (var id in WinnerIds)
                 writer.Write(id);
 
             return writer;
         }
         public static void ReadFrom(MessageReader reader)
         {
-            WinnerTeam = (CustomWinner)reader.ReadInt32();
+            WinnerTeam = (CustomWinner)reader.ReadPackedInt32();
 
             AdditionalWinnerRoles = new();
-            int AdditionalWinnerRolesCount = reader.ReadInt32();
+            int AdditionalWinnerRolesCount = reader.ReadPackedInt32();
             for (int i = 0; i < AdditionalWinnerRolesCount; i++)
-                AdditionalWinnerRoles.Add((CustomRoles)reader.ReadInt32());
+                AdditionalWinnerRoles.Add((CustomRoles)reader.ReadPackedInt32());
 
             WinnerRoles = new();
-            int WinnerRolesCount = reader.ReadInt32();
+            int WinnerRolesCount = reader.ReadPackedInt32();
             for (int i = 0; i < WinnerRolesCount; i++)
-                WinnerRoles.Add((CustomRoles)reader.ReadInt32());
+                WinnerRoles.Add((CustomRoles)reader.ReadPackedInt32());
 
             WinnerIds = new();
-            int WinnerIdsCount = reader.ReadInt32();
+            int WinnerIdsCount = reader.ReadPackedInt32();
             for (int i = 0; i < WinnerIdsCount; i++)
                 WinnerIds.Add(reader.ReadByte());
         }

Modules/ErrorText.cs

@@ -152,6 +152,7 @@ public enum ErrorCode
         // ==========
         // 001 Main
         Main_DictionaryError = 0010003, // 001-000-3 Main Dictionary Error
+        OptionIDDuplicate = 001_010_3, // 001-010-3 オプションIDが重複している(DEBUGビルド時のみ)
         // 002 サポート関連
         UnsupportedVersion = 002_000_1,  // 002-000-1 AmongUsのバージョンが古い
         // ==========

Modules/ExtendedPlayerControl.cs

@@ -32,11 +32,14 @@ public static void RpcSetCustomRole(this PlayerControl player, CustomRoles role)
             }
             if (AmongUsClient.Instance.AmHost)
             {
-                var roleClass = player.GetRoleClass();
-                if (roleClass != null)
+                if (role < CustomRoles.NotAssigned)
                 {
-                    roleClass.Dispose();
-                    CustomRoleManager.CreateInstance(role, player);
+                    var roleClass = player.GetRoleClass();
+                    if (roleClass != null)
+                    {
+                        roleClass.Dispose();
+                        CustomRoleManager.CreateInstance(role, player);
+                    }
                 }
 
                 MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.SetCustomRole, Hazel.SendOption.Reliable, -1);
@@ -567,6 +570,19 @@ public static PlainShipRoom GetPlainShipRoom(this PlayerControl pc)
             }
             return null;
         }
+        public static void RpcSnapTo(this PlayerControl pc, Vector2 position)
+        {
+            pc.NetTransform.RpcSnapTo(position);
+        }
+        public static void RpcSnapToDesync(this PlayerControl pc, PlayerControl target, Vector2 position)
+        {
+            var net = pc.NetTransform;
+            var num = (ushort)(net.lastSequenceId + 2);
+            MessageWriter messageWriter = AmongUsClient.Instance.StartRpcImmediately(net.NetId, (byte)RpcCalls.SnapTo, SendOption.None, target.GetClientId());
+            NetHelpers.WriteVector2(position, messageWriter);
+            messageWriter.Write(num);
+            AmongUsClient.Instance.FinishRpcImmediately(messageWriter);
+        }
         public static bool IsProtected(this PlayerControl self) => self.protectedByGuardianId > -1;
 
         //汎用

Modules/OptionHolder.cs

@@ -281,6 +281,8 @@ public static CustomGameMode CurrentGameMode
         public static OptionItem SabotageTimeControl;
         public static OptionItem PolusReactorTimeLimit;
         public static OptionItem AirshipReactorTimeLimit;
+        public static OptionItem FungleReactorTimeLimit;
+        public static OptionItem FungleMushroomMixupDuration;
 
         // サボタージュのクールダウン変更
         public static OptionItem ModifySabotageCooldown;
@@ -456,6 +458,12 @@ public static void Load()
             AirshipReactorTimeLimit = FloatOptionItem.Create(100802, "AirshipReactorTimeLimit", new(1f, 90f, 1f), 60f, TabGroup.MainSettings, false).SetParent(SabotageTimeControl)
                 .SetValueFormat(OptionFormat.Seconds)
                 .SetGameMode(CustomGameMode.Standard);
+            FungleReactorTimeLimit = FloatOptionItem.Create(100803, "FungleReactorTimeLimit", new(1f, 90f, 1f), 60f, TabGroup.MainSettings, false).SetParent(SabotageTimeControl)
+                .SetValueFormat(OptionFormat.Seconds)
+                .SetGameMode(CustomGameMode.Standard);
+            FungleMushroomMixupDuration = FloatOptionItem.Create(100804, "FungleMushroomMixupDuration", new(1f, 20f, 1f), 10f, TabGroup.MainSettings, false).SetParent(SabotageTimeControl)
+                .SetValueFormat(OptionFormat.Seconds)
+                .SetGameMode(CustomGameMode.Standard);
 
             // サボタージュのクールダウン変更
             ModifySabotageCooldown = BooleanOptionItem.Create(100810, "ModifySabotageCooldown", false, TabGroup.MainSettings, false)

Modules/OptionItem/OptionItem.cs

@@ -14,6 +14,9 @@ public abstract class OptionItem
         public static IReadOnlyDictionary<int, OptionItem> FastOptions => _fastOptions;
         private static Dictionary<int, OptionItem> _fastOptions = new(1024);
         public static int CurrentPreset { get; set; }
+#if DEBUG
+        public static bool IdDuplicated { get; private set; } = false;
+#endif
         #endregion
 
         // 必須情報 (コンストラクタで必ず設定させる必要がある値)
@@ -105,6 +108,9 @@ public OptionItem(int id, string name, int defaultValue, TabGroup tab, bool isSi
             }
             else
             {
+#if DEBUG
+                IdDuplicated = true;
+#endif
                 Logger.Error($"ID:{id}が重複しています", "OptionItem");
             }
         }
@@ -179,7 +185,7 @@ public virtual void Refresh()
                 opt.oldValue = opt.Value = CurrentValue;
             }
         }
-        public void SetValue(int afterValue, bool doSave, bool doSync = true)
+        public virtual void SetValue(int afterValue, bool doSave, bool doSync = true)
         {
             int beforeValue = CurrentValue;
             if (IsSingleValue)

Modules/OptionItem/PresetOptionItem.cs

@@ -40,5 +40,10 @@ public override void SetValue(int value, bool doSync = true)
             base.SetValue(Rule.RepeatIndex(value), doSync);
             SwitchPreset(Rule.RepeatIndex(value));
         }
+        public override void SetValue(int afterValue, bool doSave, bool doSync = true)
+        {
+            base.SetValue(Rule.RepeatIndex(afterValue), doSave, doSync);
+            SwitchPreset(Rule.RepeatIndex(afterValue));
+        }
     }
 }

Modules/Utils.cs

@@ -543,24 +543,68 @@ public static void ShowActiveSettings(byte PlayerId = byte.MaxValue)
                 if (RoleAssignManager.OptionAssignMode.GetBool())
                 {
                     ShowChildrenSettings(RoleAssignManager.OptionAssignMode, ref sb);
+                    CheckPageChange(PlayerId, sb);
                 }
                 foreach (var role in Options.CustomRoleCounts)
                 {
                     if (!role.Key.IsEnable()) continue;
+                    if (role.Key is CustomRoles.HASFox or CustomRoles.HASTroll) continue;
+
                     sb.Append($"\n【{GetRoleName(role.Key)}×{role.Key.GetCount()}】\n");
                     ShowChildrenSettings(Options.CustomRoleSpawnChances[role.Key], ref sb);
+                    CheckPageChange(PlayerId, sb);
                 }
                 foreach (var opt in OptionItem.AllOptions.Where(x => x.GetBool() && x.Parent == null && x.Id >= 80000 && !x.IsHiddenOn(Options.CurrentGameMode)))
                 {
-                    if (opt.Name is "KillFlashDuration" or "RoleAssigningAlgorithm")
-                        sb.Append($"\n【{opt.GetName(true)}: {opt.GetString()}】\n");
+                    if (opt.Name is "RandomSpawn")
+                    {
+                        foreach (var randomOpt in opt.Children)
+                        {
+                            if ((randomOpt.Id / 100) % 10 != mapId) continue;
+                            //現在のマップのみ表示する
+                            if (randomOpt.GetBool())
+                            {
+                                //Onの時は頭に改ページを入れる
+                                CheckPageChange(PlayerId, sb, true);
+                                sb.Append($"\n【{opt.GetName(true)}】");
+                                sb.Append($"\n {randomOpt.GetName(true)}: {randomOpt.GetString()}\n");
+
+                                ShowChildrenSettings(randomOpt, ref sb, 1);
+                            }
+                            else
+                            {
+                                //オフならそのままで大丈夫
+                                sb.Append($"\n【{opt.GetName(true)}】");
+                                sb.Append($"\n {randomOpt.GetName(true)}: {randomOpt.GetString()}\n");
+                            }
+                        }
+                        CheckPageChange(PlayerId, sb);
+                    }
                     else
-                        sb.Append($"\n【{opt.GetName(true)}】\n");
-                    ShowChildrenSettings(opt, ref sb);
+                    {
+                        if (opt.Name is "KillFlashDuration" or "RoleAssigningAlgorithm")
+                            sb.Append($"\n【{opt.GetName(true)}: {opt.GetString()}】\n");
+                        else
+                            sb.Append($"\n【{opt.GetName(true)}】\n");
+                        ShowChildrenSettings(opt, ref sb);
+                        CheckPageChange(PlayerId, sb);
+                    }
                 }
             }
             SendMessage(sb.ToString(), PlayerId, removeTags: false);
         }
+
+        private static void CheckPageChange(byte PlayerId, StringBuilder sb, bool force = false)
+        {
+            //2Byte文字想定で1000byt越えるならページを変える
+            if (force || sb.Length > 500)
+            {
+                SendMessage(sb.ToString(), PlayerId, removeTags: false);
+                sb.Clear();
+                sb.AppendFormat("<size={0}>", ActiveSettingsSize);
+            }
+        }
+
         public static void CopyCurrentSettings()
         {
             var sb = new StringBuilder();
@@ -1020,27 +1064,39 @@ public static void OpenDirectory(string path)
         }
         public static string SummaryTexts(byte id, bool isForChat)
         {
-            // 全プレイヤー中最長の名前の長さからプレイヤー名の後の水平位置を計算する
-            // 1em ≒ 半角2文字
-            // 空白は0.5emとする
-            // SJISではアルファベットは1バイト，日本語は基本的に2バイト
-            var longestNameByteCount = Main.AllPlayerNames.Values.Select(name => name.GetByteCount()).OrderByDescending(byteCount => byteCount).FirstOrDefault();
-            //最大11.5emとする(★+日本語10文字分+半角空白)
-            var pos = Math.Min(((float)longestNameByteCount / 2) + 1.5f /* ★+末尾の半角空白 */ , 11.5f);
 
             var builder = new StringBuilder();
-            builder.Append(isForChat ? Main.AllPlayerNames[id] : ColorString(Main.PlayerColors[id], Main.AllPlayerNames[id]));
-            builder.AppendFormat("<pos={0}em>", pos).Append(isForChat ? GetProgressText(id).RemoveColorTags() : GetProgressText(id)).Append("</pos>");
-            // "(00/00) " = 4em
-            pos += 4f;
-            builder.AppendFormat("<pos={0}em>", pos).Append(GetVitalText(id)).Append("</pos>");
-            // "Lover's Suicide " = 8em
-            // "回線切断 " = 4.5em
-            pos += DestroyableSingleton<TranslationController>.Instance.currentLanguage.languageID == SupportedLangs.English ? 8f : 4.5f;
-            builder.AppendFormat("<pos={0}em>", pos);
-            builder.Append(isForChat ? GetTrueRoleName(id, false).RemoveColorTags() : GetTrueRoleName(id, false));
-            builder.Append(isForChat ? GetSubRolesText(id).RemoveColorTags() : GetSubRolesText(id));
-            builder.Append("</pos>");
+            // チャットならposタグを使わない(文字数削減)
+            if (isForChat)
+            {
+                builder.Append(Main.AllPlayerNames[id]);
+                builder.Append(": ").Append(GetProgressText(id).RemoveColorTags());
+                builder.Append(' ').Append(GetVitalText(id));
+                builder.Append(' ').Append(GetTrueRoleName(id, false).RemoveColorTags());
+                builder.Append(' ').Append(GetSubRolesText(id).RemoveColorTags());
+            }
+            else
+            {
+                // 全プレイヤー中最長の名前の長さからプレイヤー名の後の水平位置を計算する
+                // 1em ≒ 半角2文字
+                // 空白は0.5emとする
+                // SJISではアルファベットは1バイト，日本語は基本的に2バイト
+                var longestNameByteCount = Main.AllPlayerNames.Values.Select(name => name.GetByteCount()).OrderByDescending(byteCount => byteCount).FirstOrDefault();
+                //最大11.5emとする(★+日本語10文字分+半角空白)
+                var pos = Math.Min(((float)longestNameByteCount / 2) + 1.5f /* ★+末尾の半角空白 */ , 11.5f);
+                builder.Append(ColorString(Main.PlayerColors[id], Main.AllPlayerNames[id]));
+                builder.AppendFormat("<pos={0}em>", pos).Append(GetProgressText(id)).Append("</pos>");
+                // "(00/00) " = 4em
+                pos += 4f;
+                builder.AppendFormat("<pos={0}em>", pos).Append(GetVitalText(id)).Append("</pos>");
+                // "Lover's Suicide " = 8em
+                // "回線切断 " = 4.5em
+                pos += DestroyableSingleton<TranslationController>.Instance.currentLanguage.languageID == SupportedLangs.English ? 8f : 4.5f;
+                builder.AppendFormat("<pos={0}em>", pos);
+                builder.Append(GetTrueRoleName(id, false));
+                builder.Append(GetSubRolesText(id));
+                builder.Append("</pos>");
+            }
             return builder.ToString();
         }
         public static string RemoveHtmlTags(this string str) => Regex.Replace(str, "<[^>]*?>", "");

Patches/AirshipStatus.cs

@@ -10,7 +10,14 @@ public static class AirshipStatusPrespawnStepPatch
     {
         public static bool Prefix()
         {
-            return !PlayerControl.LocalPlayer.Is(CustomRoles.GM); // GMは湧き画面をスキップ
+            if (PlayerControl.LocalPlayer.Is(CustomRoles.GM))
+            {
+                RandomSpawn.hostReady = true;
+                RandomSpawn.AirshipSpawn(PlayerControl.LocalPlayer);
+                // GMは湧き画面をスキップ
+                return false;
+            }
+            return true;
         }
     }
 }