Overworked the scope adjustment keybinds:

*Fixed duplicate actionIDs
*Introduced minor/major steps
*Reset the stringtable.xml
This commit is contained in:
ulteq 2015-04-10 20:17:26 +02:00
parent b44f22c262
commit 127d100628
2 changed files with 24 additions and 88 deletions

View File

@ -33,7 +33,7 @@ if !(hasInterface) exitWith {};
// Add keybinds
["ACE3", QGVAR(AdjustUp), localize "STR_ACE_Scopes_AdjustUp",
["ACE3", QGVAR(AdjustUpMinor), localize "STR_ACE_Scopes_AdjustUpMinor",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -48,7 +48,7 @@ if !(hasInterface) exitWith {};
{false},
[201, [false, false, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustDown), localize "STR_ACE_Scopes_AdjustDown",
["ACE3", QGVAR(AdjustDownMinor), localize "STR_ACE_Scopes_AdjustDownMinor",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -63,7 +63,7 @@ if !(hasInterface) exitWith {};
{false},
[209, [false, false, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustLeft), localize "STR_ACE_Scopes_AdjustLeft",
["ACE3", QGVAR(AdjustLeftMinor), localize "STR_ACE_Scopes_AdjustLeftMinor",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -78,7 +78,7 @@ if !(hasInterface) exitWith {};
{false},
[209, [false, true, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustRight), localize "STR_ACE_Scopes_AdjustRight",
["ACE3", QGVAR(AdjustRightMinor), localize "STR_ACE_Scopes_AdjustRightMinor",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -93,7 +93,7 @@ if !(hasInterface) exitWith {};
{false},
[201, [false, true, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustUp), localize "STR_ACE_Scopes_AdjustUp1mil",
["ACE3", QGVAR(AdjustUpMajor), localize "STR_ACE_Scopes_AdjustUpMajor",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -108,7 +108,7 @@ if !(hasInterface) exitWith {};
{false},
[201, [true, false, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustDown), localize "STR_ACE_Scopes_AdjustDown1mil",
["ACE3", QGVAR(AdjustDownMajor), localize "STR_ACE_Scopes_AdjustDownMajor",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -123,7 +123,7 @@ if !(hasInterface) exitWith {};
{false},
[209, [true, false, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustLeft), localize "STR_ACE_Scopes_AdjustLeft1mil",
["ACE3", QGVAR(AdjustLeftMajor), localize "STR_ACE_Scopes_AdjustLeftMajor",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -138,7 +138,7 @@ if !(hasInterface) exitWith {};
{false},
[209, [true, true, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustRight), localize "STR_ACE_Scopes_AdjustRight1mil",
["ACE3", QGVAR(AdjustRightMajor), localize "STR_ACE_Scopes_AdjustRightMajor",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

View File

@ -2,93 +2,29 @@
<!-- Edited with tabler - 2014-12-11 -->
<Project name="ACE">
<Package name="Scopes">
<Key ID="STR_ACE_Scopes_AdjustUp">
<English>Adjust Elevation Up 0.1 mil</English>
<Hungarian>Magasság Állítása Felfelé 0.1 mil</Hungarian>
<German>Optik-Elevation erhöhen 0.1 mil</German>
<Portuguese>Ajustar Elevação Acima 0.1 mil</Portuguese>
<French>Hausse + 0.1 mil</French>
<Polish>Regulacja krzyża w pionie + 0.1 mil</Polish>
<Czech>Zvýšit náměr 0.1 mil</Czech>
<Spanish>Ajustar elevación arriba 0.1 mil</Spanish>
<Russian>Вверх по вертикали 0.1 mil</Russian>
<Key ID="STR_ACE_Scopes_AdjustUpMinor">
<English>"Minor adjustment up</English>
</Key>
<Key ID="STR_ACE_Scopes_AdjustDown">
<English>Adjust Elevation Down 0.1 mil</English>
<Hungarian>Magasság Állítása Lefelé 0.1 mil</Hungarian>
<German>Optik-Elevation verringern 0.1 mil</German>
<Portuguese>Ajustar Elevação Abaixo 0.1 mil</Portuguese>
<French>Hausse - 0.1 mil</French>
<Polish>Regulacja krzyża w pionie - 0.1 mil</Polish>
<Czech>Snížit náměr 0.1 mil</Czech>
<Spanish>Ajustar elevación abajo 0.1 mil</Spanish>
<Russian>Вниз по вертикали 0.1 mil</Russian>
<Key ID="STR_ACE_Scopes_AdjustDownMinor">
<English>"Minor adjustment down</English>
</Key>
<Key ID="STR_ACE_Scopes_AdjustRight">
<English>Adjust Windage Right 0.1 mil</English>
<Hungarian>Oldalirány Állítása Jobbra 0.1 mil</Hungarian>
<German>Optik-Azimuth erhöhen 0.1 mil</German>
<Portuguese>Ajustar Azimute à Direita 0.1 mil</Portuguese>
<French>Dérive + 0.1 mil</French>
<Polish>Regulacja krzyża w poziomie + 0.1 mil</Polish>
<Czech>Náměr doprava (vítr) 0.1 mil</Czech>
<Spanish>Ajustar deriva a la derecha 0.1 mil</Spanish>
<Russian>Вправо на уровне 0.1 mil</Russian>
<Key ID="STR_ACE_Scopes_AdjustRightMinor">
<English>"Minor adjustment right</English>
</Key>
<Key ID="STR_ACE_Scopes_AdjustLeft">
<English>Adjust Windage Left 0.1 mil</English>
<Hungarian>Oldalirány Állítása Balra 0.1 mil</Hungarian>
<German>Optik-Azimuth verringern 0.1 mil</German>
<Portuguese>Ajustar Azimute à Esquerda 0.1 mil</Portuguese>
<French>Dérive - 0.1 mil</French>
<Polish>Regulacja krzyża w poziomie - 0.1 mil</Polish>
<Czech>Náměr doleva (vítr) 0.1 mil</Czech>
<Spanish>Ajustar deriva a la izquierda 0.1 mil</Spanish>
<Russian>Влево на уровне 0.1 mil</Russian>
<Key ID="STR_ACE_Scopes_AdjustLeftMinor">
<English>"Minor adjustment left</English>
</Key>
<Key ID="STR_ACE_Scopes_AdjustUp1mil">
<English>Adjust Elevation Up 1 mil</English>
<Hungarian>Magasság Állítása Felfelé 1 mil</Hungarian>
<German>Optik-Elevation erhöhen 1 mil</German>
<Portuguese>Ajustar Elevação Acima 1 mil</Portuguese>
<French>Hausse + 1 mil</French>
<Polish>Regulacja krzyża w pionie + 1 mil</Polish>
<Czech>Zvýšit náměr 1 mil</Czech>
<Spanish>Ajustar elevación arriba 1 mil</Spanish>
<Russian>Вверх по вертикали 1 mil</Russian>
<Key ID="STR_ACE_Scopes_AdjustUpMajor">
<English>Major adjustment up</English>
</Key>
<Key ID="STR_ACE_Scopes_AdjustDown1mil">
<English>Adjust Elevation Down 1 mil</English>
<Hungarian>Magasság Állítása Lefelé 1 mil</Hungarian>
<German>Optik-Elevation verringern 1 mil</German>
<Portuguese>Ajustar Elevação Abaixo 1 mil</Portuguese>
<French>Hausse - 1 mil</French>
<Polish>Regulacja krzyża w pionie - 1 mil</Polish>
<Czech>Snížit náměr 1 mil</Czech>
<Spanish>Ajustar elevación abajo 1 mil</Spanish>
<Russian>Вниз по вертикали 1 mil</Russian>
<Key ID="STR_ACE_Scopes_AdjustDownMajor">
<English>Major adjustment down</English>
</Key>
<Key ID="STR_ACE_Scopes_AdjustRight1mil">
<English>Adjust Windage Right 1 mil</English>
<Hungarian>Oldalirány Állítása Jobbra 1 mil</Hungarian>
<German>Optik-Azimuth erhöhen 1 mil</German>
<Portuguese>Ajustar Azimute à Direita 1 mil</Portuguese>
<French>Dérive + 1 mil</French>
<Polish>Regulacja krzyża w poziomie + 1 mil</Polish>
<Czech>Náměr doprava (vítr) 1 mil</Czech>
<Spanish>Ajustar deriva a la derecha 1 mil</Spanish>
<Russian>Вправо на уровне 1 mil</Russian>
<Key ID="STR_ACE_Scopes_AdjustRightMajor">
<English>Major adjustment right</English>
</Key>
<Key ID="STR_ACE_Scopes_AdjustLeft1mil">
<English>Adjust Windage Left 1 mil</English>
<Hungarian>Oldalirány Állítása Balra 1 mil</Hungarian>
<German>Optik-Azimuth verringern 1 mil</German>
<Portuguese>Ajustar Azimute à Esquerda 1 mil</Portuguese>
<French>Dérive - 1 mil</French>
<Polish>Regulacja krzyża w poziomie - 1 mil</Polish>
<Czech>Náměr doleva (vítr) 1 mil</Czech>
<Spanish>Ajustar deriva a la izquierda 1 mil</Spanish>
<Russian>Влево на уровне 1 mil</Russian>
<Key ID="STR_ACE_Scopes_AdjustLeftMajor">
<English>Major adjustment left</English>
</Key>
</Package>
</Project>