Merge pull request #33 from Theseus-Aegis/metal-gear-remake

Theseus-Aegis · Jun 2, 2020 · 71d5f6b · 71d5f6b
2 parents 1f205e2 + ec67cad
commit 71d5f6b
Show file tree

Hide file tree

Showing 492 changed files with 4,879 additions and 427 deletions.
diff --git a/addons/main/config.cpp b/addons/main/config.cpp
@@ -46,6 +46,7 @@ class CfgPatches {
             "CUP_TrackedVehicles_BMP",
             "CUP_TrackedVehicles_M113",
             "CUP_TrackedVehicles_M60",
+            "CUP_Weapons_ACR",
             "CUP_Weapons_AK",
             "CUP_Weapons_Ammunition",
             "CUP_Weapons_Backpacks",

diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
@@ -1,3 +1,3 @@
 #define MAJOR 1
-#define MINOR 4
-#define PATCH 2
+#define MINOR 5
+#define PATCH 0
diff --git a/addons/msf/CfgGlasses.hpp b/addons/msf/CfgGlasses.hpp
@@ -0,0 +1,51 @@
+class CfgGlasses {
+    class None;
+    class TACU_MSF_Glasses_Headbag: None {
+        dlc = QUOTE(PREFIX);
+        author = "Rebel, Facel";
+        scope = 2;
+        scopeCurator = 2;
+        identityTypes[] = {};
+        mass = 5;
+        displayName = "Headbag";
+        model = QPATHTOF(msf_glasses_headbag.p3d);
+        picture = QPATHTOF(ui\headbag\msf_glasses_headbag_ca.paa);
+        ace_overlay = QPATHTOF(ui\headbag\msf_glasses_headbag_overlay.paa);
+        ace_overlayCracked = QPATHTOF(ui\headbag\msf_glasses_headbag_overlay_cracked.paa);
+        ace_resistance = 1;
+        ace_protection = 1;
+    };
+
+    class TACU_MSF_Glasses_Scarf_Green: None {
+        dlc = QUOTE(PREFIX);
+        author = "Facel";
+        scope = 2;
+        scopeCurator = 2;
+        identityTypes[] = {};
+        mass = 4;
+        displayName = "Shoulder Scarf (Green)";
+        model = QPATHTOF(msf_glasses_scarf.p3d);
+        picture = QPATHTOF(ui\scarves\msf_glasses_scarf_green_ca.paa);
+        hiddenSelections[] = {"camo"};
+        hiddenSelectionsTextures[] = {QPATHTOF(data\scarves\msf_glasses_scarf_green_co.paa)};
+        hiddenSelectionsMaterials[] = {QPATHTOF(data\scarves\msf_glasses_scarf.rvmat)};
+    };
+    class TACU_MSF_Glasses_Scarf_Khaki: TACU_MSF_Glasses_Scarf_Green {
+        author = "Facel";
+        displayName = "Shoulder Scarf (Khaki)";
+        picture = QPATHTOF(ui\scarves\msf_glasses_scarf_khaki_ca.paa);
+        hiddenSelectionsTextures[] = {QPATHTOF(data\scarves\msf_glasses_scarf_khaki_co.paa)};
+    };
+    class TACU_MSF_Glasses_Scarf_Black: TACU_MSF_Glasses_Scarf_Green {
+        author = "Facel";
+        displayName = "Shoulder Scarf (Black)";
+        picture = QPATHTOF(ui\scarves\msf_glasses_scarf_black_ca.paa);
+        hiddenSelectionsTextures[] = {QPATHTOF(data\scarves\msf_glasses_scarf_black_co.paa)};
+    };
+    class TACU_MSF_Glasses_Scarf_Red: TACU_MSF_Glasses_Scarf_Green {
+        author = "Facel";
+        displayName = "Shoulder Scarf (Red)";
+        picture = QPATHTOF(ui\scarves\msf_glasses_scarf_red_ca.paa);
+        hiddenSelectionsTextures[] = {QPATHTOF(data\scarves\msf_glasses_scarf_red_co.paa)};
+    };
+};
diff --git a/addons/msf/CfgUnitInsignia.hpp b/addons/msf/CfgUnitInsignia.hpp
@@ -1,28 +1,28 @@
 class CfgUnitInsignia {
-	class TACU_MSF_Insignia_DDogs_Text {
+    class TACU_MSF_Insignia_DDogs_Text {
         scope = 2;
         author = "Kresky";
         displayName = "Diamond Dogs";
-        texture = QPATHTOF(data\MSF_Insignia_DDogs_Text.paa);
+        texture = QPATHTOF(data\msf_insignia_ddogs_text.paa);
     };
 
     class TACU_MSF_Insignia_Foxhound_Text {
         scope = 2;
         author = "Kresky";
         displayName = "Foxhound";
-        texture = QPATHTOF(data\MSF_Insignia_Foxhound_Text.paa);
+        texture = QPATHTOF(data\msf_insignia_foxhound_text.paa);
     };
 
     class TACU_MSF_Insignia_MSF {
-		scope = 2;
-		author = "Kresky";
-		displayName = "Militaires Sans Frontières";
-		texture = QPATHTOF(data\MSF_Insignia_MSF.paa);
-	};
+        scope = 2;
+        author = "Kresky";
+        displayName = "Militaires Sans Frontières";
+        texture = QPATHTOF(data\msf_insignia_msf.paa);
+    };
     class TACU_MSF_Insignia_MSF_Text {
         scope = 2;
-		author = "Kresky";
-		displayName = "Militaires Sans Frontières (Text)";
-		texture = QPATHTOF(data\MSF_Insignia_MSF_Text.paa);
+        author = "Kresky";
+        displayName = "Militaires Sans Frontières (Text)";
+        texture = QPATHTOF(data\msf_insignia_msf_text.paa);
     };
 };