Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2025-07-25 04:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

More use of params, event system, removed compile

Browse Source
This commit is contained in:
BaerMitUmlaut
2015-09-11 15:36:23 +02:00
parent 45bfa3eaf5
commit a29902ddb3
4 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
addons/interaction/XEH_preInit.sqf
View File

@ -29,7 +29,6 @@ PREP(openDoor);
PREP(openMenuSelectUI); PREP(openMenuSelectUI);
PREP(openSelectMenu); PREP(openSelectMenu);
PREP(passMagazine); PREP(passMagazine);
PREP(passMagazineLocal);
PREP(prepareSelectMenu); PREP(prepareSelectMenu);
PREP(push); PREP(push);
PREP(removeTag); PREP(removeTag);

12
addons/interaction/functions/fnc_canPassMagazine.sqf
View File

@ -18,14 +18,16 @@
#include "script_component.hpp" #include "script_component.hpp"
params ["_player", "_target", "_weapon"]; params ["_player", "_target", "_weapon"];
private ["_compatibleMags", "_filterFunc", "_filteredMags"]; private ["_compatibleMags", "_filteredMags"];
_compatibleMags = getArray (configfile >> "CfgWeapons" >> _weapon >> "magazines"); _compatibleMags = getArray (configfile >> "CfgWeapons" >> _weapon >> "magazines");
_filterFunc = compile format ["((_this select 0) in %1) && (!(_this select 2))", _compatibleMags]; _filteredMags = [magazinesAmmoFull _player, {
_filteredMags = [magazinesAmmoFull _player, _filterFunc] call EFUNC(common,filter); params ["_className", "", "_loaded"];
_className in _compatibleMags && !_loaded
}] call EFUNC(common,filter);
if (count _filteredMags > 0) then { if !(_filteredMags isEqualTo []) then {
({(_target canAddItemToUniform (_x select 0)) || (_target canAddItemToVest (_x select 0)) || (_target canAddItemToBackpack (_x select 0))} count _filteredMags) > 0 ({_target canAdd (_x select 0)} count _filteredMags) > 0
} else { } else {
false false
}; };

26
addons/interaction/functions/fnc_passMagazine.sqf
View File

@ -18,18 +18,20 @@
#include "script_component.hpp" #include "script_component.hpp"
params ["_player", "_target", "_weapon"]; params ["_player", "_target", "_weapon"];
private ["_compatibleMags", "_filterFunc", "_filteredMags", "_magToPass", "_magToPassIndex"]; private ["_compatibleMags", "_filteredMags", "_magToPass", "_magToPassIndex", "_playerName", "_magToPassDisplayName"];
_compatibleMags = getArray (configfile >> "CfgWeapons" >> _weapon >> "magazines"); _compatibleMags = getArray (configfile >> "CfgWeapons" >> _weapon >> "magazines");
_filterFunc = compile format ["((_this select 0) in %1) && !(_this select 2)", _compatibleMags]; _filteredMags = [magazinesAmmoFull _player, {
params ["_className", "", "_loaded"];
_filteredMags = [magazinesAmmoFull _player, _filterFunc] call EFUNC(common,filter); _className in _compatibleMags && !_loaded
}] call EFUNC(common,filter);
//select magazine with most ammo //select magazine with most ammo
_magToPass = _filteredMags select 0; _magToPass = _filteredMags select 0;
_magToPassIndex = 0; _magToPassIndex = 0;
{ {
if (((_x select 1) > (_magToPass select 1)) && ((_target canAddItemToUniform (_x select 0)) || (_target canAddItemToVest (_x select 0)) || (_target canAddItemToBackpack (_x select 0)))) then { _x params ["_className", "_ammoCount"];
if ((_ammoCount > (_magToPass select 1)) && (_target canAdd _className)) then {
_magToPass = _x; _magToPass = _x;
_magToPassIndex = _forEachIndex; _magToPassIndex = _forEachIndex;
}; };
@ -37,13 +39,19 @@ _magToPassIndex = 0;
//remove all magazines and add them again, except the one to be passed //remove all magazines and add them again, except the one to be passed
//needed because of missing commands, see http://feedback.arma3.com/view.php?id=12782 //needed because of missing commands, see http://feedback.arma3.com/view.php?id=12782
_player removeMagazines (_magToPass select 0); _magToPass params ["_magToPassClassName", "_magToPassAmmoCount"];
_player removeMagazines _magToPassClassName;
{ {
if ((_x select 0) == (_magToPass select 0) && (_forEachIndex != _magToPassIndex)) then { _x params ["_className", "_ammoCount"];
_player addMagazine [_x select 0, _x select 1]; if ((_className == _magToPassClassName) && (_forEachIndex != _magToPassIndex)) then {
_player addMagazine [_className, _ammoCount];
}; };
} foreach _filteredMags; } foreach _filteredMags;
_player playActionNow "PutDown"; _player playActionNow "PutDown";
[[_player, _target, _magToPass select 0, _magToPass select 1], QUOTE(FUNC(passMagazineLocal)), _target] call EFUNC(common,execRemoteFnc); _target addMagazine [_magToPassClassName, _magToPassAmmoCount];
_playerName = [_player] call EFUNC(common,getName);
_magToPassDisplayName = getText (configFile >> "CfgMagazines" >> _magToPassClassName >> "displayName");
["displayTextStructured", [_target], [[LSTRING(PassMagazineHint), _playerName, _magToPassDisplayName], 1.5, _target]] call EFUNC(common,targetEvent);

26
addons/interaction/functions/fnc_passMagazineLocal.sqf
View File

@ -1,26 +0,0 @@
/*
* Author: BaerMitUmlaut
* Pass spare magazine for the specified weapon.
*
* Arguments:
* 0: Unit that passes the magazine <OBJECT>
* 1: Unit to pass the magazine to <OBJECT>
* 2: Magazine classname <STRING>
* 3: Amount of rounds in magazine <NUMBER>
*
* Return Value:
* None
*
* Example:
* [_unit, _player, "30Rnd_65x39_caseless_mag", 30] call ace_interaction_fnc_magToPassazine
*
* Public: No
*/
#include "script_component.hpp"
params ["_unit", "_target", "_magazine", "_ammoCount"];
_target addMagazine [_magazine, _ammoCount];
if (_target == ACE_player) then {
[parseText format [localize LSTRING(PassMagazineHint), name _unit, getText (configFile >> "CfgMagazines" >> _magazine >> "displayName")]] call EFUNC(common,displayTextStructured);
};