diff --git a/addons/arsenal/arsenale/fnc_arsenalBW.sqf b/addons/arsenal/arsenale/fnc_arsenalBW.sqf
index 5249c917..74a5fd20 100644
--- a/addons/arsenal/arsenale/fnc_arsenalBW.sqf
+++ b/addons/arsenal/arsenale/fnc_arsenalBW.sqf
@@ -215,7 +215,7 @@ private _allgemein_handfeuerwaffen = [
"BWA3_1Rnd_Flare_Multistar_Red",
"BWA3_15Rnd_9x19_P8",
"TB_mag_taser",
- "TB_mag_45_FMJ",
+ "TB_mag_6Rnd_500_FMJ",
"TB_mag_33Rnd_9x19_JHP",
"TB_mag_33Rnd_9x19_FMJ",
// ### Befestigungsschiene
diff --git a/addons/arsenal/arsenale/fnc_arsenalUSA.sqf b/addons/arsenal/arsenale/fnc_arsenalUSA.sqf
index a9b11703..e4afefa3 100644
--- a/addons/arsenal/arsenale/fnc_arsenalUSA.sqf
+++ b/addons/arsenal/arsenale/fnc_arsenalUSA.sqf
@@ -139,7 +139,13 @@ private _allgemein_magazine = [
"TB_mag_MPR_10Rnd_Antimateriel",
"TB_mag_MPR_10Rnd_Slug",
"TB_mag_MPR_10Rnd_Buckshot",
- "TB_mag_MPR_10Rnd_Underwater"
+ "TB_mag_MPR_10Rnd_Underwater",
+
+ // .45 Cal
+ "TB_mag_40Rnd_45_FMJ",
+ "TB_mag_40Rnd_45_FMJ_Tracer_Red",
+ "TB_mag_40Rnd_45_JHP",
+ "TB_mag_40Rnd_45_JHP_Tracer_Red"
];
private _allgemein_gewehre = [
@@ -190,7 +196,8 @@ private _allgemein_gewehre = [
"rhs_weap_mk18_KAC",
"rhs_weap_mk18_wd",
"rhs_weap_mk18_KAC_wd",
- "TB_weapon_MPR"
+ "TB_weapon_MPR",
+ "TB_weap_Vector"
];
_allgemein_gewehre append _allgemein_magazine;
@@ -207,9 +214,10 @@ private _allgemein_visiere = [
"rhsusf_acc_compm4",
"rhsusf_acc_ACOG_d",
"rhsusf_acc_ACOG_wd",
- "optic_mrco",
- "ace_optic_mrco_2d",
- "optic_yorris"
+ "rhsusf_acc_rm05",
+ "rhsusf_acc_t1_low",
+ "optic_yorris",
+ "optic_aco_smg"
];
private _allgemein_befestigungsschiene = [
@@ -291,7 +299,7 @@ private _allgemein_handfeuerwaffen = [
"TB_mag_33Rnd_9x19_FMJ",
"TB_mag_33Rnd_9x19_JHP",
"TB_mag_taser",
- "TB_mag_45_FMJ"
+ "TB_mag_6Rnd_500_FMJ"
];
private _allgemein_uniformen = [
diff --git a/addons/arsenal/arsenale/themen/fnc_arsenalLDF.sqf b/addons/arsenal/arsenale/themen/fnc_arsenalLDF.sqf
index 7f6dd2f2..f85bf449 100644
--- a/addons/arsenal/arsenale/themen/fnc_arsenalLDF.sqf
+++ b/addons/arsenal/arsenale/themen/fnc_arsenalLDF.sqf
@@ -61,7 +61,7 @@ private _allgemein = [
"TB_mag_taser",
"16Rnd_9x21_yellow_Mag",
"9Rnd_45ACP_Mag",
- "TB_mag_45_FMJ",
+ "TB_mag_6Rnd_500_FMJ",
"6Rnd_45ACP_Cylinder",
// ESD
diff --git a/addons/config/configs/CfgAmmo.hpp b/addons/config/configs/CfgAmmo.hpp
index 943dedb8..a93d2a99 100644
--- a/addons/config/configs/CfgAmmo.hpp
+++ b/addons/config/configs/CfgAmmo.hpp
@@ -145,12 +145,24 @@ class CfgAmmo
};
class B_45ACP_Ball;
- class TB_45_FMJ : B_45ACP_Ball // 45. FMJ Munition
+ class TB_ammo_500_FMJ : B_45ACP_Ball // .500 FMJ Munition
{
caliber = 1.4; // 1
hit = 21; // 8
};
+ class TB_ammo_45_FMJ : B_45ACP_Ball // .45 FMJ Munition
+ {
+ caliber = 0.715; // 1
+ hit = 5; // 8
+ };
+
+ class TB_ammo_45_JHP : B_45ACP_Ball // .45 JHP Munition
+ {
+ caliber = 0.415; // 1
+ hit = 7; // 8
+ };
+
class B_570x28_Ball;
class TB_ammo_570 : B_570x28_Ball // 5.7mm Munition
{
diff --git a/addons/config/configs/CfgMagazineWells.hpp b/addons/config/configs/CfgMagazineWells.hpp
index 5d176495..4ab4ca9b 100644
--- a/addons/config/configs/CfgMagazineWells.hpp
+++ b/addons/config/configs/CfgMagazineWells.hpp
@@ -9,9 +9,20 @@ class CfgMagazineWells
ADDON[] = {"3Rnd_Smoke_Grenade_shell_precise"};
};
- class TB_magwell_6Rnd_45_FMJ
+ class TB_magwell_6Rnd_500_FMJ
{
- ADDON[] = {"TB_mag_45_FMJ"};
+ ADDON[] = {"TB_mag_6Rnd_500_FMJ"};
+ };
+
+ class TB_magwell_40Rnd_45
+ {
+ TB_40Rnd_45[] =
+ {
+ "TB_mag_40Rnd_45_FMJ",
+ "TB_mag_40Rnd_45_JHP",
+ "TB_mag_40Rnd_45_FMJ_Tracer_Red",
+ "TB_mag_40Rnd_45_JHP_Tracer_Red"
+ };
};
class TB_magwell_10Rnd_338
diff --git a/addons/config/configs/CfgMagazines.hpp b/addons/config/configs/CfgMagazines.hpp
index ae84e156..cd05013a 100644
--- a/addons/config/configs/CfgMagazines.hpp
+++ b/addons/config/configs/CfgMagazines.hpp
@@ -271,12 +271,50 @@ class CfgMagazines
};
class 6Rnd_45ACP_Cylinder;
- class TB_mag_45_FMJ : 6Rnd_45ACP_Cylinder // 45. FMJ Magazin
+ class TB_mag_6Rnd_500_FMJ : 6Rnd_45ACP_Cylinder // .500 FMJ Magazin Revolver
{
- ammo = "TB_45_FMJ";
+ ammo = "TB_ammo_500_FMJ";
author = "TBMod";
- displayName = "45. cal FMJ";
- displayNameShort = "45. cal FMJ";
+ displayName = "6Rnd .500 FMJ";
+ displayNameShort = "6Rnd .500 FMJ";
+ };
+
+ class 30Rnd_45ACP_Mag_SMG_01;
+ class TB_mag_40Rnd_45_FMJ : 30Rnd_45ACP_Mag_SMG_01 // .45 FMJ Magazin Vector
+ {
+ ammo = "TB_ammo_45_FMJ";
+ author = "TBMod";
+ count = 40;
+ displayName = "40Rnd .45 FMJ";
+ displayNameShort = "40Rnd .45 FMJ";
+ };
+
+ class 30Rnd_45ACP_Mag_SMG_01_Tracer_Red;
+ class TB_mag_40Rnd_45_FMJ_Tracer_Red : 30Rnd_45ACP_Mag_SMG_01_Tracer_Red // .45 FMJ Magazin Tracer Vector
+ {
+ ammo = "TB_ammo_45_FMJ";
+ author = "TBMod";
+ count = 40;
+ displayName = "40Rnd .45 FMJ Tracer";
+ displayNameShort = "40Rnd .45 FMJ Tracer";
+ };
+
+ class TB_mag_40Rnd_45_JHP : 30Rnd_45ACP_Mag_SMG_01 // .45 JHP Magazin Vector
+ {
+ ammo = "TB_ammo_45_JHP";
+ author = "TBMod";
+ count = 40;
+ displayName = "40Rnd .45 JHP";
+ displayNameShort = "40Rnd .45 JHP";
+ };
+
+ class TB_mag_40Rnd_45_JHP_Tracer_Red : 30Rnd_45ACP_Mag_SMG_01_Tracer_Red // .45 JHP Magazin Tracer Vector
+ {
+ ammo = "TB_ammo_45_JHP";
+ author = "TBMod";
+ count = 40;
+ displayName = "40Rnd .45 JHP Tracer";
+ displayNameShort = "40Rnd .45 JHP Tracer";
};
class 50Rnd_570x28_SMG_03;
diff --git a/addons/config/configs/CfgRecoils.hpp b/addons/config/configs/CfgRecoils.hpp
index 91bb2dcb..91699389 100644
--- a/addons/config/configs/CfgRecoils.hpp
+++ b/addons/config/configs/CfgRecoils.hpp
@@ -46,4 +46,11 @@ class CfgRecoils
permanent = 0.04;
temporary = 0.02;
};
+ class TB_recoil_Vector_G2
+ {
+ kickBack[] = {0.015,0.04};
+ muzzleOuter[] = {0,0,0.03,0.03};
+ permanent = 0.025;
+ temporary = 0.02;
+ };
};
diff --git a/addons/config/configs/CfgWeapons.hpp b/addons/config/configs/CfgWeapons.hpp
index fb97a8aa..1cdf4033 100644
--- a/addons/config/configs/CfgWeapons.hpp
+++ b/addons/config/configs/CfgWeapons.hpp
@@ -595,14 +595,14 @@ class CfgWeapons
{
class Single;
};
- class TB_weapon_rhino60 : hgun_Pistol_heavy_02_F // .45 Revolver
+ class TB_weapon_rhino60 : hgun_Pistol_heavy_02_F // .500 Revolver
{
author = "TBMod";
baseWeapon = "TB_weapon_rhino60";
- descriptionShort = "Tactical Revolver
Caliber: .45 FMJ";
+ descriptionShort = "Tactical Revolver
Caliber: .500 FMJ";
displayName = "Rhino 60";
- magazines[] = {"TB_mag_45_FMJ"};
- magazineWell[] = {"TB_magwell_6Rnd_45_FMJ"};
+ magazines[] = {"TB_mag_6Rnd_500_FMJ"};
+ magazineWell[] = {"TB_magwell_6Rnd_500_FMJ"};
modes[] = {"manual"};
class manual : Single
diff --git a/addons/nachschub/configs/CfgVehicles.hpp b/addons/nachschub/configs/CfgVehicles.hpp
index a8e51d91..ec67841a 100644
--- a/addons/nachschub/configs/CfgVehicles.hpp
+++ b/addons/nachschub/configs/CfgVehicles.hpp
@@ -158,6 +158,7 @@ class CfgVehicles
exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"};
condition = "(entities [['TB_arsenal_usa', 'TB_arsenal_predefined_custom'], []]) isNotEqualTo []";
+ ADD_SUPPLY("Airdrop",TB_supply_usa_airdrop);
ADD_SUPPLY("Notfall",TB_supply_usa_notfall);
ADD_SUPPLY("NachtKiste",TB_supply_usa_night);
diff --git a/addons/nachschub/configs/CfgVehicles_BW.hpp b/addons/nachschub/configs/CfgVehicles_BW.hpp
index 84983b7c..fce0fd7d 100644
--- a/addons/nachschub/configs/CfgVehicles_BW.hpp
+++ b/addons/nachschub/configs/CfgVehicles_BW.hpp
@@ -23,7 +23,7 @@ class TB_supply_bw_ammoSmall : WRAPPER_NAME(Box_East_Grenades_F)
class TransportMagazines
{
MACRO_ADDMAGAZINE(BWA3_15Rnd_9x19_P8,15);
- MACRO_ADDMAGAZINE(TB_mag_45_FMJ,30);
+ MACRO_ADDMAGAZINE(TB_mag_6Rnd_500_FMJ,30);
MACRO_ADDMAGAZINE(rhsusf_mag_17Rnd_9x19_JHP,15);
};
};
diff --git a/addons/nachschub/configs/CfgVehicles_LDF.hpp b/addons/nachschub/configs/CfgVehicles_LDF.hpp
index cdcab9e8..d1bb7049 100644
--- a/addons/nachschub/configs/CfgVehicles_LDF.hpp
+++ b/addons/nachschub/configs/CfgVehicles_LDF.hpp
@@ -42,7 +42,7 @@ class TB_supply_ldf_ammo_small : WRAPPER_NAME(Box_East_Support_F)
MACRO_ADDMAGAZINE(30Rnd_9x21_Red_Mag,10);
MACRO_ADDMAGAZINE(11Rnd_45ACP_Mag,10);
MACRO_ADDMAGAZINE(9Rnd_45ACP_Mag,10);
- MACRO_ADDMAGAZINE(TB_mag_45_FMJ,10);
+ MACRO_ADDMAGAZINE(TB_mag_6Rnd_500_FMJ,10);
};
};
diff --git a/addons/nachschub/configs/CfgVehicles_USA.hpp b/addons/nachschub/configs/CfgVehicles_USA.hpp
index 8427bf54..0298c9ce 100644
--- a/addons/nachschub/configs/CfgVehicles_USA.hpp
+++ b/addons/nachschub/configs/CfgVehicles_USA.hpp
@@ -19,6 +19,7 @@ class TB_supply_usa_ammo : WRAPPER_NAME(Box_IND_Wps_F)
MACRO_ADDMAGAZINE(TB_mag_100Rnd_556x45_Mk318_tracer,2); // MGMag5.56 C-Mag Tracer
MACRO_ADDMAGAZINE(rhsusf_100Rnd_762x51_m62_tracer,2); // MGMag7.62 AP Tracer
MACRO_ADDMAGAZINE(TB_mag_100Rnd_338_LS_Tracer,2); // MGMag8.6 Tracer
+ MACRO_ADDMAGAZINE(TB_mag_40Rnd_45_JHP_Tracer_Red,3); // Vector.45 Tracer
};
};
@@ -75,7 +76,7 @@ class TB_supply_usa_ammoSmall : WRAPPER_NAME(Box_East_Support_F)
MACRO_ADDMAGAZINE(rhsusf_mag_17Rnd_9x19_JHP,15);
MACRO_ADDMAGAZINE(rhsusf_mag_7x45acp_MHP,15);
MACRO_ADDMAGAZINE(rhsusf_mag_15Rnd_9x19_JHP,15);
- MACRO_ADDMAGAZINE(TB_mag_45_FMJ,15);
+ MACRO_ADDMAGAZINE(TB_mag_6Rnd_500_FMJ,15);
};
};
@@ -310,7 +311,7 @@ class TB_supply_usa_airdrop : WRAPPER_NAME(B_supplyCrate_F)
MACRO_ADDMAGAZINE(rhsusf_mag_17Rnd_9x19_JHP,15);
MACRO_ADDMAGAZINE(rhsusf_mag_7x45acp_MHP,15);
MACRO_ADDMAGAZINE(rhsusf_mag_15Rnd_9x19_JHP,15);
- MACRO_ADDMAGAZINE(TB_mag_45_FMJ,15);
+ MACRO_ADDMAGAZINE(TB_mag_6Rnd_500_FMJ,15);
// 12.7
MACRO_ADDMAGAZINE(rhsusf_mag_10Rnd_STD_50BMG_M33,6);
@@ -336,6 +337,9 @@ class TB_supply_usa_airdrop : WRAPPER_NAME(B_supplyCrate_F)
MACRO_ADDMAGAZINE(TB_mag_MPR_10Rnd_Antimateriel,5);
MACRO_ADDMAGAZINE(TB_mag_MPR_10Rnd_Slug,5);
MACRO_ADDMAGAZINE(TB_mag_MPR_10Rnd_Buckshot,5);
+
+ // .45
+ MACRO_ADDMAGAZINE(TB_mag_40Rnd_45_JHP_Tracer_Red,10); // Vector.45 Tracer
};
class TransportItems
diff --git a/addons/skins/configs/CfgWeapons.hpp b/addons/skins/configs/CfgWeapons.hpp
index e43a1584..69cd108e 100644
--- a/addons/skins/configs/CfgWeapons.hpp
+++ b/addons/skins/configs/CfgWeapons.hpp
@@ -2,6 +2,11 @@
Part of the TBMod ( https://github.com/TacticalBaconDevs/TBMod )
Developed by http://tacticalbacon.de
*/
+class Mode_SemiAuto;
+class Mode_Burst;
+class Mode_FullAuto;
+class CowsSlot;
+class MuzzleSlot;
class CfgWeapons
{
@@ -119,6 +124,101 @@ class CfgWeapons
QPATHTOEF(skins,pictures\vests\TB_vest_sps_ucp_02.paa)
};
};
+
+ class SMG_01_Base;
+ class SMG_01_F : SMG_01_Base
+ {
+ class WeaponSlotsInfo;
+ };
+ class TB_weap_Vector : SMG_01_F // Vector
+ {
+ ace_overheating_mrbs = 6000;
+ author = "TBMod";
+ aimTransitionSpeed = 1.7;
+ baseWeapon = "TB_weap_Vector";
+ descriptionShort = "Submachine Gun
Caliber: .45";
+ displayName = "Vector G2 Grey";
+ hiddenSelectionsTextures[] =
+ {
+ QPATHTOF(pictures\weapons\TB_weap_vector_grey.paa),
+ "\a3\weapons_f\data\vectoratt_co.paa",
+ "\a3\weapons_f\acc\data\battlesight_co.paa"
+ };
+ modes[] = {"Single","Burst","FastAuto"};
+ magazines[] = {"TB_mag_40Rnd_45_JHP_Tracer_Red"};
+ magazineWell[] = {"TB_magwell_40Rnd_45"};
+ recoil="TB_recoil_Vector_G2";
+ class Single : Mode_SemiAuto
+ {
+ dispersion = 0.00131;
+ multiplier = 1;
+ reloadTime = 0.05;
+ textureType = "semi";
+ class BaseSoundModeType;
+ class SilencedSound: BaseSoundModeType
+ {
+ SoundSetShot[] = {"SMGVermin_silencerShot_SoundSet","SMGVermin_silencerTail_SoundSet","SMGVermin_silencerInteriorTail_SoundSet"};
+ };
+ class StandardSound: BaseSoundModeType
+ {
+ soundsetshot[] = {"SMGVermin_Shot_SoundSet","SMGVermin_Tail_SoundSet","SMGVermin_InteriorTail_SoundSet"};
+ };
+ };
+ class Burst : Mode_Burst
+ {
+ burst = 2;
+ dispersion = 0.00131;
+ multiplier = 1;
+ reloadTime = 0.04;
+ textureType = "dual";
+ class BaseSoundModeType;
+ class SilencedSound: BaseSoundModeType
+ {
+ SoundSetShot[] = {"SMGVermin_silencerShot_SoundSet","SMGVermin_silencerTail_SoundSet","SMGVermin_silencerInteriorTail_SoundSet"};
+ };
+ class StandardSound: BaseSoundModeType
+ {
+ soundsetshot[] = {"SMGVermin_Shot_SoundSet","SMGVermin_Tail_SoundSet","SMGVermin_InteriorTail_SoundSet"};
+ };
+ };
+ class FastAuto : Mode_FullAuto
+ {
+ dispersion = 0.00131;
+ multiplier = 1;
+ reloadTime = 0.04;
+ textureType = "fastAuto";
+ class BaseSoundModeType;
+ class SilencedSound: BaseSoundModeType
+ {
+ SoundSetShot[] = {"SMGVermin_silencerShot_SoundSet","SMGVermin_silencerTail_SoundSet","SMGVermin_silencerInteriorTail_SoundSet"};
+ };
+ class StandardSound: BaseSoundModeType
+ {
+ soundsetshot[] = {"SMGVermin_Shot_SoundSet","SMGVermin_Tail_SoundSet","SMGVermin_InteriorTail_SoundSet"};
+ };
+ };
+ class WeaponSlotsInfo : WeaponSlotsInfo
+ {
+ class CowsSlot : CowsSlot
+ {
+ class compatibleItems
+ {
+ optic_yorris = 1;
+ optic_aco_smg = 1;
+ rhsusf_acc_rm05 = 1;
+ rhsusf_acc_t1_low = 1;
+ rhsusf_acc_eotech_552 = 1;
+ };
+ };
+ class MuzzleSlot : MuzzleSlot
+ {
+ class compatibleItems
+ {
+ rhsusf_acc_rotex5_grey = 1;
+ };
+ };
+ };
+ };
};
///////////////////////////////////
diff --git a/addons/skins/pictures/weapons/TB_weap_vector_grey.paa b/addons/skins/pictures/weapons/TB_weap_vector_grey.paa
new file mode 100644
index 00000000..271ce34c
Binary files /dev/null and b/addons/skins/pictures/weapons/TB_weap_vector_grey.paa differ