Merge pull request #169 from 501st-Aux-Mod-Team/patch1321

Patch1321

addons - Copy/RD501_Main/config.cpp

@@ -415,7 +415,7 @@ class CfgEditorSubcategories
 
 	class macro_editor_cat(static_msc)
 	{
-		displayName = "Bacta Tanks";
+		displayName = "Static Objects";
 	};
 	class macro_editor_cat(turrets)
 	{

addons - Copy/RD501_Vehicles/air/Vulture/config.cpp

@@ -102,6 +102,7 @@ class CfgVehicles
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat_air(CIS)
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
+		radarTargetSize = 0.7;
 		class HitPoints: HitPoints
 		{
 			class HitHull: HitHull
@@ -136,6 +137,7 @@ class CfgVehicles
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat_air(CIS)
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
+		radarTargetSize = 0.7;
 		class Components: Components
 		{
 			class TransportPylonsComponent

addons - Copy/RD501_Vehicles/land/droideka/config.cpp

@@ -37,7 +37,8 @@ class CfgVehicles
 		faction = macro_cis_faction;
 		editorSubcategory = macro_editor_cat(heavy_armored_infantry);
 		vehicleClass = macro_editor_vehicle_type(heavy_armored_infantry);
-
+		ace_dragging_canCarry = 0;
+		ace_dragging_canDrag = 0;
 		armor = 225;
 		armorStructural = 1.0;
 		explosionShielding	= 0.1;

addons - Copy/RD501_Vehicles/static/Explosives/config.cpp

@@ -0,0 +1,92 @@
+#include "../../../RD501_main/config_macros.hpp"
+
+class CfgPatches
+{
+	class macro_patch_name(explosives)
+	{
+		addonRootClass=macro_patch_name(vehicles)
+
+		requiredAddons[]=
+		{
+			macro_patch_name(vehicles)
+		};
+		requiredVersion=0.1;
+		units[]=
+		{
+			"Rd501_Explosive_Barrel"
+		};
+		weapons[]=
+		{
+			
+		};
+	};
+};
+
+class CfgVehicles
+{
+	class Land_3as_ExplodeBarrel_1;
+	class 442_box4;
+	class Rd501_Explosive_Barrel: 442_box4
+	{
+		scope=2;
+		scopeCurator=2;
+		displayName="Explosive Barrel";
+		model="\RD501_Vehicles\static\Explosives\data\barrel_0.p3d";
+		vehicleClass = macro_editor_vehicle_type(statics)
+		editorCategory =  macro_editor_cat(statics)
+		editorSubcategory = macro_editor_cat(static_msc)
+		ace_dragging_canCarry = 1;
+		ace_dragging_canDrag = 1;
+		armor=25;
+		destrType = "DestructBuilding";
+		explosionEffect="FuelExplosionBig";
+		class ACE_Actions {
+            class ACE_MainActions {
+                displayName = "Interact";
+                selection = "mem01";
+                distance = 10;
+                condition = "true";
+            };
+		};
+		transportFuel=1000;
+		class DestructionEffects
+		{
+			class Smoke1
+			{
+				intensity=1;
+				interval=1;
+				lifeTime=1;
+				position="";
+				simulation="particles";
+				type="ObjectDestructionSmokeSmall";
+			};
+			class Smoke2
+			{
+				intensity=1;
+				interval=1;
+				lifeTime=1;
+				position="";
+				simulation="particles";
+				type="ObjectDestructionSmoke2";
+			};
+			class Fire1
+			{
+				intensity=0.5;
+				interval=1;
+				lifeTime=2;
+				position="";
+				simulation="particles";
+				type="ObjectDestructionFire1Small";
+			};
+			class HouseDestr
+			{
+				intensity=1;
+				interval=1;
+				lifeTime=5;
+				position="";
+				simulation="destroy";
+				type="DelayedDestruction";
+			};
+		};
+	};
+};

addons - Copy/RD501_Vehicles/static/bacta/config.cpp

@@ -64,6 +64,7 @@ class CfgVehicles
                 selection = "";
                 distance = 4;
                 condition = "true";
+				position = "[0,0,1.5]"
                 class RD501_Heal_All_Nearby
                 {
                     displayName = "Heal Nearby";

addons - Copy/RD501_Weapons/Valken/config.cpp

@@ -67,10 +67,10 @@ class CfgWeapons
 					"RD501_Holosight",
 					"RD501_Holosight_2",
 					"RD501_Holosight_3",
-					"RD501_DMS",
-					"RD501_DMS_2",
-					"RD501_DMS_3",
-					"RD501_DMS_4",
+					"RD501_DMS_TI",
+					"RD501_DMS_2_TI",
+					"RD501_DMS_3_TI",
+					"RD501_DMS_4_TI",
 					"RD501_MRCO",
 					"RD501_MRCO_2",
 					"RD501_MRCO_3"

addons - Copy/RD501_Weapons/_acc/config.cpp

@@ -449,8 +449,7 @@ class CfgWeapons
 					visionMode[]=
 					{
 						"Normal",
-						"NVG",
-						"Ti"
+						"NVG"
 					};
 					thermalMode[]={5,6};
 					opticsFlare=1;
@@ -513,6 +512,108 @@ class CfgWeapons
 			modelOptics="\RD501_weapons\_acc\data\RD501_scope4_DMS";
 		};
 	};
+class RD501_DMS_TI: optic_DMS
+	{
+		author="RD501";
+		_generalMacro="optic_DMS";
+		scope=2;
+		displayName="DMS LR 6-12x Scope A";
+		picture="\RD501_weapons\_acc\data\rd501_ico_lr_01_ca.paa";
+		model="\RD501_weapons\_acc\data\rd501_dms.p3d";
+		descriptionShort="Long Range Scope";
+		class ItemInfo: ItemInfo
+		{
+			mass=12;
+			opticType=2;
+			optics=1;
+			modelOptics="\RD501_weapons\_acc\data\RD501_scope_DMS";
+			class OpticsModes
+			{
+				class Snip
+				{
+					opticsID=1;
+					useModelOptics=1;
+					opticsPPEffects[]=
+					{
+						"OpticsCHAbera2",
+						"OpticsBlur3"
+					};
+					opticsZoomMin = scope_magnification(12);
+					opticsZoomMax = scope_magnification(6);
+					opticsZoomInit = scope_magnification(6);
+					discreteinitIndex = 0;
+					discretefov[] = {scope_magnification(6),scope_magnification(12)};
+					discreteDistanceInitIndex = 1;
+					distanceZoomMin=300;
+					distanceZoomMax=1200;
+					memoryPointCamera="opticView";
+					visionMode[]=
+					{
+						"Normal",
+						"NVG",
+						"Ti"
+					};
+					thermalMode[]={5,6};
+					opticsFlare=1;
+					opticsDisablePeripherialVision=0;
+					cameraDir="";
+				};
+				class Iron: Snip
+				{
+					opticsID=2;
+					useModelOptics=0;
+					opticsPPEffects[]=
+					{
+						"",
+						""
+					};
+					opticsFlare=0;
+					opticsDisablePeripherialVision=0;
+					opticsZoomMin=0.25;
+					opticsZoomMax=1.25;
+					opticsZoomInit=0.75;
+					memoryPointCamera="opticView";
+					visionMode[]={};
+					discretefov[]={};
+					distanceZoomMin=200;
+					distanceZoomMax=200;
+					discreteDistance[]={200};
+					discreteDistanceInitIndex=0;
+				};
+			};
+		};
+		inertia=0.2;
+	};
+	class RD501_DMS_2_TI: RD501_DMS
+	{
+		picture="\RD501_weapons\_acc\data\rd501_ico_lr_02_ca.paa";
+		model="\RD501_weapons\_acc\data\rd501_dms_2.p3d";
+		displayName="DMS LR 6-12x Scope B";
+		class ItemInfo: ItemInfo
+		{
+			modelOptics="\RD501_weapons\_acc\data\RD501_scope2_DMS";
+		};
+	};
+	class RD501_DMS_3_TI: RD501_DMS
+	{
+		picture="\RD501_weapons\_acc\data\rd501_ico_lr_03_ca.paa";
+		model="\RD501_weapons\_acc\data\rd501_dms_3.p3d";
+		displayName="DMS LR 6-12x Scope C";
+		class ItemInfo: ItemInfo
+		{
+			modelOptics="\RD501_weapons\_acc\data\RD501_scope3_DMS";
+		};
+	};
+	class RD501_DMS_4_TI: RD501_DMS
+	{
+		picture="\RD501_weapons\_acc\data\rd501_ico_lr_03_ca.paa";
+		model="\RD501_weapons\_acc\data\rd501_dms_4.p3d";
+		displayName="DMS LR 6-12x Scope D";
+		class ItemInfo: ItemInfo
+		{
+			modelOptics="\RD501_weapons\_acc\data\RD501_scope4_DMS";
+		};
+	};
 	class optic_MRD:ItemCore
 	{
 		class ItemInfo;

addons - Copy/RD501_Weapons/_acc/data/holosight.rvmat

@@ -0,0 +1,93 @@
+ambient[]={50,50,50,1};
+diffuse[]={0,0,0,1};
+forcedDiffuse[]={0,0,0,1};
+emmisive[]={10,10,10,0};
+specular[]={0,0,0,1};
+specularPower=8;
+PixelShaderID="Super";
+VertexShaderID="Super";
+class Stage1
+{
+	texture="#(argb,8,8,3)color(0.5,0.5,1,1,NOHQ)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage2
+{
+	texture="#(argb,8,8,3)color(1,1,1,0,DT)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={8,0,0};
+		up[]={0,8,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage3
+{
+	texture="#(argb,8,8,3)color(0.5,0.5,0.5,0,MC)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage4
+{
+	texture="#(argb,8,8,3)color(1,1,1,1,AS)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage5
+{
+	texture="#(argb,8,8,3)color(1,0.1,0.1,1,SMDI)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage6
+{
+	texture="#(ai,16,2,2)fresnel(10.4,8.3)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage7
+{
+	texture="a3\data_f\env_land_co.paa";
+	useWorldEnvMap="true";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};