String updates

This commit is contained in:
SilentSpike 2015-07-25 11:20:59 +01:00
parent 5ac77fa996
commit 69d1db2872
6 changed files with 24 additions and 21 deletions

View File

@ -6,7 +6,7 @@ class ACE_Settings {
class GVAR(filterUnits) { class GVAR(filterUnits) {
typeName = "SCALAR"; typeName = "SCALAR";
value = 0; value = 0;
values[] = {"$STR_Special_None", CSTRING(units_players), CSTRING(units_all)}; values[] = {CSTRING(units_none), CSTRING(units_players), CSTRING(units_all)};
}; };
class GVAR(filterSides) { class GVAR(filterSides) {
typeName = "SCALAR"; typeName = "SCALAR";

View File

@ -15,13 +15,13 @@ class CfgVehicles {
typeName = "BOOL"; typeName = "BOOL";
defaultValue = 0; defaultValue = 0;
}; };
class spectatorUnits { class unitsFilter {
displayName = CSTRING(units_DisplayName); displayName = CSTRING(units_DisplayName);
description = CSTRING(units_Description); description = CSTRING(units_Description);
typeName = "NUMBER"; typeName = "NUMBER";
class values { class values {
class none { class none {
name = "$STR_Special_None"; name = CSTRING(units_none);
value = 0; value = 0;
default = 1; default = 1;
}; };
@ -35,7 +35,7 @@ class CfgVehicles {
}; };
}; };
}; };
class spectatorSides { class sidesFilter {
displayName = CSTRING(sides_DisplayName); displayName = CSTRING(sides_DisplayName);
description = CSTRING(sides_Description); description = CSTRING(sides_Description);
typeName = "NUMBER"; typeName = "NUMBER";

View File

@ -137,10 +137,10 @@ switch (toLower _mode) do {
[localize LSTRING(freeCamPrevVis),"Ctrl + N"], [localize LSTRING(freeCamPrevVis),"Ctrl + N"],
[localize LSTRING(otherControls)], [localize LSTRING(otherControls)],
[localize LSTRING(nextCam),"Up"], [localize LSTRING(nextCam),"Up Arrow"],
[localize LSTRING(prevCam),"Down"], [localize LSTRING(prevCam),"Down Arrow"],
[localize LSTRING(nextUnit),"Right"], [localize LSTRING(nextUnit),"Right Arrow"],
[localize LSTRING(prevUnit),"Left"] [localize LSTRING(prevUnit),"Left Arrow"]
]; ];
// Hacky way to enable keybindings // Hacky way to enable keybindings

View File

@ -37,7 +37,7 @@ if (GVAR(camMode) == 0) then {
}; };
if (isNull GVAR(camUnit)) then { if (isNull GVAR(camUnit)) then {
_name = localize "STR_VOICE_MASK_NONE"; _name = localize "STR_Special_None";
} else { } else {
_name = GETVAR(GVAR(camUnit),GVAR(uName),""); _name = GETVAR(GVAR(camUnit),GVAR(uName),"");
}; };

View File

@ -20,7 +20,7 @@ params ["_logic", "_units", "_activated"];
if !(_activated) exitWith {}; if !(_activated) exitWith {};
[_logic, QGVAR(enabledSystem), "spectatorSystem"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(enabledSystem), "spectatorSystem"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(filterUnits), "spectatorUnits"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(filterUnits), "unitsFilter"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(filterSides), "spectatorSides"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(filterSides), "sidesFilter"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(restrictModes), "cameraModes"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(restrictModes), "cameraModes"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(restrictVisions), "visionModes"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(restrictVisions), "visionModes"] call EFUNC(common,readSettingFromModule);

View File

@ -14,10 +14,13 @@
<English>Enter spectator mode upon respawn.</English> <English>Enter spectator mode upon respawn.</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_units_DisplayName"> <Key ID="STR_ACE_Spectator_units_DisplayName">
<English>Spectatable Units</English> <English>Unit filter</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_units_Description"> <Key ID="STR_ACE_Spectator_units_Description">
<English>Units automatically made available to spectate.</English> <English>Method of filtering spectatable units.</English>
</Key>
<Key ID="STR_ACE_Spectator_units_none">
<English>No units</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_units_players"> <Key ID="STR_ACE_Spectator_units_players">
<English>Only players</English> <English>Only players</English>
@ -26,10 +29,10 @@
<English>All units</English> <English>All units</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_sides_DisplayName"> <Key ID="STR_ACE_Spectator_sides_DisplayName">
<English>Spectatable Sides</English> <English>Side filter</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_sides_Description"> <Key ID="STR_ACE_Spectator_sides_Description">
<English>Sides automatically made available to spectate.</English> <English>Method of filtering spectatable sides.</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_sides_player"> <Key ID="STR_ACE_Spectator_sides_player">
<English>Player side</English> <English>Player side</English>
@ -105,22 +108,22 @@
<English>Free Camera Controls</English> <English>Free Camera Controls</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_freeCamForward"> <Key ID="STR_ACE_Spectator_freeCamForward">
<English>Move Camera Forward</English> <English>Camera Forward</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_freeCamBackward"> <Key ID="STR_ACE_Spectator_freeCamBackward">
<English>Move Camera Backward</English> <English>Camera Backward</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_freeCamLeft"> <Key ID="STR_ACE_Spectator_freeCamLeft">
<English>Move Camera Left</English> <English>Camera Left</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_freeCamRight"> <Key ID="STR_ACE_Spectator_freeCamRight">
<English>Move Camera Right</English> <English>Camera Right</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_freeCamUp"> <Key ID="STR_ACE_Spectator_freeCamUp">
<English>Move Camera Up</English> <English>Camera Up</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_freeCamDown"> <Key ID="STR_ACE_Spectator_freeCamDown">
<English>Move Camera Down</English> <English>Camera Down</English>
</Key> </Key>
<Key ID="STR_ACE_Spectator_freeCamPan"> <Key ID="STR_ACE_Spectator_freeCamPan">
<English>Pan Camera</English> <English>Pan Camera</English>