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

Rearm - Add distance setting (#7137)

Browse Source 
* Add rearm distance setting

* Set rearm distance slider maximum at 50m

* Update addons/rearm/stringtable.xml

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Fix rearm action check

* Update addons/rearm/stringtable.xml

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Update addons/rearm/initSettings.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/rearm/functions/fnc_rearm.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
This commit is contained in:
Josuan Albin 2019-09-04 02:06:50 +02:00 committed by PabstMirror
parent 0fa8330833
commit 1caf6fb08f
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/rearm/functions/fnc_addRearmActions.sqf
View File

@ -18,7 +18,7 @@
params ["_truck", "_player"];
private _vehicles = nearestObjects [_truck, ["AllVehicles"], 20];
private _vehicles = nearestObjects [_truck, ["AllVehicles"], GVAR(distance)];
_vehicles = _vehicles select {(_x != _truck) && {!(_x isKindOf "CAManBase")} && {!(_x getVariable [QGVAR(disabled), false])}};
private _cswCarryMagazines = [];

2
addons/rearm/functions/fnc_rearm.sqf
View File

@ -46,7 +46,7 @@ private _magazineDisplayName = _magazineClass call FUNC(getMagazineName);
format [localize LSTRING(RearmAction), getText(configFile >> "CfgVehicles" >> (typeOf _target) >> "displayName"), _magazineDisplayName],
{
param [0] params ["_target", "_unit"];
(_unit distanceSqr _target) <= REARM_ACTION_DISTANCE_SQR
_player distance _target <= GVAR(distance);
},
["isnotinside"]
] call EFUNC(common,progressBar);

2
addons/rearm/functions/fnc_rearmEntireVehicle.sqf
View File

@ -28,7 +28,7 @@ TRACE_3("rearmEntireVehicle",_truck,_player,_vehicle);
format [localize LSTRING(BasicRearmAction), getText(configFile >> "CfgVehicles" >> (typeOf _vehicle) >> "displayName")],
{
param [0] params ["", "_vehicle", "_player"];
(_player distanceSqr _vehicle) <= REARM_ACTION_DISTANCE_SQR
_player distance _vehicle <= GVAR(distance);
},
["isnotinside"]
] call EFUNC(common,progressBar);

9
addons/rearm/initSettings.sqf
View File

@ -17,3 +17,12 @@
true, // isGlobal
{[QGVAR(supply), _this] call EFUNC(common,cbaSettings_settingChanged)}
] call CBA_settings_fnc_init;
[
QGVAR(distance), "SLIDER",
[localize LSTRING(RearmSettings_distance_DisplayName), localize LSTRING(RearmSettings_distance_Description)],
[localize ELSTRING(OptionsMenu,CategoryLogistics), localize LSTRING(DisplayName)],
[10, 50, 20, 0],
true, // isGlobal
{[QGVAR(supply), _this] call EFUNC(common,cbaSettings_settingChanged)}
] call CBA_settings_fnc_init;

10
addons/rearm/stringtable.xml
View File

@ -612,5 +612,15 @@
<Italian>Il rifornimento delle munizioni (-1 per disabilitarlo)</Italian>
<Russian>Объем боеприпасов для перевооружения (-1 для отмены)</Russian>
</Key>
<Key ID="STR_ACE_Rearm_RearmSettings_distance_DisplayName">
<English>Rearm distance</English>
<French>Distance de réarmement</French>
<German>Aufrüstbereich</German>
</Key>
<Key ID="STR_ACE_Rearm_RearmSettings_distance_Description">
<English>The maximum distance a vehicle can be rearmed at</English>
<French>Distance maximale à laquelle un véhicle peut être réarmé</French>
<German>Die maximale Distanz, über die ein Fahrzeug Aufmunitioniert werden kann</German>
</Key>
</Package>
</Project>