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

Fix "throw items" from Fav-Bar

Browse Source
This commit is contained in:
He-Man 2017-08-07 22:57:59 +02:00 committed by GitHub
parent 5bb3ef31c2
commit aff46f13f7
1 changed files with 32 additions and 22 deletions

54
Sources/epoch_code/gui/scripts/favBar/epoch_favBar_action.sqf

@ -13,7 +13,7 @@
Usage: none
*/
private ["_item","_slot","_dsp","_kee","_tileIdx","_itemHasInteraction","_force","_errorCode","_curSlot","_Fav_DropIfOverflow","_Fav_FastWeaponSwitching"];
private ["_throw","_item","_slot","_dsp","_kee","_tileIdx","_itemHasInteraction","_force","_errorCode","_curSlot","_Fav_DropIfOverflow","_Fav_FastWeaponSwitching"];
params ["_dsp","_kee"];
_tileIdx = switch (_kee) do {
@ -25,28 +25,38 @@ _tileIdx = switch (_kee) do {
};
_item = rmx_var_favBar_current select _tileIdx;
_itemHasInteraction = str(missionConfigFile >> "CfgItemInteractions" >> _item) != "";
_throw = "";
{
if (_item in (getarray (_x >> "Magazines"))) exitwith {
_throw = configname _x;
};
} foreach ("true" configClasses (configfile >> "CfgWeapons" >> "Throw"));
if !(_throw isequalto "") then {
player forceWeaponFire [_throw,_throw];
}
else {
_itemHasInteraction = str(missionConfigFile >> "CfgItemInteractions" >> _item) != "";
if (_itemHasInteraction) then {
EPOCH_InteractedItem = ["",_item,""];
[] call EPOCH_consumeItem;
EPOCH_favBar_itemConsumed = true;
} else {
_Fav_DropIfOverflow = ["CfgEpochClient", "Fav_DropIfOverflow", false] call EPOCH_fnc_returnConfigEntryV2;
_slot = _item call epoch_itemTypeSlot;
_force = if (_slot in [3,4,5,7,8,10,11,16]) then {true} else {false}; //see how it works with other items, definitely keep true for weapons
_errorCode = [_item,_Fav_DropIfOverflow,_force] call epoch_equip;
player selectWeapon _item;
if (_itemHasInteraction) then {
EPOCH_InteractedItem = ["",_item,""];
[] call EPOCH_consumeItem;
EPOCH_favBar_itemConsumed = true;
} else {
_Fav_DropIfOverflow = ["CfgEpochClient", "Fav_DropIfOverflow", false] call EPOCH_fnc_returnConfigEntryV2;
_slot = _item call epoch_itemTypeSlot;
_force = if (_slot in [3,4,5,7,8,10,11,16]) then {true} else {false}; //see how it works with other items, definitely keep true for weapons
_errorCode = [_item,_Fav_DropIfOverflow,_force] call epoch_equip;
player selectWeapon _item;
if (_slot in [3,4,5]) then {
_curSlot = _item call epoch_itemTypeSlot;
_Fav_FastWeaponSwitching = ["CfgEpochClient", "Fav_FastWeaponSwitching", false] call EPOCH_fnc_returnConfigEntryV2;
if (_curSlot == _slot && !_Fav_FastWeaponSwitching && _errorCode in [1,2]) then {player playAction "reloadMagazine";};
};
if (_slot in [3,4,5]) then {
_curSlot = _item call epoch_itemTypeSlot;
_Fav_FastWeaponSwitching = ["CfgEpochClient", "Fav_FastWeaponSwitching", false] call EPOCH_fnc_returnConfigEntryV2;
if (_curSlot == _slot && !_Fav_FastWeaponSwitching && _errorCode in [1,2]) then {player playAction "reloadMagazine";};
};
if (_errorCode isEqualTo 2) then {"Not enough space, item dropped on the ground!" call epoch_message;};
if (_errorCode isEqualTo 4 && _item != (currentWeapon player)) then {"Not enough space!" call epoch_message;};
if (_errorCode isEqualTo 3) then {"Item not found!" call epoch_message;};
if (_errorCode isEqualTo 5) then {"No compatible weapon found!" call epoch_message;};
if (_errorCode isEqualTo 2) then {"Not enough space, item dropped on the ground!" call epoch_message;};
if (_errorCode isEqualTo 4 && _item != (currentWeapon player)) then {"Not enough space!" call epoch_message;};
if (_errorCode isEqualTo 3) then {"Item not found!" call epoch_message;};
if (_errorCode isEqualTo 5) then {"No compatible weapon found!" call epoch_message;};
};
};
true