Skip to content

Commit f37abb4

Browse files
committed
Add config property animation overwrite
1 parent ec5b84c commit f37abb4

2 files changed

Lines changed: 40 additions & 26 deletions

File tree

addons/sitting/functions/fnc_getRandomAnimation.sqf

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,43 @@
1515
* Public: No
1616
*/
1717

18+
params [["_object", objNull, [objNull]]];
19+
// Original function had no parameters, so add default for BWC
20+
21+
private _animations = [];
22+
if !(isNull configOf _object) then {
23+
// configOf objNull returns CONFIG-NULL
24+
_animations = getArray (configOf _object >> QGVAR(animations));
25+
};
26+
27+
if (_animations isEqualTo []) then {
28+
_animations = [
29+
QGVAR(HubSittingChairA_idle1),
30+
QGVAR(HubSittingChairA_idle2),
31+
QGVAR(HubSittingChairA_idle3),
32+
QGVAR(HubSittingChairA_move1),
33+
QGVAR(HubSittingChairB_idle1),
34+
QGVAR(HubSittingChairB_idle2),
35+
QGVAR(HubSittingChairB_idle3),
36+
QGVAR(HubSittingChairB_move1),
37+
QGVAR(HubSittingChairC_idle1),
38+
QGVAR(HubSittingChairC_idle2),
39+
QGVAR(HubSittingChairC_idle3),
40+
QGVAR(HubSittingChairC_move1),
41+
QGVAR(HubSittingChairUA_idle1),
42+
QGVAR(HubSittingChairUA_idle2),
43+
QGVAR(HubSittingChairUA_idle3),
44+
QGVAR(HubSittingChairUA_move1),
45+
QGVAR(HubSittingChairUB_idle1),
46+
QGVAR(HubSittingChairUB_idle2),
47+
QGVAR(HubSittingChairUB_idle3),
48+
QGVAR(HubSittingChairUB_move1),
49+
QGVAR(HubSittingChairUC_idle1),
50+
QGVAR(HubSittingChairUC_idle2),
51+
QGVAR(HubSittingChairUC_idle3),
52+
QGVAR(HubSittingChairUC_move1)
53+
];
54+
};
55+
1856
// Select random animation from Animations Pool
19-
selectRandom [
20-
QGVAR(HubSittingChairA_idle1),
21-
QGVAR(HubSittingChairA_idle2),
22-
QGVAR(HubSittingChairA_idle3),
23-
QGVAR(HubSittingChairA_move1),
24-
QGVAR(HubSittingChairB_idle1),
25-
QGVAR(HubSittingChairB_idle2),
26-
QGVAR(HubSittingChairB_idle3),
27-
QGVAR(HubSittingChairB_move1),
28-
QGVAR(HubSittingChairC_idle1),
29-
QGVAR(HubSittingChairC_idle2),
30-
QGVAR(HubSittingChairC_idle3),
31-
QGVAR(HubSittingChairC_move1),
32-
QGVAR(HubSittingChairUA_idle1),
33-
QGVAR(HubSittingChairUA_idle2),
34-
QGVAR(HubSittingChairUA_idle3),
35-
QGVAR(HubSittingChairUA_move1),
36-
QGVAR(HubSittingChairUB_idle1),
37-
QGVAR(HubSittingChairUB_idle2),
38-
QGVAR(HubSittingChairUB_idle3),
39-
QGVAR(HubSittingChairUB_move1),
40-
QGVAR(HubSittingChairUC_idle1),
41-
QGVAR(HubSittingChairUC_idle2),
42-
QGVAR(HubSittingChairUC_idle3),
43-
QGVAR(HubSittingChairUC_move1)
44-
]
57+
selectRandom _animations

docs/wiki/framework/sitting-framework.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class CfgVehicles {
2929
acex_sitting_sitDirection = 180; // Direction relative to object
3030
acex_sitting_sitPosition[] = {0, -0.1, -0.45}; // Position relative to object (may behave weird with certain objects)
3131
acex_sitting_interactPosition[] = {0, -0.1, -0.45};
32+
ace_sitting_animations[] = {"ace_sitting_HubSittingChairA_idle1"}; // Overwrite random animation pool
3233
XEH_ENABLED; // Enable XEH (only necessary if XEH is not yet enabled for this class or the one this inherits from)
3334
};
3435
};

0 commit comments

Comments
 (0)