Misc. changes

lang/Jailbreak.English/LastRequest/CoinflipLocale.cs

@@ -9,7 +9,7 @@ public class CoinflipLocale : LastRequestLocale, ILRCFLocale {
   public IView FailedToChooseInTime(bool choice) {
     return new SimpleView {
       PREFIX,
-      "You failed to choose in time, defaulting to " + ChatColors.Green,
+      "You failed to choose in time, defaulting to" + ChatColors.Green,
       choice ? "Heads" : "Tails"
     };
   }
@@ -18,23 +18,15 @@ public IView GuardChose(CCSPlayerController guard, bool choice) {
     return new SimpleView {
       PREFIX,
       guard,
-      " chose " + ChatColors.Green,
+      "chose" + ChatColors.Green,
       choice ? "Heads" : "Tails",
       ChatColors.Default + ", flipping..."
     };
   }
 
   public IView CoinLandsOn(bool heads) {
     return new SimpleView {
-      PREFIX, "The coin lands on " + ChatColors.Green, heads ? "Heads" : "Tails"
-    };
-  }
-
-  public IView FailedToChooseInTime(string choice) {
-    return new SimpleView {
-      PREFIX,
-      "You failed to choose in time, defaulting to " + ChatColors.Green,
-      choice
+      PREFIX, "The coin lands on" + ChatColors.Green, heads ? "Heads" : "Tails"
     };
   }
 }

lang/Jailbreak.English/LastRequest/LastRequestLocale.cs

@@ -52,9 +52,9 @@ public IView InformLastRequest(AbstractLastRequest lr) {
     return new SimpleView {
       PREFIX,
       lr.Prisoner,
-      "is preparing a",
-      lr.Type.ToFriendlyString(),
-      "Last Request against",
+      ChatColors.Grey + "is preparing a",
+      ChatColors.White + lr.Type.ToFriendlyString(),
+      ChatColors.Grey + "Last Request against",
       lr.Guard
     };
   }

lang/Jailbreak.English/SpecialDay/SoloDayLocale.cs

@@ -1,5 +1,6 @@
 using Jailbreak.Formatting.Base;
 using Jailbreak.Formatting.Views.SpecialDay;
+using Jailbreak.Public.Extensions;
 using Jailbreak.Public.Utils;
 
 namespace Jailbreak.English.SpecialDay;
@@ -27,7 +28,9 @@ public virtual IView BeginsIn(int seconds) {
   }
 
   public IView GenerateStartMessage() {
-    var result = new SimpleView { PREFIX, { "Today is a", Name, "day!" } };
+    var result = new SimpleView {
+      PREFIX, { "Today is a" + (Name[0].IsVowel() ? "n" : ""), Name, "day!" }
+    };
 
     if (description.Length == 0) return result;
 

lang/Jailbreak.English/SpecialDay/SpeedrunDayLocale.cs

@@ -69,7 +69,7 @@ public IView RunnerAssigned(CCSPlayerController player) {
     };
   }
 
-  public IView RunnerReassigned(CCSPlayerController player) {
+  public IView RunnerLeftAndReassigned(CCSPlayerController player) {
     return new SimpleView {
       PREFIX,
       "The original speedrunner left, so",
@@ -78,6 +78,15 @@ public IView RunnerReassigned(CCSPlayerController player) {
     };
   }
 
+  public IView RunnerAFKAndReassigned(CCSPlayerController player) {
+    return new SimpleView {
+      PREFIX,
+      "The original speedrunner isn't moving, so",
+      player,
+      "is now the speedrunner!"
+    };
+  }
+
   public IView PlayerTime(CCSPlayerController player, int position,
     float time) {
     var place = position switch {

lang/Jailbreak.English/SpecialDay/TeamDayLocale.cs

@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API.Modules.Utils;
 using Jailbreak.Formatting.Base;
 using Jailbreak.Formatting.Views.SpecialDay;
+using Jailbreak.Public.Extensions;
 using Jailbreak.Public.Utils;
 
 namespace Jailbreak.English.SpecialDay;
@@ -29,7 +30,9 @@ public virtual IView BeginsIn(int seconds) {
   }
 
   public IView GenerateStartMessage() {
-    var result = new SimpleView { PREFIX, { "Today is a", Name, "day!" } };
+    var result = new SimpleView {
+      PREFIX, { "Today is a" + (Name[0].IsVowel() ? "n" : ""), Name, "day!" }
+    };
 
     if (description.Length == 0) return result;
 

mod/Jailbreak.Debug/Subcommands/DebugZone.cs

@@ -48,7 +48,7 @@ public override void OnCommand(CCSPlayerController? executor,
       specifiedType = success;
     }
 
-    string map = Server.MapName;
+    var map = Server.MapName;
     switch (info.GetArg(1).ToLower()) {
       case "finish":
       case "done":
@@ -190,8 +190,7 @@ await zoneManager.PushZoneWithID(innerZone, innerPair.Value.Item2,
         info.ReplyToCommand("Removing " + toRemove.Count
           + " auto-generated zones");
         Server.NextFrameAsync(async () => {
-          foreach (var z in toRemove)
-            await zoneManager.DeleteZone(z.Id, map);
+          foreach (var z in toRemove) await zoneManager.DeleteZone(z.Id, map);
         });
         return;
     }

mod/Jailbreak.SpecialDay/SpecialDayCommand.cs

@@ -6,7 +6,6 @@
 using CounterStrikeSharp.API.Modules.Cvars;
 using CounterStrikeSharp.API.Modules.Menu;
 using Jailbreak.Formatting.Extensions;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Formatting.Views.Warden;
 using Jailbreak.Public.Behaviors;

mod/Jailbreak.SpecialDay/SpecialDays/AbstractArmoryRestrictedDay.cs

@@ -31,7 +31,9 @@ public virtual IView ArmoryReminder
 
   override protected IZone GetZone() {
     var manager = provider.GetRequiredService<IZoneManager>();
-    var zones   = manager.GetZones(Server.MapName, ZoneType.ARMORY).GetAwaiter().GetResult();
+    var zones = manager.GetZones(Server.MapName, ZoneType.ARMORY)
+     .GetAwaiter()
+     .GetResult();
     if (zones.Count > 0) return new MultiZoneWrapper(zones);
 
     var bounds = new DistanceZone(

mod/Jailbreak.SpecialDay/SpecialDays/AbstractCellRestrictedDay.cs

@@ -30,7 +30,9 @@ public virtual IView CellReminder
 
   override protected IZone GetZone() {
     var manager = provider.GetRequiredService<IZoneManager>();
-    var zones   = manager.GetZones(Server.MapName, ZoneType.CELL).GetAwaiter().GetResult();
+    var zones = manager.GetZones(Server.MapName, ZoneType.CELL)
+     .GetAwaiter()
+     .GetResult();
     if (zones.Count > 0) return new MultiZoneWrapper(zones);
 
     var bounds = new DistanceZone(

mod/Jailbreak.SpecialDay/SpecialDays/CustomDay.cs

@@ -1,6 +1,5 @@
 using CounterStrikeSharp.API.Core;
 using Jailbreak.English.SpecialDay;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Mod.SpecialDay;
 using Jailbreak.Public.Mod.SpecialDay.Enums;

mod/Jailbreak.SpecialDay/SpecialDays/FFADay.cs

@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API.Core;
 using Jailbreak.English.SpecialDay;
 using Jailbreak.Formatting.Extensions;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Mod.SpecialDay;
 using Jailbreak.Public.Mod.SpecialDay.Enums;

mod/Jailbreak.SpecialDay/SpecialDays/GunGameDay.cs

@@ -3,7 +3,6 @@
 using CounterStrikeSharp.API.Modules.Utils;
 using Jailbreak.English.SpecialDay;
 using Jailbreak.Formatting.Extensions;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Extensions;
 using Jailbreak.Public.Mod.SpecialDay;
@@ -115,7 +114,8 @@ private HookResult OnDeath(EventPlayerDeath @event, GameEventInfo info) {
     int playerIndex;
     if (!progressions.TryGetValue(player.Slot, out playerIndex))
       playerIndex = 0;
-    if (attacker == null || !attacker.IsValid || attacker.Slot == player.Slot) {
+    if (attacker == null || !attacker.IsValid) return HookResult.Continue;
+    if (attacker.Slot == player.Slot) {
       if (playerIndex <= 0) return HookResult.Continue;
       playerIndex--;
       msg.DemotedDueToSuicide.ToChat(player);
@@ -167,7 +167,7 @@ private HookResult OnDeath(EventPlayerDeath @event, GameEventInfo info) {
       msg.PlayerOnLastPromotion(attacker).ToAllChat();
 
     msg.PromotedTo(weaponProgression[attackerProgress].GetFriendlyWeaponName(),
-        weaponProgression.Count - attackerProgress - 1)
+        weaponProgression.Count - attackerProgress)
      .ToChat(attacker);
 
     attacker.RemoveWeapons();

mod/Jailbreak.SpecialDay/SpecialDays/HideAndSeekDay.cs

@@ -3,7 +3,6 @@
 using Jailbreak.English.SpecialDay;
 using Jailbreak.Formatting.Base;
 using Jailbreak.Formatting.Extensions;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Extensions;
 using Jailbreak.Public.Mod.SpecialDay;

mod/Jailbreak.SpecialDay/SpecialDays/ISpecialDayMessageProvider.cs

@@ -1,4 +1,3 @@
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 
 namespace Jailbreak.SpecialDay.SpecialDays;

mod/Jailbreak.SpecialDay/SpecialDays/InfectionDay.cs

@@ -4,7 +4,6 @@
 using CounterStrikeSharp.API.Modules.Utils;
 using Jailbreak.English.SpecialDay;
 using Jailbreak.Formatting.Extensions;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Extensions;
 using Jailbreak.Public.Mod.SpecialDay;

mod/Jailbreak.SpecialDay/SpecialDays/NoScopeDay.cs

@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using Jailbreak.English.SpecialDay;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Extensions;
 using Jailbreak.Public.Mod.SpecialDay;

mod/Jailbreak.SpecialDay/SpecialDays/OneInTheChamberDay.cs

@@ -1,6 +1,5 @@
 using CounterStrikeSharp.API.Core;
 using Jailbreak.English.SpecialDay;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Extensions;
 using Jailbreak.Public.Mod.SpecialDay;

mod/Jailbreak.SpecialDay/SpecialDays/SpeedrunDay.cs

@@ -168,7 +168,7 @@ public override void Setup() {
         }
 
         speedrunner.SetColor(Color.DodgerBlue);
-        msg.RunnerReassigned(speedrunner).ToAllChat();
+        msg.RunnerLeftAndReassigned(speedrunner).ToAllChat();
         msg.YouAreRunner(CvInitialSpeedrunTime.Value).ToChat(speedrunner);
       }
 
@@ -254,6 +254,49 @@ private ActivePlayerTrail<BeamTrailSegment> createFirstTrail(
       var tps              = 1 / trail.UpdateRate;
       var didntMoveSeconds = (int)Math.Ceiling(trail.DidntMoveTicks / tps);
       var thresholdTicks   = (int)Math.Ceiling(tps * 3);
+      if (start == null) {
+        panic("start is null");
+        return;
+      }
+
+      if (start.DistanceSquared(speedrunner?.Pawn.Value?.AbsOrigin!) < 100) {
+        if (trail.DidntMoveTicks <= tps * 10) return;
+        // If the player is afk, we need to pick the closet player
+        // that has moved to continue the run
+        var end = trail.GetEndSegment()?.GetEnd() ?? start;
+        if (end == null) {
+          panic("Speedrunner is invalid, and we cannot find the start");
+          return;
+        }
+
+        var furthest = PlayerUtil.GetAlive()
+         .Where(p => p.Pawn.IsValid && p.Pawn.Value != null)
+         .Where(p => p.Pawn.Value!.IsValid && p.Pawn.Value.AbsOrigin != null)
+         .Where(p
+            => p.Pawn.Value!.AbsOrigin!.DistanceSquared(speedrunner?.Pawn.Value!
+             .AbsOrigin!) > 100) // Ensure they have moved
+         .MinBy(p => p.Pawn.Value!.AbsOrigin!.DistanceSquared(end));
+
+        if (furthest == null) {
+          panic("Speedrunner is invalid, and we cannot find a new one");
+          return;
+        }
+
+        speedrunner = furthest;
+        foreach (var p in PlayerUtil.GetAlive()) {
+          if (p.Slot == speedrunner.Slot) continue;
+          p.Teleport(speedrunner);
+        }
+
+        furthest.Pawn.Value?.Teleport(end);
+        furthest.SetColor(Color.DodgerBlue);
+        msg.RunnerAFKAndReassigned(furthest).ToAllChat();
+        msg.YouAreRunner(RoundUtil.GetTimeRemaining()).ToChat(furthest);
+        trail.StartTracking(furthest);
+        trail.DidntMoveTicks = 0;
+        return;
+      }
+
       if (trail.DidntMoveTicks < thresholdTicks) return;
       if (trail.DidntMoveTicks == thresholdTicks)
         msg.StayStillToSpeedup.ToChat(trail.Player);
@@ -284,7 +327,7 @@ private ActivePlayerTrail<BeamTrailSegment> createFirstTrail(
       speedrunner = nearest;
       nearest.Pawn.Value?.Teleport(end);
       nearest.SetColor(Color.DodgerBlue);
-      msg.RunnerReassigned(nearest).ToAllChat();
+      msg.RunnerLeftAndReassigned(nearest).ToAllChat();
       msg.YouAreRunner(RoundUtil.GetTimeRemaining()).ToChat(nearest);
       trail.StartTracking(nearest);
     };

mod/Jailbreak.SpecialDay/SpecialDays/TeleportDay.cs

@@ -1,6 +1,5 @@
 using CounterStrikeSharp.API.Core;
 using Jailbreak.English.SpecialDay;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Extensions;
 using Jailbreak.Public.Mod.SpecialDay;

mod/Jailbreak.SpecialDay/SpecialDays/WardayDay.cs

@@ -2,7 +2,6 @@
 using CounterStrikeSharp.API.Modules.Utils;
 using Jailbreak.English.SpecialDay;
 using Jailbreak.Formatting.Extensions;
-using Jailbreak.Formatting.Views;
 using Jailbreak.Formatting.Views.SpecialDay;
 using Jailbreak.Public.Extensions;
 using Jailbreak.Public.Mod.SpecialDay;

mod/Jailbreak.Trail/ActivePlayerTrail.cs

@@ -23,7 +23,7 @@ public ActivePlayerTrail(BasePlugin plugin, CCSPlayerController player,
   }
 
   public float UpdateRate { get; protected set; }
-  public int DidntMoveTicks { get; protected set; }
+  public int DidntMoveTicks { get; set; }
 
   public CCSPlayerController? Player { get; protected set; }
   public event Action OnPlayerInvalid = () => { };
@@ -51,6 +51,8 @@ virtual protected void Tick() {
     }
 
     DidntMoveTicks = 0;
+    if (dist < 5000) return;
+
     AddTrailPoint(pos);
   }
 

mod/Jailbreak.Warden/Global/WardenBehavior.cs

@@ -374,7 +374,6 @@ public HookResult OnRoundStart(EventRoundStart ev, GameEventInfo info) {
     firstWarden    = true;
     preWardenStats = null;
 
-
     return HookResult.Continue;
   }
 

mod/Jailbreak.Warden/Selection/WardenSelectionBehavior.cs

@@ -8,6 +8,7 @@
 using Jailbreak.Public.Behaviors;
 using Jailbreak.Public.Generic;
 using Jailbreak.Public.Mod.Warden;
+using Jailbreak.Public.Utils;
 using Microsoft.Extensions.Logging;
 
 namespace Jailbreak.Warden.Selection;
@@ -78,6 +79,7 @@ public bool InQueue(CCSPlayerController player) {
 
   [GameEventHandler]
   public HookResult OnRoundStart(EventRoundStart ev, GameEventInfo info) {
+    if (RoundUtil.IsWarmup()) return HookResult.Continue;
     //	Enable the warden queue
     queueInactive = false;
 

public/Jailbreak.Formatting/Views/LastRequest/ILRLocale.cs

@@ -16,7 +16,10 @@ public interface ILRLocale {
   public IView LastRequestNotEnabled();
   public IView InvalidLastRequest(string query);
   public IView InformLastRequest(AbstractLastRequest lr);
+
+  [Obsolete("Unused, use InformLastRequest instead")]
   public IView AnnounceLastRequest(AbstractLastRequest lr);
+
   public IView LastRequestDecided(AbstractLastRequest lr, LRResult result);
   public IView CannotLR(string reason);
   public IView CannotLR(CCSPlayerController player, string reason);

public/Jailbreak.Formatting/Views/SpecialDay/ISpeedDayLocale.cs

@@ -12,7 +12,8 @@ public interface ISpeedDayLocale : ISDInstanceLocale {
 
   public IView YouAreRunner(int seconds);
 
-  public IView RunnerReassigned(CCSPlayerController player);
+  public IView RunnerLeftAndReassigned(CCSPlayerController player);
+  public IView RunnerAFKAndReassigned(CCSPlayerController player);
 
   public IView RuntimeLeft(int seconds);