Added ExecutedCommands for Custom Modes

NockyCZ · Apr 27, 2024 · e1d2468 · e1d2468
1 parent 2692bc1
commit e1d2468
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 6 deletions.
diff --git a/Custom Modes Examples/Only_AK47.md b/Custom Modes Examples/Only_AK47.md
@@ -14,7 +14,8 @@
         "weapon_ak47"
     ],
     "SecondaryWeapons": [],
-    "Utilities": []
+    "Utilities": [],
+    "ExecuteCommands": []
 }
 ```
 
diff --git a/Custom Modes Examples/Only_awp.md b/Custom Modes Examples/Only_awp.md
@@ -16,6 +16,7 @@
     "SecondaryWeapons": [],
     "Utilities": [
         "weapon_flashbang"
-    ]
+    ],
+    "ExecuteCommands": []
 }
 ```
diff --git a/Custom Modes Examples/Only_pistols.md b/Custom Modes Examples/Only_pistols.md
@@ -24,7 +24,8 @@
     "Utilities": [
         "weapon_flashbang",
         "weapon_hegrenade
-    ]
+    ],
+    "ExecuteCommands": []
 }
 ```
 
diff --git a/Custom Modes Examples/Only_rifles.md b/Custom Modes Examples/Only_rifles.md
@@ -18,6 +18,7 @@
         "weapon_sg556"
     ],
     "SecondaryWeapons": [],
-    "Utilities": []
+    "Utilities": [],
+    "ExecuteCommands": []
 }
 ```
diff --git a/Custom Modes Examples/Only_shotguns.md b/Custom Modes Examples/Only_shotguns.md
@@ -17,6 +17,7 @@
         "weapon_xm1014"
     ],
     "SecondaryWeapons": [],
-    "Utilities": []
+    "Utilities": [],
+    "ExecuteCommands": []
 }
 ```
diff --git a/source/Common/Classes.cs b/source/Common/Classes.cs
@@ -16,6 +16,7 @@ public class ModeData
             public List<string>? PrimaryWeapons { get; set; }
             public List<string>? SecondaryWeapons { get; set; }
             public List<string>? Utilities { get; set; }
+            public List<string>? ExecuteCommands { get; set; }
         }
 
         public class DeathmatchPlayerData

diff --git a/source/Configs.cs b/source/Configs.cs
@@ -162,6 +162,7 @@ public class CustomModes
         Utilities = new List<string> {
                         "weapon_flashbang"
                     },
+        ExecuteCommands = new List<string>()
     };
 
     [JsonPropertyName("1")]
@@ -184,6 +185,8 @@ public class CustomModes
                         "weapon_usp_silencer", "weapon_p250", "weapon_glock",
                         "weapon_fiveseven", "weapon_hkp2000", "weapon_deagle"
                     },
+        Utilities = new List<string>(),
+        ExecuteCommands = new List<string>()
     };
 
     [JsonPropertyName("2")]
@@ -203,6 +206,7 @@ public class CustomModes
         Utilities = new List<string> {
                         "weapon_flashbang" , "weapon_healthshot"
                     },
+        ExecuteCommands = new List<string>()
     };
 
     [JsonPropertyName("3")]
@@ -221,6 +225,8 @@ public class CustomModes
                         "weapon_cz75a", "weapon_elite", "weapon_fiveseven",
                         "weapon_tec9", "weapon_hkp2000"
                     },
+        Utilities = new List<string>(),
+        ExecuteCommands = new List<string>()
     };
 
     [JsonPropertyName("4")]
@@ -242,6 +248,7 @@ public class CustomModes
         Utilities = new List<string> {
                         "weapon_hegrenade", "weapon_flashbang", "weapon_healthshot"
                     },
+        ExecuteCommands = new List<string>()
     };
 }
 

diff --git a/source/Deathmatch.cs b/source/Deathmatch.cs
@@ -170,7 +170,13 @@ public void SetupDeathmatchConfiguration(ModeData mode, bool isNewMode)
             Server.PrintToChatAll($"{Localizer["Chat.Prefix"]} {Localizer["Chat.NewModeStarted", mode.Name]}");
 
         Server.ExecuteCommand($"mp_free_armor {mode.Armor};mp_damage_headshot_only {mode.OnlyHS};mp_ct_default_primary \"\";mp_t_default_primary \"\";mp_ct_default_secondary \"\";mp_t_default_secondary \"\"");
-
+
+        if (mode.ExecuteCommands != null && mode.ExecuteCommands.Count > 0)
+        {
+            foreach (var cmd in mode.ExecuteCommands)
+                Server.ExecuteCommand(cmd);
+        }
+
         foreach (var p in Utilities.GetPlayers().Where(p => p != null && p.IsValid && p.PawnIsAlive))
         {
             p.RemoveWeapons();