Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Grenades - Add CTS 7290 9-bang flashbang #6856

Merged
merged 18 commits into from
Dec 17, 2019
Merged
7 changes: 7 additions & 0 deletions addons/grenades/CfgAmmo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ class CfgAmmo {
effectsSmoke = "ACE_M84FlashbangEffect";
whistleDist = 0;
};

class ACE_G_CTS9: ACE_G_M84 {
dedmen marked this conversation as resolved.
Show resolved Hide resolved
GVAR(flashbang) = 1;
dedmen marked this conversation as resolved.
Show resolved Hide resolved
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};
Expand Down
11 changes: 11 additions & 0 deletions addons/grenades/CfgMagazines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion addons/grenades/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -28,5 +28,9 @@ class CfgWeapons {
class ACE_M14Muzzle: ThrowMuzzle {
magazines[] = {"ACE_M14"};
};

class ACE_CTS9Muzzle: ThrowMuzzle {
magazines[] = {"ACE_CTS9"};
};
};
};
Binary file added addons/grenades/UI/ace_cts9_x_ca.paa
Binary file not shown.
3 changes: 2 additions & 1 deletion addons/grenades/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ class CfgPatches {
"ACE_HandFlare_Green",
"ACE_HandFlare_Yellow",
"ACE_M84",
"ACE_M14"
"ACE_M14",
"ACE_CTS9"
dedmen marked this conversation as resolved.
Show resolved Hide resolved
};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
Expand Down
Binary file added addons/grenades/models/ACE_CTS_9bang.p3d
Binary file not shown.
Binary file added addons/grenades/models/ACE_CTS_9bang_thrown.p3d
Binary file not shown.
6 changes: 6 additions & 0 deletions addons/grenades/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@
<Korean>플래시뱅이라고도 알려져있습니다. 사용즉시 섬광으로 인한 시력장애, 청각장애, 이명, 내이기관방해를 유발합니다.</Korean>
<Chinesesimp>也被称为闪光弹,会造成暂时性失明,耳聋,耳鸣等效果。</Chinesesimp>
<Chinese>也被稱為閃光彈,會造成暫時性失明,耳聾,耳鳴等效果</Chinese>
</Key>
<Key ID="STR_ACE_Grenades_CTS9_Name">
<English>CTS 7290-9 9-bang Flash Grenade</English>
</Key>
<Key ID="STR_ACE_Grenades_CTS9_NameShort">
<English>CTS 7290-9</English>
dedmen marked this conversation as resolved.
Show resolved Hide resolved
</Key>
<Key ID="STR_ACE_Grenades_M127A1_White_Name">
<English>M127A1 Hand Held Signal (White)</English>
Expand Down
Binary file added addons/grenades/textures/ace_cts_9bang_co.paa
Binary file not shown.