feat: new uniforms equipments (#19)

* Adding retextured vanilla helmets * Fixing path for the texture of beret. * Adding Gorkas * Fixing naming problem for white balaclava * Changing display names to have the same format * Adding new facewears & Fixing minor issues with existant ones * Adding vests * Adding backpacks * Adding author to vests * Changing radio bag maximum load * Adding TFAR LR to radio bag & Fixing radio bag maximum load * Restore legacy equipments * fix: add pbo prefix to some addons * Fix: Renaming the config class Co-authored-by: PhileasLX <x@x.x>
team-gsri · Aug 16, 2022 · 0552c5b · 0552c5b
1 parent 0fcbc77
commit 0552c5b
Show file tree

Hide file tree

Showing 77 changed files with 1,444 additions and 57 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,24 +30,24 @@ jobs:
       with:
         source: 'addons/gsri_backpacks'
         target: 'addons'
-        includes: '*.xml'
-        flags: '-clear'
+        includes: '*.paa;*.xml;*.rvmat'
+        flags: '"-clear","-prefix=fr\gsri\backpacks"'
 
     - name: Build GSRI Flags
       uses: team-gsri/actions-addon-builder@master
       with:
         source: 'addons/gsri_flags'
         target: 'addons'
         includes: '*.paa;*.xml'
-        flags: '"-clear","-prefix=fr/gsri/flags"'
+        flags: '"-clear","-prefix=fr\gsri\flags"'
 
     - name: Build GSRI Headgear
       uses: team-gsri/actions-addon-builder@master
       with:
         source: 'addons/gsri_headgear'
         target: 'addons'
-        includes: '*.paa;*.xml'
-        flags: '"-clear","-prefix=fr/gsri/headgear"'
+        includes: '*.paa;*.xml;*.rvmat'
+        flags: '"-clear","-prefix=fr\gsri\headgear"'
 
     - name: Build GSRI Radio
       uses: team-gsri/actions-addon-builder@master
@@ -78,8 +78,8 @@ jobs:
       with:
         source: 'addons/gsri_vests'
         target: 'addons'
-        includes: '*.xml'
-        flags: '-clear'
+        includes: '*.paa;*.xml'
+        flags: '"-clear","-prefix=fr\gsri\vests"'
 
     - name: Upload pbo files
       uses: actions/upload-artifact@v2

diff --git a/addons/gsri_backpacks/$PBOPREFIX$ b/addons/gsri_backpacks/$PBOPREFIX$
@@ -0,0 +1 @@
+fr\gsri\backpacks
diff --git a/addons/gsri_backpacks/Data/gsri_compact_co.paa b/addons/gsri_backpacks/Data/gsri_compact_co.paa
diff --git a/addons/gsri_backpacks/Data/gsri_fast_co.paa b/addons/gsri_backpacks/Data/gsri_fast_co.paa
diff --git a/addons/gsri_backpacks/Data/gsri_radiobag_co.paa b/addons/gsri_backpacks/Data/gsri_radiobag_co.paa
diff --git a/addons/gsri_backpacks/Data/gsri_small_co.paa b/addons/gsri_backpacks/Data/gsri_small_co.paa
diff --git a/addons/gsri_backpacks/Data/gsri_tortila_co.paa b/addons/gsri_backpacks/Data/gsri_tortila_co.paa
diff --git a/addons/gsri_backpacks/UI/icon_gsri_compact_ca.paa b/addons/gsri_backpacks/UI/icon_gsri_compact_ca.paa
diff --git a/addons/gsri_backpacks/UI/icon_gsri_fast_ca.paa b/addons/gsri_backpacks/UI/icon_gsri_fast_ca.paa
diff --git a/addons/gsri_backpacks/UI/icon_gsri_radiobag_ca.paa b/addons/gsri_backpacks/UI/icon_gsri_radiobag_ca.paa
diff --git a/addons/gsri_backpacks/UI/icon_gsri_small_ca.paa b/addons/gsri_backpacks/UI/icon_gsri_small_ca.paa
diff --git a/addons/gsri_backpacks/UI/icon_gsri_tortila_ca.paa b/addons/gsri_backpacks/UI/icon_gsri_tortila_ca.paa
diff --git a/addons/gsri_backpacks/config.cpp b/addons/gsri_backpacks/config.cpp
@@ -1,14 +1,85 @@
 class CfgPatches {
-    class gsri_backpacks {
-        units[]={};
-        requiredVersion=0.1;
-        requiredAddons[]={"COS_back_pack", "ace_logistics_wirecutter"};
-        author="[-GSRI-]Cheitan";
-    };
+	class gsri_backpacks	{
+		author="$STR_GSRI_BACKPACKS_AUTHOR";
+		units[]={};
+		weapons[]={};
+		requiredVersion=0.1;
+		requiredAddons[] = {
+			"A3_Weapons_F",
+			"A3_Supplies_F_Enoch",
+			"tfar_core",
+			"COS_back_pack", 
+			"ace_logistics_wirecutter"
+		};
+	};
 };
 
-class CfgVehicles {
-    class B_AssaultPack_mcamo;
+class CfgVehicles
+{
+	class Bag_Base;
+	class GSRI_AssaultPack : Bag_Base
+	{
+		author="$STR_GSRI_BACKPACKS_AUTHOR";
+		scope = 2;
+		model = "\A3\weapons_f\Ammoboxes\bags\Backpack_Compact.p3d";
+		displayName = "$STR_GSRI_BACKPACKS_ASSAULTPACK";
+		picture = "\fr\gsri\backpacks\ui\icon_gsri_compact_ca.paa";
+		hiddenSelectionsTextures[]={"\fr\gsri\backpacks\Data\gsri_compact_co.paa"};
+		maximumLoad = 160;
+		mass = 20;
+	};
+	class GSRI_Kitbag : Bag_Base
+	{
+		author="$STR_GSRI_BACKPACKS_AUTHOR";
+		scope = 2;
+		model = "\A3\weapons_f\Ammoboxes\bags\Backpack_Fast.p3d";
+		displayName = "$STR_GSRI_BACKPACKS_KITBAG";
+		picture = "\fr\gsri\backpacks\ui\icon_gsri_fast_ca.paa";
+		hiddenSelectionsTextures[]={"\fr\gsri\backpacks\Data\gsri_fast_co.paa"};
+		maximumLoad = 280;
+		mass = 50;
+	};
+	class GSRI_RadioBag : Bag_Base
+	{
+		author="$STR_GSRI_BACKPACKS_AUTHOR";
+		scope = 2;
+		model = "\A3\supplies_f_enoch\Bags\B_RadioBag_01_F.p3d";
+		displayName = "$STR_GSRI_BACKPACKS_RADIOBAG";
+		picture = "\fr\gsri\backpacks\ui\icon_gsri_radiobag_ca.paa";
+		hiddenSelections[] = {"Camo1"};
+		hiddenSelectionsTextures[]={"\fr\gsri\backpacks\Data\gsri_radiobag_co.paa"};
+		maximumLoad = 220;
+		mass = 110;
+		tf_HasLRradio = 1;
+        tf_dialogUpdate = "call TFAR_fnc_updateLRDialogToChannel;";
+        tf_encryptionCode = "tf_west_radio_code";
+        tf_dialog = "rt1523g_radio_dialog";
+        tf_subtype = "digital_lr";
+	};
+	class GSRI_TacticalPack : Bag_Base
+	{
+		author="$STR_GSRI_BACKPACKS_AUTHOR";
+		scope = 2;
+		model = "\A3\weapons_f\Ammoboxes\bags\Backpack_Small.p3d";
+		displayName = "$STR_GSRI_BACKPACKS_TACTICALPACK";
+		picture = "\fr\gsri\backpacks\ui\icon_gsri_small_ca.paa";
+		hiddenSelectionsTextures[]={"\fr\gsri\backpacks\Data\gsri_small_co.paa"};
+		maximumLoad = 240;
+		mass = 40;
+	};
+	class GSRI_Carryall : Bag_Base
+	{
+		author="$STR_GSRI_BACKPACKS_AUTHOR";
+		scope = 2;
+		model = "\A3\weapons_f\Ammoboxes\bags\Backpack_Tortila.p3d";
+		displayName = "$STR_GSRI_BACKPACKS_CARRYALL";
+		picture = "\fr\gsri\backpacks\ui\icon_gsri_tortila_ca.paa";
+		hiddenSelectionsTextures[]={"\fr\gsri\backpacks\Data\gsri_tortila_co.paa"};
+		maximumLoad = 320;
+		mass = 60;
+	};
+
+	class B_AssaultPack_mcamo;
 
     //Notifying the use of legacy items
     //for radio variants, see gsri_radio.pbo

diff --git a/addons/gsri_backpacks/stringtable.xml b/addons/gsri_backpacks/stringtable.xml
@@ -1,5 +1,35 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<Project name="gsri_backpacks">
+<Project name="gsri_gear">
+	<Package name="gsri_backpacks">
+		<Container name="Metadata">
+			<Key ID="STR_GSRI_BACKPACKS_AUTHOR">
+				<Original>[-GSRI-] PhileasLX for www.gsri.team</Original>
+				<French>[-GSRI-] PhileasLX pour www.gsri.team</French>
+			</Key>
+		</Container>
+		<Container name="Backpacks names">
+			<Key ID="STR_GSRI_BACKPACKS_ASSAULTPACK">
+				<Original>[-GSRI-] Assault Pack</Original>
+				<French>[-GSRI-] Paquetage d'assaut</French>
+			</Key>
+			<Key ID="STR_GSRI_BACKPACKS_KITBAG">
+				<Original>[-GSRI-] Kitbag</Original>
+				<French>[-GSRI-] Paquetage de terrain</French>
+			</Key>
+			<Key ID="STR_GSRI_BACKPACKS_RADIOBAG">
+				<Original>[-GSRI-] Radio Pack</Original>
+				<French>[-GSRI-] Sac à dos radio</French>
+			</Key>
+			<Key ID="STR_GSRI_BACKPACKS_TACTICALPACK">
+				<Original>[-GSRI-] Tactical Backpack</Original>
+				<French>[-GSRI-] Sac à dos tactique</French>
+			</Key>
+			<Key ID="STR_GSRI_BACKPACKS_CARRYALL">
+				<Original>[-GSRI-] Carryall Backpack</Original>
+				<French>[-GSRI-] Sac à dos multifonctions</French>
+			</Key>
+		</Container>
+	</Package>
 	<Package name="various">
 		<Container name="GSRI_backpacks_common">
 			<Key ID="STR_GSRI_backpack_obsolete_displayName">

diff --git a/addons/gsri_headgear/UI/icon_gsri_balaclava_dark_ca.paa b/addons/gsri_headgear/UI/icon_gsri_balaclava_dark_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_balaclava_light_ca.paa b/addons/gsri_headgear/UI/icon_gsri_balaclava_light_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_balaclava_med_ca.paa b/addons/gsri_headgear/UI/icon_gsri_balaclava_med_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_balaclava_v2_camo_ca.paa b/addons/gsri_headgear/UI/icon_gsri_balaclava_v2_camo_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_balaclava_v2_dark_ca.paa b/addons/gsri_headgear/UI/icon_gsri_balaclava_v2_dark_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_balaclava_v2_light_ca.paa b/addons/gsri_headgear/UI/icon_gsri_balaclava_v2_light_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_balaclava_v2_med_ca.paa b/addons/gsri_headgear/UI/icon_gsri_balaclava_v2_med_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_balaclava_white_ca.paa b/addons/gsri_headgear/UI/icon_gsri_balaclava_white_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_balaclava_white_goggles_ca.paa b/addons/gsri_headgear/UI/icon_gsri_balaclava_white_goggles_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_bandMask_camo_ca.paa b/addons/gsri_headgear/UI/icon_gsri_bandMask_camo_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_bandMask_dark_ca.paa b/addons/gsri_headgear/UI/icon_gsri_bandMask_dark_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_bandMask_glasses_camo_ca.paa b/addons/gsri_headgear/UI/icon_gsri_bandMask_glasses_camo_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_bandMask_glasses_dark_ca.paa b/addons/gsri_headgear/UI/icon_gsri_bandMask_glasses_dark_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_bandMask_glasses_light_ca.paa b/addons/gsri_headgear/UI/icon_gsri_bandMask_glasses_light_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_bandMask_glasses_med_ca.paa b/addons/gsri_headgear/UI/icon_gsri_bandMask_glasses_med_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_bandMask_light_ca.paa b/addons/gsri_headgear/UI/icon_gsri_bandMask_light_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_bandMask_med_ca.paa b/addons/gsri_headgear/UI/icon_gsri_bandMask_med_ca.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_helmet.paa b/addons/gsri_headgear/UI/icon_gsri_helmet.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_helmet_light.paa b/addons/gsri_headgear/UI/icon_gsri_helmet_light.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_helmet_modular.paa b/addons/gsri_headgear/UI/icon_gsri_helmet_modular.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_helmet_modular_advanced.paa b/addons/gsri_headgear/UI/icon_gsri_helmet_modular_advanced.paa
diff --git a/addons/gsri_headgear/UI/icon_gsri_helmet_spec.paa b/addons/gsri_headgear/UI/icon_gsri_helmet_spec.paa