Merge remote-tracking branch 'upstream/main' into Fixed-typo-in-CBA-s…

…ettings
7Cav · Apr 8, 2024 · 67f6740 · 67f6740
2 parents 9bf5623 + 1e2b293
commit 67f6740
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/cScripts/functions/systems/fn_addInsigniaSelectionList.sqf b/cScripts/functions/systems/fn_addInsigniaSelectionList.sqf
@@ -98,6 +98,7 @@ if (!isPlayer _object) then {
 [_object,"Squad Insignia 2/1/C/1-7","Charlie_1_2","z\cav\addons\insignia\data\Charlie_1_2.paa",_charlieCategory] call FUNC(addInsigniaSelection);
 [_object,"Squad Insignia 3/1/C/1-7","Charlie_1_3","z\cav\addons\insignia\data\Charlie_1_3.paa",_charlieCategory] call FUNC(addInsigniaSelection);
 [_object,"Squad Insignia 4/1/C/1-7","Charlie_1_4","z\cav\addons\insignia\data\Charlie_1_4.paa",_charlieCategory] call FUNC(addInsigniaSelection);
+[_object,"Squad Insignia 4/1/C/1-7 (Colored)","charlie_1_4_colored","z\cav\addons\insignia\data\Charlie_1_4_Colored.paa",_charlieCategory] call FUNC(addInsigniaSelection);
 
 // Charlie Company  2nd Platoon
 [_object,"Platoon Insignia 2/C/1-7","Charlie_2","z\cav\addons\insignia\data\Charlie_2.paa",_charlieCategory] call FUNC(addInsigniaSelection);
@@ -120,4 +121,4 @@ if (!isPlayer _object) then {
 [_object,"S3","specialized_s3","z\cav\addons\insignia\data\specialized_s3.paa",_specialCategory] call FUNC(addInsigniaSelection);
 
 
-INFO_1("addInsigniaSelectionList", "Setup insignia selection list on %1 is completed.", _object);
+INFO_1("addInsigniaSelectionList", "Setup insignia selection list on %1 is completed.", _object);
diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf
@@ -120,8 +120,12 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [
 private _cav_dragoon_base_F = createHashMapFromArray [
     ["antiarmor", [
         ["SmokeLauncherMag",[0],6],
-        ["2000Rnd_762x51_Belt_T_Red",[0],2000],
-        ["2000Rnd_762x51_Belt_T_Red",[0],2000],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
         ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
         ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
         ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
@@ -131,8 +135,12 @@ private _cav_dragoon_base_F = createHashMapFromArray [
     ]],
     // ["antiair", [
     //     ["SmokeLauncherMag",[0,0],6],
-    //     ["2000Rnd_762x51_Belt_T_Red",[0],2000],
-    //     ["2000Rnd_762x51_Belt_T_Red",[0],2000],
+    //     ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+    //     ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+    //     ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+    //     ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+    //     ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+    //     ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
     //     ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
     //     ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
     //     ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
@@ -141,8 +149,12 @@ private _cav_dragoon_base_F = createHashMapFromArray [
     // ]],
     ["default",[
         ["SmokeLauncherMag",[0],6],
-        ["2000Rnd_762x51_Belt_T_Red",[0],2000],
-        ["2000Rnd_762x51_Belt_T_Red",[0],2000],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
         ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
         ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
         ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
@@ -152,8 +164,12 @@ private _cav_dragoon_base_F = createHashMapFromArray [
     ]],
     ["balanced",[
         ["SmokeLauncherMag",[0],6],
-        ["2000Rnd_762x51_Belt_T_Red",[0],2000],
-        ["2000Rnd_762x51_Belt_T_Red",[0],2000],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
+        ["cav_mag_300Rnd_762x51_Belt_Red",[0],300],
         ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
         ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
         ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],