Merge pull request #5886 from acemod/tripd-updates

update tripod

addons/main/CfgEditorSubcategories.hpp

@@ -1,5 +1,5 @@
 class CfgEditorSubcategories {
     class GVAR(subcategory) {
-        displayName = ECSTRING(main,Category_Logistics);
+        displayName = CSTRING(Category_Logistics);
     };
 };

addons/main/config.cpp

@@ -906,3 +906,4 @@ class CfgMods {
 #include "CfgSettings.hpp"
 #include "CfgModuleCategories.hpp"
 #include "CfgVehicleClasses.hpp"
+#include "CfgEditorSubcategories.hpp"

addons/repair/CfgVehicles.hpp

@@ -322,7 +322,7 @@ class CfgVehicles {
         accuracy = 0.2;
         vehicleClass = "ACE_Logistics_Items";
         editorCategory = "EdCat_Supplies";
-        editorSubcategory = QGVAR(subcategory);
+        editorSubcategory = QEGVAR(main,subcategory);
     };
 
     class ACE_Track: ACE_RepairItem_Base {

addons/repair/config.cpp

@@ -21,4 +21,3 @@ class CfgPatches {
 #include "CfgEventHandlers.hpp"
 #include "CfgMoves.hpp"
 #include "CfgVehicles.hpp"
-#include "CfgEditorSubcategories.hpp"

addons/tripod/CfgVehicles.hpp

@@ -49,12 +49,13 @@ class CfgVehicles {
         scope = 2;
         displayName = CSTRING(DisplayName);
         model = QPATHTOF(data\sniper_tripod.p3d);
+        icon = "\A3\Static_F_Gamma\data\UI\map_StaticTurret_AT_CA.paa";
 
         class AnimationSources {
             class slide_down_tripod {
                 source = "user";
                 animPeriod = 0.02;
-                initPhase = 0;
+                initPhase = 0.5;
                 minValue = 0;
                 maxValue = 1;
             };
@@ -65,15 +66,15 @@ class CfgVehicles {
 
         class ACE_Actions {
             class ACE_MainActions {
-                selection = "";
+                selection = "interaction_point";
                 distance = 5;
-                condition = "true";
+                condition = "(true)";
 
                 class ACE_Pickup {
                     selection = "";
                     displayName = CSTRING(PickUp);
                     distance = 5;
-                    condition = "true";
+                    condition = "(true)";
                     statement = QUOTE([ARR_2(_player,_target)] call FUNC(pickup));
                     showDisabled = 0;
                     exceptions[] = {};
@@ -85,7 +86,7 @@ class CfgVehicles {
                     selection = "";
                     displayName = CSTRING(Adjust);
                     distance = 5;
-                    condition = "true";
+                    condition = "(true)";
                     //wait a frame to handle "Do When releasing action menu key" option:
                     statement = QUOTE([ARR_2({_this call FUNC(adjust)}, [ARR_2(_player,_target)])] call CBA_fnc_execNextFrame);
                     showDisabled = 0;
@@ -95,5 +96,9 @@ class CfgVehicles {
                 };
             };
         };
+
+        editorCategory = "EdCat_Supplies";
+        editorSubcategory = QEGVAR(main,subcategory);
+        editorPreview = QPATHTOF(data\preview_tripod.jpg);
     };
 };

addons/tripod/XEH_postInit.sqf

@@ -4,7 +4,7 @@ if (!hasInterface) exitWith {};
 
 GVAR(adjustPFH) = -1;
 
-GVAR(height) = 0;
+GVAR(height) = 0.5;
 
 // Cancel adjustment if interact menu opens
 ["ace_interactMenuOpened", {[ACE_player] call FUNC(handleInteractMenuOpened)}] call CBA_fnc_addEventHandler;

addons/tripod/XEH_preInit.sqf

@@ -6,4 +6,9 @@ PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
+["ACE_TripodObject", "killed", {
+    params ["_tripod"];
+    [{deleteVehicle _this}, _tripod, 5] call CBA_fnc_waitAndExecute;
+}] call CBA_fnc_addClassEventHandler;
+
 ADDON = true;

addons/tripod/data/model.cfg

@@ -1,10 +1,10 @@
-class CfgSkeletons
+class CfgSkeletons {
-{
     class Default {
         isDiscrete = 1;
         skeletonInherit = "";
         skeletonBones[] = {};
     };
+
     class ace_snipertripod_skeleton: Default {
         isDiscrete = 1;
         skeletonInherit = "Default";
@@ -13,21 +13,25 @@ class CfgSkeletons
             "leg_1","tripod",
             "leg_2","tripod",
             "leg_3","tripod",
+            "interaction_point","tripod",
             "leg_slide_1","leg_1",
             "leg_slide_2","leg_2",
             "leg_slide_3","leg_3"
-        };	
+        };
     };
 };
+
 class CfgModels {
     class Default {
         sectionsInherit = "";
         sections[] = {};
         skeletonName = "";
     };
+
     class sniper_tripod: Default {
         skeletonName = "ace_snipertripod_skeleton";
         sectionsInherit = "Default";
+
         class animations {
             class slide_down_tripod {
                 type = "translation";
@@ -40,25 +44,25 @@ class CfgModels {
                 maxValue = 1;
                 sourceAddress = "clamp";
                 offset0 = 0;
-                offset1 = 0.855;				
+                offset1 = 0.855;
             };
             class retract_leg_1: slide_down_tripod {
                 selection = "leg_slide_1";
                 begin = "slide_end_1";
                 end = "slide_start_1";
                 offset0 = 0;
-                offset1 = -0.95;			
+                offset1 = -0.95;
             };
             class retract_leg_2: retract_leg_1 {
                 selection = "leg_slide_2";
                 begin = "slide_end_2";
-                end = "slide_start_2";			
+                end = "slide_start_2";
             };
             class retract_leg_3: retract_leg_2 {
                 selection = "leg_slide_3";
                 begin = "slide_end_3";
-                end = "slide_start_3";			
+                end = "slide_start_3";
-            };			
+            };
         };
     };
 };

addons/tripod/functions/fnc_place.sqf

@@ -33,13 +33,13 @@ if (stance _unit == "STAND") then {
     private _tripod = "ACE_TripodObject" createVehicle [0, 0, 0];
 
     {
-        _tripod animate [_x, 1];
+        _tripod animate [_x, 0.5];
     } count ["slide_down_tripod", "retract_leg_1", "retract_leg_2", "retract_leg_3"];
 
     [{
         (_this select 0) params ["_tripod", "_direction", "_position"];
 
-        if (_tripod animationPhase "slide_down_tripod" == 1) then {
+        if (_tripod animationPhase "slide_down_tripod" == 0.5) then {
             _tripod setDir _direction;
             _tripod setPosASL _position;
 

addons/tripod/script_component.hpp

@@ -2,9 +2,9 @@
 #define COMPONENT_BEAUTIFIED Tripod
 #include "\z\ace\addons\main\script_mod.hpp"
 
-// #define DEBUG_MODE_FULL
+#define DEBUG_MODE_FULL
-// #define DISABLE_COMPILE_CACHE
+#define DISABLE_COMPILE_CACHE
-// #define ENABLE_PERFORMANCE_COUNTERS
+//#define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_TRIPOD
     #define DEBUG_MODE_FULL