diff --git a/addons/attach/functions/fnc_detach.sqf b/addons/attach/functions/fnc_detach.sqf
index 38acbc1883c..7c68831f36a 100644
--- a/addons/attach/functions/fnc_detach.sqf
+++ b/addons/attach/functions/fnc_detach.sqf
@@ -47,7 +47,7 @@ private _isChemlight = _attachedObject isKindOf "Chemlight_base";
// Exit if can't add the item
if (!([_unit, _itemName] call CBA_fnc_canAddItem) && {!_isChemlight}) exitWith {
- [localize LSTRING(Inventory_Full)] call EFUNC(common,displayTextStructured);
+ [LELSTRING(common,Inventory_Full)] call EFUNC(common,displayTextStructured);
};
// Add item to inventory (unless it's a chemlight)
diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml
index 44af6990176..831c4384e4b 100644
--- a/addons/attach/stringtable.xml
+++ b/addons/attach/stringtable.xml
@@ -154,23 +154,6 @@
已取下萤光棒Işık Çubuğu Söküldü
-
- No inventory space
- Kein Platz im Inventar
- Sin espacio en inventario
- Brak miejsca w ekwipunku
- Pas de place dans l'inventaire
- Nedostatek místa v inventáři
- Sem espaço no inventário
- Non hai più spazio
- Nincs több hely
- В инвентаре нет места
- インベントリに空きがない
- 넣을 공간이 없음
- 無可用空間
- 无可用空间
- Envanter de alan yok
- IR StrobeIR-Stroboskop
diff --git a/addons/chemlights/stringtable.xml b/addons/chemlights/stringtable.xml
index 86deea03808..c1c6c930d8d 100644
--- a/addons/chemlights/stringtable.xml
+++ b/addons/chemlights/stringtable.xml
@@ -49,23 +49,6 @@
%1<br/>Preparado%1<br/> Hazırlandı
-
- No inventory space
- Kein Platz im Inventar
- Sin espacio en inventario
- Brak miejsca w ekwipunku
- Pas de place dans l'inventaire
- Nedostatek místa v inventáři
- Sem espaço no inventário
- Nessuno spazio nell'inventario
- Nincs több hely
- В инвентаре нет места
- インベントリに空きがありません
- 소지품 공간이 없음
- 已無存放空間
- 已无存放空间
- Envanter de alan yok
- [ACE] Chemlights[ACE] ケミライト
diff --git a/addons/common/functions/fnc_cbaSettings_convertHelper.sqf b/addons/common/functions/fnc_cbaSettings_convertHelper.sqf
index b2b23eec914..6e7a4456c71 100644
--- a/addons/common/functions/fnc_cbaSettings_convertHelper.sqf
+++ b/addons/common/functions/fnc_cbaSettings_convertHelper.sqf
@@ -110,7 +110,6 @@ private _settings = configProperties [configFile >> "ACE_Settings", "(isClass _x
private _gvarName = _varName select [_addonSearchCount];
- _output pushBack "";
_output pushBack format ["["];
_output pushBack format [" QGVAR(%1), ""%2"",", _gvarName, _cbaSettingType];
_output pushBack format [" [LSTRING(), LSTRING()], // %1, %2", _localizedName, _localizedDescription]; //IGNORE_STRING_WARNING(str_ace_common_);
@@ -124,6 +123,7 @@ private _settings = configProperties [configFile >> "ACE_Settings", "(isClass _x
};
_output pushBack format [" %1 // Needs mission restart", _warnIfChangedMidMission];
_output pushBack "] call CBA_fnc_addSetting;";
+ _output pushBack "";
} forEach _settings;
copyToClipboard (_output joinString endl);
diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml
index fb94add8b65..4325f152bf4 100644
--- a/addons/common/stringtable.xml
+++ b/addons/common/stringtable.xml
@@ -1296,6 +1296,23 @@
没有空间可卸载언로드 할 공간이 없습니다.
+
+ No inventory space
+ Kein Platz im Inventar
+ Sin espacio en inventario
+ Brak miejsca w ekwipunku
+ Pas de place dans l'inventaire
+ Nedostatek místa v inventáři
+ Sem espaço no inventário
+ Non hai più spazio
+ Nincs több hely
+ В инвентаре нет места
+ インベントリに空きがない
+ 넣을 공간이 없음
+ 無可用空間
+ 无可用空间
+ Envanter de alan yok
+ Toggleпереключить
diff --git a/addons/hearing/functions/fnc_removeEarplugs.sqf b/addons/hearing/functions/fnc_removeEarplugs.sqf
index 55ba422beb4..8399a3a84f3 100644
--- a/addons/hearing/functions/fnc_removeEarplugs.sqf
+++ b/addons/hearing/functions/fnc_removeEarplugs.sqf
@@ -21,7 +21,7 @@ params ["_player", ["_displayHint", false, [false]]];
if (!GVAR(EnableCombatDeafness)) exitWith {};
if !([_player, "ACE_EarPlugs"] call CBA_fnc_canAddItem) exitWith { // inventory full
- [localize LSTRING(Inventory_Full)] call EFUNC(common,displayTextStructured);
+ [LELSTRING(common,Inventory_Full)] call EFUNC(common,displayTextStructured);
};
// Plugs already in and removing them.
diff --git a/addons/hearing/stringtable.xml b/addons/hearing/stringtable.xml
index e5a8ca2bab0..b67f363b000 100644
--- a/addons/hearing/stringtable.xml
+++ b/addons/hearing/stringtable.xml
@@ -119,23 +119,6 @@
你沒有耳塞Kulak Tıkacın Yok
-
- No inventory space
- Kein Platz im Inventar
- Sin espacio en el inventario
- Brak miejsca w ekwipunku
- Il n'y a plus de place dans l'inventaire.
- Není místo v inventáři
- Non hai abbastanza spazio
- Não há espaço no inventário
- Nincs több hely
- Нет места в инвентаре
- インベントリに空きがありません
- 넣을 공간이 없습니다
- 无可用空间
- 無可用空間
- Envanterin de alan yok
- Disable ear ringingDésactiver les bourdonnements
diff --git a/addons/interaction/ACE_Settings.hpp b/addons/interaction/ACE_Settings.hpp
index 3efb745a6b4..67497ec23b0 100644
--- a/addons/interaction/ACE_Settings.hpp
+++ b/addons/interaction/ACE_Settings.hpp
@@ -1,24 +1,12 @@
class ACE_Settings {
class GVAR(enableTeamManagement) {
- category = CSTRING(DisplayName);
- displayName = CSTRING(EnableTeamManagement_DisplayName);
- description = CSTRING(EnableTeamManagement_Description);
- value = 1;
- typeName = "BOOL";
+ movedToSQF = 1;
};
class GVAR(enableMagazinePassing) {
- category = CSTRING(DisplayName);
- value = 1;
- typeName = "BOOL";
- isClientSettable = 1;
- displayName = CSTRING(PassMagazineSetting);
+ movedToSQF = 1;
};
class GVAR(disableNegativeRating) {
- category = CSTRING(DisplayName);
- displayName = CSTRING(DisableNegativeRating_DisplayName);
- description = CSTRING(DisableNegativeRating_Description);
- value = 0;
- typeName = "BOOL";
+ movedToSQF = 1;
};
};
diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
index 3b53bf925c0..de80f3e1e1f 100644
--- a/addons/interaction/CfgVehicles.hpp
+++ b/addons/interaction/CfgVehicles.hpp
@@ -312,6 +312,14 @@ class CfgVehicles {
statement = "";
showDisabled = 1;
icon = ""; // @todo
+
+ class GVAR(weaponAttachments) {
+ displayName = "$STR_A3_CfgEditorSubcategories_EdSubcat_SideSlot0";
+ condition = QGVAR(enableWeaponAttachments);
+ exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"};
+ insertChildren = QUOTE(call DFUNC(getWeaponAttachmentsActions));
+ modifierFunction = QUOTE(_this select 3 set [ARR_2(2, getText (configFile >> 'CfgWeapons' >> currentWeapon (_this select 0) >> 'picture'))];);
+ };
};
};
};
diff --git a/addons/interaction/XEH_PREP.hpp b/addons/interaction/XEH_PREP.hpp
index a63bfc48f8f..8eada17e3da 100644
--- a/addons/interaction/XEH_PREP.hpp
+++ b/addons/interaction/XEH_PREP.hpp
@@ -33,6 +33,10 @@ PREP(pardon);
PREP(canPullOutBody);
PREP(pullOutBody);
+// Weapon Attachments
+PREP(getWeaponAttachmentsActions);
+PREP(switchWeaponAttachment);
+
// interaction with doors
PREP(getDoor);
PREP(getGlassDoor);
diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf
index 7a9f2b6572d..933cead137b 100644
--- a/addons/interaction/XEH_postInit.sqf
+++ b/addons/interaction/XEH_postInit.sqf
@@ -135,3 +135,9 @@ GVAR(isOpeningDoor) = false;
}];
};
}] call CBA_fnc_addEventHandler;
+
+{
+ [_x, {
+ [QGVAR(clearWeaponAttachmentsActionsCache)] call CBA_fnc_localEvent;
+ }] call CBA_fnc_addPlayerEventHandler;
+} forEach ["loadout", "weapon"];
diff --git a/addons/interaction/XEH_preInit.sqf b/addons/interaction/XEH_preInit.sqf
index dbc37e2bb68..855d651d556 100644
--- a/addons/interaction/XEH_preInit.sqf
+++ b/addons/interaction/XEH_preInit.sqf
@@ -6,6 +6,8 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp"
PREP_RECOMPILE_END;
+#include "initSettings.sqf"
+
DFUNC(repair_Statement) = { // moved from config because of build problems
TRACE_1("repair_Statement",_this);
{
diff --git a/addons/interaction/functions/fnc_getWeaponAttachmentsActions.sqf b/addons/interaction/functions/fnc_getWeaponAttachmentsActions.sqf
new file mode 100644
index 00000000000..cd0e8f9730c
--- /dev/null
+++ b/addons/interaction/functions/fnc_getWeaponAttachmentsActions.sqf
@@ -0,0 +1,68 @@
+#include "script_component.hpp"
+/*
+ * Author: mharis001, Dystopian
+ * Returns children actions for weapon attachment switching.
+ *
+ * Arguments:
+ * 0: Unit
+
+ Attach %1
+ Установить %1
+
+
+ Detach %1
+ Снять %1
+
+
+ Enables attach/detach weapon attachment actions for current weapon.
+ Включает действия Установить/Снять для приспособлений текущего оружия.
+
diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
index 36015f36ac2..b8e9bcf69c1 100644
--- a/addons/main/script_mod.hpp
+++ b/addons/main/script_mod.hpp
@@ -11,7 +11,7 @@
// MINIMAL required version for the Mod. Components can specify others..
#define REQUIRED_VERSION 2.02
-#define REQUIRED_CBA_VERSION {3,15,0}
+#define REQUIRED_CBA_VERSION {3,15,2}
#ifdef COMPONENT_BEAUTIFIED
#define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)