Merge branch 'main' of https://github.com/projectbraf/braf_factions

addons/armored/Cascavel_base.hpp

@@ -5,7 +5,7 @@ class braf_ee9_cascavel_col: braf_ee9_cascavel_base
 	side=2;
 	faction="BRAF_FACTIONS";
 	displayname="Colombian Army Engesa EE-9 Cascavel Mk3.";
-	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_COL_picture_ca.paa";
+	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_COL_picture_ca.jpg";
 	hiddenSelectionsTextures[]=
 	{
 		"",
@@ -36,7 +36,7 @@ class braf_ee9_cascavel_nia: braf_ee9_cascavel_base
 	side=2;
 	faction="BRAF_FACTIONS";
 	displayname="New Iraq Army Engesa EE-9 Cascavel Mk3.";
-	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_NIA_picture_ca.paa";
+	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_NIA_picture_ca.jpg";
 	animationList[]=
 	{
 		"showBackpacks",0,
@@ -73,7 +73,7 @@ class braf_ee9_cascavel_iran: braf_ee9_cascavel_base
 	side=2;
 	faction="BRAF_FACTIONS";
 	displayname="Iran Army Engesa EE-9 Cascavel Mk3.";
-	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_IRAN_picture_ca.paa";
+	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_IRAN_picture_ca.jpg";
 	animationList[]=
 	{
 		"showBackpacks",0,
@@ -106,7 +106,7 @@ class braf_ee9_cascavel_iran: braf_ee9_cascavel_base
 class braf_ee9_cascavel_oia: braf_ee9_cascavel_nia
 {
 	displayname="Old Iraq Army Engesa EE-9 Cascavel Mk3.";
-	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_OIA_picture_ca.paa";
+	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_OIA_picture_ca.jpg";
 	hiddenSelectionsTextures[]=
 	{
 		"",
@@ -137,7 +137,7 @@ class braf_ee9_cascavel_hiaf: braf_ee9_cascavel_base
 	side=1;
 	faction = "BRAF_HIAF";
 	displayname="Engesa EE-9 Cascavel Mk3.";
-	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_HIAF_picture_ca.paa";
+	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_HIAF_picture_ca.jpg";
 	hiddenSelectionsTextures[]=
 	{
 		"",
@@ -164,7 +164,7 @@ class braf_ee9_cascavel_hiaf: braf_ee9_cascavel_base
 class braf_ee9_cascavel_putain: braf_ee9_cascavel_hiaf
 {
 	displayname="Engesa EE-9 Cascavel Mk3.";
-	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_PUTAIN_picture_ca.paa";
+	editorPreview="braf\braf_factions\addons\armored\data\cascavel\ui\EE-9_PUTAIN_picture_ca.jpg";
 	hiddenSelectionsTextures[]=
 	{
 		"",

addons/armored/LMV_base.hpp

@@ -1,4 +1,5 @@
 class braf_lmv_gendarmerie : braf_lmv_base {
+    editorPreview = "braf\braf_factions\addons\armored\data\lmv\ui\LMV_gendarmeire_picture_ca.jpg";
     _generalMacro = "braf_lmv_gendarmerie";
     displayName = "VBMT-LSR Iveco LMV";
     scope = 2;
@@ -47,7 +48,7 @@ class braf_lmv_gendarmerie : braf_lmv_base {
     class Attributes {};
 };
 class braf_lmv_aaf : braf_lmv_base {
-    editorPreview = "braf\braf_factions\addons\armored\data\lmv\ui\LMV_EB_picture_ca.paa";
+    editorPreview = "braf\braf_factions\addons\armored\data\lmv\ui\LMV_AAF_picture_ca.jpg";
     _generalMacro = "braf_lmv_aaf";
     displayName = "VBMT-LSR Iveco LMV";
     scope = 2;
@@ -103,7 +104,7 @@ class braf_lmv_aaf : braf_lmv_base {
     class Attributes {};
 };
 class braf_lmv_aaf_rcws : braf_lmv_armed_base {
-    editorPreview = "braf\braf_factions\addons\armored\data\lmv\ui\LMV_RCWS_EB_picture_ca.paa";
+    editorPreview = "braf\braf_factions\addons\armored\data\lmv\ui\LMV_RCWS_AAF_picture_ca.jpg";
     _generalMacro = "braf_lmv_AAF_RCWS";
     displayName = "VBMT-LSR Iveco LMV REMAX";
     scope = 2;

addons/characters/units/v_cratenia_jungle_2020.hpp

@@ -825,12 +825,12 @@ class braf_cra_ar_jungle : braf_cra_ar_regular {
         "30Rnd_556x45_Stanag"
     };
     respawnWeapons[] = {
-        "braf_lmga4_green",
+        "braf_factions_colt_lmga4_green",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "braf_lmga4_green",
+        "braf_factions_colt_lmga4_green",
         "Throw",
         "Put"
     };

addons/headgear/config.cpp

@@ -23,6 +23,8 @@ class CfgPatches {
 
             //Beret
             "braf_hiaf_army_beret",
+            "braf_cratenia_army_beret",
+            "braf_cratenia_jungle_beret",
             "braf_hiaf_marine_beret",
 
             //Patrol Cap
@@ -31,7 +33,11 @@ class CfgPatches {
 
             //Boonie
             "braf_hiaf_boonie",
-            "braf_HIAF_Mariner_boonie"
+            "braf_HIAF_Mariner_boonie",
+
+            //Orlite
+            "braf_orlite_helm_olive",
+            "braf_orlite_helm_tan"
         };
     };
 };
@@ -64,4 +70,5 @@ class CfgWeapons {
     #include "w_hiaf_patrol_cap.hpp"
     #include "w_hiaf_boonie.hpp"
     #include "w_cratenia_orlite.hpp"
+    #include "w_cratenia_beret.hpp"
 };

addons/headgear/w_cratenia_beret.hpp

@@ -0,0 +1,49 @@
+//--------------------------Beret----------------------------
+//----- CRATENIA -----
+class braf_cratenia_beret_itemInfo : braf_hiaf_beret_itemInfo  {
+	uniformModel ="\A3\Characters_F\Common\headgear_beret01.p3d";
+    hiddenSelections[] = {"camo"};
+    hiddenSelectionsTextures[] = { "\braf\braf_factions\addons\headgear\data\Beret\cratenia\cratenia_regular_co.paa"};
+};
+class H_Beret_blk;
+class braf_cratenia_army_beret : H_Beret_blk {
+    scope = 2;
+    scopeArsenal = 2;
+    scopeCurator = 2; 
+    displayName = "[CRA] Beret, Blue (Army)";
+	picture = "\braf\braf_factions\addons\headgear\data\Beret\ui\braf_cratenia_army_beret_ca.paa";
+    hiddenSelections[] = {
+        "camo"
+    };
+    hiddenSelectionsTextures[] = {
+        "\braf\braf_factions\addons\headgear\data\Beret\cratenia\cratenia_regular_co.paa"
+    };
+    class ItemInfo : braf_cratenia_beret_itemInfo {
+        mass = 5;
+        hiddenSelections[] = {
+            "camo"
+        };
+        hiddenSelectionsTextures[] = {
+            "\braf\braf_factions\addons\headgear\data\Beret\cratenia\cratenia_regular_co.paa"
+        };
+    };
+};
+class braf_cratenia_jungle_beret : braf_cratenia_army_beret {
+    scope = 2;
+    scopeArsenal = 2;
+    scopeCurator = 2;
+    displayName = "[CRA] Beret, Black (Jungle)";
+    picture = "\braf\braf_factions\addons\headgear\data\Beret\ui\braf_cratenia_jungle_beret_ca.paa";
+    hiddenSelectionsTextures[] = {
+        "\braf\braf_factions\addons\headgear\data\Beret\cratenia\cratenia_sf_co.paa"
+    };
+    class ItemInfo : braf_cratenia_beret_itemInfo {
+        mass = 5;
+        hiddenSelections[] = {
+            "camo"
+        };
+        hiddenSelectionsTextures[] = {
+        "\braf\braf_factions\addons\headgear\data\Beret\cratenia\cratenia_sf_co.paa"
+		};
+    };
+};