Merge pull request #6 from Nilia119/Nilia_Uniform_2.0

New Uniforms
Nilia119 · Feb 22, 2024 · 5c7dea3 · 5c7dea3
2 parents 23fa064 + 01c3cc4
commit 5c7dea3
Show file tree

Hide file tree

Showing 21 changed files with 418 additions and 12 deletions.
diff --git a/Addons/EUFOR_Uniform/Fleck/EUFOR_Fleck_Uniform1_co.paa b/Addons/EUFOR_Uniform/Fleck/EUFOR_Fleck_Uniform1_co.paa
diff --git a/Addons/EUFOR_Uniform/Fleck/EUFOR_Fleck_Uniform_co.paa b/Addons/EUFOR_Uniform/Fleck/EUFOR_Fleck_Uniform_co.paa
diff --git a/Addons/EUFOR_Uniform/Fleck/pngs/BW2035_Fleck_Uniform.png b/Addons/EUFOR_Uniform/Fleck/pngs/BW2035_Fleck_Uniform.png
diff --git a/Addons/EUFOR_Uniform/Fleck/pngs/BW2035_Fleck_Uniform1.png b/Addons/EUFOR_Uniform/Fleck/pngs/BW2035_Fleck_Uniform1.png
diff --git a/Addons/EUFOR_Uniform/Multi/EUFOR_Multi_Uniform_co.paa b/Addons/EUFOR_Uniform/Multi/EUFOR_Multi_Uniform_co.paa
diff --git a/Addons/EUFOR_Uniform/Multi/Icon_Multi.paa b/Addons/EUFOR_Uniform/Multi/Icon_Multi.paa
diff --git a/Addons/EUFOR_Uniform/Multi/png/20240219160008_1.jpg b/Addons/EUFOR_Uniform/Multi/png/20240219160008_1.jpg
diff --git a/Addons/EUFOR_Uniform/Multi/png/EUFOR_Multi_Uniform.png b/Addons/EUFOR_Uniform/Multi/png/EUFOR_Multi_Uniform.png
diff --git a/Addons/EUFOR_Uniform/Multi/png/Icon_Multi.png b/Addons/EUFOR_Uniform/Multi/png/Icon_Multi.png
diff --git a/Addons/EUFOR_Uniform/Schnee/EUFOR_Schnee_Uniform_co.paa b/Addons/EUFOR_Uniform/Schnee/EUFOR_Schnee_Uniform_co.paa
diff --git a/Addons/EUFOR_Uniform/Schnee/Icon_schnee.paa b/Addons/EUFOR_Uniform/Schnee/Icon_schnee.paa
diff --git a/Addons/EUFOR_Uniform/Schnee/pngs/20240219124153_1.jpg b/Addons/EUFOR_Uniform/Schnee/pngs/20240219124153_1.jpg
diff --git a/Addons/EUFOR_Uniform/Schnee/pngs/EUFOR_Schnee_Uniform.png b/Addons/EUFOR_Uniform/Schnee/pngs/EUFOR_Schnee_Uniform.png
diff --git a/Addons/EUFOR_Uniform/Schnee/pngs/Icon_schnee.png b/Addons/EUFOR_Uniform/Schnee/pngs/Icon_schnee.png
diff --git a/Addons/EUFOR_Uniform/Tropen/EUFOR_Tropen_Uniform_Digi_co.paa b/Addons/EUFOR_Uniform/Tropen/EUFOR_Tropen_Uniform_Digi_co.paa
diff --git a/Addons/EUFOR_Uniform/Tropen/pngs/EUFOR_Tropen_Digital.png b/Addons/EUFOR_Uniform/Tropen/pngs/EUFOR_Tropen_Digital.png
diff --git a/Addons/EUFOR_Uniform/Tropen/pngs/EUFOR_Tropen_Digital1.png b/Addons/EUFOR_Uniform/Tropen/pngs/EUFOR_Tropen_Digital1.png
diff --git a/Addons/EUFOR_Uniform/cfgPatches.hpp b/Addons/EUFOR_Uniform/cfgPatches.hpp
@@ -8,15 +8,34 @@ class CfgPatches
 		units[]=
 		{
             "EUFOR_BW_Soldier",
+            "EUFOR_BW_Soldier_Sleeves",
             "EUFOR_soldat_Tropen",
+            "EUFOR_soldat_Tropen_Digital",
+            "EUFOR_soldat_Tropen_Sleeves",
+            "EUFOR_soldat_Tropen_Digital_Sleeves",
+            "EUFOR_soldat_Tropen_Shirt",
+            "EUFOR_soldat_Tropen_Digi_Shirt",
+            "EUFOR_soldat_Schnee",
+            "EUFOR_soldat_Multi",
             "EUFOR_soldat_Fleck",
-            "EUFOR_soldat_Fleck1"
+            "EUFOR_soldat_Fleck1",
+            "EUFOR_soldat_Fleck_Sleeves",
+            "EUFOR_soldat_Fleck1_Sleeves"
 		};
 		weapons[]=
 		{
 			"W_EUFOR_Uniform_Tropen",
+            "W_EUFOR_Uniform_Tropen_Digital",
+            "W_EUFOR_Uniform_Tropen_Sleeves",
+            "W_EUFOR_Uniform_Tropen_Digital_Sleeves",
+            "W_EUFOR_Uniform_Tropen_Shirt",
+            "W_EUFOR_Uniform_Tropen_Digital_Shirt",
+            "W_EUFOR_Uniform_Schnee",
+            "W_EUFOR_Uniform_Multi",
             "W_EUFOR_Uniform_Fleck",
-            "W_EUFOR_Uniform_Fleck1"
+            "W_EUFOR_Uniform_Fleck1",
+            "W_EUFOR_Uniform_Fleck_Sleeves",
+            "W_EUFOR_Uniform_Fleck1_Sleeves"
 		};
 		requiredVersion=0.1;
 		requiredAddons[]={"A3_Characters_F"};

diff --git a/Addons/EUFOR_Uniform/cfgVehicles.hpp b/Addons/EUFOR_Uniform/cfgVehicles.hpp
diff --git a/Addons/EUFOR_Uniform/cfgWeapons.hpp b/Addons/EUFOR_Uniform/cfgWeapons.hpp
@@ -11,6 +11,7 @@
 //Uniformen
 //Tatsächliche Uniform als Item hier werden die Einstellungen für die Uniformen getätigt
 
+    /* =======================================TROPEN======================================= */
 
 	class W_EUFOR_Uniform_Tropen: Uniform_Base
 	{
@@ -32,6 +33,90 @@
 		};
 	};
 
+class W_EUFOR_Uniform_Tropen_Digital: Uniform_Base
+{
+    author = "$STR_EUFOR_Uniform_Author";
+    scope = 2;
+    scopeArsenal = 2;
+    displayName = "$STR_EUFOR_Uniform_Tropen_Digital";
+    picture = "\EUFOR_Uniform\Tropen\Icon_tropen.paa";
+    model = "\A3\Characters_F\Common\Suitpacks\suitpack_original_F.p3d";
+    hiddenSelections[] = {"camo", "insignia"};
+    hiddenSelectionsTextures[] = {"EUFOR_Uniform\Tropen\EUFOR_Tropen_Uniform_Digi_co.paa"};
+
+    class ItemInfo: UniformItem
+    {
+        uniformModel = "-";
+        uniformClass = EUFOR_soldat_Tropen_Digi;
+        containerClass = Supply80;
+        mass = 40;
+    };
+};
+
+    /* ------- Ärmel hoch ------- */
+
+    class W_EUFOR_Uniform_Tropen_Sleeves: W_EUFOR_Uniform_Tropen
+    {
+        author = "$STR_EUFOR_Uniform_Author";
+        displayName = "$STR_EUFOR_Uniform_Tropen_Sleeves";
+
+        class ItemInfo: UniformItem
+        {
+            uniformModel = "-";
+            uniformClass = EUFOR_soldat_Tropen_Sleeves;
+            containerClass = Supply80;
+            mass = 40;
+        };
+
+    };
+
+    class W_EUFOR_Uniform_Tropen_Digital_Sleeves: W_EUFOR_Uniform_Tropen_Digital
+    {
+        author = "$STR_EUFOR_Uniform_Author";
+        displayName = "$STR_EUFOR_Uniform_Tropen_Digital_Sleeves";
+
+        class ItemInfo: UniformItem
+        {
+            uniformModel = "-";
+            uniformClass = EUFOR_soldat_Tropen_Digi_Sleeves;
+            containerClass = Supply80;
+            mass = 40;
+        };
+    };
+
+/* ------- T-Shirt ------- */
+
+class W_EUFOR_Uniform_Tropen_Shirt: W_EUFOR_Uniform_Tropen
+{
+    author = "$STR_EUFOR_Uniform_Author";
+    displayName = "$STR_EUFOR_Uniform_Tropen_Shirt";
+
+    class ItemInfo: UniformItem
+    {
+        uniformModel = "-";
+        uniformClass = EUFOR_soldat_Tropen_Shirt;
+        containerClass = Supply80;
+        mass = 40;
+    };
+
+};
+
+class W_EUFOR_Uniform_Tropen_Digital_Shirt: W_EUFOR_Uniform_Tropen_Digital
+{
+    author = "$STR_EUFOR_Uniform_Author";
+    displayName = "$STR_EUFOR_Uniform_Tropen_Digital_Shirt";
+
+    class ItemInfo: UniformItem
+    {
+        uniformModel = "-";
+        uniformClass = EUFOR_soldat_Tropen_Digi_Shirt;
+        containerClass = Supply80;
+        mass = 40;
+    };
+};
+
+    /* ======================================FLECK======================================== */
+
 class W_EUFOR_Uniform_Fleck: Uniform_Base
 {
     author = "$STR_EUFOR_Uniform_Author";
@@ -70,4 +155,84 @@ class W_EUFOR_Uniform_Fleck1: Uniform_Base
         containerClass = Supply80;
         mass = 40;
     };
+};
+
+/* ------- Ärmel hoch ------- */
+
+class W_EUFOR_Uniform_Fleck_Sleeves: W_EUFOR_Uniform_Fleck
+{
+    author = "$STR_EUFOR_Uniform_Author";
+    scope = 2;
+    scopeArsenal = 2;
+    displayName = "$STR_EUFOR_Uniform_Flecktarn_Sleeves";
+    picture = "\EUFOR_Uniform\Fleck\Icon_fleck.paa";
+
+    class ItemInfo: UniformItem
+    {
+        uniformModel = "-";
+        uniformClass = EUFOR_soldat_Fleck_Sleeves;
+        containerClass = Supply80;
+        mass = 40;
+    };
+};
+
+class W_EUFOR_Uniform_Fleck1_Sleeves: W_EUFOR_Uniform_Fleck1
+{
+    author = "$STR_EUFOR_Uniform_Author";
+    scope = 2;
+    scopeArsenal = 2;
+    displayName = "$STR_EUFOR_Uniform_Flecktarn_1_Sleeves";
+    picture = "\EUFOR_Uniform\Fleck\Icon_fleck.paa";
+
+    class ItemInfo: UniformItem
+    {
+        uniformModel = "-";
+        uniformClass = EUFOR_soldat_Fleck1_Sleeves;
+        containerClass = Supply80;
+        mass = 40;
+    };
+};
+
+/* ======================================SCHNEE======================================== */
+
+class W_EUFOR_Uniform_Schnee: Uniform_Base
+{
+    author = "$STR_EUFOR_Uniform_Author";
+    scope = 2;
+    scopeArsenal = 2;
+    displayName = "$STR_EUFOR_Uniform_Schneetarn";
+    picture = "\EUFOR_Uniform\Schnee\Icon_schnee.paa";
+    model = "\A3\Characters_F\Common\Suitpacks\suitpack_original_F.p3d";
+    hiddenSelections[] = {"camo", "insignia"};
+    hiddenSelectionsTextures[] = {"EUFOR_Uniform\Schnee\EUFOR_Schnee_Uniform_co.paa"};
+
+    class ItemInfo: UniformItem
+    {
+        uniformModel = "-";
+        uniformClass = EUFOR_soldat_Schnee;
+        containerClass = Supply80;
+        mass = 40;
+    };
+};
+
+/* ======================================MULTI======================================== */
+
+class W_EUFOR_Uniform_Multi: Uniform_Base
+{
+    author = "$STR_EUFOR_Uniform_Author";
+    scope = 2;
+    scopeArsenal = 2;
+    displayName = "$STR_EUFOR_Uniform_Multitarn";
+    picture = "\EUFOR_Uniform\Multi\Icon_Multi.paa";
+    model = "\A3\Characters_F\Common\Suitpacks\suitpack_original_F.p3d";
+    hiddenSelections[] = {"camo", "insignia"};
+    hiddenSelectionsTextures[] = {"EUFOR_Uniform\Multi\EUFOR_Multi_Uniform_co.paa"};
+
+    class ItemInfo: UniformItem
+    {
+        uniformModel = "-";
+        uniformClass = EUFOR_soldat_Multi;
+        containerClass = Supply80;
+        mass = 40;
+    };
 };
diff --git a/Addons/EUFOR_Uniform/stringtable.xml b/Addons/EUFOR_Uniform/stringtable.xml
@@ -12,19 +12,64 @@
             <German>Nilia</German>
         </Key>>
         <Key ID="STR_EUFOR_Uniform_Tropen">
-            <Original>IdN Tropentarn</Original>
-            <English>IdN Tropentarn</English>
-            <German>IdN Tropentarn</German>
+            <Original>EUFOR Tropentarn</Original>
+            <English>EUFOR Tropentarn</English>
+            <German>EUFOR Tropentarn</German>
+        </Key>
+        <Key ID="STR_EUFOR_Uniform_Tropen_Sleeves">
+            <Original>EUFOR Tropentarn Sleeves Up</Original>
+            <English>EUFOR Tropentarn Sleeves Up</English>
+            <German>EUFOR Tropentarn hochgekrempelt</German>
+        </Key>
+        <Key ID="STR_EUFOR_Uniform_Tropen_Shirt">
+            <Original>EUFOR Tropentarn T-Shirt</Original>
+            <English>EUFOR Tropentarn T-Shirt</English>
+            <German>EUFOR Tropentarn T-Shirt</German>
+        </Key>
+        <Key ID="STR_EUFOR_Uniform_Tropen_Digital">
+            <Original>EUFOR Tropentarn Digital</Original>
+            <English>EUFOR Tropentarn Digital</English>
+            <German>EUFOR Tropentarn Digital</German>
+        </Key>
+        <Key ID="STR_EUFOR_Uniform_Tropen_Digital_Sleeves">
+            <Original>EUFOR Tropentarn Digital Sleeves Up</Original>
+            <English>EUFOR Tropentarn Digital Sleeves Up</English>
+            <German>EUFOR Tropentarn Digital hochgekrempelt</German>
+        </Key>
+        <Key ID="STR_EUFOR_Uniform_Tropen_Digital_Shirt">
+            <Original>EUFOR Tropentarn Digital T-Shirt</Original>
+            <English>EUFOR Tropentarn Digital T-Shirt</English>
+            <German>EUFOR Tropentarn Digital T-Shirt</German>
         </Key>
         <Key ID="STR_EUFOR_Uniform_Flecktarn">
-            <Original>IdN Flecktarn</Original>
-            <English>IdN Flecktarn</English>
-            <German>IdN Flecktarn</German>
+            <Original>EUFOR Flecktarn</Original>
+            <English>EUFOR Flecktarn</English>
+            <German>EUFOR Flecktarn</German>
+        </Key>
+        <Key ID="STR_EUFOR_Uniform_Flecktarn_Sleeves">
+            <Original>EUFOR Flecktarn Sleeves Up</Original>
+            <English>EUFOR Flecktarn Sleeves Up</English>
+            <German>EUFOR Flecktarn hochgekrempelt</German>
         </Key>
         <Key ID="STR_EUFOR_Uniform_Flecktarn_1">
-            <Original>IdN Flecktarn Sand</Original>
-            <English>IdN Flecktarn Sand</English>
-            <German>IdN Flecktarn Sand</German>
+            <Original>EUFOR Flecktarn Sand</Original>
+            <English>EUFOR Flecktarn Sand</English>
+            <German>EUFOR Flecktarn Sand</German>
+        </Key>
+        <Key ID="STR_EUFOR_Uniform_Flecktarn_1_Sleeves">
+            <Original>EUFOR Flecktarn Sand Sleeves Up</Original>
+            <English>EUFOR Flecktarn Sand Sleeves Up</English>
+            <German>EUFOR Flecktarn Sand hochgekrempelt</German>
+        </Key>
+        <Key ID="STR_EUFOR_Uniform_Schneetarn">
+            <Original>EUFOR Snow Camo</Original>
+            <English>EUFOR Snow Camo</English>
+            <German>EUFOR Schneetarn</German>
+        </Key>
+        <Key ID="STR_EUFOR_Uniform_Multitarn">
+            <Original>EUFOR Multitarn</Original>
+            <English>EUFOR Multitarn</English>
+            <German>EUFOR Multitarn</German>
         </Key>
     </Package>
 </Project>