Merge remote-tracking branch 'origin/main'

This commit is contained in:
Gurge44 committed 2025-06-21 18:38:16 +02:00
commit a70bb0ac8a
2 files changed
+5 -5

No files matched your search

+3 -3
View File
@@ -1197,8 +1197,8 @@ public static class Options
{
(int Min, int Max) defaultNum = team switch
{
Team.Impostor => (1, 3),
Team.Neutral => (0, 5),
Team.Impostor => (1, 1),
Team.Neutral => (0, 4),
Team.Coven => (0, 0),
_ => (0, 15)
};
@@ -1246,7 +1246,7 @@ public static class Options
.SetColor(roleOptionTypeColor)
.SetHidden(tab == TabGroup.NeutralRoles);
options[1] = new IntegerOptionItem(id++, $"RoleSubCategoryLimitOptions.{roleOptionType}.Min", new(0, 15, 1), 1, tab)
options[1] = new IntegerOptionItem(id++, $"RoleSubCategoryLimitOptions.{roleOptionType}.Min", new(0, 15, 1), 0, tab)
.SetGameMode(CustomGameMode.Standard)
.SetValueFormat(OptionFormat.Players)
.SetColor(roleOptionTypeColor);
+2 -2
View File
@@ -62,7 +62,7 @@ internal static class PingTrackerUpdatePatch
};
Sb.Append(GameStates.InGame ? " - " : "\r\n");
Sb.Append($"<color={color}>{ping} {GetString("PingText")}</color>");
Sb.Append($"<color={color}>{GetString("PingText")}: {ping}</color>");
AppendSeparator();
Sb.Append(string.Format(GetString("Server"), Utils.GetRegionName()));
@@ -452,4 +452,4 @@ internal static class OptionsMenuBehaviourOpenPatch
return false;
}
}
}