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

Cargo - Add setting for carry after cargo unload (#8997)

Browse Source 
* Add setting for carry after cargo unload

* Fix typos

* Contributors

* Don't make setting global

* Update addons/cargo/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
This commit is contained in:
Tim Beswick 2022-08-20 22:28:16 +01:00 committed by GitHub
parent b2b3149d1d
commit 2a4355dfb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -165,6 +165,7 @@ Sniperwolf572 <tenga6@gmail.com>
System98 System98
SzwedzikPL <szwedzikpl@gmail.com> SzwedzikPL <szwedzikpl@gmail.com>
Tachi <zaveruha007@gmail.com> Tachi <zaveruha007@gmail.com>
tbeswick96
Tessa Elieff <Fastroping Sound - CreativeCommons Attributions 3.0> Tessa Elieff <Fastroping Sound - CreativeCommons Attributions 3.0>
Timi007 <timi007@gmx.net> Timi007 <timi007@gmx.net>
Toaster <jonathan.pereira@gmail.com> Toaster <jonathan.pereira@gmail.com>

1
addons/cargo/functions/fnc_unloadCarryItem.sqf
View File

@ -19,6 +19,7 @@ params ["_unloader", "_object"];
TRACE_2("unloadCarryItem-start",_unloader,_object); TRACE_2("unloadCarryItem-start",_unloader,_object);
if !(["ace_dragging"] call EFUNC(common,isModLoaded)) exitWith {}; if !(["ace_dragging"] call EFUNC(common,isModLoaded)) exitWith {};
if !(GVAR(carryAfterUnload)) exitWith {};
// When unloading attached objects, this code will run before server has finished moving object to the safe position // When unloading attached objects, this code will run before server has finished moving object to the safe position
[{ [{

9
addons/cargo/initSettings.sqf
View File

@ -42,3 +42,12 @@
false, false,
{[QGVAR(enableRename), _this, true] call EFUNC(common,cbaSettings_settingChanged)} {[QGVAR(enableRename), _this, true] call EFUNC(common,cbaSettings_settingChanged)}
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
[
QGVAR(carryAfterUnload), "CHECKBOX",
[LSTRING(carryAfterUnload), LSTRING(carryAfterUnload_description)],
[LELSTRING(OptionsMenu,CategoryLogistics), LLSTRING(openMenu)],
true,
false,
{[QGVAR(carryAfterUnload), _this] call EFUNC(common,cbaSettings_settingChanged)}
] call CBA_fnc_addSetting;

6
addons/cargo/stringtable.xml
View File

@ -482,5 +482,11 @@
<Chinesesimp>成功卸货后，重新打开货物菜单。</Chinesesimp> <Chinesesimp>成功卸货后，重新打开货物菜单。</Chinesesimp>
<Korean>화물을 성공적으로 내리고 난 다음 화물 메뉴를 열지 결정합니다.</Korean> <Korean>화물을 성공적으로 내리고 난 다음 화물 메뉴를 열지 결정합니다.</Korean>
</Key> </Key>
<Key ID="STR_ACE_Cargo_carryAfterUnload">
<English>Carry After Unload</English>
</Key>
<Key ID="STR_ACE_Cargo_carryAfterUnload_description">
<English>Controls whether cargo items are carried or dragged after unloading.</English>
</Key>
</Package> </Package>
</Project> </Project>