From 11c07544af481d7c4314260165ab5f32364b43e8 Mon Sep 17 00:00:00 2001 From: "Blake.H" Date: Wed, 16 Oct 2024 15:38:55 +0100 Subject: [PATCH] Fixed grammar and spelling in multiple files (#1247) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Broström.A | Evul --- cScripts/functions/civ/fn_civ_init.sqf | 5 +++-- cScripts/functions/gear/fn_gear_selectLoadout.sqf | 2 +- cScripts/functions/gear/fn_gear_setupRadios.sqf | 2 +- cScripts/functions/init/fn_init_skillAdjustment.sqf | 2 +- cScripts/functions/modules/fn_zenModule_callEndex.sqf | 6 +++--- .../modules/fn_zenModule_enableUnitSimulation.sqf | 2 +- .../modules/fn_zenModule_resetPlayerRadio.sqf | 10 +++++----- .../functions/players/fn_player_setOrganization.sqf | 2 +- cScripts/functions/players/fn_setRadioChannel.sqf | 2 +- cScripts/functions/systems/fn_addObjectToCurator.sqf | 2 +- cScripts/functions/systems/fn_isValidFaction.sqf | 2 +- .../vehicle/fn_vehicle_addCosmeticSelection.sqf | 2 +- .../functions/vehicle/fn_vehicle_addRegearAction.sqf | 2 +- .../functions/vehicle/fn_vehicle_addRepairAction.sqf | 2 +- cScripts/functions/vehicle/fn_vehicle_applyLoadout.sqf | 2 +- cScripts/functions/vehicle/fn_vehicle_setRadio.sqf | 2 +- 16 files changed, 24 insertions(+), 23 deletions(-) diff --git a/cScripts/functions/civ/fn_civ_init.sqf b/cScripts/functions/civ/fn_civ_init.sqf index 3bed11e0f..a8b6370c7 100644 --- a/cScripts/functions/civ/fn_civ_init.sqf +++ b/cScripts/functions/civ/fn_civ_init.sqf @@ -26,7 +26,7 @@ private _civZones = []; private _density = [_x, 21] call BIS_fnc_trimString; _density = (_density splitString "_")#0; if !(_density in ["extream", "high", "medium", "low", "none"]) then { - SHOW_CHAT_WARNING_2("Civ", "Zone %1 have invalid density '%2'.", _x, _density); + SHOW_CHAT_WARNING_2("Civ", "Zone %1 has invalid density '%2'.", _x, _density); continue; }; private _pos = getMarkerPos _x; @@ -50,7 +50,7 @@ if !(player diarySubjectExists "CivCenter") then { private _location = text nearestLocation [_pos, ""]; private _textLocation = formatText["%1 is a population center located at %2.", _location, mapGridPosition _pos]; - private _textDensity = if (_density != "none") then { formatText["

The location have %1 density.", _density]; } else {""}; + private _textDensity = if (_density != "none") then { formatText["

The location has %1 density.", _density]; } else {""}; private _record = player createDiaryRecord ["CivCenter", [_location, format [ "%1%2", _textLocation, _textDensity ]]]; @@ -95,3 +95,4 @@ if !(player diarySubjectExists "CivCenter") then { systemChat format ["Civilian casualties caused by %1 repoted near %2.", name _unit, _location]; playSound "hint"; }] call CBA_fnc_addEventHandler; + diff --git a/cScripts/functions/gear/fn_gear_selectLoadout.sqf b/cScripts/functions/gear/fn_gear_selectLoadout.sqf index b8cdea527..d5295fd65 100644 --- a/cScripts/functions/gear/fn_gear_selectLoadout.sqf +++ b/cScripts/functions/gear/fn_gear_selectLoadout.sqf @@ -1,7 +1,7 @@ #include "..\script_component.hpp"; /* * Author: BaerMitUmlaut, CPL.Brostrom.A - * This function selects a loadout based on if you have a save variable loadout or config. + * This function selects a loadout based on if you have a saved variable loadout or config. * * Arguments: * 0: Unit diff --git a/cScripts/functions/gear/fn_gear_setupRadios.sqf b/cScripts/functions/gear/fn_gear_setupRadios.sqf index eced33a45..2472ec1ca 100644 --- a/cScripts/functions/gear/fn_gear_setupRadios.sqf +++ b/cScripts/functions/gear/fn_gear_setupRadios.sqf @@ -31,7 +31,7 @@ if (EGVAR(patches,usesACRE)) exitWith { // Handle Radio preset from cba settings private _lrChannels = parseSimpleArray EGVAR(Settings,setRadioChannelNames); - if !(_lrChannels isEqualType []) exitWith {SHOW_CHAT_ERROR("GearRadio", "Radio array have not been setup correctly.")}; + if !(_lrChannels isEqualType []) exitWith {SHOW_CHAT_ERROR("GearRadio", "Radio array has not been setup correctly.")}; // Set LR radio labels and frequency { diff --git a/cScripts/functions/init/fn_init_skillAdjustment.sqf b/cScripts/functions/init/fn_init_skillAdjustment.sqf index 5cbe02ecd..cf0256515 100644 --- a/cScripts/functions/init/fn_init_skillAdjustment.sqf +++ b/cScripts/functions/init/fn_init_skillAdjustment.sqf @@ -96,7 +96,7 @@ if (!isServer) exitWith {}; ["spottime", _unit skill "spottime"], ["spotdistance", _unit skill "spotdistance"] ]; - INFO_3("init","AI unit %1 (%2) have skill levels %3.", _unit, typeOf _unit, _skillArray); + INFO_3("init","AI unit %1 (%2) has skill levels %3.", _unit, typeOf _unit, _skillArray); }; }; }, true, [], true] call CBA_fnc_addClassEventHandler; diff --git a/cScripts/functions/modules/fn_zenModule_callEndex.sqf b/cScripts/functions/modules/fn_zenModule_callEndex.sqf index 0e4c9e022..fe00d470c 100644 --- a/cScripts/functions/modules/fn_zenModule_callEndex.sqf +++ b/cScripts/functions/modules/fn_zenModule_callEndex.sqf @@ -55,7 +55,7 @@ params ["_modulePos", "_objectPos"]; private _safedWeapons = player getVariable ['ace_safemode_safedWeapons', []]; if !(_weapon in _safedWeapons) then { [player, currentWeapon player, currentMuzzle player] call ace_safemode_fnc_lockSafety; - INFO_2("ZEN", "%1 weapon (%2) have been set to safe."); + INFO_2("ZEN", "%1 weapon (%2) has been set to safe."); }; } remoteExecCall ["bis_fnc_call", -2]; }; @@ -71,7 +71,7 @@ params ["_modulePos", "_objectPos"]; { (group _x) setBehaviourStrong "CARELESS"; (group _x) setCombatMode "BLUE"; - INFO_2("ZEN", "AI %1 group (%2) have been set to careless and blue.", _x, group _x); + INFO_2("ZEN", "AI %1 group (%2) has been set to careless and blue.", _x, group _x); } forEach ((allUnits) - (allPlayers)); }; @@ -94,7 +94,7 @@ params ["_modulePos", "_objectPos"]; private _hftext = "You are not allowed to discharge your weapon during Endex.
"; hint parseText (_hftitle + _hfimage + _hftext); - format ["Player %1 have discharge his weapon (%2; %3) during endex.", name _unit, _weapon, _muzzle] remoteExecCall [QFUNC(info), 0]; + format ["Player %1 has discharged their weapon (%2; %3) during endex.", name _unit, _weapon, _muzzle] remoteExecCall [QFUNC(info), 0]; if ( _unit getVariable [QEGVAR(player,endexFiredWeapon), ""] != _muzzle ) then { format [ "Hold your fire %1 %2!", diff --git a/cScripts/functions/modules/fn_zenModule_enableUnitSimulation.sqf b/cScripts/functions/modules/fn_zenModule_enableUnitSimulation.sqf index c9be31cc3..69421407e 100644 --- a/cScripts/functions/modules/fn_zenModule_enableUnitSimulation.sqf +++ b/cScripts/functions/modules/fn_zenModule_enableUnitSimulation.sqf @@ -33,4 +33,4 @@ group _objectPos enableDynamicSimulation false; [_x, false] remoteExec ["hideObjectGlobal", 2]; } forEach units group _objectPos; -["Unit have been activated"] call zen_common_fnc_showMessage; +["Unit has been activated"] call zen_common_fnc_showMessage; diff --git a/cScripts/functions/modules/fn_zenModule_resetPlayerRadio.sqf b/cScripts/functions/modules/fn_zenModule_resetPlayerRadio.sqf index 43cd61e2e..c75927ab7 100644 --- a/cScripts/functions/modules/fn_zenModule_resetPlayerRadio.sqf +++ b/cScripts/functions/modules/fn_zenModule_resetPlayerRadio.sqf @@ -19,7 +19,7 @@ if (_objectPos isKindOf "Man") exitWith { private _unit = _objectPos; [] remoteExec [QFUNC(clearRadioIds), _unit]; - SHOW_SERVER_INFO_2("GearRadio", "Player %1 (%2) radio have been reset", name _unit, getPlayerUID _unit); + SHOW_SERVER_INFO_2("GearRadio", "Player %1 (%2) radio has been reset", name _unit, getPlayerUID _unit); [format["Radio reset for %1", name _unit]] call zen_common_fnc_showMessage; }; @@ -36,13 +36,13 @@ if (_objectPos isKindOf "Man") exitWith { if (_sure) exitWith { [] remoteExec [QFUNC(clearRadioIds), -2]; - SHOW_CHAT_SERVER_WARNING("GearRadio", "All players radio have been reset in this mission"); - ["Radio have been reset for all players called"] call zen_common_fnc_showMessage; + SHOW_CHAT_SERVER_WARNING("GearRadio", "All players radios have been reset in this mission"); + ["Radios have been reset for all players called"] call zen_common_fnc_showMessage; }; - ["Nothing have been done"] call zen_common_fnc_showMessage; + ["Nothing has been done"] call zen_common_fnc_showMessage; }, {}, [_modulePos] ] call zen_dialog_fnc_create; -["Nothing have been done"] call zen_common_fnc_showMessage; +["Nothing has been done"] call zen_common_fnc_showMessage; diff --git a/cScripts/functions/players/fn_player_setOrganization.sqf b/cScripts/functions/players/fn_player_setOrganization.sqf index dbce26ae9..05ffd8e47 100644 --- a/cScripts/functions/players/fn_player_setOrganization.sqf +++ b/cScripts/functions/players/fn_player_setOrganization.sqf @@ -34,6 +34,6 @@ _company = toLower _company; SETVAR(player,EGVAR(Player,Company),_company); private _unit = name player; -INFO_3("Player", "%1 have company set to '%2' and platoon set to '%3'",_unit,_company,_platoon); +INFO_3("Player", "%1 has company set to '%2' and platoon set to '%3'",_unit,_company,_platoon); [_platoon, _company] \ No newline at end of file diff --git a/cScripts/functions/players/fn_setRadioChannel.sqf b/cScripts/functions/players/fn_setRadioChannel.sqf index 6037db31e..2ff6dd361 100644 --- a/cScripts/functions/players/fn_setRadioChannel.sqf +++ b/cScripts/functions/players/fn_setRadioChannel.sqf @@ -32,7 +32,7 @@ if (EGVAR(patches,usesACRE)) exitWith { private _channel = [[_player] call EFUNC(unit,getSquadName), _radio] call FUNC(getRadioChannel); [_x, _channel] call acre_api_fnc_setRadioChannel; - INFO_3("Radio", "%1 radio (%2) have its channel set to %3", _player, _x, _channel); + INFO_3("Radio", "%1 radio (%2) has its channel set to %3", _player, _x, _channel); // Store radio channels in variable. private _radioAndChannel = _player getVariable [QEGVAR(Player,RadioChannel), []]; diff --git a/cScripts/functions/systems/fn_addObjectToCurator.sqf b/cScripts/functions/systems/fn_addObjectToCurator.sqf index 7b1d8f7cc..9b4c62ff8 100644 --- a/cScripts/functions/systems/fn_addObjectToCurator.sqf +++ b/cScripts/functions/systems/fn_addObjectToCurator.sqf @@ -14,7 +14,7 @@ params [["_object", objNull, [objNull]]]; -INFO_1("addObjectToCurator", "%1 have been added to all curators.", _object); +INFO_1("addObjectToCurator", "%1 has been added to all curators.", _object); [{ { diff --git a/cScripts/functions/systems/fn_isValidFaction.sqf b/cScripts/functions/systems/fn_isValidFaction.sqf index cf5246a5f..823b34a72 100644 --- a/cScripts/functions/systems/fn_isValidFaction.sqf +++ b/cScripts/functions/systems/fn_isValidFaction.sqf @@ -20,7 +20,7 @@ params[["_unit", objNull, [objNull]]]; private _factionArray = parseSimpleArray EGVAR(Settings,vehicleFactions); if !(_factionArray isEqualType []) exitWith { - SHOW_CHAT_ERROR("FactionArray", "Faction array have not been setup correctly."); + SHOW_CHAT_ERROR("FactionArray", "Faction array has not been setup correctly."); false }; diff --git a/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf b/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf index b39ff0d77..e51752d74 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf @@ -209,7 +209,7 @@ private _textures = [ call _code; [ [], - ["Vehicle art have been changed"], + ["Vehicle art has been changed"], [_texture, 10], [""] ] call CBA_fnc_notify; diff --git a/cScripts/functions/vehicle/fn_vehicle_addRegearAction.sqf b/cScripts/functions/vehicle/fn_vehicle_addRegearAction.sqf index 534acc79e..cb56e2d83 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addRegearAction.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addRegearAction.sqf @@ -32,7 +32,7 @@ private _stagingCat = [QEGVAR(Actions_Vehicle,Repair), "Regear", _icon, { _vehicle setFuel 1; [ [], - ["Vehicle have been rearmed and refueld."], + ["Vehicle has been rearmed and refueled."], [""], [""] ] call CBA_fnc_notify; diff --git a/cScripts/functions/vehicle/fn_vehicle_addRepairAction.sqf b/cScripts/functions/vehicle/fn_vehicle_addRepairAction.sqf index c65d4777c..fd7656143 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addRepairAction.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addRepairAction.sqf @@ -28,7 +28,7 @@ private _stagingCat = [QEGVAR(Actions_Vehicle,Repair), "Repair and Refuel", _ico _vehicle setFuel 1; [ [], - ["Vehicle have been refueld and repaired."], + ["Vehicle has been refueled and repaired."], [""], [""] ] call CBA_fnc_notify; diff --git a/cScripts/functions/vehicle/fn_vehicle_applyLoadout.sqf b/cScripts/functions/vehicle/fn_vehicle_applyLoadout.sqf index a82928e3e..94156624c 100644 --- a/cScripts/functions/vehicle/fn_vehicle_applyLoadout.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_applyLoadout.sqf @@ -57,5 +57,5 @@ _vehicle setVehicleAmmo 1; }; } forEach _vehicleLoadout; -INFO_3("VehiclePylonApply", "Vehicle %1 (%2) have been rearmed with '%3'", _vehicle, typeOf _vehicle, _loadoutName); +INFO_3("VehiclePylonApply", "Vehicle %1 (%2) has been rearmed with '%3'", _vehicle, typeOf _vehicle, _loadoutName); _vehicle setVariable [QEGVAR(Vehicle,Pylon), [_loadoutName, _vehicleLoadout], true]; diff --git a/cScripts/functions/vehicle/fn_vehicle_setRadio.sqf b/cScripts/functions/vehicle/fn_vehicle_setRadio.sqf index 42347302c..da0134ee3 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setRadio.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setRadio.sqf @@ -49,7 +49,7 @@ if (EGVAR(patches,usesACRE)) exitWith { if (count _radio != 0) then { private _channel = _radioChannel select _forEachIndex; [_radio, _channel] call acre_api_fnc_setRadioChannel; - INFO_4("VehicleRadio", "Vehicle %1 (%2) radio %3 in rack %3 have radio set to channel %4", _vehicle, typeOf _vehicle, _radio, _x, _channel); + INFO_4("VehicleRadio", "Vehicle %1 (%2) radio %3 in rack %3 has radio set to channel %4", _vehicle, typeOf _vehicle, _radio, _x, _channel); }; } forEach _racks; };