Added pistols round

Author: Ravid-A

Modules/Config.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using CounterStrikeSharp.API.Modules.Utils;
 using MySqlConnector;
 
 using static RetakesAllocator.Modules.Core;
@@ -10,6 +11,7 @@ public class Config
 { 
     public ConnectionConfig DbConnection { get; init; } = null!;
     public PrefixConfig Prefix { get; init; } = null!;
+    public PistolRoundConfig PistolRound { get; init; } = null!;
 
     public bool GiveArmor {get; init;} = true;
     public string[] triggerWords {get; init;} = { "guns", "gun", "weapon", "weapons"};
@@ -19,8 +21,10 @@ public Config()
     {
         DbConnection = new ConnectionConfig();
         Prefix = new PrefixConfig();
+        PistolRound = new PistolRoundConfig();
         GiveArmor = true;
         triggerWords = new string[] { "guns", "gun", "weapon", "weapons"};
+        AddSkipOption = true;
     }
 
     public bool IsValid()
@@ -58,6 +62,18 @@ public class PrefixConfig
     public string PrefixCon { get; set; } = "[RetakesAllocator]";
 }
 
+public class PistolRoundConfig
+{
+    public int RoundAmount { get; init; } = 2;
+    public string weapon_t { get; init; } = "weapon_glock";
+    public string weapon_ct { get; init; } = "weapon_usp_silencer";
+
+    public string GetWeaponByTeam(CsTeam team)
+    {
+        return (team == CsTeam.Terrorist) ? weapon_t : weapon_ct;
+    }
+}
+
 public static class Configs
 {
     public const string ConfigDirectory = "configs";

Modules/Core.cs

@@ -13,7 +13,7 @@
 
 namespace RetakesAllocator.Modules;
 
-[MinimumApiVersion(154)]
+[MinimumApiVersion(202)]
 public class Core : BasePlugin
 {
     public static Core Plugin = null!;
@@ -27,6 +27,7 @@ public class Core : BasePlugin
 
     public static Database Db = null!;
     public static List<Player> Players = new();
+    public static int RoundsCounter = 0;
 
     public override void Load(bool hotReload)
     {

Modules/Handlers/Events.cs

@@ -4,29 +4,49 @@
 using static RetakesAllocator.Modules.Core;
 using static RetakesAllocator.Modules.Utils;
 using static RetakesAllocator.Modules.Models.Player;
+using CounterStrikeSharp.API;
 
 namespace RetakesAllocator.Modules.Handlers;
 
 internal static class Events
 {
+    static bool IgnoreRoundEnd = false;
+
     public static void RegisterEvents()
     {
         Plugin.RegisterEventHandler<EventRoundPrestart>(OnRoundPreStart);
+        Plugin.RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
         Plugin.RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
     }
 
     private static HookResult OnRoundPreStart(EventRoundPrestart @event, GameEventInfo info)
     {
         if (GetGameRules().WarmupPeriod)
         {
+            IgnoreRoundEnd = true;
             return HookResult.Continue;
         }
 
+        // TODO: Add Vote Logic
+
         SetupPlayers(Players);
 
         return HookResult.Continue;
     }
 
+    private static HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info)
+    {
+        if (GetGameRules().WarmupPeriod || IgnoreRoundEnd)
+        {
+            IgnoreRoundEnd = false;
+            return HookResult.Continue;
+        }
+        
+        RoundsCounter++;
+
+        return HookResult.Continue;
+    }
+
     private static HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
     {
         if(GetGameRules().WarmupPeriod)

Modules/Handlers/Listeners.cs

@@ -24,6 +24,7 @@ public static void RegisterListeners()
 
     private static void OnMapStart(string map_name)
     {
+        RoundsCounter = 0;
         Players.Clear();
         Utilities.GetPlayers().ForEach(AddPlayerToList);
     }

Modules/Models/Player.cs

@@ -94,6 +94,12 @@ public void CreateSpawnDelay()
 
     private void Timer_GiveWeapons()
     {
+        if(RoundsCounter < Core.Config.PistolRound.RoundAmount)
+        {
+            WeaponsAllocator.AllocatePistolRound();
+            return;
+        }
+
         WeaponsAllocator.Allocate();
     }
 }

Modules/Utils.cs

@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
+using CounterStrikeSharp.API.Modules.Utils;
 using static RetakesAllocator.Modules.Core;
 using static RetakesAllocator.Modules.Database;
 using Player = RetakesAllocator.Modules.Models.Player;
@@ -17,6 +18,11 @@ public static void PrintToChat(CCSPlayerController controller, string msg)
         controller.PrintToChat(msg);
     }
 
+    public static void PrintToChatAll(string msg)
+    {
+        Server.PrintToChatAll(msg);
+    }
+
     public static void PrintToServer(string msg, ConsoleColor color = ConsoleColor.Cyan)
     {
         Console.ForegroundColor = color;
@@ -85,4 +91,23 @@ public static void RemovePlayerFromList(CCSPlayerController player)
 
         Players.Remove(playerObj);
     }
+
+    public static int GetRoundsAmount()
+    {
+        IEnumerable<CTeam> team = Utilities.FindAllEntitiesByDesignerName<CTeam>("cs_team");
+
+        if (team.Count() == 0)
+        {
+            return 0;
+        }
+
+        int rounds = 0;
+
+        foreach (var t in team)
+        {
+            rounds = t.Score;
+        }
+
+        return rounds;
+    }
 }

Modules/Weapons/Allocator.cs

@@ -151,6 +151,38 @@ public void Allocate()
             GiveArmor();
     }
 
+    public void AllocatePistolRound()
+    {
+        if (_player == null || cCSPlayerController == null || !_player.player.IsValid)
+        {
+            return;
+        }
+
+        if (!cCSPlayerController.PawnIsAlive)
+        {
+            return;
+        }
+
+        if (cCSPlayerController.Team < CsTeam.Terrorist || cCSPlayerController.Team > CsTeam.CounterTerrorist)
+        {
+            return;
+        }
+
+
+        string secondary = Core.Config.PistolRound.GetWeaponByTeam(cCSPlayerController.Team);
+
+        cCSPlayerController.GiveNamedItem(secondary);
+        cCSPlayerController.GiveNamedItem(CsItem.Knife);
+
+        if (cCSPlayerController.Team == CsTeam.CounterTerrorist)
+        {
+           GiveCtEquipment();
+        }
+
+        if(Core.Config.GiveArmor)
+            cCSPlayerController.GiveNamedItem(CsItem.Kevlar); 
+    }
+
     private CsItem SelectGrenade()
     {
         var grenade = CsItem.HEGrenade;
@@ -178,8 +210,6 @@ private CsItem SelectGrenade()
 
     private void GiveCtEquipment()
     {
-        cCSPlayerController.GiveNamedItem(CsItem.KevlarHelmet); 
-
         if (
             cCSPlayerController.Team == CsTeam.CounterTerrorist
             && cCSPlayerController.PlayerPawn.IsValid

RetakesAllocator.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>RetakesAllocator</RootNamespace>
@@ -14,6 +14,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.168" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.202" />
   </ItemGroup>
 </Project>