Merge pull request #12 from oscar-wos/wall

feat: ZoneType.Wall

Author: oscar-wos

lang/en.json

@@ -14,6 +14,7 @@
   "zone.Hurt": "Hurt",
   "zone.Kill": "Kill",
   "zone.Teleport": "Teleport",
+  "zone.Wall":  "Wall",
   "menu.Add": "Add Zone",
   "menu.View": "View Zones",
   "menu.None": "No Zones",

src/AntiRush.cs

@@ -127,14 +127,14 @@ private bool PrintAction(CCSPlayerController controller, Zone zone)
 
     private void DoAction(CCSPlayerController controller, Zone zone)
     {
+        const PlayerButtons checkButtons = PlayerButtons.Forward | PlayerButtons.Back | PlayerButtons.Moveleft | PlayerButtons.Moveright;
+
         if (PrintAction(controller, zone))
             _playerData[controller].LastMessage = Server.CurrentTime;
 
         switch (zone.Type)
         {
             case ZoneType.Bounce:
-                const PlayerButtons checkButtons = PlayerButtons.Forward | PlayerButtons.Back | PlayerButtons.Moveleft | PlayerButtons.Moveright;
-
                 if ((controller.Buttons & checkButtons) != 0)
                     controller.PlayerPawn.Value?.Teleport(new Vector(_playerData[controller].LastPos[0], _playerData[controller].LastPos[1], _playerData[controller].LastPos[2]), null, new Vector(_playerData[controller].LastVel[0], _playerData[controller].LastVel[1], _playerData[controller].LastVel[2]));
 
@@ -156,6 +156,11 @@ private void DoAction(CCSPlayerController controller, Zone zone)
             case ZoneType.Teleport:
                 controller.PlayerPawn.Value!.Teleport(_playerData[controller].SpawnPos, controller.PlayerPawn.Value.EyeAngles, Vector.Zero);
                 return;
+
+            case ZoneType.Wall:
+                controller.PlayerPawn.Value?.Teleport(new Vector(_playerData[controller].LastPos[0], _playerData[controller].LastPos[1], _playerData[controller].LastPos[2]), null, Vector.Zero);
+
+                return;
         }
     }
 }

src/Config.cs

@@ -5,15 +5,15 @@ namespace AntiRush;
 
 public class AntiRushConfig : BasePluginConfig
 {
-    public override int Version { get; set; } = 6;
+    public override int Version { get; set; } = 7;
     [JsonPropertyName("Messages")] public string Messages { get; set; } = "simple";
     [JsonPropertyName("DrawZones")] public bool DrawZones { get; set; } = false;
     [JsonPropertyName("Warmup")] public bool Warmup { get; set; } = false;
     [JsonPropertyName("DisableOnBombPlant")] public bool DisableOnBombPlant { get; set; } = true;
     [JsonPropertyName("RestartOnLoad")] public bool RestartOnLoad { get; set; } = true;
     [JsonPropertyName("NoRushTime")] public int NoRushTime { get; set; } = 0;
     [JsonPropertyName("NoCampTime")] public int NoCampTime { get; set; } = 0;
-    [JsonPropertyName("RushZones")] public int[] RushZones { get; set; } = [0, 2, 3];
+    [JsonPropertyName("RushZones")] public int[] RushZones { get; set; } = [0, 2, 3, 4];
     [JsonPropertyName("CampZones")] public int[] CampZones { get; set; } = [1];
     [JsonPropertyName("Countdown")] public int[] Countdown { get; set; } = [60, 30, 15, 10, 5, 3, 2, 1];
     [JsonPropertyName("MinPlayers")] public int MinPlayers { get; set; } = 1;

src/Enums/ZoneType.cs

@@ -5,5 +5,6 @@ public enum ZoneType
     Bounce = 0,
     Hurt = 1,
     Kill = 2,
-    Teleport = 3
+    Teleport = 3,
+    Wall = 4
 }

src/Globals.cs

@@ -8,7 +8,7 @@ namespace AntiRush;
 public partial class AntiRush
 {
     public override string ModuleName => "AntiRush";
-    public override string ModuleVersion => "1.0.9";
+    public override string ModuleVersion => "1.0.10";
     public override string ModuleAuthor => "https://github.com/oscar-wos/AntiRush";
     public AntiRushConfig Config { get; set; } = new();
     public Menu.Menu Menu { get; } = new();

src/Menus.cs

@@ -116,7 +116,8 @@ private void BuildAddZoneMenu(CCSPlayerController controller)
                 new(Localizer["zone.Bounce"]) { Prefix = "<font color=\"#FFFF00\">", Suffix = "<font color=\"#FFFFFF\">" },
                 new(Localizer["zone.Hurt"]) { Prefix = "<font color=\"#FFA500\">", Suffix = "<font color=\"#FFFFFF\">" },
                 new(Localizer["zone.Kill"]) { Prefix = "<font color=\"#FF0000\">", Suffix = "<font color=\"#FFFFFF\">" },
-                new(Localizer["zone.Teleport"]) { Prefix = "<font color=\"#FF00FF\">", Suffix = "<font color=\"#FFFFFF\">" }
+                new(Localizer["zone.Teleport"]) { Prefix = "<font color=\"#FF00FF\">", Suffix = "<font color=\"#FFFFFF\">" },
+                new(Localizer["zone.Wall"]) { Prefix = "<font color=\"#0000FF\">", Suffix = "<font color=\"#FFFFFF\">" }
             };
 
             var teams = new List<MenuValue>
@@ -130,7 +131,9 @@ private void BuildAddZoneMenu(CCSPlayerController controller)
             addZoneMenu.AddItem(new MenuItem(MenuItemType.Choice, new MenuValue($"{Localizer["menu.Teams"]} "), teams, true));
             addZoneMenu.AddItem(new MenuItem(MenuItemType.Input, new MenuValue($"{Localizer["menu.Name"]} ")));
 
-            addZoneMenu.AddItem(_playerData[controller].AddZone!.Items[0].Option != 0
+            var delayCheck = _playerData[controller].AddZone!.Items[0].Option != 0 && _playerData[controller].AddZone!.Items[0].Option != 4;
+
+            addZoneMenu.AddItem(delayCheck
                 ? new MenuItem(MenuItemType.Input, new MenuValue($"{Localizer["menu.Delay"]} "), new MenuValue($" {Localizer["menu.Seconds"]}"))
                 : new MenuItem(MenuItemType.Spacer));
 

src/Zone.cs

@@ -32,6 +32,7 @@ public string ToString(IStringLocalizer localize)
             ZoneType.Hurt => $"{ChatColors.Orange}{localize["zone.Hurt"]}{ChatColors.White}",
             ZoneType.Kill => $"{ChatColors.Red}{localize["zone.Kill"]}{ChatColors.White}",
             ZoneType.Teleport => $"{ChatColors.Magenta}{localize["zone.Teleport"]}{ChatColors.White}",
+            ZoneType.Wall => $"{ChatColors.Blue}{localize["zone.Wall"]}{ChatColors.White}",
             _ => ""
         };
     }
@@ -92,6 +93,7 @@ private Color GetBeamColor()
             ZoneType.Hurt => Color.DarkOrange,
             ZoneType.Kill => Color.Red,
             ZoneType.Teleport => Color.Magenta,
+            ZoneType.Wall => Color.Blue,
             _ => Color.White
         };
     }