Grenades - Add CTS 7290 9-bang flashbang (#6856)

* Add CTS 7290 9-bang flashbang grenade * Add ui icon * Add proper 9bang configuration Co-Authored-By: dedmen <[email protected]> * Move banana and replace with text * Rotate 20deg * Fix stringtable * Fix peen * Remove rust * Less rusty dirt * Translation * Add ShadowLod to thrown variant * Update addons/grenades/CfgAmmo.hpp Co-Authored-By: Oliver Blanthorn <[email protected]> * Update texture (make sure to squash&merge) * Ermordung der tab * tabs2 * tabs3
acemod · Dec 17, 2019 · 60a901b · 60a901b
2 parents 1fb989d + 0ce8318
commit 60a901b
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 2 deletions.
diff --git a/addons/grenades/CfgAmmo.hpp b/addons/grenades/CfgAmmo.hpp
@@ -119,6 +119,16 @@ class CfgAmmo {
         effectsSmoke = "ACE_M84FlashbangEffect";
         whistleDist = 0;
     };
+
+    class ACE_G_CTS9: ACE_G_M84 {
+        GVAR(flashbang) = 1;
+        GVAR(flashbangBangs) = 9;
+        GVAR(flashbangInterval) = 0.5;
+        GVAR(flashbangIntervalMaxDeviation) = 0.35;
+        model = QPATHTOF(models\ACE_CTS_9bang_thrown.p3d);
+        explosionTime = 1.5;
+        timeToLive = 10;
+    };
 
     class Chemlight_base: SmokeShell {
         GVAR(pullPinSound)[] = {"A3\sounds_f\weapons\Other\dry4.wss", 3, 2, 10};

diff --git a/addons/grenades/CfgMagazines.hpp b/addons/grenades/CfgMagazines.hpp
@@ -64,6 +64,17 @@ class CfgMagazines {
         ammo = "ACE_G_M84";
         mass = 4;
     };
+
+    class ACE_CTS9: HandGrenade {
+        author = ECSTRING(common,ACETeam);
+        displayname = CSTRING(CTS9_Name);
+        descriptionShort = CSTRING(M84_Description);
+        displayNameShort = CSTRING(CTS9_NameShort);
+        model = QPATHTOF(models\ACE_CTS_9bang.p3d);
+        picture = QPATHTOF(UI\ace_cts9_x_ca.paa);
+        ammo = "ACE_G_CTS9";
+        mass = 4;
+    };
 
     class SmokeShell;
     class ACE_M14: SmokeShell {

diff --git a/addons/grenades/CfgWeapons.hpp b/addons/grenades/CfgWeapons.hpp
@@ -2,7 +2,7 @@
 class CfgWeapons {
     class GrenadeLauncher;
     class Throw: GrenadeLauncher {
-        muzzles[] += {"ACE_HandFlare_WhiteMuzzle","ACE_HandFlare_RedMuzzle","ACE_HandFlare_GreenMuzzle","ACE_HandFlare_YellowMuzzle","ACE_M84Muzzle","ACE_M14Muzzle"};
+        muzzles[] += {"ACE_HandFlare_WhiteMuzzle","ACE_HandFlare_RedMuzzle","ACE_HandFlare_GreenMuzzle","ACE_HandFlare_YellowMuzzle","ACE_M84Muzzle","ACE_M14Muzzle","ACE_CTS9Muzzle"};
 
         class ThrowMuzzle;
         class ACE_HandFlare_WhiteMuzzle: ThrowMuzzle {
@@ -28,5 +28,9 @@ class CfgWeapons {
         class ACE_M14Muzzle: ThrowMuzzle {
             magazines[] = {"ACE_M14"};
         };
+
+        class ACE_CTS9Muzzle: ThrowMuzzle {
+            magazines[] = {"ACE_CTS9"};
+        };
     };
 };
diff --git a/addons/grenades/UI/ace_cts9_x_ca.paa b/addons/grenades/UI/ace_cts9_x_ca.paa
diff --git a/addons/grenades/config.cpp b/addons/grenades/config.cpp
@@ -10,7 +10,8 @@ class CfgPatches {
             "ACE_HandFlare_Green",
             "ACE_HandFlare_Yellow",
             "ACE_M84",
-            "ACE_M14"
+            "ACE_M14",
+            "ACE_CTS9"
         };
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common"};

diff --git a/addons/grenades/models/ACE_CTS_9bang.p3d b/addons/grenades/models/ACE_CTS_9bang.p3d
diff --git a/addons/grenades/models/ACE_CTS_9bang_thrown.p3d b/addons/grenades/models/ACE_CTS_9bang_thrown.p3d
diff --git a/addons/grenades/stringtable.xml b/addons/grenades/stringtable.xml
@@ -145,6 +145,26 @@
             <Chinesesimp>也被称为闪光弹，会造成暂时性失明，耳聋，耳鸣等效果。</Chinesesimp>
             <Chinese>也被稱為閃光彈，會造成暫時性失明，耳聾，耳鳴等效果</Chinese>
         </Key>
+        <Key ID="STR_ACE_Grenades_CTS9_Name">
+            <English>CTS 7290 9-bang Flash Grenade</English>
+            <German>CTS 7290 9-fach Blendgranate</German>
+        </Key>
+        <Key ID="STR_ACE_Grenades_CTS9_NameShort">
+            <English>CTS 7290-9</English>
+            <German>CTS 7290-9</German>
+            <Czech>CTS 7290-9</Czech>
+            <Hungarian>CTS 7290-9</Hungarian>
+            <Italian>CTS 7290-9</Italian>
+            <Polish>CTS 7290-9</Polish>
+            <Portuguese>CTS 7290-9</Portuguese>
+            <Russian>CTS 7290-9</Russian>
+            <Spanish>CTS 7290-9</Spanish>
+            <French>CTS 7290-9</French>
+            <Japanese>CTS 7290-9</Japanese>
+            <Korean>CTS 7290-9</Korean>
+            <Chinesesimp>CTS 7290-9</Chinesesimp>
+            <Chinese>CTS 7290-9</Chinese>
+        </Key>
         <Key ID="STR_ACE_Grenades_M127A1_White_Name">
             <English>M127A1 Hand Held Signal (White)</English>
             <German>M127A1 Leuchtmittel (Weiß)</German>

diff --git a/addons/grenades/textures/ace_cts_9bang_co.paa b/addons/grenades/textures/ace_cts_9bang_co.paa