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

fix weapon select in ffv slots not working

Browse Source
This commit is contained in:
commy2 2015-08-30 12:01:13 +02:00
parent 2f54cfadbc
commit 58ec4a68cb
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addons/weaponselect/XEH_postInit.sqf
View File

@ -7,7 +7,7 @@ if !(hasInterface) exitWith {};
["ACE3 Weapons", QGVAR(SelectPistolNew), localize LSTRING(SelectPistol), ["ACE3 Weapons", QGVAR(SelectPistolNew), localize LSTRING(SelectPistol),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotInside", "isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false}; if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
@ -21,7 +21,7 @@ if !(hasInterface) exitWith {};
["ACE3 Weapons", QGVAR(SelectRifleNew), localize LSTRING(SelectRifle), ["ACE3 Weapons", QGVAR(SelectRifleNew), localize LSTRING(SelectRifle),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotInside", "isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false}; if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
@ -35,7 +35,7 @@ if !(hasInterface) exitWith {};
["ACE3 Weapons", QGVAR(SelectRifleMuzzleNew), localize LSTRING(SelectRifleMuzzle), ["ACE3 Weapons", QGVAR(SelectRifleMuzzleNew), localize LSTRING(SelectRifleMuzzle),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotInside", "isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false}; if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
@ -49,7 +49,7 @@ if !(hasInterface) exitWith {};
["ACE3 Weapons", QGVAR(SelectLauncherNew), localize LSTRING(SelectLauncher), ["ACE3 Weapons", QGVAR(SelectLauncherNew), localize LSTRING(SelectLauncher),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotInside", "isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false}; if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
@ -63,7 +63,7 @@ if !(hasInterface) exitWith {};
["ACE3 Weapons", QGVAR(SelectBinocularNew), localize LSTRING(SelectBinocular), ["ACE3 Weapons", QGVAR(SelectBinocularNew), localize LSTRING(SelectBinocular),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotInside", "isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false}; if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
@ -77,7 +77,7 @@ if !(hasInterface) exitWith {};
["ACE3 Weapons", QGVAR(SelectGrenadeFrag), localize LSTRING(SelectGrenadeFrag), ["ACE3 Weapons", QGVAR(SelectGrenadeFrag), localize LSTRING(SelectGrenadeFrag),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotInside", "isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false}; if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
@ -91,7 +91,7 @@ if !(hasInterface) exitWith {};
["ACE3 Weapons", QGVAR(SelectGrenadeOther), localize LSTRING(SelectGrenadeOther), ["ACE3 Weapons", QGVAR(SelectGrenadeOther), localize LSTRING(SelectGrenadeOther),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotInside", "isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false}; if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
@ -105,7 +105,7 @@ if !(hasInterface) exitWith {};
["ACE3 Weapons", QGVAR(HolsterWeapon), localize LSTRING(HolsterWeapon), ["ACE3 Weapons", QGVAR(HolsterWeapon), localize LSTRING(HolsterWeapon),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["isNotInside", "isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false}; if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
@ -130,12 +130,12 @@ if !(hasInterface) exitWith {};
["ACE3 Vehicles", QGVAR(EngineOn), localize LSTRING(EngineOn), ["ACE3 Vehicles", QGVAR(EngineOn), localize LSTRING(EngineOn),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !((ACE_player != vehicle ACE_player) && {ACE_player == driver vehicle ACE_player} && {!isEngineOn vehicle ACE_player}) exitWith {false}; if !((ACE_player != vehicle ACE_player) && {ACE_player == driver vehicle ACE_player} && {!isEngineOn vehicle ACE_player}) exitWith {false};
// Statement // Statement
(vehicle ACE_player) engineOn true; vehicle ACE_player engineOn true;
true true
}, },
{false}, {false},
@ -144,12 +144,12 @@ if !(hasInterface) exitWith {};
["ACE3 Vehicles", QGVAR(EngineOff), localize LSTRING(EngineOff), ["ACE3 Vehicles", QGVAR(EngineOff), localize LSTRING(EngineOff),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {isEngineOn vehicle ACE_player}) exitWith {false}; if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {isEngineOn vehicle ACE_player}) exitWith {false};
// Statement // Statement
(vehicle ACE_player) engineOn false; vehicle ACE_player engineOn false;
true true
}, },
{false}, {false},
@ -158,7 +158,7 @@ if !(hasInterface) exitWith {};
["ACE3 Vehicles", QGVAR(SelectMainGunNew), localize LSTRING(SelectMainGun), ["ACE3 Vehicles", QGVAR(SelectMainGunNew), localize LSTRING(SelectMainGun),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player != vehicle ACE_player) exitWith {false}; if !(ACE_player != vehicle ACE_player) exitWith {false};
@ -172,7 +172,7 @@ if !(hasInterface) exitWith {};
["ACE3 Vehicles", QGVAR(SelectMachineGunNew), localize LSTRING(SelectMachineGun), ["ACE3 Vehicles", QGVAR(SelectMachineGunNew), localize LSTRING(SelectMachineGun),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player != vehicle ACE_player) exitWith {false}; if !(ACE_player != vehicle ACE_player) exitWith {false};
@ -186,7 +186,7 @@ if !(hasInterface) exitWith {};
["ACE3 Vehicles", QGVAR(SelectMissilesNew), localize LSTRING(SelectMissiles), ["ACE3 Vehicles", QGVAR(SelectMissilesNew), localize LSTRING(SelectMissiles),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player != vehicle ACE_player) exitWith {false}; if !(ACE_player != vehicle ACE_player) exitWith {false};
@ -200,7 +200,7 @@ if !(hasInterface) exitWith {};
["ACE3 Vehicles", QGVAR(FireSmokeLauncher), localize LSTRING(FireSmokeLauncher), ["ACE3 Vehicles", QGVAR(FireSmokeLauncher), localize LSTRING(FireSmokeLauncher),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player != vehicle ACE_player && {ACE_player == commander vehicle ACE_player}) exitWith {false}; if !(ACE_player != vehicle ACE_player && {ACE_player == commander vehicle ACE_player}) exitWith {false};