New FRIES model, new animations

addons/fastroping/CfgMoves.hpp

@@ -8,12 +8,32 @@ class CfgMovesBasic {
 class CfgMovesMaleSdr: CfgMovesBasic {
     class States {
         class Crew;
-        class ACE_FastRoping: Crew {
-            file = PATHTOF(anim\fastroping.rtm);
-            interpolateTo[] = {"Unconscious",1};
+        class ACE_freefallLoop: Crew {
+            file = PATHTOF(anim\freefallLoop.rtm);
+            interpolateTo[] = {"Unconscious", 1};
             disableWeapons = 1;
             disableWeaponsLong = 1;
             canReload = 0;
+            looped = 1;
+            speed = 0.204082;
+        };
+        class ACE_freefallStart: Crew {
+            file = PATHTOF(anim\freefallStart.rtm);
+            interpolateTo[] = {"Unconscious", 1};
+            disableWeapons = 1;
+            disableWeaponsLong = 1;
+            canReload = 0;
+            looped = 0;
+            speed = 0.61224502;
+        };
+        class ACE_slidingLoop: Crew {
+            file = PATHTOF(anim\slidingLoop.rtm);
+            interpolateTo[] = {"Unconscious", 1};
+            disableWeapons = 1;
+            disableWeaponsLong = 1;
+            canReload = 0;
+            looped = 1;
+            speed = 0.441176;
         };
     };
 };

addons/fastroping/CfgVehicles.hpp

@@ -14,7 +14,7 @@ class CfgVehicles {
         destrType = "";
     };
     class ACE_friesAnchorBar: ACE_friesBase {
-		author = "BaerMitUmlaut";
+		author = "jokoho48";
 		scope = 2;
 		model = PATHTOF(data\friesAnchorBar.p3d);
         animated = 1;
@@ -99,9 +99,9 @@ class CfgVehicles {
     };
     class Heli_Transport_01_base_F: Helicopter_Base_H {
         GVAR(enabled) = 2;
-        GVAR(ropeOrigins[]) = {"hookRight", "hookLeft"};
+        GVAR(ropeOrigins[]) = {"ropeOriginRight", "ropeOriginLeft"};
         GVAR(friesType) = "ACE_friesAnchorBar";
-        GVAR(friesAttachmentPoint[]) = {0.065, 2.2, -0.17};
+        GVAR(friesAttachmentPoint[]) = {0.065, 2.2, -0.15};
 
         GVAR(onPrepare) = QFUNC(onPrepareCommon);
         GVAR(onCut) = QFUNC(onCutCommon);

addons/fastroping/data/fries.rvmat

@@ -1,9 +0,0 @@
-ambient[] = {0.9, 0.9, 0.9, 1};
-diffuse[] = {0.9, 0.9, 0.9, 1};
-forcedDiffuse[] = {0, 0, 0, 0};
-emmisive[] = {0, 0, 0, 1};
-specular[] = {1, 1, 1, 1};
-specularPower = 100;
-PixelShaderID = "Normal";
-VertexShaderID = "Basic";
-surfaceInfo = "A3\data_f\Penetration\metal.bisurf";

addons/fastroping/data/friesAnchorBar.rvmat

@@ -0,0 +1,66 @@
+ambient[] = {1,1,1,1};
+diffuse[] = {1,1,1,1};
+forcedDiffuse[] = {0,0,0,0};
+emmisive[] = {0,0,0,0};
+specular[] = {0.071,0.071,0.071,1};
+specularPower = 110;
+PixelShaderID = "Super";
+VertexShaderID = "Super";
+class Stage1 {
+    texture = "z\ace\addons\fastroping\data\friesAnchorBar_nohq.paa";
+    uvSource = "tex";
+    class uvTransform {
+        aside[] = {1,0,0};
+        up[] = {0,1,0};
+        dir[] = {0,0,0};
+        pos[] = {0,0,0};
+    };
+};
+class Stage2 {
+    texture = "#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
+    uvSource = "tex";
+    class uvTransform {
+        aside[] = {10,0,0};
+        up[] = {0,10,0};
+        dir[] = {0,0,0};
+        pos[] = {0,0,0};
+    };
+};
+class Stage3 {
+    texture = "#(argb,8,8,3)color(0,0,0,0,MC)";
+    uvSource = "tex";
+    class uvTransform {
+        aside[] = {1,0,0};
+        up[] = {0,1,0};
+        dir[] = {0,0,0};
+        pos[] = {0,0,0};
+    };
+};
+class Stage4 {
+    texture = "z\ace\addons\fastroping\data\friesAnchorBar_as.paa";
+    uvSource = "tex";
+    class uvTransform {
+        aside[] = {1,0,0};
+        up[] = {0,1,0};
+        dir[] = {0,0,1};
+        pos[] = {0,0,1};
+    };
+};
+class Stage5 {
+    texture = "z\ace\addons\fastroping\data\friesAnchorBar_smdi.paa";
+    uvSource = "tex";
+    class uvTransform {
+        aside[] = {1,0,0};
+        up[] = {0,1,0};
+        dir[] = {0,0,1};
+        pos[] = {0,0,1};
+    };
+};
+class Stage6 {
+    texture = "#(ai,64,64,1)fresnel(4.5,1.1)";
+    uvSource = "none";
+};
+class Stage7 {
+    texture = "a3\data_f\env_land_ca.paa";
+    uvSource = "none";
+};

addons/fastroping/data/model.cfg

@@ -8,8 +8,8 @@ class CfgSkeletons {
         isDiscrete = 1;
         skeletonInherit = "Default";
         skeletonBones[] = {
-            "tubeRight", "",
-            "tubeLeft", ""
+            "barRight", "",
+            "barLeft", ""
         };
     };
 };
@@ -23,12 +23,12 @@ class CfgModels {
     class friesAnchorBar: Default {
         skeletonName = "ace_friesAnchorBar_skeleton";
         sectionsInherit = "";
-        sections[] = {"hookRight", "hookLeft"};
+        sections[] = {"ropeOriginRight", "ropeOriginLeft"};
         class animations {
             class extendHookRight {
                 type = "translation";
                 source = "";
-                selection = "tubeRight";
+                selection = "barRight";
                 axis = "slideAxis";
                 animPeriod = 0;
                 minValue = 0;
@@ -36,11 +36,11 @@ class CfgModels {
                 minPhase = 0;
                 maxPhase = 1;
                 offset0 = 0;
-                offset1 = -0.5;
+                offset1 = 0.45;
             };
             class extendHookLeft: extendHookRight {
-                selection = "tubeLeft";
-                offset1 = 0.5;
+                selection = "barLeft";
+                offset1 = -0.45;
             };
         };
     };

addons/fastroping/functions/fnc_fastRopeLocalPFH.sqf

@@ -25,15 +25,20 @@ private ["_vectorUp", "_vectorDir", "_origin"];
 if (vehicle _unit != _unit) exitWith {};
 
 //Start fast roping
-if (animationState _unit != "ACE_FastRoping") exitWith {
+if (animationState _unit != "ACE_slidingLoop") exitWith {
     _unit disableCollisionWith _dummy;
-    _unit attachTo [_dummy, [0, 0, -1.2]];
-    [_unit, "ACE_FastRoping", 2] call EFUNC(common,doAnimation);
+    _unit attachTo [_dummy, [0, 0, -0.5]];
+    [_unit, "ACE_slidingLoop", 2] call EFUNC(common,doAnimation);
 };
 
 //End of fast rope
 if (isNull attachedTo _unit) exitWith {
-    [_unit, "", 2] call EFUNC(common,doAnimation);
+    if ((getPos _unit) select 2 > 1) then {
+        [_unit, "ACE_freeFallStart", 2] call EFUNC(common,doAnimation);
+        [_unit, "ACE_freeFallLoop", 1] call EFUNC(common,doAnimation);
+    } else {
+        [_unit, "", 2] call EFUNC(common,doAnimation);
+    };
     _unit setVectorUp [0, 0, 1];
 
     [_pfhHandle] call CBA_fnc_removePerFrameHandler;

addons/fastroping/functions/fnc_fastRopeServerPFH.sqf

@@ -25,10 +25,10 @@ private ["_vectorUp", "_vectorDir", "_origin"];
 if (vehicle _unit != _unit) exitWith {};
 
 //Start fast roping
-if (animationState _unit != "ACE_FastRoping") exitWith {
+if (animationState _unit != "ACE_slidingLoop") exitWith {
     //Fix for twitchyness
     _dummy setMass 80;
-    _dummy setCenterOfMass [0, 0, -1];
+    _dummy setCenterOfMass [0, 0, -2];
     _origin = getPosASL _hook;
     _dummy setPosASL (_origin vectorAdd [0, 0, -2]);
     _dummy setVectorUp [0, 0, 1];

addons/fastroping/script_component.hpp

@@ -1,12 +1,12 @@
 #define COMPONENT fastroping
 #include "\z\ace\addons\main\script_mod.hpp"
 
-#ifdef DEBUG_ENABLED_BLANK
+#ifdef DEBUG_ENABLED_FASTROPING
     #define DEBUG_MODE_FULL
 #endif
 
-#ifdef DEBUG_SETTINGS_BLANK
-    #define DEBUG_SETTINGS DEBUG_SETTINGS_BLANK
+#ifdef DEBUG_SETTINGS_FASTROPING
+    #define DEBUG_SETTINGS DEBUG_SETTINGS_FASTROPING
 #endif
 
 #include "\z\ace\addons\main\script_macros.hpp"