Add support for un-implemented LRs

mod/Jailbreak.Debug/Subcommands/LastRequest.cs

@@ -26,7 +26,8 @@ public LastRequest(IServiceProvider services, BasePlugin plugin) : base(services
         this.plugin = plugin;
         manager = services.GetRequiredService<ILastRequestManager>();
         playerSelector = new LastRequestPlayerSelector(manager, true);
-        menuSelector = new LastRequestMenuSelector((type) => "css_debug lastrequest " + type);
+        menuSelector = new LastRequestMenuSelector(services.GetRequiredService<ILastRequestFactory>(),
+            (type) => "css_debug lastrequest " + type);
         _messages = services.GetRequiredService<ILastRequestMessages>();
         _generic = services.GetRequiredService<IGenericCommandNotifications>();
     }

mod/Jailbreak.LastRequest/LastRequestCommand.cs

@@ -22,21 +22,23 @@ public class LastRequestCommand : IPluginBehavior
     private BasePlugin plugin;
     private ILastRequestMessages _messages;
     private IGenericCommandNotifications _generic;
+    private ILastRequestFactory _factory;
 
     // css_lr <player> <LRType>
     public LastRequestCommand(ILastRequestManager manager, ILastRequestMessages messages,
-        IGenericCommandNotifications generic)
+        IGenericCommandNotifications generic, ILastRequestFactory factory)
     {
         _lrManager = manager;
         _messages = messages;
         _generic = generic;
+        _factory = factory;
     }
 
     public void Start(BasePlugin plugin)
     {
         this.plugin = plugin;
         playerSelector = new LastRequestPlayerSelector(_lrManager);
-        menuSelector = new LastRequestMenuSelector();
+        menuSelector = new LastRequestMenuSelector(_factory);
     }
 
 

mod/Jailbreak.LastRequest/LastRequestFactory.cs

@@ -29,9 +29,22 @@ public AbstractLastRequest CreateLastRequest(CCSPlayerController prisoner, CCSPl
             LRType.NoScope => new NoScope(plugin, manager, prisoner, guard),
             LRType.RockPaperScissors => new RockPaperScissors(plugin, manager, prisoner, guard),
             LRType.Coinflip => new Coinflip(plugin, manager, prisoner, guard),
-            LRType.ShotForShot => new ShotForShot(plugin, manager, prisoner, guard),
-            LRType.MagForMag => new MagForMag(plugin, manager, prisoner, guard),
+            // LRType.ShotForShot => new ShotForShot(plugin, manager, prisoner, guard),
+            // LRType.MagForMag => new MagForMag(plugin, manager, prisoner, guard),
             _ => throw new ArgumentException("Invalid last request type: " + type, nameof(type))
         };
     }
+
+    public bool IsValidType(LRType type)
+    {
+        return type switch
+        {
+            LRType.KnifeFight => true,
+            LRType.GunToss => true,
+            LRType.NoScope => true,
+            LRType.RockPaperScissors => true,
+            LRType.Coinflip => true,
+            _ => false
+        };
+    }
 }

mod/Jailbreak.LastRequest/LastRequestMenuSelector.cs

@@ -10,17 +10,22 @@ public class LastRequestMenuSelector
 {
     private readonly CenterHtmlMenu menu;
     private Func<LRType, string> command;
+    private readonly ILastRequestFactory factory;
 
-    public LastRequestMenuSelector() : this((lr) => "css_lr " + ((int)lr))
+    public LastRequestMenuSelector(ILastRequestFactory factory) : this(factory, (lr) => "css_lr " + ((int)lr))
     {
+        this.factory = factory;
     }
 
-    public LastRequestMenuSelector(Func<LRType, string> command)
+    public LastRequestMenuSelector(ILastRequestFactory factory, Func<LRType, string> command)
     {
+        this.factory = factory;
         this.command = command;
         menu = new CenterHtmlMenu("css_lr [LR] [Player]");
         foreach (LRType lr in Enum.GetValues(typeof(LRType)))
         {
+            if (!factory.IsValidType(lr))
+                continue;
             menu.AddMenuOption(lr.ToFriendlyString(), (p, o) => OnSelectLR(p, lr));
         }
     }

public/Jailbreak.Public/Mod/LastRequest/Enums/LRType.cs

@@ -26,6 +26,9 @@ public static string ToFriendlyString(this LRType type)
             LRType.KnifeFight => "Knife Fight",
             LRType.NoScope => "No Scope",
             LRType.Coinflip => "Coinflip",
+            LRType.ShotForShot => "Shot For Shot",
+            LRType.MagForMag => "Mag For Mag",
+            LRType.Race => "Race",
             _ => "Unknown"
         };
     }

public/Jailbreak.Public/Mod/LastRequest/ILastRequestFactory.cs

@@ -7,4 +7,5 @@ namespace Jailbreak.Public.Mod.LastRequest;
 public interface ILastRequestFactory : IPluginBehavior
 {
     AbstractLastRequest CreateLastRequest(CCSPlayerController prisoner, CCSPlayerController guard, LRType type);
+    bool IsValidType(LRType type);
 }