9 Commits a05bf5bae4 ... f969dba3c7

Auteur SHA1 Message Date
  Mark f969dba3c7 Merge remote-tracking branch 'origin/Sakke/Saber-Fix' il y a 3 ans
  Mark 389971b4c8 I have markedly less confidence in this commit than normal il y a 3 ans
  Mark cc829d36b8 Merge remote-tracking branch 'origin/Casskun/LE-fix' il y a 3 ans
  Mark 0cb141fb7a CASSKUN CONFLICKT il y a 3 ans
  Kestrel e8e0e6458d forgot maelstrom apparently il y a 3 ans
  Casskun 5dbf387d0c fixed laat/le lol il y a 3 ans
  Casskun 7df9a7a619 Merge branch 'master' of http://git.501stlegion-a3.com/501st-Aux-Team/501st-Aux-Mod into Casskun/ARC-fix il y a 3 ans
  Kestrel 97b71e363c Re-added some helmets, Maelstrom added il y a 3 ans
  Sakke cf3d20cfec MG and Super Saber Fixed il y a 3 ans

BIN
addons/RD501_Helmets/_textures/Infantry/Fenrir.paa


BIN
addons/RD501_Helmets/_textures/Infantry/Kestrel.paa


BIN
addons/RD501_Helmets/_textures/Infantry/Maelstrom.paa


+ 3 - 2
addons/RD501_Helmets/infantry/config.cpp

@@ -130,7 +130,7 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Narrator,Narrator,Narrator.paa)
 	NEW_501_Inf_Helm_JLTS(Silver,Silver,Silver.paa)
 	NEW_501_Inf_Helm_JLTS(Sunshine,Sunshine,Sunshine.paa)
-	//NEW_501_Inf_Helm_JLTS(Fenrir,Fenrir,Fenrir.paa)
+	NEW_501_Inf_Helm_JLTS(Fenrir,Fenrir,Fenrir.paa)
 	NEW_501_Inf_Helm_JLTS(Kyrie,Kyrie,Kyrie.paa)
 	NEW_501_Inf_Helm_JLTS(Power,Power,Power.paa)
 	NEW_501_Inf_Helm_JLTS(Vulpes,Vulpes,Vulpes.paa)
@@ -186,6 +186,7 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Flak,Flak,Flak.paa)
 	NEW_501_Inf_Helm_JLTS(Chimera,Chimera,Chimera.paa)
 	NEW_501_Inf_Helm_JLTS(Peterson,Peterson,Peterson.paa)
+	NEW_501_Inf_Helm_JLTS(Maelstrom,Maelstrom,Maelstrom.paa)
 	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)
 	NEW_501_ARC_Helm_JLTS(Archaic,Archaic,Archaic.paa)
 	NEW_501_ARC_Helm_JLTS(Duke,Duke,Duke.paa)
@@ -208,8 +209,8 @@ class CfgWeapons
 	NEW_501_ARC_Helm_JLTS(Scruff,Scruff,Scruff.paa)
 	NEW_501_ARC_Helm_JLTS(Dalton,Dalton,Dalton.paa)
 	NEW_501_ARC_Helm_JLTS(Blythe,Blythe,Blythe.paa)
+	NEW_501_ARC_Helm_JLTS(Aeon,Aeon,Aeon.paa)
     NEW_501_Inf_Helm_JLTS2(CMC_03,CM-C,cm_c_trooper_helmet.paa)
     NEW_501_Inf_Helm_JLTS2(CM_03,CM,cm_trooper_helmet.paa)
     NEW_501_BARC_Helm_JLTS(BARC_CMC,CM,cm_barc_helmet.paa)
-	NEW_501_ARC_Helm_JLTS(Aeon,Aeon,Aeon.paa)
 };

+ 1 - 1
addons/RD501_Vehicles/air/LAAT/config.cpp

@@ -292,7 +292,7 @@ class CfgVehicles
 		RD501_magclamp_large_offset[] = {0.0, 0.0, -4.5};
 		RD501_magclamp_small_offset[] = {0.0, 0.0, -4.5};
 
-		faction = MACRO_QUOTE(macro_faction(republic)));
+		faction = MACRO_QUOTE(macro_faction(republic));
 		editorSubcategory = MACRO_QUOTE(macro_editor_cat_air(Republic_heli));
 		vehicleClass = MACRO_QUOTE(macro_editor_vehicle_type_air(Republic));
 		transportSoldier=14;

+ 4 - 4
addons/RD501_Vehicles/land/saber/config.cpp

@@ -470,7 +470,7 @@ class CfgWeapons
 class CfgMagazines
 {
 	class 3AS_300Rnd_SabreMG_Mag;
-	class 3AS_10Rnd_Sabre_mag;
+	class 3AS_50Rnd_Sabre_mag;
 	class 3as_saber_80Rnd_autocannon_30mm_mag;
 	class 3as_25rnd_Sabre_Super_Mag;
 	class 4Rnd_120mm_LG_cannon_missiles;
@@ -491,15 +491,15 @@ class CfgMagazines
 		count=100;
 		ammo=MACRO_QUOTE(macro_new_ammo(saber_auto));
 	};
-	class macro_new_mag(saber_main,10): 3AS_10Rnd_Sabre_mag
+	class macro_new_mag(saber_main,10): 3AS_50Rnd_Sabre_mag
 	{
 		displayNameShort="HEAT";
 		ammo=MACRO_QUOTE(macro_new_ammo(saber_main));
-
+		count = 10;
 	};
 	class macro_new_mag(saber_super_3as,25): 3as_25rnd_Sabre_Super_Mag
 	{
-		ammo=macro_new_ammo(saber_super_3as));
+		ammo= MACRO_QUOTE(macro_new_ammo(saber_super_3as));
 	};
 	class macro_new_mag(saber_recon_missile_he,4) :4Rnd_120mm_LG_cannon_missiles
 	{