Fix!: Reorganize addons in GSRI Gear (#28)

* Fix!: Unify backpacks, headgear, uniforms, vests in a single "equipment" addon
* Feat: Tweak and adjust balistic/load/mass values in order to better reflect general appearance and offer a wide range of load-carrying/weight mixes
* Fix: authors not properly inherited on custom objects, because why not : https://discord.com/channels/105462288051380224/122121444703338496/1018542108098953256
* Fix!: fuse legacy stuff together in a single "legacy" addon, that will be easy to delete once the transition from old to new stuff is fully executed
* Fix!: fuse lockers and flags in a single "props" addon
* Fix: merge vanilla compat in "equipment" addon
* Update release.yml

.github/workflows/release.yml

@@ -27,69 +27,29 @@ jobs:
     - name: Checkout files
       uses: actions/checkout@v2
 
-    - name: Build GSRI Backpacks
+    - name: Build GSRI Equipment
       uses: team-gsri/actions-addon-builder@master
       with:
-        source: 'addons/gsri_backpacks'
+        source: 'addons/gsri_equipment'
         target: 'addons'
-        includes: '*.paa;*.xml;*.rvmat'
-        flags: '"-clear","-prefix=fr\gsri\backpacks"'
+        includes: '*.p3d;*.paa;*.txt;*.xml;*.sqf;*.wss;*.ogg*;.rvmat'
+        flags: '"-clear","-prefix=fr\gsri\equipment"'
 
-    - name: Build GSRI Flags
+    - name: Build GSRI Props
       uses: team-gsri/actions-addon-builder@master
       with:
-        source: 'addons/gsri_flags'
+        source: 'addons/gsri_props'
         target: 'addons'
-        includes: '*.paa;*.xml'
-        flags: '"-clear","-prefix=fr\gsri\flags"'
+        includes: '*.p3d;*.paa;*.txt;*.xml;*.sqf;*.wss;*.ogg*;.rvmat'
+        flags: '"-clear","-prefix=fr\gsri\props"'
 
-    - name: Build GSRI Headgear
+    - name: Build GSRI Legacy configs
       uses: team-gsri/actions-addon-builder@master
       with:
-        source: 'addons/gsri_headgear'
+        source: 'addons/gsri_legacy'
         target: 'addons'
-        includes: '*.paa;*.xml;*.rvmat'
-        flags: '"-clear","-prefix=fr\gsri\headgear"'
-
-    - name: Build GSRI Radio
-      uses: team-gsri/actions-addon-builder@master
-      with:
-        source: 'addons/gsri_radio'
-        target: 'addons'
-        includes: '*.xml'
-        flags: '-clear'
-
-    - name: Build GSRI Uniforms
-      uses: team-gsri/actions-addon-builder@master
-      with:
-        source: 'addons/gsri_uniforms'
-        target: 'addons'
-        includes: '*.paa;*.xml;*.rvmat'
-        flags: '"-clear","-prefix=fr\gsri\uniforms"'
-
-    - name: Build GSRI Vanilla Compat
-      uses: team-gsri/actions-addon-builder@master
-      with:
-        source: 'addons/gsri_vanilla_compat'
-        target: 'addons'
-        includes: '*.xml'
-        flags: '-clear'
-
-    - name: Build GSRI Vests
-      uses: team-gsri/actions-addon-builder@master
-      with:
-        source: 'addons/gsri_vests'
-        target: 'addons'
-        includes: '*.paa;*.xml'
-        flags: '"-clear","-prefix=fr\gsri\vests"'
-
-    - name: Build GSRI Lockers
-      uses: team-gsri/actions-build-addon@0.1.1
-      with:
-        source: 'addons/gsri_lockers'
-        target: 'addons'
-        prefix: 'fr\gsri\lockers'
-
+        includes: '*.p3d;*.paa;*.txt;*.xml;*.sqf;*.wss;*.ogg*;.rvmat'
+        flags: '"-clear","-prefix=fr\gsri\legacy"'
 
     - name: Upload pbo files
       uses: actions/upload-artifact@v2

addons/gsri_equipment/backpacks/backpacks.hpp

@@ -0,0 +1,57 @@
+class Bag_Base;
+class GSRI_AssaultPack : Bag_Base {
+    author="$STR_GSRI_AUTHORS_PHILEAS";
+    scope = 2;
+    model = "\A3\weapons_f\Ammoboxes\bags\Backpack_Compact.p3d";
+    displayName = "$STR_GSRI_BACKPACK_ASSAULTPACK";
+    picture = "\fr\gsri\equipment\backpacks\UI\icon_gsri_compact_ca.paa";
+    hiddenSelectionsTextures[]={"\fr\gsri\equipment\backpacks\Data\gsri_compact_co.paa"};
+    maximumLoad = 160;
+    mass = 20;
+};
+class GSRI_Kitbag : Bag_Base {
+    author="$STR_GSRI_AUTHORS_PHILEAS";
+    scope = 2;
+    model = "\A3\weapons_f\Ammoboxes\bags\Backpack_Fast.p3d";
+    displayName = "$STR_GSRI_BACKPACK_KITBAG";
+    picture = "\fr\gsri\equipment\backpacks\UI\icon_gsri_fast_ca.paa";
+    hiddenSelectionsTextures[]={"\fr\gsri\equipment\backpacks\Data\gsri_fast_co.paa"};
+    maximumLoad = 280;
+    mass = 50;
+};
+class GSRI_RadioBag : Bag_Base {
+    author="$STR_GSRI_AUTHORS_PHILEAS";
+    scope = 2;
+    model = "\A3\supplies_f_enoch\Bags\B_RadioBag_01_F.p3d";
+    displayName = "$STR_GSRI_BACKPACK_RADIOBAG";
+    picture = "\fr\gsri\equipment\backpacks\UI\icon_gsri_radiobag_ca.paa";
+    hiddenSelections[] = {"Camo1"};
+    hiddenSelectionsTextures[]={"\fr\gsri\equipment\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_AUTHORS_PHILEAS";
+    scope = 2;
+    model = "\A3\weapons_f\Ammoboxes\bags\Backpack_Small.p3d";
+    displayName = "$STR_GSRI_BACKPACK_TACTICALPACK";
+    picture = "\fr\gsri\equipment\backpacks\UI\icon_gsri_small_ca.paa";
+    hiddenSelectionsTextures[]={"\fr\gsri\equipment\backpacks\Data\gsri_small_co.paa"};
+    maximumLoad = 240;
+    mass = 40;
+};
+class GSRI_Carryall : Bag_Base {
+    author="$STR_GSRI_AUTHORS_PHILEAS";
+    scope = 2;
+    model = "\A3\weapons_f\Ammoboxes\bags\Backpack_Tortila.p3d";
+    displayName = "$STR_GSRI_BACKPACK_CARRYALL";
+    picture = "\fr\gsri\equipment\backpacks\UI\icon_gsri_tortila_ca.paa";
+    hiddenSelectionsTextures[]={"\fr\gsri\equipment\backpacks\Data\gsri_tortila_co.paa"};
+    maximumLoad = 320;
+    mass = 60;
+};

addons/gsri_equipment/config.cpp

@@ -0,0 +1,63 @@
+#define TEast			0
+#define TWest			1
+#define TGuerrila		2
+#define TCivilian		3
+#define TSideUnknown	4
+#define TEnemy			5
+#define TFriendly		6
+#define TLogic			7
+
+class CfgPatches {
+    class gsri_equipment {
+        author="$STR_GSRI_AUTHORS";
+        units[]={};
+        weapons[]={};
+        requiredVersion=0.1;
+        requiredAddons[] = {
+            "A3_Characters_F",
+            "A3_Characters_F_Beta", 
+            "A3_Characters_F_Enoch",
+            "A3_Characters_F_EXP",
+            "A3_Supplies_F_Enoch",
+            "A3_Weapons_F",
+            "cba_jr",
+            "cba_jam",
+            "tfar_core"
+        };
+    };
+};
+
+class asdg_OpticRail1913;
+class asdg_FrontSideRail;
+
+class CfgMagazineWells {
+    class CBA_556x45_STANAG {
+        SMA_mags[] = {
+            "SMA_30Rnd_556x45_M855A1",
+            "SMA_30Rnd_556x45_M855A1_Tracer",
+            "SMA_30Rnd_556x45_M855A1_IR",
+            "SMA_30Rnd_556x45_Mk318",
+            "SMA_30Rnd_556x45_Mk318_Tracer",
+            "SMA_30Rnd_556x45_Mk318_IR",
+            "SMA_30Rnd_556x45_Mk262",
+            "SMA_30Rnd_556x45_Mk262_Tracer",
+            "SMA_30Rnd_556x45_Mk262_IR"
+        };
+    };
+};
+
+class CfgVehicles {
+    #include "backpacks\backpacks.hpp"
+    #include "uniforms\uniforms.hpp"
+};
+
+class CfgWeapons {
+    #include "weapons_compat.hpp"
+    #include "headgear\headgear.hpp"
+    #include "uniforms\uniformItems.hpp"
+    #include "vests\vests.hpp"
+};
+
+class CfgGlasses {
+    #include "facewear\facewear.hpp"
+};