mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Merge pull request #762 from acemod/wselect
remove weapon select in favor of the new controls from bi
This commit is contained in:
commit
12f3bb8dfd
@ -4,7 +4,7 @@
|
||||
if !(hasInterface) exitWith {};
|
||||
|
||||
// Add keybinds
|
||||
["ACE3", QGVAR(SelectPistol), localize "STR_ACE_WeaponSelect_SelectPistol",
|
||||
["ACE3", QGVAR(SelectPistolNew), localize "STR_ACE_WeaponSelect_SelectPistol",
|
||||
{
|
||||
// Conditions: canInteract
|
||||
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
|
||||
@ -13,12 +13,12 @@ if !(hasInterface) exitWith {};
|
||||
|
||||
// Statement
|
||||
[ACE_player, handgunWeapon ACE_player] call FUNC(selectWeaponMode);
|
||||
true
|
||||
false
|
||||
},
|
||||
{false},
|
||||
[2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key
|
||||
[0, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key
|
||||
|
||||
["ACE3", QGVAR(SelectRifle), localize "STR_ACE_WeaponSelect_SelectRifle",
|
||||
["ACE3", QGVAR(SelectRifleNew), localize "STR_ACE_WeaponSelect_SelectRifle",
|
||||
{
|
||||
// Conditions: canInteract
|
||||
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
|
||||
@ -27,12 +27,12 @@ if !(hasInterface) exitWith {};
|
||||
|
||||
// Statement
|
||||
[ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMode);
|
||||
true
|
||||
false
|
||||
},
|
||||
{false},
|
||||
[3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key
|
||||
[0, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key
|
||||
|
||||
["ACE3", QGVAR(SelectRifleMuzzle), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle",
|
||||
["ACE3", QGVAR(SelectRifleMuzzleNew), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle",
|
||||
{
|
||||
// Conditions: canInteract
|
||||
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
|
||||
@ -41,12 +41,12 @@ if !(hasInterface) exitWith {};
|
||||
|
||||
// Statement
|
||||
[ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMuzzle);
|
||||
true
|
||||
false
|
||||
},
|
||||
{false},
|
||||
[4, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
|
||||
[0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
|
||||
|
||||
["ACE3", QGVAR(SelectLauncher), localize "STR_ACE_WeaponSelect_SelectLauncher",
|
||||
["ACE3", QGVAR(SelectLauncherNew), localize "STR_ACE_WeaponSelect_SelectLauncher",
|
||||
{
|
||||
// Conditions: canInteract
|
||||
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
|
||||
@ -55,12 +55,12 @@ if !(hasInterface) exitWith {};
|
||||
|
||||
// Statement
|
||||
[ACE_player, secondaryWeapon ACE_player] call FUNC(selectWeaponMode);
|
||||
true
|
||||
false
|
||||
},
|
||||
{false},
|
||||
[5, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
|
||||
[0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
|
||||
|
||||
["ACE3", QGVAR(SelectBinocular), localize "STR_ACE_WeaponSelect_SelectBinocular",
|
||||
["ACE3", QGVAR(SelectBinocularNew), localize "STR_ACE_WeaponSelect_SelectBinocular",
|
||||
{
|
||||
// Conditions: canInteract
|
||||
if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
|
||||
@ -69,10 +69,10 @@ if !(hasInterface) exitWith {};
|
||||
|
||||
// Statement
|
||||
[ACE_player, binocular ACE_player] call FUNC(selectWeaponMode);
|
||||
true
|
||||
false
|
||||
},
|
||||
{false},
|
||||
[6, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
|
||||
[0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
|
||||
|
||||
["ACE3", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag",
|
||||
{
|
||||
@ -144,7 +144,7 @@ if !(hasInterface) exitWith {};
|
||||
{false},
|
||||
[2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key
|
||||
|
||||
["ACE3", QGVAR(SelectMainGun), localize "STR_ACE_WeaponSelect_SelectMainGun",
|
||||
["ACE3", QGVAR(SelectMainGunNew), localize "STR_ACE_WeaponSelect_SelectMainGun",
|
||||
{
|
||||
// Conditions: canInteract
|
||||
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
|
||||
@ -153,12 +153,12 @@ if !(hasInterface) exitWith {};
|
||||
|
||||
// Statement
|
||||
[ACE_player, vehicle ACE_player, 0] call FUNC(selectWeaponVehicle);
|
||||
true
|
||||
false
|
||||
},
|
||||
{false},
|
||||
[4, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
|
||||
[0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
|
||||
|
||||
["ACE3", QGVAR(SelectMachineGun), localize "STR_ACE_WeaponSelect_SelectMachineGun",
|
||||
["ACE3", QGVAR(SelectMachineGunNew), localize "STR_ACE_WeaponSelect_SelectMachineGun",
|
||||
{
|
||||
// Conditions: canInteract
|
||||
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
|
||||
@ -167,12 +167,12 @@ if !(hasInterface) exitWith {};
|
||||
|
||||
// Statement
|
||||
[ACE_player, vehicle ACE_player, 1] call FUNC(selectWeaponVehicle);
|
||||
true
|
||||
false
|
||||
},
|
||||
{false},
|
||||
[5, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
|
||||
[0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
|
||||
|
||||
["ACE3", QGVAR(SelectMissiles), localize "STR_ACE_WeaponSelect_SelectMissiles",
|
||||
["ACE3", QGVAR(SelectMissilesNew), localize "STR_ACE_WeaponSelect_SelectMissiles",
|
||||
{
|
||||
// Conditions: canInteract
|
||||
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
|
||||
@ -181,10 +181,10 @@ if !(hasInterface) exitWith {};
|
||||
|
||||
// Statement
|
||||
[ACE_player, vehicle ACE_player, 2] call FUNC(selectWeaponVehicle);
|
||||
true
|
||||
false
|
||||
},
|
||||
{false},
|
||||
[6, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
|
||||
[0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
|
||||
|
||||
["ACE3", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher",
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user