%1", _notificationText]; + _notificationText = format ["
%1", _notificationText];// TODO: localize "STR_A3A_fn_base_caclaggro_levelchange" for the "Aggression level changed" part [petros, "income", _notificationText] remoteExec ["A3A_fnc_commsMP", [teamPlayer, civilian]]; }; }; diff --git a/A3A/addons/core/functions/Base/fn_canMoveHQ.sqf b/A3A/addons/core/functions/Base/fn_canMoveHQ.sqf index 26c387c18b..db6f51a323 100644 --- a/A3A/addons/core/functions/Base/fn_canMoveHQ.sqf +++ b/A3A/addons/core/functions/Base/fn_canMoveHQ.sqf @@ -21,28 +21,30 @@ Example: */ private _result = [false]; +private _titleStr = localize "STR_A3A_fn_base_canmovehq_title"; + if (player != theBoss) then { - ["Move HQ", "Only our Commander has access to this function."] call A3A_fnc_customHint; - _result pushBack "Commander only"; + [_titleStr, localize "STR_A3A_fn_base_canmovehq_no_comm"] call A3A_fnc_customHint; + _result pushBack "Commander only";// TODO: localize "STR_A3A_fn_base_canmovehq_comm_only" }; if ((count weaponCargo boxX >0) or (count magazineCargo boxX >0) or (count itemCargo boxX >0) or (count backpackCargo boxX >0)) then { if(count _result == 1) then { - ["Move HQ", "You must first empty your Arsenal inventory in order to move the HQ."] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_canmovehq_no_empty1"] call A3A_fnc_customHint; }; - _result pushBack "Arsenal inventory must be empty"; + _result pushBack "Arsenal inventory must be empty";// TODO: localize "STR_A3A_fn_base_canmovehq_no_empty2" }; if !(isNull attachedTo petros) then { if(count _result == 1) then { - ["Move HQ", "Put Petros down before you move the HQ!"] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_canmovehq_petros_down"] call A3A_fnc_customHint; }; - _result pushBack "Petros currently picked up"; + _result pushBack "Petros currently picked up";// TODO: localize "STR_A3A_fn_base_canmovehq_petros_pickedup" }; if(count _result != 1) exitWith diff --git a/A3A/addons/core/functions/Base/fn_commsMP.sqf b/A3A/addons/core/functions/Base/fn_commsMP.sqf index 07aef92664..8606816e21 100644 --- a/A3A/addons/core/functions/Base/fn_commsMP.sqf +++ b/A3A/addons/core/functions/Base/fn_commsMP.sqf @@ -12,15 +12,15 @@ if (_typeX == "sideChat") then if (_typeX == "hint") then {[_titleX, format ["%1",_textX]] call A3A_fnc_customHint;}; if (_typeX == "hintCS") then {hintC format ["%1",_textX]}; if (_typeX == "hintS") then {[_titleX, format ["%1",_textX], true] call A3A_fnc_customHint;}; -if (_typeX == "intelError") then {[_titleX, format ["Download error:
%1",_textX]] call A3A_fnc_customHint;}; +if (_typeX == "intelError") then {[_titleX, format [localize "STR_A3A_fn_base_commsmp_error",_textX]] call A3A_fnc_customHint;}; if (_typeX == "globalChat") then { _unit globalChat format ["%1", _textX]; }; if (_typeX == "countdown") then { - _textX = format ["Time Remaining: %1 secs",_textX]; - ["Countdown", format ["%1",_textX]] call A3A_fnc_customHint; + _textX = format [localize "STR_A3A_fn_base_commsmp_remaining",_textX]; + [localize "STR_A3A_fn_base_commsmp_countdown", format ["%1",_textX]] call A3A_fnc_customHint; }; private _layer = ["A3A_infoRight"] call BIS_fnc_rscLayer; @@ -55,7 +55,7 @@ if (_typeX == "tier") then //playSound3D ["a3\sounds_f\sfx\beep_target.wss", player]; playSound "3DEN_notificationDefault"; //[_textX,0.8,0.5,5,0,0,2] spawn bis_fnc_dynamicText; - _textX = format ["War Level Changed
Current Level: %1",tierWar]; + _textX = format ["War Level Changed
Current Level: %1",tierWar]; // TODO: localize "STR_A3A_fn_base_commsmp_warlvlchange" [_textX, [safeZoneX + (0.8 * safeZoneW), (0.2 * safeZoneW)], 0.5, 5, 0, 0, _layer] spawn bis_fnc_dynamicText; incomeRep = false; [] spawn A3A_fnc_statistics; diff --git a/A3A/addons/core/functions/Base/fn_createOutpostsFIA.sqf b/A3A/addons/core/functions/Base/fn_createOutpostsFIA.sqf index d57984a2c4..1b8b331286 100644 --- a/A3A/addons/core/functions/Base/fn_createOutpostsFIA.sqf +++ b/A3A/addons/core/functions/Base/fn_createOutpostsFIA.sqf @@ -7,7 +7,7 @@ private ["_typeX","_costs","_groupX","_unit","_radiusX","_roads","_road","_pos", _typeX = _this select 0; _positionTel = _this select 1; -if (_typeX == "delete") exitWith {["Create Outpost", "Deprecated option. Use Remove Garrison from HQ instead."] call A3A_fnc_customHint;}; +if (_typeX == "delete") exitWith {[localize "STR_A3A_fn_base_createoutpfia_create", localize "STR_A3A_fn_base_createoutpfia_outdated"] call A3A_fnc_customHint;}; _isRoad = isOnRoad _positionTel; diff --git a/A3A/addons/core/functions/Base/fn_createPetros.sqf b/A3A/addons/core/functions/Base/fn_createPetros.sqf index d827d15f73..3d2f1fc499 100644 --- a/A3A/addons/core/functions/Base/fn_createPetros.sqf +++ b/A3A/addons/core/functions/Base/fn_createPetros.sqf @@ -16,7 +16,13 @@ if (isNil "_location") then { }; private _oldPetros = petros; -petros = [_groupPetros, FactionGet(reb,"unitPetros"), _location, [], 10, "NONE"] call A3A_fnc_createUnit; +private _identity = createHashMapFromArray [ + ["firstName", "Petros"], + ["face", "GreekHead_A3_01"], + ["speaker", "Male06GRE"], + ["pitch", 1.1] +]; +petros = [_groupPetros, FactionGet(reb,"unitPetros"), _location, [], 10, "NONE", _identity] call A3A_fnc_createUnit; publicVariable "petros"; deleteVehicle _oldPetros; // Petros should now be leader unless there's a player in the group diff --git a/A3A/addons/core/functions/Base/fn_flagaction.sqf b/A3A/addons/core/functions/Base/fn_flagaction.sqf index 52e3018fb8..051595999c 100644 --- a/A3A/addons/core/functions/Base/fn_flagaction.sqf +++ b/A3A/addons/core/functions/Base/fn_flagaction.sqf @@ -12,38 +12,38 @@ switch _typeX do case "take": { removeAllActions _flag; - _actionX = _flag addAction ["
Last GC was " + _timeSinceLastGC + " ago."] remoteExec ["A3A_fnc_customHint", 0]; +[localize "STR_A3A_fn_base_gc_title", format [localize "STR_A3A_fn_base_gc_wait", _timeSinceLastGC]] remoteExec ["A3A_fnc_customHint", 0]; Info("Cleaning garbage..."); private _rebelSpawners = units teamPlayer select { _x getVariable ["spawner",false] }; @@ -27,11 +27,31 @@ private _fnc_distCheck = { if !(_x isKindOf "StaticWeapon" or unitIsUAV _x or locked _x > 1) then { [_x, 500] call _fnc_distCheck }; } forEach (vehicles select {_x getVariable ["ownerSide", sideUnknown] == teamPlayer}); +// Cleanup constructed buildings +private _rebMarkers = (airportsX + outposts + seaports + factories + resourcesX) select { sidesX getVariable _x == teamPlayer }; +_rebMarkers append outpostsFIA; _rebMarkers pushBack "Synd_HQ"; + +A3A_buildingsToSave = A3A_buildingsToSave select { + // Keep if there are rebel spawners within 500m + if (_rebelSpawners inAreaArray [getPosATL _x, 500, 500] isNotEqualTo []) then { continueWith true }; + + // Delete if outside mission distance (temporary) + if (_x distance2d markerPos "Synd_HQ" > distanceMission) then { deleteVehicle _x; continueWith false }; + + // Delete if not within a rebel marker + private _building = _x; + private _indexes = _rebMarkers inAreaArrayIndexes [getPosATL _x, 500, 500]; + if (-1 != _indexes findIf { _building inArea _rebMarkers#_x } ) then { continueWith true }; + deleteVehicle _x; false; +}; + + if (A3A_hasACE) then { { deleteVehicle _x } forEach (allMissionObjects "ACE_bodyBagObject"); { deleteVehicle _x } forEach (allMissionObjects "UserTexture1m_F"); // ACE spraycan tags { deleteVehicle _x } forEach (allMissionObjects "ace_cookoff_Turret_MBT_01"); //MBT turret wrecks { deleteVehicle _x } forEach (allMissionObjects "ace_cookoff_Turret_MBT_02"); + { [_x, 200] call _fnc_distCheck } forEach (allMissionObjects "ACE_Grave"); { [_x, 200] call _fnc_distCheck } forEach (allMissionObjects "ACE_envelope_big"); // ACE trench objects { [_x, 200] call _fnc_distCheck } forEach (allMissionObjects "ACE_envelope_small"); }; @@ -56,7 +76,8 @@ if (isClass (configFile/"CfgPatches"/"rhsgref_main")) then {//ToDo: these should }; + // Do not localise timeSpan, it is broadcast to all connected clients. -["Garbage Cleaner","Garbage Deleted.
Last GC was " + _timeSinceLastGC + " ago."] remoteExec ["A3A_fnc_customHint", 0]; +[localize "STR_A3A_fn_base_gc_title", format [localize "STR_A3A_fn_base_gc_deleted", _timeSinceLastGC]] remoteExec ["A3A_fnc_customHint", 0]; missionNamespace setVariable ["A3A_lastGarbageCleanTime",serverTime,true]; Info("Garbage clean completed"); diff --git a/A3A/addons/core/functions/Base/fn_garbageCleanerTracker.sqf b/A3A/addons/core/functions/Base/fn_garbageCleanerTracker.sqf index 0cbed150a6..e4bc44c261 100644 --- a/A3A/addons/core/functions/Base/fn_garbageCleanerTracker.sqf +++ b/A3A/addons/core/functions/Base/fn_garbageCleanerTracker.sqf @@ -1,6 +1,6 @@ #include "..\..\script_component.hpp" /* -Author: [Killerswin2] +Author: Killerswin2, Giddi Automatic/backup garbage cleaner with fix time slices Arguments: NONE @@ -15,30 +15,163 @@ Dependencies: None Example: */ -#define GC_THRESHOLD_DISABLE 9999999 + +#define GC_THRESHOLD_DISABLE 0 + +#define GC_NOTIFY_CHECK_INTERVAL 10 + +#define GC_FINAL_WARNING_SECONDS 120 + +#define GC_QUEUE_SENTINEL_TIME -1 + + if(!isServer) exitWith {}; if(A3A_GCThreshold isEqualTo GC_THRESHOLD_DISABLE) exitWith {}; -while {true} do -{ - // notify players of last gc time - if ((serverTime-A3A_lastGarbageCleanTimeNote) > (A3A_GCThreshold / 4)) then - { - private _timeSinceLastGC = [[serverTime-A3A_lastGarbageCleanTime] call A3A_fnc_secondsToTimeSpan,0,0,false,2] call A3A_fnc_timeSpan_format; - [localize "STR_A3A_GCTracker_tracker_title", format [localize "STR_A3A_GCTracker_tracker_notification", _timeSinceLastGC]] remoteExec ["A3A_fnc_customHint", 0]; - missionNamespace setVariable ["A3A_lastGarbageCleanTimeNote",serverTime,true]; - Info_1("Garbage Cleaner Tracker has notified players of last gc time %1", _timeSinceLastGC); + +// store the value of the last garbage clean so it can be checked if it changed. +private _storedLastGCTime = A3A_lastGarbageCleanTime; + + +// initialize some later needed variables. +private _contextQueue = []; + +private _currentContext = []; + + + + +private _fnc_conditionalSleep = { + // returns true if the condition turned true at any time and false if it rant until _targetTime + // done this way to be able to immediatley register when a manual GC was done. + + private _returnValue = false; + + // end-time can be changed to be a parameter if necessary + private _targetEndTime = serverTime + GC_NOTIFY_CHECK_INTERVAL; + + while {serverTime < _targetEndTime} do { + + if (_storedLastGCTime isNotEqualTo A3A_lastGarbageCleanTime) then { + _returnValue = true; + break; + }; + + uiSleep 2; }; - // if the gc time goes above the threshold then it's time to gc. - if ((serverTime-A3A_lastGarbageCleanTime) > A3A_GCThreshold) then - { - [] call A3A_fnc_garbageCleaner; - [localize "STR_A3A_GCTracker_tracker_title", localize "STR_A3A_GCTracker_tracker_ran_gc"] remoteExec ["A3A_fnc_customHint", 0]; - Info("Garbage Cleaner Tracker has ran a gc as players reached threshold"); + + _returnValue; +}; + + + +private _fnc_onRemind = { + + private _timeSinceLastGC = [[serverTime-A3A_lastGarbageCleanTime] call A3A_fnc_secondsToTimeSpan,0,0,false,2] call A3A_fnc_timeSpan_format; + private _timeUntilForcedGC = [[(A3A_lastGarbageCleanTime + A3A_GCThreshold)-serverTime] call A3A_fnc_secondsToTimeSpan,0,0,false,2] call A3A_fnc_timeSpan_format; + [localize "STR_A3A_GCTracker_tracker_title", format [localize "STR_A3A_GCTracker_tracker_notification", _timeSinceLastGC, _timeUntilForcedGC]] remoteExec ["A3A_fnc_customHint", 0]; + Debug_2("Garbage Cleaner Tracker has notified players of last gc time %1 and time until forced gc %2", _timeSinceLastGC, _timeUntilForcedGC); +}; + + +private _fnc_onFinalWarning = { + + private _timeUntilForcedGC = [[(A3A_lastGarbageCleanTime + A3A_GCThreshold)-serverTime] call A3A_fnc_secondsToTimeSpan,0,0,false,2] call A3A_fnc_timeSpan_format; + [localize "STR_A3A_GCTracker_warning_title", format [localize "STR_A3A_GCTracker_warning_text", _timeUntilForcedGC]] remoteExec ["A3A_fnc_customHint", 0]; + Debug("Garbage Cleaner Tracker has notified players of finalWarning for auto GC"); + +}; + + + +private _fnc_onAutoGC = { + + [] call A3A_fnc_garbageCleaner; + [localize "STR_A3A_GCTracker_tracker_title", localize "STR_A3A_GCTracker_tracker_ran_gc"] remoteExec ["A3A_fnc_customHint", 0]; + + private _timeSinceLastGC = [[serverTime-A3A_lastGarbageCleanTime] call A3A_fnc_secondsToTimeSpan,0,0,false,2] call A3A_fnc_timeSpan_format; + + Debug_2("Garbage Cleaner Tracker has ran a gc as players reached threshold, time since last gc: %1", _timeSinceLastGC); +}; + +// Noop function just to be safe and to not break the Context Queue format. +private _fnc_noOp = { + +}; + + + +private _fnc_getNewContextQueue = { + // creates the context queue, to modify the beaviour of the tracker, only this function has to be edited + // basically a context queue factory function + private _singleStepTime = (A3A_GCThreshold/4); + + + // ensure that the final warning actually happens after the last reminder, currently not that important but could be if the preset thresholds change + private _actualWarningSeconds = GC_FINAL_WARNING_SECONDS min (_singleStepTime/2); + + + // context queue is an array that consists of sub arrays of [trigger time, function to call] + // last context always has to be the Sentinel context aka [GC_QUEUE_SENTINEL_TIME, _noOp] + private _returnValue = [ + [A3A_lastGarbageCleanTime + (_singleStepTime*1), _fnc_onRemind], + [A3A_lastGarbageCleanTime + (_singleStepTime*2), _fnc_onRemind], + [A3A_lastGarbageCleanTime + (_singleStepTime*3), _fnc_onRemind], + [(A3A_lastGarbageCleanTime + A3A_GCThreshold)-_actualWarningSeconds, _fnc_onFinalWarning], + [A3A_lastGarbageCleanTime+A3A_GCThreshold, _fnc_onAutoGC], + [GC_QUEUE_SENTINEL_TIME, _fnc_noOp] + ]; + + + + _returnValue; +}; + +private _fnc_resetTracker = { + // resets everything after a GC happened or initially sets everything up + + + // reset the stored GC Time as it most likely has changed. + _storedLastGCTime = A3A_lastGarbageCleanTime; + + // generate a completely new context queue from the context queue factory function + _contextQueue = call _fnc_getNewContextQueue; + + // pre-select the current context as to not have to do it each time the loop checks if it has to trigger + _currentContext = _contextQueue select 0; + + Debug("Reseted GC Tracker"); +}; + +// initially fill the context Queue +call _fnc_resetTracker; + + +// event-loop +while {true} do { + + // sleeps for the CHECK_INTERVAL, but also return sooner if it detects that a GC happened. If GC happened, we reset the context queue. + if (call _fnc_conditionalSleep) then { + call _fnc_resetTracker; }; - sleep (A3A_GCThreshold / 4); -}; \ No newline at end of file + // if we ever enter a state where the last context (auto-gc) was used but the queue was not reset, then we do nothing. + if ((_currentContext select 0) isEqualTo GC_QUEUE_SENTINEL_TIME) then { + Error("Context Queue ran out without triggering a GC, something went wrong"); + continue; + }; + + // actuall main logic, checks if the set time of the top item in the queue is in the past, if yes it executes the associated function + // then removes the top most item from the queue and sets the new top most as current. + if (serverTime >= (_currentContext select 0)) then { + call (_currentContext select 1); + _contextQueue deleteAt 0; + _currentContext = _contextQueue select 0; + + }; + + +}; diff --git a/A3A/addons/core/functions/Base/fn_garrisonInfo.sqf b/A3A/addons/core/functions/Base/fn_garrisonInfo.sqf index 6a767365c1..4b4b8186fd 100644 --- a/A3A/addons/core/functions/Base/fn_garrisonInfo.sqf +++ b/A3A/addons/core/functions/Base/fn_garrisonInfo.sqf @@ -44,6 +44,6 @@ _textX = format [ , {_x distance _positionX < _size} count staticsToSave , _estatic , if (_limit != -1) then {format ["/%1", _limit]} else {""} -]; +]; //TODO: Localize _textX diff --git a/A3A/addons/core/functions/Base/fn_getVehiclesGroundSupport.sqf b/A3A/addons/core/functions/Base/fn_getVehiclesGroundSupport.sqf index a47608f903..592386ebcb 100644 --- a/A3A/addons/core/functions/Base/fn_getVehiclesGroundSupport.sqf +++ b/A3A/addons/core/functions/Base/fn_getVehiclesGroundSupport.sqf @@ -23,17 +23,23 @@ private _vehWeights = []; private _milCarWeight = [50, 40, 30, 20, 10, 0, 0, 0, 0, 0] select _level; private _carWeight = [50, 50, 50, 50, 50, 50, 50, 40, 35, 30] select _level; private _aaWeight = [ 0, 0, 3, 5, 7, 8, 10, 12, 13, 14] select _level; -private _tankWeight = [ 0, 5, 10, 15, 20, 25, 30, 35, 40, 50] select _level; +private _ltWeight = [ 0, 5, 7, 9, 10, 11, 12, 13, 14, 15] select _level; +private _tankWeight = [ 0, 0, 3, 6, 10, 14, 18, 22, 26, 35] select _level; // filter out weak AA that shouldn't be tier-scaled (eg. Avenger, zu23) private _vehAA = (_faction get "vehiclesAA") select { A3A_vehicleResourceCosts get _x >= 100 }; if (_vehAA isEqualTo []) then { _tankWeight = _tankWeight + _aaWeight }; +// Only one of these two is mandatory +if (_faction get "vehiclesLightTanks" isEqualTo []) then { _tankWeight = _tankWeight + _ltWeight }; +if (_faction get "vehiclesTanks" isEqualTo []) then { _ltWeight = _ltWeight + _tankWeight }; + // only occupants use militia vehicles? if (_side == Occupants) then { [_faction get "vehiclesMilitiaLightArmed", _milCarWeight] call _fnc_addArrayToWeights; }; [_faction get "vehiclesLightArmed", _carWeight] call _fnc_addArrayToWeights; +[_faction get "vehiclesLightTanks", _ltWeight] call _fnc_addArrayToWeights; [_faction get "vehiclesTanks", _tankWeight] call _fnc_addArrayToWeights; [_vehAA, _aaWeight] call _fnc_addArrayToWeights; diff --git a/A3A/addons/core/functions/Base/fn_initPetros.sqf b/A3A/addons/core/functions/Base/fn_initPetros.sqf index 36ec37dbba..7bb8339c01 100644 --- a/A3A/addons/core/functions/Base/fn_initPetros.sqf +++ b/A3A/addons/core/functions/Base/fn_initPetros.sqf @@ -7,8 +7,6 @@ petros setSkill 1; petros setVariable ["respawning",false]; petros allowDamage false; -[petros, "GreekHead_A3_01", "Male06GRE", 1.1, "Petros"] call A3A_fnc_setIdentity; - removeHeadgear petros; removeGoggles petros; private _vest = selectRandomWeighted (A3A_rebelGear get "ArmoredVests"); diff --git a/A3A/addons/core/functions/Base/fn_localizar.sqf b/A3A/addons/core/functions/Base/fn_localizar.sqf index facd71a32c..0dabc6f12c 100644 --- a/A3A/addons/core/functions/Base/fn_localizar.sqf +++ b/A3A/addons/core/functions/Base/fn_localizar.sqf @@ -14,24 +14,24 @@ if (_siteX in citiesX) then else { _city = [citiesX,_pos] call BIS_fnc_nearestPosition; - if (_siteX in airportsX) then {_textX = format ["%1 Airbase",_city]}; - if (_siteX in resourcesX) then {_textX = format ["Resource near %1",_city]}; - if (_siteX in factories) then {_textX = format ["Factory near %1",_city]}; - if (_siteX in outposts) then {_textX = format ["Outpost near %1",_city]}; - if (_siteX in seaports) then {_textX = format ["Seaport near %1",_city]}; + if (_siteX in airportsX) then {_textX = format ["%1 Airbase",_city]}; //TODO: Localize + if (_siteX in resourcesX) then {_textX = format ["Resource near %1",_city]}; //TODO: Localize + if (_siteX in factories) then {_textX = format ["Factory near %1",_city]}; //TODO: Localize + if (_siteX in outposts) then {_textX = format ["Outpost near %1",_city]}; //TODO: Localize + if (_siteX in seaports) then {_textX = format ["Seaport near %1",_city]}; //TODO: Localize if (_siteX in controlsX) then { if (isOnRoad getMarkerPos _siteX) then { - _textX = format ["Roadblock near %1",_city] + _textX = format ["Roadblock near %1",_city] //TODO: Localize } else { - _textX = format ["Forest near %1",_city] + _textX = format ["Forest near %1",_city] //TODO: Localize }; } else{ - if ((_siteX == "NATO_carrier") or (_siteX == "CSAT_carrier")) then {_textX = "their carrier"}; + if ((_siteX == "NATO_carrier") or (_siteX == "CSAT_carrier")) then {_textX = "their carrier"}; //TODO: Localize }; }; _textX \ No newline at end of file diff --git a/A3A/addons/core/functions/Base/fn_markerChange.sqf b/A3A/addons/core/functions/Base/fn_markerChange.sqf index 95cb7197b6..8a941fd865 100644 --- a/A3A/addons/core/functions/Base/fn_markerChange.sqf +++ b/A3A/addons/core/functions/Base/fn_markerChange.sqf @@ -355,4 +355,4 @@ else markersChanging = markersChanging - [_markerX]; ["markerChange", [_markerX, _winner]] call EFUNC(Events,triggerEvent); -Debug_1("Finished marker change at %1", _markerX); +Debug_1("Finished marker change at %1", _markerX); \ No newline at end of file diff --git a/A3A/addons/core/functions/Base/fn_moveHQ.sqf b/A3A/addons/core/functions/Base/fn_moveHQ.sqf index d7fde5cea4..07b75e6906 100644 --- a/A3A/addons/core/functions/Base/fn_moveHQ.sqf +++ b/A3A/addons/core/functions/Base/fn_moveHQ.sqf @@ -29,6 +29,8 @@ Example: #include "..\..\script_component.hpp" FIX_LINE_NUMBERS() private _possible = [] call A3A_fnc_canMoveHQ; +private _titleStr = localize "STR_A3A_fn_base_movehq_garrison"; + if !(_possible#0) exitWith {}; private _groupPetros = group petros; @@ -53,7 +55,7 @@ if (count _garrison > 0) then private _hr = 0; if (allUnits findIf {(alive _x) && (!captive _x) && ((side (group _x) == Occupants) || (side (group _x) == Invaders)) && {_x distance2D _posHQ < 500}} != -1) then { - ["Garrison", "HQ Garrison will stay here and distract the enemy."] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_movehq_stay"] call A3A_fnc_customHint; //Is there a despawn routine attached to them? //Why are they getting refunded if they stay? } @@ -94,7 +96,7 @@ if (count _garrison > 0) then } forEach _garrison; [_hr,_costs] remoteExec ["A3A_fnc_resourcesFIA",2]; garrison setVariable ["Synd_HQ",[],true]; - ["Garrison", format ["Garrison removed
Recovered Money: %1 €
Recovered HR: %2",_costs,_hr]] call A3A_fnc_customHint; + [_titleStr, format [localize "STR_A3A_fn_base_movehq_removed",_costs,_hr]] call A3A_fnc_customHint; }; sleep 5; diff --git a/A3A/addons/core/functions/Base/fn_mrkWIN.sqf b/A3A/addons/core/functions/Base/fn_mrkWIN.sqf index 1080d8c49f..5d781aea2b 100644 --- a/A3A/addons/core/functions/Base/fn_mrkWIN.sqf +++ b/A3A/addons/core/functions/Base/fn_mrkWIN.sqf @@ -21,6 +21,8 @@ Example: #include "..\..\script_component.hpp" FIX_LINE_NUMBERS() +private _titleStr = localize "STR_A3A_fn_base_mrkwin_title"; + params ["_target","_caller","_actionID","_argument"]; if (_caller isNotEqualTo player) exitWith { @@ -37,8 +39,8 @@ private _outpostGridSquare = ((_markerPos#0 toFixed 0) call A3A_fnc_pad_3Digits) if (sidesX getVariable [_markerX,sideUnknown] == teamPlayer) exitWith {}; if !(player call A3A_fnc_canFight) exitWith { ServerError("Action somehow used by dead or unconscious player?") }; -if (captive player) exitWith {["Capture", "You cannot Capture the Flag while Undercover."] call A3A_fnc_customHint;}; -if ((_markerX in airportsX) and (tierWar < 3)) exitWith {["Capture", "You cannot capture Airports until you reach War Level 3."] call A3A_fnc_customHint;}; +if (captive player) exitWith {[_titleStr, localize "STR_A3A_fn_base_mrkwin_no_undercover"] call A3A_fnc_customHint;}; +if ((_markerX in airportsX) and (tierWar < 3)) exitWith {[_titleStr, localize "STR_A3A_fn_base_mrkwin_no_wl3"] call A3A_fnc_customHint;}; // This damn ineffective multiplayer lock will be fixed with a future library addition. Not worth the effort to fix At the Moment. - C.Serafin //Check if the flag is locked @@ -47,7 +49,7 @@ if(_flagCaptureETA > serverTime) exitWith { private _timeSpan = [_flagCaptureETA - serverTime] call A3A_fnc_secondsToTimeSpan; private _secondsLeftString = [_timeSpan,0,0,false,1] call A3A_fnc_timeSpan_format; // Only print most significant quantity. - ["Capture", "Flag pole being used, wait "+_secondsLeftString+"."] call A3A_fnc_customHint; + [_titleStr, format [localize "STR_A3A_fn_base_mrkwin_used", _secondsLeftString]] call A3A_fnc_customHint; }; //Lock the flag _flagX setVariable ["A3A_flagCaptureETA", serverTime + 10, true]; @@ -78,10 +80,10 @@ if (_enemyValue > 2*_rebelValue) exitWith { ServerInfo_4("Outpost at %1 (%2): Flag capture cancelled due to enemy value (%3) greater than 2*rebel value (%4)", _outpostGridSquare, _markerX, _enemyValue, _rebelValue); if (difficultyOption "mapContentEnemy" == 1) then { - ["Capture", "The enemy still lurks about. Check your map and clear the area."] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_mrkwin_lurk_check"] call A3A_fnc_customHint; } else { // Remove map quote due to immersive difficulty. - ["Capture", "The enemy still lurks about. Hunt them down and clear the area."] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_mrkwin_lurk_hunt"] call A3A_fnc_customHint; } }; @@ -90,21 +92,21 @@ A3A_isPlayerCapturingFlag = true; player playMove "MountSide"; private _cancellationToken = [false]; -private _cancelActionID = player addAction ["Abort Outpost Capture", +private _cancelActionID = player addAction [localize "STR_A3A_fn_base_mrkwin_addact_abortCapture", { params ["_target","_caller","_actionID","_cancellationToken"]; _cancellationToken set [0, true]; A3A_isPlayerCapturingFlag = nil; player switchMove ""; player removeAction _actionID; - ["Capture", "Aborted Outpost Capture"] call A3A_fnc_customHint; + [localize "STR_A3A_fn_base_mrkwin_title", localize "STR_A3A_fn_base_mrkwin_abort"] call A3A_fnc_customHint; }, _cancellationToken]; // returnflag Icon should be 1.5 tiems bigger than takeflag icon. 2 * 1.5 = 3 player setUserActionText [_cancelActionID,"Aborted Outpost Capture","
Remember: to build Roadblocks you must click exactly on a road map section."] call A3A_fnc_customHint;} else {["Watchposts/Roadblocks", "Click on the Watchpost or Roadblock to delete."] call A3A_fnc_customHint;}; +if (_typeX != "delete") then {[_titleStr, localize "STR_A3A_fn_base_outpdiag_click_position"] call A3A_fnc_customHint;} +else {[_titleStr, localize "STR_A3A_fn_base_outpdiag_click_delete"] call A3A_fnc_customHint;}; onMapSingleClick "positionTel = _pos;"; @@ -21,8 +24,8 @@ if (!visibleMap) exitWith {}; _positionTel = positionTel; _pos = []; -if ((_typeX == "delete") and (count outpostsFIA < 1)) exitWith {["Watchposts/Roadblocks", "No Watchposts or Roadblocks deployed to delete."] call A3A_fnc_customHint;}; -if ((_typeX == "delete") and ({(alive _x) and (!captive _x) and ((side _x == Occupants) or (side _x == Invaders)) and (_x distance _positionTel < 500)} count allUnits > 0)) exitWith {["Outposts/Roadblocks", "You cannot delete a Post while enemies are near it."] call A3A_fnc_customHint;}; +if ((_typeX == "delete") and (count outpostsFIA < 1)) exitWith {[_titleStr, localize "STR_A3A_fn_base_outpdiag_no_delete"] call A3A_fnc_customHint;}; +if ((_typeX == "delete") and ({(alive _x) and (!captive _x) and ((side _x == Occupants) or (side _x == Invaders)) and (_x distance _positionTel < 500)} count allUnits > 0)) exitWith {[_titleStr, localize "STR_A3A_fn_base_outpdiag_no_enemies"] call A3A_fnc_customHint;}; _costs = 0; _hr = 0; @@ -48,14 +51,14 @@ else { _mrk = [outpostsFIA,_positionTel] call BIS_fnc_nearestPosition; _pos = getMarkerPos _mrk; - if (_positionTel distance _pos >10) exitWith {["Watchposts/Roadblocks", "No post nearby."] call A3A_fnc_customHint;}; + if (_positionTel distance _pos >10) exitWith {[_titleStr, localize "STR_A3A_fn_base_outpdiag_no_post"] call A3A_fnc_customHint;}; }; //if ((_typeX == "delete") and (_positionTel distance _pos >10)) exitWith {hint "No post nearby"}; _resourcesFIA = server getVariable "resourcesFIA"; _hrFIA = server getVariable "hr"; -if (((_resourcesFIA < _costs) or (_hrFIA < _hr)) and (_typeX!= "delete")) exitWith {["Watchposts/Roadblocks", format ["You lack of resources to build this Watchpost or Roadblock.
%1 HR and %2 € needed.",_hr,_costs]] call A3A_fnc_customHint;}; +if (((_resourcesFIA < _costs) or (_hrFIA < _hr)) and (_typeX!= "delete")) exitWith {[_titleStr, format [localize "STR_A3A_fn_base_outpdiag_no_resources",_hr,_costs]] call A3A_fnc_customHint;}; if (_typeX != "delete") then { diff --git a/A3A/addons/core/functions/Base/fn_placementselection.sqf b/A3A/addons/core/functions/Base/fn_placementselection.sqf index 0c408caf01..1b249cd839 100644 --- a/A3A/addons/core/functions/Base/fn_placementselection.sqf +++ b/A3A/addons/core/functions/Base/fn_placementselection.sqf @@ -2,12 +2,15 @@ FIX_LINE_NUMBERS() scriptName "fn_placementSelection.sqf"; private _disabledPlayerDamage = false; +private _titleStr = localize "STR_A3A_fn_base_placeselec_title"; player allowDamage false; format ["%1 is Dead",name petros] hintC format ["%1 has been killed. You lost part of your assets and need to select a new HQ position far from the enemies.",name petros]; +// TODO: localize "STR_A3A_fn_base_placeselec_petros_dead" - implement into line 8 +// TODO: localize "STR_A3A_fn_base_placeselec_petros_dead_long" - implement into line 8 hintC_arr_EH = findDisplay 72 displayAddEventHandler ["unload",{ - 0 = _this spawn { + _this spawn { _this select 0 displayRemoveEventHandler ["unload", hintC_arr_EH]; hintSilent ""; }; @@ -47,24 +50,24 @@ while {_positionIsInvalid} do { _markerX = [_markersX,_positionClicked] call BIS_fnc_nearestPosition; if (getMarkerPos _markerX distance _positionClicked < 500) then { - ["HQ Position", "Place selected is very close to enemy zones.
Please select another position."] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_placeselec_no_enemy_zone"] call A3A_fnc_customHint; _positionIsInvalid = true; }; if (!_positionIsInvalid && {surfaceIsWater _positionClicked}) then { - ["HQ Position", "Selected position cannot be in water."] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_placeselec_no_water"] call A3A_fnc_customHint; _positionIsInvalid = true; }; if (!_positionIsInvalid && (_positionClicked findIf { (_x < 0) || (_x > worldSize)} != -1)) then { - ["HQ Position", "Selected position cannot be outside the map."] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_placeselec_no_map"] call A3A_fnc_customHint; _positionIsInvalid = true; }; if (!_positionIsInvalid) then { //Invalid if enemies nearby _positionIsInvalid = (allUnits findIf {(side _x == Occupants || side _x == Invaders) && {_x distance _positionClicked < 500}}) > -1; - if (_positionIsInvalid) then {["HQ Position", "There are enemies in the surroundings of that area, please select another."] call A3A_fnc_customHint;}; + if (_positionIsInvalid) then {[_titleStr, localize "STR_A3A_fn_base_placeselec_no_enemy_near"] call A3A_fnc_customHint;}; }; sleep 0.1; }; diff --git a/A3A/addons/core/functions/Base/fn_rebuildAssets.sqf b/A3A/addons/core/functions/Base/fn_rebuildAssets.sqf index 8cf17144b7..87f92c78bf 100644 --- a/A3A/addons/core/functions/Base/fn_rebuildAssets.sqf +++ b/A3A/addons/core/functions/Base/fn_rebuildAssets.sqf @@ -1,14 +1,17 @@ #include "..\..\script_component.hpp" FIX_LINE_NUMBERS() + +private _titleStr = localize "STR_A3A_fn_base_rebasset_title"; + _resourcesFIA = server getVariable "resourcesFIA"; -if (_resourcesFIA < 5000) exitWith {["Rebuild Assets", "You do not have enough money to rebuild any Asset. You need 5.000 €."] call A3A_fnc_customHint;}; +if (_resourcesFIA < 5000) exitWith {[_titleStr, localize "STR_A3A_fn_base_rebasset_no_money"] call A3A_fnc_customHint;}; _destroyedSites = destroyedSites - citiesX; if (!visibleMap) then {openMap true}; positionTel = []; -["Rebuild Assets", "Click on the zone you want to rebuild."] call A3A_fnc_customHint; +[_titleStr, localize "STR_A3A_fn_base_rebasset_click_zone"] call A3A_fnc_customHint; onMapSingleClick "positionTel = _pos;"; @@ -21,13 +24,13 @@ _positionTel = positionTel; _siteX = [markersX,_positionTel] call BIS_fnc_nearestPosition; -if (getMarkerPos _siteX distance _positionTel > 50) exitWith {["Rebuild Assets", "You must click near a map marker."] call A3A_fnc_customHint;}; +if (getMarkerPos _siteX distance _positionTel > 50) exitWith {[_titleStr, localize "STR_A3A_fn_base_rebasset_click_marker"] call A3A_fnc_customHint;}; -if ((not(_siteX in _destroyedSites)) and (!(_siteX in outposts))) exitWith {["Rebuild Assets", "You cannot rebuild that."] call A3A_fnc_customHint;}; +if ((not(_siteX in _destroyedSites)) and (!(_siteX in outposts))) exitWith {[_titleStr, localize "STR_A3A_fn_base_rebasset_no"] call A3A_fnc_customHint;}; _leave = false; _antennaDead = objNull; -_textX = "That Outpost does not have a destroyed Radio Tower."; +_textX = localize "STR_A3A_fn_base_rebasset_no_notower"; if (_siteX in outposts) then { _antennasDead = antennasDead select {_x inArea _siteX}; @@ -36,7 +39,7 @@ if (_siteX in outposts) then if (sidesX getVariable [_siteX, sideUnknown] != teamPlayer) then { _leave = true; - _textX = format ["You cannot rebuild a Radio Tower in an Outpost which does not belong to %1.",FactionGet(reb,"name")]; + _textX = format [localize "STR_A3A_fn_base_rebasset_no_owner",FactionGet(reb,"name")]; } else { @@ -49,13 +52,13 @@ if (_siteX in outposts) then }; }; -if (_leave) exitWith {["Rebuild Assets", format ["%1",_textX]] call A3A_fnc_customHint;}; +if (_leave) exitWith {[_titleStr, format ["%1",_textX]] call A3A_fnc_customHint;}; if (isNull _antennaDead) then { _nameX = [_siteX] call A3A_fnc_localizar; - ["Rebuild Assets", format ["%1 Rebuilt"]] call A3A_fnc_customHint; + [_titleStr, format [localize "STR_A3A_fn_base_rebasset_done_1", _nameX]] call A3A_fnc_customHint; [0,10,_positionTel] remoteExec ["A3A_fnc_citySupportChange",2]; [Occupants, 10, 30] remoteExec ["A3A_fnc_addAggression",2]; @@ -65,7 +68,7 @@ if (isNull _antennaDead) then } else { - ["Rebuild Assets", "Radio Tower rebuilt."] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_rebasset_done_2"] call A3A_fnc_customHint; [_antennaDead] remoteExec ["A3A_fnc_rebuildRadioTower", 2]; }; [0,-5000] remoteExec ["A3A_fnc_resourcesFIA",2]; diff --git a/A3A/addons/core/functions/Base/fn_relocateHQObjects.sqf b/A3A/addons/core/functions/Base/fn_relocateHQObjects.sqf index 9473537247..ea32f27018 100644 --- a/A3A/addons/core/functions/Base/fn_relocateHQObjects.sqf +++ b/A3A/addons/core/functions/Base/fn_relocateHQObjects.sqf @@ -26,10 +26,13 @@ posHQ = _newPosition; publicVariable "posHQ"; "Synd_HQ" setMarkerPos _newPosition; chopForest = false; publicVariable "chopForest"; - [respawnTeamPlayer, 1, teamPlayer] call A3A_fnc_setMarkerAlphaForSide; [respawnTeamPlayer, 1, civilian] call A3A_fnc_setMarkerAlphaForSide; +// Move headless client logic objects near HQ so that firedNear EH etc. work more reliably +private _hcpos = _newPosition vectorAdd [-100, -100, 0]; +{ _x setPosATL _hcpos } forEach (entities "HeadlessClient_F"); + private _alignNormals = { private _thing = _this; _thing setVectorUp surfaceNormal getPos _thing; diff --git a/A3A/addons/core/functions/Base/fn_resourcesFIA.sqf b/A3A/addons/core/functions/Base/fn_resourcesFIA.sqf index c0dbae65e5..ac666a2c04 100644 --- a/A3A/addons/core/functions/Base/fn_resourcesFIA.sqf +++ b/A3A/addons/core/functions/Base/fn_resourcesFIA.sqf @@ -28,11 +28,11 @@ _resourcesFIASim = ""; if (_resourcesFIA > 0) then {_resourcesFIASim = "+"}; if ((_hr != 0) and (_resourcesFIA != 0)) then { - _textX = format ["
HR: %3%1
Money: %4%2 €",_hr toFixed 0,_resourcesFIA toFixed 0,_hrSim,_resourcesFIASim,FactionGet(reb,"name")] + _textX = format ["
HR: %3%1
Money: %4%2 €",_hr toFixed 0,_resourcesFIA toFixed 0,_hrSim,_resourcesFIASim,FactionGet(reb,"name")] //TODO: Localize } else { - if (_hr != 0) then {_textX = format ["
HR: %3%1",_hr toFixed 0,_resourcesFIA toFixed 0,_hrSim,FactionGet(reb,"name")]} else {if (_resourcesFIA != 5) then {_textX = format ["
Money: %4%2 €",_hr toFixed 0,_resourcesFIA toFixed 0,_hrSim,_resourcesFIASim,FactionGet(reb,"name")]}}; + if (_hr != 0) then {_textX = format ["
HR: %3%1",_hr toFixed 0,_resourcesFIA toFixed 0,_hrSim,FactionGet(reb,"name")]} else {if (_resourcesFIA != 5) then {_textX = format ["
Money: %4%2 €",_hr toFixed 0,_resourcesFIA toFixed 0,_hrSim,_resourcesFIASim,FactionGet(reb,"name")]}}; //TODO: Localize }; if (_textX != "") then diff --git a/A3A/addons/core/functions/Base/fn_sellVehicle.sqf b/A3A/addons/core/functions/Base/fn_sellVehicle.sqf index 0da3a98fde..459e2761c8 100644 --- a/A3A/addons/core/functions/Base/fn_sellVehicle.sqf +++ b/A3A/addons/core/functions/Base/fn_sellVehicle.sqf @@ -36,6 +36,8 @@ FIX_LINE_NUMBERS() #define OccAndInv(VAR) (FactionGet(occ, VAR) + FactionGet(inv, VAR)) +private _titleStr = localize "STR_A3A_fn_base_sellveh_sell"; + /* Blacklisted Assets @@ -53,18 +55,18 @@ _blacklistedAssets = [ "vn_o_vc_spiderhole_01","vn_o_vc_spiderhole_02","vn_o_vc_spiderhole_03"]; if (isNull _player) exitWith { Error("_player is null.") }; -if (isNull _veh) exitWith {["Sell Vehicle", "You are not looking at a vehicle."] remoteExecCall ["A3A_fnc_customHint",_player];}; +if (isNull _veh) exitWith {[_titleStr, localize "STR_A3A_fn_base_sellveh_no_looking"] remoteExecCall ["A3A_fnc_customHint",_player];}; -if (_veh distance getMarkerPos respawnTeamPlayer > 50) exitWith {["Sell Vehicle", "Vehicle must be closer than 50 meters to the headquarters marker."] remoteExecCall ["A3A_fnc_customHint",_player];}; +if (_veh distance getMarkerPos respawnTeamPlayer > 50) exitWith {[_titleStr, localize "STR_A3A_fn_base_sellveh_no_closer"] remoteExecCall ["A3A_fnc_customHint",_player];}; -if ({isPlayer _x} count crew _veh > 0) exitWith {["Sell Vehicle", "In order to sell the vehicle, it must be empty."] remoteExecCall ["A3A_fnc_customHint",_player];}; +if ({isPlayer _x} count crew _veh > 0) exitWith {[_titleStr, localize "STR_A3A_fn_base_sellveh_no_empty"] remoteExecCall ["A3A_fnc_customHint",_player];}; _owner = _veh getVariable ["ownerX",""]; if !(_owner isEqualTo "" || {getPlayerUID _player isEqualTo _owner}) exitWith { // Vehicle cannot be sold if owned by another player. - ["Sell Vehicle", "You are not the owner of this vehicle. Therefore, you cannot sell it."] remoteExecCall ["A3A_fnc_customHint",_player]; + [_titleStr, localize "STR_A3A_fn_base_sellveh_no_owner"] remoteExecCall ["A3A_fnc_customHint",_player]; }; -if (_veh getVariable ["A3A_sellVehicle_inProgress",false]) exitWith {["Sell Vehicle", "Vehicle sale already in progress."] remoteExecCall ["A3A_fnc_customHint",_player];}; +if (_veh getVariable ["A3A_sellVehicle_inProgress",false]) exitWith {[_titleStr, localize "STR_A3A_fn_base_sellveh_progress"] remoteExecCall ["A3A_fnc_customHint",_player];}; _veh setVariable ["A3A_sellVehicle_inProgress",true,false]; // Only processed on the server. It is absolutely pointless trying to network this due to race conditions. private _typeX = typeOf _veh; @@ -96,6 +98,7 @@ private _costs = call { if ( (_typeX in FactionGet(all,"vehiclesAPCs")) || (_typeX in FactionGet(all,"vehiclesIFVs")) + || (_typeX in FactionGet(all,"vehiclesLightTanks")) || (_typeX in FactionGet(all,"vehiclesHelisLightAttack")) || (_typeX in FactionGet(all,"vehiclesTransportAir")) || (_typeX in FactionGet(all,"vehiclesUAVs")) @@ -112,7 +115,7 @@ private _costs = call { if (_costs == 0) exitWith { _veh setVariable ["A3A_sellVehicle_inProgress",false,false]; - ["Sell Vehicle", "The vehicle you are looking is not suitable in our marketplace."] remoteExecCall ["A3A_fnc_customHint",_player]; + [_titleStr, localize "STR_A3A_fn_base_sellveh_no_suitable"] remoteExecCall ["A3A_fnc_customHint",_player]; }; _costs = round (_costs * (1-damage _veh)); @@ -125,5 +128,5 @@ if (_veh in staticsToSave) then {staticsToSave = staticsToSave - [_veh]; publicV if (_veh isKindOf "StaticWeapon") then {deleteVehicle _veh}; -["Sell Vehicle", "Vehicle Sold."] remoteExecCall ["A3A_fnc_customHint",_player]; +[_titleStr, localize "STR_A3A_fn_base_sellveh_sold"] remoteExecCall ["A3A_fnc_customHint",_player]; nil; diff --git a/A3A/addons/core/functions/Base/fn_setPlaneLoadout.sqf b/A3A/addons/core/functions/Base/fn_setPlaneLoadout.sqf index b2b1b086da..20707f1f3a 100644 --- a/A3A/addons/core/functions/Base/fn_setPlaneLoadout.sqf +++ b/A3A/addons/core/functions/Base/fn_setPlaneLoadout.sqf @@ -19,6 +19,7 @@ if (_type == "CAS") then switch (typeOf _plane) do { //Vanilla NATO CAS (A-10) + case "B_D_Plane_CAS_01_dynamicLoadout_lxWS"; case "B_Plane_CAS_01_dynamicLoadout_F": { _loadout = ["PylonRack_7Rnd_Rocket_04_HE_F","PylonRack_7Rnd_Rocket_04_HE_F","PylonRack_7Rnd_Rocket_04_HE_F","PylonRack_3Rnd_LG_scalpel","PylonRack_3Rnd_LG_scalpel","PylonRack_3Rnd_LG_scalpel","PylonRack_3Rnd_LG_scalpel","PylonRack_7Rnd_Rocket_04_HE_F","PylonRack_7Rnd_Rocket_04_HE_F","PylonRack_7Rnd_Rocket_04_HE_F"]; @@ -35,6 +36,7 @@ if (_type == "CAS") then _plane setVariable ["missileLauncher", ["missiles_SCALPEL"]]; }; //Vanilla IND CAS + case "a3a_Plane_Fighter_03_grey_F"; case "I_Plane_Fighter_03_dynamicLoadout_F": { // _loadout = ["PylonRack_1Rnd_LG_scalpel","PylonRack_3Rnd_LG_scalpel","PylonRack_3Rnd_LG_scalpel","","PylonRack_3Rnd_LG_scalpel","PylonRack_3Rnd_LG_scalpel","PylonRack_1Rnd_LG_scalpel"]; @@ -123,6 +125,7 @@ if (_type == "CAS") then _plane setVariable ["rocketLauncher", ["missiles_DAR"]]; _plane setVariable ["missileLauncher", ["Missile_AGM_02_Plane_CAS_01_F"]]; }; + case "UK3CB_ADA_B_L39_PYLON"; case "UK3CB_AAF_B_L39_PYLON"; case "UK3CB_KRG_B_L39_PYLON"; case "UK3CB_LDF_B_L39_PYLON": @@ -139,6 +142,13 @@ if (_type == "CAS") then _plane setVariable ["rocketLauncher", ["rhs_weap_s8t"]]; _plane setVariable ["missileLauncher", ["uk3cb_weap_kh25ma_Launcher"]]; }; + case "UK3CB_AAF_B_Gripen_G"; + case "UK3CB_AAF_B_Gripen_DG": + { + _loadout = ["","","PylonRack_Missile_AGM_02_x1","PylonRack_Missile_AGM_02_x1","PylonRack_Missile_AGM_02_x2","PylonRack_Missile_AGM_02_x2"]; + _plane setVariable ["mainGun", "weapon_Fighter_Gun20mm_AA"]; + _plane setVariable ["missileLauncher", ["weapon_AGM_65Launcher"]]; + }; // cup aircraft case "CUP_B_L39_CZ": { @@ -264,6 +274,7 @@ if (_type == "AA") then _loadout = ["PylonMissile_Missile_AA_R73_x1","PylonMissile_Missile_AA_R73_x1","PylonMissile_Missile_AA_R73_x1","PylonMissile_Missile_AA_R73_x1","PylonMissile_Missile_AA_R73_x1","PylonMissile_Missile_AA_R73_x1","PylonMissile_Missile_AA_R73_x1","PylonMissile_Missile_AA_R73_x1","PylonMissile_Missile_AA_R77_x1","PylonMissile_Missile_AA_R77_x1","PylonMissile_Missile_AA_R77_INT_x1","PylonMissile_Missile_AA_R77_INT_x1","PylonMissile_Missile_AA_R77_INT_x1"]; }; //Vanilla IND Air superiority fighter + case "a3a_Plane_Fighter_04_grey_F"; case "I_Plane_Fighter_04_F": { _loadout = ["PylonMissile_Missile_BIM9X_x1","PylonMissile_Missile_BIM9X_x1","PylonRack_Missile_AMRAAM_C_x1","PylonRack_Missile_AMRAAM_C_x1","PylonRack_Missile_BIM9X_x2","PylonRack_Missile_BIM9X_x2"]; @@ -298,7 +309,7 @@ if (_type == "AA") then _loadout = ["rhs_mag_R27ER_APU470","rhs_mag_R27ER_APU470","rhs_mag_R73M_APU73","rhs_mag_R73M_APU73","rhs_mag_R73M_APU73","rhs_mag_R73M_APU73","rhs_BVP3026_CMFlare_Chaff_Magazine_x2"]; }; case "UK3CB_ANA_B_L39_PYLON"; - case "UK3CB_KDF_B_L39_PYLON"; + case "UK3CB_ADA_B_L39_PYLON"; case "UK3CB_ADA_I_L39_PYLON"; case "UK3CB_TKA_B_L39_PYLON"; case "UK3CB_KRG_B_L39_PYLON"; @@ -306,6 +317,11 @@ if (_type == "AA") then { _loadout = ["PylonRack_1Rnd_Missile_AA_04_F","PylonRack_1Rnd_AAA_missiles","PylonRack_1Rnd_GAA_missiles","PylonWeapon_300Rnd_20mm_shells","PylonRack_1Rnd_GAA_missiles","PylonRack_1Rnd_AAA_missiles","PylonRack_1Rnd_Missile_AA_04_F"]; }; + case "UK3CB_AAF_B_Gripen_G"; + case "UK3CB_AAF_B_Gripen_DG": + { + _loadout = ["PylonMissile_Missile_BIM9X_x1","PylonMissile_Missile_BIM9X_x1","PylonRack_Missile_AMRAAM_C_x1","PylonRack_Missile_AMRAAM_C_x1","PylonRack_Missile_AMRAAM_C_x2","PylonRack_Missile_AMRAAM_C_x2"]; + }; case "UK3CB_LDF_B_MIG21_AA"; case "UK3CB_TKA_B_MIG21_AA": { diff --git a/A3A/addons/core/functions/Base/fn_startBreachVehicle.sqf b/A3A/addons/core/functions/Base/fn_startBreachVehicle.sqf index 9758cf94b5..494680ce7e 100644 --- a/A3A/addons/core/functions/Base/fn_startBreachVehicle.sqf +++ b/A3A/addons/core/functions/Base/fn_startBreachVehicle.sqf @@ -2,18 +2,19 @@ FIX_LINE_NUMBERS() params["_vehicle", "_caller", "_actionID"]; -if(!isPlayer _caller) exitWith {["Breach Vehicle", "Only players are currently able to breach vehicles!"] call A3A_fnc_customHint;}; +private _titleStr = localize "STR_A3A_fn_base_breachveh_breachveh"; + +if(!isPlayer _caller) exitWith {[_titleStr, localize "STR_A3A_fn_base_breachveh_no_player"] call A3A_fnc_customHint;}; //Only engineers should be able to breach a vehicle -private _isEngineer = _caller getUnitTrait "engineer"; -if(!_isEngineer) exitWith +if !(_caller call A3A_fnc_isEngineer) exitWith { - ["Breach Vehicle", "You have to be an engineer to breach a vehicle!"] call A3A_fnc_customHint;; + [_titleStr, localize "STR_A3A_fn_base_breachveh_no_engi"] call A3A_fnc_customHint;; }; if(!alive _vehicle) exitWith { - ["Breach Vehicle", "Why would you want to breach a destroyed vehicle?"] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_breachveh_no_destr"] call A3A_fnc_customHint; _vehicle removeAction _actionID; }; @@ -21,14 +22,14 @@ private _vehCrew = crew _vehicle; private _aliveCrew = _vehCrew select {alive _x}; if(count _aliveCrew == 0) exitWith { - ["Breach Vehicle", "There is no living crew left, no need for breaching!"] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_breachveh_no_dead"] call A3A_fnc_customHint; _vehicle lock false; _vehicle removeAction _actionID; }; if(side (_aliveCrew select 0) == teamPlayer) exitWith { - ["Breach Vehicle", "You cannot breach a vehicle which is controlled by the rebels!"] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_breachveh_no_friendly"] call A3A_fnc_customHint; _vehicle removeAction _actionID; }; @@ -56,7 +57,7 @@ private _index = -1; //Abort if no explosives found if(_magazineArray isEqualTo []) exitWith { - ["Breach Vehicle", "You carry no explosives. You will need some to breach vehicles!"] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_breachveh_no_noexpl"] call A3A_fnc_customHint; }; private _explosive = ""; @@ -93,7 +94,7 @@ if(!(_explo isEqualTo [])) then if(_explosiveCount == 0) exitWith { - ["Breach Vehicle", "You don't have the right explosives, check the briefing notes to see what you need!"] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_breachveh_no_wrongexpl"] call A3A_fnc_customHint; }; private _time = 15 + (random 5); @@ -115,7 +116,7 @@ _caller setVariable ["breachVeh", _vehicle]; _caller setVariable ["animsDone",false]; _caller setVariable ["cancelBreach",false]; -private _action = _caller addAction ["Cancel Breaching", {(_this select 1) setVariable ["cancelBreach",true]},nil,6,true,true,"","(isPlayer _this) && (_this == vehicle _this)"]; +private _action = _caller addAction [localize "STR_A3A_fn_base_breachveh_cancel", {(_this select 1) setVariable ["cancelBreach",true]},nil,6,true,true,"","(isPlayer _this) && (_this == vehicle _this)"]; _vehicle removeAction _actionID; _caller addEventHandler ["AnimDone", @@ -156,7 +157,7 @@ if {_caller getVariable ["cancelBreach",false]}}}} ) exitWith { - ["Breach Vehicle", "Breaching cancelled."] call A3A_fnc_customHint; + [_titleStr, localize "STR_A3A_fn_base_breachveh_cancelled"] call A3A_fnc_customHint; _caller setVariable ["cancelBreach",nil]; if(alive _vehicle) then { _vehicle call A3A_fnc_addActionBreachVehicle; @@ -171,7 +172,7 @@ for "_count" from 1 to _explosiveCount do //Added as the vehicle might blow up. Best not to blow up in the player's face. //Pause AFTER removing the explosive in case they decide to drop it or something. -["Breach Vehicle", "Breaching in 10 seconds."] call A3A_fnc_customHint; +[_titleStr, localize "STR_A3A_fn_base_breachveh_timer"] call A3A_fnc_customHint; sleep 10; private _hitPointsConfigPath = configFile >> "CfgVehicles" >> (typeOf _vehicle) >> "HitPoints"; diff --git a/A3A/addons/core/functions/Base/fn_statistics.sqf b/A3A/addons/core/functions/Base/fn_statistics.sqf index e7ddb52634..030a2919fa 100644 --- a/A3A/addons/core/functions/Base/fn_statistics.sqf +++ b/A3A/addons/core/functions/Base/fn_statistics.sqf @@ -22,11 +22,11 @@ if (_player getVariable ["isAFK", false]) then { _ucovertxt = _ucovertxt + " | < if (_player != theBoss) then { private _nameC = if !(isNull theBoss) then {name theBoss} else {"None"}; - _textX = format ["