Skip to content

Commit

Permalink
Fixed grammar and spelling in multiple files (#1247)
Browse files Browse the repository at this point in the history
Co-authored-by: Broström.A | Evul <[email protected]>
  • Loading branch information
blakehhh and AndreasBrostrom authored Oct 16, 2024
1 parent 652eddc commit 11c0754
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 23 deletions.
5 changes: 3 additions & 2 deletions cScripts/functions/civ/fn_civ_init.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -50,7 +50,7 @@ if !(player diarySubjectExists "CivCenter") then {

private _location = text nearestLocation [_pos, ""];
private _textLocation = formatText["<font color='#ffc61a'>%1</font> is a population center located at <font color='#ffc61a'>%2</font>.", _location, mapGridPosition _pos];
private _textDensity = if (_density != "none") then { formatText["<br/><br/>The location have <font color='#ffc61a'>%1</font> density.", _density]; } else {""};
private _textDensity = if (_density != "none") then { formatText["<br/><br/>The location has <font color='#ffc61a'>%1</font> density.", _density]; } else {""};
private _record = player createDiaryRecord ["CivCenter", [_location, format [
"%1%2", _textLocation, _textDensity
]]];
Expand Down Expand Up @@ -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;

2 changes: 1 addition & 1 deletion cScripts/functions/gear/fn_gear_selectLoadout.sqf
Original file line number Diff line number Diff line change
@@ -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 <OBJECT>
Expand Down
2 changes: 1 addition & 1 deletion cScripts/functions/gear/fn_gear_setupRadios.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion cScripts/functions/init/fn_init_skillAdjustment.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 3 additions & 3 deletions cScripts/functions/modules/fn_zenModule_callEndex.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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];
};
Expand All @@ -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));
};

Expand All @@ -94,7 +94,7 @@ params ["_modulePos", "_objectPos"];
private _hftext = "You are not allowed to discharge your weapon during Endex.<br />";

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!",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
10 changes: 5 additions & 5 deletions cScripts/functions/modules/fn_zenModule_resetPlayerRadio.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand All @@ -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;
2 changes: 1 addition & 1 deletion cScripts/functions/players/fn_player_setOrganization.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion cScripts/functions/players/fn_setRadioChannel.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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), []];
Expand Down
2 changes: 1 addition & 1 deletion cScripts/functions/systems/fn_addObjectToCurator.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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);

[{
{
Expand Down
2 changes: 1 addition & 1 deletion cScripts/functions/systems/fn_isValidFaction.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ private _textures = [
call _code;
[
[],
["Vehicle art have been changed"],
["Vehicle art has been changed"],
[_texture, 10],
[""]
] call CBA_fnc_notify;
Expand Down
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_addRegearAction.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_addRepairAction.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_applyLoadout.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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];
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_setRadio.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit 11c0754

Please sign in to comment.