Ver Fonte

laat mk3 update done

Florian Steinschorn há 3 anos atrás
pai
commit
d3703e0c81

+ 2 - 2
addons - Copy/RD501_Laat/_interactions/cx.hpp

@@ -30,13 +30,13 @@ class ACE_SelfActions: ACE_SelfActions
         };
         class RD501_Style_Scuba: RD501_NoseArt_None
         {
-            condition="!(isNull objectParent player) && (driver (vehicle player)==player) && (name player) == 'CX Scuba' || (name player) == 'CX-X Floff'";
+            condition="!(isNull objectParent player) && (driver (vehicle player)==player) && ['scuba', (name player)] call BIS_fnc_inString || ['floff', (name player)] call BIS_fnc_inString";
             displayName="CX Scuba";
             statement="_target setObjectTextureGlobal [0, 'RD501_Laat\textures\laat\Laat501stcx\Laat501stBodyCX_scuba.paa']";
         };
 		class RD501_Style_Casskun: RD501_NoseArt_None
 		{
-			condition="!(isNull objectParent player) && (driver (vehicle player)==player) && (name player) == 'CX-S Casskun' || (name player) == 'CX Casskun' || (name player) == 'CX-X Floff'";
+			condition="!(isNull objectParent player) && (driver (vehicle player)==player) && ['casskun', (name player)] call BIS_fnc_inString || ['floff', (name player)] call BIS_fnc_inString";
 			displayName="CX-S Casskun";
 			statement="_target setObjectTextureGlobal [0, 'RD501_Laat\textures\laat\Laat501stcx\Laat501stBodyCX_casskun.paa']";
 		};

+ 2 - 2
addons - Copy/RD501_Laat/_interactions/cxs.hpp

@@ -30,13 +30,13 @@ class ACE_SelfActions: ACE_SelfActions
         };
 		class RD501_Style_Erlien: RD501_NoseArt_None
 		{
-			condition="!(isNull objectParent player) && (driver (vehicle player)==player) && (name player) == 'CX-S Erlien' || (name player) == 'CX-X Floff'";
+			condition="!(isNull objectParent player) && (driver (vehicle player)==player) && ['erlien', (name player)] call BIS_fnc_inString || ['floff', (name player)] call BIS_fnc_inString";
 			displayName="CX-S Erlien";
 			statement="_target setObjectTextureGlobal [0, 'RD501_Laat\textures\laat\Laat501stcxs\Laat501stBodyCXS_erlien.paa']";
 		};
 		class RD501_Style_Kushiban: RD501_NoseArt_None
 		{
-			condition="!(isNull objectParent player) && (driver (vehicle player)==player) && (name player) == 'CX-S Kushiban' || (name player) == 'CX-X Floff'";
+			condition="!(isNull objectParent player) && (driver (vehicle player)==player) && ['kushiban', (name player)] call BIS_fnc_inString || ['floff', (name player)] call BIS_fnc_inString";
 			displayName="CX-S Kushiban";
 			statement="_target setObjectTextureGlobal [0, 'RD501_Laat\textures\laat\Laat501stcxs\Laat501stBodyCXS_kushiban.paa']";
 		};

+ 0 - 5
addons - Copy/RD501_Laat/_interactions/cxx.hpp

@@ -53,11 +53,6 @@ class ACE_SelfActions: ACE_SelfActions
 			displayName="Cyclone Express";
 			statement="_target setObjectTextureGlobal [0, 'RD501_Laat\textures\laat\Laat501stcxx\Laat501stBodyCXX_cyclone_express.paa']";
 		};
-		class RD501_NoseArt_Lightning: RD501_NoseArt_None
-		{
-			displayName="Lightning";
-			statement="_target setObjectTextureGlobal [0, 'RD501_Laat\textures\laat\Laat501stcxx\Laat501stBodyCXX_lightning.paa']";
-		};
 		class RD501_NoseArt_MrsMae: RD501_NoseArt_None
 		{
 			displayName="Mrs. Mae";

BIN
addons - Copy/RD501_Laat/textures/laat/Laat501stcx/Laat501stBodyCX.paa


BIN
addons - Copy/RD501_Laat/textures/laat/Laat501stcx/Laat501stBodyCX_casskun.paa


BIN
addons - Copy/RD501_Laat/textures/laat/Laat501stcx/Laat501stBodyCX_clones.paa


BIN
addons - Copy/RD501_Laat/textures/laat/Laat501stcx/Laat501stBodyCX_gunship_diplomacy.paa


BIN
addons - Copy/RD501_Laat/textures/laat/Laat501stcx/Laat501stBodyCX_mouth.paa


BIN
addons - Copy/RD501_Laat/textures/laat/Laat501stcx/Laat501stBodyCX_nexu.paa


BIN
addons - Copy/RD501_Laat/textures/laat/Laat501stcx/Laat501stBodyCX_pilot.paa


BIN
addons - Copy/RD501_Laat/textures/laat/Laat501stcx/Laat501stBodyCX_scuba.paa


BIN
addons - Copy/RD501_Laat/textures/laat/Laat501stcxs/Laat501stBodyCXS_clones.paa


+ 2 - 2
addons - Copy/RD501_Vehicles/air/LAAT/config.cpp

@@ -94,7 +94,7 @@ class CfgVehicles
 		slingLoadMemoryPoint = "slingload0";
 
 		//hiddenSelectionsMaterials[] = {"RD501_Laat\textures\laat\g1.rvmat","RD501_Laat\textures\laat\g2.rvmat"};
-		
+
 
 		//typing hard
 		#include "ace_stuff.hpp"
@@ -260,7 +260,7 @@ class CfgVehicles
 
 	
 		class EventHandlers : DefaultEventhandlers {
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; 
+			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
 			init = "[_this select 0] call RD501_Main_fnc_laatc_lift";
 		}
  

BIN
addons - Copy/RD501_Vehicles/air/LAAT/config.cpp~


+ 18 - 25
addons - Copy/RD501_Vehicles/air/Y_Wing/config.cpp

@@ -273,36 +273,29 @@ class CfgVehicles
 		displayName="VTOL LAAT Mk.II";
 		gearsUpFrictionCoef=0;
 		model="\LAAT\LAAT.p3d";
+		hiddenSelections[] = {"camo1","camo2"};
+		hiddenSelectionsTextures[]=
+		{
+			"RD501_Laat\textures\laat\Laat501stcxx\Laat501stBodyCXX_lightning.paa",
+			"RD501_Laat\textures\laat\Laat501stcxx\Laat501stWingCXX.paa"
+		};
 		forceInGarage=1;
 		availableForSupportTypes[] = {};
-		weapons[]=
-		{
-			macro_new_weapon(cannon,laat),
+		weapons[] = {
+			macro_basic_air_weapons,
+			macro_new_weapon(generic,republic_aircraft_cannon),
+			macro_new_weapon(generic,kannon),
 			macro_new_weapon(wynd,a2a),
-			"CMFlareLauncher",
-			"SmokeLauncher",
-			"Laserdesignator_pilotCamera"
+			macro_new_weapon(wynd,agm),
+			macro_new_weapon(wynd,ugm),
 		};
-		magazines[]=
-		{
-			"300Rnd_CMFlare_Chaff_Magazine",
-			"300Rnd_CMFlare_Chaff_Magazine",
-			"300Rnd_CMFlare_Chaff_Magazine",
-			macro_new_mag(a2a,4),
-			macro_new_mag(a2a,4),
+		magazines[] = {
+			macro_new_mag(generic_aircraft_cannon_green,1000),
 			macro_new_mag(a2a,4),
-			"SmokeLauncherMag",
-			macro_new_mag(laat_cannon,100),
-			macro_new_mag(laat_cannon,100),
-			macro_new_mag(laat_cannon,100),
-			macro_new_mag(laat_cannon,100),
-			"SmokeLauncherMag",
-			"SmokeLauncherMag",
-			"SmokeLauncherMag",
-			"SmokeLauncherMag",
-			"SmokeLauncherMag",
-			"SmokeLauncherMag",
-			"Laserbatteries"
+			macro_new_mag(agm,6),
+			macro_new_mag(ugm,10),
+			macro_basic_air_mags,
+			macro_new_mag(Kannon,100)
 		};
 		armor=550;
 		class Sounds: Sounds