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

Macro STRING to LSTRING

Browse Source
This commit is contained in:
jonpas 2015-05-28 21:59:04 +02:00
parent 700c4cb962
commit 763cb07629
105 changed files with 230 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/advanced_ballistics/initKeybinds.sqf
View File

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

2
addons/atragmx/initKeybinds.sqf
View File

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

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

@ -37,7 +37,7 @@ if (_itemVehClass == "") then {
if (_itemVehClass == "") exitWith {ERROR("no ACE_Attachable for Item");}; if (_itemVehClass == "") exitWith {ERROR("no ACE_Attachable for Item");};
_onAtachText = format [localize STRING(Item_Attached), _onAtachText]; _onAtachText = format [localize LSTRING(Item_Attached), _onAtachText];
if (_unit == _attachToVehicle) then { //Self Attachment if (_unit == _attachToVehicle) then { //Self Attachment
_unit removeItem _itemClassname; // Remove item _unit removeItem _itemClassname; // Remove item
@ -54,12 +54,12 @@ if (_unit == _attachToVehicle) then { //Self Attachment
[_unit, QGVAR(vehAttach), true] call EFUNC(common,setForceWalkStatus); [_unit, QGVAR(vehAttach), true] call EFUNC(common,setForceWalkStatus);
//MenuBack isn't working for now (localize STRING(CancelAction)) //MenuBack isn't working for now (localize LSTRING(CancelAction))
[{[localize STRING(PlaceAction), ""] call EFUNC(interaction,showMouseHint)}, [], 0, 0] call EFUNC(common,waitAndExecute); [{[localize LSTRING(PlaceAction), ""] call EFUNC(interaction,showMouseHint)}, [], 0, 0] call EFUNC(common,waitAndExecute);
_unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {true}, {GVAR(placeAction) = 1;}] call EFUNC(common,AddActionEventHandler)]; _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)]; // _unit setVariable [QGVAR(cancelActionEH), [_unit, "MenuBack", {true}, {GVAR(placeAction) = 0;}] call EFUNC(common,AddActionEventHandler)];
_actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize STRING(CancelAction)], {GVAR(placeAction) = 0}]; _actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize LSTRING(CancelAction)], {GVAR(placeAction) = 0}];
[{ [{
private "_startingPosition"; 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 // Exit if can't add the item
if !(_unit canAdd _itemName) exitWith { if !(_unit canAdd _itemName) exitWith {
[localize STRING(Inventory_Full)] call EFUNC(common,displayTextStructured); [localize LSTRING(Inventory_Full)] call EFUNC(common,displayTextStructured);
}; };
// Add item to inventory // Add item to inventory
@ -78,4 +78,4 @@ if (_itemDisplayName == "") then {
_itemDisplayName = getText (configFile >> "CfgMagazines" >> _itemName >> "displayName"); _itemDisplayName = getText (configFile >> "CfgMagazines" >> _itemName >> "displayName");
}; };
[format [localize STRING(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) //Checks (too close to center or can't attach)
if (((_startDistanceFromCenter - _closeInDistance) < 0.1) || {!([_attachToVehicle, _unit, _itemClassname] call FUNC(canAttach))}) exitWith { if (((_startDistanceFromCenter - _closeInDistance) < 0.1) || {!([_attachToVehicle, _unit, _itemClassname] call FUNC(canAttach))}) exitWith {
TRACE_2("no valid spot found",_closeInDistance,_startDistanceFromCenter); TRACE_2("no valid spot found",_closeInDistance,_startDistanceFromCenter);
[localize STRING(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) //Move it out slightly, for visability sake (better to look a little funny than be embedded//sunk in the hull and be useless)

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

@ -30,7 +30,7 @@ if (_state) then {
_unit setVariable [QGVAR(escortedUnit), _target, true]; _unit setVariable [QGVAR(escortedUnit), _target, true];
//Add Actionmenu to release captive //Add Actionmenu to release captive
_actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize STRING(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);}, {[(_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)))]; 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 = []; _listedItemClasses = [];
_actions = [localize STRING(FriskMenuHeader), ""] call ACE_Interaction_fnc_prepareSelectMenu; _actions = [localize LSTRING(FriskMenuHeader), ""] call ACE_Interaction_fnc_prepareSelectMenu;
_allGear = []; _allGear = [];

6
addons/captives/functions/fnc_moduleSurrender.sqf
View File

@ -36,13 +36,13 @@ if (local _logic) then {
["SetSurrendered", [_mouseOverObject], [_mouseOverObject, false]] call EFUNC(common,targetEvent); ["SetSurrendered", [_mouseOverObject], [_mouseOverObject, false]] call EFUNC(common,targetEvent);
}; };
} else { } else {
[STRING(Zeus_OnlyAlive)] call EFUNC(common,displayTextStructured); [LSTRING(Zeus_OnlyAlive)] call EFUNC(common,displayTextStructured);
}; };
} else { } else {
[STRING(Zeus_OnlyInfantry)] call EFUNC(common,displayTextStructured); [LSTRING(Zeus_OnlyInfantry)] call EFUNC(common,displayTextStructured);
}; };
} else { } else {
[STRING(Zeus_NothingSelected)] call EFUNC(common,displayTextStructured); [LSTRING(Zeus_NothingSelected)] call EFUNC(common,displayTextStructured);
}; };
} else { } else {
//an editor module //an editor module

2
addons/common/functions/fnc_hashGet.sqf
View File

@ -13,7 +13,7 @@ try {
_index = (_hash select 0) find _key; _index = (_hash select 0) find _key;
if(_index != -1) then { if(_index != -1) then {
_val = (_hash select 1) select _index; _val = (_hash select 1) select _index;
if(IS_STRING(_val) && {_val == "ACREHASHREMOVEDONOTUSETHISVAL"}) then { if(IS_LSTRING(_val) && {_val == "ACREHASHREMOVEDONOTUSETHISVAL"}) then {
_val = nil; _val = nil;
}; };
}; };

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

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

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

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

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

@ -49,8 +49,8 @@ if (_type in _initializedClasses) exitWith {};
_initializedClasses pushBack _type; _initializedClasses pushBack _type;
GVAR(initializedClasses_carry) = _initializedClasses; GVAR(initializedClasses_carry) = _initializedClasses;
_carryAction = [QGVAR(carry), localize STRING(Carry), "", {[_player, _target] call FUNC(startCarry)}, {[_player, _target] call FUNC(canCarry)}] 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 STRING(Drop), "", {[_player, _target] call FUNC(dropObject_carry)}, {[_player, _target] call FUNC(canDrop_carry)}] 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, ["ACE_MainActions"], _carryAction] call EFUNC(interact_menu,addActionToClass);
[_type, 0, [], _dropAction] 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; _initializedClasses pushBack _type;
GVAR(initializedClasses) = _initializedClasses; GVAR(initializedClasses) = _initializedClasses;
_dragAction = [QGVAR(drag), localize STRING(Drag), "", {[_player, _target] call FUNC(startDrag)}, {[_player, _target] call FUNC(canDrag)}] 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 STRING(Drop), "", {[_player, _target] call FUNC(dropObject)}, {[_player, _target] call FUNC(canDrop)}] 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, ["ACE_MainActions"], _dragAction] call EFUNC(interact_menu,addActionToClass);
[_type, 0, [], _dropAction] 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); _weight = [_target] call FUNC(getWeight);
if (_weight > GETMVAR(ACE_maxWeightCarry,1E11)) exitWith { if (_weight > GETMVAR(ACE_maxWeightCarry,1E11)) exitWith {
[localize STRING(UnableToDrag)] call EFUNC(common,displayTextStructured); [localize LSTRING(UnableToDrag)] call EFUNC(common,displayTextStructured);
}; };
private "_timer"; private "_timer";

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

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

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), []]; _clacker = _unit getVariable [QGVAR(Clackers), []];
GVAR(PlacedCount) = GVAR(PlacedCount) + 1; GVAR(PlacedCount) = GVAR(PlacedCount) + 1;
_clacker pushBack [_explosive, getNumber(_config >> "FuseTime"), format [localize STRING(DetonateCode), _clacker pushBack [_explosive, getNumber(_config >> "FuseTime"), format [localize LSTRING(DetonateCode),
GVAR(PlacedCount)], _magazineClass, configName ((_this select 3) select (count (_this select 3) - 1))]; GVAR(PlacedCount)], _magazineClass, configName ((_this select 3) select (count (_this select 3) - 1))];
_unit setVariable [QGVAR(Clackers), _clacker, true]; _unit setVariable [QGVAR(Clackers), _clacker, true];
_unit sideChat format [localize STRING(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 [8860, QUOTE(call DFUNC(SetTimer);)];
buttonSetAction [8855, QUOTE(closeDialog 0;)]; buttonSetAction [8855, QUOTE(closeDialog 0;)];
ctrlSetText [8870, format[localize STRING(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); }] call CALLSTACK(BIS_fnc_addStackedEventHandler);
[localize STRING(PlaceAction), localize STRING(CancelAction), [localize LSTRING(PlaceAction), localize LSTRING(CancelAction),
localize STRING(ScrollAction)] call EFUNC(interaction,showMouseHint); localize LSTRING(ScrollAction)] call EFUNC(interaction,showMouseHint);
_unit setVariable [QGVAR(Place), [_unit, "DefaultAction", _unit setVariable [QGVAR(Place), [_unit, "DefaultAction",
{GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call FUNC(place_Approve);}] call EFUNC(common,AddActionEventHandler)]; {GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call FUNC(place_Approve);}] call EFUNC(common,AddActionEventHandler)];
_unit setVariable [QGVAR(Cancel), [_unit, "zoomtemp", _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); _isEOD = [_unit] call EFUNC(Common,isEOD);
_defuseTime = [_isEOD, _target] call _fnc_DefuseTime; _defuseTime = [_isEOD, _target] call _fnc_DefuseTime;
if (_isEOD || {!GVAR(RequireSpecialist)}) then { if (_isEOD || {!GVAR(RequireSpecialist)}) then {
[_defuseTime, [_unit,_target], {(_this select 0) call FUNC(defuseExplosive)}, {}, (localize STRING(DefusingExplosive))] call EFUNC(common,progressBar); [_defuseTime, [_unit,_target], {(_this select 0) call FUNC(defuseExplosive)}, {}, (localize LSTRING(DefusingExplosive))] call EFUNC(common,progressBar);
}; };
}; };

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

@ -208,5 +208,5 @@ if(_playSound) then {
}; };
if(_showHint) then { if(_showHint) then {
[format ["%1: %2", localize STRING(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(Elevation), _turret], 0] call EFUNC(common,setVariablePublic);
[_vehicle, format ["%1_%2", QGVAR(Azimuth), _turret], 0] call EFUNC(common,setVariablePublic); [_vehicle, format ["%1_%2", QGVAR(Azimuth), _turret], 0] call EFUNC(common,setVariablePublic);
[localize STRING(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 // by commy2
["ACE3 Vehicles", QGVAR(lazeTarget), localize STRING(LaseTarget), ["ACE3 Vehicles", QGVAR(lazeTarget), localize LSTRING(LaseTarget),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; 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 [15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key
["ACE3 Vehicles", QGVAR(adjustRangeUp), localize STRING(AdjustRangeUp), ["ACE3 Vehicles", QGVAR(adjustRangeUp), localize LSTRING(AdjustRangeUp),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -44,7 +44,7 @@
{false}, {false},
[201, [false, false, false]], false] call cba_fnc_addKeybind; //PageUp Key [201, [false, false, false]], false] call cba_fnc_addKeybind; //PageUp Key
["ACE3 Vehicles", QGVAR(adjustRangDown), localize STRING(AdjustRangeDown), ["ACE3 Vehicles", QGVAR(adjustRangDown), localize LSTRING(AdjustRangeDown),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/goggles/XEH_postInit.sqf
View File

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

2
addons/grenades/XEH_postInit.sqf
View File

@ -10,7 +10,7 @@ GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265];
GVAR(flashbangPPEffectCC) ppEffectForceInNVG true; GVAR(flashbangPPEffectCC) ppEffectForceInNVG true;
// Add keybinds // Add keybinds
["ACE3 Weapons", QGVAR(switchGrenadeMode), localize STRING(SwitchGrenadeMode), ["ACE3 Weapons", QGVAR(switchGrenadeMode), localize LSTRING(SwitchGrenadeMode),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; 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 = [ _hint = [
localize STRING(NormalThrow), localize LSTRING(NormalThrow),
localize STRING(HighThrow), localize LSTRING(HighThrow),
localize STRING(PreciseThrow), localize LSTRING(PreciseThrow),
localize STRING(RollGrenade), localize LSTRING(RollGrenade),
localize STRING(DropGrenade) localize LSTRING(DropGrenade)
] select _mode; ] select _mode;
[_hint] call EFUNC(common,displayTextStructured); [_hint] call EFUNC(common,displayTextStructured);

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

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

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

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

4
addons/interact_menu/XEH_clientInit.sqf
View File

@ -28,7 +28,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)];
}; };
["ACE3 Common", QGVAR(InteractKey), (localize STRING(InteractKey)), ["ACE3 Common", QGVAR(InteractKey), (localize LSTRING(InteractKey)),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false}; 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)}, },{[0,false] call FUNC(keyUp)},
[219, [false, false, false]], false] call cba_fnc_addKeybind; //Left Windows Key [219, [false, false, false]], false] call cba_fnc_addKeybind; //Left Windows Key
["ACE3 Common", QGVAR(SelfInteractKey), (localize STRING(SelfInteractKey)), ["ACE3 Common", QGVAR(SelfInteractKey), (localize LSTRING(SelfInteractKey)),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false};

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

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

6
addons/interaction/XEH_postInit.sqf
View File

@ -23,7 +23,7 @@ private ["_team"];
// Add keybinds // Add keybinds
["ACE3 Common", QGVAR(openDoor), localize STRING(OpenDoor), ["ACE3 Common", QGVAR(openDoor), localize LSTRING(OpenDoor),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; 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 [57, [false, true, false]], false] call cba_fnc_addKeybind; //Key CTRL+Space
["ACE3 Common", QGVAR(tapShoulder), localize STRING(TapShoulder), ["ACE3 Common", QGVAR(tapShoulder), localize LSTRING(TapShoulder),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -57,7 +57,7 @@ private ["_team"];
{false}, {false},
[20, [true, false, false]], false] call cba_fnc_addKeybind; [20, [true, false, false]], false] call cba_fnc_addKeybind;
["ACE3 Common", QGVAR(modifierKey), localize STRING(ModifierKey), ["ACE3 Common", QGVAR(modifierKey), localize LSTRING(ModifierKey),
{ {
// Conditions: canInteract // Conditions: canInteract
//if !([ACE_player, objNull, ["isNotDragging"]] call EFUNC(common,canInteractWith)) exitWith {false}; // not needed //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 { if (_unit == ACE_player) then {
_message = if (_team == "MAIN") then { _message = if (_team == "MAIN") then {
localize STRING(LeftTeam); localize LSTRING(LeftTeam);
} else { } else {
_team = localize format [STRING(Team%1), _team]; _team = localize format [LSTRING(Team%1), _team];
format [localize STRING(JoinedTeam), _team]; format [localize LSTRING(JoinedTeam), _team];
}; };
[_message] call EFUNC(common,displayTextStructured); [_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; GVAR(InteractionMenu_Crew) = _cargo;
// Prepare: add header and "OK" button to select menu // Prepare: add header and "OK" button to select menu
_actions = [localize STRING(InteractionMenu), localize STRING(Interact)] call FUNC(prepareSelectMenu); _actions = [localize LSTRING(InteractionMenu), localize LSTRING(Interact)] call FUNC(prepareSelectMenu);
// Prepare: add all cargo units as options to select menu // 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; closeDialog 0;
if (isNil "_buttonText" or {_buttonText == ""}) then { if (isNil "_buttonText" or {_buttonText == ""}) then {
_buttonText = localize STRING(MakeSelection); _buttonText = localize LSTRING(MakeSelection);
}; };
createDialog "RscACE_SelectAnItem"; createDialog "RscACE_SelectAnItem";

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

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

4
addons/javelin/initKeybinds.sqf
View File

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

4
addons/kestrel4500/initKeybinds.sqf
View File

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

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]; ACE_player setVariable [QGVAR(code), _laserCode, false];
}; };
if(_laserCode != _oldLaserCode) then { if(_laserCode != _oldLaserCode) then {
[format ["%1: %2", localize STRING(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; _laserCode = _oldLaserCode + 1;
ACE_player setVariable [QGVAR(code), _laserCode, false]; ACE_player setVariable [QGVAR(code), _laserCode, false];
if(_laserCode != _oldLaserCode) then { if(_laserCode != _oldLaserCode) then {
[format ["%1: %2", localize STRING(laserCode), _laserCode]] call EFUNC(common,displayTextStructured); [format ["%1: %2", localize LSTRING(laserCode), _laserCode]] call EFUNC(common,displayTextStructured);
}; };

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

@ -48,7 +48,7 @@ _finalOwner = nil;
if(IS_CODE(_method)) then { if(IS_CODE(_method)) then {
_laser = _x call _method; _laser = _x call _method;
} else { } else {
if(IS_STRING(_method)) then { if(IS_LSTRING(_method)) then {
_laser = _x call (missionNamespace getVariable [_method, {}]); _laser = _x call (missionNamespace getVariable [_method, {}]);
} else { } else {
if(IS_ARRAY(_method)) then { if(IS_ARRAY(_method)) then {

4
addons/laser/initKeybinds.sqf
View File

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

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

2
addons/laserpointer/initKeybinds.sqf
View File

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

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

@ -36,4 +36,4 @@ _onFailure = {
[_caller, "AinvPknlMstpSnonWnonDr_medic5", 0] call EFUNC(common,doAnimation); [_caller, "AinvPknlMstpSnonWnonDr_medic5", 0] call EFUNC(common,doAnimation);
[10, [_caller, _target], _onFinish, _onFailure, (localize STRING(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);

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))}) ((!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 STRING(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); PARAMS_1(_fenceObject);
_fenceObject setdamage 1; _fenceObject setdamage 1;
// [localize STRING(FenceCut)] call EFUNC(common,displayTextStructured); // [localize LSTRING(FenceCut)] call EFUNC(common,displayTextStructured);
[ACE_player, "AmovPknlMstpSrasWrflDnon", 1] call EFUNC(common,doAnimation); [ACE_player, "AmovPknlMstpSrasWrflDnon", 1] call EFUNC(common,doAnimation);

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

@ -53,7 +53,7 @@ if (!("ACE_wirecutter" in (items ace_player))) exitWith {};
if ([_x] call FUNC(isFence)) then { if ([_x] call FUNC(isFence)) then {
_fencesHelped pushBack _x; _fencesHelped pushBack _x;
_helper = "Sign_Sphere25cm_F" createVehicleLocal (getpos _x); _helper = "Sign_Sphere25cm_F" createVehicleLocal (getpos _x);
_action = [QGVAR(helperCutFence), (localize STRING(CutFence)), QUOTE(PATHTOF(ui\wirecutter_ca.paa)), _fncStatement, _fncCondition, {}, _x, [0,0,0], 5] call EFUNC(interact_menu,createAction); _action = [QGVAR(helperCutFence), (localize LSTRING(CutFence)), QUOTE(PATHTOF(ui\wirecutter_ca.paa)), _fncStatement, _fncCondition, {}, _x, [0,0,0], 5] call EFUNC(interact_menu,createAction);
[_helper, 0, [],_action] call EFUNC(interact_menu,addActionToObject); [_helper, 0, [],_action] call EFUNC(interact_menu,addActionToObject);
_helper setPosASL ((getPosASL _x) vectorAdd [0,0,1.25]); _helper setPosASL ((getPosASL _x) vectorAdd [0,0,1.25]);
_helper hideObject true; _helper hideObject true;

6
addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf
View File

@ -29,9 +29,9 @@ _fullMagazineCount = getNumber (configfile >> "CfgMagazines" >> _magazineClassna
if (!([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith))) exitWith {}; if (!([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith))) exitWith {};
_structuredOutputText = if (_errorCode == 0) then { _structuredOutputText = if (_errorCode == 0) then {
format ["<t align='center'>%1</t><br/>", (localize STRING(RepackComplete))]; format ["<t align='center'>%1</t><br/>", (localize LSTRING(RepackComplete))];
} else { } else {
format ["<t align='center'>%1</t><br/>", (localize STRING(RepackInterrupted))]; format ["<t align='center'>%1</t><br/>", (localize LSTRING(RepackInterrupted))];
}; };
_picture = getText (configFile >> "CfgMagazines" >> _magazineClassname >> "picture"); _picture = getText (configFile >> "CfgMagazines" >> _magazineClassname >> "picture");
@ -51,6 +51,6 @@ _structuredOutputText = _structuredOutputText + format ["<img align='center' siz
// }; // };
// }; // };
// } forEach (magazinesAmmoFull ACE_player); // } forEach (magazinesAmmoFull ACE_player);
// _structuredOutputText = _structuredOutputText + format [("<t align='center'>" + (localize STRING(RepackedMagazinesCount)) + "</t>"), _fullMags, _partialMags]; // _structuredOutputText = _structuredOutputText + format [("<t align='center'>" + (localize LSTRING(RepackedMagazinesCount)) + "</t>"), _fullMags, _partialMags];
[parseText _structuredOutputText, 2] call EFUNC(common,displayTextStructured); [parseText _structuredOutputText, 2] call EFUNC(common,displayTextStructured);

2
addons/magazinerepack/functions/fnc_startRepackingMagazine.sqf
View File

@ -67,7 +67,7 @@ _totalTime,
[_magazineClassname, _startingAmmoCounts, _simEvents], [_magazineClassname, _startingAmmoCounts, _simEvents],
{_this call FUNC(magazineRepackFinish)}, {_this call FUNC(magazineRepackFinish)},
{_this call FUNC(magazineRepackFinish)}, {_this call FUNC(magazineRepackFinish)},
(localize STRING(RepackingMagazine)), (localize LSTRING(RepackingMagazine)),
{_this call FUNC(magazineRepackProgress)}, {_this call FUNC(magazineRepackProgress)},
["isNotInside"] ["isNotInside"]
] call EFUNC(common,progressBar); ] call EFUNC(common,progressBar);

4
addons/main/script_macros.hpp
View File

@ -22,8 +22,8 @@
#define PATHTOEF(var1,var2) PATHTOF_SYS(PREFIX,var1,var2) #define PATHTOEF(var1,var2) PATHTOF_SYS(PREFIX,var1,var2)
#define STRING(var1) QUOTE(TRIPLES(STR,ADDON,var1)) #define LSTRING(var1) QUOTE(TRIPLES(STR,ADDON,var1))
#define ESTRING(var1,var2) QUOTE(TRIPLES(STR,DOUBLES(PREFIX,var1),var2)) #define LESTRING(var1,var2) QUOTE(TRIPLES(STR,DOUBLES(PREFIX,var1),var2))
#define CSTRING(var1) QUOTE(TRIPLES($STR,ADDON,var1)) #define CSTRING(var1) QUOTE(TRIPLES($STR,ADDON,var1))
#define ECSTRING(var1,var2) QUOTE(TRIPLES($STR,DOUBLES(PREFIX,var1),var2)) #define ECSTRING(var1,var2) QUOTE(TRIPLES($STR,DOUBLES(PREFIX,var1),var2))

2
addons/markers/functions/fnc_onSliderPosChangedAngle.sqf
View File

@ -25,6 +25,6 @@ if (_direction < 0) then {
_direction = _direction + 360; _direction = _direction + 360;
}; };
((ctrlParent _ctrl) displayCtrl 1221) ctrlSetText format [localize STRING(MarkerDirection), _direction]; ((ctrlParent _ctrl) displayCtrl 1221) ctrlSetText format [localize LSTRING(MarkerDirection), _direction];
GVAR(currentMarkerAngle) = _data; GVAR(currentMarkerAngle) = _data;

22
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
View File

@ -28,27 +28,27 @@ _bloodPressureLow = _bloodPressure select 0;
_output = ""; _output = "";
_logOutPut = ""; _logOutPut = "";
if ([_caller] call FUNC(isMedic)) then { if ([_caller] call FUNC(isMedic)) then {
_output = STRING(Check_Bloodpressure_Output_1); _output = LSTRING(Check_Bloodpressure_Output_1);
_logOutPut = format["%1/%2",round(_bloodPressureHigh),round(_bloodPressureLow)]; _logOutPut = format["%1/%2",round(_bloodPressureHigh),round(_bloodPressureLow)];
} else { } else {
if (_bloodPressureHigh > 20) then { if (_bloodPressureHigh > 20) then {
_output = STRING(Check_Bloodpressure_Output_2); _output = LSTRING(Check_Bloodpressure_Output_2);
_logOutPut = localize STRING(Check_Bloodpressure_Low); _logOutPut = localize LSTRING(Check_Bloodpressure_Low);
if (_bloodPressureHigh > 100) then { if (_bloodPressureHigh > 100) then {
_output = STRING(Check_Bloodpressure_Output_3); _output = LSTRING(Check_Bloodpressure_Output_3);
_logOutPut = localize STRING(Check_Bloodpressure_Normal); _logOutPut = localize LSTRING(Check_Bloodpressure_Normal);
if (_bloodPressureHigh > 160) then { if (_bloodPressureHigh > 160) then {
_output = STRING(Check_Bloodpressure_Output_4); _output = LSTRING(Check_Bloodpressure_Output_4);
_logOutPut = localize STRING(Check_Bloodpressure_High); _logOutPut = localize LSTRING(Check_Bloodpressure_High);
}; };
}; };
} else { } else {
if (random(10) > 3) then { if (random(10) > 3) then {
_output = STRING(Check_Bloodpressure_Output_5); _output = LSTRING(Check_Bloodpressure_Output_5);
_logOutPut = localize STRING(Check_Bloodpressure_NoBloodpressure); _logOutPut = localize LSTRING(Check_Bloodpressure_NoBloodpressure);
} else { } else {
_output = STRING(Check_Bloodpressure_Output_6); _output = LSTRING(Check_Bloodpressure_Output_6);
}; };
}; };
}; };
@ -56,5 +56,5 @@ if ([_caller] call FUNC(isMedic)) then {
["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller]] call EFUNC(common,targetEvent); ["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller]] call EFUNC(common,targetEvent);
if (_logOutPut != "") then { if (_logOutPut != "") then {
[_target,"activity", localize STRING(Check_Bloodpressure_Log), [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog); [_target,"activity", localize LSTRING(Check_Bloodpressure_Log), [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog);
}; };

20
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
View File

@ -23,24 +23,24 @@ _heartRate = _unit getvariable [QGVAR(heartRate), 80];
if (!alive _unit) then { if (!alive _unit) then {
_heartRate = 0; _heartRate = 0;
}; };
_heartRateOutput = STRING(Check_Pulse_Output_5); _heartRateOutput = LSTRING(Check_Pulse_Output_5);
_logOutPut = localize STRING(Check_Pulse_None); _logOutPut = localize LSTRING(Check_Pulse_None);
if (_heartRate > 1.0) then { if (_heartRate > 1.0) then {
if ([_caller] call FUNC(isMedic)) then { if ([_caller] call FUNC(isMedic)) then {
_heartRateOutput = STRING(Check_Pulse_Output_1); _heartRateOutput = LSTRING(Check_Pulse_Output_1);
_logOutPut = format["%1",round(_heartRate)]; _logOutPut = format["%1",round(_heartRate)];
} else { } else {
// non medical personel will only find a pulse/HR // non medical personel will only find a pulse/HR
_heartRateOutput = STRING(Check_Pulse_Output_2); _heartRateOutput = LSTRING(Check_Pulse_Output_2);
_logOutPut = localize STRING(Check_Pulse_Weak); _logOutPut = localize LSTRING(Check_Pulse_Weak);
if (_heartRate > 60) then { if (_heartRate > 60) then {
if (_heartRate > 100) then { if (_heartRate > 100) then {
_heartRateOutput = STRING(Check_Pulse_Output_3); _heartRateOutput = LSTRING(Check_Pulse_Output_3);
_logOutPut = localize STRING(Check_Pulse_Strong); _logOutPut = localize LSTRING(Check_Pulse_Strong);
} else { } else {
_heartRateOutput = STRING(Check_Pulse_Output_4); _heartRateOutput = LSTRING(Check_Pulse_Output_4);
_logOutPut = localize STRING(Check_Pulse_Normal); _logOutPut = localize LSTRING(Check_Pulse_Normal);
}; };
}; };
}; };
@ -49,5 +49,5 @@ if (_heartRate > 1.0) then {
["displayTextStructured", [_caller], [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent); ["displayTextStructured", [_caller], [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent);
if (_logOutPut != "") then { if (_logOutPut != "") then {
[_unit,"activity", localize STRING(Check_Pulse_Log),[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog); [_unit,"activity", localize LSTRING(Check_Pulse_Log),[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog);
}; };

4
addons/medical/functions/fnc_actionCheckResponse.sqf
View File

@ -20,9 +20,9 @@ _target = _this select 1;
_output = ""; _output = "";
if ([_target] call EFUNC(common,isAwake)) then { if ([_target] call EFUNC(common,isAwake)) then {
_output = STRING(Check_Response_Responsive); _output = LSTRING(Check_Response_Responsive);
} else { } else {
_output = STRING(Check_Response_Unresponsive); _output = LSTRING(Check_Response_Unresponsive);
}; };
["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName)], 2, _caller]] call EFUNC(common,targetEvent); ["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName)], 2, _caller]] call EFUNC(common,targetEvent);

16
addons/medical/functions/fnc_actionDiagnose.sqf
View File

@ -18,28 +18,28 @@ private ["_caller", "_target", "_genericMessages"];
_caller = _this select 0; _caller = _this select 0;
_target = _this select 1; _target = _this select 1;
_genericMessages = [STRING(diagnoseMessage)]; _genericMessages = [LSTRING(diagnoseMessage)];
_genericMessages pushBack ([_target] call EFUNC(common,getName)); _genericMessages pushBack ([_target] call EFUNC(common,getName));
if (alive _target) then { if (alive _target) then {
_genericMessages pushback STRING(diagnoseAlive); _genericMessages pushback LSTRING(diagnoseAlive);
} else { } else {
_genericMessages pushback STRING(diagnoseDead); _genericMessages pushback LSTRING(diagnoseDead);
}; };
if (_target getvariable[QGVAR(hasLostBlood), 0] > 0) then { if (_target getvariable[QGVAR(hasLostBlood), 0] > 0) then {
if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then { if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then {
_genericMessages pushback STRING(lostBloodALot); _genericMessages pushback LSTRING(lostBloodALot);
} else { } else {
_genericMessages pushback STRING(lostBlood); _genericMessages pushback LSTRING(lostBlood);
}; };
} else { } else {
_genericMessages pushback STRING(noBloodloss); _genericMessages pushback LSTRING(noBloodloss);
}; };
if (_target getvariable[QGVAR(hasPain), false]) then { if (_target getvariable[QGVAR(hasPain), false]) then {
_genericMessages pushback STRING(inPain); _genericMessages pushback LSTRING(inPain);
} else { } else {
_genericMessages pushback STRING(noPain); _genericMessages pushback LSTRING(noPain);
}; };
["displayTextStructured", [_caller], [_genericMessages, 3.0, _caller]] call EFUNC(common,targetEvent); ["displayTextStructured", [_caller], [_genericMessages, 3.0, _caller]] call EFUNC(common,targetEvent);

32
addons/medical/functions/fnc_displayPatientInformation.sqf
View File

@ -50,22 +50,22 @@ if (_show) then {
_genericMessages = []; _genericMessages = [];
if (GVAR(level) >= 2) then { if (GVAR(level) >= 2) then {
_partText = [STRING(Head), STRING(Torso), STRING(ArmLeft) ,STRING(ArmRight) ,STRING(LegLeft), STRING(LegRight)] select _selectionN; _partText = [LSTRING(Head), LSTRING(Torso), LSTRING(ArmLeft) ,LSTRING(ArmRight) ,LSTRING(LegLeft), LSTRING(LegRight)] select _selectionN;
_genericMessages pushback [localize _partText, [1, 1, 1, 1]]; _genericMessages pushback [localize _partText, [1, 1, 1, 1]];
}; };
if (_target getvariable[QGVAR(isBleeding), false]) then { if (_target getvariable[QGVAR(isBleeding), false]) then {
_genericMessages pushback [localize STRING(Status_Bleeding), [1, 0.1, 0.1, 1]]; _genericMessages pushback [localize LSTRING(Status_Bleeding), [1, 0.1, 0.1, 1]];
}; };
if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then { if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then {
_genericMessages pushback [localize STRING(Status_Lost_Blood), [1, 0.1, 0.1, 1]]; _genericMessages pushback [localize LSTRING(Status_Lost_Blood), [1, 0.1, 0.1, 1]];
}; };
if (((_target getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]]) select _selectionN) > 0) then { if (((_target getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]]) select _selectionN) > 0) then {
_genericMessages pushback [localize STRING(Status_Tourniquet_Applied), [0.77, 0.51, 0.08, 1]]; _genericMessages pushback [localize LSTRING(Status_Tourniquet_Applied), [0.77, 0.51, 0.08, 1]];
}; };
if (_target getvariable[QGVAR(hasPain), false]) then { if (_target getvariable[QGVAR(hasPain), false]) then {
_genericMessages pushback [localize STRING(Status_Pain), [1, 1, 1, 1]]; _genericMessages pushback [localize LSTRING(Status_Pain), [1, 1, 1, 1]];
}; };
_totalIvVolume = 0; _totalIvVolume = 0;
@ -77,7 +77,7 @@ if (_show) then {
}; };
}foreach GVAR(IVBags); }foreach GVAR(IVBags);
if (_totalIvVolume >= 1) then { if (_totalIvVolume >= 1) then {
_genericMessages pushback [format[localize STRING(receivingIvVolume), floor _totalIvVolume], [1, 1, 1, 1]]; _genericMessages pushback [format[localize LSTRING(receivingIvVolume), floor _totalIvVolume], [1, 1, 1, 1]];
}; };
_damaged = [false, false, false, false, false, false]; _damaged = [false, false, false, false, false, false];
@ -133,17 +133,17 @@ if (_show) then {
if (_target getHitPointDamage _x > 0 && {_forEachIndex == _selectionN}) then { if (_target getHitPointDamage _x > 0 && {_forEachIndex == _selectionN}) then {
_pointDamage = _target getHitPointDamage _x; _pointDamage = _target getHitPointDamage _x;
_severity = switch (true) do { _severity = switch (true) do {
case (_pointDamage > 0.5): {localize STRING(HeavilyWounded)}; case (_pointDamage > 0.5): {localize LSTRING(HeavilyWounded)};
case (_pointDamage > 0.1): {localize STRING(LightlyWounded)}; case (_pointDamage > 0.1): {localize LSTRING(LightlyWounded)};
default {localize STRING(VeryLightlyWounded)}; default {localize LSTRING(VeryLightlyWounded)};
}; };
_part = localize ([ _part = localize ([
STRING(Head), LSTRING(Head),
STRING(Torso), LSTRING(Torso),
STRING(LeftArm), LSTRING(LeftArm),
STRING(RightArm), LSTRING(RightArm),
STRING(LeftLeg), LSTRING(LeftLeg),
STRING(RightLeg) LSTRING(RightLeg)
] select _forEachIndex); ] select _forEachIndex);
_allInjuryTexts pushBack [format ["%1 %2", _severity, toLower _part], [1,1,1,1]]; _allInjuryTexts pushBack [format ["%1 %2", _severity, toLower _part], [1,1,1,1]];
}; };
@ -186,7 +186,7 @@ if (_show) then {
_lbCtrl lbSetColor [_foreachIndex + _amountOfGeneric, _x select 1]; _lbCtrl lbSetColor [_foreachIndex + _amountOfGeneric, _x select 1];
}foreach _allInjuryTexts; }foreach _allInjuryTexts;
if (count _allInjuryTexts == 0) then { if (count _allInjuryTexts == 0) then {
_lbCtrl lbAdd (localize STRING(NoInjuriesBodypart)); _lbCtrl lbAdd (localize LSTRING(NoInjuriesBodypart));
}; };
_logCtrl = (_display displayCtrl 302); _logCtrl = (_display displayCtrl 302);

2
addons/medical/functions/fnc_displayTriageCard.sqf
View File

@ -58,7 +58,7 @@ if (_show) then {
}foreach _log; }foreach _log;
if (count _triageCardTexts == 0) then { if (count _triageCardTexts == 0) then {
_lbCtrl lbAdd (localize STRING(TriageCard_NoEntry)); _lbCtrl lbAdd (localize LSTRING(TriageCard_NoEntry));
}; };
{ {
_lbCtrl lbAdd _x; _lbCtrl lbAdd _x;

10
addons/medical/functions/fnc_getTriageStatus.sqf
View File

@ -17,10 +17,10 @@ private ["_unit","_return","_status"];
_unit = _this select 0; _unit = _this select 0;
_status = _unit getvariable [QGVAR(triageLevel), -1]; _status = _unit getvariable [QGVAR(triageLevel), -1];
_return = switch (_status) do { _return = switch (_status) do {
case 1: {[localize STRING(Triage_Status_Minor), 1, [0, 0.5, 0, 0.9]]}; case 1: {[localize LSTRING(Triage_Status_Minor), 1, [0, 0.5, 0, 0.9]]};
case 2: {[localize STRING(Triage_Status_Delayed), 2, [0.7, 0.5, 0, 0.9]]}; case 2: {[localize LSTRING(Triage_Status_Delayed), 2, [0.7, 0.5, 0, 0.9]]};
case 3: {[localize STRING(Triage_Status_Immediate), 3, [0.4, 0.07, 0.07, 0.9]]}; case 3: {[localize LSTRING(Triage_Status_Immediate), 3, [0.4, 0.07, 0.07, 0.9]]};
case 4: {[localize STRING(Triage_Status_Deceased), 4, [0, 0, 0, 0.9]]}; case 4: {[localize LSTRING(Triage_Status_Deceased), 4, [0, 0, 0, 0.9]]};
default {[localize STRING(Triage_Status_None), 0, [0, 0, 0, 0.9]]}; default {[localize LSTRING(Triage_Status_None), 0, [0, 0, 0, 0.9]]};
}; };
_return; _return;

2
addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
View File

@ -37,6 +37,6 @@ if !([_target] call FUNC(hasMedicalEnabled)) exitwith {
}; };
}foreach _items;*/ }foreach _items;*/
[_target, "activity", STRING(Activity_bandagedPatient), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); [_target, "activity", LSTRING(Activity_bandagedPatient), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog);
true; true;

2
addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
View File

@ -32,6 +32,6 @@ _items = _this select 4;
}; };
}foreach _items; }foreach _items;
[_target, "activity", STRING(Activity_usedItem), [[_caller] call EFUNC(common,getName), _className]] call FUNC(addToLog); [_target, "activity", LSTRING(Activity_usedItem), [[_caller] call EFUNC(common,getName), _className]] call FUNC(addToLog);
true; true;

2
addons/medical/functions/fnc_treatmentIV.sqf
View File

@ -29,4 +29,4 @@ if (count _items == 0) exitwith {};
_removeItem = _items select 0; _removeItem = _items select 0;
[[_target, _className], QUOTE(DFUNC(treatmentIVLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ [[_target, _className], QUOTE(DFUNC(treatmentIVLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
[_target, _removeItem] call FUNC(addToTriageCard); [_target, _removeItem] call FUNC(addToTriageCard);
[_target, "activity", STRING(Activity_gaveIV), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); [_target, "activity", LSTRING(Activity_gaveIV), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog);

2
addons/medical/functions/fnc_treatmentTourniquet.sqf
View File

@ -43,7 +43,7 @@ _removeItem = _items select 0;
[[_target, _removeItem, _selectionName], QUOTE(DFUNC(treatmentTourniquetLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ [[_target, _removeItem, _selectionName], QUOTE(DFUNC(treatmentTourniquetLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
[_target, _removeItem] call FUNC(addToTriageCard); [_target, _removeItem] call FUNC(addToTriageCard);
[_target, "activity", STRING(Activity_appliedTourniquet), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); [_target, "activity", LSTRING(Activity_appliedTourniquet), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog);
true; true;

4
addons/microdagr/XEH_clientInit.sqf
View File

@ -4,7 +4,7 @@
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
//Add Keybinds: //Add Keybinds:
["ACE3 Equipment", QGVAR(openGPS), (localize STRING(toggleUnit)), ["ACE3 Equipment", QGVAR(openGPS), (localize LSTRING(toggleUnit)),
{ {
// canInteractWith (can use on map) // canInteractWith (can use on map)
if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -17,7 +17,7 @@ if (!hasInterface) exitWith {};
{false}, {false},
[0xC7, [false, false, false]], false] call cba_fnc_addKeybind; //Home Key [0xC7, [false, false, false]], false] call cba_fnc_addKeybind; //Home Key
["ACE3 Equipment", QGVAR(closeGPS), (localize STRING(closeUnit)), ["ACE3 Equipment", QGVAR(closeGPS), (localize LSTRING(closeUnit)),
{ {
// canInteractWith (can use on map) // canInteractWith (can use on map)
if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

4
addons/microdagr/functions/fnc_showApplicationPage.sqf
View File

@ -88,10 +88,10 @@ if (GVAR(currentApplicationPage) == APP_MODE_MARK) then {
if ((count GVAR(newWaypointPosition)) == 0) then { if ((count GVAR(newWaypointPosition)) == 0) then {
(_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText (localize STRING(wpEnterCords)); (_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText (localize LSTRING(wpEnterCords));
(_display displayCtrl IDC_MODEMARK_CORDSEDIT) ctrlSetText ""; (_display displayCtrl IDC_MODEMARK_CORDSEDIT) ctrlSetText "";
} else { } else {
(_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText format [(localize STRING(wpEnterName)), mapGridPosition GVAR(newWaypointPosition)]; (_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText format [(localize LSTRING(wpEnterName)), mapGridPosition GVAR(newWaypointPosition)];
(_display displayCtrl IDC_MODEMARK_CORDSEDIT) ctrlSetText format ["[%1]", mapGridPosition GVAR(newWaypointPosition)]; (_display displayCtrl IDC_MODEMARK_CORDSEDIT) ctrlSetText format ["[%1]", mapGridPosition GVAR(newWaypointPosition)];
}; };
ctrlSetFocus (_display displayCtrl IDC_MODEMARK_CORDSEDIT); ctrlSetFocus (_display displayCtrl IDC_MODEMARK_CORDSEDIT);

12
addons/microdagr/functions/fnc_updateDisplay.sqf
View File

@ -181,18 +181,18 @@ case (APP_MODE_SETUP): {
_settingListBox = _display displayCtrl IDC_MODESETTINGS; _settingListBox = _display displayCtrl IDC_MODESETTINGS;
lbClear _settingListBox; lbClear _settingListBox;
_settingListBox lbAdd (localize STRING(settingUseMils)); _settingListBox lbAdd (localize LSTRING(settingUseMils));
if (GVAR(settingUseMils)) then { if (GVAR(settingUseMils)) then {
_settingListBox lbSetTextRight [0, (localize STRING(settingMils))]; _settingListBox lbSetTextRight [0, (localize LSTRING(settingMils))];
} else { } else {
_settingListBox lbSetTextRight [0, (localize STRING(settingDegrees))]; _settingListBox lbSetTextRight [0, (localize LSTRING(settingDegrees))];
}; };
_settingListBox lbAdd (localize STRING(settingShowWP)); _settingListBox lbAdd (localize LSTRING(settingShowWP));
if (GVAR(settingShowAllWaypointsOnMap)) then { if (GVAR(settingShowAllWaypointsOnMap)) then {
_settingListBox lbSetTextRight [1, (localize STRING(settingOn))]; _settingListBox lbSetTextRight [1, (localize LSTRING(settingOn))];
} else { } else {
_settingListBox lbSetTextRight [1, (localize STRING(settingOff))]; _settingListBox lbSetTextRight [1, (localize LSTRING(settingOff))];
}; };
}; };
}; };

2
addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf
View File

@ -51,7 +51,7 @@ _fireModes = getArray (configFile >> "CfgWeapons" >> _tubeWeaponName >> "modes")
_currentFireMode = (weaponState [_mortarVeh, [0]]) select 2; _currentFireMode = (weaponState [_mortarVeh, [0]]) select 2;
_currentChargeMode = _fireModes find _currentFireMode; _currentChargeMode = _fireModes find _currentFireMode;
_text = format ["<t size='0.8'>%1: %2 <img image='%3'/></t>", (localize STRING(rangetable_charge)), _currentChargeMode, QUOTE(PATHTOF(UI\ui_charges.paa))]; _text = format ["<t size='0.8'>%1: %2 <img image='%3'/></t>", (localize LSTRING(rangetable_charge)), _currentChargeMode, QUOTE(PATHTOF(UI\ui_charges.paa))];
_chargeText ctrlSetStructuredText parseText _text; _chargeText ctrlSetStructuredText parseText _text;
if (shownArtilleryComputer && {!GVAR(allowComputerRangefinder)}) then { if (shownArtilleryComputer && {!GVAR(allowComputerRangefinder)}) then {
//Don't like this solution, but it works //Don't like this solution, but it works

2
addons/mk6mortar/functions/fnc_rangeTableOpen.sqf
View File

@ -39,7 +39,7 @@ _muzzleVelocities = [];
_showToPlayer = getNumber (configFile >> "CfgWeapons" >> _weaponName >> _x >> "showToPlayer"); _showToPlayer = getNumber (configFile >> "CfgWeapons" >> _weaponName >> _x >> "showToPlayer");
if (_showToPlayer == 1) then { if (_showToPlayer == 1) then {
_artilleryCharge = getNumber (configFile >> "CfgWeapons" >> _weaponName >> _x >> "artilleryCharge"); _artilleryCharge = getNumber (configFile >> "CfgWeapons" >> _weaponName >> _x >> "artilleryCharge");
LIST_CHARGE lbAdd format ["%1: %2", (localize STRING(rangetable_charge)), (count _muzzleVelocities)]; LIST_CHARGE lbAdd format ["%1: %2", (localize LSTRING(rangetable_charge)), (count _muzzleVelocities)];
LIST_CHARGE lbSetData [(count _muzzleVelocities), str (_artilleryCharge * _initSpeed)]; LIST_CHARGE lbSetData [(count _muzzleVelocities), str (_artilleryCharge * _initSpeed)];
_muzzleVelocities pushBack _artilleryCharge; _muzzleVelocities pushBack _artilleryCharge;
}; };

4
addons/movement/XEH_postInit.sqf
View File

@ -14,13 +14,13 @@ if (!hasInterface) exitWith {};
[_this select 1] call CBA_fnc_removePerFrameHandler; [_this select 1] call CBA_fnc_removePerFrameHandler;
}; };
_dialog displayCtrl 111 ctrlSetText format ["%1 - %2 %3", [ACE_player] call EFUNC(common,getName), localize STRING(Weight), [ACE_player] call FUNC(getWeight)]; _dialog displayCtrl 111 ctrlSetText format ["%1 - %2 %3", [ACE_player] call EFUNC(common,getName), localize LSTRING(Weight), [ACE_player] call FUNC(getWeight)];
}, 0, _this select 0] call CBA_fnc_addPerFrameHandler; }, 0, _this select 0] call CBA_fnc_addPerFrameHandler;
}] call EFUNC(common,addEventHandler); }] call EFUNC(common,addEventHandler);
["ACE3 Movement", QGVAR(climb), localize STRING(Climb), ["ACE3 Movement", QGVAR(climb), localize LSTRING(Climb),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/movement/functions/fnc_climb.sqf
View File

@ -20,7 +20,7 @@ private "_unit";
_unit = _this select 0; _unit = _this select 0;
if !([_unit] call FUNC(canClimb)) exitWith { if !([_unit] call FUNC(canClimb)) exitWith {
[localize STRING(CanNotClimb)] call EFUNC(common,displayTextStructured); [localize LSTRING(CanNotClimb)] call EFUNC(common,displayTextStructured);
}; };
if !(_unit getVariable [QGVAR(isClimbInit), false]) then { if !(_unit getVariable [QGVAR(isClimbInit), false]) then {

2
addons/nametags/XEH_postInit.sqf
View File

@ -8,7 +8,7 @@ if (!hasInterface) exitWith {};
GVAR(ShowNamesTime) = -10; GVAR(ShowNamesTime) = -10;
// Add keybinds // Add keybinds
["ACE3 Common", QGVAR(showNameTags), localize STRING(ShowNames), ["ACE3 Common", QGVAR(showNameTags), localize LSTRING(ShowNames),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

4
addons/nightvision/XEH_postInitClient.sqf
View File

@ -37,7 +37,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
["playerTurretChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler); ["playerTurretChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler);
// Add keybinds // Add keybinds
["ACE3 Equipment", QGVAR(IncreaseNVGBrightness), localize STRING(IncreaseNVGBrightness), ["ACE3 Equipment", QGVAR(IncreaseNVGBrightness), localize LSTRING(IncreaseNVGBrightness),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -51,7 +51,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
{false}, {false},
[201, [false, false, true]], false] call cba_fnc_addKeybind; //PageUp + ALT [201, [false, false, true]], false] call cba_fnc_addKeybind; //PageUp + ALT
["ACE3 Equipment", QGVAR(DecreaseNVGBrightness), localize STRING(DecreaseNVGBrightness), ["ACE3 Equipment", QGVAR(DecreaseNVGBrightness), localize LSTRING(DecreaseNVGBrightness),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
View File

@ -29,5 +29,5 @@ _player setVariable [QGVAR(NVGBrightness), _brightness, false];
GVAR(ppEffectNVGBrightness) ppEffectAdjust [1, 1, _brightness / 4, [0, 0, 0, 0], [0, 0, 0, 1], [0, 0, 0, 1]]; GVAR(ppEffectNVGBrightness) ppEffectAdjust [1, 1, _brightness / 4, [0, 0, 0, 0], [0, 0, 0, 1], [0, 0, 0, 1]];
GVAR(ppEffectNVGBrightness) ppEffectCommit 0; GVAR(ppEffectNVGBrightness) ppEffectCommit 0;
[format [(localize STRING(NVGBrightness)), (_brightness * 100)]] call EFUNC(common,displayTextStructured); [format [(localize LSTRING(NVGBrightness)), (_brightness * 100)]] call EFUNC(common,displayTextStructured);
playSound "ACE_Sound_Click"; playSound "ACE_Sound_Click";

2
addons/optionsmenu/functions/fnc_exportSettings.sqf
View File

@ -75,6 +75,6 @@ FUNC(clipboardExport) = {
}; };
[_compiledConfig] call FUNC(clipboardExport); [_compiledConfig] call FUNC(clipboardExport);
[STRING(settingsExported)] call EFUNC(common,displayTextStructured); [LSTRING(settingsExported)] call EFUNC(common,displayTextStructured);

4
addons/optionsmenu/functions/fnc_onListBoxShowSelectionChanged.sqf
View File

@ -26,7 +26,7 @@ _settingsMenu = uiNamespace getVariable 'ACE_settingsMenu';
switch (GVAR(optionMenu_openTab)) do { switch (GVAR(optionMenu_openTab)) do {
case (MENU_TAB_OPTIONS): { case (MENU_TAB_OPTIONS): {
_localizedHeader = format ["%1: %2", (localize STRING(OpenConfigMenu)), (localize STRING(TabOptions))]; _localizedHeader = format ["%1: %2", (localize LSTRING(OpenConfigMenu)), (localize LSTRING(TabOptions))];
ctrlSetText [13, _localizedHeader]; ctrlSetText [13, _localizedHeader];
lbClear 400; lbClear 400;
@ -39,7 +39,7 @@ case (MENU_TAB_OPTIONS): {
(_settingsMenu displayCtrl 413) ctrlShow false; (_settingsMenu displayCtrl 413) ctrlShow false;
}; };
case (MENU_TAB_COLORS): { case (MENU_TAB_COLORS): {
_localizedHeader = format ["%1: %2", (localize STRING(OpenConfigMenu)), (localize STRING(TabColors))]; _localizedHeader = format ["%1: %2", (localize LSTRING(OpenConfigMenu)), (localize LSTRING(TabColors))];
ctrlSetText [13, _localizedHeader]; ctrlSetText [13, _localizedHeader];
lbClear 400; lbClear 400;

6
addons/optionsmenu/functions/fnc_onServerListBoxShowSelectionChanged.sqf
View File

@ -26,7 +26,7 @@ _settingsMenu = uiNamespace getVariable 'ACE_serverSettingsMenu';
switch (GVAR(optionMenu_openTab)) do { switch (GVAR(optionMenu_openTab)) do {
case (MENU_TAB_SERVER_OPTIONS): { case (MENU_TAB_SERVER_OPTIONS): {
_localizedHeader = format ["%1: %2", (localize STRING(OpenConfigMenu)), (localize STRING(TabOptions))]; _localizedHeader = format ["%1: %2", (localize LSTRING(OpenConfigMenu)), (localize LSTRING(TabOptions))];
ctrlSetText [13, _localizedHeader]; ctrlSetText [13, _localizedHeader];
lbClear 400; lbClear 400;
@ -43,7 +43,7 @@ case (MENU_TAB_SERVER_OPTIONS): {
(_settingsMenu displayCtrl 416) ctrlEnable false; (_settingsMenu displayCtrl 416) ctrlEnable false;
}; };
case (MENU_TAB_SERVER_COLORS): { case (MENU_TAB_SERVER_COLORS): {
_localizedHeader = format ["%1: %2", (localize STRING(OpenConfigMenu)), (localize STRING(TabColors))]; _localizedHeader = format ["%1: %2", (localize LSTRING(OpenConfigMenu)), (localize LSTRING(TabColors))];
ctrlSetText [13, _localizedHeader]; ctrlSetText [13, _localizedHeader];
lbClear 400; lbClear 400;
@ -67,7 +67,7 @@ case (MENU_TAB_SERVER_COLORS): {
(_settingsMenu displayCtrl 416) ctrlEnable false; (_settingsMenu displayCtrl 416) ctrlEnable false;
}; };
case (MENU_TAB_SERVER_VALUES): { case (MENU_TAB_SERVER_VALUES): {
_localizedHeader = format ["%1: %2", (localize STRING(OpenConfigMenu)), (localize STRING(TabValues))]; _localizedHeader = format ["%1: %2", (localize LSTRING(OpenConfigMenu)), (localize LSTRING(TabValues))];
ctrlSetText [13, _localizedHeader]; ctrlSetText [13, _localizedHeader];
lbClear 400; lbClear 400;

4
addons/optionsmenu/functions/fnc_onServerSettingsMenuOpen.sqf
View File

@ -61,7 +61,7 @@ _menu = uiNamespace getvariable "ACE_serverSettingsMenu";
(_menu displayCtrl 1003) ctrlEnable false; (_menu displayCtrl 1003) ctrlEnable false;
if (GVAR(ClientSettingsExportIncluded)) then { if (GVAR(ClientSettingsExportIncluded)) then {
(_settingsMenu displayCtrl 1102) ctrlSetText localize (STRING(exClientSettings)); (_settingsMenu displayCtrl 1102) ctrlSetText localize (LSTRING(exClientSettings));
} else { } else {
(_settingsMenu displayCtrl 1102) ctrlSetText localize (STRING(inClientSettings)); (_settingsMenu displayCtrl 1102) ctrlSetText localize (LSTRING(inClientSettings));
}; };

12
addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateKeyView.sqf
View File

@ -56,8 +56,8 @@ if (count _collection > 0) then {
// Created disable/enable options for bools // Created disable/enable options for bools
if ((_setting select 1) == "BOOL") then { if ((_setting select 1) == "BOOL") then {
lbClear 400; lbClear 400;
lbAdd [400, (localize STRING(Disabled))]; lbAdd [400, (localize LSTRING(Disabled))];
lbAdd [400, (localize STRING(Enabled))]; lbAdd [400, (localize LSTRING(Enabled))];
_settingsValue = [0, 1] select _settingsValue; _settingsValue = [0, 1] select _settingsValue;
} else { } else {
lbClear 400; lbClear 400;
@ -77,10 +77,10 @@ if (count _collection > 0) then {
// Created disable/enable options for bools // Created disable/enable options for bools
_expectedType = switch (_setting select 1) do { _expectedType = switch (_setting select 1) do {
case "STRING": {STRING(stringType)}; case "STRING": {LSTRING(stringType)};
case "ARRAY": {STRING(arrayType)}; case "ARRAY": {LSTRING(arrayType)};
case "SCALAR": {STRING(scalarType)}; case "SCALAR": {LSTRING(scalarType)};
default {STRING(unknownType)}; default {LSTRING(unknownType)};
}; };
(_settingsMenu displayCtrl 414) ctrlSetText format["%1", _settingsValue]; (_settingsMenu displayCtrl 414) ctrlSetText format["%1", _settingsValue];
(_settingsMenu displayCtrl 415) ctrlSetText format[localize _expectedType]; (_settingsMenu displayCtrl 415) ctrlSetText format[localize _expectedType];

2
addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
View File

@ -37,7 +37,7 @@ switch (GVAR(optionMenu_openTab)) do {
// Created disable/enable options for bools // Created disable/enable options for bools
_settingsText = if ((_x select 1) == "BOOL") then { _settingsText = if ((_x select 1) == "BOOL") then {
[(localize STRING(Disabled)), (localize STRING(Enabled))] select _settingsValue; [(localize LSTRING(Disabled)), (localize LSTRING(Enabled))] select _settingsValue;
} else { } else {
(_x select 5) select _settingsValue; (_x select 5) select _settingsValue;
}; };

4
addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf
View File

@ -56,8 +56,8 @@ if (count _collection > 0) then {
// Created disable/enable options for bools // Created disable/enable options for bools
if ((_setting select 1) == "BOOL") then { if ((_setting select 1) == "BOOL") then {
lbClear 400; lbClear 400;
lbAdd [400, (localize STRING(Disabled))]; lbAdd [400, (localize LSTRING(Disabled))];
lbAdd [400, (localize STRING(Enabled))]; lbAdd [400, (localize LSTRING(Enabled))];
_settingsValue = [0, 1] select _settingsValue; _settingsValue = [0, 1] select _settingsValue;
} else { } else {
lbClear 400; lbClear 400;

2
addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
View File

@ -34,7 +34,7 @@ switch (GVAR(optionMenu_openTab)) do {
// Created disable/enable options for bools // Created disable/enable options for bools
_settingsText = if ((_x select 1) == "BOOL") then { _settingsText = if ((_x select 1) == "BOOL") then {
[(localize STRING(Disabled)), (localize STRING(Enabled))] select _settingsValue; [(localize LSTRING(Disabled)), (localize LSTRING(Enabled))] select _settingsValue;
} else { } else {
(_x select 5) select _settingsValue; (_x select 5) select _settingsValue;
}; };

2
addons/overheating/XEH_postInit.sqf
View File

@ -4,7 +4,7 @@
if !(hasInterface) exitWith {}; if !(hasInterface) exitWith {};
// Add keybinds // Add keybinds
["ACE3 Weapons", QGVAR(unjamWeapon), localize STRING(UnjamWeapon), ["ACE3 Weapons", QGVAR(unjamWeapon), localize LSTRING(UnjamWeapon),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/overheating/functions/fnc_clearJam.sqf
View File

@ -52,6 +52,6 @@ if (_weapon in _jammedWeapons) then {
}; };
if (GVAR(DisplayTextOnJam)) then { if (GVAR(DisplayTextOnJam)) then {
[localize STRING(WeaponUnjammed)] call EFUNC(common,displayTextStructured); [localize LSTRING(WeaponUnjammed)] call EFUNC(common,displayTextStructured);
}; };
}; };

4
addons/overheating/functions/fnc_jamWeapon.sqf
View File

@ -62,7 +62,7 @@ if (_unit getVariable [QGVAR(JammingActionID), -1] == -1) then {
playSound3D ["a3\sounds_f\weapons\Other\dry9.wss", _this select 0]; playSound3D ["a3\sounds_f\weapons\Other\dry9.wss", _this select 0];
if (!(missionNamespace getVariable [QGVAR(knowAboutJam), false]) && {(_this select 1) ammo currentWeapon (_this select 1) > 0} && {GVAR(DisplayTextOnJam)}) then { if (!(missionNamespace getVariable [QGVAR(knowAboutJam), false]) && {(_this select 1) ammo currentWeapon (_this select 1) > 0} && {GVAR(DisplayTextOnJam)}) then {
[localize STRING(WeaponJammed)] call EFUNC(common,displayTextStructured); [localize LSTRING(WeaponJammed)] call EFUNC(common,displayTextStructured);
GVAR(knowAboutJam) = true; GVAR(knowAboutJam) = true;
}; };
}; };
@ -75,7 +75,7 @@ if (_unit getVariable [QGVAR(JammingActionID), -1] == -1) then {
[_this select 1, currentWeapon (_this select 1), false] call FUNC(clearJam); [_this select 1, currentWeapon (_this select 1), false] call FUNC(clearJam);
}; };
//_id = [_unit, format ["<t color=""#FFFF00"" >%1</t>", localize STRING(UnjamWeapon)], "DefaultAction", _condition, _statement, _condition2, _statement2, 10] call EFUNC(common,addActionMenuEventHandler); //_id = [_unit, format ["<t color=""#FFFF00"" >%1</t>", localize LSTRING(UnjamWeapon)], "DefaultAction", _condition, _statement, _condition2, _statement2, 10] call EFUNC(common,addActionMenuEventHandler);
_id = [_unit, "DefaultAction", _condition, _statement] call EFUNC(common,addActionEventHandler); _id = [_unit, "DefaultAction", _condition, _statement] call EFUNC(common,addActionEventHandler);
_unit setVariable [QGVAR(JammingActionID), _id]; _unit setVariable [QGVAR(JammingActionID), _id];

2
addons/overheating/functions/fnc_swapBarrel.sqf
View File

@ -22,4 +22,4 @@ _player playActionNow "GestureDismountMuzzle";
_player playAction "GestureMountMuzzle"; _player playAction "GestureMountMuzzle";
playSound "ACE_BarrelSwap"; playSound "ACE_BarrelSwap";
[10, [_player, _weapon], {(_this select 0) call FUNC(swapBarrelCallback)}, {}, (localize STRING(SwappingBarrel))] call EFUNC(common,progressBar); [10, [_player, _weapon], {(_this select 0) call FUNC(swapBarrelCallback)}, {}, (localize LSTRING(SwappingBarrel))] call EFUNC(common,progressBar);

2
addons/overheating/functions/fnc_swapBarrelCallback.sqf
View File

@ -16,6 +16,6 @@
EXPLODE_2_PVT(_this,_player,_weapon); EXPLODE_2_PVT(_this,_player,_weapon);
// don't consume the barrel, but rotate through them. // don't consume the barrel, but rotate through them.
[localize STRING(SwappedBarrel), QUOTE(PATHTOF(UI\spare_barrel_ca.paa))] call EFUNC(common,displayTextPicture); [localize LSTRING(SwappedBarrel), QUOTE(PATHTOF(UI\spare_barrel_ca.paa))] call EFUNC(common,displayTextPicture);
_player setVariable [format [QGVAR(%1), _weapon], [0, 0], false]; _player setVariable [format [QGVAR(%1), _weapon], [0, 0], false];

2
addons/parachute/XEH_postInit.sqf
View File

@ -17,7 +17,7 @@
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
["ACE3 Equipment", QGVAR(showAltimeter), localize STRING(showAltimeter), ["ACE3 Equipment", QGVAR(showAltimeter), localize LSTRING(showAltimeter),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/reload/XEH_postInit.sqf
View File

@ -4,7 +4,7 @@
if !(hasInterface) exitWith {}; if !(hasInterface) exitWith {};
// Add keybinds // Add keybinds
["ACE3 Weapons", QGVAR(checkAmmo), localize STRING(checkAmmo), ["ACE3 Weapons", QGVAR(checkAmmo), localize LSTRING(checkAmmo),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, (vehicle ACE_player), ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, (vehicle ACE_player), ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/reload/functions/fnc_startLinkingBelt.sqf
View File

@ -66,4 +66,4 @@ _player playActionNow "PutDown";
[_player, _magazineType, _maxAmmo] call EFUNC(common,removeSpecificMagazine); [_player, _magazineType, _maxAmmo] call EFUNC(common,removeSpecificMagazine);
// Call progress bar // Call progress bar
[4, [_player, _target, [_magazineType, _maxAmmo]], _onFinish, _onFailure, (localize STRING(LinkingBelt)), _condition] call EFUNC(common,progressBar); [4, [_player, _target, [_magazineType, _maxAmmo]], _onFinish, _onFailure, (localize LSTRING(LinkingBelt)), _condition] call EFUNC(common,progressBar);

2
addons/reloadlaunchers/functions/fnc_addMissileReloadActions.sqf
View File

@ -30,7 +30,7 @@ _loadableMissiles = [_unit, _weapon] call FUNC(getLoadableMissiles);
private ["_name", "_displayName", "_statement", "_condition", "_action"]; private ["_name", "_displayName", "_statement", "_condition", "_action"];
_name = format [QGVAR(Missile_%1), _x]; _name = format [QGVAR(Missile_%1), _x];
_displayName = format [localize STRING(LoadMagazine), getText (configFile >> "CfgMagazines" >> _x >> "displayName")]; _displayName = format [localize LSTRING(LoadMagazine), getText (configFile >> "CfgMagazines" >> _x >> "displayName")];
_statement = { _statement = {
(_this select 2) call DFUNC(load); (_this select 2) call DFUNC(load);

6
addons/reloadlaunchers/functions/fnc_load.sqf
View File

@ -34,15 +34,15 @@ _onSuccess = {
(_this select 0 select 0) removeMagazine (_this select 0 select 3); (_this select 0 select 0) removeMagazine (_this select 0 select 3);
["reloadLauncher", _this select 0 select 1, _this select 0] call DEFUNC(common,targetEvent); ["reloadLauncher", _this select 0 select 1, _this select 0] call DEFUNC(common,targetEvent);
[localize STRING(LauncherLoaded)] call DEFUNC(common,displayTextStructured); [localize LSTRING(LauncherLoaded)] call DEFUNC(common,displayTextStructured);
}; };
_onFailure = { _onFailure = {
[localize ESTRING(common,ActionAborted)] call DEFUNC(common,displayTextStructured); [localize LESTRING(common,ActionAborted)] call DEFUNC(common,displayTextStructured);
}; };
_condition = { _condition = {
(_this select 0) call DFUNC(canLoad) && {(_this select 0 select 0) distance (_this select 0 select 1) < 4} (_this select 0) call DFUNC(canLoad) && {(_this select 0 select 0) distance (_this select 0 select 1) < 4}
}; };
[_reloadTime, [_unit, _target, _weapon, _magazine], _onSuccess, _onFailure, localize STRING(LoadingLauncher), _condition] call EFUNC(common,progressBar); [_reloadTime, [_unit, _target, _weapon, _magazine], _onSuccess, _onFailure, localize LSTRING(LoadingLauncher), _condition] call EFUNC(common,progressBar);

4
addons/respawn/functions/fnc_moveRallypoint.sqf
View File

@ -38,7 +38,7 @@ if (count _position == 0) then {_position = getPosATL _unit};
_position set [2, 0]; _position set [2, 0];
[localize STRING(Deploy)] call EFUNC(common,displayTextStructured); [localize LSTRING(Deploy)] call EFUNC(common,displayTextStructured);
[{ [{
_rallypoint = _this select 0; _rallypoint = _this select 0;
@ -53,6 +53,6 @@ _position set [2, 0];
["rallypointMoved", [_rallypoint, _side, _position]] call EFUNC(common,globalEvent); ["rallypointMoved", [_rallypoint, _side, _position]] call EFUNC(common,globalEvent);
[localize STRING(Deployed)] call EFUNC(common,displayTextStructured); [localize LSTRING(Deployed)] call EFUNC(common,displayTextStructured);
}, },
[_rallypoint, _unit, _position, _rallypoint], 5, 1] call EFUNC(common,waitAndExecute); [_rallypoint, _unit, _position, _rallypoint], 5, 1] call EFUNC(common,waitAndExecute);

2
addons/respawn/functions/fnc_teleportToRallypoint.sqf
View File

@ -31,4 +31,4 @@ _rallypoint = missionNamespace getVariable [_rallypoint, objNull],
if (isNull _rallypoint) exitWith {}; if (isNull _rallypoint) exitWith {};
_unit setPosASL getPosASL _rallypoint; _unit setPosASL getPosASL _rallypoint;
[[localize STRING(TeleportedToRallypoint), localize STRING(TeleportedToBase)] select _toBase] call EFUNC(common,displayTextStructured); [[localize LSTRING(TeleportedToRallypoint), localize LSTRING(TeleportedToBase)] select _toBase] call EFUNC(common,displayTextStructured);

2
addons/safemode/XEH_postInit.sqf
View File

@ -9,7 +9,7 @@ if (!hasInterface) exitWith {};
// Add keybinds // Add keybinds
["ACE3 Weapons", QGVAR(safeMode), localize STRING(SafeMode), ["ACE3 Weapons", QGVAR(safeMode), localize LSTRING(SafeMode),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};

4
addons/safemode/functions/fnc_lockSafety.sqf
View File

@ -47,7 +47,7 @@ if (_unit getVariable [QGVAR(actionID), -1] == -1) then {
[_this select 1, currentWeapon (_this select 1), currentMuzzle (_this select 1)] call FUNC(unlockSafety); [_this select 1, currentWeapon (_this select 1), currentMuzzle (_this select 1)] call FUNC(unlockSafety);
}; };
//_id = [_unit, format ["<t color=""#FFFF00"" >%1</t>", localize STRING(TakeOffSafety)], "DefaultAction", _condition, {}, {true}, _statement, 10] call EFUNC(common,addActionMenuEventHandler); //_id = [_unit, format ["<t color=""#FFFF00"" >%1</t>", localize LSTRING(TakeOffSafety)], "DefaultAction", _condition, {}, {true}, _statement, 10] call EFUNC(common,addActionMenuEventHandler);
_id = [_unit, "DefaultAction", _condition, {}] call EFUNC(common,addActionEventHandler); _id = [_unit, "DefaultAction", _condition, {}] call EFUNC(common,addActionEventHandler);
_unit setVariable [QGVAR(actionID), _id]; _unit setVariable [QGVAR(actionID), _id];
@ -62,4 +62,4 @@ if ((typeName _muzzle) == (typeName "")) then {
private "_picture"; private "_picture";
_picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture");
[localize STRING(PutOnSafety), _picture] call EFUNC(common,displayTextPicture); [localize LSTRING(PutOnSafety), _picture] call EFUNC(common,displayTextPicture);

2
addons/safemode/functions/fnc_unlockSafety.sqf
View File

@ -59,4 +59,4 @@ if (inputAction "nextWeapon" > 0) then {
private "_picture"; private "_picture";
_picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture");
[localize STRING(TookOffSafety), _picture] call EFUNC(common,displayTextPicture); [localize LSTRING(TookOffSafety), _picture] call EFUNC(common,displayTextPicture);

16
addons/scopes/XEH_postInit.sqf
View File

@ -33,7 +33,7 @@ if !(hasInterface) exitWith {};
// Add keybinds // Add keybinds
["ACE3 Scope Adjustment", QGVAR(AdjustUpMinor), localize STRING(AdjustUpMinor), ["ACE3 Scope Adjustment", QGVAR(AdjustUpMinor), localize LSTRING(AdjustUpMinor),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -46,7 +46,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[201, [false, false, false]], true] call cba_fnc_addKeybind; [201, [false, false, false]], true] call cba_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustDownMinor), localize STRING(AdjustDownMinor), ["ACE3 Scope Adjustment", QGVAR(AdjustDownMinor), localize LSTRING(AdjustDownMinor),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -59,7 +59,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[209, [false, false, false]], true] call cba_fnc_addKeybind; [209, [false, false, false]], true] call cba_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustLeftMinor), localize STRING(AdjustLeftMinor), ["ACE3 Scope Adjustment", QGVAR(AdjustLeftMinor), localize LSTRING(AdjustLeftMinor),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -72,7 +72,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[209, [false, true, false]], true] call cba_fnc_addKeybind; [209, [false, true, false]], true] call cba_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustRightMinor), localize STRING(AdjustRightMinor), ["ACE3 Scope Adjustment", QGVAR(AdjustRightMinor), localize LSTRING(AdjustRightMinor),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -85,7 +85,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[201, [false, true, false]], true] call cba_fnc_addKeybind; [201, [false, true, false]], true] call cba_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustUpMajor), localize STRING(AdjustUpMajor), ["ACE3 Scope Adjustment", QGVAR(AdjustUpMajor), localize LSTRING(AdjustUpMajor),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -98,7 +98,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[201, [true, false, false]], true] call cba_fnc_addKeybind; [201, [true, false, false]], true] call cba_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustDownMajor), localize STRING(AdjustDownMajor), ["ACE3 Scope Adjustment", QGVAR(AdjustDownMajor), localize LSTRING(AdjustDownMajor),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -111,7 +111,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[209, [true, false, false]], true] call cba_fnc_addKeybind; [209, [true, false, false]], true] call cba_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustLeftMajor), localize STRING(AdjustLeftMajor), ["ACE3 Scope Adjustment", QGVAR(AdjustLeftMajor), localize LSTRING(AdjustLeftMajor),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -124,7 +124,7 @@ if !(hasInterface) exitWith {};
{false}, {false},
[209, [true, true, false]], true] call cba_fnc_addKeybind; [209, [true, true, false]], true] call cba_fnc_addKeybind;
["ACE3 Scope Adjustment", QGVAR(AdjustRightMajor), localize STRING(AdjustRightMajor), ["ACE3 Scope Adjustment", QGVAR(AdjustRightMajor), localize LSTRING(AdjustRightMajor),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

4
addons/switchunits/functions/fnc_switchUnit.sqf
View File

@ -41,7 +41,7 @@ if (GVAR(EnableSafeZone)) then {
// exitWith doesn't exit past the "if(EnableSafeZone)" block // exitWith doesn't exit past the "if(EnableSafeZone)" block
if (_leave) exitWith { if (_leave) exitWith {
[localize STRING(TooCloseToEnemy)] call EFUNC(common,displayTextStructured); [localize LSTRING(TooCloseToEnemy)] call EFUNC(common,displayTextStructured);
}; };
// should switch locality // should switch locality
@ -88,7 +88,7 @@ DFUNC(pfhSwitchUnit) = {
[[_oldUnit, _oldOwner], QUOTE({(_this select 0) setOwner (_this select 1)}), 1] call EFUNC(common,execRemoteFnc); [[_oldUnit, _oldOwner], QUOTE({(_this select 0) setOwner (_this select 1)}), 1] call EFUNC(common,execRemoteFnc);
}; };
[localize STRING(SwitchedUnit)] call EFUNC(common,displayTextStructured); [localize LSTRING(SwitchedUnit)] call EFUNC(common,displayTextStructured);
[(_this select 1)] call cba_fnc_removePerFrameHandler; [(_this select 1)] call cba_fnc_removePerFrameHandler;

4
addons/vector/initKeybinds.sqf
View File

@ -1,6 +1,6 @@
// by commy2 // by commy2
["ACE3 Equipment", QGVAR(AzimuthKey), localize STRING(AzimuthKey), ["ACE3 Equipment", QGVAR(AzimuthKey), localize LSTRING(AzimuthKey),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -29,7 +29,7 @@
[15, [false, false, false]], false, 0] call CBA_fnc_addKeybind; //Tab Key [15, [false, false, false]], false, 0] call CBA_fnc_addKeybind; //Tab Key
["ACE3 Equipment", QGVAR(DistanceKey), localize STRING(DistanceKey), ["ACE3 Equipment", QGVAR(DistanceKey), localize LSTRING(DistanceKey),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/vehiclelock/functions/fnc_lockpick.sqf
View File

@ -54,7 +54,7 @@ case (_funcType == "canLockpick"): {
_returnValue = true; _returnValue = true;
}; };
case (_funcType == "startLockpick"): { case (_funcType == "startLockpick"): {
[_vehLockpickStrenth, [_unit, _veh, "finishLockpick"], {(_this select 0) call FUNC(lockpick)}, {}, (localize STRING(Action_LockpickInUse)), _condition] call EFUNC(common,progressBar); [_vehLockpickStrenth, [_unit, _veh, "finishLockpick"], {(_this select 0) call FUNC(lockpick)}, {}, (localize LSTRING(Action_LockpickInUse)), _condition] call EFUNC(common,progressBar);
_returnValue = true; _returnValue = true;
}; };
case (_funcType == "finishLockpick"): { case (_funcType == "finishLockpick"): {

2
addons/vehicles/XEH_postInit.sqf
View File

@ -4,7 +4,7 @@
if !(hasInterface) exitWith {}; if !(hasInterface) exitWith {};
// Add keybinds // Add keybinds
["ACE3 Vehicles", QGVAR(speedLimiter), localize STRING(SpeedLimiter), ["ACE3 Vehicles", QGVAR(speedLimiter), localize LSTRING(SpeedLimiter),
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isnotinside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isnotinside"]] call EFUNC(common,canInteractWith)) exitWith {false};

4
addons/vehicles/functions/fnc_speedLimiter.sqf
View File

@ -7,12 +7,12 @@ _driver = _this select 0;
_vehicle = _this select 1; _vehicle = _this select 1;
if (GETGVAR(isSpeedLimiter,false)) exitWith { if (GETGVAR(isSpeedLimiter,false)) exitWith {
[localize STRING(Off)] call EFUNC(common,displayTextStructured); [localize LSTRING(Off)] call EFUNC(common,displayTextStructured);
playSound "ACE_Sound_Click"; playSound "ACE_Sound_Click";
GVAR(isSpeedLimiter) = false; GVAR(isSpeedLimiter) = false;
}; };
[localize STRING(On)] call EFUNC(common,displayTextStructured); [localize LSTRING(On)] call EFUNC(common,displayTextStructured);
playSound "ACE_Sound_Click"; playSound "ACE_Sound_Click";
GVAR(isSpeedLimiter) = true; GVAR(isSpeedLimiter) = true;

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