Browse Source

Patch 3.45

Erliens 3 years ago
parent
commit
6388e994e9

BIN
addons - Copy/RD501_Helmets/_textures/ARC/Dalton.paa


BIN
addons - Copy/RD501_Helmets/_textures/Airborne/Spilberge.paa


BIN
addons - Copy/RD501_Helmets/_textures/Infantry/Klinger.paa


+ 1 - 0
addons - Copy/RD501_Helmets/airborne/config.cpp

@@ -41,4 +41,5 @@ class CfgWeapons
 	NEW_501_AB_HELM_JLTS(501st_Nuclear_helmet,Nuclear,Nuclear.paa)
 	NEW_501_AB_HELM_JLTS(501st_Aedan_helmet,Aedan,Aedan.paa)
 	NEW_501_AB_HELM_JLTS(501st_Waze_helmet,Waze,Waze.paa)
+	NEW_501_AB_HELM_JLTS(501st_Spilberge_helmet,Spilberge,Spilberge.paa)
 };

+ 37 - 1
addons - Copy/RD501_Helmets/aviation/config.cpp

@@ -22,6 +22,7 @@ class CfgPatches
 class CfgWeapons
 {
 	class H_HelmetB;
+	class HeadgearItem;
 	class macro_new_helmet(pilot,base):H_HelmetB
 	{
 		displayname = Clone Pilot Base Model;
@@ -37,7 +38,42 @@ class CfgWeapons
         };
 		class ItemInfo;
 	};
-
+	class macro_new_helmet(3as_pilot,base): H_HelmetB
+	{
+		author="$STR_3rd_Studios";
+		scope=2;
+		weaponPoolAvailable=1;
+		displayName="[AVI] Pilot Base";
+		picture="3AS\3AS_Characters\Clones\Headgear\ui\p2pilot_ui_ca.paa";
+		model="\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Pilot_P2.p3d";
+		hiddenSelections[]=
+		{
+			"Camo"
+		};
+		hiddenSelectionsTextures[]=
+		{
+			"3AS\3AS_Characters\Clones\Headgear\Textures\PilotP2\Phase2_Pilot_Razor_co.paa"
+		};
+		class ItemInfo: HeadgearItem
+		{
+			mass=40;
+			uniformModel="\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Pilot_P2.p3d";
+			hiddenSelections[]=
+			{
+				"Camo"
+			};
+			modelSides[]={3,1};
+			class HitpointsProtectionInfo
+			{
+				class Head
+				{
+					hitpointName="HitHead";
+					armor=6;
+					passThrough=0.5;
+				};
+			};
+		};
+	};
 	NEW_501_Pilot_HELM(cxx,CX-X,pilots\cxx.paa)
 	NEW_501_Pilot_HELM(cxc,CX-C,pilots\cxc.paa)
 	NEW_501_Pilot_HELM(dylan,Dylan,pilots\Dylanhelmet.paa)

BIN
addons - Copy/RD501_Helmets/aviation/data/AB_helmet_p1.p3d


+ 0 - 82
addons - Copy/RD501_Helmets/aviation/data/pilot_jlts.rvmat

@@ -1,82 +0,0 @@
-class StageTI
-{
-	texture="#(argb,8,8,3)color(0.5,0,0,0,TI)";
-};
-ambient[]={0.5,0.5,0.5,1};
-diffuse[]={0.7,0.7,0.7,1};
-forcedDiffuse[]={0,0,0,0};
-emmisive[]={0,0,0,1};
-specular[]={0.7,0.7,0.7,0.1};
-specularPower=25;
-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,0};
-		pos[]={0,0,0};
-	};
-};
-class Stage2
-{
-	texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
-	uvSource="tex";
-	class uvTransform
-	{
-		aside[]={1,0,0};
-		up[]={0,1,0};
-		dir[]={0,0,0};
-		pos[]={0,0,0};
-	};
-};
-class Stage3
-{
-	texture="#(argb,8,8,3)color(0,0,0,0,MC)";
-	uvSource="tex";
-	class uvTransform
-	{
-		aside[]={1,0,0};
-		up[]={0,1,0};
-		dir[]={0,0,0};
-		pos[]={0,0,0};
-	};
-};
-class Stage4
-{
-	texture="RD501_Helmets\_textures\aviation\clonePilotHelmet_as.paa";
-	uvSource="tex";
-	class uvTransform
-	{
-		aside[]={1,0,0};
-		up[]={0,1,0};
-		dir[]={0,0,1};
-		pos[]={0,0,1};
-	};
-};
-class Stage5
-{
-	texture="RD501_Helmets\_textures\aviation\clonePilotHelmet_smdi.paa";
-	uvSource="tex";
-	class uvTransform
-	{
-		aside[]={1,0,0};
-		up[]={0,1,0};
-		dir[]={0,0,1};
-		pos[]={0,0,1};
-	};
-};
-class Stage6
-{
-	texture="#(ai,64,64,1)fresnel(1,1)";
-	uvSource="none";
-};
-class Stage7
-{
-	texture="A3\data_f\env_co.paa";
-	uvSource="none";
-};

+ 1 - 7
addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -32,7 +32,6 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Archaic,Archaic,Archaic.paa)
 	NEW_501_Inf_Helm_JLTS(Hosed,Hosed,Hosed.paa)
 	NEW_501_Inf_Helm_JLTS(Kestrel,Kestrel,Kestrel.paa)
-	NEW_501_Inf_Helm_JLTS(Player,Player,Player.paa)
 	NEW_501_Inf_Helm_JLTS(Roster,Roster,Roster.paa)
 	NEW_501_Inf_Helm_JLTS(Scanlon,Scanlon,Scanlon.paa)
 	NEW_501_Inf_Helm_JLTS(Simon,Simon,Simon.paa)
@@ -92,13 +91,11 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Sticks,Sticks,Sticks.paa)
 	NEW_501_Inf_Helm_JLTS(Twine,Twine,Twine.paa)
 	NEW_501_Inf_Helm_JLTS(Bishop,Bishop,Bishop.paa)
-	NEW_501_Inf_Helm_JLTS(Pro,Pro,Pro.paa)
 	NEW_501_Inf_Helm_JLTS(Shape,Shape,Shape.paa)
 	NEW_501_Inf_Helm_JLTS(Drammon,Drammon,Drammon.paa)
 	NEW_501_Inf_Helm_JLTS(Spectre,Spectre,Spectre.paa)
 	NEW_501_Inf_Helm_JLTS(Andromeda,Andromeda,Andromeda.paa)
 	NEW_501_Inf_Helm_JLTS(Oktapius,Oktapius,Oktapius.paa)
-	NEW_501_Inf_Helm_JLTS(Flux,Flux,Flux.paa)
 	NEW_501_Inf_Helm_JLTS(Goddest,Goddest,Goddest.paa)
 	NEW_501_Inf_Helm_JLTS(Dusty,Dusty,Dusty.paa)
 	NEW_501_Inf_Helm_JLTS(Bjorn,Bjorn,Bjorn.paa)
@@ -107,21 +104,18 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Dragon,Dragon,Dragon.paa)
 	NEW_501_Inf_Helm_JLTS(Fixit,Fixit,Fixit.paa)
 	NEW_501_Inf_Helm_JLTS(Legia,Legia,Legia.paa)
-	NEW_501_Inf_Helm_JLTS(Shadow,Shadow,Shadow.paa)
 	NEW_501_Inf_Helm_JLTS(Simon,Simon,Simon.paa)
 	NEW_501_Inf_Helm_JLTS(Sour,Sour,Sour.paa)
 	NEW_501_Inf_Helm_JLTS(Adhock,Adhock,Adhock.paa)
 	NEW_501_Inf_Helm_JLTS(Koda,Koda,Koda.paa)
 	NEW_501_Inf_Helm_JLTS(Rebellion,Rebellion,Rebellion.paa)
 	NEW_501_Inf_Helm_JLTS(Dadecoy,Dadecoy,Dadecoy.paa)
-	NEW_501_Inf_Helm_JLTS(Cursed,Cursed,Cursed.paa)
 	NEW_501_Inf_Helm_JLTS(Compo,Compo,Compo.paa)
 	NEW_501_Inf_Helm_JLTS(Shape,Shape,Shape.paa)
 	NEW_501_Inf_Helm_JLTS(Drammon,Drammon,Drammon.paa)
 	NEW_501_Inf_Helm_JLTS(Spectre,Spectre,Spectre.paa)
 	NEW_501_Inf_Helm_JLTS(Hackett,Hackett,Hackett.paa)
     NEW_501_Inf_Helm_JLTS(Phoenix,Phoenix,Phoenix.paa)
-	NEW_501_Inf_Helm_JLTS(Riddle,Riddle,Riddle.paa)
 	NEW_501_Inf_Helm_JLTS(Storm,Storm,Storm.paa)
 	NEW_501_Inf_Helm_JLTS(Sigma,Sigma,Sigma.paa)
 	NEW_501_Inf_Helm_JLTS(Walsh,Walsh,Walsh.paa)
@@ -156,7 +150,6 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Uncle,Uncle,Uncle.paa)
 	NEW_501_Inf_Helm_JLTS(Shredded,Shredded,Shredded.paa)
 	NEW_501_Inf_Helm_JLTS(Popeye,Popeye,Popeye.paa)
-	NEW_501_Inf_Helm_JLTS(Shroom,Shroom,Shroom.paa)
 	NEW_501_Inf_Helm_JLTS(Sledge,Sledge,Sledge.paa)
 	NEW_501_Inf_Helm_JLTS(Mirror,Mirror,Mirror.paa)
 	NEW_501_Inf_Helm_JLTS(Waylander,Waylander,Waylander.paa)
@@ -196,4 +189,5 @@ class CfgWeapons
 	NEW_501_ARC_Helm_JLTS(Tal,Tal,Tal.paa)
 	NEW_501_ARC_Helm_JLTS(Deva,Deva,Deva.paa)
 	NEW_501_ARC_Helm_JLTS(Scruff,Scruff,Scruff.paa)
+	NEW_501_ARC_Helm_JLTS(Dalton,Dalton,Dalton.paa)
 };

+ 1 - 0
addons - Copy/RD501_Units/blufor/clones/_headwear.hpp

@@ -208,6 +208,7 @@ class rd501_JLTS_CloneBinocular: JLTS_CloneBinocular
 class rd501_JLTS_CloneBinocular_black_TI: JLTS_CloneBinocular_black
 {
     displayname = "[501st] Clone Macrobinoculars Scout";
+	modelOptics="\A3\Weapons_F_beta\Binocular\lasermarker_optics";
 	visionMode[]=
     {
         "Normal",

+ 3 - 3
addons - Copy/RD501_Vehicles/_init_functions/cis_aircraft_turrets.hpp

@@ -18,13 +18,13 @@
 
     class macro_new_vehicle(HMP,gunship) {
 		class turret1 {
-			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,5,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,normal)),[0,5,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
 		};
 		class turret2 {
-			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,normal)),[5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
 		};
 		class turret3 {
-			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[-5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,normal)),[-5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
 		};
 		macro_standard_eh
         class swop_init {

+ 166 - 0
addons - Copy/RD501_Weapons/Drexi/config.cpp

@@ -0,0 +1,166 @@
+#include "../../RD501_main/config_macros.hpp"
+#include "../_common/common.hpp"
+class CfgPatches
+{
+	class RD501_patch_drexl
+	{
+		author="RD501";
+		addonRootClass="RD501_patch_weapons";
+		requiredAddons[]=
+		{
+			"RD501_patch_weapons"
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]=
+		{
+			macro_new_weapon_nofam(drexl)
+		};
+	};
+};
+class Mode_SemiAuto;
+class Mode_FullAuto;
+class CowsSlot;
+class MuzzleSlot;
+class PointerSlot;
+class CfgWeapons
+{
+	class Rifle;
+	class Rifle_Base_F: Rifle
+	{
+		class WeaponSlotsInfo;
+	};
+	class macro_new_weapon_nofam(drexl): Rifle_Base_F
+	{
+		ACE_Overheating_JamChance = 0;
+		ACE_overheating_mrbs = 3e+009;
+		selectionFireAnim="zasleh";
+		flash="gunfire";
+		author="RD501";
+		scope=2;
+		model="101st_Aux_Mod\Addons\DBA_Weapons\Boma\Boma_Shotgun.p3d";
+		picture="101st_Aux_Mod\Addons\DBA_Weapons\effects\icons\Boma_CA.paa";
+		handAnim[] = {"OFP2_ManSkeleton","\A3\Weapons_F_beta\Rifles\MK20\Data\Anim\mk20G.rtm"};
+		magazines[] =
+		{
+			macro_new_mag(shotgun_scatter,6),
+			macro_new_mag(shotgun_HE,6),
+			macro_new_mag(shotgun_EMP,2),
+			macro_new_mag(shotgun_slug,6)
+		};
+		reloadAction = "ReloadMagazine";
+		displayName = "Republic SX17 Drexl";
+		descriptionShort = "Republic Automatic shotgun";
+		soundBullet[]={""};
+		modes[]=
+		{
+			"Single",
+			"FullAuto"
+		};
+		simulation = "Weapon";
+		fireLightDuration=0.050000001;
+		fireLightIntensity=0.2;
+		fireLightDiffuse[] = {0,1,0};
+		fireLightAmbient[] = {0,1,0};
+		class Single: Mode_SemiAuto
+		{
+			sounds[]=
+			{
+				"StandardSound"
+			};
+			class StandardSound
+			{
+				soundSetShot[] = {"Msbs65_01_Shotgun_Shot_SoundSet","Msbs65_01_Shotgun_Tail_SoundSet"};
+			};
+			recoil = "recoil_MSBS65_ubs";
+			recoilProne = "assaultRifleBase";
+			reloadTime = 0.35;
+			dispersion = "5*0.00087";
+			minRange = 2;
+			minRangeProbab = 0.5;
+			midRange = 400;
+			midRangeProbab = 0.7;
+			maxRange = 800;
+			maxRangeProbab = 0.3;
+		};
+		class FullAuto: Mode_FullAuto
+		{
+			sounds[]=
+			{
+				"StandardSound"
+			};
+			class StandardSound
+			{
+				soundSetShot[] = {"Msbs65_01_Shotgun_Shot_SoundSet","Msbs65_01_Shotgun_Tail_SoundSet"};
+			};
+			recoil = "recoil_MSBS65_ubs";
+			recoilProne = "assaultRifleBase";
+			reloadTime = 0.275;
+			dispersion = "5*0.00087";
+			minRange = 2;
+			minRangeProbab = 0.5;
+			midRange = 400;
+			midRangeProbab = 0.7;
+			maxRange = 800;
+			maxRangeProbab = 0.3;
+			aiRateOfFire=2;
+			aiRateOfFireDistance=500;
+		};
+		inertia = 1.4;
+		dexterity=1.7;
+		initSpeed=300;
+		maxRecoilSway=0.0125;
+		reloadMagazineSound[] = {"A3\Sounds_F_Enoch\Assets\Arsenal\Msbs65_01\Shotgun\Msbs65_Shotgun_Reload_01",3.98107,1,10};
+		class ItemInfo
+		{
+			priority=1;
+		};
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass=100;
+			class MuzzleSlot: MuzzleSlot
+			{
+				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
+				iconPosition[]={0,0.44999999};
+				iconScale=0.2;
+			};
+			class CowsSlot: CowsSlot
+			{
+				iconPosition[]={0.5,0.34999999};
+				iconScale=0.2;
+				compatibleItems[] = 
+				{
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3"
+				};
+			};
+			class PointerSlot: PointerSlot
+			{
+				iconPosition[]={0.2,0.44999999};
+				iconScale=0.25;
+			};
+		};
+		/*class WeaponSlotsInfo
+		{
+			mass = 30;
+			class CowsSlot
+			{
+				displayName = "Optics Slot";
+				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
+				iconPinpoint = "Bottom";
+				iconPosition[] = {0.5,0.35};
+				iconScale = 0.2;
+				linkProxy = "\A3\data_f\proxies\weapon_slots\TOP";
+				scope = 0;
+				compatibleItems[] = 
+				{
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3"
+				};
+
+			};
+		};*/
+	};
+};

+ 1 - 1
addons - Copy/RD501_Weapons/RAMER/config.cpp

@@ -39,7 +39,7 @@ class cfgWeapons
 		{
 			reloadTime=0.24;
 		}
-			class WeaponSlotsInfo
+		class WeaponSlotsInfo
 		{
 			mass = 30;
 			class CowsSlot

+ 9 - 0
addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -545,6 +545,15 @@ class CfgMagazines
 		ammo = macro_new_ammo(shotgun_EMP)
 		descriptionShort = "2 Rnd EMP";
 	};
+	class macro_new_mag(shotgun_slug,6):2Rnd_12Gauge_Pellets
+	{
+		scope=2;
+		displayName = "6 Rnd Slug Magazine";
+		displayNameShort = "6 Rnd Slug Mag";
+		count=6;
+		ammo = macro_new_ammo(30mw)
+		descriptionShort = "6 Rnd Slug";
+	};
 	////////////////////////////////////////////////////
 	/////////////Flare    Magazines/////////////////////
 	////////////////////////////////////////////////////