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

Merge branch 'master' into captiveModuleSettings

Browse Source 
Conflicts:
	addons/captives/CfgVehicles.hpp
This commit is contained in:
PabstMirror 2015-06-04 13:15:53 -05:00
commit e5edc0345b
307 changed files with 2846 additions and 2338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS.txt
View File

@ -47,7 +47,7 @@ Codingboy
Coren <coren4@gmail.com>
Crusty
Dharma Bellamkonda <dharma.bellamkonda@gmail.com>
Dimaslg <dimaslg@telecable.e>
Dimaslg <dimaslg@telecable.es>
eRazeri
evromalarkey <evromalarkey@gmail.com>
Falke75

44
addons/advanced_ballistics/CfgVehicles.hpp
View File

@ -2,7 +2,7 @@ class CfgVehicles {
class ACE_Module;
class GVAR(ModuleSettings): ACE_Module {
scope = 2;
displayName = "$STR_ACE_AdvancedBallistics_DisplayName";
displayName = CSTRING(DisplayName);
icon = QUOTE(PATHTOF(UI\Icon_Module_Wind_ca.paa));
category = "ACE";
function = QUOTE(DFUNC(initModuleSettings));
@ -12,32 +12,32 @@ class CfgVehicles {
author = "Ruthberg";
class Arguments {
class enabled {
displayName = "$STR_ACE_AdvancedBallistics_enabled_DisplayName";
description = "$STR_ACE_AdvancedBallistics_enabled_Description";
displayName = CSTRING(enabled_DisplayName);
description = CSTRING(enabled_Description);
typeName = "BOOL";
defaultValue = 0;
};
class simulateForSnipers {
displayName = "$STR_ACE_AdvancedBallistics_simulateForSnipers_DisplayName";
description = "$STR_ACE_AdvancedBallistics_simulateForSnipers_Description";
displayName = CSTRING(simulateForSnipers_DisplayName);
description = CSTRING(simulateForSnipers_Description);
typeName = "BOOL";
defaultValue = 1;
};
class simulateForGroupMembers {
displayName = "$STR_ACE_AdvancedBallistics_simulateForGroupMembers_DisplayName";
description = "$STR_ACE_AdvancedBallistics_simulateForGroupMembers_Description";
displayName = CSTRING(simulateForGroupMembers_DisplayName);
description = CSTRING(simulateForGroupMembers_Description);
typeName = "BOOL";
defaultValue = 0;
};
class simulateForEveryone {
displayName = "$STR_ACE_AdvancedBallistics_simulateForEveryone_DisplayName";
description = "$STR_ACE_AdvancedBallistics_simulateForEveryone_Description";
displayName = CSTRING(simulateForEveryone_DisplayName);
description = CSTRING(simulateForEveryone_Description);
typeName = "BOOL";
defaultValue = 0;
};
class disabledInFullAutoMode {
displayName = "$STR_ACE_AdvancedBallistics_disabledInFullAutoMod_DisplayName";
description = "$STR_ACE_AdvancedBallistics_disabledInFullAutoMod_Description";
displayName = CSTRING(disabledInFullAutoMod_DisplayName);
description = CSTRING(disabledInFullAutoMod_Description);
typeName = "BOOL";
defaultValue = 0;
};
@ -50,38 +50,38 @@ class CfgVehicles {
};
*/
class ammoTemperatureEnabled {
displayName = "$STR_ACE_AdvancedBallistics_ammoTemperatureEnabled_DisplayName";
description = "$STR_ACE_AdvancedBallistics_ammoTemperatureEnabled_Description";
displayName = CSTRING(ammoTemperatureEnabled_DisplayName);
description = CSTRING(ammoTemperatureEnabled_Description);
typeName = "BOOL";
defaultValue = 1;
};
class barrelLengthInfluenceEnabled {
displayName = "$STR_ACE_AdvancedBallistics_barrelLengthInfluenceEnabled_DisplayName";
description = "$STR_ACE_AdvancedBallistics_barrelLengthInfluenceEnabled_Description";
displayName = CSTRING(barrelLengthInfluenceEnabled_DisplayName);
description = CSTRING(barrelLengthInfluenceEnabled_Description);
typeName = "BOOL";
defaultValue = 1;
};
class bulletTraceEnabled {
displayName = "$STR_ACE_AdvancedBallistics_bulletTraceEnabled_DisplayName";
description = "$STR_ACE_AdvancedBallistics_bulletTraceEnabled_Description";
displayName = CSTRING(bulletTraceEnabled_DisplayName);
description = CSTRING(bulletTraceEnabled_Description);
typeName = "BOOL";
defaultValue = 1;
};
class simulationInterval {
displayName = "$STR_ACE_AdvancedBallistics_simulationInterval_DisplayName";
description = "$STR_ACE_AdvancedBallistics_simulationInterval_Description";
displayName = CSTRING(simulationInterval_DisplayName);
description = CSTRING(simulationInterval_Description);
typeName = "NUMBER";
defaultValue = 0.0;
};
class simulationRadius {
displayName = "$STR_ACE_AdvancedBallistics_simulationRadius_DisplayName";
description = "$STR_ACE_AdvancedBallistics_simulationRadius_Description";
displayName = CSTRING(simulationRadius_DisplayName);
description = CSTRING(simulationRadius_Description);
typeName = "NUMBER";
defaultValue = 3000;
};
};
class ModuleDescription {
description = "$STR_ACE_AdvancedBallistics_Description";
description = CSTRING(Description);
};
};
};

2
addons/advanced_ballistics/initKeybinds.sqf
View File

@ -1,4 +1,4 @@
["ACE3 Equipment", QGVAR(ProtractorKey), localize "STR_ACE_AdvancedBallistics_ProtractorKey",
["ACE3 Equipment", QGVAR(ProtractorKey), localize LSTRING(ProtractorKey),
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

54
addons/advanced_ballistics/stringtable.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="AdvancedBallistics">
<Key ID="STR_ACE_AdvancedBallistics_WindInfoKey">
<Package name="Advanced_Ballistics">
<Key ID="STR_ACE_Advanced_Ballistics_WindInfoKey">
<English>Show Wind Info</English>
<Polish>Pokaż inf. o wietrze</Polish>
<Italian>Mostra indicazioni del vento</Italian>
@ -13,7 +13,7 @@
<Czech>Zobrazit informace o větru</Czech>
<Portuguese>Mostrar Informação do Vento</Portuguese>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_ProtractorKey">
<Key ID="STR_ACE_Advanced_Ballistics_ProtractorKey">
<English>Show Protractor</English>
<Polish>Pokaż kątomierz</Polish>
<Italian>Mostra il rapportatore</Italian>
@ -25,139 +25,139 @@
<Czech>Zobrazit úhloměr</Czech>
<Portuguese>Mostrar Transferidor</Portuguese>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_DisplayName">
<English>Advanced Ballistics</English>
<Polish>Zaawansowana balistyka</Polish>
<Spanish>Balística avanzada</Spanish>
<German>Erweiterte Ballistik</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_enabled_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_enabled_DisplayName">
<English>Advanced Ballistics</English>
<Polish>Zaawansowana balistyka</Polish>
<Spanish>Balística avanzada</Spanish>
<German>Erweiterte Ballistik</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_enabled_Description">
<Key ID="STR_ACE_Advanced_Ballistics_enabled_Description">
<English>Enables advanced ballistics</English>
<Polish>Aktywuje zaawansowaną balistykę</Polish>
<Spanish>Activa la balística avanzada</Spanish>
<German>Aktiviert die erweiterte Ballistik</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_simulateForSnipers_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_simulateForSnipers_DisplayName">
<English>Enabled For Snipers</English>
<Spanish>Activada para francotiradores</Spanish>
<German>Für Scharfschützen aktiviert</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_simulateForSnipers_Description">
<Key ID="STR_ACE_Advanced_Ballistics_simulateForSnipers_Description">
<English>Enables advanced ballistics for non local snipers (when using high power optics)</English>
<Spanish>Activa la balística avanzada para francotiradores no locales (cuando se usa una mira telescópica)</Spanish>
<German>Aktiviert die erweiterte Ballistik für nicht lokale Scharfschützen (bei Benutzung von Optiken mit starker Vergrößerung)</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_simulateForGroupMembers_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_simulateForGroupMembers_DisplayName">
<English>Enabled For Group Members</English>
<Spanish>Activada para miembros de grupo</Spanish>
<German>Für Gruppenmitglieder aktiviert</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_simulateForGroupMembers_Description">
<Key ID="STR_ACE_Advanced_Ballistics_simulateForGroupMembers_Description">
<English>Enables advanced ballistics for non local group members</English>
<Spanish>Activada la balística avanzada para miembros de grupo no locales</Spanish>
<German>Aktiviert die erweiterte Ballistik für nicht lokale Gruppenmitglieder</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_simulateForEveryone_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_simulateForEveryone_DisplayName">
<English>Enabled For Everyone</English>
<Spanish>Activada para todos</Spanish>
<German>Für jeden aktiviert</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_simulateForEveryone_Description">
<Key ID="STR_ACE_Advanced_Ballistics_simulateForEveryone_Description">
<English>Enables advanced ballistics for all non local players (enabling this may degrade performance during heavy firefights in multiplayer)</English>
<Spanish>Activada la balística avanzada para todos los jugadores no locales (activarlo puede degradar el rendimiento durante grandes tiroteos en multijugador).</Spanish>
<German>Aktiviert die erweiterte Ballistik für alle nicht lokalen Spieler (das Aktivieren dieser Funktion kann zur Beeinträchtigung des Spielerlebnisses im Multiplayer führen)</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_alwaysSimulateForGroupMembers_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_alwaysSimulateForGroupMembers_DisplayName">
<English>Always Enabled For Group Members</English>
<Polish>Zawsze akt. dla czł. grupy</Polish>
<Spanish>Siempre activada para miembros de grupo</Spanish>
<German>Für Gruppenmitglieder immer aktiviert</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_alwaysSimulateForGroupMembers_Description">
<Key ID="STR_ACE_Advanced_Ballistics_alwaysSimulateForGroupMembers_Description">
<English>Always enables advanced ballistics when a group member fires</English>
<Polish>Aktywuje zaawansowaną balistykę dla wszystkich członków grupy</Polish>
<Spanish>Activada la balística avanzada siempre cuando miembros de grupo disparan</Spanish>
<German>Aktiviert die erweiterte Ballistik immer, wenn ein Gruppenmitglied schießt</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_disabledInFullAutoMod_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_disabledInFullAutoMod_DisplayName">
<English>Disabled In FullAuto Mode</English>
<Polish>Wył. podczas ognia auto.</Polish>
<Spanish>Desactivada en modo automático</Spanish>
<German>Beim vollautomatischen Feuern deaktiviert</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_disabledInFullAutoMod_Description">
<Key ID="STR_ACE_Advanced_Ballistics_disabledInFullAutoMod_Description">
<English>Disables the advanced ballistics during full auto fire</English>
<Polish>Dezaktywuje zaawansowaną balistykę podczas ognia automatycznego</Polish>
<Spanish>Desactivada la balística avanzada durante el fuego automático</Spanish>
<German>Deaktiviert die erweiterte Ballistik beim vollautomatischen Feuern</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_ammoTemperatureEnabled_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_ammoTemperatureEnabled_DisplayName">
<English>Enable Ammo Temperature Simulation</English>
<Polish>Symulacja temp. amunicji</Polish>
<Spanish>Activar simulación de temperatura de munición</Spanish>
<German>Simulation der Munitionstemperatur aktivieren</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_ammoTemperatureEnabled_Description">
<Key ID="STR_ACE_Advanced_Ballistics_ammoTemperatureEnabled_Description">
<English>Muzzle velocity varies with ammo temperature</English>
<Polish>Prędkość wylotowa pocisku jest zależna od temperatury amunicji</Polish>
<Spanish>La velocidad de salida varía con la temperatura de la munición</Spanish>
<German>Munitionstemperatur hat Einfluss auf die Mündungsgeschwindigkeit</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_barrelLengthInfluenceEnabled_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_barrelLengthInfluenceEnabled_DisplayName">
<English>Enable Barrel Length Simulation</English>
<Polish>Symulacja długości lufy</Polish>
<Spanish>Habilitar la simulación de longitud del cañón</Spanish>
<German>Simulation der Lauflänge aktivieren</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_barrelLengthInfluenceEnabled_Description">
<Key ID="STR_ACE_Advanced_Ballistics_barrelLengthInfluenceEnabled_Description">
<English>Muzzle velocity varies with barrel length</English>
<Polish>Prędkość wylotowa pocisku jest zależna od długości lufy</Polish>
<Spanish>La velocidad de salidal varía con la longitud del cañón</Spanish>
<German>Lauflänge beeinflusst Mündungsgeschwindigkeit</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_bulletTraceEnabled_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_bulletTraceEnabled_DisplayName">
<English>Enable Bullet Trace Effect</English>
<Polish>Efekt smugi pocisku</Polish>
<Spanish>Activar el efecto trazador de la bala</Spanish>
<German>Geschossspureffekt aktivieren</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_bulletTraceEnabled_Description">
<Key ID="STR_ACE_Advanced_Ballistics_bulletTraceEnabled_Description">
<English>Enables a bullet trace effect to high caliber bullets (only visible when looking through high power optics)</English>
<Polish>Aktywuje efekt smugi pocisku dla pocisków wysokokalibrowych (widoczne tylko podczas patrzenia przez optykę)</Polish>
<Spanish>Activa el efecto trazador de la balas de gran calibre (solo visible cuando se mira a través de una mira telescópica)</Spanish>
<German>Aktiviere Geschossspureffekt für hohe Kaliber (bei Benutzung von Optiken mit starker Vergrößerung)</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_simulationInterval_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_simulationInterval_DisplayName">
<English>Simulation Interval</English>
<Polish>Interwał symulacji</Polish>
<Spanish>Intervalo de simulación</Spanish>
<German>Simulationsintervall</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_simulationInterval_Description">
<Key ID="STR_ACE_Advanced_Ballistics_simulationInterval_Description">
<English>Defines the interval between every calculation step</English>
<Polish>Określa interwał pomiędzy każdym krokiem kalkulacji</Polish>
<Spanish>Define el intervalo entre cada cálculo</Spanish>
<German>Legt das Intervall zwischen den Berechnungsschritten fest</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_simulationRadius_DisplayName">
<Key ID="STR_ACE_Advanced_Ballistics_simulationRadius_DisplayName">
<English>Simulation Radius</English>
<Polish>Zasięg symulacji</Polish>
<Spanish>Radio de simulación</Spanish>
<German>Simulationsradius</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_simulationRadius_Description">
<Key ID="STR_ACE_Advanced_Ballistics_simulationRadius_Description">
<English>Defines the radius around the player (in meters) at which advanced ballistics are applied to projectiles</English>
<Polish>Określa obszar naokoło gracza (w metrach), na którym zaawansowana balistyka jest aplikowana dla pocisków</Polish>
<Spanish>Define el radio alrededor del jugador (en metros) en el cual se aplica la balística avanzada a los proyectiles</Spanish>
<German>Gibt den Radius (in Metern) um den Spieler an, bei dem die erweiterte Ballistik auf Geschosse angewendet wird</German>
</Key>
<Key ID="STR_ACE_AdvancedBallistics_Description">
<Key ID="STR_ACE_Advanced_Ballistics_Description">
<English></English>
<Polish>Moduł ten pozwala aktywować zaawansowaną balistykę biorącą przy obliczeniach trajektorii lotu pocisku pod uwagę takie rzeczy jak temperatura powietrza, ciśnienie atmosferyczne, wilgotność powietrza, siły Coriolisa i Eotvosa, grawitację a także broń z jakiej wykonywany jest strzał oraz rodzaj amunicji. Wszystko to sprowadza się na bardzo dokładne odwzorowanie balistyki.</Polish>
</Key>

8
addons/aircraft/CfgVehicles.hpp
View File

@ -176,8 +176,8 @@ class CfgVehicles {
};
class CargoRamp_Open: DoorL1_Open {
userActionID = 52;
displayName = "$STR_ACE_Aircraft_OpenCargoRamp";
textToolTip = "$STR_ACE_Aircraft_OpenCargoRamp";
displayName = CSTRING(OpenCargoRamp);
textToolTip = CSTRING(OpenCargoRamp);
position = "action_cargoramp";
radius = 3.0;
condition = "this animationPhase ""cargoramp_open"" < 0.5 AND Alive(this)";
@ -185,8 +185,8 @@ class CfgVehicles {
};
class CargoRamp_Close: DoorL1_Close {
userActionID = 55;
displayName = "$STR_ACE_Aircraft_CloseCargoRamp";
textToolTip = "$STR_ACE_Aircraft_CloseCargoRamp";
displayName = CSTRING(CloseCargoRamp);
textToolTip = CSTRING(CloseCargoRamp);
position = "action_cargoramp";
radius = 3.0;
condition = "this animationPhase ""cargoramp_open"" > 0.5 AND Alive(this)";

6
addons/aircraft/CfgWeapons.hpp
View File

@ -29,7 +29,7 @@ class CfgWeapons {
reloadTime = 0.1;
};
class Burst: Mode_Burst {
displayName = "$STR_ACE_Aircraft_CMFlareLauncher_Burst_Name";
displayName = CSTRING(CMFlareLauncher_Burst_Name);
};
};
@ -50,12 +50,12 @@ class CfgWeapons {
};
class ACE_gatling_20mm_Comanche: gatling_20mm {
displayName = "$STR_ACE_Aircraft_gatling_20mm_Name";
displayName = CSTRING(gatling_20mm_Name);
class manual: manual {
reloadTime = 0.04;
dispersion = 0.006;
displayName = "$STR_ACE_Aircraft_gatling_20mm_Name";
displayName = CSTRING(gatling_20mm_Name);
};
class close: close {
reloadTime = 0.04;

BIN
addons/apl/LWTS_optic.p3d Normal file
View File

Binary file not shown.

8
addons/apl/data/default.rvmat Normal file
View File

@ -0,0 +1,8 @@
ambient[]={1,1,1,1};
diffuse[]={1,1,1,1};
forcedDiffuse[]={0,0,0,0};
emmisive[]={0,0,0,1};
specular[]={0,0,0,0};
specularPower=0;
PixelShaderID="Normal";
VertexShaderID="Basic";

BIN
addons/apl/data/optics_bg_blurred_round_ca.paa Normal file
View File

Binary file not shown.

BIN
addons/apl/data/optics_bg_square_ca.paa Normal file
View File

Binary file not shown.

BIN
addons/apl/data/twis_m16_ca.paa Normal file
View File

Binary file not shown.

2
addons/atragmx/CfgVehicles.hpp
View File

@ -4,7 +4,7 @@ class CfgVehicles {
class ACE_SelfActions {
class ACE_Equipment {
class GVAR(open) {
displayName = "$STR_ACE_ATragMX_OpenATragMXDialog";
displayName = CSTRING(OpenATragMXDialog);
condition = QUOTE(call FUNC(can_show));
statement = QUOTE(call FUNC(create_dialog));
showDisabled = 0;

4
addons/atragmx/CfgWeapons.hpp
View File

@ -6,8 +6,8 @@ class CfgWeapons {
class ACE_ATragMX: ACE_ItemCore {
author = "Ruthberg";
scope = 2;
displayName = "$STR_ACE_ATragMX_Name";
descriptionShort = "$STR_ACE_ATragMX_Description";
displayName = CSTRING(Name);
descriptionShort = CSTRING(Description);
model = PATHTOF(data\tdsrecon.p3d);
picture = PATHTOF(UI\ATRAG_Icon.paa);
icon = "iconObject_circle";

2
addons/atragmx/initKeybinds.sqf
View File

@ -1,4 +1,4 @@
["ACE3 Equipment", QGVAR(ATragMXDialogKey), localize "STR_ACE_ATragMX_ATragMXDialogKey",
["ACE3 Equipment", QGVAR(ATragMXDialogKey), localize LSTRING(ATragMXDialogKey),
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

8
addons/attach/CfgVehicles.hpp
View File

@ -3,7 +3,7 @@
class ACE_Actions { \
class ACE_MainActions { \
class GVAR(AttachVehicle) { \
displayName = "$STR_ACE_Attach_AttachDetach"; \
displayName = CSTRING(AttachDetach); \
condition = QUOTE(_this call FUNC(canAttach)); \
insertChildren = QUOTE(_this call FUNC(getChildrenAttachActions)); \
exceptions[] = {}; \
@ -13,7 +13,7 @@
distance = 4.5; \
}; \
class GVAR(DetachVehicle) { \
displayName = "$STR_ACE_Attach_Detach"; \
displayName = CSTRING(Detach); \
condition = QUOTE(_this call FUNC(canDetach)); \
statement = QUOTE(_this call FUNC(detach) ); \
exceptions[] = {}; \
@ -54,7 +54,7 @@ class CfgVehicles {
class ACE_SelfActions {
class ACE_Equipment {
class GVAR(Attach) {
displayName = "$STR_ACE_Attach_AttachDetach";
displayName = CSTRING(AttachDetach);
condition = QUOTE(_this call FUNC(canAttach));
insertChildren = QUOTE(_this call FUNC(getChildrenAttachActions));
exceptions[] = {"isNotDragging"};
@ -64,7 +64,7 @@ class CfgVehicles {
// hotkey = "T";
};
class GVAR(Detach) {
displayName = "$STR_ACE_Attach_Detach";
displayName = CSTRING(Detach);
condition = QUOTE(_this call FUNC(canDetach));
statement = QUOTE(_this call FUNC(detach));
exceptions[] = {"isNotDragging"};

6
addons/attach/CfgWeapons.hpp
View File

@ -5,10 +5,10 @@ class CfgWeapons {
class ACE_IR_Strobe_Item: ACE_ItemCore {
ACE_attachable = "ACE_IR_Strobe_Effect";
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
scope = 2;
displayName = "$STR_ACE_IrStrobe_Name";
descriptionShort = "$STR_ACE_IrStrobe_Description";
displayName = CSTRING(IrStrobe_Name);
descriptionShort = CSTRING(IrStrobe_Description);
model = "\A3\weapons_F\ammo\mag_univ.p3d";
picture = PATHTOF(UI\irstrobe_item.paa);

6
addons/attach/functions/fnc_attach.sqf
View File

@ -37,7 +37,7 @@ if (_itemVehClass == "") then {
if (_itemVehClass == "") exitWith {ERROR("no ACE_Attachable for Item");};
_onAtachText = format [localize "STR_ACE_Attach_Item_Attached", _onAtachText];
_onAtachText = format [localize LSTRING(Item_Attached), _onAtachText];
if (_unit == _attachToVehicle) then { //Self Attachment
_unit removeItem _itemClassname; // Remove item
@ -55,11 +55,11 @@ if (_unit == _attachToVehicle) then { //Self Attachment
[_unit, QGVAR(vehAttach), true] call EFUNC(common,setForceWalkStatus);
//MenuBack isn't working for now (localize "STR_ACE_Attach_CancelAction")
[{[localize "STR_ACE_Attach_PlaceAction", ""] call EFUNC(interaction,showMouseHint)}, []] call EFUNC(common,execNextFrame);
[{[localize LSTRING(PlaceAction), ""] call EFUNC(interaction,showMouseHint)}, []] call EFUNC(common,execNextFrame);
_unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {true}, {GVAR(placeAction) = 1;}] call EFUNC(common,AddActionEventHandler)];
// _unit setVariable [QGVAR(cancelActionEH), [_unit, "MenuBack", {true}, {GVAR(placeAction) = 0;}] call EFUNC(common,AddActionEventHandler)];
_actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize "STR_ACE_Attach_CancelAction"], {GVAR(placeAction) = 0}];
_actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize LSTRING(CancelAction)], {GVAR(placeAction) = 0}];
[{
private "_startingPosition";

4
addons/attach/functions/fnc_detach.sqf
View File

@ -49,7 +49,7 @@ if (isNull _attachedObject || {_itemName == ""}) exitWith {ERROR("Could not find
// Exit if can't add the item
if !(_unit canAdd _itemName) exitWith {
[localize "STR_ACE_Attach_Inventory_Full"] call EFUNC(common,displayTextStructured);
[localize LSTRING(Inventory_Full)] call EFUNC(common,displayTextStructured);
};
// Add item to inventory
@ -78,4 +78,4 @@ if (_itemDisplayName == "") then {
_itemDisplayName = getText (configFile >> "CfgMagazines" >> _itemName >> "displayName");
};
[format [localize "STR_ACE_Attach_Item_Detached", _itemDisplayName]] call EFUNC(common,displayTextStructured);
[format [localize LSTRING(Item_Detached), _itemDisplayName]] call EFUNC(common,displayTextStructured);

2
addons/attach/functions/fnc_placeApprove.sqf
View File

@ -74,7 +74,7 @@ _closeInDistance = (_closeInMax + _closeInMin) / 2;
//Checks (too close to center or can't attach)
if (((_startDistanceFromCenter - _closeInDistance) < 0.1) || {!([_attachToVehicle, _unit, _itemClassname] call FUNC(canAttach))}) exitWith {
TRACE_2("no valid spot found",_closeInDistance,_startDistanceFromCenter);
[localize "STR_ACE_Attach_Failed"] call EFUNC(common,displayTextStructured);
[localize LSTRING(Failed)] call EFUNC(common,displayTextStructured);
};
//Move it out slightly, for visability sake (better to look a little funny than be embedded//sunk in the hull and be useless)

4
addons/attach/stringtable.xml
View File

@ -121,7 +121,7 @@
<Hungarian>Nincs több hely</Hungarian>
<Russian>В инвентаре нет места</Russian>
</Key>
<Key ID="STR_ACE_IrStrobe_Name">
<Key ID="STR_ACE_Attach_IrStrobe_Name">
<English>IR Strobe</English>
<German>IR-Stroboskop</German>
<Spanish>Marcador IR</Spanish>
@ -133,7 +133,7 @@
<Hungarian>Infravörös jeladó</Hungarian>
<Russian>ИК-маяк</Russian>
</Key>
<Key ID="STR_ACE_IrStrobe_Description">
<Key ID="STR_ACE_Attach_IrStrobe_Description">
<English>IR Strobe allows you to signal your position through a pulsating beacon only visible with NVGs.</English>
<German>Das IR-Stroboskop erlaubt es dir deine Position mit einem blinkenden Leuchtfeuer zu signalisieren, welches nur mit Nachtsichtgerät zu erkennen ist.</German>
<Polish>Stroboskop światła podczerwieni umożliwia oznaczenie swojej pozycji pulsacyjnym światłem widocznym tylko przez optykę noktowizyjną i gogle noktowizyjne.</Polish>

256
addons/ballistics/CfgMagazines.hpp
View File

@ -12,75 +12,75 @@ class CfgMagazines {
initSpeed = 760;
};
class ACE_100Rnd_65x39_caseless_mag_Tracer_Dim: 100Rnd_65x39_caseless_mag_Tracer {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_65x39_Caseless_Tracer_Dim";
displayName = "$STR_ACE_100Rnd_65x39_caseless_mag_Tracer_DimName";
displayNameShort = "$STR_ACE_100Rnd_65x39_caseless_mag_Tracer_DimNameShort";
descriptionShort = "$STR_ACE_100Rnd_65x39_caseless_mag_Tracer_DimDescription";
displayName = CSTRING(100Rnd_65x39_caseless_mag_Tracer_DimName);
displayNameShort = CSTRING(100Rnd_65x39_caseless_mag_Tracer_DimNameShort);
descriptionShort = CSTRING(100Rnd_65x39_caseless_mag_Tracer_DimDescription);
picture = "\A3\weapons_f\data\ui\m_100rnd_65x39_yellow_ca.paa";
};
class 200Rnd_65x39_cased_Box: 100Rnd_65x39_caseless_mag {
initSpeed = 760;
};
class ACE_200Rnd_65x39_cased_Box_Tracer_Dim: 200Rnd_65x39_cased_Box {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_65x39_Caseless_Tracer_Dim";
displayName = "$STR_ACE_200Rnd_65x39_cased_Box_Tracer_DimName";
displayNameShort = "$STR_ACE_200Rnd_65x39_cased_Box_Tracer_DimNameShort";
descriptionShort = "$STR_ACE_200Rnd_65x39_cased_Box_Tracer_DimDescription";
displayName = CSTRING(200Rnd_65x39_cased_Box_Tracer_DimName);
displayNameShort = CSTRING(200Rnd_65x39_cased_Box_Tracer_DimNameShort);
descriptionShort = CSTRING(200Rnd_65x39_cased_Box_Tracer_DimDescription);
picture = "\A3\weapons_f\data\ui\m_200rnd_65x39_yellow_ca.paa";
};
class 30Rnd_65x39_caseless_mag_Tracer;
class ACE_30Rnd_65x39_caseless_mag_Tracer_Dim: 30Rnd_65x39_caseless_mag_Tracer {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_65x39_Caseless_Tracer_Dim";
displayName = "$STR_ACE_30Rnd_65x39_caseless_mag_Tracer_DimName";
displayNameShort = "$STR_ACE_30Rnd_65x39_caseless_mag_Tracer_DimNameShort";
descriptionShort = "$STR_ACE_30Rnd_65x39_caseless_mag_Tracer_DimDescription";
displayName = CSTRING(30Rnd_65x39_caseless_mag_Tracer_DimName);
displayNameShort = CSTRING(30Rnd_65x39_caseless_mag_Tracer_DimNameShort);
descriptionShort = CSTRING(30Rnd_65x39_caseless_mag_Tracer_DimDescription);
};
class 30Rnd_65x39_caseless_green_mag_Tracer;
class ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim: 30Rnd_65x39_caseless_green_mag_Tracer {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_65x39_Caseless_green_Tracer_Dim";
displayName = "$STR_ACE_30Rnd_65x39_caseless_green_mag_Tracer_DimName";
displayNameShort = "$STR_ACE_30Rnd_65x39_caseless_green_mag_Tracer_DimNameShort";
descriptionShort = "$STR_ACE_30Rnd_65x39_caseless_green_mag_Tracer_DimDescription";
displayName = CSTRING(30Rnd_65x39_caseless_green_mag_Tracer_DimName);
displayNameShort = CSTRING(30Rnd_65x39_caseless_green_mag_Tracer_DimNameShort);
descriptionShort = CSTRING(30Rnd_65x39_caseless_green_mag_Tracer_DimDescription);
};
class 30Rnd_556x45_Stanag: CA_Magazine {
};
class ACE_30Rnd_556x45_Stanag_M995_AP_mag: 30Rnd_556x45_Stanag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_556x45_Ball_M995_AP";
displayName = "$STR_ACE_30Rnd_556x45_Stanag_M995_AP_mag_Name";
displayNameShort = "$STR_ACE_30Rnd_556x45_Stanag_M995_AP_mag_NameShort";
descriptionShort = "$STR_ACE_30Rnd_556x45_Stanag_M995_AP_mag_Description";
displayName = CSTRING(30Rnd_556x45_Stanag_M995_AP_mag_Name);
displayNameShort = CSTRING(30Rnd_556x45_Stanag_M995_AP_mag_NameShort);
descriptionShort = CSTRING(30Rnd_556x45_Stanag_M995_AP_mag_Description);
initSpeed = 865;
};
class ACE_30Rnd_556x45_Stanag_Mk262_mag: 30Rnd_556x45_Stanag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_556x45_Ball_Mk262";
displayName = "$STR_ACE_30Rnd_556x45_Stanag_Mk262_mag_Name";
displayNameShort = "$STR_ACE_30Rnd_556x45_Stanag_Mk262_mag_NameShort";
descriptionShort = "$STR_ACE_30Rnd_556x45_Stanag_Mk262_mag_Description";
displayName = CSTRING(30Rnd_556x45_Stanag_Mk262_mag_Name);
displayNameShort = CSTRING(30Rnd_556x45_Stanag_Mk262_mag_NameShort);
descriptionShort = CSTRING(30Rnd_556x45_Stanag_Mk262_mag_Description);
initSpeed = 832;
};
class ACE_30Rnd_556x45_Stanag_Mk318_mag: 30Rnd_556x45_Stanag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_556x45_Ball_Mk318";
displayName = "$STR_ACE_30Rnd_556x45_Stanag_Mk318_mag_Name";
displayNameShort = "$STR_ACE_30Rnd_556x45_Stanag_Mk318_mag_NameShort";
descriptionShort = "$STR_ACE_30Rnd_556x45_Stanag_Mk318_mag_Description";
displayName = CSTRING(30Rnd_556x45_Stanag_Mk318_mag_Name);
displayNameShort = CSTRING(30Rnd_556x45_Stanag_Mk318_mag_NameShort);
descriptionShort = CSTRING(30Rnd_556x45_Stanag_Mk318_mag_Description);
initSpeed = 922;
};
class 30Rnd_556x45_Stanag_Tracer_Red: 30Rnd_556x45_Stanag {
};
class ACE_30Rnd_556x45_Stanag_Tracer_Dim: 30Rnd_556x45_Stanag_Tracer_Red {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_B_556x45_Ball_Tracer_Dim";
displayName = "$STR_ACE_30Rnd_556x45_mag_Tracer_DimName";
displayNameShort = "$STR_ACE_30Rnd_556x45_mag_Tracer_DimNameShort";
descriptionShort = "$STR_ACE_30Rnd_556x45_mag_Tracer_DimDescription";
displayName = CSTRING(30Rnd_556x45_mag_Tracer_DimName);
displayNameShort = CSTRING(30Rnd_556x45_mag_Tracer_DimNameShort);
descriptionShort = CSTRING(30Rnd_556x45_mag_Tracer_DimDescription);
picture = "\A3\weapons_f\data\ui\m_20stanag_red_ca.paa";
};
@ -97,180 +97,180 @@ class CfgMagazines {
initSpeed = 833;
};
class ACE_20Rnd_762x51_Mag_Tracer: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "B_762x51_Tracer_Red";
displayName = "$STR_ACE_20Rnd_762x51_mag_TracerName";
displayNameShort = "$STR_ACE_20Rnd_762x51_mag_TracerNameShort";
descriptionShort = "$STR_ACE_20Rnd_762x51_mag_TracerDescription";
displayName = CSTRING(20Rnd_762x51_mag_TracerName);
displayNameShort = CSTRING(20Rnd_762x51_mag_TracerNameShort);
descriptionShort = CSTRING(20Rnd_762x51_mag_TracerDescription);
tracersEvery = 1;
};
class ACE_20Rnd_762x51_Mag_Tracer_Dim: ACE_20Rnd_762x51_Mag_Tracer {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_B_762x51_Tracer_Dim";
displayName = "$STR_ACE_20Rnd_762x51_mag_Tracer_DimName";
displayNameShort = "$STR_ACE_20Rnd_762x51_mag_Tracer_DimNameShort";
descriptionShort = "$STR_ACE_20Rnd_762x51_mag_Tracer_DimDescription";
displayName = CSTRING(20Rnd_762x51_mag_Tracer_DimName);
displayNameShort = CSTRING(20Rnd_762x51_mag_Tracer_DimNameShort);
descriptionShort = CSTRING(20Rnd_762x51_mag_Tracer_DimDescription);
};
class ACE_20Rnd_762x51_Mag_SD: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_Subsonic";
displayName = "$STR_ACE_20Rnd_762x51_mag_SDName";
displayNameShort = "$STR_ACE_20Rnd_762x51_mag_SDNameShort";
descriptionShort = "$STR_ACE_20Rnd_762x51_mag_SDDescription";
displayName = CSTRING(20Rnd_762x51_mag_SDName);
displayNameShort = CSTRING(20Rnd_762x51_mag_SDNameShort);
descriptionShort = CSTRING(20Rnd_762x51_mag_SDDescription);
initSpeed = 325;
};
class ACE_10Rnd_762x51_M118LR_Mag: 10Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_M118LR";
count = 10;
displayName = "$STR_ACE_10Rnd_762x51_M118LR_Mag_Name";
displayNameShort = "$STR_ACE_10Rnd_762x51_M118LR_Mag_NameShort";
descriptionShort = "$STR_ACE_10Rnd_762x51_M118LR_Mag_Description";
displayName = CSTRING(10Rnd_762x51_M118LR_Mag_Name);
displayNameShort = CSTRING(10Rnd_762x51_M118LR_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_762x51_M118LR_Mag_Description);
initSpeed = 780;
};
class ACE_10Rnd_762x51_Mk316_Mod_0_Mag: 10Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_Mk316_Mod_0";
count = 10;
displayName = "$STR_ACE_10Rnd_762x51_Mk316_Mod_0_Mag_Name";
displayNameShort = "$STR_ACE_10Rnd_762x51_Mk316_Mod_0_Mag_NameShort";
descriptionShort = "$STR_ACE_10Rnd_762x51_Mk316_Mod_0_Mag_Description";
displayName = CSTRING(10Rnd_762x51_Mk316_Mod_0_Mag_Name);
displayNameShort = CSTRING(10Rnd_762x51_Mk316_Mod_0_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_762x51_Mk316_Mod_0_Mag_Description);
initSpeed = 790;
};
class ACE_10Rnd_762x51_Mk319_Mod_0_Mag: 10Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_Mk319_Mod_0";
count = 10;
displayName = "$STR_ACE_10Rnd_762x51_Mk319_Mod_0_Mag_Name";
displayNameShort = "$STR_ACE_10Rnd_762x51_Mk319_Mod_0_Mag_NameShort";
descriptionShort = "$STR_ACE_10Rnd_762x51_Mk319_Mod_0_Mag_Description";
displayName = CSTRING(10Rnd_762x51_Mk319_Mod_0_Mag_Name);
displayNameShort = CSTRING(10Rnd_762x51_Mk319_Mod_0_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_762x51_Mk319_Mod_0_Mag_Description);
initSpeed = 900;
};
class ACE_10Rnd_762x51_M993_AP_Mag: 10Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_M993_AP";
count = 10;
displayName = "$STR_ACE_10Rnd_762x51_M993_AP_Mag_Name";
displayNameShort = "$STR_ACE_10Rnd_762x51_M993_AP_Mag_NameShort";
descriptionShort = "$STR_ACE_10Rnd_762x51_M993_AP_Mag_Description";
displayName = CSTRING(10Rnd_762x51_M993_AP_Mag_Name);
displayNameShort = CSTRING(10Rnd_762x51_M993_AP_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_762x51_M993_AP_Mag_Description);
initSpeed = 920;
};
class ACE_20Rnd_762x51_M118LR_Mag: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_M118LR";
displayName = "$STR_ACE_20Rnd_762x51_M118LR_Mag_Name";
displayNameShort = "$STR_ACE_20Rnd_762x51_M118LR_Mag_NameShort";
descriptionShort = "$STR_ACE_20Rnd_762x51_M118LR_Mag_Description";
displayName = CSTRING(20Rnd_762x51_M118LR_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x51_M118LR_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x51_M118LR_Mag_Description);
initSpeed = 780;
};
class ACE_20Rnd_762x51_Mk316_Mod_0_Mag: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_Mk316_Mod_0";
count = 20;
displayName = "$STR_ACE_20Rnd_762x51_Mk316_Mod_0_Mag_Name";
displayNameShort = "$STR_ACE_20Rnd_762x51_Mk316_Mod_0_Mag_NameShort";
descriptionShort = "$STR_ACE_20Rnd_762x51_Mk316_Mod_0_Mag_Description";
displayName = CSTRING(20Rnd_762x51_Mk316_Mod_0_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x51_Mk316_Mod_0_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x51_Mk316_Mod_0_Mag_Description);
initSpeed = 790;
};
class ACE_20Rnd_762x51_Mk319_Mod_0_Mag: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_Mk319_Mod_0";
displayName = "$STR_ACE_20Rnd_762x51_Mk319_Mod_0_Mag_Name";
displayNameShort = "$STR_ACE_20Rnd_762x51_Mk319_Mod_0_Mag_NameShort";
descriptionShort = "$STR_ACE_20Rnd_762x51_Mk319_Mod_0_Mag_Description";
displayName = CSTRING(20Rnd_762x51_Mk319_Mod_0_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x51_Mk319_Mod_0_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x51_Mk319_Mod_0_Mag_Description);
initSpeed = 900;
};
class ACE_20Rnd_762x51_M993_AP_Mag: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_M993_AP";
count = 20;
displayName = "$STR_ACE_20Rnd_762x51_M993_AP_Mag_Name";
displayNameShort = "$STR_ACE_20Rnd_762x51_M993_AP_Mag_NameShort";
descriptionShort = "$STR_ACE_20Rnd_762x51_M993_AP_Mag_Description";
displayName = CSTRING(20Rnd_762x51_M993_AP_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x51_M993_AP_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x51_M993_AP_Mag_Description);
initSpeed = 920;
};
class ACE_20Rnd_762x67_Mk248_Mod_0_Mag: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x67_Ball_Mk248_Mod_0";
displayName = "$STR_ACE_20Rnd_762x67_Mk248_Mod_0_Mag_Name";
displayNameShort = "$STR_ACE_20Rnd_762x67_Mk248_Mod_0_Mag_NameShort";
descriptionShort = "$STR_ACE_20Rnd_762x67_Mk248_Mod_0_Mag_Description";
displayName = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_Description);
initSpeed = 900;
};
class ACE_20Rnd_762x67_Mk248_Mod_1_Mag: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x67_Ball_Mk248_Mod_1";
displayName = "$STR_ACE_20Rnd_762x67_Mk248_Mod_1_Mag_Name";
displayNameShort = "$STR_ACE_20Rnd_762x67_Mk248_Mod_1_Mag_NameShort";
descriptionShort = "$STR_ACE_20Rnd_762x67_Mk248_Mod_1_Mag_Description";
displayName = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_Description);
initSpeed = 880;
};
class ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x67_Ball_Berger_Hybrid_OTM";
displayName = "$STR_ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag_Name";
displayNameShort = "$STR_ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag_NameShort";
descriptionShort = "$STR_ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag_Description";
displayName = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_Description);
initSpeed = 832;
};
class ACE_30Rnd_65x47_Scenar_mag: 30Rnd_65x39_caseless_mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_65x47_Ball_Scenar";
displayName = "$STR_ACE_30Rnd_65x47_Scenar_mag_Name";
displayNameShort = "$STR_ACE_30Rnd_65x47_Scenar_mag_NameShort";
descriptionShort = "$STR_ACE_30Rnd_65x47_Scenar_mag_Description";
displayName = CSTRING(30Rnd_65x47_Scenar_mag_Name);
displayNameShort = CSTRING(30Rnd_65x47_Scenar_mag_NameShort);
descriptionShort = CSTRING(30Rnd_65x47_Scenar_mag_Description);
};
class ACE_30Rnd_65_Creedmor_mag: 30Rnd_65x39_caseless_mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_65_Creedmor_Ball";
displayName = "$STR_ACE_30Rnd_65_Creedmor_mag_Name";
displayNameShort = "$STR_ACE_30Rnd_65_Creedmor_mag_NameShort";
descriptionShort = "$STR_ACE_30Rnd_65_Creedmor_mag_Description";
displayName = CSTRING(30Rnd_65_Creedmor_mag_Name);
displayNameShort = CSTRING(30Rnd_65_Creedmor_mag_NameShort);
descriptionShort = CSTRING(30Rnd_65_Creedmor_mag_Description);
};
class 10Rnd_338_Mag;
class ACE_10Rnd_338_300gr_HPBT_Mag: 10Rnd_338_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_338_Ball";
displayName = "$STR_ACE_10Rnd_338_300gr_HPBT_Mag_Name";
displayNameShort = "$STR_ACE_10Rnd_338_300gr_HPBT_Mag_NameShort";
descriptionShort = "$STR_ACE_10Rnd_338_300gr_HPBT_Mag_Description";
displayName = CSTRING(10Rnd_338_300gr_HPBT_Mag_Name);
displayNameShort = CSTRING(10Rnd_338_300gr_HPBT_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_338_300gr_HPBT_Mag_Description);
initSpeed = 800;
};
class ACE_10Rnd_338_API526_Mag: 10Rnd_338_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_338_Ball_API526";
displayName = "$STR_ACE_10Rnd_338_API526_Mag_Name";
displayNameShort = "$STR_ACE_10Rnd_338_API526_Mag_NameShort";
descriptionShort = "$STR_ACE_10Rnd_338_API526_Mag_Description";
displayName = CSTRING(10Rnd_338_API526_Mag_Name);
displayNameShort = CSTRING(10Rnd_338_API526_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_338_API526_Mag_Description);
initSpeed = 880;
};
class 5Rnd_127x108_Mag;
class ACE_5Rnd_127x99_Mag: 5Rnd_127x108_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "B_127x99_Ball";
displayName = "$STR_ACE_5Rnd_127x99_Mag_Name";
displayNameShort = "$STR_ACE_5Rnd_127x99_Mag_NameShort";
descriptionShort = "$STR_ACE_5Rnd_127x99_Mag_Description";
displayName = CSTRING(5Rnd_127x99_Mag_Name);
displayNameShort = CSTRING(5Rnd_127x99_Mag_NameShort);
descriptionShort = CSTRING(5Rnd_127x99_Mag_Description);
initSpeed = 900;
};
class ACE_5Rnd_127x99_API_Mag: 5Rnd_127x108_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_127x99_API";
displayName = "$STR_ACE_5Rnd_127x99_API_Mag_Name";
displayNameShort = "$STR_ACE_5Rnd_127x99_API_Mag_NameShort";
descriptionShort = "$STR_ACE_5Rnd_127x99_API_Mag_Description";
displayName = CSTRING(5Rnd_127x99_API_Mag_Name);
displayNameShort = CSTRING(5Rnd_127x99_API_Mag_NameShort);
descriptionShort = CSTRING(5Rnd_127x99_API_Mag_Description);
initSpeed = 900;
};
class ACE_5Rnd_127x99_AMAX_Mag: 5Rnd_127x108_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_127x99_Ball_AMAX";
displayName = "$STR_ACE_5Rnd_127x99_AMAX_Mag_Name";
displayNameShort = "$STR_ACE_5Rnd_127x99_AMAX_Mag_NameShort";
descriptionShort = "$STR_ACE_5Rnd_127x99_AMAX_Mag_Description";
displayName = CSTRING(5Rnd_127x99_AMAX_Mag_Name);
displayNameShort = CSTRING(5Rnd_127x99_AMAX_Mag_NameShort);
descriptionShort = CSTRING(5Rnd_127x99_AMAX_Mag_Description);
initSpeed = 860;
};
@ -279,11 +279,11 @@ class CfgMagazines {
initSpeed = 450;
};
class ACE_30Rnd_9x19_mag: 30Rnd_9x21_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_9x19_Ball";
displayName = "$STR_ACE_30Rnd_9x19_mag_Name";
displayNameShort = "$STR_ACE_30Rnd_9x19_mag_NameShort";
descriptionShort = "$STR_ACE_30Rnd_9x19_mag_Description";
displayName = CSTRING(30Rnd_9x19_mag_Name);
displayNameShort = CSTRING(30Rnd_9x19_mag_NameShort);
descriptionShort = CSTRING(30Rnd_9x19_mag_Description);
initSpeed = 370;
};
@ -311,11 +311,11 @@ class CfgMagazines {
initSpeed = 450;
};
class ACE_16Rnd_9x19_mag: 16Rnd_9x21_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_9x19_Ball";
displayName = "$STR_ACE_16Rnd_9x19_mag_Name";
displayNameShort = "$STR_ACE_16Rnd_9x19_mag_NameShort";
descriptionShort = "$STR_ACE_16Rnd_9x19_mag_Description";
displayName = CSTRING(16Rnd_9x19_mag_Name);
displayNameShort = CSTRING(16Rnd_9x19_mag_NameShort);
descriptionShort = CSTRING(16Rnd_9x19_mag_Description);
initSpeed = 370;
};
@ -323,11 +323,11 @@ class CfgMagazines {
initSpeed = 800;
};
class ACE_10Rnd_762x54_Tracer_mag: 10Rnd_762x54_Mag {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x54_Ball_7T2";
displayName = "$STR_ACE_10Rnd_762x54_Tracer_mag_Name";
displayNameShort = "$STR_ACE_10Rnd_762x54_Tracer_mag_NameShort";
descriptionShort = "$STR_ACE_10Rnd_762x54_Tracer_mag_Description";
displayName = CSTRING(10Rnd_762x54_Tracer_mag_Name);
displayNameShort = CSTRING(10Rnd_762x54_Tracer_mag_NameShort);
descriptionShort = CSTRING(10Rnd_762x54_Tracer_mag_Description);
initSpeed = 800;
tracersEvery = 1;
};

6
addons/ballistics/CfgVehicles.hpp
View File

@ -2,7 +2,7 @@
class CfgVehicles {
class Sign_F;
class ACE_TargetWall: Sign_F {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
scope = 0;
class Eventhandlers {
init = QUOTE(_this call COMPILE_FILE(scripts\initTargetWall));
@ -190,9 +190,9 @@ class CfgVehicles {
class ACE_Box_Ammo: NATO_Box_Base {
scope = 2;
accuracy = 1000;
displayName = "$STR_ACE_AmmoSupplyCrate_DisplayName";
displayName = CSTRING(AmmoSupplyCrate_DisplayName);
model = "\A3\weapons_F\AmmoBoxes\AmmoBox_F";
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_SD,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_M993_AP_Mag,4);

268
addons/ballistics/stringtable.xml
View File

File diff suppressed because it is too large Load Diff

28
addons/captives/CfgVehicles.hpp
View File

@ -4,7 +4,7 @@ class CfgVehicles {
class ACE_Actions {
class ACE_ApplyHandcuffs {
displayName = "$STR_ACE_Captives_SetCaptive";
displayName = CSTRING(SetCaptive);
selection = "righthand";
distance = 2;
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canApplyHandcuffs));
@ -13,7 +13,7 @@ class CfgVehicles {
icon = QUOTE(PATHTOF(UI\handcuff_ca.paa));
};
class ACE_RemoveHandcuffs {
displayName = "$STR_ACE_Captives_ReleaseCaptive";
displayName = CSTRING(ReleaseCaptive);
selection = "righthand";
distance = 2;
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canRemoveHandcuffs));
@ -24,7 +24,7 @@ class CfgVehicles {
class ACE_MainActions {
class ACE_EscortCaptive {
displayName = "$STR_ACE_Captives_EscortCaptive";
displayName = CSTRING(EscortCaptive);
distance = 4;
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canEscortCaptive));
statement = QUOTE([ARR_3(_player, _target, true)] call FUNC(doEscortCaptive));
@ -35,7 +35,7 @@ class CfgVehicles {
hotkey = "E";
};
class ACE_StopEscorting {
displayName = "$STR_ACE_Captives_StopEscorting";
displayName = CSTRING(StopEscorting);
distance = 4;
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canStopEscorting));
statement = QUOTE([ARR_3(_player,_target, false)] call FUNC(doEscortCaptive));
@ -46,7 +46,7 @@ class CfgVehicles {
hotkey = "E";
};
class ACE_LoadCaptive {
displayName = "$STR_ACE_Captives_LoadCaptive";
displayName = CSTRING(LoadCaptive);
distance = 4;
condition = QUOTE([ARR_3(_player, _target, objNull)] call FUNC(canLoadCaptive));
statement = QUOTE([ARR_3(_player, _target, objNull)] call FUNC(doLoadCaptive));
@ -57,7 +57,7 @@ class CfgVehicles {
hotkey = "L";
};
class ACE_FriskPerson {
displayName = "$STR_ACE_Captives_FriskPerson";
displayName = CSTRING(FriskPerson);
distance = 2;
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canFriskPerson));
statement = QUOTE([ARR_2(_player, _target)] call FUNC(doFriskPerson));
@ -71,7 +71,7 @@ class CfgVehicles {
class ACE_SelfActions {
class ACE_StopEscortingSelf {
displayName = "$STR_ACE_Captives_StopEscorting";
displayName = CSTRING(StopEscorting);
condition = QUOTE([ARR_2(_player, objNull)] call FUNC(canStopEscorting));
statement = QUOTE([ARR_3(_player,objNull, false)] call FUNC(doEscortCaptive));
exceptions[] = {"isNotEscorting"};
@ -80,7 +80,7 @@ class CfgVehicles {
hotkey = "C";
};
class ACE_StartSurrenderingSelf {
displayName = "$STR_ACE_Captives_StartSurrendering";
displayName = CSTRING(StartSurrendering);
condition = QUOTE([ARR_2(_player, true)] call FUNC(canSurrender));
statement = QUOTE([ARR_2(_player, true)] call FUNC(setSurrendered));
exceptions[] = {};
@ -89,7 +89,7 @@ class CfgVehicles {
icon = QUOTE(PATHTOF(UI\Surrender_ca.paa));
};
class ACE_StopSurrenderingSelf {
displayName = "$STR_ACE_Captives_StopSurrendering";
displayName = CSTRING(StopSurrendering);
condition = QUOTE([ARR_2(_player, false)] call FUNC(canSurrender));
statement = QUOTE([ARR_2(_player, false)] call FUNC(setSurrendered));
exceptions[] = {"isNotSurrendering"};
@ -104,7 +104,7 @@ class CfgVehicles {
class ACE_Actions { \
class ACE_MainActions { \
class GVAR(LoadCaptive) { \
displayName = "$STR_ACE_Captives_LoadCaptive"; \
displayName = CSTRING(LoadCaptive); \
distance = 4; \
condition = QUOTE([ARR_3(_player, objNull, _target)] call FUNC(canLoadCaptive)); \
statement = QUOTE([ARR_3(_player, objNull, _target)] call FUNC(doLoadCaptive)); \
@ -112,7 +112,7 @@ class CfgVehicles {
priority = 1.2; \
}; \
class GVAR(UnloadCaptive) { \
displayName = "$STR_ACE_Captives_UnloadCaptive"; \
displayName = CSTRING(UnloadCaptive); \
distance = 4; \
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canUnloadCaptive)); \
statement = QUOTE([ARR_2(_player, _target)] call FUNC(doUnloadCaptive)); \
@ -161,9 +161,9 @@ class CfgVehicles {
};
class GVAR(ModuleSurrender): Module_F {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
category = "ACE";
displayName = "$STR_ACE_Captives_ModuleSurrender_DisplayName"; //Make Unit Surrender
displayName = CSTRING(ModuleSurrender_DisplayName); //Make Unit Surrender
function = QFUNC(moduleSurrender);
scope = 2; //show in editor
isGlobal = 1; //run global
@ -172,7 +172,7 @@ class CfgVehicles {
functionPriority = 0;
class Arguments {};
class ModuleDescription: ModuleDescription {
description = "$STR_ACE_Captives_ModuleSurrender_Description"; //Sync a unit to make them surrender.<br/>Source: ace_captives
description = CSTRING(ModuleSurrender_Description); //Sync a unit to make them surrender.<br/>Source: ace_captives
sync[] = {"AnyAI"};
};
};

4
addons/captives/CfgWeapons.hpp
View File

@ -3,8 +3,8 @@ class CfgWeapons {
class InventoryItem_Base_F;
class ACE_CableTie: ACE_ItemCore {
displayName = "$STR_ACE_Captives_CableTie";
descriptionShort = "$STR_ACE_Captives_CableTieDescription";
displayName = CSTRING(CableTie);
descriptionShort = CSTRING(CableTieDescription);
model = QUOTE(PATHTOF(models\ace_cabletie.p3d));
picture = QUOTE(PATHTOF(UI\ace_cabletie_ca.paa));
scope = 2;

2
addons/captives/functions/fnc_doEscortCaptive.sqf
View File

@ -30,7 +30,7 @@ if (_state) then {
_unit setVariable [QGVAR(escortedUnit), _target, true];
//Add Actionmenu to release captive
_actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize "STR_ACE_Captives_StopEscorting"],
_actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize LSTRING(StopEscorting)],
{[(_this select 0), ((_this select 0) getVariable [QGVAR(escortedUnit), objNull]), false] call FUNC(doEscortCaptive);},
nil, 20, false, true, "", QUOTE(!isNull (GETVAR(_target,QGVAR(escortedUnit),objNull)))];

2
addons/captives/functions/fnc_doFriskPerson.sqf
View File

@ -27,7 +27,7 @@ if (_weapon == primaryWeapon _player && {_weapon != ""}) then {
_listedItemClasses = [];
_actions = [localize "STR_ACE_Captives_FriskMenuHeader", ""] call ACE_Interaction_fnc_prepareSelectMenu;
_actions = [localize LSTRING(FriskMenuHeader), ""] call ACE_Interaction_fnc_prepareSelectMenu;
_allGear = [];

4
addons/common/CfgUnitInsignia.hpp
View File

@ -2,13 +2,13 @@
class CfgUnitInsignia {
class ACE_insignia_logo {
displayName = "ACE3";
author = "$STR_ACE_Common_ACETeam";
author = CSTRING(ACETeam);
texture = PATHTOF(data\Insignia_ace3logo_ca.paa);
textureVehicle = "";
};
class ACE_insignia_banana {
displayName = "ABE3";
author = "$STR_ACE_Common_ACETeam";
author = CSTRING(ACETeam);
texture = PATHTOF(data\insignia_banana_ca.paa);
textureVehicle = "";
};

41
addons/common/CfgVehicles.hpp
View File

@ -1,4 +1,3 @@
class CfgVehicles {
/*class Man;
class CAManBase: Man {
@ -29,43 +28,43 @@ class CfgVehicles {
class ModuleDescription;
};
class ACE_Module: Module_F {};
class ACE_ModuleCheckPBOs: ACE_Module {
author = "$STR_ACE_Common_ACETeam";
class ACE_ModuleCheckPBOs: ACE_Module {
author = CSTRING(ACETeam);
category = "ACE";
displayName = "$STR_ACE_Common_CheckPBO_DisplayName";
displayName = CSTRING(CheckPBO_DisplayName);
function = QFUNC(moduleCheckPBOs);
scope = 2;
isGlobal = 1;
icon = QUOTE(PATHTOF(UI\Icon_Module_CheckPBO_ca.paa));
class Arguments {
class Action {
displayName = "$STR_ACE_Common_CheckPBO_Action_DisplayName";
description = "$STR_ACE_Common_CheckPBO_Action_Description";
displayName = CSTRING(CheckPBO_Action_DisplayName);
description = CSTRING(CheckPBO_Action_Description);
class values {
class WarnOnce {
default = 1;
name = "$STR_ACE_Common_CheckPBO_Action_WarnOnce";
name = CSTRING(CheckPBO_Action_WarnOnce);
value = 0;
};
class Warn {
name = "$STR_ACE_Common_CheckPBO_Action_WarnPerm";
name = CSTRING(CheckPBO_Action_WarnPerm);
value = 1;
};
class Kick {
name = "$STR_ACE_Common_CheckPBO_Action_Kick";
name = CSTRING(CheckPBO_Action_Kick);
value = 2;
};
};
};
class CheckAll {
displayName = "$STR_ACE_Common_CheckPBO_CheckAll_DisplayName";
description = "$STR_ACE_Common_CheckPBO_CheckAll_Description";
displayName = CSTRING(CheckPBO_CheckAll_DisplayName);
description = CSTRING(CheckPBO_CheckAll_Description);
typeName = "BOOL";
defaultValue = 0;
};
class Whitelist {
displayName = "$STR_ACE_Common_CheckPBO_Whitelist_DisplayName";
description = "$STR_ACE_Common_CheckPBO_Whitelist_Description";
displayName = CSTRING(CheckPBO_Whitelist_DisplayName);
description = CSTRING(CheckPBO_Whitelist_Description);
typeName = "STRING";
class values {
default = "[]";
@ -73,14 +72,14 @@ class CfgVehicles {
};
};
class ModuleDescription: ModuleDescription {
description = "$STR_ACE_Common_CheckPBO_Description";
description = CSTRING(CheckPBO_Description);
};
};
class ACE_ModuleLSDVehicles: ACE_Module {
author = "$STR_ACE_Common_ACETeam";
author = CSTRING(ACETeam);
category = "ACE";
displayName = "$STR_ACE_Common_LSDVehicles_DisplayName";
displayName = CSTRING(LSDVehicles_DisplayName);
function = "ACE_Common_fnc_moduleLSDVehicles";
scope = 2;
icon = QUOTE(PATHTOF(UI\Icon_Module_LSD_ca.paa));
@ -88,15 +87,15 @@ class CfgVehicles {
class Arguments {
};
class ModuleDescription: ModuleDescription {
description = "$STR_ACE_Common_LSDVehicles_Description";
description = CSTRING(LSDVehicles_Description);
sync[] = {"AnyVehicle"};
};
};
class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F {
author = "$STR_ACE_Common_ACETeam";
displayName = "$STR_ACE_Common_MiscItems";
author = CSTRING(ACETeam);
displayName = CSTRING(MiscItems);
transportMaxWeapons = 9001;
transportMaxMagazines = 9001;
transportMaxItems = 9001;
@ -112,8 +111,8 @@ class CfgVehicles {
class ACE_bananaItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
displayName = "$STR_ACE_Common_bananaDisplayName";
author = "$STR_ACE_Common_ACETeam";
displayName = CSTRING(bananaDisplayName);
author = CSTRING(ACETeam);
vehicleClass = "Items";
class TransportItems
{

6
addons/common/CfgVoice.hpp
View File

@ -209,7 +209,7 @@ class ACE_RadioProtocolNoRadio: RadioProtocolBase {
class CfgVoice {
class ACE_NoVoice {
author = "$STR_ACE_Common_ACETeam";
author = CSTRING(ACETeam);
protocol = "ACE_RadioProtocolNoRadio";
variants[] = {1};
directories[] = {"",""};
@ -217,13 +217,13 @@ class CfgVoice {
scope = 2;
voiceType = "";
icon = "\a3\Ui_f\data\Map\Markers\Flags\nato_ca.paa";
displayName = "$STR_ACE_Common_NoVoice";
displayName = CSTRING(NoVoice);
};
};
class CfgVoiceTypes {
class ACE_NoVoice {
name = "$STR_ACE_Common_NoVoice";
name = CSTRING(NoVoice);
voices[] = {"ACE_NoVoice","ACE_NoVoice","ACE_NoVoice"};
preview = "ACE_NoVoice";
alternative = "";

6
addons/common/CfgWeapons.hpp
View File

@ -30,10 +30,10 @@ class CfgWeapons {
class InventoryItem_Base_F;
class ACE_Banana: ACE_ItemCore {
author = "$STR_ACE_Common_ACETeam";
author = CSTRING(ACETeam);
scope = 2;
displayName = "$STR_ACE_Common_bananaDisplayName";
descriptionShort = "$STR_ACE_Common_bananaDescr";
displayName = CSTRING(bananaDisplayName);
descriptionShort = CSTRING(bananaDescr);
model = PATHTOF(data\banana.p3d);
picture = PATHTOF(data\icon_banana_ca.paa);
icon = "iconObject_circle";

26
addons/common/config.cpp
View File

@ -74,10 +74,10 @@ class ACE_Settings {
*
* The following settings only apply when isClientSettable == 1
* Stringtable entry with the setting name
* displayName = "$STR_ACE_Common_SettingName";
* displayName = CSTRING(SettingName);
*
* Stringtable entry with the setting description
* description = "$STR_ACE_Common_SettingDescription";
* description = CSTRING(SettingDescription);
*
* Stringtable entries that describe the options
* Only applies if typeName == "SCALAR";
@ -92,39 +92,39 @@ class ACE_Settings {
value = 1;
typeName = "BOOL";
isClientSettable = 1;
displayName = "$STR_ACE_Common_EnableNumberHotkeys";
displayName = CSTRING(EnableNumberHotkeys);
};*/
class GVAR(settingFeedbackIcons) {
value = 1;
typeName = "SCALAR";
force = 0;
isClientSettable = 1;
displayName = "$STR_ACE_Common_SettingFeedbackIconsName";
description = "$STR_ACE_Common_SettingFeedbackIconsDesc";
values[] = {"$STR_ACE_Common_Hide", "$STR_ACE_Common_TopRightDown", "$STR_ACE_Common_TopRightLeft", "$STR_ACE_Common_TopLeftDown", "$STR_ACE_Common_TopLeftRight"};
displayName = CSTRING(SettingFeedbackIconsName);
description = CSTRING(SettingFeedbackIconsDesc);
values[] = {ECSTRING(optionsmenu,Hide), ECSTRING(optionsmenu,TopRightDown), ECSTRING(optionsmenu,TopRightLeft), ECSTRING(optionsmenu,TopLeftDown), ECSTRING(optionsmenu,TopLeftRight)};
};
class GVAR(SettingProgressBarLocation) {
value = 0;
typeName = "SCALAR";
force = 0;
isClientSettable = 1;
displayName = "$STR_ACE_Common_SettingProgressbarLocationName";
description = "$STR_ACE_Common_SettingProgressbarLocationDesc";
values[] = {"$STR_ACE_Common_Top", "$STR_ACE_Common_Bottom"};
displayName = CSTRING(SettingProgressbarLocationName);
description = CSTRING(SettingProgressbarLocationDesc);
values[] = {ECSTRING(optionsmenu,Top), ECSTRING(optionsmenu,Bottom)};
};
class GVAR(displayTextColor) {
value[] = {0,0,0,0.1};
typeName = "COLOR";
isClientSettable = 1;
displayName = "$STR_ACE_Common_SettingDisplayTextColorName";
description = "$STR_ACE_Common_SettingDisplayTextColorDesc";
displayName = CSTRING(SettingDisplayTextColorName);
description = CSTRING(SettingDisplayTextColorDesc);
};
class GVAR(displayTextFontColor) {
value[] = {1,1,1,1};
typeName = "COLOR";
isClientSettable = 1;
displayName = "$STR_ACE_Common_SettingDisplayTextFontColorName";
description = "$STR_ACE_Common_SettingDisplayTextFontColorDesc";
displayName = CSTRING(SettingDisplayTextFontColorName);
description = CSTRING(SettingDisplayTextFontColorDesc);
};
};

2
addons/disarming/CfgVehicles.hpp
View File

@ -4,7 +4,7 @@ class CfgVehicles {
class ACE_Actions {
class ACE_MainActions {
class ACE_DisarmInventory {
displayName = "$STR_ACE_Disarming_OpenInventory";
displayName = CSTRING(OpenInventory);
distance = 3.5;
condition = QUOTE([ARR_2(_player,_target)] call FUNC(canPlayerDisarmUnit));
statement = QUOTE([ARR_2(_player,_target)] call FUNC(openDisarmDialog));

10
addons/disposable/CfgMagazines.hpp
View File

@ -1,10 +1,10 @@
class CfgMagazines {
class NLAW_F;
class ACE_PreloadedMissileDummy: NLAW_F { // The dummy magazine
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
scope = 1;
scopeArsenal = 1;
displayName = "$STR_ACE_Disposable_PreloadedMissileDummy";
displayName = CSTRING(PreloadedMissileDummy);
picture = PATHTOEF(common,UI\blank_CO.paa);
weaponPoolAvailable = 0;
mass = 0;
@ -13,9 +13,9 @@ class CfgMagazines {
count = 0;
};
class ACE_UsedTube_F: NLAW_F {
author = "$STR_ACE_Common_ACETeam";
displayName = "$STR_ACE_Disposable_UsedTube";
descriptionShort = "$STR_ACE_Disposable_UsedTubeDescription";
author = ECSTRING(common,ACETeam);
displayName = CSTRING(UsedTube);
descriptionShort = CSTRING(UsedTubeDescription);
displayNameShort = "-";
count = 0;
weaponPoolAvailable = 0;

6
addons/disposable/CfgWeapons.hpp
View File

@ -7,9 +7,9 @@ class CfgWeapons {
class ACE_launch_NLAW_Used_F: launch_NLAW_F { // the used tube should be a sub class of the disposable launcher
scope = 1;
ACE_isUsedLauncher = 1;
author = "$STR_ACE_Common_ACETeam";
displayName = "$STR_ACE_Disposable_UsedTube";
descriptionShort = "$STR_ACE_Disposable_UsedTubeDescription";
author = ECSTRING(common,ACETeam);
displayName = CSTRING(UsedTube);
descriptionShort = CSTRING(UsedTubeDescription);
magazines[] = {"ACE_FiredMissileDummy"}; // This will disable the used launcher class from being fired again.
//picture = ""; @todo
//model = ""; @todo

2
addons/dragging/functions/fnc_carryObject.sqf
View File

@ -58,7 +58,7 @@ if (_actionID != -1) then {
};
_actionID = _unit addAction [
format ["<t color='#FF0000'>%1</t>", localize "STR_ACE_Dragging_Drop"],
format ["<t color='#FF0000'>%1</t>", localize LSTRING(Drop)],
QUOTE([ARR_2(_this select 0, (_this select 0) getVariable [ARR_2(QUOTE(QGVAR(carriedObject)),objNull)])] call FUNC(dropObject_carry)),
nil,
20,

2
addons/dragging/functions/fnc_dragObject.sqf
View File

@ -49,7 +49,7 @@ if (_actionID != -1) then {
};
_actionID = _unit addAction [
format ["<t color='#FF0000'>%1</t>", localize "STR_ACE_Dragging_Drop"],
format ["<t color='#FF0000'>%1</t>", localize LSTRING(Drop)],
QUOTE([ARR_2(_this select 0, (_this select 0) getVariable [ARR_2(QUOTE(QGVAR(draggedObject)),objNull)])] call FUNC(dropObject)),
nil,
20,

4
addons/dragging/functions/fnc_setCarryable.sqf
View File

@ -49,8 +49,8 @@ if (_type in _initializedClasses) exitWith {};
_initializedClasses pushBack _type;
GVAR(initializedClasses_carry) = _initializedClasses;
_carryAction = [QGVAR(carry), localize "STR_ACE_Dragging_Carry", "", {[_player, _target] call FUNC(startCarry)}, {[_player, _target] call FUNC(canCarry)}] call EFUNC(interact_menu,createAction);
_dropAction = [QGVAR(drop_carry), localize "STR_ACE_Dragging_Drop", "", {[_player, _target] call FUNC(dropObject_carry)}, {[_player, _target] call FUNC(canDrop_carry)}] call EFUNC(interact_menu,createAction);
_carryAction = [QGVAR(carry), localize LSTRING(Carry), "", {[_player, _target] call FUNC(startCarry)}, {[_player, _target] call FUNC(canCarry)}] call EFUNC(interact_menu,createAction);
_dropAction = [QGVAR(drop_carry), localize LSTRING(Drop), "", {[_player, _target] call FUNC(dropObject_carry)}, {[_player, _target] call FUNC(canDrop_carry)}] call EFUNC(interact_menu,createAction);
[_type, 0, ["ACE_MainActions"], _carryAction] call EFUNC(interact_menu,addActionToClass);
[_type, 0, [], _dropAction] call EFUNC(interact_menu,addActionToClass);

4
addons/dragging/functions/fnc_setDraggable.sqf
View File

@ -49,8 +49,8 @@ if (_type in _initializedClasses) exitWith {};
_initializedClasses pushBack _type;
GVAR(initializedClasses) = _initializedClasses;
_dragAction = [QGVAR(drag), localize "STR_ACE_Dragging_Drag", "", {[_player, _target] call FUNC(startDrag)}, {[_player, _target] call FUNC(canDrag)}] call EFUNC(interact_menu,createAction);
_dropAction = [QGVAR(drop), localize "STR_ACE_Dragging_Drop", "", {[_player, _target] call FUNC(dropObject)}, {[_player, _target] call FUNC(canDrop)}] call EFUNC(interact_menu,createAction);
_dragAction = [QGVAR(drag), localize LSTRING(Drag), "", {[_player, _target] call FUNC(startDrag)}, {[_player, _target] call FUNC(canDrag)}] call EFUNC(interact_menu,createAction);
_dropAction = [QGVAR(drop), localize LSTRING(Drop), "", {[_player, _target] call FUNC(dropObject)}, {[_player, _target] call FUNC(canDrop)}] call EFUNC(interact_menu,createAction);
[_type, 0, ["ACE_MainActions"], _dragAction] call EFUNC(interact_menu,addActionToClass);
[_type, 0, [], _dropAction] call EFUNC(interact_menu,addActionToClass);

2
addons/dragging/functions/fnc_startCarry.sqf
View File

@ -22,7 +22,7 @@ private "_weight";
_weight = [_target] call FUNC(getWeight);
if (_weight > GETMVAR(ACE_maxWeightCarry,1E11)) exitWith {
[localize "STR_ACE_Dragging_UnableToDrag"] call EFUNC(common,displayTextStructured);
[localize LSTRING(UnableToDrag)] call EFUNC(common,displayTextStructured);
};
private "_timer";

2
addons/dragging/functions/fnc_startDrag.sqf
View File

@ -22,7 +22,7 @@ private "_weight";
_weight = [_target] call FUNC(getWeight);
if (_weight > GETMVAR(ACE_maxWeightDrag,1E11)) exitWith {
[localize "STR_ACE_Dragging_UnableToDrag"] call EFUNC(common,displayTextStructured);
[localize LSTRING(UnableToDrag)] call EFUNC(common,displayTextStructured);
};
// add a primary weapon if the unit has none.

14
addons/explosives/CfgModule.hpp
View File

@ -1,27 +1,27 @@
class ACE_Module;
class ACE_ModuleExplosive: ACE_Module {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
category = "ACE";
displayName = "$STR_ACE_Explosive_Module_DisplayName";
displayName = CSTRING(Module_DisplayName);
function = QUOTE(FUNC(module));
scope = 2;
isGlobal = 1;
icon = PATHTOF(UI\Icon_Module_Explosives_ca.paa);
class Arguments {
class RequireSpecialist {
displayName = "$STR_ACE_Explosive_RequireSpecialist_DisplayName";
description = "$STR_ACE_Explosive_RequireSpecialist_Description";
displayName = CSTRING(RequireSpecialist_DisplayName);
description = CSTRING(RequireSpecialist_Description);
typeName = "BOOL";
defaultValue = 0;
};
class PunishNonSpecialists {
displayName = "$STR_ACE_Explosive_PunishNonSpecialists_DisplayName";
description = "$STR_ACE_Explosive_PunishNonSpecialists_Description";
displayName = CSTRING(PunishNonSpecialists_DisplayName);
description = CSTRING(PunishNonSpecialists_Description);
typeName = "BOOL";
defaultValue = 1;
};
};
class ModuleDescription {
description = "$STR_ACE_Explosive_Module_Description";
description = CSTRING(Module_Description);
};
};

4
addons/explosives/CfgVehicles.hpp
View File

@ -97,7 +97,7 @@ class CfgVehicles {
condition = "true";
class ACE_SetTrigger {
selection = "";
displayName = "$STR_ACE_Explosives_TriggerMenu";
displayName = CSTRING(TriggerMenu);
distance = 4;
condition = "true";
statement = "";
@ -109,7 +109,7 @@ class CfgVehicles {
};
class ACE_PickUp {
selection = "";
displayName = "$STR_ACE_Explosives_Pickup";
displayName = CSTRING(Pickup);
distance = 4;
condition = "true";
statement = QUOTE([ARR_2(_player,_target getVariable QUOTE(QGVAR(class)))] call EFUNC(common,addToInventory);deleteVehicle _target;);

10
addons/explosives/ExplosivesUI.hpp
View File

@ -215,7 +215,7 @@ class Rsc_ACE_PhoneInterface {
y = 0.676 * safezoneH + safezoneY;
w = 0.0309375 * safezoneW;
h = 0.033 * safezoneH;
tooltip = "$STR_ACE_Explosives_Phone_AddToSpeedDial";
tooltip = CSTRING(Phone_AddToSpeedDial);
action = QUOTE([ARR_2(ctrlText 1401,ctrlText 1400)] call FUNC(addToSpeedDial););
};
class clear: Rsc_ACE_HiddenButton {
@ -224,7 +224,7 @@ class Rsc_ACE_PhoneInterface {
y = 0.445 * safezoneH + safezoneY;
w = 0.020625 * safezoneW;
h = 0.033 * safezoneH;
tooltip = "$STR_ACE_Explosives_Clear";
tooltip = CSTRING(Clear);
action = QUOTE(ctrlSetText [ARR_2(1400,'')];[ctrlText 1401] call FUNC(removeFromSpeedDial);ctrlSetText [ARR_2(1401,'')];);
};
class dial: Rsc_ACE_HiddenButton {
@ -233,7 +233,7 @@ class Rsc_ACE_PhoneInterface {
y = 0.445 * safezoneH + safezoneY;
w = 0.04125 * safezoneW;
h = 0.033 * safezoneH;
tooltip = "$STR_ACE_Explosives_Phone_Dial";
tooltip = CSTRING(Phone_Dial);
action = QUOTE([ARR_2(ace_player,ctrlText 1400)] call FUNC(dialPhone););
};
class up: Rsc_ACE_HiddenButton {
@ -242,7 +242,7 @@ class Rsc_ACE_PhoneInterface {
y = 0.445 * safezoneH + safezoneY;
w = 0.020625 * safezoneW;
h = 0.033 * safezoneH;
tooltip = "$STR_ACE_Explosives_Phone_Up";
tooltip = CSTRING(Phone_Up);
action = QUOTE([true] call FUNC(setSpeedDial));
};
class down: Rsc_ACE_HiddenButton {
@ -251,7 +251,7 @@ class Rsc_ACE_PhoneInterface {
y = 0.485 * safezoneH + safezoneY;
w = 0.020625 * safezoneW;
h = 0.033 * safezoneH;
tooltip = "$STR_ACE_Explosives_Phone_Down";
tooltip = CSTRING(Phone_Down);
action = QUOTE([false] call FUNC(setSpeedDial));
};
class speedDial_Text: RscText {

4
addons/explosives/functions/fnc_addClacker.sqf
View File

@ -37,8 +37,8 @@ _config = ConfigFile >> "CfgMagazines" >> _magazineClass >> "ACE_Triggers" >> co
_clacker = _unit getVariable [QGVAR(Clackers), []];
GVAR(PlacedCount) = GVAR(PlacedCount) + 1;
_clacker pushBack [_explosive, getNumber(_config >> "FuseTime"), format [localize "STR_ACE_Explosives_DetonateCode",
_clacker pushBack [_explosive, getNumber(_config >> "FuseTime"), format [localize LSTRING(DetonateCode),
GVAR(PlacedCount)], _magazineClass, configName ((_this select 3) select (count (_this select 3) - 1))];
_unit setVariable [QGVAR(Clackers), _clacker, true];
_unit sideChat format [localize "STR_ACE_Explosives_DetonateCode", GVAR(PlacedCount)];
_unit sideChat format [localize LSTRING(DetonateCode), GVAR(PlacedCount)];

2
addons/explosives/functions/fnc_openTimerSetUI.sqf
View File

@ -38,4 +38,4 @@ DFUNC(SetTimer) = {
buttonSetAction [8860, QUOTE(call DFUNC(SetTimer);)];
buttonSetAction [8855, QUOTE(closeDialog 0;)];
ctrlSetText [8870, format[localize "STR_ACE_Explosives_TimerMenu",0, 30]];
ctrlSetText [8870, format[localize LSTRING(TimerMenu),0, 30]];

4
addons/explosives/functions/fnc_setupExplosive.sqf
View File

@ -41,8 +41,8 @@ GVAR(TweakedAngle) = 180;
};
}] call CALLSTACK(BIS_fnc_addStackedEventHandler);
[localize "STR_ACE_Explosives_PlaceAction", localize "STR_ACE_Explosives_CancelAction",
localize "STR_ACE_Explosives_ScrollAction"] call EFUNC(interaction,showMouseHint);
[localize LSTRING(PlaceAction), localize LSTRING(CancelAction),
localize LSTRING(ScrollAction)] call EFUNC(interaction,showMouseHint);
_unit setVariable [QGVAR(Place), [_unit, "DefaultAction",
{GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call FUNC(place_Approve);}] call EFUNC(common,AddActionEventHandler)];
_unit setVariable [QGVAR(Cancel), [_unit, "zoomtemp",

2
addons/explosives/functions/fnc_startDefuse.sqf
View File

@ -59,6 +59,6 @@ if (ACE_player != _unit) then {
_isEOD = [_unit] call EFUNC(Common,isEOD);
_defuseTime = [_isEOD, _target] call _fnc_DefuseTime;
if (_isEOD || {!GVAR(RequireSpecialist)}) then {
[_defuseTime, [_unit,_target], {(_this select 0) call FUNC(defuseExplosive)}, {}, (localize "STR_ACE_Explosives_DefusingExplosive")] call EFUNC(common,progressBar);
[_defuseTime, [_unit,_target], {(_this select 0) call FUNC(defuseExplosive)}, {}, (localize LSTRING(DefusingExplosive))] call EFUNC(common,progressBar);
};
};

12
addons/explosives/stringtable.xml
View File

@ -505,37 +505,37 @@
<Italian>Raccogli</Italian>
<Portuguese>Pegar</Portuguese>
</Key>
<Key ID="STR_ACE_Explosive_Module_DisplayName">
<Key ID="STR_ACE_Explosives_Module_DisplayName">
<English>Explosive System</English>
<Polish>System ładunków wybuchowych</Polish>
<Spanish>Sistema de explosivos</Spanish>
<German>Sprengstoffsystem</German>
</Key>
<Key ID="STR_ACE_Explosive_RequireSpecialist_DisplayName">
<Key ID="STR_ACE_Explosives_RequireSpecialist_DisplayName">
<English>Require specialists?</English>
<Polish>Wymagaj specjalistów?</Polish>
<Spanish>¿Requiere especialista?</Spanish>
<German>Benötigt Sprengstoffexperten?</German>
</Key>
<Key ID="STR_ACE_Explosive_RequireSpecialist_Description">
<Key ID="STR_ACE_Explosives_RequireSpecialist_Description">
<English>Require explosive specialists to disable explosives? Default: No</English>
<Polish>Wymagać saperów do rozbrajania ładunków wybuchowych? Domyślnie: Nie</Polish>
<Spanish>Requiere especialista en explosivos para desactivar explosivos?. Por defecto: No</Spanish>
<German>Benötige Sprengstoffexperte um Sprengladungen zu entschärfen? Standard: Nein</German>
</Key>
<Key ID="STR_ACE_Explosive_PunishNonSpecialists_DisplayName">
<Key ID="STR_ACE_Explosives_PunishNonSpecialists_DisplayName">
<English>Punish non-specialists?</English>
<Polish>Karaj nie-specjalistów?</Polish>
<Spanish>¿Penalizar a los no especialistas?</Spanish>
<German>Bestrafe Nicht-Sprengstoffexperten?</German>
</Key>
<Key ID="STR_ACE_Explosive_PunishNonSpecialists_Description">
<Key ID="STR_ACE_Explosives_PunishNonSpecialists_Description">
<English>Increase the time it takes to complete actions for non-specialists? Default: Yes</English>
<Polish>Zwiększyć ilość wymaganego czasu do ukończenia akcji dla nie-specjalistów? Domyślnie: Tak</Polish>
<Spanish>Aumenta el tiempo que lleva completar acciones para los no especialstas?. Por defecto: Si</Spanish>
<German>Entschärfungszeit für Nicht-Sprengstoffexperten erhöhen? Standard: Ja</German>
</Key>
<Key ID="STR_ACE_Explosive_Module_Description">
<Key ID="STR_ACE_Explosives_Module_Description">
<English></English>
<Polish>Moduł ten pozwala dostosować opcje związane z ładunkami wybuchowymi, ich podkładaniem oraz rozbrajaniem.</Polish>
<German>Dieses Modul erlaubt die Einstellungen für Sprengstoffe zu verändern.</German>

2
addons/fcs/functions/fnc_keyUp.sqf
View File

@ -208,5 +208,5 @@ if(_playSound) then {
};
if(_showHint) then {
[format ["%1: %2", localize "STR_ACE_FCS_ZeroedTo", _distance]] call EFUNC(common,displayTextStructured);
[format ["%1: %2", localize LSTRING(ZeroedTo), _distance]] call EFUNC(common,displayTextStructured);
};

2
addons/fcs/functions/fnc_reset.sqf
View File

@ -22,4 +22,4 @@ _turret = _this select 1;
[_vehicle, format ["%1_%2", QGVAR(Elevation), _turret], 0] call EFUNC(common,setVariablePublic);
[_vehicle, format ["%1_%2", QGVAR(Azimuth), _turret], 0] call EFUNC(common,setVariablePublic);
[localize "STR_ACE_FCS_HasBeenReset"] call EFUNC(common,displayTextStructured);
[localize LSTRING(HasBeenReset)] call EFUNC(common,displayTextStructured);

6
addons/fcs/initKeybinds.sqf
View File

@ -1,6 +1,6 @@
// by commy2
["ACE3 Vehicles", QGVAR(lazeTarget), localize "STR_ACE_FCS_LaseTarget",
["ACE3 Vehicles", QGVAR(lazeTarget), localize LSTRING(LaseTarget),
{
// Conditions: canInteract
if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -30,7 +30,7 @@
},
[15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key
["ACE3 Vehicles", QGVAR(adjustRangeUp), localize "STR_ACE_FCS_AdjustRangeUp",
["ACE3 Vehicles", QGVAR(adjustRangeUp), localize LSTRING(AdjustRangeUp),
{
// Conditions: canInteract
if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -44,7 +44,7 @@
{false},
[201, [false, false, false]], false] call cba_fnc_addKeybind; //PageUp Key
["ACE3 Vehicles", QGVAR(adjustRangDown), localize "STR_ACE_FCS_AdjustRangeDown",
["ACE3 Vehicles", QGVAR(adjustRangDown), localize LSTRING(AdjustRangeDown),
{
// Conditions: canInteract
if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};

28
addons/flashsuppressors/CfgWeapons.hpp
View File

@ -230,7 +230,7 @@ class CfgWeapons {
class InventoryMuzzleItem_Base_F;
class ACE_muzzle_mzls_H: ItemCore {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
_generalMacro = "ACE_muzzle_mzls_H";
htMin = 1;
htMax = 600;
@ -239,7 +239,7 @@ class CfgWeapons {
mFact = 1;
tBody = 100;
scope = 2;
displayName = "$STR_ACE_muzzle_mzls_H";
displayName = CSTRING(muzzle_mzls_H);
picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_h_ca.paa";
model = "\A3\weapons_f\acc\acca_mzls_H_F";
@ -283,9 +283,9 @@ class CfgWeapons {
};
class ACE_muzzle_mzls_B: ACE_muzzle_mzls_H {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
_generalMacro = "ACE_muzzle_mzls_B";
displayName = "$STR_ACE_muzzle_mzls_B";
displayName = CSTRING(muzzle_mzls_B);
picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_h_ca.paa";
model = "\A3\weapons_f\acc\acca_mzls_H_F";
@ -329,9 +329,9 @@ class CfgWeapons {
};
class ACE_muzzle_mzls_L: ACE_muzzle_mzls_H {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
_generalMacro = "ACE_muzzle_mzls_L";
displayName = "$STR_ACE_muzzle_mzls_L";
displayName = CSTRING(muzzle_mzls_L);
picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa";
model = "\A3\weapons_f\acc\acca_mzls_l_F";
@ -375,9 +375,9 @@ class CfgWeapons {
};
class ACE_muzzle_mzls_smg_01: ACE_muzzle_mzls_H {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
_generalMacro = "ACE_muzzle_mzls_smg_01";
displayName = "$STR_ACE_muzzle_mzls_smg_01";
displayName = CSTRING(muzzle_mzls_smg_01);
picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa";
model = "\A3\weapons_f\acc\acca_mzls_H_F"; //"\A3\weapons_f\acc\acca_mzls_smg_01_F";
@ -421,9 +421,9 @@ class CfgWeapons {
};
class ACE_muzzle_mzls_smg_02: ACE_muzzle_mzls_H {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
_generalMacro = "ACE_muzzle_mzls_smg_02";
displayName = "$STR_ACE_muzzle_mzls_smg_02";
displayName = CSTRING(muzzle_mzls_smg_02);
picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa";
model = "\A3\weapons_f\acc\acca_mzls_H_F"; //"\A3\weapons_f\acc\acca_mzls_smg_01_F";
@ -467,9 +467,9 @@ class CfgWeapons {
};
class ACE_muzzle_mzls_338: ACE_muzzle_mzls_H {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
_generalMacro = "ACE_muzzle_mzls_338";
displayName = "$STR_ACE_muzzle_mzls_338";
displayName = CSTRING(muzzle_mzls_338);
picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_h_ca.paa";
model = "\A3\weapons_f\acc\acca_mzls_H_F";
@ -513,9 +513,9 @@ class CfgWeapons {
};
class ACE_muzzle_mzls_93mmg: ACE_muzzle_mzls_H {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
_generalMacro = "ACE_muzzle_mzls_93mmg";
displayName = "$STR_ACE_muzzle_mzls_93mmg";
displayName = CSTRING(muzzle_mzls_93mmg);
picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_h_ca.paa";
model = "\A3\weapons_f\acc\acca_mzls_H_F";

14
addons/flashsuppressors/stringtable.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="FlashSuppressors">
<Key ID="STR_ACE_muzzle_mzls_H">
<Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_H">
<English>Flash Suppressor (6.5 mm)</English>
<Hungarian>Lángrejtő (6,5 mm)</Hungarian>
<German>Mündungsfeuerdämpfer (6,5 mm)</German>
@ -13,7 +13,7 @@
<Russian>Пламегаситель (6,5 мм)</Russian>
<Spanish>Bocacha (6,5 mm)</Spanish>
</Key>
<Key ID="STR_ACE_muzzle_mzls_B">
<Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_B">
<English>Flash Suppressor (7.62 mm)</English>
<Hungarian>Lángrejtő (7,62 mm)</Hungarian>
<German>Mündungsfeuerdämpfer (7,62 mm)</German>
@ -25,7 +25,7 @@
<Russian>Пламегаситель (7,62 мм)</Russian>
<Spanish>Bocacha (7,62 mm)</Spanish>
</Key>
<Key ID="STR_ACE_muzzle_mzls_L">
<Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_L">
<English>Flash Suppressor (5.56 mm)</English>
<Hungarian>Lángrejtő (5,56 mm)</Hungarian>
<German>Mündungsfeuerdämpfer (5,56 mm)</German>
@ -37,7 +37,7 @@
<Russian>Пламегаситель (5,56 мм)</Russian>
<Spanish>Bocacha (5,56 mm)</Spanish>
</Key>
<Key ID="STR_ACE_muzzle_mzls_smg_01">
<Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_smg_01">
<English>Flash Suppressor (.45 ACP)</English>
<Hungarian>Lángrejtő (.45 ACP)</Hungarian>
<German>Mündungsfeuerdämpfer (.45 ACP)</German>
@ -49,7 +49,7 @@
<Russian>Пламегаситель (.45 ACP)</Russian>
<Spanish>Bocacha (.45 ACP)</Spanish>
</Key>
<Key ID="STR_ACE_muzzle_mzls_smg_02">
<Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_smg_02">
<English>Flash Suppressor (9 mm)</English>
<Hungarian>Lángrejtő (9 mm)</Hungarian>
<German>Mündungsfeuerdämpfer (9 mm)</German>
@ -61,7 +61,7 @@
<Russian>Пламегаситель (9 мм)</Russian>
<Spanish>Bocacha (9 mm)</Spanish>
</Key>
<Key ID="STR_ACE_muzzle_mzls_338">
<Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_338">
<English>Flash Suppressor (.338)</English>
<Hungarian>Lángrejtő (.338)</Hungarian>
<German>Mündungsfeuerdämpfer (.338)</German>
@ -73,7 +73,7 @@
<Russian>Пламегаситель (.338)</Russian>
<Spanish>Bocacha (.338)</Spanish>
</Key>
<Key ID="STR_ACE_muzzle_mzls_93mmg">
<Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_93mmg">
<English>Flash Suppressor (9.3 mm)</English>
<Hungarian>Lángrejtő (9,3 mm)</Hungarian>
<German>Mündungsfeuerdämpfer (9,3 mm)</German>

20
addons/frag/ACE_Settings.hpp
View File

@ -1,32 +1,32 @@
class ACE_Settings {
class GVAR(Enabled) {
displayName = "$STR_ACE_frag_EnableFrag";
description = "$STR_ACE_frag_EnableFrag_Desc";
displayName = CSTRING(EnableFrag);
description = CSTRING(EnableFrag_Desc);
typeName = "BOOL";
value = 1;
};
class GVAR(SpallEnabled) {
displayName = "$STR_ACE_frag_EnableSpall";
description = "$STR_ACE_frag_EnableSpall_Desc";
displayName = CSTRING(EnableSpall);
description = CSTRING(EnableSpall_Desc);
typeName = "BOOL";
value = 0;
};
class GVAR(maxTrack) {
displayName = "$STR_ACE_frag_MaxTrack";
description = "$STR_ACE_frag_MaxTrack_Desc";
displayName = CSTRING(MaxTrack);
description = CSTRING(MaxTrack_Desc);
typeName = "SCALAR";
value = 500;
};
class GVAR(MaxTrackPerFrame) {
displayName = "$STR_ACE_frag_MaxTrackPerFrame";
description = "$STR_ACE_frag_MaxTrackPerFrame_Desc";
displayName = CSTRING(MaxTrackPerFrame);
description = CSTRING(MaxTrackPerFrame_Desc);
typeName = "SCALAR";
value = 50;
};
class GVAR(EnableDebugTrace) {
displayName = "$STR_ACE_frag_EnableDebugTrace";
description = "$STR_ACE_frag_EnableDebugTrace_Desc";
displayName = CSTRING(EnableDebugTrace);
description = CSTRING(EnableDebugTrace_Desc);
typeName = "BOOL";
value = 0;
};

20
addons/frag/stringtable.xml
View File

@ -1,50 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Frag">
<Key ID="STR_ACE_frag_EnableFrag">
<Key ID="STR_ACE_Frag_EnableFrag">
<English>Fragmentation Simulation</English>
<Spanish>Simulación de fragmentación</Spanish>
<German>Splittersimulation</German>
</Key>
<Key ID="STR_ACE_frag_EnableFrag_Desc">
<Key ID="STR_ACE_Frag_EnableFrag_Desc">
<English>Enable the ACE Fragmentation Simulation</English>
<Spanish>Activa la simulación de fragmentación ACE</Spanish>
<German>Aktiviere die ACE-Splittersimulation</German>
</Key>
<Key ID="STR_ACE_frag_EnableSpall">
<Key ID="STR_ACE_Frag_EnableSpall">
<English>Spalling Simulation</English>
<Spanish>Simulación de astillamiento</Spanish>
<German>Explosionssimulation</German>
</Key>
<Key ID="STR_ACE_frag_EnableSpall_Desc">
<Key ID="STR_ACE_Frag_EnableSpall_Desc">
<English>Enable the ACE Spalling Simulation</English>
<Spanish>Activa la simulación de astillamiento ACE</Spanish>
<German>Aktiviere ACE-Explosionssimulation</German>
</Key>
<Key ID="STR_ACE_frag_MaxTrack">
<Key ID="STR_ACE_Frag_MaxTrack">
<English>Maximum Projectiles Tracked</English>
<Spanish>Máximos proyectiles rastreados</Spanish>
<German>Maximalzahl der verfolgten Projektile</German>
</Key>
<Key ID="STR_ACE_frag_MaxTrack_Desc">
<Key ID="STR_ACE_Frag_MaxTrack_Desc">
<English>This setting controls the maximum amount of projectiles the fragmentation and spalling system will track at any given time. If more projectiles are fired, they will not be tracked. Lower this setting if you do not want FPS drops at high-count projectile scenarios ( &gt;200 rounds in the air at once)</English>
<Spanish>Este ajuste controla la cantidad máxima de proyectiles del sistema de fragmentación y astillamiento de los que se hará un seguimiento en cualquier momento dado. Si se disparan más proyectiles, no serán rastreados. Baja esta opción si no deseas una bajada de FPS en escenarios con muchos proyectiles (&gt;200 proyectiles en el aire a la vez)</Spanish>
<German>Diese Einstellung steuert die maximale Anzahl an Projektilen, die das Splitter- und Explosionssystem gleichzeitig verfolgen wird. Wenn mehr Projektile abgefeuert werden, werden sie nicht verfolgt werden. Diese Einstellung zu verringern, kann FPS-Einbrüche bei Szenarien mit vielen Projektilen verhindern (&gt;200 Objekte gleichzeitig in der Luft)</German>
</Key>
<Key ID="STR_ACE_frag_MaxTrackPerFrame">
<Key ID="STR_ACE_Frag_MaxTrackPerFrame">
<English>Maximum Projectiles Per Frame</English>
<Spanish>Máximos proyectiles por cuadro</Spanish>
<German>Maximale Anzahl an Projektilen pro Frame</German>
</Key>
<Key ID="STR_ACE_frag_MaxTrackPerFrame_Desc">
<Key ID="STR_ACE_Frag_MaxTrackPerFrame_Desc">
<English>The number of spall track calculations to perform in any given frame. This helps spread the FPS impact of tracking spall rounds across multiple frames, limiting its impact even further.</English>
<German>Gibt die Anzahl der Explosionverfolgungsberechnungen an, die gleichzeitig ausgeführt werden. Das kann dabei helfen den FPS-Einfluss abzuschwächen, wenn Teile über mehrere Frames hinweg verfolgt werden.</German>
</Key>
<Key ID="STR_ACE_frag_EnableDebugTrace">
<Key ID="STR_ACE_Frag_EnableDebugTrace">
<English>(SP Only) Frag/Spall Debug Tracing</English>
<Spanish>(Solo SP) Seguimiento de depuración de Fragmentación/Astillamiento </Spanish>
</Key>
<Key ID="STR_ACE_frag_EnableDebugTrace_Desc">
<Key ID="STR_ACE_Frag_EnableDebugTrace_Desc">
<English>(SP Only) Requires a mission/editor restart. Enables visual tracing of fragmentation and spalling rounds in SP game mode only.</English>
<Spanish>(Solo SP) Requiere un reinicio misión/editor. Permite el seguimiento visual de la fragmentación y astillamientos de los proyectiles en modo SP.</Spanish>
<German>(nur SP) Splitter-/Explosions-Debugging</German>

2
addons/goggles/ACE_Settings.hpp
View File

@ -3,6 +3,6 @@ class ACE_Settings {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
displayName = "$STR_ACE_Goggles_ShowInThirdPerson";
displayName = CSTRING(ShowInThirdPerson);
};
};

2
addons/goggles/XEH_postInit.sqf
View File

@ -17,7 +17,7 @@
#include "script_component.hpp"
if (!hasInterface) exitWith {};
["ACE3 Common", QGVAR(wipeGlasses), localize "STR_ACE_Goggles_WipeGlasses",
["ACE3 Common", QGVAR(wipeGlasses), localize LSTRING(WipeGlasses),
{
if (!(GETVAR(ace_player,ACE_isUnconscious,false))) exitWith {
call FUNC(clearGlasses);

42
addons/grenades/CfgMagazines.hpp
View File

@ -9,50 +9,50 @@ class CfgMagazines {
initSpeed = 22;
};
class ACE_HandFlare_White: ACE_HandFlare_Base {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
scope = 2;
ammo = "ACE_F_Hand_White";
displayname = "$STR_ACE_Grenades_M127A1_White_Name";
descriptionshort = "$STR_ACE_Grenades_M127A1_White_Description";
displayNameShort = "$STR_ACE_Grenades_M127A1_White_NameShort";
displayname = CSTRING(M127A1_White_Name);
descriptionshort = CSTRING(M127A1_White_Description);
displayNameShort = CSTRING(M127A1_White_NameShort);
model = "\A3\weapons_f\ammo\flare_white";
picture = "\A3\Weapons_F\Data\UI\gear_flare_white_ca.paa";
};
class ACE_HandFlare_Red: ACE_HandFlare_Base {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
scope = 2;
ammo = "ACE_F_Hand_Red";
displayname = "$STR_ACE_Grenades_M127A1_Red_Name";
descriptionshort = "$STR_ACE_Grenades_M127A1_Red_Description";
displayNameShort = "$STR_ACE_Grenades_M127A1_Red_NameShort";
displayname = CSTRING(M127A1_Red_Name);
descriptionshort = CSTRING(M127A1_Red_Description);
displayNameShort = CSTRING(M127A1_Red_NameShort);
model = "\A3\weapons_f\ammo\flare_red";
picture = "\A3\Weapons_F\Data\UI\gear_flare_red_ca.paa";
};
class ACE_HandFlare_Green: ACE_HandFlare_Base {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
scope = 2;
ammo = "ACE_F_Hand_Green";
displayname = "$STR_ACE_Grenades_M127A1_Green_Name";
descriptionshort = "$STR_ACE_Grenades_M127A1_Green_Description";
displayNameShort = "$STR_ACE_Grenades_M127A1_Green_NameShort";
displayname = CSTRING(M127A1_Green_Name);
descriptionshort = CSTRING(M127A1_Green_Description);
displayNameShort = CSTRING(M127A1_Green_NameShort);
model = "\A3\weapons_f\ammo\flare_green";
picture = "\A3\Weapons_F\Data\UI\gear_flare_green_ca.paa";
};
class ACE_HandFlare_Yellow: ACE_HandFlare_Base {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
scope = 2;
ammo = "ACE_F_Hand_Yellow";
displayname = "$STR_ACE_Grenades_M127A1_Yellow_Name";
descriptionshort = "$STR_ACE_Grenades_M127A1_Yellow_Description";
displayNameShort = "$STR_ACE_Grenades_M127A1_Yellow_NameShort";
displayname = CSTRING(M127A1_Yellow_Name);
descriptionshort = CSTRING(M127A1_Yellow_Description);
displayNameShort = CSTRING(M127A1_Yellow_NameShort);
model = "\A3\weapons_f\ammo\flare_yellow";
picture = "\A3\Weapons_F\Data\UI\gear_flare_yellow_ca.paa";
};
class ACE_M84: HandGrenade {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "ACE_G_M84";
displayname = "$STR_ACE_Grenades_M84_Name";
descriptionshort = "$STR_ACE_Grenades_M84_Description";
displayname = CSTRING(M84_Name);
descriptionshort = CSTRING(M84_Description);
displayNameShort = "M84";
mass = 4;
model = PATHTOF(models\ACE_m84.p3d);
@ -61,12 +61,12 @@ class CfgMagazines {
class 3Rnd_UGL_FlareGreen_F;
class 6Rnd_GreenSignal_F: 3Rnd_UGL_FlareGreen_F {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "F_40mm_Green";
initSpeed = 120;
};
class 6Rnd_RedSignal_F: 6Rnd_GreenSignal_F {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
ammo = "F_40mm_Red";
initSpeed = 120;
};

2
addons/grenades/XEH_postInit.sqf
View File

@ -10,7 +10,7 @@ GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265];
GVAR(flashbangPPEffectCC) ppEffectForceInNVG true;
// Add keybinds
["ACE3 Weapons", QGVAR(switchGrenadeMode), localize "STR_ACE_Grenades_SwitchGrenadeMode",
["ACE3 Weapons", QGVAR(switchGrenadeMode), localize LSTRING(SwitchGrenadeMode),
{
// Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};

10
addons/grenades/functions/fnc_nextMode.sqf
View File

@ -31,11 +31,11 @@ if (_mode == 3) then {
};
_hint = [
localize "STR_ACE_Grenades_NormalThrow",
localize "STR_ACE_Grenades_HighThrow",
localize "STR_ACE_Grenades_PreciseThrow",
localize "STR_ACE_Grenades_RollGrenade",
localize "STR_ACE_Grenades_DropGrenade"
localize LSTRING(NormalThrow),
localize LSTRING(HighThrow),
localize LSTRING(PreciseThrow),
localize LSTRING(RollGrenade),
localize LSTRING(DropGrenade)
] select _mode;
[_hint] call EFUNC(common,displayTextStructured);

2
addons/hearing/ACE_Settings.hpp
View File

@ -15,6 +15,6 @@ class ACE_Settings {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
displayName = "$STR_ACE_Hearing_DisableEarRinging";
displayName = CSTRING(DisableEarRinging);
};
};

15
addons/hearing/CfgVehicles.hpp
View File

@ -4,7 +4,7 @@ class CfgVehicles {
class ACE_SelfActions {
class ACE_Equipment {
class ACE_PutInEarplugs {
displayName = "$STR_ACE_Hearing_EarPlugs_On";
displayName = CSTRING(EarPlugs_On);
condition = QUOTE( !([_player] call FUNC(hasEarPlugsIn)) && {'ACE_EarPlugs' in items _player} );
exceptions[] = {"isNotInside"};
statement = QUOTE( [_player] call FUNC(putInEarPlugs) );
@ -14,7 +14,7 @@ class CfgVehicles {
hotkey = "E";
};
class ACE_RemoveEarplugs {
displayName = "$STR_ACE_Hearing_EarPlugs_Off";
displayName = CSTRING(EarPlugs_Off);
condition = QUOTE( [_player] call FUNC(hasEarPlugsIn) );
exceptions[] = {"isNotInside"};
statement = QUOTE( [_player] call FUNC(removeEarPlugs) );
@ -93,26 +93,25 @@ class CfgVehicles {
};
};
class ACE_Module;
class ACE_ModuleHearing: ACE_Module {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
category = "ACE";
displayName = "$STR_ACE_Hearing_Module_DisplayName";
displayName = CSTRING(Module_DisplayName);
function = QFUNC(moduleHearing);
scope = 2;
isGlobal = 1;
icon = PATHTOF(UI\Icon_Module_Hearing_ca.paa);
class Arguments {
class EnableCombatDeafness {
displayName = "$STR_ACE_Hearing_CombatDeafness_DisplayName";
description = "$STR_ACE_Hearing_CombatDeafness_Description";
displayName = CSTRING(CombatDeafness_DisplayName);
description = CSTRING(CombatDeafness_Description);
typeName = "BOOL";
defaultValue = 1;
};
};
class ModuleDescription {
description = "$STR_ACE_Hearing_Module_Description";
description = CSTRING(Module_Description);
};
};
};

4
addons/hearing/CfgWeapons.hpp
View File

@ -3,8 +3,8 @@ class CfgWeapons {
class InventoryItem_Base_F;
class ACE_EarPlugs: ACE_ItemCore {
displayName = "$STR_ACE_Hearing_EarPlugs_Name";
descriptionShort = "$STR_ACE_Hearing_EarPlugs_Description";
displayName = CSTRING(EarPlugs_Name);
descriptionShort = CSTRING(EarPlugs_Description);
model = PATHTOF(ACE_earplugs.p3d);
picture = PATHTOF(UI\ACE_earplugs_x_ca.paa);
scope = 2;

6
addons/hearing/functions/fnc_putInEarplugs.sqf
View File

@ -22,7 +22,7 @@ _player removeItem "ACE_EarPlugs";
_player setVariable ["ACE_hasEarPlugsIn", true, true];
[localize "STR_ACE_Hearing_EarPlugs_Are_On"] call EFUNC(common,displayTextStructured);
[localize LSTRING(EarPlugs_Are_On)] call EFUNC(common,displayTextStructured);
/*// No Ear Plugs in inventory, telling user
[localize "STR_ACE_Hearing_NoPlugs"] call EFUNC(common,displayTextStructured);*/
/*// No Earplugs in inventory, telling user
[localize LSTRING(NoPlugs)] call EFUNC(common,displayTextStructured);*/

4
addons/hearing/functions/fnc_removeEarplugs.sqf
View File

@ -18,7 +18,7 @@
PARAMS_1(_player);
if !(_player canAdd "ACE_EarPlugs") exitWith { // inventory full
[localize "STR_ACE_Hearing_Inventory_Full"] call EFUNC(common,displayTextStructured);
[localize LSTRING(Inventory_Full)] call EFUNC(common,displayTextStructured);
};
// Plugs already in and removing them.
@ -26,4 +26,4 @@ _player addItem "ACE_EarPlugs";
_player setVariable ["ACE_hasEarPlugsIn", false, true];
[localize "STR_ACE_Hearing_EarPlugs_Are_Off"] call EFUNC(common,displayTextStructured);
[localize LSTRING(EarPlugs_Are_Off)] call EFUNC(common,displayTextStructured);

6
addons/hearing/stringtable.xml
View File

@ -2,7 +2,7 @@
<Project name="ACE">
<Package name="Hearing">
<Key ID="STR_ACE_Hearing_EarPlugs_Name">
<English>Ear Plugs</English>
<English>Earplugs</English>
<German>Ohrenstöpsel</German>
<Spanish>Tapones para los oídos</Spanish>
<Polish>Stopery do uszu</Polish>
@ -14,7 +14,7 @@
<Italian>Tappi auricolari</Italian>
</Key>
<Key ID="STR_ACE_Hearing_EarPlugs_Description">
<English>Protective Ear Plugs allow the wearer to be near loud weaponry without damage to his hearing.</English>
<English>Protective Earplugs allow the wearer to be near loud weaponry without damage to his hearing.</English>
<German>Schützende Ohrenstöpsel, die es dem Träger ermöglichen, sich in der Nähe lauter Waffen aufzuhalten ohne Gehörschäden davonzutragen..</German>
<Spanish>Los tapones para los oídos permiten al usuario operar armamento ruidoso sin sufrir pérdida de audición.</Spanish>
<Polish>Stopery do uszu umożliwiają użytkownikowi przebywać w pobliżu głośnej broni bez poniesienia konsekwencji jaką jest utrata słuchu.</Polish>
@ -74,7 +74,7 @@
<Italian>Levati i tappi auricolari</Italian>
</Key>
<Key ID="STR_ACE_Hearing_NoPlugs">
<English>You have no ear plugs</English>
<English>You have no earplugs</English>
<German>Keine Ohrenstöpsel im Inventar</German>
<Spanish>No tienes tapones para los oídos</Spanish>
<Polish>Nie masz stoperów</Polish>

36
addons/interact_menu/ACE_Settings.hpp
View File

@ -3,77 +3,77 @@ class ACE_Settings {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_AlwaysUseCursorSelfInteraction";
displayName = CSTRING(AlwaysUseCursorSelfInteraction);
};
class GVAR(cursorKeepCentered) {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_cursorKeepCentered";
description = "$STR_ACE_Interact_cursorKeepCenteredDescription";
displayName = CSTRING(cursorKeepCentered);
description = CSTRING(cursorKeepCenteredDescription);
};
class GVAR(AlwaysUseCursorInteraction) {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_AlwaysUseCursorInteraction";
displayName = CSTRING(AlwaysUseCursorInteraction);
};
class GVAR(UseListMenu) {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_UseListMenu";
displayName = CSTRING(UseListMenu);
};
class GVAR(colorTextMax) {
value[] = {1, 1, 1, 1};
typeName = "COLOR";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_ColorTextMax";
displayName = CSTRING(ColorTextMax);
};
class GVAR(colorTextMin) {
value[] = {1, 1, 1, 0.25};
typeName = "COLOR";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_ColorTextMin";
displayName = CSTRING(ColorTextMin);
};
class GVAR(colorShadowMax) {
value[] = {0, 0, 0, 1};
typeName = "COLOR";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_ColorShadowMax";
displayName = CSTRING(ColorShadowMax);
};
class GVAR(colorShadowMin) {
value[] = {0, 0, 0, 0.25};
typeName = "COLOR";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_ColorShadowMin";
displayName = CSTRING(ColorShadowMin);
};
class GVAR(textSize) {
value = 2;
typeName = "SCALAR";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_textSize";
displayName = CSTRING(textSize);
values[] = {"$str_very_small", "$str_small", "$str_medium", "$str_large", "$str_very_large"};
};
class GVAR(shadowSetting) {
value = 2;
typeName = "SCALAR";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_shadowSetting";
description = "$STR_ACE_Interact_shadowSettingDescription";
values[] = {"$STR_A3_OPTIONS_DISABLED", "$STR_A3_OPTIONS_ENABLED", "$STR_ACE_Interact_shadowOutline"};
displayName = CSTRING(shadowSetting);
description = CSTRING(shadowSettingDescription);
values[] = {"$STR_A3_OPTIONS_DISABLED", "$STR_A3_OPTIONS_ENABLED", CSTRING(shadowOutline)};
};
class GVAR(actionOnKeyRelease) {
value = 1;
typeName = "BOOL";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_ActionOnKeyRelease";
displayName = CSTRING(ActionOnKeyRelease);
};
class GVAR(blurScreen) {
class GVAR(menuBackground) {
value = 0;
typeName = "BOOL";
typeName = "SCALAR";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_blurScreen";
description = "$STR_ACE_Interact_Menu_blurScreenDesc";
displayName = CSTRING(background);
values[] = {"$STR_A3_OPTIONS_DISABLED", CSTRING(backgroundBlur), CSTRING(backgroundBlack)};
};
};

38
addons/interact_menu/CursorMenus.hpp
View File

@ -6,3 +6,41 @@ class GVAR(cursorMenu) {
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(dlgCursorMenu)),_this select 0)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(cursorMenuOpened)),true)]);
onUnload = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(cursorMenuOpened)),false)]);
};
class RscTitles {
class RscPicture;
class GVAR(menuBackground) {
idd = -1;
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(menuBackground)),_this select 0)]);
onUnload = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(menuBackground)),displayNull)]);
fadeIn = 0.25;
fadeOut = 0.25;
movingEnable = false;
duration = 10e10;
name = QGVAR(menuBackground);
class controls {
class GVAR(menuBackground)_picutre: RscPicture {
idc = -1;
};
};
class controlsBackground {
class background {
idc = -1;
moving = 0;
font = "TahomaB";
text = "";
sizeEx = 0;
lineSpacing = 0;
access = 0;
type = 0;
style = 0;
size = 1;
colorBackground[] = {0, 0, 0, 0.65};
colorText[] = {0, 0, 0, 0};
x = "safezoneX";
y = "safezoneY";
w = "safezoneW";
h = "safezoneH";
};
};
};
};

15
addons/interact_menu/XEH_clientInit.sqf
View File

@ -28,7 +28,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)];
};
["ACE3 Common", QGVAR(InteractKey), (localize "STR_ACE_Interact_Menu_InteractKey"),
["ACE3 Common", QGVAR(InteractKey), (localize LSTRING(InteractKey)),
{
// Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -37,7 +37,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)];
},{[0,false] call FUNC(keyUp)},
[219, [false, false, false]], false] call cba_fnc_addKeybind; //Left Windows Key
["ACE3 Common", QGVAR(SelfInteractKey), (localize "STR_ACE_Interact_Menu_SelfInteractKey"),
["ACE3 Common", QGVAR(SelfInteractKey), (localize LSTRING(SelfInteractKey)),
{
// Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -63,5 +63,12 @@ addMissionEventHandler ["Draw3D", DFUNC(render)];
// disable firing while the interact menu is is is opened
["playerChanged", {_this call FUNC(handlePlayerChanged)}] call EFUNC(common,addEventHandler);
["interactMenuOpened", { if (GVAR(blurScreen)) then {[QGVAR(blurScreen), true] call EFUNC(common,blurScreen);}; }] call EFUNC(common,addEventHandler);
["interactMenuClosed", { if (GVAR(blurScreen)) then {[QGVAR(blurScreen), false] call EFUNC(common,blurScreen);}; }] call EFUNC(common,addEventHandler);
// background options
["interactMenuOpened", {
if (GVAR(menuBackground)==1) then {[QGVAR(menuBackground), true] call EFUNC(common,blurScreen);};
if (GVAR(menuBackground)==2) then {0 cutRsc[QGVAR(menuBackground), "PLAIN", 1, false];};
}] call EFUNC(common,addEventHandler);
["interactMenuClosed", {
if (GVAR(menuBackground)==1) then {[QGVAR(menuBackground), false] call EFUNC(common,blurScreen);};
if (GVAR(menuBackground)==2) then {(uiNamespace getVariable [QGVAR(menuBackground), displayNull]) closeDisplay 0;};
}] call EFUNC(common,addEventHandler);

4
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
View File

@ -92,12 +92,12 @@ private ["_baseDisplayName", "_baseIcon"];
_baseDisplayName = "";
_baseIcon = "";
if (_objectType isKindOf "CAManBase") then {
_baseDisplayName = localize "STR_ACE_Interact_Menu_SelfActionsRoot";
_baseDisplayName = localize LSTRING(SelfActionsRoot);
_baseIcon = "\a3\ui_f\data\IGUI\Cfg\Actions\eject_ca.paa";
} else {
_baseDisplayName = getText (configFile >> "CfgVehicles" >> _objectType >> "displayName");
//Alt would be to just use a static text, if veh names end up being too long:
// _baseDisplayName = localize "STR_ACE_Interact_Menu_VehicleActionsRoot";
// _baseDisplayName = localize LSTRING(VehicleActionsRoot);
//Pull the icon from the vehicle's config:
_baseIcon = getText (configFile >> "CfgVehicles" >> _objectType >> "Icon");

21
addons/interact_menu/stringtable.xml
View File

@ -133,7 +133,7 @@
<Hungarian>Cselekvés - Árnyék min.</Hungarian>
<Portuguese>Interação - Min. de Sombra</Portuguese>
</Key>
<Key ID="STR_ACE_Interact_cursorKeepCentered">
<Key ID="STR_ACE_Interact_Menu_cursorKeepCentered">
<English>Keep cursor centered</English>
<French>Garder le curseur au centre</French>
<Russian>Центрировать курсор</Russian>
@ -145,7 +145,7 @@
<Portuguese>Manter o cursor centralizado</Portuguese>
<Italian>Mantieni il cursore centrato</Italian>
</Key>
<Key ID="STR_ACE_Interact_cursorKeepCenteredDescription">
<Key ID="STR_ACE_Interact_Menu_cursorKeepCenteredDescription">
<English>Keeps cursor centered and pans the option menu around. Useful if screen size is limited.</English>
<Czech>Udržuje kurzor na středu. Užitečné, pokud je velikost obrazovky omezena.</Czech>
<French>Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée.</French>
@ -169,7 +169,7 @@
<Hungarian>Cselekvés végrehajtása a menügomb elengedésekor</Hungarian>
<Italian>Esegui l'azione quando rilasci il tasto menu</Italian>
</Key>
<Key ID="STR_ACE_Interact_textSize">
<Key ID="STR_ACE_Interact_Menu_textSize">
<English>Interaction Text Size</English>
<Czech>Velikost textu interakce</Czech>
<German>Menü-Schriftgröße</German>
@ -181,7 +181,7 @@
<Hungarian>Cselekvő szöveg mérete</Hungarian>
<Italian>Dimensione del testo d'interazione</Italian>
</Key>
<Key ID="STR_ACE_Interact_shadowSetting">
<Key ID="STR_ACE_Interact_Menu_shadowSetting">
<English>Interaction Text Shadow</English>
<Czech>Stín textu interakce</Czech>
<German>Menü-Hintergrundschatten</German>
@ -193,7 +193,7 @@
<Hungarian>Cselekvő szöveg árnyéka</Hungarian>
<Italian>Ombra del testo d'interazione</Italian>
</Key>
<Key ID="STR_ACE_Interact_shadowSettingDescription">
<Key ID="STR_ACE_Interact_Menu_shadowSettingDescription">
<English>Allows controlling the text's shadow. Outline ignores custom shadow colors.</English>
<Czech>Umožňuje změnit stíny textu v menu interakce. Barva stínu je u tahu písma ignorována.</Czech>
<German>Stellt den Hintergrundschatten ein. Die Einstellung 'Kontur' ignoriert die Farbe des Schattens.</German>
@ -205,7 +205,7 @@
<Hungarian>Hozzáférést biztosít a szöveg árnyékának kezeléséhez. A körvonal nem veszi figyelembe az egyedi árnyékszíneket.</Hungarian>
<Italian>Permette di controllare l'ombra del testo. L'impostazione "Contorno" ignora il colore dell'ombra.</Italian>
</Key>
<Key ID="STR_ACE_Interact_shadowOutline">
<Key ID="STR_ACE_Interact_Menu_shadowOutline">
<English>Outline</English>
<Czech>Kontura</Czech>
<German>Kontur</German>
@ -217,11 +217,16 @@
<Hungarian>Körvonal</Hungarian>
<Italian>Contorno</Italian>
</Key>
<Key ID="STR_ACE_Interact_Menu_blurScreen">
<English>Blur screen on interaction</English>
<Key ID="STR_ACE_Interact_Menu_background">
<English>Interaction menu background</English>
</Key>
<Key ID="STR_ACE_Interact_Menu_blurScreenDesc">
<English>Blur the background while the interaction menu is open.</English>
<Key ID="STR_ACE_Interact_Menu_backgroundBlur">
<English>Blur screen</English>
</Key>
<Key ID="STR_ACE_Interact_Menu_backgroundBlack">
<English>Black</English>
</Key>
</Package>
</Project>

135
addons/interaction/CfgVehicles.hpp
View File

@ -1,24 +1,23 @@
class CfgVehicles {
class ACE_Module;
class ACE_ModuleInteraction: ACE_Module {
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
category = "ACE";
displayName = "$STR_ACE_InteractionSystem_Module_DisplayName";
displayName = CSTRING(Module_DisplayName);
function = "ACE_Interaction_fnc_moduleInteraction";
scope = 2;
isGlobal = 1;
icon = PATHTOF(UI\Icon_Module_Interaction_ca.paa);
class Arguments {
class EnableTeamManagement {
displayName = "$STR_ACE_InteractionSystem_EnableTeamManagement_DisplayName";
description = "$STR_ACE_InteractionSystem_EnableTeamManagement_Description";
displayName = CSTRING(EnableTeamManagement_DisplayName);
description = CSTRING(EnableTeamManagement_Description);
typeName = "BOOL";
defaultValue = 1;
};
};
class ModuleDescription {
description = "$STR_ACE_InteractionSystem_Module_Description";
description = CSTRING(Module_Description);
};
};
@ -26,7 +25,7 @@ class CfgVehicles {
class CAManBase: Man {
class ACE_Actions {
class ACE_MainActions {
displayName = "$STR_ACE_Interaction_MainAction";
displayName = CSTRING(MainAction);
distance = 4;
condition = QUOTE(true);
statement = "";
@ -34,7 +33,7 @@ class CfgVehicles {
selection = "pelvis";
class ACE_TeamManagement {
displayName = "$STR_ACE_Interaction_TeamManagement";
displayName = CSTRING(TeamManagement);
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam) && {GVAR(EnableTeamManagement)});
statement = "";
showDisabled = 0;
@ -43,7 +42,7 @@ class CfgVehicles {
hotkey = "M";
class ACE_AssignTeamRed {
displayName = "$STR_ACE_Interaction_AssignTeamRed";
displayName = CSTRING(AssignTeamRed);
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'RED')] call DFUNC(joinTeam));
showDisabled = 1;
@ -52,7 +51,7 @@ class CfgVehicles {
hotkey = "R";
};
class ACE_AssignTeamGreen {
displayName = "$STR_ACE_Interaction_AssignTeamGreen";
displayName = CSTRING(AssignTeamGreen);
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'GREEN')] call DFUNC(joinTeam));
showDisabled = 1;
@ -61,7 +60,7 @@ class CfgVehicles {
hotkey = "G";
};
class ACE_AssignTeamBlue {
displayName = "$STR_ACE_Interaction_AssignTeamBlue";
displayName = CSTRING(AssignTeamBlue);
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'BLUE')] call DFUNC(joinTeam));
showDisabled = 1;
@ -70,7 +69,7 @@ class CfgVehicles {
hotkey = "B";
};
class ACE_AssignTeamYellow {
displayName = "$STR_ACE_Interaction_AssignTeamYellow";
displayName = CSTRING(AssignTeamYellow);
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'YELLOW')] call DFUNC(joinTeam));
showDisabled = 1;
@ -80,7 +79,7 @@ class CfgVehicles {
};
class ACE_UnassignTeam {
displayName = "$STR_ACE_Interaction_LeaveTeam";
displayName = CSTRING(LeaveTeam);
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam) && {assignedTeam _target != 'MAIN'});
statement = QUOTE([ARR_2(_target,'MAIN')] call DFUNC(joinTeam));
showDisabled = 1;
@ -91,7 +90,7 @@ class CfgVehicles {
};
class ACE_JoinGroup {
displayName = "$STR_ACE_Interaction_JoinGroup";
displayName = CSTRING(JoinGroup);
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinGroup));
statement = QUOTE([_player] joinSilent group _target);
showDisabled = 0;
@ -101,21 +100,21 @@ class CfgVehicles {
};
class ACE_GetDown {
displayName = "$STR_ACE_Interaction_GetDown";
displayName = CSTRING(GetDown);
condition = QUOTE([_target] call DFUNC(canInteractWithCivilian));
statement = QUOTE([_target] call DFUNC(getDown));
showDisabled = 0;
priority = 2.2;
};
class ACE_SendAway {
displayName = "$STR_ACE_Interaction_SendAway";
displayName = CSTRING(SendAway);
condition = QUOTE([_target] call DFUNC(canInteractWithCivilian));
statement = QUOTE([_target] call DFUNC(sendAway));
showDisabled = 0;
priority = 2.0;
};
class ACE_Pardon {
displayName = "$STR_ACE_Interaction_Pardon";
displayName = CSTRING(Pardon);
condition = QUOTE(rating _target < -2000 && {alive _target} && {side group _player == side group _target});
statement = QUOTE([ARR_3(_target,'{_this addRating -rating _this}',_target)] call DEFUNC(common,execRemoteFnc));
showDisabled = 0;
@ -123,49 +122,49 @@ class CfgVehicles {
};
};
class ACE_Torso {
displayName = "$STR_ACE_Interaction_Torso";
displayName = CSTRING(Torso);
selection = "spine3";
distance = 1.50;
condition = "";
statement = "";
};
class ACE_Head {
displayName = "$STR_ACE_Interaction_Head";
displayName = CSTRING(Head);
selection = "pilot";
distance = 1.50;
condition = "";
statement = "";
};
class ACE_ArmLeft {
displayName = "$STR_ACE_Interaction_ArmLeft";
displayName = CSTRING(ArmLeft);
selection = "LeftForeArm";
distance = 1.50;
condition = "";
statement = "";
};
class ACE_ArmRight {
displayName = "$STR_ACE_Interaction_ArmRight";
displayName = CSTRING(ArmRight);
selection = "RightForeArm";
distance = 1.50;
condition = "";
statement = "";
};
class ACE_LegLeft {
displayName = "$STR_ACE_Interaction_LegLeft";
displayName = CSTRING(LegLeft);
selection = "LKnee";
distance = 1.50;
condition = "";
statement = "";
};
class ACE_LegRight {
displayName = "$STR_ACE_Interaction_LegRight";
displayName = CSTRING(LegRight);
selection = "RKnee";
distance = 1.50;
condition = "";
statement = "";
};
class ACE_Weapon {
displayName = "$STR_ACE_Interaction_Weapon";
displayName = CSTRING(Weapon);
position = QUOTE(call FUNC(getWeaponPos));
distance = 1.50;
condition = "";
@ -173,14 +172,14 @@ class CfgVehicles {
};
class ACE_TapShoulderRight {
displayName = "$STR_ACE_Interaction_TapShoulder";
displayName = CSTRING(TapShoulder);
selection = "rightshoulder";
distance = 2.0;
condition = QUOTE([ARR_2(_player, _target)] call DFUNC(canTapShoulder));
statement = QUOTE([ARR_3(_player, _target, 0)] call DFUNC(tapShoulder));
};
class ACE_TapShoulderLeft {
displayName = "$STR_ACE_Interaction_TapShoulder";
displayName = CSTRING(TapShoulder);
selection = "leftshoulder";
distance = 2.0;
condition = QUOTE([ARR_2(_player, _target)] call DFUNC(canTapShoulder));
@ -190,7 +189,7 @@ class CfgVehicles {
class ACE_SelfActions {
class ACE_TeamManagement {
displayName = "$STR_ACE_Interaction_TeamManagement";
displayName = CSTRING(TeamManagement);
condition = QUOTE(GVAR(EnableTeamManagement));
exceptions[] = {"isNotInside"};
statement = "";
@ -200,7 +199,7 @@ class CfgVehicles {
hotkey = "M";
class ACE_JoinTeamRed {
displayName = "$STR_ACE_Interaction_JoinTeamRed";
displayName = CSTRING(JoinTeamRed);
condition = QUOTE(true);
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_2(_player,'RED')] call DFUNC(joinTeam));
@ -210,7 +209,7 @@ class CfgVehicles {
hotkey = "R";
};
class ACE_JoinTeamGreen {
displayName = "$STR_ACE_Interaction_JoinTeamGreen";
displayName = CSTRING(JoinTeamGreen);
condition = QUOTE(true);
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_2(_player,'GREEN')] call DFUNC(joinTeam));
@ -220,7 +219,7 @@ class CfgVehicles {
hotkey = "G";
};
class ACE_JoinTeamBlue {
displayName = "$STR_ACE_Interaction_JoinTeamBlue";
displayName = CSTRING(JoinTeamBlue);
condition = QUOTE(true);
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_2(_player,'BLUE')] call DFUNC(joinTeam));
@ -230,7 +229,7 @@ class CfgVehicles {
hotkey = "B";
};
class ACE_JoinTeamYellow {
displayName = "$STR_ACE_Interaction_JoinTeamYellow";
displayName = CSTRING(JoinTeamYellow);
condition = QUOTE(true);
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_2(_player,'YELLOW')] call DFUNC(joinTeam));
@ -241,7 +240,7 @@ class CfgVehicles {
};
class ACE_LeaveTeam {
displayName = "$STR_ACE_Interaction_LeaveTeam";
displayName = CSTRING(LeaveTeam);
condition = QUOTE(assignedTeam _player != 'MAIN');
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_2(_player,'MAIN')] call DFUNC(joinTeam));
@ -251,7 +250,7 @@ class CfgVehicles {
hotkey = "N";
};
class ACE_BecomeLeader {
displayName = "$STR_ACE_Interaction_BecomeLeader";
displayName = CSTRING(BecomeLeader);
condition = QUOTE(_this call DFUNC(canBecomeLeader));
exceptions[] = {"isNotInside"};
statement = QUOTE(_this call DFUNC(doBecomeLeader));
@ -261,7 +260,7 @@ class CfgVehicles {
hotkey = "L";
};
class ACE_LeaveGroup {
displayName = "$STR_ACE_Interaction_LeaveGroup";
displayName = CSTRING(LeaveGroup);
condition = QUOTE(count (units group _player) > 1);
exceptions[] = {"isNotInside"};
statement = QUOTE(_oldGroup = units group _player; _newGroup = createGroup side _player; [_player] joinSilent _newGroup; {_player reveal _x} forEach _oldGroup;);
@ -273,7 +272,7 @@ class CfgVehicles {
};
class ACE_Gestures {
displayName = "$STR_ACE_Interaction_Gestures";
displayName = CSTRING(Gestures);
condition = "canStand _target";
statement = "";
showDisabled = 1;
@ -282,14 +281,14 @@ class CfgVehicles {
hotkey = "G";
/*class ACE_Gesture_Advance {
displayName = "$STR_ACE_Interaction_Gestures_Attack";
displayName = CSTRING(Gestures_Attack);
condition = "canStand _target";
statement = "_target playActionNow 'gestureAttack';";
showDisabled = 1;
priority = 2.0;
};*/
class ACE_Gesture_Advance {
displayName = "$STR_ACE_Interaction_Gestures_Advance";
displayName = CSTRING(Gestures_Advance);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureAdvance';);
showDisabled = 1;
@ -297,7 +296,7 @@ class CfgVehicles {
hotkey = "1";
};
class ACE_Gesture_Go {
displayName = "$STR_ACE_Interaction_Gestures_Go";
displayName = CSTRING(Gestures_Go);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow ([ARR_2('gestureGo','gestureGoB')] select floor random 2););
showDisabled = 1;
@ -305,7 +304,7 @@ class CfgVehicles {
hotkey = "2";
};
class ACE_Gesture_Follow {
displayName = "$STR_ACE_Interaction_Gestures_Follow";
displayName = CSTRING(Gestures_Follow);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureFollow';);
showDisabled = 1;
@ -313,14 +312,14 @@ class CfgVehicles {
hotkey = "3";
};
/*class ACE_Gesture_Point {
displayName = "$STR_ACE_Interaction_Gestures_Point";
displayName = CSTRING(Gestures_Point);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gesturePoint';);
showDisabled = 1;
priority = 1.6;
};*/
class ACE_Gesture_Up {
displayName = "$STR_ACE_Interaction_Gestures_Up";
displayName = CSTRING(Gestures_Up);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureUp';);
showDisabled = 1;
@ -328,7 +327,7 @@ class CfgVehicles {
hotkey = "4";
};
class ACE_Gesture_Cover {
displayName = "$STR_ACE_Interaction_Gestures_Cover";
displayName = CSTRING(Gestures_Cover);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureCover';);
showDisabled = 1;
@ -336,7 +335,7 @@ class CfgVehicles {
hotkey = "5";
};
class ACE_Gesture_CeaseFire {
displayName = "$STR_ACE_Interaction_Gestures_Cease_Fire";
displayName = CSTRING(Gestures_Cease_Fire);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureCeaseFire';);
showDisabled = 1;
@ -344,7 +343,7 @@ class CfgVehicles {
hotkey = "6";
};
class ACE_Gesture_Freeze {
displayName = "$STR_ACE_Interaction_Gestures_Freeze";
displayName = CSTRING(Gestures_Freeze);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureFreeze';);
showDisabled = 1;
@ -352,7 +351,7 @@ class CfgVehicles {
hotkey = "7";
};
class ACE_Gesture_Yes {
displayName = "$STR_ACE_Interaction_Gestures_Yes";
displayName = CSTRING(Gestures_Yes);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow ([ARR_2('gestureYes','gestureNod')] select floor random 2););
showDisabled = 1;
@ -360,7 +359,7 @@ class CfgVehicles {
hotkey = "8";
};
class ACE_Gesture_No {
displayName = "$STR_ACE_Interaction_Gestures_No";
displayName = CSTRING(Gestures_No);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureNo';);
showDisabled = 1;
@ -368,7 +367,7 @@ class CfgVehicles {
hotkey = "9";
};
class ACE_Gesture_Hi {
displayName = "$STR_ACE_Interaction_Gestures_Hi";
displayName = CSTRING(Gestures_Hi);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow ([ARR_3('gestureHi','gestureHiB','gestureHiC')] select floor random 3););
showDisabled = 1;
@ -378,7 +377,7 @@ class CfgVehicles {
};
class ACE_Equipment {
displayName = "$STR_ACE_Interaction_Equipment";
displayName = CSTRING(Equipment);
condition = QUOTE(true);
exceptions[] = {"isNotInside","notOnMap"};
statement = "";
@ -394,12 +393,12 @@ class CfgVehicles {
class Car: LandVehicle {
class ACE_Actions {
class ACE_MainActions {
displayName = "$STR_ACE_Interaction_MainAction";
displayName = CSTRING(MainAction);
selection = "";
distance = 10;
condition = "true";
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -408,7 +407,7 @@ class CfgVehicles {
};
class ACE_SelfActions {
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -418,12 +417,12 @@ class CfgVehicles {
class Tank: LandVehicle {
class ACE_Actions {
class ACE_MainActions {
displayName = "$STR_ACE_Interaction_MainAction";
displayName = CSTRING(MainAction);
selection = "";
distance = 10;
condition = "true";
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -432,7 +431,7 @@ class CfgVehicles {
};
class ACE_SelfActions {
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -444,12 +443,12 @@ class CfgVehicles {
class Helicopter: Air {
class ACE_Actions {
class ACE_MainActions {
displayName = "$STR_ACE_Interaction_MainAction";
displayName = CSTRING(MainAction);
selection = "";
distance = 10;
condition = "true";
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -458,7 +457,7 @@ class CfgVehicles {
};
class ACE_SelfActions {
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -468,12 +467,12 @@ class CfgVehicles {
class Plane: Air {
class ACE_Actions {
class ACE_MainActions {
displayName = "$STR_ACE_Interaction_MainAction";
displayName = CSTRING(MainAction);
selection = "";
distance = 10;
condition = "true";
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -482,7 +481,7 @@ class CfgVehicles {
};
class ACE_SelfActions {
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -494,13 +493,13 @@ class CfgVehicles {
class Ship_F: Ship {
class ACE_Actions {
class ACE_MainActions {
displayName = "$STR_ACE_Interaction_MainAction";
displayName = CSTRING(MainAction);
selection = "";
distance = 10;
condition = "true";
class ACE_Push {
displayName = "$STR_ACE_Interaction_Push";
displayName = CSTRING(Push);
distance = 6;
condition = QUOTE(getMass _target < 1000 && {alive _target});
statement = QUOTE([ARR_2(_target, [ARR_3(2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5)])] call DFUNC(push););
@ -508,7 +507,7 @@ class CfgVehicles {
priority = -1;
};
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -517,7 +516,7 @@ class CfgVehicles {
};
class ACE_SelfActions {
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -528,12 +527,12 @@ class CfgVehicles {
class StaticWeapon: LandVehicle {
class ACE_Actions {
class ACE_MainActions {
displayName = "$STR_ACE_Interaction_MainAction";
displayName = CSTRING(MainAction);
selection = "gunnerview";
distance = 2;
condition = "true";
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -542,7 +541,7 @@ class CfgVehicles {
};
class ACE_SelfActions {
class ACE_Passengers {
displayName = "$STR_ACE_Interaction_Passengers";
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
@ -554,7 +553,7 @@ class CfgVehicles {
class ReammoBox_F: thingX {
class ACE_Actions {
class ACE_MainActions {
displayName = "$STR_ACE_Interaction_MainAction";
displayName = CSTRING(MainAction);
selection = "";
distance = 2;
condition = "true";

6
addons/interaction/XEH_postInit.sqf
View File

@ -23,7 +23,7 @@ private ["_team"];
// Add keybinds
["ACE3 Common", QGVAR(openDoor), localize "STR_ACE_Interaction_OpenDoor",
["ACE3 Common", QGVAR(openDoor), localize LSTRING(OpenDoor),
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -43,7 +43,7 @@ private ["_team"];
[57, [false, true, false]], false] call cba_fnc_addKeybind; //Key CTRL+Space
["ACE3 Common", QGVAR(tapShoulder), localize "STR_ACE_Interaction_TapShoulder",
["ACE3 Common", QGVAR(tapShoulder), localize LSTRING(TapShoulder),
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -57,7 +57,7 @@ private ["_team"];
{false},
[20, [true, false, false]], false] call cba_fnc_addKeybind;
["ACE3 Common", QGVAR(modifierKey), localize "STR_ACE_Interaction_ModifierKey",
["ACE3 Common", QGVAR(modifierKey), localize LSTRING(ModifierKey),
{
// Conditions: canInteract
//if !([ACE_player, objNull, ["isNotDragging"]] call EFUNC(common,canInteractWith)) exitWith {false}; // not needed

6
addons/interaction/functions/fnc_joinTeam.sqf
View File

@ -25,10 +25,10 @@ _unit setVariable [QGVAR(assignedFireTeam), _team, true];
if (_unit == ACE_player) then {
_message = if (_team == "MAIN") then {
localize "STR_ACE_Interaction_LeftTeam";
localize LSTRING(LeftTeam);
} else {
_team = localize format ["STR_ACE_Interaction_Team%1", _team];
format [localize "STR_ACE_Interaction_JoinedTeam", _team];
_team = localize format [LSTRING(Team%1), _team];
format [localize LSTRING(JoinedTeam), _team];
};
[_message] call EFUNC(common,displayTextStructured);

2
addons/interaction/functions/fnc_openMenuSelectUI.sqf
View File

@ -29,7 +29,7 @@ if !(_unit in _cargo) exitWith {};
GVAR(InteractionMenu_Crew) = _cargo;
// Prepare: add header and "OK" button to select menu
_actions = [localize "STR_ACE_Interaction_InteractionMenu", localize "STR_ACE_Interaction_Interact"] call FUNC(prepareSelectMenu);
_actions = [localize LSTRING(InteractionMenu), localize LSTRING(Interact)] call FUNC(prepareSelectMenu);
// Prepare: add all cargo units as options to select menu
{

2
addons/interaction/functions/fnc_prepareSelectMenu.sqf
View File

@ -21,7 +21,7 @@ PARAMS_2(_header,_buttonText);
closeDialog 0;
if (isNil "_buttonText" or {_buttonText == ""}) then {
_buttonText = localize "STR_ACE_Interaction_MakeSelection";
_buttonText = localize LSTRING(MakeSelection);
};
createDialog "RscACE_SelectAnItem";

4
addons/interaction/functions/fnc_tapShoulder.sqf
View File

@ -32,9 +32,9 @@ addCamShake [4, 0.5, 5];
private ["_message"];
//localize is converting the escaped <> symbols, so just add them here instead of in the stringtable
if (_shoulderNum == 0) then {
_message = format ["%1 &gt;", (localize "STR_ACE_Interaction_YouWereTappedRight")];
_message = format ["%1 &gt;", (localize LSTRING(YouWereTappedRight))];
} else {
_message = format ["&lt; %1", (localize "STR_ACE_Interaction_YouWereTappedLeft")];
_message = format ["&lt; %1", (localize LSTRING(YouWereTappedLeft))];
};
[parseText _message] call EFUNC(common,displayTextStructured);

8
addons/interaction/stringtable.xml
View File

@ -793,25 +793,25 @@
<Italian>Passeggeri</Italian>
<Portuguese>Passageiros</Portuguese>
</Key>
<Key ID="STR_ACE_InteractionSystem_Module_DisplayName">
<Key ID="STR_ACE_Interaction_Module_DisplayName">
<English>Interaction System</English>
<Polish>System interakcji</Polish>
<Spanish>Sistema de interacción</Spanish>
<German>Interaktionssystem</German>
</Key>
<Key ID="STR_ACE_InteractionSystem_EnableTeamManagement_DisplayName">
<Key ID="STR_ACE_Interaction_EnableTeamManagement_DisplayName">
<English>Enable Team Management</English>
<Polish>Wł. zarządzanie drużyną</Polish>
<Spanish>Habilitar gestión de equipos</Spanish>
<German>Aktiviere Gruppenverwaltung</German>
</Key>
<Key ID="STR_ACE_InteractionSystem_EnableTeamManagement_Description">
<Key ID="STR_ACE_Interaction_EnableTeamManagement_Description">
<English>Should players be allowed to use the Team Management Menu? Default: Yes</English>
<Polish>Czy gracze mogą korzystać z menu zarządzania drużyną? Domyślnie: Tak</Polish>
<Spanish>¿Deben tener permitido los jugadores el uso del menu de gestión de equipos? Por defecto: Si</Spanish>
<German>Sollen Spieler das Gruppenverwaltungsmenü verwenden dürfen? Standard: Ja</German>
</Key>
<Key ID="STR_ACE_InteractionSystem_Module_Description">
<Key ID="STR_ACE_Interaction_Module_Description">
<English></English>
<Polish>Na zarządzanie drużyną składa się: przydział kolorów dla członków drużyny, przejmowanie dowodzenia, dołączanie/opuszczanie drużyn.</Polish>
<German>Die Gruppenverwaltung erlaubt die Zuweisung von Farben für Einheiten, die Kommandierung und das Beitreten/Verlassen einer Gruppe.</German>

4
addons/inventory/ACE_Settings.hpp
View File

@ -3,8 +3,8 @@ class ACE_Settings {
value = 0;
typeName = "SCALAR";
isClientSettable = 1;
displayName = "$STR_ACE_Inventory_SettingName";
description = "$STR_ACE_Inventory_SettingDescription";
displayName = CSTRING(SettingName);
description = CSTRING(SettingDescription);
values[] = {"$str_medium", "$str_large", "$str_very_large"};
};
};

4
addons/javelin/initKeybinds.sqf
View File

@ -1,6 +1,6 @@
// by commy2
["ACE3 Weapons", QGVAR(lockTarget), localize "STR_ACE_JAVELIN_LockTarget",
["ACE3 Weapons", QGVAR(lockTarget), localize LSTRING(LockTarget),
{
if (GETGVAR(isLockKeyDown,false)) exitWith {false};
@ -21,7 +21,7 @@
},
[15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key
["ACE3 Weapons", QGVAR(cycleFireMode), localize "STR_ACE_JAVELIN_CycleFireMode",
["ACE3 Weapons", QGVAR(cycleFireMode), localize LSTRING(CycleFireMode),
{ false },
{
[ACE_player] call FUNC(cycleFireMode);

6
addons/javelin/stringtable.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="WEP_JAVELIN">
<Key ID="STR_ACE_JAVELIN_LockTarget">
<Package name="Javelin">
<Key ID="STR_ACE_Javelin_LockTarget">
<English>Lock Target (Hold)</English>
<German>Ziel aufschalten</German>
<Russian>Захватить цель (удерживать)</Russian>
@ -13,7 +13,7 @@
<Spanish>Fijar objetivo (Mantener)</Spanish>
<Portuguese>Travar Alvo(Segurar)</Portuguese>
</Key>
<Key ID="STR_ACE_JAVELIN_CycleFireMode">
<Key ID="STR_ACE_Javelin_CycleFireMode">
<English>Cycle Fire Mode</English>
<German>Wechsle Feuermodus</German>
<Russian>Переключение режимов огня</Russian>

6
addons/kestrel4500/CfgVehicles.hpp
View File

@ -4,7 +4,7 @@ class CfgVehicles {
class ACE_SelfActions {
class ACE_Equipment {
class GVAR(open) {
displayName = "$STR_ACE_Kestrel4500_OpenKestrel";
displayName = CSTRING(OpenKestrel);
condition = QUOTE(call FUNC(canShow) && !GVAR(Kestrel4500));
statement = QUOTE(call FUNC(createKestrelDialog));
showDisabled = 0;
@ -13,7 +13,7 @@ class CfgVehicles {
exceptions[] = {"notOnMap"};
};
class GVAR(show) {
displayName = "$STR_ACE_Kestrel4500_ShowKestrel";
displayName = CSTRING(ShowKestrel);
condition = QUOTE(call FUNC(canShow) && !GVAR(Overlay));
statement = QUOTE(call FUNC(displayKestrel));
showDisabled = 0;
@ -22,7 +22,7 @@ class CfgVehicles {
exceptions[] = {"notOnMap", "isNotInside"};
};
class GVAR(hide) {
displayName = "$STR_ACE_Kestrel4500_HideKestrel";
displayName = CSTRING(HideKestrel);
condition = QUOTE(GVAR(Overlay));
statement = QUOTE(call FUNC(displayKestrel));
showDisabled = 0;

4
addons/kestrel4500/CfgWeapons.hpp
View File

@ -6,8 +6,8 @@ class CfgWeapons {
class ACE_Kestrel4500: ACE_ItemCore {
author[] = {$STR_ACE_Common_ACETeam, "Ruthberg"};
scope = 2;
displayName = "$STR_ACE_Kestrel_Name";
descriptionShort = "$STR_ACE_Kestrel_Description";
displayName = CSTRING(Name);
descriptionShort = CSTRING(Description);
model = PATHTOF(kestrel4500.p3d);
picture = PATHTOF(UI\Kestrel4500.paa);
icon = "iconObject_circle";

4
addons/kestrel4500/initKeybinds.sqf
View File

@ -1,4 +1,4 @@
["ACE3 Equipment", QGVAR(KestrelDialogKey), localize "STR_ACE_Kestrel4500_KestrelDialogKey",
["ACE3 Equipment", QGVAR(KestrelDialogKey), localize LSTRING(KestrelDialogKey),
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -13,7 +13,7 @@
{false},
[0, [false, false, false]], false, 0] call CBA_fnc_addKeybind; // (empty default key)
["ACE3 Equipment", QGVAR(DisplayKestrelKey), localize "STR_ACE_Kestrel4500_DisplayKestrelKey",
["ACE3 Equipment", QGVAR(DisplayKestrelKey), localize LSTRING(DisplayKestrelKey),
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

4
addons/kestrel4500/stringtable.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Kestrel4500">
<Key ID="STR_ACE_Kestrel_Name">
<Key ID="STR_ACE_Kestrel4500_Name">
<English>Kestrel 4500NV</English>
<German>Kestrel 4500NV</German>
<Spanish>Kestrel 4500NV</Spanish>
@ -13,7 +13,7 @@
<Portuguese>Kestrel 4500NV</Portuguese>
<Russian>Kestrel 4500NV</Russian>
</Key>
<Key ID="STR_ACE_Kestrel_Description">
<Key ID="STR_ACE_Kestrel4500_Description">
<English>Kestrel 4500 Pocket Weather Tracker</English>
<Polish>Anemomentr skrzydełkowy Kestrel 4500</Polish>
<Russian>Карманная метеостанция Kestrel 4500NV</Russian>

2
addons/laser/functions/fnc_keyLaserCodeDown.sqf
View File

@ -8,5 +8,5 @@ if(_oldLaserCode > ACE_DEFAULT_LASER_CODE) then {
ACE_player setVariable [QGVAR(code), _laserCode, false];
};
if(_laserCode != _oldLaserCode) then {
[format ["%1: %2", localize "STR_ACE_laser_laserCode", _laserCode]] call EFUNC(common,displayTextStructured);
[format ["%1: %2", localize LSTRING(laserCode), _laserCode]] call EFUNC(common,displayTextStructured);
};

2
addons/laser/functions/fnc_keyLaserCodeUp.sqf
View File

@ -6,5 +6,5 @@ _oldLaserCode = ACE_player getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
_laserCode = _oldLaserCode + 1;
ACE_player setVariable [QGVAR(code), _laserCode, false];
if(_laserCode != _oldLaserCode) then {
[format ["%1: %2", localize "STR_ACE_laser_laserCode", _laserCode]] call EFUNC(common,displayTextStructured);
[format ["%1: %2", localize LSTRING(laserCode), _laserCode]] call EFUNC(common,displayTextStructured);
};

4
addons/laser/initKeybinds.sqf
View File

@ -1,4 +1,4 @@
["ACE3 Equipment", QGVAR(LaserCodeUp), localize "STR_ACE_laser_laserCodeUp",
["ACE3 Equipment", QGVAR(LaserCodeUp), localize LSTRING(laserCodeUp),
{
if( EGVAR(laser_selfdesignate,active)
||
@ -12,7 +12,7 @@
{false},
[16, [false, true, true]], false, 0] call CBA_fnc_addKeybind; // (ALT+CTRL+Q)
["ACE3 Equipment", QGVAR(LaserCodeDown), localize "STR_ACE_laser_laserCodeDown",
["ACE3 Equipment", QGVAR(LaserCodeDown), localize LSTRING(laserCodeDown),
{
if( EGVAR(laser_selfdesignate,active)
||

8
addons/laser/stringtable.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="laser">
<Key ID="STR_ACE_laser_laserCode">
<Package name="Laser">
<Key ID="STR_ACE_Laser_laserCode">
<English>Laser Code</English>
<German>Lasercode</German>
<Polish>Kod lasera</Polish>
@ -13,7 +13,7 @@
<Czech>Laser kód</Czech>
<Italian>Codice laser</Italian>
</Key>
<Key ID="STR_ACE_laser_laserCodeUp">
<Key ID="STR_ACE_Laser_laserCodeUp">
<English>Laser - Cycle Code Up</English>
<German>Lasercode +</German>
<Polish>Laser - Następny kod</Polish>
@ -25,7 +25,7 @@
<Czech>Laser - Kód +</Czech>
<Italian>Codice laser +</Italian>
</Key>
<Key ID="STR_ACE_laser_laserCodeDown">
<Key ID="STR_ACE_Laser_laserCodeDown">
<English>Laser - Cycle Code Down</English>
<German>Lasercode -</German>
<Polish>Laser - Poprzedni kod</Polish>

4
addons/laser_selfdesignate/functions/fnc_initDesignatorActions.sqf
View File

@ -31,7 +31,7 @@ GVAR(initializedClasses) = _initializedClasses;
// e.g.: _vehicle setVariable [format ["%1_%2", QGVAR(active), _x], false];
// Add actions
_onAction = [QGVAR(LaserOn), localize "STR_ACE_Laser_SelfDesignate_DesignatorOn", "",
_onAction = [QGVAR(LaserOn), localize LSTRING(DesignatorOn), "",
{
// Statement
_this call FUNC(laserHudDesignateOn)
@ -41,7 +41,7 @@ GVAR(initializedClasses) = _initializedClasses;
!GVAR(active) && {[ACE_player] call FUNC(unitTurretHasDesignator)}
}] call EFUNC(interact_menu,createAction);
_offAction = [QGVAR(LaserOff), localize "STR_ACE_Laser_SelfDesignate_DesignatorOff", "",
_offAction = [QGVAR(LaserOff), localize LSTRING(DesignatorOff), "",
{
// Statement
_this call FUNC(laserHudDesignateOff)

28
addons/laserpointer/CfgWeapons.hpp
View File

@ -10,26 +10,26 @@ class CfgWeapons {
class acc_pointer_IR: ItemCore {
ACE_nextModeClass = "ACE_acc_pointer_red";
ACE_modeDescription = "$STR_ACE_Laserpointer_IRLaser";
ACE_modeDescription = CSTRING(IRLaser);
displayName = "$STR_ACE_Laserpointer_red";
descriptionUse = "$STR_ACE_Laserpointer_useLaser";
displayName = CSTRING(red);
descriptionUse = CSTRING(useLaser);
};
class ACE_acc_pointer_red: ItemCore {
ACE_nextModeClass = "acc_pointer_IR";
ACE_modeDescription = "$STR_ACE_Laserpointer_Laser";
ACE_modeDescription = CSTRING(Laser);
ACE_laserpointer = 1;
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
_generalMacro = "ACE_acc_pointer_red";
scope = 1;
displayName = "$STR_ACE_Laserpointer_red";
descriptionUse = "$STR_ACE_Laserpointer_useLaser";
displayName = CSTRING(red);
descriptionUse = CSTRING(useLaser);
picture = "\A3\weapons_F\Data\UI\gear_accv_pointer_CA.paa";
model = "\A3\weapons_f\acc\accv_pointer_F";
descriptionShort = "$STR_ACE_Laserpointer_Description";
descriptionShort = CSTRING(Description);
class ItemInfo: InventoryFlashLightItem_Base_F {
mass = 6;
@ -69,23 +69,23 @@ class CfgWeapons {
class ACE_acc_pointer_green_IR: acc_pointer_IR {
ACE_nextModeClass = "ACE_acc_pointer_green";
ACE_modeDescription = "$STR_ACE_Laserpointer_IRLaser";
ACE_modeDescription = CSTRING(IRLaser);
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
_generalMacro = "ACE_acc_pointer_green";
scope = 1;
displayName = "$STR_ACE_Laserpointer_green";
displayName = CSTRING(green);
};
class ACE_acc_pointer_green: ACE_acc_pointer_red {
ACE_nextModeClass = "ACE_acc_pointer_green_IR";
ACE_modeDescription = "$STR_ACE_Laserpointer_Laser";
ACE_modeDescription = CSTRING(Laser);
ACE_laserpointer = 2;
author = "$STR_ACE_Common_ACETeam";
author = ECSTRING(common,ACETeam);
_generalMacro = "ACE_acc_pointer_green";
scope = 2;
displayName = "$STR_ACE_Laserpointer_green";
displayName = CSTRING(green);
};
};

2
addons/laserpointer/initKeybinds.sqf
View File

@ -1,6 +1,6 @@
// by commy2
["ACE3 Weapons", QGVAR(switchLaserLightMode), localize "STR_ACE_Laserpointer_switchLaserLight",
["ACE3 Weapons", QGVAR(switchLaserLightMode), localize LSTRING(switchLaserLight),
{
// Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/logistics_uavbattery/CfgVehicles.hpp
View File

@ -14,7 +14,7 @@ class CfgVehicles {
class ACE_Actions: ACE_Actions{
class ACE_MainActions: ACE_MainActions {
class GVAR(RefuelUAV) {
displayName = "$STR_ACE_logistics_uavbattery_Recharge";
displayName = CSTRING(Recharge);
distance = 4;
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canRefuelUAV));
statement = QUOTE([ARR_2(_player, _target)] call FUNC(refuelUAV));

4
addons/logistics_uavbattery/CfgWeapons.hpp
View File

@ -4,8 +4,8 @@ class CfgWeapons {
class ACE_UAVBattery: ACE_ItemCore {
scope = 2;
displayName = "$STR_ACE_logistics_uavbattery_Battery_Name";
descriptionShort = "$STR_ACE_logistics_uavbattery_Battery_Description";
displayName = CSTRING(Battery_Name);
descriptionShort = CSTRING(Battery_Description);
model = QUOTE(PATHTOF(models\ace_battery.p3d));
picture = QUOTE(PATHTOF(ui\UAV_battery_ca.paa));
class ItemInfo: InventoryItem_Base_F {

2
addons/logistics_uavbattery/functions/fnc_refuelUAV.sqf
View File

@ -36,4 +36,4 @@ _onFailure = {
[_caller, "AinvPknlMstpSnonWnonDr_medic5", 0] call EFUNC(common,doAnimation);
[10, [_caller, _target], _onFinish, _onFailure, (localize "STR_ACE_logistics_uavbattery_Battery_Recharge"), {(_this select 0) call FUNC(canRefuelUAV)}] call EFUNC(common,progressBar);
[10, [_caller, _target], _onFinish, _onFailure, (localize LSTRING(Battery_Recharge)), {(_this select 0) call FUNC(canRefuelUAV)}] call EFUNC(common,progressBar);

14
addons/logistics_uavbattery/stringtable.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="logistics_uavbattery">
<Key ID="STR_ACE_logistics_uavbattery_Full">
<Package name="Logistics_UAVbattery">
<Key ID="STR_ACE_Logistics_UAVbattery_Full">
<English>Drone is full</English>
<German>Drohne ist voll</German>
<Spanish>El VANT está lleno</Spanish>
@ -13,7 +13,7 @@
<Italian>Il drone è pieno</Italian>
<Russian>БПЛА полностью заряжен</Russian>
</Key>
<Key ID="STR_ACE_logistics_uavbattery_NoBattery">
<Key ID="STR_ACE_Logistics_UAVbattery_NoBattery">
<English>You need a UAV Battery</English>
<German>Du brauchst eine UAV-Batterie</German>
<Spanish>Necesitas una batería para VANT</Spanish>
@ -25,7 +25,7 @@
<Italian>Hai bisogno di una Batteria UAV</Italian>
<Russian>Требуется аккумулятор для БПЛА</Russian>
</Key>
<Key ID="STR_ACE_logistics_uavbattery_Recharge">
<Key ID="STR_ACE_Logistics_UAVbattery_Recharge">
<English>Recharge</English>
<German>Aufladen</German>
<Spanish>Recargar</Spanish>
@ -37,7 +37,7 @@
<Italian>Ricarica</Italian>
<Russian>Зарядить</Russian>
</Key>
<Key ID="STR_ACE_logistics_uavbattery_Battery_Name">
<Key ID="STR_ACE_Logistics_UAVbattery_Battery_Name">
<English>UAV Battery</English>
<German>UAV-Batterie</German>
<Spanish>Batería para VANT</Spanish>
@ -49,7 +49,7 @@
<Italian>Batteria UAV</Italian>
<Russian>Аккумулятор БПЛА</Russian>
</Key>
<Key ID="STR_ACE_logistics_uavbattery_Battery_Description">
<Key ID="STR_ACE_Logistics_UAVbattery_Battery_Description">
<English>Used to refuel Carried UAV's</English>
<German>Verwendet zum Aufladen von tragbaren UAVs</German>
<Spanish>Usada para reabastecer el VANT</Spanish>
@ -61,7 +61,7 @@
<Italian>Usata per ricaricare la Batteria dell'UAV</Italian>
<Russian>Используется для зарядки переносных БПЛА</Russian>
</Key>
<Key ID="STR_ACE_logistics_uavbattery_Battery_Recharge">
<Key ID="STR_ACE_Logistics_UAVbattery_Battery_Recharge">
<English>Recharging ...</English>
<German>Aufladen ...</German>
<Spanish>Recargando ...</Spanish>

6
addons/logistics_wirecutter/CfgWeapons.hpp
View File

@ -3,9 +3,9 @@ class CfgWeapons {
class ACE_ItemCore;
class ACE_wirecutter: ACE_ItemCore {
author = "$STR_ACE_Common_ACETeam";
displayName = "$STR_ACE_logistics_wirecutter_wirecutterName";
descriptionShort = "$STR_ACE_logistics_wirecutter_wirecutterDescription";
author = ECSTRING(common,ACETeam);
displayName = CSTRING(wirecutterName);
descriptionShort = CSTRING(wirecutterDescription);
model = "\A3\weapons_F\ammo\mag_univ.p3d";
picture = QUOTE(PATHTOF(ui\item_wirecutter_ca.paa));
scope = 2;

2
addons/logistics_wirecutter/functions/fnc_cutDownFence.sqf
View File

@ -38,4 +38,4 @@ _progressCheck = {
((!isNull _fenceObject) && {(damage _fenceObject) < 1} && {("ACE_wirecutter" in (items ACE_player))})
};
[_timeToCut, [_fenceObject,0], {(_this select 0) call FUNC(cutDownFenceCallback)}, {(_this select 0) call FUNC(cutDownFenceAbort)}, localize "STR_ACE_logistics_wirecutter_CuttingFence", _progressCheck] call EFUNC(common,progressBar);
[_timeToCut, [_fenceObject,0], {(_this select 0) call FUNC(cutDownFenceCallback)}, {(_this select 0) call FUNC(cutDownFenceAbort)}, localize LSTRING(CuttingFence), _progressCheck] call EFUNC(common,progressBar);

2
addons/logistics_wirecutter/functions/fnc_cutDownFenceCallback.sqf
View File

@ -18,5 +18,5 @@
PARAMS_1(_fenceObject);
_fenceObject setdamage 1;
// [localize "STR_ACE_logistics_wirecutter_FenceCut"] call EFUNC(common,displayTextStructured);
// [localize LSTRING(FenceCut)] call EFUNC(common,displayTextStructured);
[ACE_player, "AmovPknlMstpSrasWrflDnon", 1] call EFUNC(common,doAnimation);

Some files were not shown because too many files have changed in this diff Show More