Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

CSW - Add drag after deploy setting, fix container storage (#7164)

Browse Source
This commit is contained in:
PabstMirror 2019-09-05 15:48:26 -05:00 committed by GitHub
parent 48362e7ca6
commit 54125e3697
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/csw/functions/fnc_assemble_deployTripod.sqf
View File

@ -49,7 +49,7 @@
[_player, "PutDown"] call EFUNC(common,doGesture);
// drag after deploying
if ((missionNamespace getVariable [QGVAR(dragAfterDeploying), false]) && {["ACE_dragging"] call EFUNC(common,isModLoaded)}) then {
if ((missionNamespace getVariable [QGVAR(dragAfterDeploy), false]) && {["ACE_dragging"] call EFUNC(common,isModLoaded)}) then {
if ([_player, _cswTripod] call EFUNC(dragging,canCarry)) then {
TRACE_1("starting carry",_cswTripod);
[_player, _cswTripod] call EFUNC(dragging,startCarry);

2
addons/csw/functions/fnc_reload_handleReturnAmmo.sqf
View File

@ -51,7 +51,7 @@ if (isNull _container) then {
_weaponRelPos set [2, ((getPosATL _unloadTo) select 2) + 0.05];
_container = createVehicle ["groundWeaponHolder", [0, 0, 0], [], 0, "NONE"];
// ToDo: Unload to ammo box??
_unloadTo setVariable [QGVAR(container), container, true];
_unloadTo setVariable [QGVAR(container), _container, true];
_container setDir random [0, 180, 360];
_container setPosATL _weaponRelPos;
if ((_weaponRelPos select 2) < 0.5) then {

10
addons/csw/initSettings.sqf
View File

@ -41,3 +41,13 @@ private _categoryArray = [format ["ACE %1", localize LSTRING(DisplayName)]];
{[QGVAR(progressBarTimeCoefficent), _this] call EFUNC(common,cbaSettings_settingChanged)},
false // Needs mission restart
] call CBA_settings_fnc_init;
[
QGVAR(dragAfterDeploy), "CHECKBOX",
[LSTRING(dragAfterDeploy_displayName), LSTRING(dragAfterDeploy_description)],
_categoryArray,
false, // default value
false, // isGlobal
{[QGVAR(dragAfterDeploy), _this] call EFUNC(common,cbaSettings_settingChanged)},
false // Needs mission restart
] call CBA_settings_fnc_init;

6
addons/csw/stringtable.xml
View File

@ -78,6 +78,12 @@
<Key ID="STR_ACE_CSW_progressBarTimeCoefficent_description">
<English>Scales time required to assemble and reload static weapons</English>
</Key>
<Key ID="STR_ACE_CSW_dragAfterDeploy_displayName">
<English>Drag tripods after deploying</English>
</Key>
<Key ID="STR_ACE_CSW_dragAfterDeploy_description">
<English>After deploying a tripod, start dragging it to a precise location</English>
</Key>
<Key ID="STR_ACE_CSW_Pickup_displayName">
<English>Pickup Tripod</English>
</Key>