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

don't overwrite input in weapon select, fix: weapon select didn't work in FFV

Browse Source
This commit is contained in:
commy2 2015-03-25 15:06:47 +01:00
parent 5d950e8fad
commit 50c63b8fb9
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
addons/weaponselect/XEH_postInit.sqf
View File

@ -7,13 +7,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(SelectPistol), localize "STR_ACE_WeaponSelect_SelectPistol", ["ACE3", QGVAR(SelectPistol), localize "STR_ACE_WeaponSelect_SelectPistol",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["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};
// Statement // Statement
[ACE_player, handgunWeapon ACE_player] call FUNC(selectWeaponMode); [ACE_player, handgunWeapon ACE_player] call FUNC(selectWeaponMode);
true false
}, },
{false}, {false},
[2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key [2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key
@ -21,13 +21,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(SelectRifle), localize "STR_ACE_WeaponSelect_SelectRifle", ["ACE3", QGVAR(SelectRifle), localize "STR_ACE_WeaponSelect_SelectRifle",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["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};
// Statement // Statement
[ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMode); [ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMode);
true false
}, },
{false}, {false},
[3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key [3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key
@ -35,13 +35,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(SelectRifleMuzzle), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle", ["ACE3", QGVAR(SelectRifleMuzzle), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["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};
// Statement // Statement
[ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMuzzle); [ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMuzzle);
true false
}, },
{false}, {false},
[4, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key [4, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
@ -49,13 +49,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(SelectLauncher), localize "STR_ACE_WeaponSelect_SelectLauncher", ["ACE3", QGVAR(SelectLauncher), localize "STR_ACE_WeaponSelect_SelectLauncher",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["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};
// Statement // Statement
[ACE_player, secondaryWeapon ACE_player] call FUNC(selectWeaponMode); [ACE_player, secondaryWeapon ACE_player] call FUNC(selectWeaponMode);
true false
}, },
{false}, {false},
[5, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key [5, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
@ -63,13 +63,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(SelectBinocular), localize "STR_ACE_WeaponSelect_SelectBinocular", ["ACE3", QGVAR(SelectBinocular), localize "STR_ACE_WeaponSelect_SelectBinocular",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["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};
// Statement // Statement
[ACE_player, binocular ACE_player] call FUNC(selectWeaponMode); [ACE_player, binocular ACE_player] call FUNC(selectWeaponMode);
true false
}, },
{false}, {false},
[6, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key [6, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
@ -77,13 +77,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag", ["ACE3", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["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};
// Statement // Statement
[ACE_player] call FUNC(selectGrenadeFrag); [ACE_player] call FUNC(selectGrenadeFrag);
true false
}, },
{false}, {false},
[7, [false, false, false]], false] call cba_fnc_addKeybind; //6 Key [7, [false, false, false]], false] call cba_fnc_addKeybind; //6 Key
@ -91,13 +91,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(SelectGrenadeOther), localize "STR_ACE_WeaponSelect_SelectGrenadeOther", ["ACE3", QGVAR(SelectGrenadeOther), localize "STR_ACE_WeaponSelect_SelectGrenadeOther",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["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};
// Statement // Statement
[ACE_player] call FUNC(selectGrenadeOther); [ACE_player] call FUNC(selectGrenadeOther);
true false
}, },
{false}, {false},
[8, [false, false, false]], false] call cba_fnc_addKeybind; //7 Key [8, [false, false, false]], false] call cba_fnc_addKeybind; //7 Key
@ -105,13 +105,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(HolsterWeapon), localize "STR_ACE_WeaponSelect_HolsterWeapon", ["ACE3", QGVAR(HolsterWeapon), localize "STR_ACE_WeaponSelect_HolsterWeapon",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, ACE_player, ["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};
// Statement // Statement
[ACE_player] call FUNC(putWeaponAway); [ACE_player] call FUNC(putWeaponAway);
true false
}, },
{false}, {false},
[11, [false, false, false]], false] call cba_fnc_addKeybind; //0 Key [11, [false, false, false]], false] call cba_fnc_addKeybind; //0 Key
@ -119,13 +119,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn", ["ACE3", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, 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 false
}, },
{false}, {false},
[3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key [3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key
@ -133,13 +133,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff", ["ACE3", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, 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 false
}, },
{false}, {false},
[2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key [2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key
@ -147,13 +147,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(SelectMainGun), localize "STR_ACE_WeaponSelect_SelectMainGun", ["ACE3", QGVAR(SelectMainGun), localize "STR_ACE_WeaponSelect_SelectMainGun",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, 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};
// Statement // Statement
[ACE_player, vehicle ACE_player, 0] call FUNC(selectWeaponVehicle); [ACE_player, vehicle ACE_player, 0] call FUNC(selectWeaponVehicle);
true false
}, },
{false}, {false},
[4, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key [4, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
@ -161,13 +161,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(SelectMachineGun), localize "STR_ACE_WeaponSelect_SelectMachineGun", ["ACE3", QGVAR(SelectMachineGun), localize "STR_ACE_WeaponSelect_SelectMachineGun",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, 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};
// Statement // Statement
[ACE_player, vehicle ACE_player, 1] call FUNC(selectWeaponVehicle); [ACE_player, vehicle ACE_player, 1] call FUNC(selectWeaponVehicle);
true false
}, },
{false}, {false},
[5, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key [5, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
@ -175,13 +175,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(SelectMissiles), localize "STR_ACE_WeaponSelect_SelectMissiles", ["ACE3", QGVAR(SelectMissiles), localize "STR_ACE_WeaponSelect_SelectMissiles",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, 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};
// Statement // Statement
[ACE_player, vehicle ACE_player, 2] call FUNC(selectWeaponVehicle); [ACE_player, vehicle ACE_player, 2] call FUNC(selectWeaponVehicle);
true false
}, },
{false}, {false},
[6, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key [6, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
@ -189,13 +189,13 @@ if !(hasInterface) exitWith {};
["ACE3", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher", ["ACE3", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, 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};
// Statement // Statement
[vehicle ACE_player] call FUNC(fireSmokeLauncher); [vehicle ACE_player] call FUNC(fireSmokeLauncher);
true false
}, },
{false}, {false},
[10, [false, false, false]], false] call cba_fnc_addKeybind; //9 Key [10, [false, false, false]], false] call cba_fnc_addKeybind; //9 Key