diff --git a/.editorconfig b/.editorconfig index e994e4c4e..ab1ba3a47 100644 --- a/.editorconfig +++ b/.editorconfig @@ -55,13 +55,13 @@ csharp_style_var_elsewhere = false:none # ReSharper properties resharper_align_linq_query = false -resharper_align_multiline_argument = true +resharper_align_multiline_argument = false resharper_align_multiline_binary_patterns = true -resharper_align_multiline_calls_chain = true +resharper_align_multiline_calls_chain = false resharper_align_multiline_extends_list = true -resharper_align_multiline_parameter = true -resharper_align_multiline_type_parameter_constraints = true -resharper_align_multiline_type_parameter_list = true +resharper_align_multiline_parameter = false +resharper_align_multiline_type_parameter_constraints = false +resharper_align_multiline_type_parameter_list = false resharper_align_multiple_declaration = true resharper_align_tuple_components = true resharper_braces_for_dowhile = required_for_multiline diff --git a/GameMode/MoveAndStop.cs b/GameMode/MoveAndStop.cs index c40bed7eb..c53c98336 100644 --- a/GameMode/MoveAndStop.cs +++ b/GameMode/MoveAndStop.cs @@ -170,10 +170,11 @@ internal static class MoveAndStop { if (Options.CurrentGameMode == CustomGameMode.AllInOne) return 60; bool tutorial = EnableTutorial.GetBool() && !HasPlayed.Contains(pc.FriendCode); - + int time = 37; if (tutorial) time += 10; - if (Main.CurrentMap == MapNames.Airship) time += 10; + if (Main.CurrentMap is MapNames.Airship or MapNames.Fungle) time += 5; + if (Main.CurrentMap == MapNames.Airship) time += 7; return time; } @@ -282,7 +283,7 @@ internal static class MoveAndStop int startingGreenTime = StartingGreenTime(pc); Vector2 pos = pc.Pos(); - Counter[] counters = new[] {'⬅', '⇅', '➡'}.Select(x => new Counter(startingGreenTime, RandomRedTime(x), now, x, false, RandomRedTime, RandomGreenTime)).ToArray(); + Counter[] counters = new[] { '⬅', '⇅', '➡' }.Select(x => new Counter(startingGreenTime, RandomRedTime(x), now, x, false, RandomRedTime, RandomGreenTime)).ToArray(); AllPlayerTimers[pc.PlayerId] = new(counters, pos.x, pos.y, PlayerLives.GetInt()); float limit; @@ -293,10 +294,7 @@ internal static class MoveAndStop ? 2f // If the player has a joystick, the game is a lot harder : 0.5f; // On PC, you have WASD, you can't mess up } - catch - { - limit = 2f; - } + catch { limit = 2f; } FixedUpdatePatch.Limit[pc.PlayerId] = limit; } @@ -311,10 +309,7 @@ internal static class MoveAndStop rank += Main.PlayerStates.Values.Where(x => x.TaskState.CompletedTasksCount == ms).ToList().IndexOf(Main.PlayerStates[playerId]); return rank; } - catch - { - return Main.AllPlayerControls.Length; - } + catch { return Main.AllPlayerControls.Length; } } public static string GetSuffixText(PlayerControl pc) diff --git a/GameMode/RoomRush.cs b/GameMode/RoomRush.cs index 64f7fa2bb..e906d5ed2 100644 --- a/GameMode/RoomRush.cs +++ b/GameMode/RoomRush.cs @@ -31,6 +31,8 @@ public static class RoomRush private static int TimeLeft; private static HashSet DonePlayers = []; + private static long RoundStartTS; + public static bool GameGoing; private static DateTime GameStartDateTime; @@ -282,6 +284,7 @@ public static class RoomRush _ => throw new ArgumentOutOfRangeException(map.ToString(), "Invalid map") }; + RoundStartTS = Utils.TimeStamp; DonePlayers.Clear(); RoomGoal = AllRooms.Without(previous).RandomElement(); Vector2 goalPos = Map.Positions.GetValueOrDefault(RoomGoal, RoomGoal.GetRoomClass().transform.position); @@ -321,15 +324,6 @@ public static class RoomRush if (DisplayArrowToRoom.GetBool()) Main.AllPlayerControls.Do(x => LocateArrow.Add(x.PlayerId, goalPos)); Utils.NotifyRoles(); - - Main.AllPlayerSpeed[PlayerControl.LocalPlayer.PlayerId] = Main.MinSpeed; - PlayerControl.LocalPlayer.SyncSettings(); - - LateTask.New(() => - { - Main.AllPlayerSpeed[PlayerControl.LocalPlayer.PlayerId] = speed; - PlayerControl.LocalPlayer.SyncSettings(); - }, Utils.CalculatePingDelay()); } private static PlainShipRoom GetRoomClass(this SystemTypes systemTypes) @@ -341,6 +335,8 @@ public static class RoomRush { if (!GameGoing || Main.HasJustStarted || seer == null) return string.Empty; + if (seer.IsHost() && RoundStartTS == Utils.TimeStamp) return "...."; + StringBuilder sb = new(); bool dead = !seer.IsAlive(); bool done = dead || DonePlayers.Contains(seer.PlayerId); diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json index ea8e69d24..45fe07b44 100644 --- a/Resources/Lang/en_US.json +++ b/Resources/Lang/en_US.json @@ -4758,6 +4758,7 @@ "Negotiator.LowVision": "Low vision", "Negotiator.LowSpeed": "Low speed", "Negotiator.MinVotingTimeLeftToNegotiate": "Minimum Voting Time Left to Negotiate", + "Negotiator.TargetPickSuccess": "You've chosen to {0}", "Negotiator.Type.Suicide": "Suicide", "Negotiator.Type.HarmfulAddon": "Receive a Harmful Add-on", "Negotiator.Type.LowVision": "Get Permanent low vision",