From bd0b128f30aa4e4273623763169e3a5e30d7499e Mon Sep 17 00:00:00 2001
From: BrettMayson <brett@mayson.io>
Date: Wed, 15 Jan 2025 02:54:35 -0600
Subject: [PATCH] improve training smoke

---
 addons/training/CfgAmmo.hpp      | 14 +++++++-------
 addons/training/CfgMagazines.hpp | 21 ++++++++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/addons/training/CfgAmmo.hpp b/addons/training/CfgAmmo.hpp
index 8392bb6..9f95068 100644
--- a/addons/training/CfgAmmo.hpp
+++ b/addons/training/CfgAmmo.hpp
@@ -61,36 +61,36 @@ class CfgAmmo {
 
     class SmokeShell;
     class CLASS(SmokeShell_Training_Ammo): SmokeShell {
-        timeToLive = 2;
+        timeToLive = 5;
     };
 
     class SmokeShellRed;
     class CLASS(SmokeShellRed_Training_Ammo): SmokeShellRed {
-        timeToLive = 2;
+        timeToLive = 5;
     };
 
     class SmokeShellGreen;
     class CLASS(SmokeShellGreen_Training_Ammo): SmokeShellGreen {
-        timeToLive = 2;
+        timeToLive = 5;
     };
 
     class SmokeShellYellow;
     class CLASS(SmokeShellYellow_Training_Ammo): SmokeShellYellow {
-        timeToLive = 2;
+        timeToLive = 5;
     };
 
     class SmokeShellPurple;
     class CLASS(SmokeShellPurple_Training_Ammo): SmokeShellPurple {
-        timeToLive = 2;
+        timeToLive = 5;
     };
 
     class SmokeShellBlue;
     class CLASS(SmokeShellBlue_Training_Ammo): SmokeShellBlue {
-        timeToLive = 2;
+        timeToLive = 5;
     };
 
     class SmokeShellOrange;
     class CLASS(SmokeShellOrange_Training_Ammo): SmokeShellOrange {
-        timeToLive = 2;
+        timeToLive = 5;
     };
 };
diff --git a/addons/training/CfgMagazines.hpp b/addons/training/CfgMagazines.hpp
index c9910d0..407d176 100644
--- a/addons/training/CfgMagazines.hpp
+++ b/addons/training/CfgMagazines.hpp
@@ -43,43 +43,50 @@ class CfgMagazines {
 
     class SmokeShell;
     class CLASS(SmokeShell_Training): SmokeShell {
-        displayName = "M83 Smoke Shell (White, Training)";
+        displayName = "M83T Smoke Grenade (White)";
+        displayNameShort = "White (Training)";
         ammo = QCLASS(SmokeShell_Training_Ammo);
     };
 
     class SmokeShellGreen;
     class CLASS(SmokeShellGreen_Training): SmokeShellGreen {
-        displayName = "M18 Smoke Shell (Green, Training)";
+        displayName = "M18T Smoke Grenade (Green)";
+        displayNameShort = "Green (Training)";
         ammo = QCLASS(SmokeShellGreen_Training_Ammo);
     };
 
     class SmokeShellRed;
     class CLASS(SmokeShellRed_Training): SmokeShellRed {
-        displayName = "M18 Smoke Shell (Red, Training)";
+        displayName = "M18T Smoke Grenade (Red)";
+        displayNameShort = "Red (Training)";
         ammo = QCLASS(SmokeShellRed_Training_Ammo);
     };
 
     class SmokeShellYellow;
     class CLASS(SmokeShellYellow_Training): SmokeShellYellow {
-        displayName = "M18 Smoke Shell (Yellow, Training)";
+        displayName = "M18T Smoke Grenade (Yellow)";
+        displayNameShort = "Yellow (Training)";
         ammo = QCLASS(SmokeShellYellow_Training_Ammo);
     };
 
     class SmokeShellPurple;
     class CLASS(SmokeShellPurple_Training): SmokeShellPurple {
-        displayName = "M18 Smoke Shell (Purple, Training)";
+        displayName = "M18T Smoke Grenade (Purple)";
+        displayNameShort = "Purple (Training)";
         ammo = QCLASS(SmokeShellPurple_Training_Ammo);
     };
 
     class SmokeShellBlue;
     class CLASS(SmokeShellBlue_Training): SmokeShellBlue {
-        displayName = "M18 Smoke Shell (Blue, Training)";
+        displayName = "M18T Smoke Grenade (Blue)";
+        displayNameShort = "Blue (Training)";
         ammo = QCLASS(SmokeShellBlue_Training_Ammo);
     };
 
     class SmokeShellOrange;
     class CLASS(SmokeShellOrange_Training): SmokeShellOrange {
-        displayName = "M18 Smoke Shell (Orange, Training)";
+        displayName = "M18T Smoke Grenade (Orange)";
+        displayNameShort = "Orange (Training)";
         ammo = QCLASS(SmokeShellOrange_Training_Ammo);
     };
 };