diff --git a/.gitignore b/.gitignore index 9e7860c..690a24f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ release/ releases/ keys/ .hemttout/ +*.hemttprivatekey #### diff --git a/.hemtt/lints.toml b/.hemtt/lints.toml new file mode 100644 index 0000000..7750520 --- /dev/null +++ b/.hemtt/lints.toml @@ -0,0 +1,12 @@ +[sqf.var_all_caps] +options.ignore = [ + "MTS_RECOMPILES", + "MTS_PREP_RECOMPILE" +] + +[sqf.banned_macros] +options.release = [ + "DEBUG_MODE_FULL", + "DISABLE_COMPILE_CACHE", + "CBA_DEBUG_SYNCHRONOUS" +] diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 127ac5e..1622b27 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,6 @@ { "recommendations": [ - "blackfisch.sqf-language", "editorconfig.editorconfig", - "bux578.vscode-openlastrpt" + "brettmayson.hemtt" ] } diff --git a/addons/markers/XEH_PREP.hpp b/addons/markers/XEH_PREP.hpp index 7233f6f..a54454f 100644 --- a/addons/markers/XEH_PREP.hpp +++ b/addons/markers/XEH_PREP.hpp @@ -14,8 +14,8 @@ PREP(getAllModifiers); PREP(getBroadcastChannel); PREP(getBroadcastTargets); PREP(getCharMarkerType); -PREP(getDisplay); PREP(getDTGUIData); +PREP(getDisplay); PREP(getMarkerAlpha); PREP(getMarkerConfig); PREP(getMarkerFamily); @@ -57,6 +57,6 @@ PREP(setMarkerPreview); PREP(setMarkerScale); PREP(setMarkerScaleLocal); PREP(setUIData); -PREP(toDTGCharaters); +PREP(toDTGCharacters); PREP(transmitUIData); PREP(updatePresetsList); diff --git a/addons/markers/functions/fnc_createMarker.sqf b/addons/markers/functions/fnc_createMarker.sqf index 2dbfee7..4e32d2e 100644 --- a/addons/markers/functions/fnc_createMarker.sqf +++ b/addons/markers/functions/fnc_createMarker.sqf @@ -12,7 +12,7 @@ * 3: ARRAY - The marker configuration. * 0: ARRAY - Frameshape of the marker. * 0: STRING - Identity (blu, red, neu, unk). - * 1: BOOLEAN - Dashed (e.g. supect). + * 1: BOOLEAN - Dashed (e.g. suspect). * 2: BOOLEAN - Headquarters. * 1: ARRAY - Composition of modifier for the marker. IDs are listed in the wiki. (Optional, default: no modifiers) * 0: NUMBER - Icon (0 for none). diff --git a/addons/markers/functions/fnc_createMarkerLocal.sqf b/addons/markers/functions/fnc_createMarkerLocal.sqf index 92e2010..bbe6799 100644 --- a/addons/markers/functions/fnc_createMarkerLocal.sqf +++ b/addons/markers/functions/fnc_createMarkerLocal.sqf @@ -14,7 +14,7 @@ * 3: ARRAY - The marker configuration. * 0: ARRAY - Frameshape of the marker. * 0: STRING - Identity (blu, red, neu, unk). - * 1: BOOLEAN - Dashed (e.g. supect). + * 1: BOOLEAN - Dashed (e.g. suspect). * 2: BOOLEAN - Headquarters. * 1: ARRAY - Composition of modifier for the marker. IDs are listed in the wiki. (Optional, default: no modifiers) * 0: NUMBER - Icon (0 for none). @@ -203,7 +203,7 @@ if (_additionalInfo isNotEqualTo "") then { }; // create text marker (bottom left of marker) -if ((count _uniqueDesignation) > 0) then { +if (_uniqueDesignation isNotEqualTo []) then { TRACE_1("uniqueDesignation input",_uniqueDesignation); scopeName "textLeftCreation"; @@ -245,7 +245,7 @@ if ((count _uniqueDesignation) > 0) then { }; // create text marker (bottom right of marker) -if ((count _higherFormation) > 0) then { +if (_higherFormation isNotEqualTo []) then { TRACE_1("higherFormation input",_higherFormation); scopeName "textRightCreation"; @@ -300,9 +300,9 @@ if (_operationalCondition > 0) then { }; // Create Date-Time Group markers -if ((count _dateTimeGroup) > 0) then { +if (_dateTimeGroup isNotEqualTo []) then { // Returns array in format [D, D, H, H, M, M, Z, mmm, Y, Y]. - private _dtgCharacters = _dateTimeGroup call FUNC(toDTGCharaters); + private _dtgCharacters = _dateTimeGroup call FUNC(toDTGCharacters); CHECKRET(_dtgCharacters isEqualTo [],WARNING_1("Date-Time Group is invalid. Will not create DTG markers. DTG: %1",_dateTimeGroup)); @@ -333,7 +333,7 @@ GVAR(localMarkers) set [_namePrefix, CBA_missionTime, true]; private _markerInformation = GVAR(namespace) getVariable [_namePrefix, []]; if (_markerInformation isEqualTo []) then { //save in mts_markers_namespace - //save inmutable variables of marker + //save immutable variables of marker GVAR(namespace) setVariable [_namePrefix, [_markerFamily, _markerParameter, _broadcastChannel], true]; if (is3DEN) then { diff --git a/addons/markers/functions/fnc_getBroadcastTargets.sqf b/addons/markers/functions/fnc_getBroadcastTargets.sqf index 300b5ea..6a18671 100644 --- a/addons/markers/functions/fnc_getBroadcastTargets.sqf +++ b/addons/markers/functions/fnc_getBroadcastTargets.sqf @@ -3,7 +3,7 @@ * Author: Timi007 * * Description: - * Returnes broadcast targets for remoteExec based on the broadcast channel. + * Returns broadcast targets for remoteExec based on the broadcast channel. * * Parameter(s): * 0: NUMBER - Broadcast channel. (Check "currentChannel" command for channel ID; Use -1 for local creation) diff --git a/addons/markers/functions/fnc_initializeUI.sqf b/addons/markers/functions/fnc_initializeUI.sqf index e99a851..c6d06b0 100644 --- a/addons/markers/functions/fnc_initializeUI.sqf +++ b/addons/markers/functions/fnc_initializeUI.sqf @@ -8,7 +8,7 @@ * Adds Combobox selections and pictures. * * Parameter(s): - * 0: DISPLAY - Display on which the dialog should apear. (Check mts_markers_fnc_getDisplay) + * 0: DISPLAY - Display on which the dialog should appear. (Check mts_markers_fnc_getDisplay) * 1: ARRAY - Mouse position on map. (Not needed if parameter 2 is given e.g. nil) * 2: STRING - Unique marker prefix for editing set marker. (Not needed if dialog should open with default settings) * @@ -117,13 +117,15 @@ if (!isMultiplayer || is3DEN) then { { _x params ["_channelText", "_channelID", "_channelColor"]; - if (!((channelEnabled _channelID) isEqualTo [false, false]) || _channelID isEqualTo 3) then { + (channelEnabled _channelID) params ["", "", ["_areMarkersEnabled", true, [true]]]; + + if (_areMarkersEnabled || _channelID isEqualTo 3) then { private _selectionColor = (configFile >> "RscChatListMission" >> _channelColor) call BIS_fnc_colorConfigToRGBA; private _index = _channelCtrl lbAdd (localize _channelText); _channelCtrl lbSetValue [_index, _channelID]; _channelCtrl lbSetColor [_index, _selectionColor]; }; - } count _channelDropdownArray; + } forEach _channelDropdownArray; }; private _suspectedCbCtrl = _mainDisplay displayCtrl SUSPECT_CHECKBOX; @@ -236,7 +238,8 @@ if ((ctrlIDD _curMapDisplay) in [MAP_BRIEFING_CLIENT_DISPLAY, MAP_BRIEFING_SERVE _mod1Ctrl, _mod2Ctrl, _echelonCtrl, - _directionCtrl]; + _directionCtrl +]; { _x ctrlAddEventHandler ["CheckedChanged", {[false] call FUNC(transmitUIData);}]; diff --git a/addons/markers/functions/fnc_moveMarkerInProgress.sqf b/addons/markers/functions/fnc_moveMarkerInProgress.sqf index 8fe024f..390acf2 100644 --- a/addons/markers/functions/fnc_moveMarkerInProgress.sqf +++ b/addons/markers/functions/fnc_moveMarkerInProgress.sqf @@ -3,7 +3,7 @@ * Author: Timi007 * * Description: - * Event triggerd when marker is being moved. + * Event triggered when marker is being moved. * * Parameter(s): * 0: ARRAY - Arguments for the PerFrameHandler. diff --git a/addons/markers/functions/fnc_moveMarkerInProgress3DEN.sqf b/addons/markers/functions/fnc_moveMarkerInProgress3DEN.sqf index 6fed06f..1d11735 100644 --- a/addons/markers/functions/fnc_moveMarkerInProgress3DEN.sqf +++ b/addons/markers/functions/fnc_moveMarkerInProgress3DEN.sqf @@ -3,7 +3,7 @@ * Author: PhILoX * * Description: - * Event triggerd when marker is being moved in 3DEN editor. + * Event triggered when marker is being moved in 3DEN editor. * * Parameter(s): * None. diff --git a/addons/markers/functions/fnc_moveMarkerMouseDown.sqf b/addons/markers/functions/fnc_moveMarkerMouseDown.sqf index 624ce28..86968c6 100644 --- a/addons/markers/functions/fnc_moveMarkerMouseDown.sqf +++ b/addons/markers/functions/fnc_moveMarkerMouseDown.sqf @@ -3,7 +3,7 @@ * Author: PhILoX, Timi007 * * Description: - * Event triggerd when mouse button is pressed on map to start moving the marker. + * Event triggered when mouse button is pressed on map to start moving the marker. * * Parameter(s): * 0: CONTROL - Map control. (Optional, default: Map control) diff --git a/addons/markers/functions/fnc_saveAndDisplayDTG.sqf b/addons/markers/functions/fnc_saveAndDisplayDTG.sqf index 5706ef8..5628567 100644 --- a/addons/markers/functions/fnc_saveAndDisplayDTG.sqf +++ b/addons/markers/functions/fnc_saveAndDisplayDTG.sqf @@ -20,6 +20,6 @@ params ["_dateTimeGroup"]; private _dtgButton = (findDisplay MAIN_DISPLAY) displayCtrl DTG_BUTTON; -private _dtgChars = _dateTimeGroup call FUNC(toDTGCharaters); +private _dtgChars = _dateTimeGroup call FUNC(toDTGCharacters); _dtgButton ctrlSetText (_dtgChars joinString ""); _dtgButton setVariable [QGVAR(dateTimeGroup), _dateTimeGroup]; diff --git a/addons/markers/functions/fnc_setMarkerAlpha.sqf b/addons/markers/functions/fnc_setMarkerAlpha.sqf index 01b6d91..e1ab4d6 100644 --- a/addons/markers/functions/fnc_setMarkerAlpha.sqf +++ b/addons/markers/functions/fnc_setMarkerAlpha.sqf @@ -3,7 +3,7 @@ * Author: Timi007 * * Description: - * Sets the transparancy (alpha) value of given marker. + * Sets the transparency (alpha) value of given marker. * When alpha equals 1, the marker is visible, but if alpha equals 0, then the marker is invisible. * * Parameter(s): diff --git a/addons/markers/functions/fnc_setMarkerAlphaLocal.sqf b/addons/markers/functions/fnc_setMarkerAlphaLocal.sqf index b84b573..5dbe25d 100644 --- a/addons/markers/functions/fnc_setMarkerAlphaLocal.sqf +++ b/addons/markers/functions/fnc_setMarkerAlphaLocal.sqf @@ -3,7 +3,7 @@ * Author: Timi007 * * Description: - * Sets the transparancy (alpha) value of given marker. + * Sets the transparency (alpha) value of given marker. * When alpha equals 1, the marker is visible, but if alpha equals 0, then the marker is invisible. * This function has a local effect. * diff --git a/addons/markers/functions/fnc_toDTGCharaters.sqf b/addons/markers/functions/fnc_toDTGCharacters.sqf similarity index 86% rename from addons/markers/functions/fnc_toDTGCharaters.sqf rename to addons/markers/functions/fnc_toDTGCharacters.sqf index e7daeac..6f0d75a 100644 --- a/addons/markers/functions/fnc_toDTGCharaters.sqf +++ b/addons/markers/functions/fnc_toDTGCharacters.sqf @@ -3,7 +3,7 @@ * Author: Timi007 * * Description: - * Constructs and returns the Date-Time Group charaters. + * Constructs and returns the Date-Time Group characters. * * Parameter(s): * 0: ARRAY - Year, month, day, hours, minutes from date, systemTime or systemTimeUTC command. @@ -11,12 +11,12 @@ * 2: BOOLEAN - Display in short format (HHMMZ) (Default: false). * * Returns: - * ARRAY - Date-Time Group charaters in format [D, D, H, H, M, M, Z, mmm, Y, Y] (long) or [H, H, M, M, Z] (short). + * ARRAY - Date-Time Group characters in format [D, D, H, H, M, M, Z, mmm, Y, Y] (long) or [H, H, M, M, Z] (short). * To get the equivalent string, just join the element with joinString "". * Returns empty array on invalid date. * * Example: - * [[2023, 12, 7, 12, 35], "A"] call mts_markers_fnc_toDTGCharaters + * [[2023, 12, 7, 12, 35], "A"] call mts_markers_fnc_toDTGCharacters * */ @@ -47,7 +47,7 @@ if (_displayShort) exitWith { }; private _dayStr = [_day, 2] call CBA_fnc_formatNumber; -private _monthAbbrivation = GVAR(monthAbbreviations) get _month; +private _monthAbbreviation = GVAR(monthAbbreviations) get _month; private _yearStr = [_year, 4] call CBA_fnc_formatNumber; // Long format DDHHMMZmmmYY @@ -59,7 +59,7 @@ private _yearStr = [_year, 4] call CBA_fnc_formatNumber; _minuteStr select [0, 1], _minuteStr select [1, 1], toUpper _timeZone, - toLower _monthAbbrivation, + toLower _monthAbbreviation, _yearStr select [2, 1], _yearStr select [3, 1] ] diff --git a/addons/markers/functions/fnc_transmitUIData.sqf b/addons/markers/functions/fnc_transmitUIData.sqf index b8992b1..050fa75 100644 --- a/addons/markers/functions/fnc_transmitUIData.sqf +++ b/addons/markers/functions/fnc_transmitUIData.sqf @@ -24,7 +24,7 @@ private _mainDisplay = findDisplay MAIN_DISPLAY; //get all data private _markerParameter = [] call FUNC(getUIData); -//chose where the data will be transmited +//chose where the data will be transmitted scopeName "main"; if (_isForMarkerCreation) then { private _uniqueDesignation = _markerParameter param [3, []]; diff --git a/addons/markers/script_mod.hpp b/addons/markers/script_mod.hpp index cbc94a6..b0f96d3 100644 --- a/addons/markers/script_mod.hpp +++ b/addons/markers/script_mod.hpp @@ -12,7 +12,7 @@ #define MTS_TAG MTS // MINIMAL required version for the Mod. Components can specify others.. -#define REQUIRED_VERSION 2.14 +#define REQUIRED_VERSION 2.20 #define REQUIRED_CBA_VERSION {3,16,1} #ifdef COMPONENT_BEAUTIFIED diff --git a/addons/markers/stringtable.xml b/addons/markers/stringtable.xml index 39e4088..3677d3f 100644 --- a/addons/markers/stringtable.xml +++ b/addons/markers/stringtable.xml @@ -5,88 +5,88 @@ Timi007, PhILoX, Bix Timi007, PhILoX, Bix + Timi007,PhILoX,Bix Timi007,PhILoX,Bix Timi007,PhILoX,Bix - Timi007,PhILoX,Bix https://github.com/Metis-Team https://github.com/Metis-Team + https://github.com/Metis-Team https://github.com/Metis-Team https://github.com/Metis-Team - https://github.com/Metis-Team UNIT MARKER EINHEITEN MARKER + 작전명령 표시기 軍事單位 军事单位 - 작전명령 표시기 Identity: Identität: + 구분: 身分: 身分: - 구분: Icon: Grundzeichen: + 종류: 圖示: 图示: - 종류: Modifier 1: Ergänzungszeichen 1: + 형태: 修飾符1: 修饰符1: - 형태: Modifier 2: Ergänzungszeichen 2: + 이동: 修飾符2: 修饰符2: - 이동: Echelon: Größenordnung: + 규모: 編制: 编制: - 규모: Reinforced Verstärkt + 증원병력 擴編 扩编 - 증원병력 Reduced Vermindert + 축소병력 縮編 缩编 - 축소병력 Higher Formation: Ü. Führungsebene: + 내용기록: 上級單位: 上级单位: - 내용기록: Unique Designation: Eindeutige Kennung: + 부호표식: 其它文字備註: 其它文字备注: - 부호표식: Additional Info: @@ -107,9 +107,9 @@ Channel: Kanal: + 채널: 頻道: 频道: - 채널: Opacity: %1 @@ -223,9 +223,9 @@ -Empty- -Leer- + -미확인- -無- -无- - -미확인- North-northeast @@ -328,284 +328,284 @@ Friend Freund + 아군 友軍 友军 - 아군 Assumed Friend Vermutlich Freund + 아군추정 計劃 / 預期 / 疑似 计划 / 预期 / 疑似 - 아군추정 Hostile Feind + 적군 敵軍 敌军 - 적군 Suspect Verdächtig + 위협수준 計劃 / 預期 / 疑似 计划 / 预期 / 疑似 - 위협수준 Neutral Neutral + 중립 中立 中立 - 중립 Unknown Unbekannt + 미확인 未知 未知 - 미확인 Pending Noch unbestimmt + 의심수준 計劃 / 預期 / 疑似 计划 / 预期 / 疑似 - 의심수준 -Empty- -Leer- + -미확인- -無- -无- - -미확인- Infantry Infanterie + 보병 步兵 步兵 - 보병 Mechanized Infantry Mechanisierte Infanterie + 기계화 보병 機械化步兵 机械化步兵 - 기계화 보병 Motorized Infantry Motorisierte Infanterie + 차량화 보병 摩托化步兵 摩托化步兵 - 차량화 보병 Armor Panzer + 기갑 裝甲 装甲 - 기갑 Anti Armor Panzerabwehr + 대전차 기갑 反裝甲 反装甲 - 대전차 기갑 Armored Anti Armor Gepanzerte Panzerabwehr + 대전차 중장갑 機械化反裝甲 机械化反装甲 - 대전차 중장갑 Motorized Anti Armor Motorisierte Panzerabwehr + 대전차 차량 摩托化反裝甲 摩托化反装甲 - 대전차 차량 Maintenance Instandsetzung + 보수 維修保養 维修保养 - 보수 Air Defence Flugabwehr + 대공 防空 防空 - 대공 Air Defence Missile Startgerät Flugabwehrrakete Boden-Luft (SAM) + 대공 미사일 防空導彈 防空导弹 - 대공 미사일 Fixed Wing Starrflügler + 항공기 定翼機 定翼机 - 항공기 Rotary Wing Drehflügler + 헬기 旋翼機 旋翼机 - 헬기 Unmanned Systems Unbemannte Systeme + 무인기 無人載具系統 无人载具系统 - 무인기 Engineer Pionier + 정비대 工兵 工兵 - 정비대 Armored Engineer Panzerpionier + 기갑 정비 裝甲工兵 装甲工兵 - 기갑 정비 Motorized Engineer Motorisierte Pioniere + 차량 정비 摩托化工兵 摩托化工兵 - 차량 정비 Field Artillery Artillerie + 야전포 火炮 火炮 - 야전포 Self-Propelled Field Artillery Panzerartillerie + 자주포 自走炮 自走炮 - 자주포 Mortar Mörser + 박격포 迫擊炮 迫击炮 - 박격포 Tracked Mortar Panzermörser + 박격포 장갑차량 機械化迫擊炮 机械化迫击炮 - 박격포 장갑차량 Reconnaissance Aufklärung + 정찰 偵察 侦察 - 정찰 Armored Reconnaissance Panzeraufklärer + 기갑 정찰 裝甲偵察 装甲侦察 - 기갑 정찰 Motorized Reconnaissance Motorisierte Aufklärung + 차량 정찰 摩托化偵察 摩托化侦察 - 차량 정찰 Surface-Surface Missile Startgerät Boden-Boden-Flugkörper + 지대지 미사일 面對面導彈 面对面导弹 - 지대지 미사일 CBRN Defence ABC-Abwehr + 화생방대 化生放核防禦 化生放核防御 - 화생방대 Military Intelligence Militärisches Nachrichtenwesen + 군사 정보 軍事情報處 军事情报处 - 군사 정보 Military Police Militärpolizei + 군사 경찰 憲兵 宪兵 - 군사 경찰 Signal Führungsunterstützung + 통신 通訊 通讯 - 통신 Combat Service Support Einsatzunterstützung + 전투 근무 지원 戰鬥後勤支援 战斗后勤支援 - 전투 근무 지원 Medical Sanitätsdienst + 의무 醫療 医疗 - 의무 Supply Nachschub + 보급 補給 补给 - 보급 Transportation Transport + 수송 運輸 运输 - 수송 Amphibious Infantry @@ -713,51 +713,51 @@ -Empty- -Leer- + -미확인- -無- -无- - -미확인- Air Assault Luftgestützt + 공습 空中突擊 空中突击 - 공습 Attack Angriffs- + 공격 攻擊 攻击 - 공격 Maintenance Instandsetzung + 보수 維修保養 维修保养 - 보수 Multiple Rocket Launcher Mehrfachraketenwerfer + 다연장 미사일 발사대 多管火箭發射器 多管火箭发射器 - 다연장 미사일 발사대 Single Rocket Launcher Einzelraketenwerfer + 미사일 발사대 單管火箭發射器 单管火箭发射器 - 미사일 발사대 Sniper Scharfschütze + 저격수 狙擊手 狙击手 - 저격수 Headquarters (Element) @@ -791,58 +791,58 @@ -Empty- -Leer- + -미확인- -無- -无- - -미확인- Airborne Luftlande-/Fallschirm- + 공수 空降 空降 - 공수 Heavy Schwer + 대규모 重型 重型 - 대규모 Medium Mittel + 중규모 中型 中型 - 중규모 Light Leicht + 소규모 輕型 轻型 - 소규모 Mountain Gebirgs- + 산악 山地 山地 - 산악 VSTOL Senkrecht- oder Kurzstart und -landung + 수직단거리이착륙 垂直/短場起降 垂直/短场起降 - 수직단거리이착륙 Wheeled Auf Rädern/Rad- + 차량 輪式載具 轮式载具 - 차량 Towed @@ -853,93 +853,93 @@ -Empty- -Leer- + -미확인- -無- -无- - -미확인- Team/Crew Team/Besatzung + 화력조 伍/組 伍/组 - 화력조 Squad Trupp + 분대 班 班 - 분대 Section Gruppe + 단대 加強班 加强班 - 단대 Platoon Zug + 소대 排 排 - 소대 Company/Battery Kompanie/Batterie + 중대 連 连 - 중대 Battalion Bataillon + 대대 營 营 - 대대 Regiment/Group Regiment/Kampfgruppe + 연대 團 团 - 연대 Brigade Brigade + 여단 旅 旅 - 여단 Division Division + 사단 師 师 - 사단 Corps Korps + 군단 軍 军 - 군단 Army Armee + 야전군 集團軍 集团军 - 야전군 Army Group Armeegruppe + 집단군 方面軍 方面军 - 집단군 @@ -957,9 +957,9 @@ Metis Marker Metis Marker + 메티스 마커 Metis軍事符號 Metis军事符号 - 메티스 마커 Player Map and Briefing @@ -974,30 +974,30 @@ Open Marker Interface Marker Interface öffnen + 마커창 열기 開啟軍事符號介面 开启军事符号介面 - 마커창 열기 Delete Marker Marker löschen + 마커 삭제 刪除軍事符號 删除军事符号 - 마커 삭제 Edit Marker Marker editieren + 마커 편집 編輯軍事符號 编辑军事符号 - 마커 편집 Move Marker Marker verschieben + 마커 이동 移動軍事符號 移动军事符号 - 마커 이동 Copy Marker