Translations - German

addons/common/functions/fnc_setupLocalUnitsHandler.sqf

@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 /*
  * Author: dedmen
- * Adds the local unit event handlers. 
+ * Adds the local unit event handlers.
  * Access with function `ace_common_fnc_getLocalUnits` or array `ace_common_localUnits`
  *
  * Arguments:
@@ -15,6 +15,8 @@
  *
  * Public: No
  */
+// Ignore UAV/Drone AI
+#define IGNORE_BASE_UAVPILOTS "B_UAV_AI", "O_UAV_AI", "UAV_AI_base_F"
 
 GVAR(localUnits) = [];
 
@@ -27,7 +29,7 @@ GVAR(localUnits) = [];
         if (!alive _unit) exitWith {};
         GVAR(localUnits) pushBack _unit;
     };
-}] call CBA_fnc_addClassEventHandler;
+}, true, [IGNORE_BASE_UAVPILOTS]] call CBA_fnc_addClassEventHandler;
 
 ["CAManBase", "respawn", {
     params ["_unit"];
@@ -37,7 +39,7 @@ GVAR(localUnits) = [];
         if (!alive _unit) exitWith {};
         GVAR(localUnits) pushBack _unit;
     };
-}] call CBA_fnc_addClassEventHandler;
+}, true, [IGNORE_BASE_UAVPILOTS]] call CBA_fnc_addClassEventHandler;
 
 ["CAManBase", "local", {
     params ["_unit", "_local"];
@@ -49,7 +51,7 @@ GVAR(localUnits) = [];
     } else {
         GVAR(localUnits) deleteAt (GVAR(localUnits) find _unit);
     };
-}] call CBA_fnc_addClassEventHandler;
+}, true, [IGNORE_BASE_UAVPILOTS]] call CBA_fnc_addClassEventHandler;
 
 ["CAManBase", "deleted", {
     params ["_unit"];
@@ -64,7 +66,7 @@ GVAR(localUnits) = [];
             };
         }, [_unit]] call CBA_fnc_execNextFrame;
     };
-}] call CBA_fnc_addClassEventHandler;
+}, true, [IGNORE_BASE_UAVPILOTS]] call CBA_fnc_addClassEventHandler;
 
 ["CAManBase", "killed", {
     params ["_unit"];
@@ -73,4 +75,4 @@ GVAR(localUnits) = [];
     if (local _unit) then {
         GVAR(localUnits) deleteAt (GVAR(localUnits) find _unit);
     };
-}] call CBA_fnc_addClassEventHandler;
+}, true, [IGNORE_BASE_UAVPILOTS]] call CBA_fnc_addClassEventHandler;

addons/fastroping/CfgVehicles.hpp

@@ -207,7 +207,7 @@ class CfgVehicles {
         GVAR(enabled) = 2;
         GVAR(ropeOrigins)[] = {"ropeOriginRight", "ropeOriginLeft"};
         GVAR(friesType) = "ACE_friesAnchorBar";
-        GVAR(friesAttachmentPoint)[] = {0.065, 2.2, -0.15};
+        GVAR(friesAttachmentPoint)[] = {0.035, 2.2, -0.15};
         GVAR(onPrepare) = QFUNC(onPrepareCommon);
         GVAR(onCut) = QFUNC(onCutCommon);
         EQUIP_FRIES_ATTRIBUTE;

addons/fastroping/XEH_PREP.hpp

@@ -4,7 +4,6 @@ PREP(canDeployRopes);
 PREP(canFastRope);
 PREP(canPrepareFRIES);
 PREP(canStowFRIES);
-PREP(checkVehicleThread);
 PREP(cutRopes);
 PREP(deployAI);
 PREP(deployRopes);
@@ -18,3 +17,4 @@ PREP(onPrepareCommon);
 PREP(onRopeBreak);
 PREP(prepareFRIES);
 PREP(stowFRIES);
+PREP(unequipFRIES);

addons/fastroping/functions/fnc_equipFRIES.sqf

@@ -12,7 +12,7 @@
  * Example:
  * [_vehicle] call ace_fastroping_fnc_equipFRIES
  *
- * Public: No
+ * Public: Yes
  */
 params ["_vehicle"];
 
@@ -24,15 +24,8 @@ if !(isNumber (_config >> QGVAR(enabled))) then {
         private _fries = (getText (_config >> QGVAR(friesType))) createVehicle [0, 0, 0];
         _fries attachTo [_vehicle, (getArray (_config >> QGVAR(friesAttachmentPoint)))];
         _vehicle setVariable [QGVAR(FRIES), _fries, true];
-        _vehicle addEventHandler ["Killed", {
-            params ["_vehicle"];
-            deleteVehicle (_vehicle getVariable [QGVAR(FRIES), objNull]);
-            _vehicle setVariable [QGVAR(FRIES), nil, true];
 
-            if !((_vehicle getVariable [QGVAR(deployedRopes), []] isEqualTo [])) then {
-                [_vehicle] call FUNC(cutRopes);
-            };
-        }];
-        [FUNC(checkVehicleThread), [_vehicle, _fries], 5] call CBA_fnc_waitAndExecute;
+        _vehicle addEventHandler ["Killed", FUNC(unequipFRIES)];
+        _vehicle addEventHandler ["Deleted", FUNC(unequipFRIES)];
     };
 };

addons/fastroping/functions/fnc_unequipFRIES.sqf

@@ -0,0 +1,24 @@
+#include "script_component.hpp"
+/*
+ * Author: BaerMitUmlaut
+ * Removes FRIES from helicopter.
+ *
+ * Arguments:
+ * 0: The helicopter <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [_vehicle] call ace_fastroping_fnc_unequipFRIES
+ *
+ * Public: Yes
+ */
+params ["_vehicle"];
+
+deleteVehicle (_vehicle getVariable [QGVAR(FRIES), objNull]);
+_vehicle setVariable [QGVAR(FRIES), nil, true];
+
+if !((_vehicle getVariable [QGVAR(deployedRopes), []] isEqualTo [])) then {
+    [_vehicle] call FUNC(cutRopes);
+};

addons/map/XEH_postInitClient.sqf

@@ -114,6 +114,7 @@ GVAR(vehicleLightColor) = [1,1,1,0];
         switch (true) do {
             case (_vehicle isKindOf "Tank");
             case (_vehicle isKindOf "Wheeled_APC"): { {true} };
+            case (_vehicle isKindOf "ParachuteBase"): { {false} };
             case (_vehicle isKindOf "Helicopter");
             case (_vehicle isKindOf "Plane"): { {(driver _vehicle == _unit) || {gunner _vehicle == _unit}} };
             default { {false} };

addons/refuel/functions/fnc_dropNozzle.sqf

@@ -29,11 +29,16 @@ _nozzle setVelocity [0, 0, 0];
 
 private _groundPosition = getPosASL _nozzle;
 private _posA = (getPosASL _nozzle) vectorAdd [0,0,0.05];
-private _posB = (getPosASL _nozzle) vectorAdd [0,0,-1000];
+private _posB = (getPosASL _nozzle) vectorAdd [0,0,- GVAR(hoseLength)];
 private _intersections = lineIntersectsSurfaces [_posA, _posB, _unit, _nozzle, true, 1, "GEOM"];
 TRACE_1("",_intersections);
 if (_intersections isEqualTo []) then {
-    _groundPosition set [2, (getTerrainHeightASL _groundPosition) + 0.005];
+    WARNING_1("no ground intersections for nozzle drop @ %1",_groundPosition);
+    if (!isNull _unit) then {
+        _groundPosition = getPosASL _unit; // place at unit's feet
+    } else {
+        _groundPosition set [2, (getTerrainHeightASL _groundPosition) + 0.005];
+    };
 } else {
     _groundPosition = ((_intersections select 0) select 0) vectorAdd [0,0,0.005];
 };

docs/wiki/framework/fastroping-framework.md

@@ -80,3 +80,23 @@ To create a custom FRIES you will need to look out for a few things:
 The `onCut` and `onPrepare` functions are responsible for opening/closing the helicopter doors and animating the FRIES (if equipped) when the FRIES gets prepared and the ropes get cut.
 
 ACE3 provides two functions that are compatible with most helicopters and all ACE3 FRIES. It is recommended to use the naming scheme for doors that is present in the base game so you can use the already existing functions `ace_fastroping_fnc_onCutCommon` and `ace_fastroping_fnc_onPrepareCommon`. You can however define your own functions if you so desire. Note that these functions run in the unscheduled environment, so commands like `sleep` and `waitUntil` will not work unless you use `spawn`. It is recommended to use `ace_common_fnc_waitAndExecute` and `ace_common_fnc_waitUntilAndExecute` instead though.
+
+## 4. Scripting
+
+### 4.1. Add FRIES to helicopter
+
+`ace_fastroping_fnc_equipFRIES`
+
+|   | Arguments | Type | Optional (default value)
+---| --------- | ---- | ------------------------
+0  | Helicopter | Object | Required
+**R** | None | None | Return value
+
+### 4.2. Remove FRIES from helicopter
+
+`ace_fastroping_fnc_unequipFRIES`
+
+|   | Arguments | Type | Optional (default value)
+---| --------- | ---- | ------------------------
+0  | Helicopter | Object | Required
+**R** | None | None | Return value