Browse Source

Patch 3.20

Erliens 4 năm trước cách đây
mục cha
commit
0e28af3fc2
24 tập tin đã thay đổi với 16 bổ sung25 xóa
  1. BIN
      addons - Copy/RD501_Helmets/_materials/Clone_helmet_ARC.rvmat
  2. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/ARC.paa
  3. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Brennan.paa
  4. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Bronson.paa
  5. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Darkstar.paa
  6. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Duke.paa
  7. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Habivi.paa
  8. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Halo.paa
  9. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Hook.paa
  10. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Jink.paa
  11. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Korvus.paa
  12. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Odd.paa
  13. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Rayne.paa
  14. BIN
      addons - Copy/RD501_Helmets/_textures/ARC/Train.paa
  15. BIN
      addons - Copy/RD501_Helmets/_textures/Airborne/Exod.paa
  16. BIN
      addons - Copy/RD501_Helmets/_textures/Airborne/Momentum.paa
  17. BIN
      addons - Copy/RD501_Helmets/_textures/Airborne/Viking.paa
  18. BIN
      addons - Copy/RD501_Helmets/_textures/aviation/pilots/Duncan.paa
  19. BIN
      addons - Copy/RD501_Helmets/_textures/aviation/pilots/Neb.paa
  20. 2 0
      addons - Copy/RD501_Helmets/aviation/config.cpp
  21. 6 6
      addons - Copy/RD501_Helmets/config.cpp
  22. 2 9
      addons - Copy/RD501_Helmets/infantry/config.cpp
  23. 2 2
      addons - Copy/RD501_Helmets/infantry/config_macros.cpp
  24. 4 8
      addons - Copy/RD501_Weapons/_common/common.hpp

BIN
addons - Copy/RD501_Helmets/_materials/Clone_helmet_ARC.rvmat


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


BIN
addons - Copy/RD501_Helmets/_textures/aviation/pilots/Duncan.paa


BIN
addons - Copy/RD501_Helmets/_textures/aviation/pilots/Neb.paa


+ 2 - 0
addons - Copy/RD501_Helmets/aviation/config.cpp

@@ -77,6 +77,8 @@ class CfgWeapons
 	NEW_501_Pilot_HELM(Legal,Legal,pilots\Legal.paa)
 	NEW_501_Pilot_HELM(Ethan,Ethan,pilots\Ethan.paa)
 	NEW_501_Pilot_HELM(Blast,Blast,pilots\Blast.paa)
+	NEW_501_Pilot_HELM(Duncan,Duncan,pilots\Duncan.paa)
+	NEW_501_Pilot_HELM(Neb,Neb,pilots\Neb.paa)
 
 	class macro_new_helmet(pilot,scuba): macro_new_helmet(pilot,base)
 	{

+ 6 - 6
addons - Copy/RD501_Helmets/config.cpp

@@ -263,16 +263,16 @@ class CfgWeapons
 		ace_hearing_lowerVolume = 0;    
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
 		displayName = "[501st] ARC HELM (Base)";
-		picture="\MRC\JLTS\characters\CloneArmor\data\ui\CloneHelmetP2_ui_ca.paa";
-		model = "\MRC\JLTS\characters\CloneArmor\CloneHelmetP2.p3d";
+		picture="\MRC\JLTS\characters\CloneArmor2\data\ui\CloneHelmetARC_ui_ca.paa";
+		model = "\MRC\JLTS\characters\CloneArmor2\CloneHelmetARC.p3d";
 		hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {"RD501_Units\textures\republic\clones\arc\arc_helmet.paa"};
-		hiddenSelectionsMaterials[]= {"RD501_Helmets\_materials\clone_helmet_p2.rvmat"};
+		hiddenSelectionsTextures[] = {"RD501_Helmets\_textures\ARC\ARC.paa"};
+		hiddenSelectionsMaterials[]= {"RD501_Helmets\_materials\Clone_helmet_ARC"};
 		class ItemInfo: HeadgearItem
 		{
 			mass = 30;
-			uniformmodel = "\MRC\JLTS\characters\CloneArmor\CloneHelmetP2.p3d";
-			hiddenSelectionsMaterials[]= {"RD501_Helmets\_materials\clone_helmet_p2.rvmat"};
+			uniformmodel = "\MRC\JLTS\characters\CloneArmor2\CloneHelmetARC.p3d";
+			hiddenSelectionsMaterials[]= {"RD501_Helmets\_materials\Clone_helmet_ARC.rvmat"};
 			modelSides[] = {6};
 			hiddenSelections[] = {"Camo1"};
 			material = -1;

+ 2 - 9
addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -25,6 +25,7 @@ class CfgWeapons
 	class macro_new_helmet(infantry,base);
 	class macro_new_helmet(infantry,lum_base);
 	class macro_new_helmet_jlts(infantry,jlts_recruit);
+	class macro_new_helmet(arc,base_jlts);
 
 	NEW_501_Inf_Helm_JLTS(Pilot,Pilot,Pilot.paa)
 	
@@ -144,15 +145,7 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Power,Power,Power.paa)
 	NEW_501_Inf_Helm_JLTS(Vulpes,Vulpes,Vulpes.paa)
 	NEW_501_ARC_Helm_JLTS(Duke,Duke,Duke.paa)
-	NEW_501_ARC_Helm_JLTS(Bronson,Bronson,Bronson.paa)
-	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)
-	NEW_501_ARC_Helm_JLTS(Halo,Halo,Halo.paa)
-	NEW_501_ARC_Helm_JLTS(Habivi,Habivi,Habivi.paa)
 	NEW_501_ARC_Helm_JLTS(Jink,Jink,Jink.paa)
 	NEW_501_ARC_Helm_JLTS(Brennan,Brennan,Brennan.paa)
-	NEW_501_ARC_Helm_JLTS(Korvus,Korvus,Korvus.paa)
-	NEW_501_ARC_Helm_JLTS(Darkstar,Darkstar,Darkstar.paa)
-	NEW_501_ARC_Helm_JLTS(Train,Train,Train.paa)
-	NEW_501_ARC_Helm_JLTS(Hook,Hook,Hook.paa)
-	NEW_501_ARC_Helm_JLTS(Odd,Odd,Odd.paa)
+	NEW_501_ARC_Helm_JLTS(Bronson,Bronson,Bronson.paa)
 };

+ 2 - 2
addons - Copy/RD501_Helmets/infantry/config_macros.cpp

@@ -9,7 +9,7 @@
 
 //ARC
 	#define NEW_501_ARC_Helm(classname,displayname,texture)\
-		class macro_new_helmet(arc,classname) : macro_new_helmet(infantry,base)\
+		class macro_new_helmet(arc,classname) : macro_new_helmet(arc,base_jlts)\
 		{\
 			scope = 2;\
 			displayName = Clonetrooper helmet (501st '##displayname##');\
@@ -36,7 +36,7 @@
 
 //ARC JLTS
 	#define NEW_501_ARC_Helm_JLTS(classname,displayname,texture)\
-		class macro_new_helmet(arc,classname) : macro_new_helmet(infantry,jlts_recruit)\
+		class macro_new_helmet(arc,classname) : macro_new_helmet(arc,base_jlts)\
 		{\
 			scope = 2;\
 			displayName = [501st] ARC HELM ('##displayname##');\

+ 4 - 8
addons - Copy/RD501_Weapons/_common/common.hpp

@@ -61,11 +61,7 @@
 	macro_new_mag(40mm_Purple,3)
 
 #define MACRO_GL_flare_rounds_1rnd \
-	macro_new_mag(40mm_white,1),\
-	macro_new_mag(40mm_CIR,1),\
-	macro_new_mag(40mm_Green,1),\
-	macro_new_mag(40mm_Red,1),\
-	macro_new_mag(40mm_Yellow,1),\
-	macro_new_mag(40mm_Blue,1),\
-	macro_new_mag(40mm_Cyan,1),\
-	macro_new_mag(40mm_Purple,1)
+	"UGL_FlareGreen_F",\
+	"UGL_FlareRed_F",\
+	"UGL_FlareWhite_F",\
+	"UGL_FlareYellow_F"