Update from remote

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,23 +4,37 @@ about: Create a report to help us improve
 title: ''
 labels: kind/bug
 assignees: ''
-
 ---
 
+<!--
+🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨
+
+I ACKNOWLEDGE THE FOLLOWING BEFORE PROCEEDING:
+1. If I delete this entire template or parts of it and go my own path, the team may close my issue without further explanation or engagement.
+2. If I list multiple bugs/concerns in this one issue, the team may close my issue without further explanation or engagement.
+3. If I write an issue that has duplicates, the team may close my issue without further explanation or engagement (and without necessarily spending time to find the exact duplicate ID number).
+4. If I leave the title incomplete when filing the issue, the team may close my issue without further explanation or engagement.
+5. If I file something completely blank in the body, the team may close my issue without further explanation or engagement.
+6. If I file an issue without collecting logs (RPT file, etc...), the team may close my issue without further explanation or engagement. 
+
+All good? Then proceed and fill out the items below.
+-->
+
 **Mods (complete and add to the following information):**
 - **Arma 3:** `x.xx` [e.g. 1.00 stable, rc,  dev]
 - **CBA:** `3.x.x` [e.g. 3.0.0 stable, commit hash]
 - **ACE3:** `3.x.x` [eg. 3.0.0 stable, commit hash]
-_Make sure to reproduce the issue with only CBA and ACE3 on a newly created mission!_
+<!-- Make sure to reproduce the issue with only CBA and ACE3 on a newly created mission! -->
 
 **Description:**
 A clear and concise description of what the bug is.
 
 **Steps to reproduce:**
-- _Follow [https://ace3mod.com/img/wiki/user/issue_flowchart.png](this flowchart)!_
-- Go to ...
-- Click ...
-- See ...
+_Follow [https://ace3mod.com/img/wiki/user/issue_flowchart.png](this flowchart)!_
+
+1. _Go to ..._
+2. _Click ..._
+3. _See ..._
 
 **Expected behavior:**
 A clear and concise description of what you expected to happen.

AUTHORS.txt

@@ -9,6 +9,7 @@
 Brandon (TCVM) <brandondanyluk366@gmail.com>
 bux578 <github@jonathandavid.de>
 commy2
+Dahlgren
 esteldunedain <nicolas.d.badano@gmail.com>
 Felix Wiegand <koffeinflummi@gmail.com>
 Garth "L-H" de Wet <garthofhearts@gmail.com>
@@ -74,6 +75,7 @@ Dudakov aka [OMCB]Kaban <dudakov.s@gmail.com>
 Drofseh <drofseh@gmail.com>
 Dslyecxi <dslyecxi@gmail.com>
 Eclipser <jms@modeemi.fi>
+Elgin675
 ElTyranos
 eRazeri
 evromalarkey <evromalarkey@gmail.com>
@@ -158,6 +160,7 @@ Tuupertunut
 Valentin Torikian <valentin.torikian@gmail.com>
 voiper
 VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
+Walthzer <walthzer.69@gmail.com>
 Winter <simon@agius-muscat.net>
 xrufix
 Zakant <Zakant@gmx.de>

README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases/latest">
-        <img src="https://img.shields.io/badge/Version-3.13.4-blue.svg?style=flat-square" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.13.5-blue.svg?style=flat-square" alt="ACE3 Version">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">

addons/advanced_ballistics/stringtable.xml

@@ -116,6 +116,7 @@
             <Russian>Имитирует небольшие изменения начальной скорости при каждом выстреле</Russian>
             <Portuguese>Simula pequenas variações na velocidade do Freio de Boca entre cada tiro</Portuguese>
             <Czech>Simuluje malé odchylky v úsťové rychlosti mezi jednotlivými výstřely</Czech>
+            <Turkish>Her atış arasında namlu çıkış hızındaki küçük değişiklikleri simüle eder</Turkish>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_ammoTemperatureEnabled_DisplayName">
             <English>Enable Ammo Temperature Simulation</English>
@@ -149,6 +150,7 @@
             <Korean>탄약 온도에 비례해 총구 속도가 달라집니다</Korean>
             <Chinese>子彈初速將隨彈藥溫度而有所變化</Chinese>
             <Chinesesimp>子弹初速将随弹药温度而有所变化</Chinesesimp>
+            <Turkish>Mermi çıkış hızı cephane sıcaklığına göre değişir</Turkish>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_barrelLengthInfluenceEnabled_DisplayName">
             <English>Enable Barrel Length Simulation</English>
@@ -165,6 +167,7 @@
             <Korean>총열 길이 구현 적용</Korean>
             <Chinese>啟用槍管長度模擬系統</Chinese>
             <Chinesesimp>启用枪管长度模拟系统</Chinesesimp>
+            <Turkish>Namlu Uzunluğu Simülasyonunu Etkinleştir</Turkish>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_barrelLengthInfluenceEnabled_Description">
             <English>Muzzle velocity varies with barrel length</English>
@@ -181,6 +184,7 @@
             <Korean>총구 속도가 총열에 비례해 달라집니다</Korean>
             <Chinese>子彈初速將隨槍管長度而有所變化</Chinese>
             <Chinesesimp>子弹初速将随枪管长度而有所变化</Chinesesimp>
+            <Turkish>Mermi çıkış hızı namlu uzunluğuna göre değişir</Turkish>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_bulletTraceEnabled_DisplayName">
             <English>Enable Bullet Trace Effect</English>
@@ -197,6 +201,7 @@
             <Korean>예광탄 효과 적용</Korean>
             <Chinese>啟用曳光彈效果</Chinese>
             <Chinesesimp>启用曳光弹效果</Chinesesimp>
+            <Turkish>İzli Mermi Etkisini Etkinleştir</Turkish>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_bulletTraceEnabled_Description">
             <English>Enables a bullet trace effect to high caliber bullets (only visible when looking through high power optics)</English>
@@ -213,6 +218,7 @@
             <Korean>대구경 탄환에 예광탄 효과를 적용합니다(오직 고성능 조준경 사용시에만 보입니다)</Korean>
             <Chinese>啟用曳光彈效果給大口徑子彈 (只有透過高倍率光學瞄鏡才能看到)</Chinese>
             <Chinesesimp>启用曳光弹效果给大口径子弹 (只有透过高倍率光学瞄镜才能看到)</Chinesesimp>
+            <Turkish>Yüksek kalibreli mermilere mermi izleme efekti sağlar (yalnızca yüksek güçlü optiklerden bakıldığında görülebilir)</Turkish>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_simulationInterval_DisplayName">
             <English>Simulation Interval</English>
@@ -278,6 +284,7 @@
             <Korean>플레이어 주위의 발사체를 고급 탄도학으로 정의하는 범위를 정합니다(미터)</Korean>
             <Chinese>以玩家的半徑距離(公尺)定義先進彈道系統啟用範圍</Chinese>
             <Chinesesimp>以玩家的半径距离(公尺)定义先进弹道系统启用范围</Chinesesimp>
+            <Turkish>Mermilere gelişmiş balistik uygulandığı oyuncunun etrafındaki yarıçapı (metre cinsinden) tanımlar</Turkish>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_Description">
             <English>This module enables advanced ballistics simulation - meaning the trajectory of projectiles is influenced by variables like air temperature, atmospheric pressure, humidity, gravity, the type of ammunition and the weapon from which it was fired.</English>

addons/arsenal/ACE_Arsenal_Sorts.hpp

@@ -4,6 +4,7 @@ class GVAR(sorts) {
         displayName = "";
         tabs[] = {{}, {}};
         statement = "";
+        condition = "true";
     };
 
     class ACE_alphabetically: sortBase {
@@ -27,24 +28,32 @@ class GVAR(sorts) {
         statement = QUOTE(_this call FUNC(sortStatement_mass));
     };
 
+    class ACE_amount: sortBase {
+        scope = 2;
+        displayName = CSTRING(sortByAmountText);
+        tabs[] = {{}, {0,1,2,3,4,5,6,7}};
+        statement = QUOTE(_this call FUNC(sortStatement_amount));
+        condition = QUOTE(_this select 0); // Only show for containers
+    };
+
     class ACE_load: sortBase {
         scope = 2;
         displayName = CSTRING(sortByLoadText);
         tabs[] = {{3,4,5}, {}};
-        statement = QUOTE(getContainerMaxLoad configName _this);
+        statement = QUOTE(getContainerMaxLoad (_this select 1));
     };
 
     class ACE_accuracy: sortBase {
         scope = 2;
         displayName = CSTRING(sortByAccuracyText);
-        tabs[] = {{0,1,2}, {}};
+        tabs[] = {{0,1}, {}};
         statement = QUOTE(_this call FUNC(sortStatement_accuracy));
     };
 
     class ACE_rateOfFire: sortBase {
         scope = 2;
         displayName = CSTRING(sortByRateOfFireText);
-        tabs[] = {{0,1,2}, {}};
+        tabs[] = {{0,1}, {}};
         statement = QUOTE(_this call FUNC(sortStatement_rateOfFire));
     };
 
@@ -61,4 +70,16 @@ class GVAR(sorts) {
         tabs[] = {{}, {4}};
         statement = QUOTE(_this call FUNC(sortStatement_magCount));
     };
+
+    class ACE_protectionBallistic: sortBase {
+        scope = 2;
+        displayName = CSTRING(sortByProtectionBallistic);
+        tabs[] = {{3,4,6}, {}};
+        statement = QUOTE([ARR_3(_this, 1000000, 1000)] call FUNC(sortStatement_protection));
+    };
+
+    class ACE_protectionExplosive: ACE_protectionBallistic {
+        displayName = CSTRING(sortByProtectionExplosive);
+        statement = QUOTE([ARR_3(_this, 1000, 1000000)] call FUNC(sortStatement_protection));
+    };
 };

addons/arsenal/XEH_PREP.hpp

@@ -64,9 +64,11 @@ PREP(scanConfig);
 PREP(showItem);
 PREP(sortPanel);
 PREP(sortStatement_accuracy);
+PREP(sortStatement_amount);
 PREP(sortStatement_magCount);
 PREP(sortStatement_mass);
 PREP(sortStatement_mod);
+PREP(sortStatement_protection);
 PREP(sortStatement_rateOfFire);
 PREP(sortStatement_scopeMag);
 PREP(statBarStatement_accuracy);

addons/arsenal/XEH_postInit.sqf

@@ -1,6 +1,8 @@
 #include "script_component.hpp"
 #include "defines.hpp"
 
+GVAR(currentBox) = objNull;
+
 GVAR(EH_ID) = 0;
 GVAR(lastSearchTextLeft) = "";
 GVAR(lastSearchTextRight) = "";

addons/arsenal/functions/fnc_addSort.sqf

@@ -10,12 +10,13 @@
  * 1: Sort Class (a unique string for each algorithm) <STRING>
  * 2: Display Name <STRING>
  * 3: Algorithm <CODE>
+ * 4: Condition (Optional)<CODE>
  *
  * Return Value:
  * 0: Array of IDs (ARRAY of STRINGS)
  *
  * Example:
- *  [[[0, 1]], "fireRateSort", "Sort by fire rate", {
+ *  [[[0, 1], []], "fireRateSort", "Sort by fire rate", {
  *      params ["_itemCfg"];
  *      private _fireModes = getArray (_itemCfg >> "modes");
  *      private _fireRate = [];
@@ -35,7 +36,8 @@ params [
     ["_tabs", [[], []], [[]], 2],
     ["_class", "", [""]],
     ["_displayName", "", [""]],
-    ["_statement", {}, [{}]]
+    ["_statement", {}, [{}]],
+    ["_condition", {true}, [{}]]
 ];
 
 _tabs params [
@@ -57,7 +59,7 @@ private _fnc_addToTabs = {
     } forEach _tabsToAddTo;
 };
 
-_finalArray = ["", _displayName, _statement];
+_finalArray = ["", _displayName, _statement, _condition];
 
 if !(_leftTabs isEqualTo []) then {
     [GVAR(sortListLeftPanel), _leftTabs, "L", 0] call _fnc_addToTabs;

addons/arsenal/functions/fnc_compileSorts.sqf

@@ -64,13 +64,18 @@ private _configEntries = "(getNumber (_x >> 'scope')) == 2" configClasses (confi
     private _class = configName _x;
     private _displayName = getText (_x >> "displayName");
     private _statement = getText (_x >> "statement");
+    private _condition = getText (_x >> "condition");
     (getArray (_x >> "tabs")) params ["_leftTabsList", "_rightTabsList"];
 
     if (_statement != "") then {
         _statement = compile _statement;
     };
 
-    _finalArray = ["", _displayName, _statement];
+    if (_condition != "") then {
+        _condition = compile _condition;
+    };
+
+    _finalArray = ["", _displayName, _statement, _condition];
 
     if !(_leftTabsList isEqualTo []) then {
         [_sortListLeftPanel, _leftTabsList, "L"] call _fnc_addToTabs;

addons/arsenal/functions/fnc_fillLeftPanel.sqf

@@ -153,8 +153,8 @@ switch true do {
                             _ctrlPanel lbSetTooltip [_lbAdd,format ["%1\n%2",_displayName, _configName]];
                             _x call ADDMODICON;
                         };
-                    } foreach ("isClass _x" configClasses _x);
-                } foreach ("isClass _x" configClasses (configfile >> "cfgfaces"));
+                    } foreach ("true" configClasses _x);
+                } foreach ("true" configClasses (configfile >> "cfgfaces"));
             };
             case IDC_buttonVoice : {
                 private _voices = (configProperties [(configFile >> "CfgVoice"), "isClass _x && {getNumber (_x >> 'scope') == 2}", true]) - [(configfile >> "CfgVoice" >> "NoVoice")];

addons/arsenal/functions/fnc_fillSort.sqf

@@ -90,9 +90,13 @@ private _sortIndex = 0;
 
 {
     if (_x isEqualTo []) exitWith {};
-    _sortCtrl lbAdd (_x select 1);
-    if ((_x select 1) isEqualTo _lastSort) then {
-        _sortIndex = _forEachIndex;
+    _x params ["_sortName", "_displayName", "", "_condition"];
+    if ([_right] call _condition) then {
+        private _index = _sortCtrl lbAdd _displayName;
+        _sortCtrl lbSetData [_index, _sortName];
+        if (_displayName isEqualTo _lastSort) then {
+            _sortIndex = _index;
+        };
     };
 } forEach _sorts;
 

addons/arsenal/functions/fnc_onArsenalClose.sqf

@@ -80,6 +80,8 @@ if (isMultiplayer) then {
     [QGVAR(center) + "_voice", GVAR(center)] call CBA_fnc_removeGlobalEventJIP;
 };
 
+GVAR(currentBox) = objNull;
+
 GVAR(camera) = nil;
 GVAR(cameraHelper) = nil;
 

addons/arsenal/functions/fnc_openBox.sqf

@@ -41,6 +41,8 @@ if (isNil "_displayToUse" || {!isnil QGVAR(camera)}) exitWith {
     [localize LSTRING(CantOpenDisplay), false, 5, 1] call EFUNC(common,displayText);
 };
 
+GVAR(currentBox) = _object;
+
 if (_mode) then {
     GVAR(virtualItems) = +(uiNamespace getVariable QGVAR(configItems));
 } else {

addons/arsenal/functions/fnc_sortPanel.sqf

@@ -97,12 +97,13 @@ private _selected = if (_right) then {
     _panel lbData _curSel
 };
 
-private _mode = 0 max lbCurSel _sortControl;
-private _statement = _sorts select _mode select 2;
+private _sortName = _sortControl lbData (0 max lbCurSel _sortControl);
+private _sortConfig = _sorts select (0 max (_sorts findIf {(_x select 0) isEqualTo _sortName}));
+private _statement = _sortConfig select 2;
 
 missionNamespace setVariable [
     [QGVAR(lastSortLeft), QGVAR(lastSortRight)] select _rightSort,
-    _sorts select _mode select 1
+    _sortConfig select 1
 ];
 
 private _for = if (_right) then {
@@ -117,8 +118,13 @@ _for do {
     } else {
         _panel lbData _i
     };
+    private _quantity = if (_right) then {
+        parseNumber (_panel lnbText [_i, 2])
+    } else {
+        0
+    };
     private _itemCfg = _cfgClass >> _item;
-    private _value = _itemCfg call _statement;
+    private _value = [_itemCfg, _item, _quantity] call _statement;
     if (_value isEqualType 0) then {
         _value = [_value, 8] call CBA_fnc_formatNumber;
     };

addons/arsenal/functions/fnc_sortStatement_amount.sqf

@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+/*
+ * Author: SynixeBrett
+ * Statement to sort items by the amount in inventory.
+ *
+ * Arguments:
+ * 0: Item Config <CONFIG>
+ * 1: Item Name <STRING>
+ * 2: Quantity <NUMBER>
+ *
+ * Return Value:
+ * Sorting Value <NUMBER>
+ *
+ * Public: No
+*/
+
+params ["", "", "_quantity"];
+
+10000 - _quantity

addons/arsenal/functions/fnc_sortStatement_protection.sqf

@@ -0,0 +1,24 @@
+#include "script_component.hpp"
+/*
+ * Author: PabstMirror
+ * Statement to sort items by their protection (combination of ballistic and explosive).
+ *
+ * Arguments:
+ * 0: Item Config <CONFIG>
+ * 1: Ballistic (passthrough) coefficent <NUMBER>
+ * 2: Explosive (armor) coefficent <NUMBER>
+ *
+ * Return Value:
+ * Sorting Value <NUMBER>
+ *
+ * Public: No
+*/
+
+params ["_itemInfo", "_ballisticCo", "_explosiveCo"];
+_itemInfo params ["_itemCfg"];
+
+(([[_itemCfg], ["passthrough", "armor"]] call BIS_fnc_configExtremes) select 1) params [["_passthroughMax", 0], ["_armorMax", 0]];
+
+private _protectionCombined = _passthroughMax * _ballisticCo + _armorMax * _explosiveCo;
+
+_protectionCombined