Merge pull request #3 from acemod/master

PR from original
acemod · Dec 4, 2019 · 2d123f9 · 2d123f9
2 parents 0011844 + 5644666
commit 2d123f9
Show file tree

Hide file tree

Showing 44 changed files with 441 additions and 275 deletions.
diff --git a/.github/workflows/arma.yml b/.github/workflows/arma.yml
@@ -34,14 +34,16 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
-    container: acemod/armake:master
     steps:
     - name: Checkout the source code
       uses: actions/checkout@master
-    - name: Build (armake)
-      run: armake --version && make -j4
-    - name: Upload Artifact
-      uses: actions/upload-artifact@master
+    - name: Build using HEMTT
+      uses: arma-actions/hemtt@master
       with:
-        name: ace3-${{ github.sha }}-nobin
-        path: '@ace'
+        command: build --ci  # no --release due to https://github.com/synixebrett/HEMTT/issues/227
+    # https://github.com/actions/upload-artifact/issues/3#issuecomment-524442814
+    # - name: Upload Artifact
+    #   uses: actions/upload-artifact@master
+    #   with:
+    #     name: ace3-${{ github.sha }}-nobin
+    #     path: '@ace'
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,10 @@
 @*
 *.zip
 release/*
+releases/*
+hemtt
+hemtt.exe
 tools/temp
-tools/armake.exe
 *.cache
 *.pbo
 texHeaders.bin

diff --git a/Makefile b/Makefile
diff --git a/VERSION b/VERSION
diff --git a/addons/flashlights/CfgEventHandlers.hpp b/addons/flashlights/CfgEventHandlers.hpp
@@ -1,4 +1,3 @@
-
 class Extended_PostInit_EventHandlers {
     class ADDON {
         clientInit = QUOTE(call COMPILE_FILE(XEH_postInitClient));

diff --git a/addons/flashlights/CfgVehicles.hpp b/addons/flashlights/CfgVehicles.hpp
@@ -7,18 +7,17 @@ class CfgVehicles {
     };
 
     class Item_Base_F;
-
     class ACE_Flashlight_MX991Item: Item_Base_F {
         scope = 2;
         scopeCurator = 2;
         displayName = CSTRING(MX991_DisplayName);
         author = ECSTRING(common,ACETeam);
-        vehicleClass = "WeaponAccessories";
+        editorCategory = "EdCat_Equipment";
+        editorSubcategory = "EdSubcat_InventoryItems";
+        vehicleClass = "Items";
+
         class TransportItems {
-            class ACE_Flashlight_MX991 {
-                name = "ACE_Flashlight_MX991";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_Flashlight_MX991,1);
         };
     };
 
@@ -27,12 +26,12 @@ class CfgVehicles {
         scopeCurator = 2;
         displayName = CSTRING(KSF1_DisplayName);
         author = ECSTRING(common,ACETeam);
-        vehicleClass = "WeaponAccessories";
+        editorCategory = "EdCat_Equipment";
+        editorSubcategory = "EdSubcat_InventoryItems";
+        vehicleClass = "Items";
+
         class TransportItems {
-            class ACE_Flashlight_KSF1 {
-                name = "ACE_Flashlight_KSF1";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_Flashlight_KSF1,1);
         };
     };
 
@@ -41,38 +40,52 @@ class CfgVehicles {
         scopeCurator = 2;
         displayName = CSTRING(XL50_DisplayName);
         author = ECSTRING(common,ACETeam);
-        vehicleClass = "WeaponAccessories";
+        editorCategory = "EdCat_Equipment";
+        editorSubcategory = "EdSubcat_InventoryItems";
+        vehicleClass = "Items";
+
         class TransportItems {
-            class ACE_Flashlight_XL50 {
-                name = "ACE_Flashlight_XL50";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_Flashlight_XL50,1);
         };
     };
 
-    class NATO_Box_Base;
-    class EAST_Box_Base;
-    class IND_Box_Base;
-    class FIA_Box_Base_F;
+    class Pistol_Base_F;
+    class ACE_Item_Flashlight_Maglite_ML300L: Pistol_Base_F {
+        scope = 2;
+        scopeCurator = 2;
+        displayName = CSTRING(Maglite_ML300L_DisplayName);
+        author = ECSTRING(common,ACETeam);
+        editorCategory = "EdCat_Equipment";
+        editorSubcategory = "EdSubcat_InventoryItems";
+        vehicleClass = "Items";
+
+        class TransportItems {
+            MACRO_ADDITEM(ACE_Flashlight_Maglite_ML300L,1);
+        };
+    };
 
+    class NATO_Box_Base;
     class Box_NATO_Support_F: NATO_Box_Base {
         class TransportItems {
             MACRO_ADDITEM(ACE_Flashlight_MX991,12);
         };
     };
 
+    class EAST_Box_Base;
     class Box_East_Support_F: EAST_Box_Base {
         class TransportItems {
             MACRO_ADDITEM(ACE_Flashlight_KSF1,12);
         };
     };
 
+    class IND_Box_Base;
     class Box_IND_Support_F: IND_Box_Base {
         class TransportItems {
             MACRO_ADDITEM(ACE_Flashlight_XL50,12);
         };
     };
 
+    class FIA_Box_Base_F;
     class Box_FIA_Support_F: FIA_Box_Base_F {
         class TransportItems {
             MACRO_ADDITEM(ACE_Flashlight_MX991,12);
@@ -84,6 +97,7 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_Flashlight_MX991,12);
             MACRO_ADDITEM(ACE_Flashlight_KSF1,12);
             MACRO_ADDITEM(ACE_Flashlight_XL50,12);
+            MACRO_ADDITEM(ACE_Flashlight_Maglite_ML300L,2);
         };
     };
-};
+};
diff --git a/addons/flashlights/CfgWeapons.hpp b/addons/flashlights/CfgWeapons.hpp
@@ -1,17 +1,81 @@
 class CfgWeapons {
+    class Pistol;
+    class Pistol_Base_F: Pistol {
+        class WeaponSlotsInfo;
+    };
+
+    class ACE_Flashlight_Maglite_ML300L: Pistol_Base_F {
+        author = ECSTRING(common,ACETeam);
+        scope = 2;
+        displayName = CSTRING(Maglite_ML300L_DisplayName);
+        descriptionShort = CSTRING(Maglite_ML300L_Description);
+        model = QPATHTOF(data\maglite_ml300l.p3d);
+        picture = QPATHTOF(UI\maglite_ml300l_ca.paa);
+        cursor = "";
+        cursorAim = "";
+
+        // binarized rtm, animation in "extras/assets/maglite"
+        handAnim[] = {"OFP2_ManSkeleton", QPATHTOF(data\maglite_ml300l.rtm)};
+        recoil = "empty";
+        muzzlePos = "flash";
+        muzzleEnd = "flash dir";
+        magazines[] = {"FakeMagazine"}; // Required for the weapon info box to work correctly.
+        textureType = "default"; // empty texture
+        weaponInfoType = "RscWeaponEmpty";
+
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            holsterScale = 0; // Item does not fit a pistol holster, so hide it.
+            mass = 20;
+
+            class MuzzleSlot {};
+            class CowsSlot {};
+        };
+
+        inertia = 0.2;
+        dexterity = 1.8;
+
+        class FlashLight {
+            color[] = {180,180,190};
+            ambient[] = {0.9,0.81,0.7};
+            intensity = 85;
+            size = 1;
+            innerAngle = 5;
+            outerAngle = 80;
+            coneFadeCoef = 8;
+            position = "flash dir";
+            direction = "flash";
+            useFlare = 1;
+            flareSize = 0.8;
+            flareMaxDistance = 100;
+            dayLight = 1;
+
+            class Attenuation {
+                start = 0.25;
+                constant = 0;
+                linear = 0;
+                quadratic = 1;
+                hardLimitStart = 140;
+                hardLimitEnd = 150;
+            };
+
+            scale[] = {0};
+        };
+    };
 
     class ACE_ItemCore;
     class CBA_MiscItem_ItemInfo;
 
     class ACE_Flashlight_MX991: ACE_ItemCore {
         author = ECSTRING(common,ACETeam);
+        scope = 2;
         displayName = CSTRING(MX991_DisplayName);
         descriptionShort = CSTRING(MX991_Description);
-        model = QPATHTOF(data\MX_991.p3d);
-        picture = QPATHTOF(UI\mx991_ca.paa);
-        scope = 2;
+        model = QPATHTOF(data\mx_991.p3d);
+        picture = QPATHTOF(UI\mx_991_ca.paa);
+
         class ItemInfo: CBA_MiscItem_ItemInfo {
-            mass = 1;
+            mass = 4;
+
             class FlashLight {
                 ACE_Flashlight_Colour = "red";
                 ACE_Flashlight_Beam = QPATHTOF(UI\Flashlight_beam_red_ca.paa);
@@ -22,13 +86,15 @@ class CfgWeapons {
 
     class ACE_Flashlight_KSF1: ACE_ItemCore {
         author = ECSTRING(common,ACETeam);
+        scope = 2;
         displayName = CSTRING(KSF1_DisplayName);
         descriptionShort = CSTRING(KSF1_Description);
-        model = QPATHTOF(data\KSF_1.p3d);
-        picture = QPATHTOF(UI\ksf1_ca.paa);
-        scope = 2;
+        model = QPATHTOF(data\ksf_1.p3d);
+        picture = QPATHTOF(UI\ksf_1_ca.paa);
+
         class ItemInfo: CBA_MiscItem_ItemInfo {
-            mass = 1;
+            mass = 4;
+
             class FlashLight {
                 ACE_Flashlight_Colour = "red";
                 ACE_Flashlight_Beam = QPATHTOF(UI\Flashlight_beam_red_ca.paa);
@@ -39,13 +105,15 @@ class CfgWeapons {
 
     class ACE_Flashlight_XL50: ACE_ItemCore {
         author = ECSTRING(common,ACETeam);
+        scope = 2;
         displayName = CSTRING(XL50_DisplayName);
         descriptionShort = CSTRING(XL50_Description);
-        model = QPATHTOF(data\Maglight.p3d);
-        picture = QPATHTOF(UI\xl50_ca.paa);
-        scope = 2;
+        model = QPATHTOF(data\maglite_xl50.p3d);
+        picture = QPATHTOF(UI\maglite_xl50_ca.paa);
+
         class ItemInfo: CBA_MiscItem_ItemInfo {
-            mass = 1;
+            mass = 3;
+
             class FlashLight {
                 ACE_Flashlight_Colour = "white";
                 ACE_Flashlight_Beam = QPATHTOF(UI\Flashlight_beam_white_ca.paa);

diff --git a/addons/flashlights/UI/KSF1_ca.paa → addons/flashlights/UI/ksf_1_ca.paa b/addons/flashlights/UI/KSF1_ca.paa → addons/flashlights/UI/ksf_1_ca.paa
diff --git a/addons/flashlights/UI/maglite_ml300l_ca.paa b/addons/flashlights/UI/maglite_ml300l_ca.paa
diff --git a/addons/flashlights/UI/xl50_ca.paa → addons/flashlights/UI/maglite_xl50_ca.paa b/addons/flashlights/UI/xl50_ca.paa → addons/flashlights/UI/maglite_xl50_ca.paa
diff --git a/addons/flashlights/UI/mx991_ca.paa → addons/flashlights/UI/mx_991_ca.paa b/addons/flashlights/UI/mx991_ca.paa → addons/flashlights/UI/mx_991_ca.paa