Merge remote-tracking branch 'refs/remotes/origin/master' into flip-v…

…ehicle
Frozeph · Apr 8, 2019 · 98095d6 · 98095d6
2 parents 7412685 + be3f9f6
commit 98095d6
Show file tree

Hide file tree

Showing 205 changed files with 18,878 additions and 6,721 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-*.pbo
+*.pbo
+@twc_config_ww2/addons/twc_ww2_faction/late/paratroopers.hpp
diff --git a/@twc_config/addons/BCCCCP/air.hpp b/@twc_config/addons/BCCCCP/air.hpp
@@ -198,11 +198,32 @@
 		};
 	};
 
+	class O_Plane_CAS_02_F;
+	class TCP_Su22: O_Plane_CAS_02_F
+	{
+		scope = 2;
+		scopeCurator = 2;
+		//elevatorCoef[] = {0,0.2,0.95,0.6,0.55,0.5,0.45,0.4,0.35,0.3,0.26,0.22,0.19,0.16,0.14,0.12,0.1,0.09,0.08};
+		elevatorCoef[] = {0,0.1,0.45,0.55,0.56,0.56,0.55,0.54,0.52,0.5,0.48,0.45,0.4,0.32,0.15};
+	};
+
+	class BCCCCP_Su17: TCP_Su22
+	{
+		displayName="Su-17 (CAS)";
+		faction="BCCCCP";
+		crew="BCCCCP_Jet_Pilot";
+		typicalCargo[]=
+		{
+			"BCCCCP_Jet_Pilot"
+		};
+	};
+
 	class CUP_O_Su25_RU_2;
 	class CUP_O_Su25_RU_3;
 
 	class BCCCCP_Su25_CAS: CUP_O_Su25_RU_3
 	{
+		scope = 2;
 		displayName="Su-25 (CAS)";
 		faction="BCCCCP";
 		crew="BCCCCP_Jet_Pilot";
@@ -219,6 +240,7 @@
 	};
 	class BCCCCP_Su25_AT: CUP_O_Su25_RU_2
 	{
+		scope = 2;
 		displayName="Su-25 (AT)";
 		faction="BCCCCP";
 		crew="BCCCCP_Jet_Pilot";
@@ -232,4 +254,33 @@
 			"\CUP\AirVehicles\CUP_AirVehicles_Su25\data\su25_body2_rus_co.paa"
 		};
 		editorPreview="CUP\AirVehicles\CUP_AirVehicles_Su25\Data\preview\CUP_O_Su25_RU_1.jpg";
+	};
+
+	class an12b_RUS;
+	class an12B_RU: an12b_RUS
+	{
+		class Eventhandlers;
+	};
+
+	class BCCCCP_An12B: an12B_RU
+	{
+		scope = 2;
+		displayName="An-12B";
+		faction="BCCCCP";
+		crew="BCCCCP_Jet_Pilot";
+		typicalCargo[]=
+		{
+			"BCCCCP_Jet_Pilot"
+		};
+		hiddenSelectionsTextures[]=
+		{
+			"\an12bkv3\liveries\18\An12main01.pac",
+			"\an12bkv3\liveries\18\An12main02.pac",
+			"\an12bkv3\liveries\18\An12main03.pac",
+			"\an12bkv3\liveries\18\An12wing.pac",
+		};
+		class Eventhandlers: Eventhandlers
+		{
+			init = "";
+		};
 	};
diff --git a/@twc_config/addons/BCCCCP/armour.hpp b/@twc_config/addons/BCCCCP/armour.hpp
@@ -11,6 +11,7 @@
 	class CUP_I_T72_NAPA;
 	class CUP_O_T72_RU;
 	class CUP_O_ZSU23_SLA;
+	class CUP_O_MTLB_pk_Green_RU;
 
 	class BCCCCP_BMP1: CUP_BMP1_base
 	{
@@ -113,6 +114,15 @@
 		hiddenSelectionsMaterials[] = {"\CUP\WheeledVehicles\CUP_WheeledVehicles_BTR60\data\textures\russia\russia_body.rvmat","\CUP\WheeledVehicles\CUP_WheeledVehicles_BTR60\data\textures\russia\russia_detail.rvmat"};
 		hiddenselectionstextures[] = {"\CUP\WheeledVehicles\CUP_WheeledVehicles_BTR60\data\textures\russia\russia_body_green_co.paa","\CUP\WheeledVehicles\CUP_WheeledVehicles_BTR60\data\textures\russia\russia_detail_green_co.paa"};
 	};
+	class BCCCCP_MTLB: CUP_O_MTLB_pk_Green_RU
+	{
+		faction="BCCCCP";
+		crew="BCCCCP_Crewman_Camo";
+		typicalCargo[]=
+		{
+			"BCCCCP_Crewman_Camo"
+		};
+	};
 	class BCCCCP_T55: CUP_I_T55_TK_GUE
 	{
 		side=0;

diff --git a/@twc_config/addons/BCCCCP/infantry.hpp b/@twc_config/addons/BCCCCP/infantry.hpp
@@ -1095,8 +1095,8 @@
 	class BCCCCP_Jet_Pilot: BCCCCP_Base
 	{
 		scope = 2;
-		displayName="Helicopter Pilot";
-		uniformClass="U_I_HeliPilotCoveralls";
+		displayName="Jet Pilot";
+		uniformClass="CUP_U_O_SLA_Overalls_Pilot";
 		linkedItems[]=
 		{
 			"CUP_V_O_TK_CrewBelt",
@@ -1131,7 +1131,7 @@
 			"SmokeShell"
 		};
 		Respawnmagazines[]=
-		{			
+		{
 			"CUP_8Rnd_9x18_Makarov_M",
 			"CUP_8Rnd_9x18_Makarov_M",
 			"CUP_8Rnd_9x18_Makarov_M",

diff --git a/@twc_config/addons/twc_ammoboxes/config.cpp b/@twc_config/addons/twc_ammoboxes/config.cpp
@@ -52,7 +52,8 @@ class CfgPatches {
 			"TWC_AmmoBox_Other_Stinger_Portable",
 			"TWC_AmmoBox_Other_Command_Portable",
 			"TWC_AmmoBox_Other_Pallet",
-			"TWC_AmmoBox_Other_Empty_Portable" 
+			"TWC_AmmoBox_Other_Empty_Portable",
+			"TWC_AmmoBox_Training_Medical_Base"
 		};
 
 		weapons[] = {};
@@ -135,4 +136,5 @@ class CfgVehicles {
 	#include "crates_vehicles.hpp"
 	#include "crates_other.hpp"
 	#include "crates_launchers.hpp"
+	#include "crates_training.hpp"
 };
diff --git a/@twc_config/addons/twc_ammoboxes/crates_training.hpp b/@twc_config/addons/twc_ammoboxes/crates_training.hpp
@@ -0,0 +1,31 @@
+/*
+	"TWC_AmmoBox_Training_Medical_Base",
+*/
+
+class TWC_AmmoBox_Training_Medical_Base: TWC_AmmoBox_Base {
+	scope = 2;
+	scopeCurator = 2;
+	displayName = "Medical Supplies (Immobile)";
+
+	editorSubcategory = "TWC_Training";
+
+	class TransportItems {
+		item_nc(ACE_fieldDressing, 100);
+		item_nc(ACE_elasticBandage, 100);
+		item_nc(ACE_quikclot, 100);
+		item_nc(ACE_packingBandage, 100);
+
+		item_nc(ACE_atropine, 25);
+		item_nc(ACE_adenosine, 25);
+		item_nc(ACE_morphine, 25);
+		item_nc(ACE_epinephrine, 25);
+
+		item_nc(ACE_salineIV_500, 50);
+		item_nc(ACE_salineIV_250, 25);
+		item_nc(ACE_tourniquet, 50);
+		item_nc(ACE_bodyBag, 50);
+
+		item_nc(ACE_personalAidKit, 25);
+		item_nc(TWC_Item_Medical_SutureKit_25, 25);
+	};
+};
diff --git a/@twc_config/addons/twc_coldwar/ammo.hpp b/@twc_config/addons/twc_coldwar/ammo.hpp
@@ -0,0 +1,11 @@
+class M_Vorona_HE;
+class SP_Blowpipe_missile: M_Vorona_HE
+{
+	trackOversteer = 1;
+	maneuvrability = 16;
+	sideAirFriction = 0.5;
+	proximityExplosionDistance = 20;
+	hit = 80;
+	indirectHitRange = 15;
+	indirectHit = 70;
+};
diff --git a/@twc_config/addons/twc_coldwar/backpacks.hpp b/@twc_config/addons/twc_coldwar/backpacks.hpp
@@ -37,7 +37,7 @@ class TWC_Backpack_ColdWar_Regular_2iC: SP_Backpack_LargePack
 class TWC_Backpack_ColdWar_Regular_ASSAT: SP_Backpack_CarlGustavCarrier
 {
 	scope = 1;
-	maximumLoad = 250;
+	maximumLoad = 300;
 	class TransportMagazines {
 		ADD_MAGA(ukcw_l14a1_HEAT,2);
 		ADD_MAGA(ukcw_l14a1_HE,1);
@@ -57,6 +57,7 @@ class TWC_Backpack_ColdWar_Regular_ASSMG: SP_Backpack_LargePack
 class TWC_Backpack_ColdWar_Regular_Dismounted_Rifleman: SP_Backpack_LargePack
 {
 	scope = 1;
+	maximumLoad = 200;
 	class TransportMagazines {
 		ADD_MAGA(UK3CB_BAF_762_20Rnd, 8);
 		ADD_MAGA(UK3CB_BAF_762_100Rnd_T, 1);
@@ -65,7 +66,7 @@ class TWC_Backpack_ColdWar_Regular_Dismounted_Rifleman: SP_Backpack_LargePack
 class TWC_Backpack_ColdWar_Regular_Dismounted_AT: SP_Backpack_LargePack_CarlGustav
 {
 	scope = 1;
-	maximumLoad = 200;
+	maximumLoad = 300;
 	class TransportMagazines {
 		ADD_MAGA(ukcw_l14a1_HE,1);
 		ADD_MAGA(ukcw_l14a1_HEAT,1);
@@ -93,7 +94,7 @@ class TWC_Backpack_ColdWar_Regular_Dismounted_MG: SP_Backpack_LargePack
 class TWC_Backpack_ColdWar_Regular_Dismounted_ASSMG: SP_Backpack_LargePack
 {
 	scope = 1;
-	maximumLoad = 250;
+	maximumLoad = 300;
 	class TransportMagazines {
 		ADD_MAGA(UK3CB_BAF_762_100Rnd_T,2);
 		ADD_MAGA(UK3CB_BAF_762_100Rnd,1);
@@ -223,7 +224,7 @@ class TWC_Backpack_ColdWar_COIN_Platoon_Commander: SP_Backpack_LargePack
 class TWC_Backpack_ColdWar_COIN_Platoon_Sergeant: SP_Backpack_LargePack
 {
 	scope = 1;
-	maximumLoad = 500;
+	maximumLoad = 600;
 	class TransportItems {
 		ADD_ITEM(ACRE_PRC77,1);
 		ADD_ITEM(ACE_wirecutter,1);
@@ -276,6 +277,7 @@ class TWC_Backpack_ColdWar_Regular_Blowpipe_Ass: SP_Backpack_BlowpipeCarrier
 class TWC_Backpack_ColdWar_Regular_Spotter: SP_Backpack_LargePack
 {
 	scope = 1;
+	maximumLoad = 250;
 	class TransportItems {
 		ADD_ITEM(ACRE_PRC77,1);
 	};
@@ -288,7 +290,7 @@ class TWC_Backpack_ColdWar_Regular_Spotter: SP_Backpack_LargePack
 class TWC_Backpack_ColdWar_Regular_Artillery_Commander: SP_Backpack_LargePack
 {
 	scope = 1;
-	maximumLoad = 250;
+	maximumLoad = 500;
 	class TransportItems {
 		ADD_ITEM(ACRE_PRC77,1);
 	};