WIP USMC 2000

fallujah 2 era, needs testing and compositions. Not entirely convinced it's a good addition yet, we'll see
Frozeph · Apr 1, 2019 · dcea1ca · dcea1ca
1 parent b5f4d92
commit dcea1ca
Show file tree

Hide file tree

Showing 7 changed files with 1,445 additions and 4 deletions.
diff --git a/@twc_config_compatibility/addons/twc_gearFixes/config.cpp b/@twc_config_compatibility/addons/twc_gearFixes/config.cpp
@@ -756,7 +756,7 @@ class cfgRecoils
 	class twc_shotgun_1
 	{
 		muzzleOuter[]	= { 0.1,  0.5,  0.1,  0.1 }; //horizontal size, vertical size, horizontal jitter, vertical jitter
-		kickBack[]	= { 0.06, 0.09 }; //min/max force
+		kickBack[]	= { 0.09, 0.12 }; //min/max force
 		permanent	= 1.5; //muzzle climb post-recoil, means nothing when on bipod
 		temporary	= 0.2; //muzzle jump
 	};

diff --git a/@twc_config_public/addons/twc_units_marines/config.cpp b/@twc_config_public/addons/twc_units_marines/config.cpp
@@ -66,6 +66,7 @@ class CfgVehicles
 	class B_Soldier_base_F;
 
 	#include "usmarines.hpp"
+	#include "usmarines2000.hpp"
 
 	#include "marinesbackpacks.hpp"
 };

diff --git a/@twc_config_public/addons/twc_units_marines/marinesbackpacks.hpp b/@twc_config_public/addons/twc_units_marines/marinesbackpacks.hpp
@@ -78,7 +78,102 @@
 		scope = 1;
 		class TransportItems
 		{
-			item_nc(ACE_surgicalKit,1);
+			item_nc(TWC_Item_Medical_SutureKit_25,1);
+			item_nc(ACE_personalAidKit,1);
+            item_nc(ACE_fieldDressing,12);
+			item_nc(ACE_elasticBandage,15);
+			item_nc(ACE_packingBandage,15);
+			item_nc(ACE_quikclot,6);
+			item_nc(ACE_morphine,10);
+			item_nc(ACE_epinephrine,10);
+			item_nc(ACE_adenosine,4);
+			item_nc(ACE_atropine,4);
+			item_nc(ACE_salineIV_500,6);
+			item_nc(ACE_tourniquet,4);
+		};
+	};
+
+	class CUP_B_Kombat_Radio_Olive;
+	class TWC_Backpack_USMC2000_Sectionleader: CUP_B_Kombat_Radio_Olive
+	{
+		class TransportItems
+		{
+			item_nc(ACRE_PRC117F,1);
+			item_nc(ACE_CableTie,5);
+		};
+		class TransportMagazines
+		{
+			maga_nc(SmokeShellRed,2);
+			maga_nc(SmokeShellGreen,2);
+		};
+	};
+
+	class UK3CB_BAF_B_Carryall_OLI;
+	class TWC_Backpack_USMC2000_Teamleader: UK3CB_BAF_B_Carryall_OLI
+	{
+		class TransportItems
+		{
+			item_nc(ACE_CableTie,5);
+		};
+		class TransportMagazines
+		{
+			maga_nc(CUP_30Rnd_556x45_Stanag,15);
+			maga_nc(CUP_30Rnd_556x45_Stanag_Tracer_Red,10);
+			maga_nc(SmokeShellGreen,2);
+		};
+	};
+
+	class B_TacticalPack_blk;
+	class TWC_Backpack_USMC2000_Rifleman: B_TacticalPack_blk
+	{
+		class TransportItems
+		{
+			item_nc(ACE_CableTie,5);
+		};
+		class TransportMagazines
+		{
+			maga_nc(CUP_30Rnd_556x45_Stanag,10);
+			maga_nc(CUP_30Rnd_556x45_Stanag_Tracer_Red,10);
+		};
+	};
+
+	class B_FieldPack_oli;
+	class TWC_Backpack_USMC2000_Breacher: B_FieldPack_oli
+	{
+		class TransportItems
+		{
+			item_nc(ACE_CableTie,5);
+		};
+		class TransportMagazines
+		{
+			maga_nc(CUP_30Rnd_556x45_Stanag,5);
+			maga_nc(CUP_30Rnd_556x45_Stanag_Tracer_Red,2);
+		};
+		class TransportWeapons
+		{
+			weap_nc(CUP_TWC_arifle_M16A4_Grip_clean,1)
+		};
+	};
+
+	class twc_genbackPack_oli;
+	class TWC_Backpack_USMC2000_Autorifleman: twc_genbackPack_oli
+	{
+		class TransportItems
+		{
+			item_nc(ACE_CableTie,5);
+		};
+		class TransportMagazines
+		{
+			maga_nc(rhsusf_200rnd_556x45_mixed_box,4);
+		};
+	};
+
+	class CUP_B_SLA_Medicbag;
+	class TWC_Backpack_USMC2000_Medic: CUP_B_SLA_Medicbag
+	{
+		class TransportItems
+		{
+			item_nc(TWC_Item_Medical_SutureKit_25,1);
 			item_nc(ACE_personalAidKit,1);
             item_nc(ACE_fieldDressing,12);
 			item_nc(ACE_elasticBandage,15);