(default: false)
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [cursorObject, player, player] call ace_vehicle_damage_fnc_medicalDamage;
+ *
+ * Public: No
+ */
+
+params ["_unit", "_source", "_instigator", ["_guaranteeDeath", false]];
+
+// Check if unit is invulnerable
+if !(isDamageAllowed _unit && {_unit getVariable [QEGVAR(medical,allowDamage), true]}) exitWith {};
+
+if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
+ for "_i" from 0 to floor (4 + random 3) do {
+ [_unit, random [0, 0.66, 1], selectRandom ["Head", "Body", "LeftArm", "RightArm", "LeftLeg", "RightLeg"], selectRandom ["bullet", "shell", "explosive"], _instigator] call EFUNC(medical,addDamageToUnit);
+ };
+} else {
+ {
+ _unit setHitPointDamage [_x, (_unit getHitPointDamage _x) + random [0, 0.66, 1], true, _source, _instigator];
+ } forEach ["HitFace", "HitNeck", "HitHead", "HitPelvis", "HitAbdomen", "HitDiaphragm", "HitChest", "HitBody", "HitArms", "HitHands", "HitLegs"];
+};
+
+// If guaranteed death is wished
+if (_guaranteeDeath && {alive _unit}) then {
+ [_unit, QGVAR(medicalDamage), _source, _instigator] call EFUNC(common,setDead);
+};
diff --git a/addons/vehicle_damage/functions/fnc_processHit.sqf b/addons/vehicle_damage/functions/fnc_processHit.sqf
index 2d29825c93..2402df7fc2 100644
--- a/addons/vehicle_damage/functions/fnc_processHit.sqf
+++ b/addons/vehicle_damage/functions/fnc_processHit.sqf
@@ -37,12 +37,10 @@ if (_newDamage >= 15) exitWith {
TRACE_2("immediate destruction - high damage",_newDamage,_currentPartDamage);
[_vehicle] call FUNC(knockOut);
[_vehicle, 1] call FUNC(handleDetonation);
- // kill everyone inside for very insane damage
+ // Kill everyone inside for very insane damage
{
- _x setDamage 1;
- _x setVariable [QEGVAR(medical,lastDamageSource), _injurer];
- _x setVariable [QEGVAR(medical,lastInstigator), _injurer];
- } forEach crew _vehicle;
+ [QGVAR(medicalDamage), [_x, _injurer, _injurer, true], _x] call CBA_fnc_targetEvent;
+ } forEach (crew _vehicle);
_vehicle setDamage 1;
_return = false;
_return
diff --git a/addons/vehiclelock/initSettings.inc.sqf b/addons/vehiclelock/initSettings.inc.sqf
index 9f68c77e7c..dcb520e7e2 100644
--- a/addons/vehiclelock/initSettings.inc.sqf
+++ b/addons/vehiclelock/initSettings.inc.sqf
@@ -3,8 +3,7 @@
[LSTRING(DefaultLockpickStrength_DisplayName), LSTRING(DefaultLockpickStrength_Description)],
LSTRING(DisplayName),
[-1,60,10,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
- true, // isGlobal
- {[QGVAR(defaultLockpickStrength), _this] call EFUNC(common,cbaSettings_settingChanged)}
+ true // isGlobal
] call CBA_fnc_addSetting;
[
diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml
index 55600489e8..7cfa58d07a 100644
--- a/addons/vehiclelock/stringtable.xml
+++ b/addons/vehiclelock/stringtable.xml
@@ -365,7 +365,7 @@
Alapértelmezett idő a zárfeltöréshez (másodpercben). Alapértelmezett: 10
Время для взлома замка отмычкой (в секундах). По умолчанию: 10
Tempo Default richiesto per forzare serrature (in secondi). Predefinito: 10
- Lockpickを使った作業の所要時間の標準設定。(秒) デフォルト: 10
+ Lockpickを使った作業の所要時間の標準設定。 (秒単位) デフォルト: 10
해정을 위해 들이는 기본시간입니다(초 단위). 기본설정: 10
开锁时间（秒）。预设：10
開鎖時間(秒)。預設:10
diff --git a/addons/viewdistance/stringtable.xml b/addons/viewdistance/stringtable.xml
index 4404d0efe8..eb7ed94838 100644
--- a/addons/viewdistance/stringtable.xml
+++ b/addons/viewdistance/stringtable.xml
@@ -96,7 +96,7 @@
Korlátozza, mekkora látótávolságot állíthatnak be a kliensek (maximum 10000-ig)
Устанавливает предел дальности, насколько клиенты могут увеличить свою дальность видимости (до 10000)
Imposta il limite massimo a cui i client possono alzare la propria distanza visiva (massimo 10000)
- 各クライアントが設定できる視界距離の上限を設定します。(最大 10000)
+ 各クライアントが設定できる視界距離の上限 (最大 10000)
클라이언트가 최대 얼마나 멀리 볼 수 있는지 제한을 둡니다 (10000 까지 가능)
设定客户端最高可显示的视距（最高至10000）
設定客戶端最高可顯示的視野距離 (最高至10000)
diff --git a/addons/viewrestriction/initSettings.inc.sqf b/addons/viewrestriction/initSettings.inc.sqf
index 3ed47c10ef..80382f5b19 100644
--- a/addons/viewrestriction/initSettings.inc.sqf
+++ b/addons/viewrestriction/initSettings.inc.sqf
@@ -6,7 +6,7 @@
[[0, 1, 2, 3], [LSTRING(Disabled), LSTRING(FirstPerson), LSTRING(ThirdPerson), LSTRING(Selective)], 0],
true,
{[QGVAR(mode), _this] call EFUNC(common,cbaSettings_settingChanged)},
- true
+ true // Needs mission restart
] call CBA_fnc_addSetting;
[
@@ -17,7 +17,7 @@
[[0, 1, 2], [LSTRING(Disabled), LSTRING(FirstPerson), LSTRING(ThirdPerson)], 0],
true,
{[QGVAR(modeSelectiveFoot), _this] call EFUNC(common,cbaSettings_settingChanged)},
- true
+ true // Needs mission restart
] call CBA_fnc_addSetting;
[
@@ -28,7 +28,7 @@
[[0, 1, 2], [LSTRING(Disabled), LSTRING(FirstPerson), LSTRING(ThirdPerson)], 0],
true,
{[QGVAR(modeSelectiveLand), _this] call EFUNC(common,cbaSettings_settingChanged)},
- true
+ true // Needs mission restart
] call CBA_fnc_addSetting;
[
@@ -39,7 +39,7 @@
[[0, 1, 2], [LSTRING(Disabled), LSTRING(FirstPerson), LSTRING(ThirdPerson)], 0],
true,
{[QGVAR(modeSelectiveAir), _this] call EFUNC(common,cbaSettings_settingChanged)},
- true
+ true // Needs mission restart
] call CBA_fnc_addSetting;
[
@@ -50,7 +50,7 @@
[[0, 1, 2], [LSTRING(Disabled), LSTRING(FirstPerson), LSTRING(ThirdPerson)], 0],
true,
{[QGVAR(modeSelectiveSea), _this] call EFUNC(common,cbaSettings_settingChanged)},
- true
+ true // Needs mission restart
] call CBA_fnc_addSetting;
[
diff --git a/addons/volume/initSettings.inc.sqf b/addons/volume/initSettings.inc.sqf
index 8735f81527..44bb464a1e 100644
--- a/addons/volume/initSettings.inc.sqf
+++ b/addons/volume/initSettings.inc.sqf
@@ -3,9 +3,6 @@
"CHECKBOX",
[ELSTRING(common,Enabled), LSTRING(KeybindDescription)],
format ["ACE %1", LLSTRING(Name)],
- false,
- false,
- {[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
false
] call CBA_fnc_addSetting;
@@ -14,10 +11,7 @@
"LIST",
[LSTRING(Reduction), LSTRING(ReductionDescription)],
format ["ACE %1", LLSTRING(Name)],
- [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], ["0%", "10%", "20%", "30%", "40%", "50%", "60%", "70%", "80%", "90%", "100%"], 5],
- false,
- {[QGVAR(reduction), _this] call EFUNC(common,cbaSettings_settingChanged)},
- false
+ [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], ["0%", "10%", "20%", "30%", "40%", "50%", "60%", "70%", "80%", "90%", "100%"], 5]
] call CBA_fnc_addSetting;
[
@@ -25,10 +19,7 @@
"LIST",
[LSTRING(FadeDelay), LSTRING(FadeDelayDescription)],
format ["ACE %1", LLSTRING(Name)],
- [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], ["0s", "1s", "2s", "3s", "4s", "5s", "6s", "7s", "8s", "9s", "10s"], 1],
- false,
- {[QGVAR(fadeDelay), _this] call EFUNC(common,cbaSettings_settingChanged)},
- false
+ [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], ["0s", "1s", "2s", "3s", "4s", "5s", "6s", "7s", "8s", "9s", "10s"], 1]
] call CBA_fnc_addSetting;
[
@@ -36,9 +27,6 @@
"CHECKBOX",
[LSTRING(LowerInVehicles), LSTRING(LowerInVehiclesDescription)],
format ["ACE %1", LLSTRING(Name)],
- false,
- false,
- {[QGVAR(lowerInVehicles), _this] call EFUNC(common,cbaSettings_settingChanged)},
false
] call CBA_fnc_addSetting;
@@ -47,10 +35,7 @@
"CHECKBOX",
[LSTRING(ShowNotification), LSTRING(ShowNotificationDescription)],
format ["ACE %1", LLSTRING(Name)],
- true,
- false,
- {[QGVAR(showNotification), _this] call EFUNC(common,cbaSettings_settingChanged)},
- false
+ true
] call CBA_fnc_addSetting;
[
@@ -58,8 +43,5 @@
"CHECKBOX",
[LSTRING(RemindIfLowered), LSTRING(RemindIfLoweredDescription)],
format ["ACE %1", LLSTRING(Name)],
- false,
- false,
- {[QGVAR(remindIfLowered), _this] call EFUNC(common,cbaSettings_settingChanged)},
false
] call CBA_fnc_addSetting;
diff --git a/addons/volume/stringtable.xml b/addons/volume/stringtable.xml
index ea0eabf4eb..feecb28b10 100644
--- a/addons/volume/stringtable.xml
+++ b/addons/volume/stringtable.xml
@@ -168,7 +168,7 @@
Time it takes (in seconds) for the sound to fade in/out.
Zeit, die es benötigt (in Sekunden), für das Geräusch, ein- bzw. auszublenden.
- 音がフェードイン/アウトするまでの時間 (秒) を決定します。
+ 音がフェードイン/アウトするまでの時間。 (秒単位)
Temps nécessaire (en secondes) aux sons pour être réduits/rétablis.
페이드 인/아웃 되는데 걸리는 시간(초)
设定音量淡出/入时所需的秒数。
diff --git a/addons/weaponselect/initSettings.inc.sqf b/addons/weaponselect/initSettings.inc.sqf
index 029c5201cb..f5695748b4 100644
--- a/addons/weaponselect/initSettings.inc.sqf
+++ b/addons/weaponselect/initSettings.inc.sqf
@@ -2,7 +2,5 @@
QGVAR(displayText), "CHECKBOX",
[LSTRING(SettingDisplayTextName), LSTRING(SettingDisplayTextDesc)],
ELSTRING(common,ACEKeybindCategoryWeapons),
- true, // default value
- false, // isGlobal
- {[QGVAR(displayText), _this] call EFUNC(common,cbaSettings_settingChanged)}
+ true // default value
] call CBA_fnc_addSetting;
diff --git a/addons/weather/functions/fnc_getMapData.sqf b/addons/weather/functions/fnc_getMapData.sqf
index c1cae6e2f8..555704fc87 100644
--- a/addons/weather/functions/fnc_getMapData.sqf
+++ b/addons/weather/functions/fnc_getMapData.sqf
@@ -48,34 +48,35 @@ GVAR(currentHumidity) = 0;
GVAR(currentOvercast) = 0;
// Get all non inherited arrays to filter maps that inherit from Stratis/Altis/Tanoa
-private _nonInheritedArrays = configProperties [configFile >> "CfgWorlds" >> _worldName, "isArray _x", false];
+private _cfgPath = configFile >> "CfgWorlds" >> _worldName;
+private _nonInheritedArrays = configProperties [_cfgPath, "isArray _x", false];
// And check if any custom non-inherited weather is defined through config and use that if so
-if ((configFile >> "CfgWorlds" >> _worldName >> "ACE_TempDay") in _nonInheritedArrays) exitWith {
- if (isArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_TempDay")) then {
- GVAR(TempDay) = getArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_TempDay");
+if ((_cfgPath >> "ACE_TempDay") in _nonInheritedArrays) exitWith {
+ if (isArray (_cfgPath >> "ACE_TempDay")) then {
+ GVAR(TempDay) = getArray (_cfgPath >> "ACE_TempDay");
};
- if (isArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_TempNight")) then {
- GVAR(TempNight) = getArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_TempNight");
+ if (isArray (_cfgPath >> "ACE_TempNight")) then {
+ GVAR(TempNight) = getArray (_cfgPath >> "ACE_TempNight");
};
- if (isArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_Humidity")) then {
- GVAR(Humidity) = getArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_Humidity");
+ if (isArray (_cfgPath >> "ACE_Humidity")) then {
+ GVAR(Humidity) = getArray (_cfgPath >> "ACE_Humidity");
};
- if (isArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_WindSpeedMin")) then {
- GVAR(WindSpeedMin) = getArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_WindSpeedMin");
+ if (isArray (_cfgPath >> "ACE_WindSpeedMin")) then {
+ GVAR(WindSpeedMin) = getArray (_cfgPath >> "ACE_WindSpeedMin");
};
- if (isArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_WindSpeedMean")) then {
- GVAR(WindSpeedMean) = getArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_WindSpeedMean");
+ if (isArray (_cfgPath >> "ACE_WindSpeedMean")) then {
+ GVAR(WindSpeedMean) = getArray (_cfgPath >> "ACE_WindSpeedMean");
};
- if (isArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_WindSpeedMax")) then {
- GVAR(WindSpeedMax) = getArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_WindSpeedMax");
+ if (isArray (_cfgPath >> "ACE_WindSpeedMax")) then {
+ GVAR(WindSpeedMax) = getArray (_cfgPath >> "ACE_WindSpeedMax");
};
- if (isArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_WindDirectionProbabilities")) then {
- GVAR(WindDirectionProbabilities) = getArray (configFile >> "CfgWorlds" >> _worldName >> "ACE_WindDirectionProbabilities");
+ if (isArray (_cfgPath >> "ACE_WindDirectionProbabilities")) then {
+ GVAR(WindDirectionProbabilities) = getArray (_cfgPath >> "ACE_WindDirectionProbabilities");
};
};
// Check if the map is among the most popular
-if (_worldName in ["chernarus", "bootcamp_acr", "woodland_acr", "utes"]) then {
+if (_worldName in ["chernarus", "bootcamp_acr", "woodland_acr", "utes"]) exitWith {
// Source: http://www.iten-online.ch/klima/europa/tschechien/prag.htm
GVAR(TempDay) = [1, 3, 9, 14, 19, 23, 25, 24, 21, 13, 7, 2];
GVAR(TempNight) = [-4, -3, 0, 4, 9, 12, 14, 14, 10, 6, 2, -2];
@@ -239,3 +240,17 @@ if (_worldName in ["kunduz"]) exitWith {
[0.04, 0.02, 0.05, 0.14, 0.19, 0.07, 0.10, 0.07] // December
];
};
+
+
+// Catches any "Winter" Map that hasnt been defined otherwise - this should stay at the end of the file
+// Values are not based on any RL reference since the snow terrain textures persists regardless the date
+_cfgPath = _cfgPath >> "RainParticles";
+if (
+ "winter" in _worldName ||
+ {"snow" in getText (_cfgPath >> "rainDropTexture")} ||
+ {getNumber (_cfgPath >> "snow") != 0}
+) exitWith {
+ GVAR(TempDay) = [-10,-9,-8,-7,-6,-5,-6,-7,-8,-9,-10,-11];
+ GVAR(TempNight) = [-15,-14,-13,-12,-11,-10,-9,-10,-11,-12,-13,-17];
+ GVAR(Humidity) = [82, 80, 81, 82, 83, 82, 81, 82, 83, 82, 83, 82];
+};
diff --git a/addons/weather/initSettings.inc.sqf b/addons/weather/initSettings.inc.sqf
index fb11e31e75..26f4442084 100644
--- a/addons/weather/initSettings.inc.sqf
+++ b/addons/weather/initSettings.inc.sqf
@@ -34,6 +34,5 @@ private _category = [format ["ACE %1", LLSTRING(Module_DisplayName)]];
QGVAR(showCheckAirTemperature), "CHECKBOX",
[LSTRING(showCheckAirTemperature_DisplayName), LELSTRING(common,showActionInSelfInteraction)],
_category,
- true, // default value
- false // isGlobal
+ true // default value
] call CBA_fnc_addSetting;
diff --git a/addons/weather/stringtable.xml b/addons/weather/stringtable.xml
index 55306f4a01..bb815b8d06 100644
--- a/addons/weather/stringtable.xml
+++ b/addons/weather/stringtable.xml
@@ -130,7 +130,7 @@
Megadja az intervallumot (másodpercben) az időjárás-frissítések között
Определяет интервал (в секундах) между обновлениями погоды
Definisce l'intervallo (in secondi) tra aggiornamenti del meteo
- 天候を更新する間隔を定義します。(秒)
+ 天候を更新する間隔 (秒) を定義します
기후를 갱신하는 간격을 초 단위로 정합니다.
设定天气更新的时间间隔（秒）
設定天氣更新的時間間隔(秒)
diff --git a/addons/zeus/CfgVehicles.hpp b/addons/zeus/CfgVehicles.hpp
index 2a1f261125..5fb4a4f61a 100644
--- a/addons/zeus/CfgVehicles.hpp
+++ b/addons/zeus/CfgVehicles.hpp
@@ -256,6 +256,12 @@ class CfgVehicles {
displayName = CSTRING(ModuleSimulation_DisplayName);
function = QFUNC(moduleSimulation);
};
+ class GVAR(moduleSpectator): GVAR(moduleBase) {
+ curatorCanAttach = 1;
+ category = QGVAR(Utility);
+ displayName = ECSTRING(spectator,Module_DisplayName);
+ curatorInfoType = QGVAR(RscSpectator);
+ };
class GVAR(moduleSuicideBomber): GVAR(moduleBase) {
curatorCanAttach = 1;
category = QGVAR(AI);
diff --git a/addons/zeus/XEH_PREP.hpp b/addons/zeus/XEH_PREP.hpp
index 8de15147bd..69dd7b18a6 100644
--- a/addons/zeus/XEH_PREP.hpp
+++ b/addons/zeus/XEH_PREP.hpp
@@ -34,6 +34,7 @@ PREP(moduleSetMedicalVehicle);
PREP(moduleSetRepairFacility);
PREP(moduleSetRepairVehicle);
PREP(moduleSimulation);
+PREP(moduleSpectator);
PREP(moduleSuicideBomber);
PREP(moduleSuppressiveFire);
PREP(moduleSuppressiveFireLocal);
@@ -56,6 +57,7 @@ PREP(ui_groupSide);
PREP(ui_patrolArea);
PREP(ui_searchArea);
PREP(ui_setEngineer);
+PREP(ui_spectator);
PREP(ui_suicideBomber);
PREP(ui_teleportPlayers);
PREP(ui_toggleFlashlight);
diff --git a/addons/zeus/XEH_postInit.sqf b/addons/zeus/XEH_postInit.sqf
index b4d1302ab5..15b4c15f76 100644
--- a/addons/zeus/XEH_postInit.sqf
+++ b/addons/zeus/XEH_postInit.sqf
@@ -11,6 +11,7 @@ QGVAR(GlobalSkillAI) addPublicVariableEventHandler FUNC(moduleGlobalSetSkill);
[QGVAR(moduleSearchNearby), CBA_fnc_searchNearby] call CBA_fnc_addEventHandler;
[QGVAR(moduleSearchArea), CBA_fnc_taskSearchArea] call CBA_fnc_addEventHandler;
[QGVAR(suppressiveFire), LINKFUNC(moduleSuppressiveFireLocal)] call CBA_fnc_addEventHandler;
+[QGVAR(moduleSpectator), LINKFUNC(moduleSpectator)] call CBA_fnc_addEventHandler;
// Editable object commands must be ran on server, this events are used in the respective module
if (isServer) then {
diff --git a/addons/zeus/config.cpp b/addons/zeus/config.cpp
index 2714c247b0..d90c906294 100644
--- a/addons/zeus/config.cpp
+++ b/addons/zeus/config.cpp
@@ -99,6 +99,11 @@ class CfgPatches {
QGVAR(moduleLayTrench)
};
};
+ class GVAR(spectator): ADDON {
+ units[] = {
+ QGVAR(moduleSpectator)
+ };
+ };
};
class ACE_Curator {
@@ -112,6 +117,7 @@ class ACE_Curator {
GVAR(arsenal) = "ace_arsenal";
GVAR(fire) = "ace_fire";
GVAR(trenches) = "ace_trenches";
+ GVAR(spectator) = "ace_spectator";
};
#include "CfgFactionClasses.hpp"
diff --git a/addons/zeus/functions/fnc_moduleSpectator.sqf b/addons/zeus/functions/fnc_moduleSpectator.sqf
new file mode 100644
index 0000000000..fb9ca2a63b
--- /dev/null
+++ b/addons/zeus/functions/fnc_moduleSpectator.sqf
@@ -0,0 +1,39 @@
+#include "..\script_component.hpp"
+/*
+ * Author: mharis001
+ * Zeus module function to make the local player an ACE Spectator.
+ *
+ * Arguments:
+ * 0: Force interface
+ * 1: Hide player
+ * 2: Sides available to spectate
+ * 3: Camera modes available
+ * 4: Vision modes available
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [true, true, [west], [0, 1, 2], [-2, -1, 0, 1]] call ace_zeus_fnc_moduleSpectator
+ *
+ * Public: No
+ */
+
+params ["_force", "_hide", "_sides", "_modes", "_visions"];
+TRACE_1("params",_this);
+
+// Update sides available to spectate
+[_sides, [west, east, independent, civilian] - _sides] call EFUNC(spectator,updateSides);
+
+// Update available camera modes
+[_modes, [0, 1, 2] - _modes] call EFUNC(spectator,updateCameraModes);
+
+// Update available vision modes
+[_visions, [-2, -1, 0, 1, 2, 3, 4, 5, 6, 7] - _visions] call EFUNC(spectator,updateVisionModes);
+
+// Make unit spectator (close Zeus camera if open)
+if (!isNull curatorCamera) then {
+ (findDisplay 312) closeDisplay 2;
+};
+
+[true, _force, _hide] call EFUNC(spectator,setSpectator);
diff --git a/addons/zeus/functions/fnc_ui_spectator.sqf b/addons/zeus/functions/fnc_ui_spectator.sqf
new file mode 100644
index 0000000000..fe9b4a3668
--- /dev/null
+++ b/addons/zeus/functions/fnc_ui_spectator.sqf
@@ -0,0 +1,265 @@
+#include "..\script_component.hpp"
+/*
+ * Author: mharis001
+ * Initializes the "Spectator" Zeus module display.
+ *
+ * Arguments:
+ * 0: spectator controls group
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [CONTROL] call ace_zeus_fnc_ui_spectator
+ *
+ * Public: No
+ */
+
+#define SIDE_IDCs [92540, 92541, 92542, 92543]
+#define CAMERA_IDCs [92550, 92551, 92552]
+#define VISION_IDCs [92558, 92559, 92560, 92561]
+
+params ["_control"];
+
+private _display = ctrlParent _control;
+private _ctrlButtonOK = _display displayCtrl 1; // IDC_OK
+private _logic = missionNamespace getVariable ["BIS_fnc_initCuratorAttributes_target", objNull];
+TRACE_1("Logic Object",_logic);
+
+_control ctrlRemoveAllEventHandlers "SetFocus";
+
+// Validate module target
+private _unit = attachedTo _logic;
+TRACE_1("Unit",_unit);
+
+scopeName "Main";
+private _fnc_errorAndClose = {
+ params ["_msg"];
+ _display closeDisplay 0;
+ deleteVehicle _logic;
+ [_msg] call FUNC(showMessage);
+ breakOut "Main";
+};
+
+switch (false) do {
+ case (["ace_spectator"] call EFUNC(common,isModLoaded)): {
+ [LSTRING(RequiresAddon)] call _fnc_errorAndClose;
+ };
+ case (!isNull _unit): {
+ [LSTRING(NothingSelected)] call _fnc_errorAndClose;
+ };
+ case (_unit isKindOf "CAManBase"): {
+ [LSTRING(OnlyInfantry)] call _fnc_errorAndClose;
+ };
+ case (alive _unit): {
+ [LSTRING(OnlyAlive)] call _fnc_errorAndClose;
+ };
+ case ([_unit, true] call EFUNC(common,isPlayer)): {
+ [LSTRING(OnlyPlayers)] call _fnc_errorAndClose;
+ };
+};
+
+// Specific onLoad stuff
+private _side = side _unit;
+
+// Spectate sides
+private _fnc_onSideSelection = {
+ params ["_ctrl"];
+
+ private _display = ctrlParent _ctrl;
+ if (isNull _display) exitWith {};
+
+ private _color = _ctrl getVariable "color";
+ private _scale = 1;
+
+ private _sides = _display getVariable [QGVAR(spectateSides), []];
+ private _selectedSide = (ctrlIDC _ctrl) - 92540;
+
+ // Add or remove from spectatable sides and update color and scale
+ if (_selectedSide in _sides) then {
+ _display setVariable [QGVAR(spectateSides), _sides - [_selectedSide]];
+ _color set [3, 0.5];
+ } else {
+ _display setVariable [QGVAR(spectateSides), _sides + [_selectedSide]];
+ _color set [3, 1];
+ _scale = 1.2;
+ };
+
+ _ctrl ctrlSetTextColor _color;
+ [_ctrl, _scale, 0.1] call BIS_fnc_ctrlSetScale;
+};
+
+// Use the unit's side as default
+private _activeSide = [east, west, independent, civilian] find _side;
+
+// Handle sides other than default four (sideEnemy)
+if (_activeSide != -1) then {
+ _display setVariable [QGVAR(spectateSides), [_activeSide]];
+};
+
+{
+ private _ctrl = _display displayCtrl _x;
+ private _side = _x - 92540;
+ private _color = [_side] call BIS_fnc_sideColor;
+ _ctrl setVariable ["color", _color];
+ _ctrl ctrlSetActiveColor _color;
+ _color set [3, 0.5];
+
+ if (_side == _activeSide) then {
+ [_ctrl, 1.2, 0] call BIS_fnc_ctrlSetScale;
+ _color set [3, 1];
+ };
+
+ _ctrl ctrlSetTextColor _color;
+
+ _ctrl ctrlAddEventHandler ["ButtonClick", _fnc_onSideSelection];
+} forEach SIDE_IDCs;
+
+// Camera modes
+private _fnc_onModesSelection = {
+ params ["_ctrl"];
+
+ private _display = ctrlParent _ctrl;
+ if (isNull _display) exitWith {};
+
+ private _color = [1, 1, 1, 0.5];
+ private _scale = 1;
+
+ private _modes = _display getVariable [QGVAR(cameraModes), []];
+ private _selectedMode = (ctrlIDC _ctrl) - 92550;
+
+ // Add or remove from camera modes and update color and scale
+ if (_selectedMode in _modes) then {
+ _display setVariable [QGVAR(cameraModes), _modes - [_selectedMode]];
+ } else {
+ _display setVariable [QGVAR(cameraModes), _modes + [_selectedMode]];
+ _color set [3, 1];
+ _scale = 1.2;
+ };
+
+ _ctrl ctrlSetTextColor _color;
+ [_ctrl, _scale, 0.1] call BIS_fnc_ctrlSetScale;
+};
+
+// Use setting as default since global variable will change
+private _availableModes = [[0, 1, 2], [1, 2], [0], [1], [2]] select EGVAR(spectator,restrictModes);
+_display setVariable [QGVAR(cameraModes), _availableModes];
+
+{
+ private _ctrl = _display displayCtrl _x;
+ private _color = [1, 1, 1, 0.5];
+
+ if ((_x - 92550) in _availableModes) then {
+ [_ctrl, 1.2, 0] call BIS_fnc_ctrlSetScale;
+ _color set [3, 1];
+ };
+
+ _ctrl ctrlSetTextColor _color;
+
+ _ctrl ctrlAddEventHandler ["ButtonClick", _fnc_onModesSelection];
+} forEach CAMERA_IDCs;
+
+// Vision Modes
+private _fnc_onVisionSelection = {
+ params ["_ctrl", "_state"];
+
+ private _display = ctrlParent _ctrl;
+ if (isNull _display) exitwith {};
+
+ // Convert to boolean since EH returns state as 0 or 1
+ private _state = [false, true] select _state;
+
+ private _visions = _display getVariable [QGVAR(visionModes), []];
+ private _selectedVision = (ctrlIDC _ctrl) - 92560;
+
+ // Add or remove from vision modes
+ if (_state) then {
+ _display setVariable [QGVAR(visionModes), _visions + [_selectedVision]];
+ } else {
+ _display setVariable [QGVAR(visionModes), _visions - [_selectedVision]];
+ };
+
+ // Handle all checked/unchecked
+ private _allCheckboxes = VISION_IDCs apply {cbChecked (_display displayCtrl _x)};
+
+ if (_allCheckboxes isEqualTo [_state, _state, _state, _state]) then {
+ (_display displayCtrl 92557) cbSetChecked _state;
+ };
+};
+
+// Use setting as default since global variable will change
+private _availableVisions = [[-2,-1,0,1], [-2,-1], [-2,0,1], [-2]] select EGVAR(spectator,restrictVisions);
+_display setVariable [QGVAR(visionModes), _availableVisions];
+
+{
+ private _ctrl = _display displayCtrl _x;
+
+ if ((_x - 92560) in _availableVisions) then {
+ _ctrl cbSetChecked true;
+ };
+
+ _ctrl ctrlAddEventHandler ["CheckedChanged", _fnc_onVisionSelection];
+} forEach VISION_IDCs;
+
+// Init all visions checkbox
+private _fnc_onVisionsAll = {
+ params ["_ctrl", "_state"];
+
+ private _display = ctrlParent _ctrl;
+ if (isNull _display) exitWith {};
+
+ // Convert to boolean since EH returns state as 0 or 1
+ _state = _state == 1;
+
+ // Set state of all checkboxes
+ {
+ (_display displayCtrl _x) cbSetChecked _state;
+ } forEach VISION_IDCs;
+
+ // Store new visions mode setting
+ private _setting = [[], [-2, -1, 0, 1]] select _state;
+ _display setVariable [QGVAR(visionModes), _setting];
+};
+
+private _allCheckbox = _display displayCtrl 92557;
+
+// Set to checked by default if setting is all vision modes
+if (_availableVisions isEqualTo [-2, -1, 0, 1]) then {
+ _allCheckbox cbSetChecked true;
+};
+
+_allCheckbox ctrlAddEventHandler ["CheckedChanged", _fnc_onVisionsAll];
+
+// Confirm and Cancel
+private _fnc_onUnload = {
+ private _logic = missionNamespace getVariable ["BIS_fnc_initCuratorAttributes_target", objNull];
+ if (isNull _logic) exitWith {};
+
+ deleteVehicle _logic;
+};
+
+private _fnc_onConfirm = {
+ params [["_ctrlButtonOK", controlNull, [controlNull]]];
+
+ private _display = ctrlParent _ctrlButtonOK;
+ if (isNull _display) exitWith {};
+
+ private _logic = missionNamespace getVariable ["BIS_fnc_initCuratorAttributes_target", objNull];
+ if (isNull _logic) exitWith {};
+
+ private _unit = attachedTo _logic;
+ if (isNull _unit) exitWith {};
+
+ private _force = lbCurSel (_display displayCtrl 92531) > 0;
+ private _hide = lbCurSel (_display displayCtrl 92532) > 0;
+ private _sides = (_display getVariable [QGVAR(spectateSides), []]) apply {_x call BIS_fnc_sideType};
+ private _modes = _display getVariable [QGVAR(cameraModes), []];
+ private _visions = _display getVariable [QGVAR(visionModes), []];
+
+ [QGVAR(moduleSpectator), [_force, _hide, _sides, _modes, _visions], _unit] call CBA_fnc_targetEvent;
+
+ deleteVehicle _logic;
+};
+
+_display displayAddEventHandler ["Unload", _fnc_onUnload];
+_ctrlButtonOK ctrlAddEventHandler ["ButtonClick", _fnc_onConfirm];
diff --git a/addons/zeus/stringtable.xml b/addons/zeus/stringtable.xml
index 8b3aaed92c..a1ae4d554e 100644
--- a/addons/zeus/stringtable.xml
+++ b/addons/zeus/stringtable.xml
@@ -1097,6 +1097,22 @@
需要一個不存在的插件
현재 없는 애드온을 필요로 합니다
+
+ Only Players
+ プレイヤーのみ
+ Nur Spieler
+ 오직 플레이어만
+ Tylko gracze
+ Joueurs seulement
+ Solo Giocatori
+ 仅玩家
+ 只有玩家
+ Только игроки
+ Apenas Jogadores
+ Pouze hráči
+ Solo jugadores
+ Sadece Oyuncular
+
None
Keiner
@@ -1322,6 +1338,7 @@
화물 내리기
Выгрузить из отсека
Décharger de la cargaison
+ Descargar de la carga
Toggle NVGs
@@ -1968,6 +1985,7 @@
의료 메뉴가 비활성화되었습니다
Медицинское меню отключено
Le Menu médical est désactivé
+ El menú médico está deshabilitado
Lay Trenchline
@@ -1978,6 +1996,7 @@
Piazza Trincea
塹壕溝線を敷設
Проложить траншею
+ Poner una Trinchera
+SHIFT to force (Can only lay N/S or E/W)
@@ -1988,6 +2007,28 @@
+SHIFT per forzare (Può piazzare solo N/S o E/O
+SHIFTキー で強制的に敷設 (北/南または東/西方向にのみ配置可能)
+SHIFT на принудительное (может укладываться только на Север/Юг или Восток/Запад)
+ +SHIFT para forzar (Puede solo colocar en N/S or E/O)
+
+
+ Forces the spectator interface preventing the player from closing it with the Escape key
+
+
+ Hide player
+
+
+ Hides the player by making them invisible, invulnerable, muted, and removing them from their group
+
+
+ Sets the sides that are available to spectate
+
+
+ White Hot
+
+
+ Black Hot
+
+
+ Toggle All
diff --git a/addons/zeus/ui/RscAttributes.hpp b/addons/zeus/ui/RscAttributes.hpp
index 0ff21b145f..da3f53364f 100644
--- a/addons/zeus/ui/RscAttributes.hpp
+++ b/addons/zeus/ui/RscAttributes.hpp
@@ -915,3 +915,231 @@ class GVAR(RscSuicideBomber): RscDisplayAttributes {
class ButtonCancel: ButtonCancel {};
};
};
+
+class GVAR(RscSpectator): RscDisplayAttributes {
+ onLoad = QUOTE([ARR_3('onLoad',_this,QQGVAR(RscSpectator))] call FUNC(zeusAttributes));
+ onUnload = QUOTE([ARR_3('onUnload',_this,QQGVAR(RscSpectator))] call FUNC(zeusAttributes));
+ class Controls: Controls {
+ class Background: Background {};
+ class Title: Title {};
+ class Content: Content {
+ class Controls {
+ class spectator: RscControlsGroupNoScrollbars {
+ onSetFocus = QUOTE(_this call FUNC(ui_spectator));
+ idc = 92530;
+ x = 0;
+ y = 0;
+ w = QUOTE(W_PART(26));
+ h = QUOTE(H_PART(10.7));
+ class controls {
+ class ForceInterfaceLabel: RscText {
+ idc = -1;
+ text = "$STR_a3_cfgvehicles_modulecurator_f_arguments_forced";
+ tooltip = CSTRING(ModuleSpectator_ForceInterface_Tooltip);
+ x = 0;
+ y = 0;
+ w = QUOTE(W_PART(10));
+ h = QUOTE(H_PART(1));
+ colorBackground[] = {0, 0, 0, 0.5};
+ };
+ class ForceInterface: ctrlToolbox {
+ idc = 92531;
+ x = QUOTE(W_PART(10.1));
+ y = 0;
+ w = QUOTE(W_PART(15.9));
+ h = QUOTE(H_PART(1));
+ rows = 1;
+ columns = 2;
+ strings[] = {ECSTRING(common,No), ECSTRING(common,Yes)};
+ };
+ class HidePlayerLabel: ForceInterfaceLabel {
+ text = CSTRING(ModuleSpectator_HidePlayer);
+ tooltip = CSTRING(ModuleSpectator_HidePlayer_Tooltip);
+ y = QUOTE(H_PART(1.1));
+ };
+ class HidePlayer: ForceInterface {
+ idc = 92532;
+ y = QUOTE(H_PART(1.1));
+ };
+ class SpectateSides: RscControlsGroupNoScrollbars {
+ idc = 92533;
+ x = 0;
+ y = QUOTE(H_PART(2.2));
+ w = QUOTE(W_PART(26));
+ h = QUOTE(H_PART(2.5));
+ class controls {
+ class Label: RscText {
+ idc = -1;
+ text = "$STR_A3_Spectator_Eden_WhitelistedSides_Name";
+ tooltip = CSTRING(ModuleSpectator_SpectableSides_Tooltip);
+ x = 0;
+ y = 0;
+ w = QUOTE(W_PART(10));
+ h = QUOTE(H_PART(2.5));
+ colorBackground[] = {0, 0, 0, 0.5};
+ };
+ class Background: RscText {
+ idc = -1;
+ x = QUOTE(W_PART(10));
+ y = 0;
+ w = QUOTE(W_PART(16));
+ h = QUOTE(H_PART(2.5));
+ colorBackground[] = {1, 1, 1, 0.1};
+ };
+ class BLUFOR: RscActivePicture {
+ idc = 92541;
+ text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_west_ca.paa";
+ x = QUOTE(W_PART(12.5));
+ y = QUOTE(H_PART(0.25));
+ w = QUOTE(W_PART(2));
+ h = QUOTE(H_PART(2));
+ tooltip = "$STR_WEST";
+ };
+ class OPFOR: BLUFOR {
+ idc = 92540;
+ text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_east_ca.paa";
+ x = QUOTE(W_PART(15.5));
+ tooltip = "$STR_EAST";
+ };
+ class Independent: BLUFOR {
+ idc = 92542;
+ text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_guer_ca.paa";
+ x = QUOTE(W_PART(18.5));
+ tooltip = "$STR_guerrila";
+ };
+ class Civilian: BLUFOR {
+ idc = 92543;
+ text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_civ_ca.paa";
+ x = QUOTE(W_PART(21.5));
+ tooltip = "$STR_Civilian";
+ };
+ };
+ };
+ class CameraModes: RscControlsGroupNoScrollbars {
+ idc = 92534;
+ x = 0;
+ y = QUOTE(H_PART(4.8));
+ w = QUOTE(W_PART(26));
+ h = QUOTE(H_PART(2.5));
+ class controls {
+ class Label: RscText {
+ idc = -1;
+ text = ECSTRING(spectator,modes_DisplayName);
+ tooltip = ECSTRING(spectator,modes_Description);
+ x = 0;
+ y = 0;
+ w = QUOTE(W_PART(10));
+ h = QUOTE(H_PART(2.5));
+ colorBackground[] = {0, 0, 0, 0.5};
+ };
+ class Background: RscText {
+ idc = -1;
+ x =QUOTE(W_PART(10));
+ y = 0;
+ w = QUOTE(W_PART(16));
+ h = QUOTE(H_PART(2.5));
+ colorBackground[] = {1, 1, 1, 0.1};
+ };
+ class Free: RscActivePicture {
+ idc = 92550;
+ text = "a3\Ui_f\data\GUI\Rsc\RscDisplayEGSpectator\Free.paa";
+ x = QUOTE(W_PART(13.375));
+ y = QUOTE(H_PART(0.375));
+ w = QUOTE(W_PART(1.75));
+ h = QUOTE(H_PART(1.75));
+ tooltip = "$STR_A3_Spectator_free_camera_tooltip";
+ };
+ class Follow: Free {
+ idc = 92552;
+ text = "a3\Ui_f\data\GUI\Rsc\RscDisplayEGSpectator\Follow.paa";
+ x = QUOTE(W_PART(17.125));
+ tooltip = "$STR_A3_Spectator_3pp_camera_tooltip";
+ };
+ class FirstPerson: Free {
+ idc = 92551;
+ text = "a3\Ui_f\data\GUI\Rsc\RscDisplayEGSpectator\Fps.paa";
+ x = QUOTE(W_PART(20.875));
+ tooltip = "$STR_A3_Spectator_1pp_camera_tooltip";
+ };
+ };
+ };
+ class VisionModes: RscControlsGroupNoScrollbars {
+ idc = 92535;
+ x = 0;
+ y = QUOTE(H_PART(7.4));
+ w = QUOTE(W_PART(26));
+ h = QUOTE(H_PART(3.3));
+ class controls {
+ class Label: RscText {
+ idc = -1;
+ text = ECSTRING(spectator,visions_DisplayName);
+ tooltip = ECSTRING(spectator,visions_Description);
+ x = 0;
+ y = 0;
+ w = QUOTE(W_PART(26));
+ h = QUOTE(H_PART(1));
+ colorBackground[] = {0, 0, 0, 0.5};
+ };
+ class Background: RscText {
+ idc = -1;
+ x = 0;
+ y = QUOTE(H_PART(1));
+ w = QUOTE(W_PART(26));
+ h = QUOTE(H_PART(2.3));
+ colorBackground[] = {1, 1, 1, 0.1};
+ };
+ class AllCheckBox: RscCheckBox {
+ idc = 92557;
+ tooltip = CSTRING(ToggleAll);
+ x = QUOTE(W_PART(25));
+ y = 0;
+ w = QUOTE(W_PART(1));
+ h = QUOTE(H_PART(1));
+ };
+ class NormalLabel: Label {
+ text = "$STR_speed_normal";
+ tooltip = "";
+ x = QUOTE(W_PART(1));
+ y = QUOTE(H_PART(1.1));
+ w = QUOTE(W_PART(10.8));
+ colorBackground[] = {0, 0, 0, 0.6};
+ };
+ class Normal: AllCheckBox {
+ idc = 92558;
+ x = QUOTE(W_PART(11.9));
+ y = QUOTE(H_PART(1.1));
+ };
+ class NightVisionLabel: NormalLabel {
+ text = "$STR_usract_night_vision";
+ y = QUOTE(H_PART(2.2));
+ };
+ class NightVision: Normal {
+ idc = 92559;
+ y = QUOTE(H_PART(2.2));
+ };
+ class WhiteHotLabel: NormalLabel {
+ text = CSTRING(ModuleSpectator_WhiteHot);
+ x = QUOTE(W_PART(13.1));
+ };
+ class WhiteHot: Normal {
+ idc = 92560;
+ x = QUOTE(W_PART(24));
+ };
+ class BlackHotLabel: WhiteHotLabel {
+ text = CSTRING(ModuleSpectator_BlackHot);
+ y = QUOTE(Y_PART(2.2));
+ };
+ class BlackHot: WhiteHot {
+ idc = 92561;
+ y = QUOTE(H_PART(2.2));
+ };
+ };
+ };
+ };
+ };
+ };
+ };
+ class ButtonOK: ButtonOK {};
+ class ButtonCancel: ButtonCancel {};
+ };
+};
diff --git a/docs/_config.yml b/docs/_config.yml
index 66cd1141f7..ee7822969d 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -9,8 +9,8 @@ ace:
version:
major: 3
minor: 17
- patch: 0
- build: 82
+ patch: 1
+ build: 86
markdown: kramdown
diff --git a/docs/_config_dev.yml b/docs/_config_dev.yml
index e3c042e9c7..348e1aee44 100644
--- a/docs/_config_dev.yml
+++ b/docs/_config_dev.yml
@@ -9,8 +9,8 @@ ace:
version:
major: 3
minor: 17
- patch: 0
- build: 82
+ patch: 1
+ build: 86
markdown: kramdown
diff --git a/docs/wiki/development/arma-3-scheduler-and-our-practices.md b/docs/wiki/development/arma-3-scheduler-and-our-practices.md
index 440f0f9557..d2ffda2a07 100644
--- a/docs/wiki/development/arma-3-scheduler-and-our-practices.md
+++ b/docs/wiki/development/arma-3-scheduler-and-our-practices.md
@@ -36,7 +36,7 @@ Code running in the unscheduled environment uses linear execution, that means it
## 2. What is the scheduler and why do I care?
-The Arma 3 script scheduler basically gives a fair-share execution to all running scripts, FSMs, and SQS files running on any given client or server at any given time. See the [Biki article](https://community.bistudio.com/wiki/Biki2.0:Performance_Considerations){:target="_blank"} for a in-depth explanation of this. What this basically means though, is that all scripts get a fair share; this also means scheduled execution is drastically affected by other mods that use scheduled execution. For example, if 2 different spawn's are running in a tight loop of `while {true} do {...};`, they will both get exactly 50% of the scheduling time.
+The Arma 3 script scheduler basically gives a fair-share execution to all running scripts, FSMs, and SQS files running on any given client or server at any given time. See the [Biki article](https://community.bistudio.com/wiki/Biki2.0:Performance_Considerations){:target="_blank"} for an in-depth explanation of this. What this basically means though, is that all scripts get a fair share; this also means scheduled execution is drastically affected by other mods that use scheduled execution. For example, if 2 different spawn's are running in a tight loop of `while {true} do {...};`, they will both get exactly 50% of the scheduling time.
With the way mission makers and mod makers generally use `spawn`/`execVM`, this means you're actually getting drastically less execution time in the scheduled environment than you might think. This leads to visible delay issues all the way up to massive delay on execution. You can easily test and prove this by looping spawns and watching the execution times extend.
diff --git a/docs/wiki/feature/grenades.md b/docs/wiki/feature/grenades.md
index 679b309b1e..2b60c08d4e 100644
--- a/docs/wiki/feature/grenades.md
+++ b/docs/wiki/feature/grenades.md
@@ -23,6 +23,8 @@ version:
### 1.1 Throw modes
Provides different modes for throwing grenades (high throw, precision throw and drop mode).
+A grenade is only rollable if the fuse time (`explosionTime`) is >= 1 second and the player isn't in a vehicle.
+
### 1.2 Hand flares
Adds throwable hand flares in the colors white, red, green and yellow. Additionally buffs existing flares by making them brighter and last longer.
diff --git a/docs/wiki/framework/arsenal-framework.md b/docs/wiki/framework/arsenal-framework.md
index 273a70836f..954bbc0a7e 100644
--- a/docs/wiki/framework/arsenal-framework.md
+++ b/docs/wiki/framework/arsenal-framework.md
@@ -31,11 +31,11 @@ To quickly add a full ACE Arsenal to a box for all clients use the following cod
`ace_arsenal_fnc_initBox`
-| | Argument | Type | Optional (default value)
----| -------- | ---- | ------------------------
-0 | Box | Object | Required
-1 | Items | Array of strings or boolean | Required
-2 | Initialize globally | Boolean | Optional (default: `false`)
+| | Argument | Type | Optional (default value) |
+|----| -------- | ---- | ------------------------ |
+| 0 | Box | Object | Required |
+| 1 | Items | Array of strings or boolean | Required |
+| 2 | Initialize globally | Boolean | Optional (default: `false`) |
This will add the virtual items passed as arguments and add an ACE interaction to open ACE Arsenal.
@@ -51,11 +51,11 @@ Please note that at least one virtual item needs to be added otherwise ACE Arsen
`ace_arsenal_fnc_openBox`
-| | Argument | Type | Optional (default value)
----| -------- | ---- | ------------------------
-0 | Box | Object | Required
-1 | Unit to open ACE Arsenal on | Object | Required
-2 | Ignore virtual items and fill ACE Arsenal | Boolean | Optional (default: `false`)
+| | Argument | Type | Optional (default value) |
+|----| -------- | ---- | ------------------------ |
+| 0 | Box | Object | Required |
+| 1 | Unit to open ACE Arsenal on | Object | Required |
+| 2 | Ignore virtual items and fill ACE Arsenal | Boolean | Optional (default: `false`) |
Examples:
- `[_box, player] call ace_arsenal_fnc_openBox`
@@ -67,10 +67,10 @@ In the second example a full ACE Arsenal will be opened on the player.
`ace_arsenal_fnc_removeBox`
-| | Argument | Type | Optional (default value)
----| -------- | ---- | ------------------------
-0 | Box | Object | Required
-2 | Remove globally | Boolean | Optional (default: `false`)
+| | Argument | Type | Optional (default value) |
+|----| -------- | ---- | ------------------------ |
+| 0 | Box | Object | Required |
+| 2 | Remove globally | Boolean | Optional (default: `false`) |
Example:
`[_box, true] call ace_arsenal_fnc_removeBox`
@@ -81,11 +81,11 @@ Example:
`ace_arsenal_fnc_addVirtualItems`
-| | Argument | Type | Optional (default value)
----| -------- | ---- | ------------------------
-0 | Box | Object | Required
-1 | Items | Array of strings or boolean | Required
-2 | Add globally | Boolean | Optional (default: `false`)
+| | Argument | Type | Optional (default value) |
+|----| -------- | ---- | ------------------------ |
+| 0 | Box | Object | Required |
+| 1 | Items | Array of strings or boolean | Required |
+| 2 | Add globally | Boolean | Optional (default: `false`) |
Passing an array of strings (class names) will add each one of those items to the specified box, passing true will add ALL items that are compatible with ACE Arsenal (the sorting is done on game startup). Faces, voices and insignia can't be added via this function.
@@ -97,11 +97,11 @@ Examples:
`ace_arsenal_fnc_removeVirtualItems`
-| | Argument | Type | Optional (default value)
----| -------- | ---- | ------------------------
-0 | Box | Object | Required
-1 | Items | Array of strings or boolean | Required
-2 | Remove globally | Boolean | Optional (default: `false`)
+| | Argument | Type | Optional (default value) |
+|----| -------- | ---- | ------------------------ |
+| 0 | Box | Object | Required |
+| 1 | Items | Array of strings or boolean | Required |
+| 2 | Remove globally | Boolean | Optional (default: `false`) |
Like adding virtual items, passing an array of string (class names) will remove each ones of those items, however passing true will remove all virtual items and also remove the interaction to access ACE Arsenal. Faces, voices and insignia can't be removed via this function.
@@ -185,11 +185,11 @@ Players with Zeus access can save default loadouts ingame, doing so will make th
`ace_arsenal_fnc_addDefaultLoadout`
-| | Argument | Type | Optional (default value)
----| -------- | ---- | ------------------------
-0 | Name of loadout | String | Required
-1 | getUnitLoadout array or CBA extended loadout array | Array | Required
-2 | Add loadout globally | Boolean | Optional (default: `false`)
+| | Argument | Type | Optional (default value) |
+|----| -------- | ---- | ------------------------ |
+| 0 | Name of loadout | String | Required |
+| 1 | getUnitLoadout array or CBA extended loadout array | Array | Required |
+| 2 | Add loadout globally | Boolean | Optional (default: `false`) |
Example:
`["Squad Leader", getUnitLoadout sql1, true] call ace_arsenal_fnc_addDefaultLoadout`
@@ -229,22 +229,22 @@ The arguments passed to the bar, text and condition statements are:
`ace_arsenal_fnc_addStat`
-| | Argument | Type | Optional (default value)
---- | -------- | ---- | ------------------------
-0 | Tabs to add the stat to | Array of arrays | Required
-0.1 | Left tab indexes | Array of numbers | Required
-0.2 | Right tab indexes | Array of numbers | Required
-1 | Stat class ID | String | Required
-2 | Config entries to pass | Array of strings | Required
-3 | Title | String | Required
-4 | Show bar / show text bools | Array of booleans | Required
-4.1 | Show bar | Boolean | Required
-4.2 | Show text | Boolean | Required
-5 | Array of statements | Array of code | Required
-5.1 | Bar code | Code | Required
-5.2 | Text code | Code | Required
-5.3 | Condition | Code | Required
-6 | Priority | Number | Optional (default: `0`)
+| | Argument | Type | Optional (default value) |
+| --- | -------- | ---- | ------------------------ |
+| 0 | Tabs to add the stat to | Array of arrays | Required |
+| 0.1 | Left tab indexes | Array of numbers | Required |
+| 0.2 | Right tab indexes | Array of numbers | Required |
+| 1 | Stat class ID | String | Required |
+| 2 | Config entries to pass | Array of strings | Required |
+| 3 | Title | String | Required |
+| 4 | Show bar / show text bools | Array of booleans | Required |
+| 4.1 | Show bar | Boolean | Required |
+| 4.2 | Show text | Boolean | Required |
+| 5 | Array of statements | Array of code | Required |
+| 5.1 | Bar code | Code | Required |
+| 5.2 | Text code | Code | Required |
+| 5.3 | Condition | Code | Required |
+| 6 | Priority | Number | Optional (default: `0`) |
Return Value:
- Array of stat IDs
@@ -263,9 +263,9 @@ If a stat already exists (so same class ID and tab), it will ignore the new addi
`ace_arsenal_fnc_removeStat`
-| | Argument | Type | Optional (default value)
----| -------- | ---- | ------------------------
-0 | Array of IDs | Array | Required
+| | Argument | Type | Optional (default value) |
+|----| -------- | ---- | ------------------------ |
+| 0 | Array of IDs | Array | Required |
Stats IDs are unique, IDs are generated as follows:
@@ -345,15 +345,15 @@ The argument passed to the condition is:
`ace_arsenal_fnc_addSort`
-| | Argument | Type | Optional (default value)
---- | -------- | ---- | ------------------------
-0 | Tabs to add the sort to | Array of arrays | Required
-0.1 | Left tab indexes | Array of numbers | Required
-0.2 | Right tab indexes | Array of numbers | Required
-1 | Stat class ID | String | Required
-2 | Title | String | Required
-3 | Algorithm | Code | Required
-4 | Condition | Code | Optional (default: `{true}`)
+| | Argument | Type | Optional (default value) |
+| --- | -------- | ---- | ------------------------ |
+| 0 | Tabs to add the sort to | Array of arrays | Required |
+| 0.1 | Left tab indexes | Array of numbers | Required |
+| 0.2 | Right tab indexes | Array of numbers | Required |
+| 1 | Stat class ID | String | Required |
+| 2 | Title | String | Required |
+| 3 | Algorithm | Code | Required |
+| 4 | Condition | Code | Optional (default: `{true}`) |
Return Value:
- Array of sort IDs
@@ -382,9 +382,9 @@ If a sorting method already exists (so same class ID and tab), it will ignore th
`ace_arsenal_fnc_removeSort`
-| | Argument | Type | Optional (default value)
----| -------- | ---- | ------------------------
-0 | Array of IDs | Array | Required
+| | Argument | Type | Optional (default value) |
+|----| -------- | ---- | ------------------------ |
+| 0 | Array of IDs | Array | Required |
Sorting method IDs are unique and are generated in the same fashion as the stat IDs (see `5.3 Removing stats via a function`).
@@ -438,15 +438,15 @@ The focused unit object is passed to the condition and statement functions.
`ace_arsenal_fnc_addAction`
-| | Argument | Type | Optional (default value)
---- | -------- | ---- | ------------------------
-0 | Tabs to add the sort to | Array of numbers | Required
-1 | Action class ID | String | Required
-2 | Title | String | Required
-3 | Actions | Array of arrays | Required
-4 | Condition | Code | Optional (default: `{true}`)
-5 | Scope editor | Number | Optional (default: `2`)
-6 | Update on cargo change | Boolean | Optional (default: `false`)
+| | Argument | Type | Optional (default value) |
+| --- | -------- | ---- | ------------------------ |
+| 0 | Tabs to add the sort to | Array of numbers | Required |
+| 1 | Action class ID | String | Required |
+| 2 | Title | String | Required |
+| 3 | Actions | Array of arrays | Required |
+| 4 | Condition | Code | Optional (default: `{true}`) |
+| 5 | Scope editor | Number | Optional (default: `2`) |
+| 6 | Update on cargo change | Boolean | Optional (default: `false`) |
Return Value:
- Array of action IDs
@@ -474,9 +474,9 @@ If an action already exists (so same class ID and tab within an action), it will
`ace_arsenal_fnc_removeAction`
-| | Argument | Type | Optional (default value)
----| -------- | ---- | ------------------------
-0 | Array of IDs | Array | Required
+| | Argument | Type | Optional (default value) |
+|----| -------- | ---- | ------------------------ |
+| 0 | Array of IDs | Array | Required |
Action IDs are unique and their generation is explained in `7.2 Adding sorting methods via a function`.
@@ -492,28 +492,28 @@ All are local.
| Name | Arguments | Added in |
| ------------- | ------------- | ------------- |
-| ace_arsenal_boxInitialized | Arsenal box (OBJECT), items (BOOL or ARRAY) |
-| ace_arsenal_boxRemoved | Arsenal box (OBJECT) |
-| ace_arsenal_displayOpened | Arsenal display (DISPLAY) |
-| ace_arsenal_displayClosed | None |
-| ace_arsenal_leftPanelFilled | Arsenal display (DISPLAY), current left panel IDC (SCALAR), current right panel IDC (SCALAR) |
-| ace_arsenal_rightPanelFilled | Arsenal display (DISPLAY), current left panel IDC (SCALAR), current right panel IDC (SCALAR) |
-| ace_arsenal_onLoadoutSave | Loadout index (SCALAR), [loadout name (STRING), loadout data (ARRAY)] |
-| ace_arsenal_onLoadoutSaveExtended | Loadout index (SCALAR), [loadout name (STRING), CBA extended loadout data (ARRAY)] | 3.15.1
-| ace_arsenal_onLoadoutLoad | loadout data (ARRAY), loadout name (STRING) |
-| ace_arsenal_onLoadoutLoadExtended | CBA extended loadout data (ARRAY), loadout name (STRING) | 3.15.1
-| ace_arsenal_onLoadoutDelete | loadout name (STRING) |
-| ace_arsenal_loadoutShared | Loadouts list listnBox control (CONTROL), loadout author (STRING), loadout name (STRING), loadout data (ARRAY) |
-| ace_arsenal_loadoutUnshared | Loadouts list listnBox control (CONTROL), loadout author (STRING), loadout name (STRING) |
-| ace_arsenal_cargoChanged | Arsenal display (DISPLAY), item (STRING), add or remove (NUMBER), shiftState (BOOL) |
-| ace_arsenal_loadoutImported | Arsenal display (DISPLAY), import list (BOOL) |
-| ace_arsenal_loadoutExported | Arsenal display (DISPLAY), export list (BOOL) |
-| ace_arsenal_loadoutsDisplayOpened | loadouts screen display (DISPLAY) | 3.12.3 |
-| ace_arsenal_loadoutsDisplayClosed | None | 3.12.3 |
-| ace_arsenal_loadoutsTabChanged | loadouts screen display (DISPLAY), tab control (CONTROL) | 3.12.3 |
-| ace_arsenal_loadoutsListFilled | loadouts screen display (DISPLAY), tab control (CONTROL) | 3.12.3 |
-| ace_arsenal_loadoutVerified | loadout data (ARRAY), loadout CBA extended data (HASHMAP), null items (ARRAY), unavailable items (ARRAY), unavailable extended data (ARRAY) | 3.17.0 |
-| ace_arsenal_weaponItemChanged | weapon classname (STRING), item classname (STRING), item index (NUMBER, 0-5: muzzle, side, optic, bipod, magazine, underbarrel) | 3.16.0 |
+| `ace_arsenal_boxInitialized` | Arsenal box (OBJECT), items (BOOL or ARRAY) |
+| `ace_arsenal_boxRemoved` | Arsenal box (OBJECT) |
+| `ace_arsenal_displayOpened` | Arsenal display (DISPLAY) |
+| `ace_arsenal_displayClosed` | None |
+| `ace_arsenal_leftPanelFilled` | Arsenal display (DISPLAY), current left panel IDC (SCALAR), current right panel IDC (SCALAR) |
+| `ace_arsenal_rightPanelFilled` | Arsenal display (DISPLAY), current left panel IDC (SCALAR), current right panel IDC (SCALAR) |
+| `ace_arsenal_onLoadoutSave` | Loadout index (SCALAR), [loadout name (STRING), loadout data (ARRAY)] |
+| `ace_arsenal_onLoadoutSaveExtended` | Loadout index (SCALAR), [loadout name (STRING), CBA extended loadout data (ARRAY)] | 3.15.1
+| `ace_arsenal_onLoadoutLoad` | loadout data (ARRAY), loadout name (STRING) |
+| `ace_arsenal_onLoadoutLoadExtended` | CBA extended loadout data (ARRAY), loadout name (STRING) | 3.15.1
+| `ace_arsenal_onLoadoutDelete` | loadout name (STRING) |
+| `ace_arsenal_loadoutShared` | Loadouts list listnBox control (CONTROL), loadout author (STRING), loadout name (STRING), loadout data (ARRAY) |
+| `ace_arsenal_loadoutUnshared` | Loadouts list listnBox control (CONTROL), loadout author (STRING), loadout name (STRING) |
+| `ace_arsenal_cargoChanged` | Arsenal display (DISPLAY), item (STRING), add or remove (NUMBER), shiftState (BOOL) |
+| `ace_arsenal_loadoutImported` | Arsenal display (DISPLAY), import list (BOOL) |
+| `ace_arsenal_loadoutExported` | Arsenal display (DISPLAY), export list (BOOL) |
+| `ace_arsenal_loadoutsDisplayOpened` | loadouts screen display (DISPLAY) | 3.12.3 |
+| `ace_arsenal_loadoutsDisplayClosed` | None | 3.12.3 |
+| `ace_arsenal_loadoutsTabChanged` | loadouts screen display (DISPLAY), tab control (CONTROL) | 3.12.3 |
+| `ace_arsenal_loadoutsListFilled` | loadouts screen display (DISPLAY), tab control (CONTROL) | 3.12.3 |
+| `ace_arsenal_loadoutVerified` | loadout data (ARRAY), loadout CBA extended data (HASHMAP), null items (ARRAY), unavailable items (ARRAY), unavailable extended data (ARRAY) | 3.17.0 |
+| `ace_arsenal_weaponItemChanged` | weapon classname (STRING), item classname (STRING), item index (NUMBER, 0-5: muzzle, side, optic, bipod, magazine, underbarrel) | 3.16.0 |
## 9. Custom sub item categories
@@ -521,13 +521,13 @@ All are local.
`ace_arsenal_fnc_addRightPanelButton`
-| | Argument | Type | Optional (default value)
----| -------- | ---- | ------------------------
-0 | Misc. items | Array of strings | Required
-1 | Tooltip | String | Optional (default: `""`)
-2 | Picture path | String | Optional (default: `"\z\ace\addons\arsenal\data\iconCustom.paa"`)
-3 | Override a specific button | Number | Optional (default: `-1`)
-4 | Move button on overwrite | Bool | Optional (default: `false`)
+| | Argument | Type | Optional (default value) |
+|----| -------- | ---- | ------------------------ |
+| 0 | Misc. items | Array of strings | Required |
+| 1 | Tooltip | String | Optional (default: `""`) |
+| 2 | Picture path | String | Optional (default: `"\z\ace\addons\arsenal\data\iconCustom.paa"`) |
+| 3 | Override a specific button | Number | Optional (default: `-1`) |
+| 4 | Move button on overwrite | Bool | Optional (default: `false`) |
Return Value:
- Successful: Number of the slot (0-9)
diff --git a/docs/wiki/framework/attach-framework.md b/docs/wiki/framework/attach-framework.md
index 2ed5f74561..f118b3b934 100644
--- a/docs/wiki/framework/attach-framework.md
+++ b/docs/wiki/framework/attach-framework.md
@@ -15,7 +15,7 @@ version:
## 1. Config Values
### 1.1 Make item attachable
-An item can be added to the ACE Attach framework by adding the ``ACE_attachable`` property to a class in ``CfgWeapons`` or ``CfgMagazines``. The value must be the classname of a valid class in ``CfgVehicles``:
+An item can be added to the ACE Attach framework by adding the `ACE_attachable` property to a class in `CfgWeapons` or `CfgMagazines`. The value must be the classname of a valid class in `CfgVehicles`:
```cpp
class CfgWeapons {
class attach_item: CBA_MiscItem {
@@ -29,16 +29,16 @@ class CfgVehicles {
scope = 1; // Should be 1 (private) or 2 (public), scope 0 will cause errors on object creation
displayName = "New ACE attachable item";
model = "\path\to\my\model.p3d";
- vehicleClass = "";
+ vehicleClass = "";
};
};
```
### 1.2 Define attach orientation for non-symmetric items
-In the case the item needs to have a particular orientation when attached, add the config value: ``ace_attach_orientation`` which is an array describing the ``roll`` and ``yaw`` orientation of the object.
-The default value is: ``[0,0]``.
+In the case the item needs to have a particular orientation when attached, add the config value: `ace_attach_orientation` which is an array describing the `roll` and `yaw` orientation of the object.
+The default value is: `[0,0]`.
-Example:
+Example:
```cpp
class CfgWeapons {
class attach_item: CBA_MiscItem {
@@ -49,11 +49,11 @@ class CfgWeapons {
```
## 2. Event Handlers
-### 2.1 Listenable Events
+### 2.1 Listenable Events
| Event Key | Parameters | Locality | Description |
-|----------|---------|---------|---------|---------|---------|
-|`ace_attach_attached` | [_attachedObject, _itemClassname, _temporary] | Local | Called after an item is attached to an object. `_temporary` flag means the item is being re-attached (after a unit is exiting a vehicle, for example)
-|`ace_attach_detaching` | [_attachedObject, _itemClassname, _temporary] | Local | Called just before an item is detached/removed from an object. `_temporary` flag means the item will be reattached later, see above.
+|----------|---------|---------|---------|
+|`ace_attach_attached` | [_attachedObject, _itemClassname, _temporary] | Local | Called after an item is attached to an object. `_temporary` flag means the item is being re-attached (after a unit is exiting a vehicle, for example) |
+|`ace_attach_detaching` | [_attachedObject, _itemClassname, _temporary] | Local | Called just before an item is detached/removed from an object. `_temporary` flag means the item will be reattached later, see above. |
### 2.2 Other events for attached objects
Use [CBA Extended Event Handlers](https://github.com/CBATeam/CBA_A3/wiki/Extended-Event-Handlers-(new)). Note that objects attached to units will be deleted/created upon entering/exiting vehicles and should be handled accordingly.
diff --git a/docs/wiki/framework/cargo-framework.md b/docs/wiki/framework/cargo-framework.md
index 68b28f7fa7..a1d810ce9c 100644
--- a/docs/wiki/framework/cargo-framework.md
+++ b/docs/wiki/framework/cargo-framework.md
@@ -47,6 +47,24 @@ class CfgVehicles {
ace_cargo_hasCargo and ace_cargo_canLoad are only needed if you aren't inheriting from any of BI base classes or if you are trying to disable loading for a specific vehicle / object.
+### 1.3 Adding predefined cargo via config
+
+```cpp
+class CfgVehicles {
+ class yourVehicleClass {
+ ace_cargo_space = 4; // Add if necessary
+ ace_cargo_hasCargo = 1; // Add if necessary
+ class ace_cargo {
+ class cargo {
+ class ACE_medicalSupplyCrate { // Doesn't have to have the same name as the item you're adding
+ type = "ACE_medicalSupplyCrate";
+ amount = 1;
+ };
+ };
+ };
+ };
+};
+```
## 2. Events
diff --git a/docs/wiki/framework/dragging-framework.md b/docs/wiki/framework/dragging-framework.md
index f4400aed44..43a7c98ba4 100644
--- a/docs/wiki/framework/dragging-framework.md
+++ b/docs/wiki/framework/dragging-framework.md
@@ -46,58 +46,58 @@ You will **not** be able to carry / drag objects that are too heavy, the mass is
`ace_dragging_fnc_setDraggable`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Any object | Object | Required
-1 | Enable dragging, true to enable, false to disable | Boolean | Required
-2 | Position to offset the object from player | Array | Optional (default: `[0, 1.5, 0]`)
-3 | Direction in degree to rotate the object | Number | Optional (default: `0`)
-4 | Ignore weight limitation for dragging | Boolean | Optional (default: `false`)
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Any object | Object | Required |
+| 1 | Enable dragging, true to enable, false to disable | Boolean | Required |
+| 2 | Position to offset the object from player | Array | Optional (default: `[0, 1.5, 0]`) |
+| 3 | Direction in degree to rotate the object | Number | Optional (default: `0`) |
+| 4 | Ignore weight limitation for dragging | Boolean | Optional (default: `false`) |
+| **R** | None | None | Return value |
#### 2.1.1 Example 1
`[foo, true, [0, 2, 0], 45] call ace_dragging_fnc_setDraggable;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `foo` | My object
-1 | `true` | Dragging is enabled
-2 | `[0,2,0]` | 0 meters sideways, 2 meters forward, 0 meters upwards
-3 | `45` | Rotated by 45°
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `foo` | My object |
+| 1 | `true` | Dragging is enabled |
+| 2 | `[0,2,0]` | 0 meters sideways, 2 meters forward, 0 |meters upwards
+| 3 | `45` | Rotated by 45° |
#### 2.1.2 Example 2
`[bar, false, [3, -2, 2], 20] call ace_dragging_fnc_setDraggable;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `bar` | My object
-1 | `false` | Dragging is disabled
-2 | `[3, -2, 2]` | 3 meters sideways, 2 meters backwards, 2 meters upwards
-3 | `20` | Rotated by 20°
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `bar` | My object |
+| 1 | `false` | Dragging is disabled |
+| 2 | `[3, -2, 2]` | 3 meters sideways, 2 meters backwards, 2 meters upwards |
+| 3 | `20` | Rotated by 20° |
### 2.2 Enabling / disabling carrying
`ace_dragging_fnc_setCarryable`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Any object | Object | Required
-1 | Enable carrying, true to enable, false to disable | Boolean | Required
-2 | Position to offset the object from player | Array | Optional (default: `[0, 1, 1]`)
-3 | Direction in degree to rotate the object | Number | Optional (default: `0`)
-4 | Ignore weight limitation for carrying | Boolean | Optional (default: `false`)
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Any object | Object | Required |
+| 1 | Enable carrying, true to enable, false to disable | Boolean | Required |
+| 2 | Position to offset the object from player | Array | Optional (default: `[0, 1, 1]`) |
+| 3 | Direction in degree to rotate the object | Number | Optional (default: `0`) |
+| 4 | Ignore weight limitation for carrying | Boolean | Optional (default: `false`) |
+| **R** | None | None | Return value |
#### 2.2.1 Example
`[foo, true, [0, 3, 1], 10] call ace_dragging_fnc_setCarryable;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `foo` | My object
-1 | `true`| Carrying is enabled
-2 | `[0,2,0]` | 0 meters sideways, 3 meters forward, 1 meter upwards
-3 | `10` | Rotated by 10°
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `foo` | My object |
+| 1 | `true`| Carrying is enabled |
+| 2 | `[0,2,0]` | 0 meters sideways, 3 meters forward, 1 meter upwards |
+| 3 | `10` | Rotated by 10° |
diff --git a/docs/wiki/framework/events-framework.md b/docs/wiki/framework/events-framework.md
index 816d5611e9..860cd90068 100644
--- a/docs/wiki/framework/events-framework.md
+++ b/docs/wiki/framework/events-framework.md
@@ -23,32 +23,32 @@ E.G.: If you only need to do action when player's weapon fires, this will be fas
The vehicle events will also have the following local variables available `_gunner (OBJECT), _turret (ARRAY)`.
| Event Key | Parameters | Locality | Type | Description |
-|----------|---------|---------|---------|---------|---------|
-|`ace_firedPlayer` | [_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | ACE_player fires
-|`ace_firedPlayerNonLocal` | [_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | Any other player fires
-|`ace_firedNonPlayer` | [_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | AI fires
-|`ace_firedPlayerVehicle` | [_vehicle, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | ACE_player turret fires
-|`ace_firedPlayerVehicleNonLocal` | [_vehicle, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | Any other player turret fires
-|`ace_firedNonPlayerVehicle` | [_vehicle, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | AI turret fires
+|----------|---------|---------|---------|---------|
+|`ace_firedPlayer` | [_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | ACE_player fires |
+|`ace_firedPlayerNonLocal` | [_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | Any other player fires |
+|`ace_firedNonPlayer` | [_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | AI fires |
+|`ace_firedPlayerVehicle` | [_vehicle, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | ACE_player turret fires |
+|`ace_firedPlayerVehicleNonLocal` | [_vehicle, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | Any other player turret fires |
+|`ace_firedNonPlayerVehicle` | [_vehicle, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | AI turret fires |
### 2.2 Medical (`ace_medical`)
| Event Key | Parameters | Locality | Type | Description |
-|----------|---------|---------|---------|---------|---------|
-|`ace_unconscious` | [_unit, _state(BOOL)] | Global | Listen | Unit's unconscious state changed
-|`ace_placedInBodyBag` | [_target, _bodyBag, _isGrave] | Global | Listen | Target placed into a bodybag Note: (Target will soon be deleted, target could be a bodybag)
-|`ace_placedInGrave` | [_target, _grave] | Global | Listen | Target placed into a grave, _grave will be objNull if `Create Grave Markers` is disabled Note: (Target will soon be deleted)
-|`ace_treatmentStarted` | [_caller, _target, _selectionName, _className, _itemUser, _usedItem] | Local | Listen | Treatment action has started (local on the _caller)
-|`ace_treatmentSucceded` | [_caller, _target, _selectionName, _className, _itemUser, _usedItem] | Local | Listen | Treatment action is completed (local on the _caller)
-|`ace_treatmentFailed` | [_caller, _target, _selectionName, _className, _itemUser, _usedItem] | Local | Listen | Treatment action has been interrupted (local on the _caller)
-|`ace_medical_handleUnitVitals` | [_unit, _deltaT] | Local | Listen | Vitals update ran for unit, _deltaT is the time elapsed since the previous vitals update (local to _unit)
-|`ace_medical_treatment_bandaged` | [_medic, _patient, _bodyPart, _className, _bandageEffectiveness] | Local | Listen | _medic has bandaged _patient, the array can be modified to change treatment parameters (local to _medic)
+|----------|---------|---------|---------|---------|
+|`ace_unconscious` | [_unit, _state(BOOL)] | Global | Listen | Unit's unconscious state changed |
+|`ace_placedInBodyBag` | [_target, _bodyBag, _isGrave] | Global | Listen | Target placed into a bodybag Note: (Target will soon be deleted, target could be a bodybag) |
+|`ace_placedInGrave` | [_target, _grave] | Global | Listen | Target placed into a grave, _grave will be objNull if `Create Grave Markers` is disabled Note: (Target will soon be deleted) |
+|`ace_treatmentStarted` | [_caller, _target, _selectionName, _className, _itemUser, _usedItem, _createLitter] | Local | Listen | Treatment action has started (local on the _caller) |
+|`ace_treatmentSucceded` | [_caller, _target, _selectionName, _className, _itemUser, _usedItem, _createLitter] | Local | Listen | Treatment action is completed (local on the _caller) |
+|`ace_treatmentFailed` | [_caller, _target, _selectionName, _className, _itemUser, _usedItem, _createLitter] | Local | Listen | Treatment action has been interrupted (local on the _caller) |
+|`ace_medical_handleUnitVitals` | [_unit, _deltaT] | Local | Listen | Vitals update ran for unit, _deltaT is the time elapsed since the previous vitals update (local to _unit) |
+|`ace_medical_treatment_bandaged` | [_medic, _patient, _bodyPart, _className, _itemUser, _usedItem, _createLitter, _bandageEffectiveness] | Local | Listen | _medic has bandaged _patient, the array can be modified to change treatment parameters (local to _medic) |
### 2.3 Interaction Menu (`ace_interact_menu`)
MenuType: 0 = Interaction, 1 = Self Interaction
| Event Key | Parameters | Locality | Type | Description |
-|----------|---------|---------|---------|---------|---------|
+|----------|---------|---------|---------|---------|
|`ace_interactMenuOpened` | [_menuType] | Local | Listen | Interaction Menu Opened
|`ace_interactMenuClosed` | [_menuType] | Local | Listen | Interaction Menu Closed
|`ace_interact_menu_newControllableObject` | [_typeOf] | Local | Listen | New controlable object, only fires once per type (add self interactions)
@@ -56,80 +56,78 @@ MenuType: 0 = Interaction, 1 = Self Interaction
### 2.4 Cargo (`ace_cargo`)
| Event Key | Parameters | Locality | Type | Description |
-|----------|---------|---------|---------|---------|---------|
-|`ace_addCargo` | [_item (CLASSNAME or OBJECT), _vehicle, _cargoCount] | Target | Callable | Scripted way to add cargo to vehicle
-|`ace_cargoLoaded` | [_item, _vehicle] | Global | Listen | Cargo has been Loaded into vehicle
-|`ace_cargoUnloaded` | [_item, _vehicle, _unloadType] | Global | Listen | Cargo has been Unloaded from vehicle
+|----------|---------|---------|---------|---------|
+|`ace_addCargo` | [_item (CLASSNAME or OBJECT), _vehicle, _cargoCount] | Target | Callable | Scripted way to add cargo to vehicle |
+|`ace_cargoLoaded` | [_item, _vehicle] | Global | Listen | Cargo has been Loaded into vehicle |
+|`ace_cargoUnloaded` | [_item, _vehicle, _unloadType] | Global | Listen | Cargo has been Unloaded from vehicle |
### 2.5 Captives (`ace_captives`)
| Event Key | Parameters | Locality | Type | Description |
-|----------|---------|---------|---------|---------|---------|
-|`ace_captiveStatusChanged` | [_unit, _state(BOOL), _reason ("SetHandcuffed" or "SetSurrendered"), _caller] | Global | Listen | Unit's captivity state changed
-|`ace_captives_setSurrendered` | [_unit, _state(BOOL)] | Target | Callable | Sets a unit to either start or stop surrendering
-|`ace_captives_setHandcuffed` | [_unit, _state(BOOL)] | Target | Callable | Sets a unit to either start or stop being handcuffed
-|`ace_captives_escortingCaptive` | [_unit, _state(BOOL), _caller] | Local | Listen | Caller starting or stopping escort of unit
+|----------|---------|---------|---------|---------|
+|`ace_captiveStatusChanged` | [_unit, _state(BOOL), _reason ("SetHandcuffed" or "SetSurrendered"), _caller] | Global | Listen | Unit's captivity state changed |
+|`ace_captives_setSurrendered` | [_unit, _state(BOOL)] | Target | Callable | Sets a unit to either start or stop surrendering |
+|`ace_captives_setHandcuffed` | [_unit, _state(BOOL)] | Target | Callable | Sets a unit to either start or stop being handcuffed |
+|`ace_captives_escortingCaptive` | [_unit, _state(BOOL), _caller] | Local | Listen | Caller starting or stopping escort of unit |
### 2.6 Settings (`ace_common`)
| Event Key | Parameters | Locality | Type | Description |
-|----------|---------|---------|---------|---------|---------|
-|`ace_settingsInitialized` | [] | Local | Listen | All modules are read and settings are ready
-|`ace_settingChanged` | [_name,_value] | Local | Listen | A setting has been changed
+|----------|---------|---------|---------|---------|
+|`ace_settingsInitialized` | [] | Local | Listen | All modules are read and settings are ready |
+|`ace_settingChanged` | [_name,_value] | Local | Listen | A setting has been changed |
### 2.7 Tagging (`ace_tagging`)
| Event Key | Parameters | Locality | Type | Description |
-|----------|---------|---------|---------|---------|---------|
-|`ace_tagCreated` | [_tagObject, _texture, _tagAttachedTo (can be null), _unitThatCreated] | Global | Listen | Tag is created
+|----------|---------|---------|---------|---------|
+|`ace_tagCreated` | [_tagObject, _texture, _tagAttachedTo (can be null), _unitThatCreated] | Global | Listen | Tag is created |
### 2.8 Explosives (`ace_explosives`)
| Event Key | Parameters | Locality | Type | Description |
-|----------|---------|---------|---------|---------|---------|
-|`ace_allowDefuse` | [_mine, _allow] | Global or Target | Callable | Set allowance of the dynamic defusal action on a mine
-|`ace_tripflareTriggered` | [_flareObject, [_posX, _posY, _posZ]] | Global | Listen | Tripflare triggered
-|`ace_explosives_clackerAdded` | [_unit, _explosive, _id] | Local | Listen | Clacker added to explosive
-|`ace_explosives_place` | [_explosive, _dir, _pitch, _unit] | Global | Listen | Explosive is armed
-|`ace_explosives_setup` | [_explosiveVehicle, _magClassname, _unit] | Global | Listen | Explosive is placed in the world
+|----------|---------|---------|---------|---------|
+|`ace_allowDefuse` | [_mine, _allow] | Global or Target | Callable | Set allowance of the dynamic defusal action on a mine |
+|`ace_tripflareTriggered` | [_flareObject, [_posX, _posY, _posZ]] | Global | Listen | Tripflare triggered |
+|`ace_explosives_clackerAdded` | [_unit, _explosive, _id] | Local | Listen | Clacker added to explosive |
+|`ace_explosives_place` | [_explosive, _dir, _pitch, _unit] | Global | Listen | Explosive is armed |
+|`ace_explosives_setup` | [_explosiveVehicle, _magClassname, _unit] | Global | Listen | Explosive is placed in the world |
### 2.9 Logistics Wirecutter (`ace_logistics`)
| Event Key | Parameters | Locality | Type | Description |
-|----------|---------|---------|---------|---------|---------|
-|`ace_wireCuttingStarted` | [_unit, _fence] | Global | Listen | Fence cutting started
+|----------|---------|---------|---------|---------|
+|`ace_wireCuttingStarted` | [_unit, _fence] | Global | Listen | Fence cutting started |
### 2.9 Refuel (`ace_refuel`)
| Event Key | Parameters | Locality | Type | Description |
-|----------|---------|---------|---------|---------|---------|
-|`ace_refuel_started` | [_source, _target] | Local | Listen | Refueling has started
-|`ace_refuel_tick` | [_source, _target, _amount] | Local | Listen | Amount of fuel transferred in a tick
-|`ace_refuel_stopped` | [_source, _target] | Local | Listen | Refueling has stopped
+|----------|---------|---------|---------|---------|
+|`ace_refuel_started` | [_source, _target] | Local | Listen | Refuelling has started |
+|`ace_refuel_tick` | [_source, _target, _amount] | Local | Listen | Amount of fuel transferred in a tick |
+|`ace_refuel_stopped` | [_source, _target] | Local | Listen | Refuelling has stopped |
### 2.10 Cook Off (`ace_cookoff`)
| Event Key | Parameters | Locality | Type | Description |
|----------|---------|---------|---------|---------|---------|
-|`ace_cookoff_cookOff` | [_vehicle, _intensity, _instigator, _smokeDelayEnabled, _ammoDetonationChance, _detonateAfterCookoff, _fireSource, _canRing, _maxIntensity, _canJet] | Server | Callable | Start vehicle cook-off
-|`ace_cookoff_cookOffBox` | [_box, _killer, _instigator] | Server | Callable | Start ammo box cook-off
-|`ace_cookoff_detonateAmmunition` | [_object, _destroyWhenFinished, _killer, _instigator, _initialDelay"] | Server | Callable | Start ammo detonation
-|`ace_cookoff_engineFire` | _vehicle | Server | Callable | Start engine fire
-
+|`ace_cookoff_cookOff` | [_vehicle, _intensity, _instigator, _smokeDelayEnabled, _ammoDetonationChance, _detonateAfterCookoff, _fireSource, _canRing, _maxIntensity, _canJet] | Global | Listen | Vehicle cook-off has started |
+|`ace_cookoff_cookOffBox` | [_box, _source, _instigator, _delay] | Global | Listen | Ammo box cook-off has started |
+|`ace_cookoff_engineFire` | [_vehicle] | Global | Listen | Engine fire has started |
### 2.11 Attach (`ace_attach`)
| Event Key | Parameters | Locality | Type | Description |
-|----------|---------|---------|---------|---------|---------|
-|`ace_attach_attached` | [_attachedObject, _itemClassname, _temporary] | Local | Listen | After an item was attached to a unit/vehicle. _temporary flag means a item is being re-attached after the player exits a vehicle
-|`ace_attach_detaching` | [_attachedObject, _itemName, _temporary] | Local | Listen | Just before an item gets detached/removed from a unit/vehicle. _temporary flag means its detached because the player unit entered a vehicle.
+|----------|---------|---------|---------|---------|
+|`ace_attach_attached` | [_attachedObject, _itemClassname, _temporary] | Local | Listen | After an item was attached to a unit/vehicle. _temporary flag means a item is being re-attached after the player exits a vehicle |
+|`ace_attach_detaching` | [_attachedObject, _itemName, _temporary] | Local | Listen | Just before an item gets detached/removed from a unit/vehicle. _temporary flag means its detached because the player unit entered a vehicle. |
### 2.12 Trenches (`ace_trenches`)
| Event Key | Parameters | Locality | Type | Description |
|---------- |------------|----------|------|-------------|
-| `ace_trenches_placed` | [_unit, _trench] | Global | Listen | After trench object is placed by unit.
-| `ace_trenches_finished` | [_unit, _trench] | Global | Listen | After trench object is fully dug up by unit (100% progress).
+| `ace_trenches_placed` | [_unit, _trench] | Global | Listen | After trench object is placed by unit. |
+| `ace_trenches_finished` | [_unit, _trench] | Global | Listen | After trench object is fully dug up by unit (100% progress). |
### 2.13 Medical GUI (`ace_medical_gui`)
@@ -157,9 +155,15 @@ MenuType: 0 = Interaction, 1 = Self Interaction
| Event Key | Parameters | Locality | Type | Description |
|---------- |------------|----------|------|-------------|
-|---------- |------------|----------|------|-------------|
| `ace_interaction_doorOpeningStarted` | [_house, _door, _animations] | Local | Listen | Called when local unit starts interacting with doors
-| `ace_interaction_doorOpeningStopped` | [_house, _door, _animations] | Local | Listen | Called when local unit stopps interacting with doors
+| `ace_interaction_doorOpeningStopped` | [_house, _door, _animations] | Local | Listen | Called when local unit stops interacting with doors
+
+### 2.17 Headless (`ace_headless`)
+
+| Event Key | Parameters | Locality | Type | Description |
+|---------- |------------|----------|------|-------------|
+| `ace_headless_groupTransferPre` | [_group, _HC (OBJECT), _previousOwner, _idHC] | Target | Listen | Called just before a group is transferred from any machine to a HC. Called where group currently is local and on the HC, where group is going to be local.
+| `ace_headless_groupTransferPost` | [_group, _HC (OBJECT), _previousOwner, _idHC, _transferredSuccessfully] | Target | Listen | Called just after a group is transferred from a machine to a HC. Called where group was local and on the HC, where group is now local. `_transferredSuccessfully` is passed so mods can actually check if the locality was properly transferred, as ownership transfer is not guaranteed.
## 3. Usage
Also Reference [CBA Events System](https://github.com/CBATeam/CBA_A3/wiki/Custom-Events-System){:target="_blank"} documentation.
@@ -170,21 +174,21 @@ Also Reference [CBA Events System](https://github.com/CBATeam/CBA_A3/wiki/Custom
`CBA_fnc_addEventHandler` - Adds an event handler with the event name and returns the event handler ID.
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Event name | String | Required
-1 | Code block | Code | Required
-**R** | Event ID | Number | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Event name | String | Required |
+| 1 | Code block | Code | Required |
+| **R** | Event ID | Number | Return value |
#### 3.1.2 Remove Event
`CBA_fnc_removeEventHandler` - Removes a specific event handler of the given event name, using the ID returned from `CBA_fnc_addEventHandler`.
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Event name | String | Required
-1 | Event ID | Number | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Event name | String | Required |
+| 1 | Event ID | Number | Required |
+| **R** | None | None | Return value |
### 3.2 Calling Events
@@ -192,42 +196,42 @@ Also Reference [CBA Events System](https://github.com/CBATeam/CBA_A3/wiki/Custom
`CBA_fnc_localEvent` - Calls an event only on the local machine, useful for inter-module events.
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Event name | String | Required
-1 | Arguments | Any | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Event name | String | Required |
+| 1 | Arguments | Any | Required |
+| **R** | None | None | Return value |
#### 3.2.2 Target Event
`CBA_fnc_targetEvent` - Calls an event only on the target machine or list of target machines.
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Event name | String | Required
-1 | Arguments | Any | Required
-2 | Target(s) | Object OR Number OR Array | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Event name | String | Required |
+| 1 | Arguments | Any | Required |
+| 2 | Target(s) | Object OR Number OR Array | Required |
+| **R** | None | None | Return value |
#### 3.2.3 Server Event
`CBA_fnc_serverEvent` - Calls an event only on the server machine (dedicated or self-hosted).
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Event name | String | Required
-1 | Arguments | Any | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Event name | String | Required |
+| 1 | Arguments | Any | Required |
+| **R** | None | None | Return value |
#### 3.2.4 Global Event
`CBA_fnc_globalEvent` - Calls an event on all machines - the local machine, and the server machine.
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Event name | String | Required
-1 | Arguments | Any | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Event name | String | Required |
+| 1 | Arguments | Any | Required |
+| **R** | None | None | Return value |
### 3.3 Synchronized Events
@@ -238,12 +242,12 @@ Adds a globally synchronized event handler which will expire events after the pr
`ace_common_fnc_addSyncedEventHandler`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Event name | String | Required
-1 | Code block | Code | Required
-2 | Time to live | Number OR Code | Optional (default: `0`)
-**R** | Event ID | Number | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Event name | String | Required |
+| 1 | Code block | Code | Required |
+| 2 | Time to live | Number OR Code | Optional (default: `0`) |
+| **R** | Event ID | Number | Return value |
#### 3.3.2 Remove Synchronized Event
@@ -251,10 +255,10 @@ Removes a specific event handler of the given event name, using the ID returned
`ace_common_fnc_removeSyncedEventHandler`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Event name | String | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Event name | String | Required |
+| **R** | None | None | Return value |
#### 3.3.3 Call Synchronized Event
@@ -262,12 +266,12 @@ Calls a globally synchronized event, which will also be run on JIP players unles
`ace_common_fnc_syncedEvent`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Event name | String | Required
-1 | Arguments | Any | Required
-2 | Time to live for this call | Number OR Code | Optional (default: `0`)
-**R** | Event ID | Number | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Event name | String | Required |
+| 1 | Arguments | Any | Required |
+| 2 | Time to live for this call | Number OR Code | Optional (default: `0`) |
+| **R** | Event ID | Number | Return value |
### 3.4 Example
diff --git a/docs/wiki/framework/explosives-framework.md b/docs/wiki/framework/explosives-framework.md
index 9d943e3eee..8abffa9448 100644
--- a/docs/wiki/framework/explosives-framework.md
+++ b/docs/wiki/framework/explosives-framework.md
@@ -120,16 +120,16 @@ class CfgWeapons {
## 4. Trigger list
-Name | Use
----- | -----
-`Command` | Explode when activated via clacker.
-`MK16_Transmitter` | Explode when activated via M26 clacker.
-`DeadManSwitch` | Explode after activated via the switch or the person dies.
-`Cellphone` | Explode when the number is called.
-`PressurePlate` | Explode upon being stepped upon.
-`IRSensor` | Explode after movement is detected in front of the mine.
-`Timer` | Explode after timer drop to 0.
-`Tripwire` | Explode when something touch the tripwire.
+| Name | Use |
+| ---- | ----- |
+| `Command` | Explode when activated via clacker. |
+| `MK16_Transmitter` | Explode when activated via M26 clacker. |
+| `DeadManSwitch` | Explode after activated via the switch or the person dies. |
+| `Cellphone` | Explode when the number is called. |
+| `PressurePlate` | Explode upon being stepped upon. |
+| `IRSensor` | Explode after movement is detected in front of the mine. |
+| `Timer` | Explode after timer drop to 0. |
+| `Tripwire` | Explode when something touch the tripwire. |
## 5. Scripting
@@ -138,41 +138,41 @@ Name | Use
`ace_explosives_fnc_scriptedExplosive`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Explosive objects | Array | Required
-1 | Delay before detonation | Number | Optional (default: `0`, randomized up to given number if negative)
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Explosive objects | Array | Required |
+| 1 | Delay before detonation | Number | Optional (default: `0`, randomized up to given number if negative) |
+| **R** | None | None | Return value |
#### 5.1.1 Example
`[[charge1, charge2], -3] call ace_explosives_fnc_scriptedExplosive;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `[charge1, charge2]` | Explosive objects to detonate
-1 | `-3` | Randomized delay, up to 3 seconds
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `[charge1, charge2]` | Explosive objects to detonate |
+| 1 | `-3` | Randomized delay, up to 3 seconds |
### 5.2 Connect Explosive
`ace_explosives_fnc_connectExplosive`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Unit to connect to | Object | Required
-1 | Explosive object to connect to | Object | Required
-2 | Detonator type class name (must be present on unit) | String | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Unit to connect to | Object | Required |
+| 1 | Explosive object to connect to | Object | Required |
+| 2 | Detonator type class name (must be present on unit) | String | Required |
+| **R** | None | None | Return value |
#### 5.2.1 Example
`[player, claymore1, "ACE_Clacker"] call ace_explosives_fnc_connectExplosive;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `player` | Unit explosive will connect to
-1 | `claymore1` | Explosive object that will be connected
-2 | `"ACE_Clacker"` | Detonator type class name
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `player` | Unit explosive will connect to |
+| 1 | `claymore1` | Explosive object that will be connected |
+| 2 | `"ACE_Clacker"` | Detonator type class name |
#### 5.3 Detonation Handler.
@@ -207,7 +207,7 @@ Jammer that blocks RF triggers:
#### 5.4 Disabling `setShotParents`.
-ACE will set the owner/instigator of the explosive to the unit placeing/detonating it.
+ACE will set the owner/instigator of the explosive to the unit placing/detonating it.
This can be disabled by executing
```sqf
diff --git a/docs/wiki/framework/fastroping-framework.md b/docs/wiki/framework/fastroping-framework.md
index fad016a8bf..57c6b9055d 100644
--- a/docs/wiki/framework/fastroping-framework.md
+++ b/docs/wiki/framework/fastroping-framework.md
@@ -18,7 +18,7 @@ If you want to prepare a helicopter from your addon for fastroping, there's a fe
By using simple rope origin points you will only need two config entries:
-```
+```cpp
ace_fastroping_enabled = 1;
ace_fastroping_ropeOrigins[] = {
{x, y, z},
@@ -28,7 +28,7 @@ ace_fastroping_ropeOrigins[] = {
This will create the ropes at the two given points. If you have defined memory points for the rope origins, you can use them too:
-```
+```cpp
ace_fastroping_enabled = 1;
ace_fastroping_ropeOrigins[] = {"ropeOriginLeft", "ropeOriginRight"};
```
@@ -41,7 +41,7 @@ If your helicopter is not fastroping capable by default, you can make it take a
To make your helicopter FRIES capable, you need to add the following config entries:
-```
+```cpp
ace_fastroping_enabled = 2;
ace_fastroping_friesType = "yourFRIESType";
ace_fastroping_friesAttachmentPoint[] = {x, y, z};
@@ -87,16 +87,16 @@ ACE3 provides two functions that are compatible with most helicopters and all AC
`ace_fastroping_fnc_equipFRIES`
-| | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Helicopter | Object | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Helicopter | Object | Required |
+| **R** | None | None | Return value |
### 4.2. Remove FRIES from helicopter
`ace_fastroping_fnc_unequipFRIES`
-| | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Helicopter | Object | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Helicopter | Object | Required |
+| **R** | None | None | Return value |
diff --git a/docs/wiki/framework/field-rations-framework.md b/docs/wiki/framework/field-rations-framework.md
index bc433e7d52..34b8b8fbcd 100644
--- a/docs/wiki/framework/field-rations-framework.md
+++ b/docs/wiki/framework/field-rations-framework.md
@@ -16,19 +16,19 @@ redirect_from: "/wiki/frameworkx/field-rations-framework.html"
### 1.1 Consumable Items
-Config Name | Type | Description
------------ | ---- | -----------
-`acex_field_rations_thirstQuenched` | Number | Amount of thirst quenched when item is consumed*
-`acex_field_rations_hungerSatiated` | Number | Amount of hunger satiated when item is consumed*
-`acex_field_rations_consumeTime` | Number | Time required to consume the item (in seconds)
-`acex_field_rations_consumeText` | String | Progress bar text (OPTIONAL)
-`acex_field_rations_consumeAnims` | Array | Animations to play when consuming item** (OPTIONAL)
-`acex_field_rations_consumeSounds` | Array | Sounds to play when consuming item** (OPTIONAL)
-`acex_field_rations_replacementItem` | String | Class name of replacement item to add on consumption (OPTIONAL)
-`acex_field_rations_refillItem` | String | Makes an item refillable, class name of item added when refilled (OPTIONAL)
-`acex_field_rations_refillAmount` | Number | Amount of water required to refill item (OPTIONAL)
-`acex_field_rations_refillTime` | Number | Time required to refill item (in seconds) (OPTIONAL)
-`ACE_isFieldRationItem` | Number | Force adds the item to the ACE Field Rations category in ACE Arsenal (OPTIONAL)
+| Config Name | Type | Description |
+| ----------- | ---- | ----------- |
+| `acex_field_rations_thirstQuenched` | Number | Amount of thirst quenched when item is consumed* |
+| `acex_field_rations_hungerSatiated` | Number | Amount of hunger satiated when item is consumed* |
+| `acex_field_rations_consumeTime` | Number | Time required to consume the item (in seconds) |
+| `acex_field_rations_consumeText` | String | Progress bar text (OPTIONAL) |
+| `acex_field_rations_consumeAnims` | Array | Animations to play when consuming item** (OPTIONAL) |
+| `acex_field_rations_consumeSounds` | Array | Sounds to play when consuming item** (OPTIONAL) |
+| `acex_field_rations_replacementItem` | String | Class name of replacement item to add on consumption (OPTIONAL) |
+| `acex_field_rations_refillItem` | String | Makes an item refillable, class name of item added when refilled (OPTIONAL) |
+| `acex_field_rations_refillAmount` | Number | Amount of water required to refill item (OPTIONAL) |
+| `acex_field_rations_refillTime` | Number | Time required to refill item (in seconds) (OPTIONAL) |
+| `ACE_isFieldRationItem` | Number | Force adds the item to the ACE Field Rations category in ACE Arsenal (OPTIONAL) |
_* Value range is 0 to 100 and can be modified by the corresponding coefficient setting._
@@ -37,17 +37,17 @@ _** Array is in format: STAND, CROUCH, PRONE. If player is in vehicle, the first
### 1.2 Water Sources
-Config Name | Type | Description
------------ | ---- | -----------
-`acex_field_rations_waterSupply` | Number | Amount of water inside the object (-1 - disabled, -10 - infinite) (OPTIONAL)
-`acex_field_rations_offset` | Array | Refill action offset relative to model (OPTIONAL)
+| Config Name | Type | Description |
+| ----------- | ---- | ----------- |
+| `acex_field_rations_waterSupply` | Number | Amount of water inside the object (-1 - disabled, -10 - infinite) (OPTIONAL) |
+| `acex_field_rations_offset` | Array | Refill action offset relative to model (OPTIONAL) |
## 2. Events
-Event Name | Passed Parameter(s) | Locality | Description
----------- | ------------------- | -------- | -----------
-`acex_rationConsumed` | [_player, _consumeItem, _replacementItem, _thirstQuenched, _hungerSatiated, _isMagazine] | Local | Item consumed
-`acex_rationRefilled` | [_source, _player, _item, _refillItem, _refillAmount, _isMagazine] | Local | Item refilled
+| Event Name | Passed Parameter(s) | Locality | Description |
+| ---------- | ------------------- | -------- | ----------- |
+| `acex_rationConsumed` | [_player, _consumeItem, _replacementItem, _thirstQuenched, _hungerSatiated, _isMagazine] | Local | Item consumed |
+| `acex_rationRefilled` | [_source, _player, _item, _refillItem, _refillAmount, _isMagazine] | Local | Item refilled |
## 3. Scripting
diff --git a/docs/wiki/framework/fire-framework.md b/docs/wiki/framework/fire-framework.md
index 4f9ecdfdd3..7994036ece 100644
--- a/docs/wiki/framework/fire-framework.md
+++ b/docs/wiki/framework/fire-framework.md
@@ -21,22 +21,22 @@ Use `CBA_fnc_serverEvent` to use the following features. Events are defined only
`ace_fire_addFireSource`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Source of flame | Object/Position ASL | Required
-1 | Radius of fire | Number | Required
-2 | Intensity of fire (1, 10] | Number | Required
-3 | Fire source ID | Any | Required
-4 | Condition to stop fire | Code | Optional (default: `{ true }`)
-5 | Arguments to pass to condition | Any | Optional (default: `[]`)
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Source of flame | Object/Position ASL | Required |
+| 1 | Radius of fire | Number | Required |
+| 2 | Intensity of fire (1, 10] | Number | Required |
+| 3 | Fire source ID | Any | Required |
+| 4 | Condition to stop fire | Code | Optional (default: `{ true }`) |
+| 5 | Arguments to pass to condition | Any | Optional (default: `[]`) |
### 1.2 Removing fire source
`ace_fire_removeFireSource`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Fire source ID | Any | Required
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Fire source ID | Any | Required |
## 2. Variables
diff --git a/docs/wiki/framework/fortify-framework.md b/docs/wiki/framework/fortify-framework.md
index 27bfe7d613..9de0fab35b 100644
--- a/docs/wiki/framework/fortify-framework.md
+++ b/docs/wiki/framework/fortify-framework.md
@@ -114,11 +114,11 @@ The Fortify budget can be updated for any side using the function.
### 2.1 Listenable
-Event Name | Passed Parameter(s) | Locality | Description
----------- | ----------- | ------------------- | --------
-`acex_fortify_objectPlaced` | [player, side, objectPlaced] | Global | Fortify object placed
-`acex_fortify_objectDeleted` | [player, side, objectDeleted] | Global | Fortify object deleted
-`acex_fortify_onDeployStart` | [player, object, cost] | Local | Player starts placing object
-`ace_fortify_onDeployStop` | [player, object, cost] | Local | Player stops placing object. Raised only if stopped before trying to place (= before progress bar appears). If it's during progress bar, only `ace_fortify_deployCanceled` is raised.
-`ace_fortify_deployFinished` | [[player, side, configName, posASL, vectorDir, vectorUp, cost], elapsedTime, totalTime, errorCode] | Local | Player successfully finishes building object
-`ace_fortify_deployCanceled` | [[player, side, configName, posASL, vectorDir, vectorUp, cost], elapsedTime, totalTime, errorCode] | Local | Player cancels building object
+| Event Name | Passed Parameter(s) | Locality | Description |
+| ---------- | ----------- | ------------------- | -------- |
+| `acex_fortify_objectPlaced` | [player, side, objectPlaced] | Global | Fortify object placed |
+| `acex_fortify_objectDeleted` | [player, side, objectDeleted] | Global | Fortify object deleted |
+| `acex_fortify_onDeployStart` | [player, object, cost] | Local | Player starts placing object |
+| `ace_fortify_onDeployStop` | [player, object, cost] | Local | Player stops placing object. Raised only if stopped before trying to place (= before progress bar appears). If it's during progress bar, only `ace_fortify_deployCanceled` is raised. |
+| `ace_fortify_deployFinished` | [[player, side, configName, posASL, vectorDir, vectorUp, cost], elapsedTime, totalTime, errorCode] | Local | Player successfully finishes building object |
+| `ace_fortify_deployCanceled` | [[player, side, configName, posASL, vectorDir, vectorUp, cost], elapsedTime, totalTime, errorCode] | Local | Player cancels building object |
diff --git a/docs/wiki/framework/frag-framework.md b/docs/wiki/framework/frag-framework.md
index 07c59764f5..d05f5068f6 100644
--- a/docs/wiki/framework/frag-framework.md
+++ b/docs/wiki/framework/frag-framework.md
@@ -60,22 +60,22 @@ Dimensionless value, as long as same unit as `ace_frag_metal` (for example `kg/k
Gurney constant for explosive force. You can find a list of common explosive types below. If you can not find it here, or want more accurate numbers, just google the type of explosive and Gurney constant and you can find substantial information. This is **not** the detonation velocity of the explosive, do not confuse them!
-Type | Speed
---------------- | --------
-Composition B | 2700 m/s
-Composition C-3 | 2680 m/s
-Cyclotol 75/25 | 2790 m/s
-HMX | 2800 m/s
-LX-14 | 2970 m/s
-Octol 75/25 | 2800 m/s
-PBX 9404 | 2900 m/s
-PBX 9502 | 2377 m/s
-Pentolite | 2750 m/s
-PETN | 2930 m/s
-RDX | 2830 m/s
-Tetryl | 2500 m/s
-TNT | 2440 m/s
-Tritonal | 2320 m/s
+| Type | Speed |
+| --------------- | -------- |
+| Composition B | 2700 m/s |
+| Composition C-3 | 2680 m/s |
+| Cyclotol 75/25 | 2790 m/s |
+| HMX | 2800 m/s |
+| LX-14 | 2970 m/s |
+| Octol 75/25 | 2800 m/s |
+| PBX 9404 | 2900 m/s |
+| PBX 9502 | 2377 m/s |
+| Pentolite | 2750 m/s |
+| PETN | 2930 m/s |
+| RDX | 2830 m/s |
+| Tetryl | 2500 m/s |
+| TNT | 2440 m/s |
+| Tritonal | 2320 m/s |
### 1.4 Gurney shape factor
@@ -83,11 +83,11 @@ Tritonal | 2320 m/s
Shape factor for the explosive configuration. You should choose it based on the general configuration of explosives/metal in the warhead. Most grenades for example are a sphere. Artillery and aircraft bombs are a cylinder. Mines generally a flat plate. Below is a list of the three common shapes and their factors.
-Shape | Factor
--------- | ------
-Sphere | 3/5
-Cylinder | 1/2
-Plate | 3/5
+| Shape | Factor |
+| -------- | ------ |
+| Sphere | 3/5 |
+| Cylinder | 1/2 |
+| Plate | 3/5 |
There are other configurations but these are the most common. If you are interested in others check out the wikipedia link given above. Most of these will not correctly function in ACE3 though due to additional variables for the equation.
@@ -97,18 +97,18 @@ There are other configurations but these are the most common. If you are interes
There are different types of fragmentation fragments to choose from, and they can be defined in this config value.
-| Type
-| ----
-| ACE_frag_tiny
-| ACE_frag_tiny_HD
-| ACE_frag_small
-| ACE_frag_small_HD
-| ACE_frag_medium
-| ACE_frag_medium_HD
-| ACE_frag_large
-| ACE_frag_large_HD
-| ACE_frag_huge
-| ACE_frag_huge_HD
+| Type |
+| ------------------ |
+| ACE_frag_tiny |
+| ACE_frag_tiny_HD |
+| ACE_frag_small |
+| ACE_frag_small_HD |
+| ACE_frag_medium |
+| ACE_frag_medium_HD |
+| ACE_frag_large |
+| ACE_frag_large_HD |
+| ACE_frag_huge |
+| ACE_frag_huge_HD |
The tinier the piece of fragmentation the shorter the distance of travel. The `_HD` variants are all even higher drag versions. Grenades generally should use the `_HD` variants. Experimentation here is important.
diff --git a/docs/wiki/framework/goggles-framework.md b/docs/wiki/framework/goggles-framework.md
index 1b9b27588b..07840ebf95 100644
--- a/docs/wiki/framework/goggles-framework.md
+++ b/docs/wiki/framework/goggles-framework.md
@@ -34,7 +34,7 @@ class CfgGlasses {
### 2.1 Listenable
-Event Name | Description | Passed Parameter(s) | Locality
----------- | ----------- | ------------------- | --------
-`ace_glassesChanged` | Glasses Changed | `[_unit, _glassesClass]` | Local
-`ace_glassesCracked` | Glasses Cracked | `[_unit]` | Local
+| Event Name | Description | Passed Parameter(s) | Locality |
+| ---------- | ----------- | ------------------- | -------- |
+| `ace_glassesChanged` | Glasses Changed | `[_unit, _glassesClass]` | Local |
+| `ace_glassesCracked` | Glasses Cracked | `[_unit]` | Local |
diff --git a/docs/wiki/framework/grenades-framework.md b/docs/wiki/framework/grenades-framework.md
index b8f61872ff..755773c171 100644
--- a/docs/wiki/framework/grenades-framework.md
+++ b/docs/wiki/framework/grenades-framework.md
@@ -1,7 +1,7 @@
---
layout: wiki
title: Grenades Framework
-description: Explains how to set-up flashbangs, particularly multi-bangs.
+description: Explains how to set-up incendiary, flares and flashbangs, particularly multi-bangs.
group: framework
parent: wiki
order: 7
@@ -14,11 +14,12 @@ version:
## 1. Overview
-ACE provides a simple interface for creating flashbang grenades and specifying their properties. It is important that one sets `timeToLive` to be greater than the total possible time until the last explosion, i.e, `ace_grenades_flashbangBangs * ace_grenades_flashbangInterval + ace_grenades_flashbangIntervalMaxDeviation`. Any explosions that occur after the `timeToLive` has expired will occur at `(0,0)`.
+ACE provides a simple interface for creating incendiary, flare and flashbang grenades, as well as specifying their properties. For flashbangs, it is important that one sets `timeToLive` to be greater than the total possible time until the last explosion, i.e, `ace_grenades_flashbangBangs * ace_grenades_flashbangInterval + ace_grenades_flashbangIntervalMaxDeviation`. Any explosions that occur after the `timeToLive` has expired will occur at `(0,0)`.
## 2. Config Values
+### 2.1 Flashbang Config Values
There are several config entries specific to ACE flashbangs. All successive values can be left undefined and they will be given the defaults shown in the first example below, with the exception of `ace_grenades_flashbang`, which is equal to `0` if left undefined.
```cpp
@@ -49,32 +50,80 @@ class CfgAmmo {
ace_grenades_flashbangBangs = 6; // 6 bangs
ace_grenades_flashbangInterval = 0.25; // 0.25 seconds between each subsequent bang
ace_grenades_flashbangIntervalMaxDeviation = 0.05; // Deviation of up to ± 0.05 seconds on each fuse
+ ace_grenades_flashbangExplodeSound[] = { // Sound that is played upon detonation
+ {"A3\Sounds_F\arsenal\explosives\grenades\Explosion_HE_grenade_01.wss", 5, 1.2, 400}, // file path, volume, pitch, max distance
+ {"A3\Sounds_F\arsenal\explosives\grenades\Explosion_HE_grenade_02.wss", 5, 1.2, 400}
+ };
};
};
```
-### 2.1 ace_grenades_flashbang
+#### 2.1.1 ace_grenades_flashbang
If set to zero or left undefined, the grenade is not treated as a flashbang. If it is set to 1, the grenade will be treated as a flashbang with the associated effects.
-### 2.2 ace_grenades_flashbangBangs
+#### 2.1.2 ace_grenades_flashbangBangs
The flashbang will explode as many times as is specified. The default is 1.
-### 2.3 ace_grenades_flashbangInterval
+#### 2.1.3 ace_grenades_flashbangInterval
The average amount of time in seconds, after `explosionTime` has passed, between each subsequent bang.
-### 2.4 ace_grenades_flashbangIntervalMaxDeviation
+#### 2.1.4 ace_grenades_flashbangIntervalMaxDeviation
The amount of randomness in the fuse time.
+### 2.1.5 ace_grenades_flashbangExplodeSound
+
+The sounds that can be used when the flashbang detonates. It randomly selects an entry from this array (equal chances, there are no weights involved).
+If not defined, `[format ["A3\Sounds_F\arsenal\explosives\grenades\Explosion_HE_grenade_0%1.wss", floor (random 4) + 1], 5, 1.2, 400]` is used as a default instead (4 sounds total).
+
+### 2.2 Incendiary Config Values
+
+```cpp
+class CfgAmmo {
+ class ACE_G_M14 {
+ ace_grenades_incendiary = 1;
+ };
+};
+```
+
+#### 2.2.1 ace_grenades_incendiary
+
+If set to zero or left undefined, the grenade is not treated as an incendiary. If it is set to 1, the grenade will be treated as an incendiary with the associated effects.
+
+### 2.3 Flare Config Values
+
+```cpp
+class CfgAmmo {
+ class ACE_G_Handflare_White {
+ ace_grenades_flare = 1;
+ ace_grenades_color[] = {0.5,0.5,0.5,0.5}; // R, G, B, light intensity
+ };
+};
+```
+
+#### 2.3.1 ace_grenades_flare
+
+If set to zero or left undefined, the grenade is not treated as a flare. If it is set to 1, the grenade will be treated as a flare with the associated effects.
+
+#### 2.3.1 ace_grenades_color
+
+Sets the color of the emitted light. The first 3 values of the array of the color, the last is the light intensity.
+
+### 2.4 Grenade Rolling
+
+#### 2.4.1 ace_grenades_rollVectorDirAndUp
+
+Sets the `setVectorDirAndUp` of the grenade when the grenade is rolled.
+
## 3. Events
### 3.1 Listenable
-Event Name | Description | Passed Parameter(s) | Locality
----------- | ----------- | ------------------- | --------
-`ace_flashbangExploded` | A flashbang exploded | `[_grenadePosASL]` | Global
-`ace_grenades_flashbangedAI` | A local AI was affected by a flashbang | `[_unit, _strength, _grenadePosASL]` | Local
-`ace_grenades_flashbangedPlayer` | The local player was affected by a flashbang | `[_strength, _grenadePosASL]` | Local
+| Event Name | Description | Passed Parameter(s) | Locality |
+| ---------- | ----------- | ------------------- | -------- |
+| `ace_flashbangExploded` | A flashbang exploded | `[_grenadePosASL]` | Global |
+| `ace_grenades_flashbangedAI` | A local AI was affected by a flashbang | `[_unit, _strength, _grenadePosASL]` | Local |
+| `ace_grenades_flashbangedPlayer` | The local player was affected by a flashbang | `[_strength, _grenadePosASL]` | Local |
diff --git a/docs/wiki/framework/headless-framework.md b/docs/wiki/framework/headless-framework.md
index 6dbc83c512..7a2a5a0822 100644
--- a/docs/wiki/framework/headless-framework.md
+++ b/docs/wiki/framework/headless-framework.md
@@ -30,14 +30,29 @@ As of ACEX v3.2.0 _(before merge into ACE3)_ this feature can also be enabled wi
## 2. Scripting
-### 2.1 Disable Transferring for a Group
+### 2.1 Manipulating HC Transfers of Groups via function
-To prevent a group from transferring to a Headless Client use the following line on a group leader (or every unit in a group in case group leader may not spawn):
+`ace_headless_fnc_blacklist`
+
+ | Arguments | Type | Optional (default value)
+---| --------- | ---- | ------------------------
+0 | Units | Object, Group or Array of both | Required
+1 | Add (true) or remove (false) from blacklist | Bool | Optional (default: `true`)
+2 | Owner to transfer units to | Number | Optional (default: `-1`)
+3 | Rebalance (0 = no rebalance, 1 = rebalance, 2 = force rebalance) | Number | (default: `0`)
+**R** | None | None | Return value
+
+`Force rebalance` means that all units, including the ones that are on the HCs, are rebalanced amongst the HCs, whereas `rebalance` means that newly spawned units are going to be evenly distributed amongst HCs. Therefore, `rebalance` does not guarantee that the HCs will have an equal amount of groups, whereas `force rebalance` does.
+
+### 2.2 Disable Transferring for a Group via variable
+
+To prevent a group from transferring to a Headless Client use the following line on a unit within a group:
```sqf
this setVariable ["acex_headless_blacklist", true];
```
+This variable can also be set on vehicles, disabling transferal of any groups having units in said vehicles.
## 3. Limitations
@@ -48,3 +63,7 @@ Some Arma 3 features are incompatible, this is up to BI to add support. Disable
Additionally, groups will not be transferred due to lack of support if they:
- Have waypoints with synchronized triggers (waypoint would not change status based on trigger condition) (added in ACEX v3.2.0 - _before merge into ACE3_)
+
+Groups will not be transferred to avoid issues:
+- If a player is within the group.
+- If they contain UAVs.
diff --git a/docs/wiki/framework/interactionMenu-framework.md b/docs/wiki/framework/interactionMenu-framework.md
index 68e49414e2..fb66fb3918 100644
--- a/docs/wiki/framework/interactionMenu-framework.md
+++ b/docs/wiki/framework/interactionMenu-framework.md
@@ -40,21 +40,25 @@ class CfgVehicles {
exceptions[] = {};
statement = "_player switchMove 'TestDance'";
icon = "\z\dance.paa";
+ };
+ };
+ };
+};
```
-Config Name | Type | Description
----------- | ----------- | -------------------
-`displayName` | String | Text shown to user
-`condition` | String (of code) | Condition to show the action
-`statement` | String (of code) | Statement run when selected
-`icon` | String (file path) | Icon shown (OPTIONAL)
-`exceptions` | Array (of strings) | Exceptions to `canInteractWith` conditions (e.g. `"notOnMap"`) (OPTIONAL)
-`insertChildren` | String (of code) | Code to return sub actions (OPTIONAL)
-`modifierFunction` | String (of code) | Code to modify this action (OPTIONAL)
-`runOnHover` | Number or String | (1=true) OR Condition code - Will run the statement on hover (OPTIONAL)
-`distance` | Number | External Base Actions Only, Max distance player can be from action point
-`position` | String (of code) | External Base Actions Only, Code to return a position in model cords (priority over `selection`)
-`selection` | String | External Base Actions Only, A memory point for `selectionPosition`
+| Config Name | Type | Description |
+| ---------- | ----------- | ------------------- |
+| `displayName` | String | Text shown to user |
+| `condition` | String (of code) | Condition to show the action |
+| `statement` | String (of code) | Statement run when selected |
+| `icon` | String (file path) | Icon shown (OPTIONAL) |
+| `exceptions` | Array (of strings) | Exceptions to `canInteractWith` conditions (e.g. `"notOnMap"`) (OPTIONAL) |
+| `insertChildren` | String (of code) | Code to return sub actions (OPTIONAL) |
+| `modifierFunction` | String (of code) | Code to modify this action (OPTIONAL) |
+| `runOnHover` | Number or String | (1=true) OR Condition code - Will run the statement on hover (OPTIONAL) |
+| `distance` | Number | External Base Actions Only, Max distance player can be from action point |
+| `position` | String (of code) | External Base Actions Only, Code to return a position in model cords (priority over `selection`) |
+| `selection` | String | External Base Actions Only, A memory point for `selectionPosition` |
Actions can be inserted anywhere on the config tree, e.g. hearing's earplugs is a sub action of `ACE_Equipment`:
@@ -62,7 +66,10 @@ Actions can be inserted anywhere on the config tree, e.g. hearing's earplugs is
class CAManBase: Man {
class ACE_SelfActions {
class ACE_Equipment {
- class ACE_PutInEarplugs {
+ class ACE_PutInEarplugs {};
+ };
+ };
+};
```
## 3. Adding actions via scripts
@@ -233,7 +240,7 @@ This is the ideal way to add self interaction actions, as adding them via `addAc
params ["_type"]; // string of the object's classname
if (!(_type isKindOf "Car")) exitWith {};
if ((getNumber (configFile >> "CfgVehicles" >> _type >> "side")) != 3) exitWith {};
-
+
private _action = ["playRadio","Play Radio","",{playMusic "NeverGonnaGiveYouUp"},{true}] call ace_interact_menu_fnc_createAction;
[_type, 1, ["ACE_SelfActions"], _action, true] call ace_interact_menu_fnc_addActionToClass;
}] call CBA_fnc_addEventHandler;
diff --git a/docs/wiki/framework/laser-framework.md b/docs/wiki/framework/laser-framework.md
index 1a7bbf7d6b..fef12a4760 100644
--- a/docs/wiki/framework/laser-framework.md
+++ b/docs/wiki/framework/laser-framework.md
@@ -18,17 +18,17 @@ version:
`ace_laser_fnc_getLaserCode`
-| | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Unit/Vehicle | Object | Required
-**R** | Laser code | Number | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Unit/Vehicle | Object | Required |
+| **R** | Laser code | Number | Return value |
### 1.2. Set object's laser code
`ace_laser_fnc_setLaserCode`
-| | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Unit/Vehicle | Object | Required
-1 | Laser code | Number | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Unit/Vehicle | Object | Required |
+| 1 | Laser code | Number | Required |
+| **R** | None | None | Return value |
diff --git a/docs/wiki/framework/medical-framework.md b/docs/wiki/framework/medical-framework.md
index 834eeced80..00d9133b00 100644
--- a/docs/wiki/framework/medical-framework.md
+++ b/docs/wiki/framework/medical-framework.md
@@ -219,23 +219,23 @@ Custom wound handlers should follow the same spec as the built-in handler:
`ace_medical_damage_fnc_woundsHandlerBase`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Unit that was hit | Object | Required
-1 | Array of damage dealt to each body part | Array | Required
-2 | Type of damage | String | Required
-**R** | Parameters to be passed to the next handler in the list, e.g. `_this` or a modified copy of it. Return `[]` to prevent further handling. | Array | Required
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Unit that was hit | Object | Required |
+| 1 | Array of damage dealt to each body part | Array | Required |
+| 2 | Type of damage | String | Required |
+| **R** | Parameters to be passed to the next handler in the list, e.g. `_this` or a modified copy of it. Return `[]` to prevent further handling. | Array | Required |
The damage elements are sorted in descending order according to how much damage was dealt to each body part _before armor was taken into account_, but the actual damage values are _after armor_.
### Example
`[player, [[0.5, "Body", 1], [0.3, "Head", 0.6]], "grenade"] ace_medical_damage_fnc_woundsHandlerBase`
- | Arguments | Explanation
----| --------- | -----------
-0 | `player` | Unit that was hit
-1 | `[[0.5, "Body", 1], [0.3, "Head", 0.6]]` | 0.5 damage to body (was 1 before armor), 0.3 damage to head (was 0.6 before armor)
-2 | `"grenade"` | type grenade (non-selection-specific)
+| | Arguments | Explanation |
+| ---| --------- | ----------- |
+| 0 | `player` | Unit that was hit |
+| 1 | `[[0.5, "Body", 1], [0.3, "Head", 0.6]]` | 0.5 damage to body (was 1 before armor), 0.3 damage to head (was 0.6 before armor) |
+| 2 | `"grenade"` | type grenade (non-selection-specific) |
## 5. Tweaking internal variables
Some of ACE Medical's underlying behavior, primarily related to damage handling and the vitals loop, can be fine-tuned by editing `ace_medical_const_` variables, found in [script_macros_medical.hpp](https://github.com/acemod/ACE3/blob/master/addons/medical_engine/script_macros_medical.hpp).
diff --git a/docs/wiki/framework/medical-treatment-framework.md b/docs/wiki/framework/medical-treatment-framework.md
index c84d4382ea..52e661a516 100644
--- a/docs/wiki/framework/medical-treatment-framework.md
+++ b/docs/wiki/framework/medical-treatment-framework.md
@@ -125,4 +125,13 @@ ace_medical_treatment_graveRotation = 0; // rotation angle (will depend on model
### 3.2 Zeus Medical Menu Module
If a mission maker wishes to disable Zeus access to the medical menu, they can set the variable below:
+```sqf
ace_medical_gui_enableZeusModule = false; // default is true
+```
+
+### 3.3 SpO2 Configuration
+
+If 3rd party mods want to disable SpO2 being set to a minimum upon successful CPR, they can set the variable below:
+```sqf
+ace_medical_treatment_setSpO2UponCPRSuccess = false; // default is true
+```
diff --git a/docs/wiki/framework/missile-guidance-framework.md b/docs/wiki/framework/missile-guidance-framework.md
index 3b31975da3..ff6859d735 100644
--- a/docs/wiki/framework/missile-guidance-framework.md
+++ b/docs/wiki/framework/missile-guidance-framework.md
@@ -117,6 +117,6 @@ class ace_missileguidance_attackProfiles {
### 5.1 Listenable
-Event Name | Description | Passed Parameter(s) | Locality
----------- | ----------- | ------------------- | --------
-`ace_missileguidance_handoff` | Missile handed off | `[_target, _args]` | Global
+| Event Name | Description | Passed Parameter(s) | Locality |
+| ---------- | ----------- | ------------------- | -------- |
+| `ace_missileguidance_handoff` | Missile handed off | `[_target, _args]` | Global |
diff --git a/docs/wiki/framework/nametags-framework.md b/docs/wiki/framework/nametags-framework.md
new file mode 100644
index 0000000000..d27a358b17
--- /dev/null
+++ b/docs/wiki/framework/nametags-framework.md
@@ -0,0 +1,45 @@
+---
+layout: wiki
+title: Nametags Framework
+description: Explains how to implement rank icons for factions.
+group: framework
+order: 5
+parent: wiki
+mod: ace
+version:
+ major: 3
+ minor: 13
+ patch: 0
+---
+
+## 1. Config Values
+
+### 1.1 Faction rank icons
+
+Defines the rank icons used by a faction.
+
+```cpp
+class CfgFactionClasses {
+ class MyFaction {
+ ace_nametags_rankIcons[] = {
+ "\z\ace\addons\nametags\UI\icons_germany\private_gs.paa", // path to private rank icon
+ "\z\ace\addons\nametags\UI\icons_germany\corporal_gs.paa", // path to corporal rank icon
+ "\z\ace\addons\nametags\UI\icons_germany\sergeant_gs.paa", // path to sergeant rank icon
+ "\z\ace\addons\nametags\UI\icons_germany\lieutenant_gs.paa", // path to lieutenant rank icon
+ "\z\ace\addons\nametags\UI\icons_germany\captain_gs.paa", // path to captain rank icon
+ "\z\ace\addons\nametags\UI\icons_germany\major_gs.paa", // path to major rank icon
+ "\z\ace\addons\nametags\UI\icons_germany\colonel_gs.paa" // path to colonel rank icon
+ };
+ };
+};
+```
+
+## 2. Mission Variables
+
+### 2.1 Faction rank icon usage
+
+If disabled, it won't use the faction icons defined via the config entry listed above.
+Needs to be set before postInit.
+```sqf
+ace_nametags_useFactionIcons = false; // by default true
+```
diff --git a/docs/wiki/framework/overpressure-framework.md b/docs/wiki/framework/overpressure-framework.md
index 7e7969f62a..243157c186 100644
--- a/docs/wiki/framework/overpressure-framework.md
+++ b/docs/wiki/framework/overpressure-framework.md
@@ -46,6 +46,6 @@ class CfgWeapons {
### 2.1 Listenable
-Event Name | Description | Passed Parameter(s) | Locality
----------- | ----------- | ------------------- | --------
-`ace_overpressure` | Overpressure damage inflicted | `[_firer, _posASL, _direction, _weapon, _magazine, _ammo]` | Target
+| Event Name | Description | Passed Parameter(s) | Locality |
+| ---------- | ----------- | ------------------- | -------- |
+| `ace_overpressure` | Overpressure damage inflicted | `[_firer, _posASL, _direction, _weapon, _magazine, _ammo]` | Target |
diff --git a/docs/wiki/framework/rearm-framework.md b/docs/wiki/framework/rearm-framework.md
index 7f899f54c9..a4061cb2bc 100644
--- a/docs/wiki/framework/rearm-framework.md
+++ b/docs/wiki/framework/rearm-framework.md
@@ -71,31 +71,31 @@ Meant to run on server only.
`ace_rearm_fnc_makeSource`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Ammo Truck | Object | Required
-1 | Supply Count | Number | Optional (default: `0`)
-1 | Add (`true`) or set (`false`) supply | Bool | Optional (default: `false`)
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Ammo Truck | Object | Required |
+| 1 | Supply Count | Number | Optional (default: `0`) |
+| 1 | Add (`true`) or set (`false`) supply | Bool | Optional (default: `false`) |
+| **R** | None | None | Return value |
#### 3.1.1 Example
`[cursorObject, 1200] call ace_rearm_fnc_makeSource`
- | Arguments | Explanation
----| --------- | -----------
-0 | `cursorObject` | Rearm source object
-1 | `1200` | Ammo supply
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `cursorObject` | Rearm source object |
+| 1 | `1200` | Ammo supply |
### 3.2 Enabling / disabling rearming
`ace_rearm_fnc_disable`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Ammo Truck | Object | Required
-1 | Disable rearming, true to disable, false to enable | Boolean | Optional (default: `true`)
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Ammo Truck | Object | Required |
+| 1 | Disable rearming, true to disable, false to enable | Boolean | Optional (default: `true`) |
+| **R** | None | None | Return value |
This function disables rearming for all supported turrets of a vehicle.
@@ -103,9 +103,9 @@ This function disables rearming for all supported turrets of a vehicle.
`[tank] call ace_rearm_fnc_disable;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `tank` | My object
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `tank` | My object |
Disables rearming on the object `tank`.
@@ -113,10 +113,10 @@ Disables rearming on the object `tank`.
`[tank, false] call ace_rearm_fnc_disable;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `tank` | My object
-1 | `false`| Rearming is enabled
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `tank` | My object |
+| 1 | `false` | Rearming is enabled |
Enables rearming on the object `tank`.
@@ -124,10 +124,10 @@ Enables rearming on the object `tank`.
`ace_rearm_fnc_getSupplyCount`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Ammo Truck | Object | Required
-**R** | Supply count | Number | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Ammo Truck | Object | Required |
+| **R** | Supply count | Number | Return value |
This function returns the current supply count of the ammo truck.
@@ -135,9 +135,9 @@ This function returns the current supply count of the ammo truck.
`[ammo_truck] call ace_rearm_fnc_getSupplyCount;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `ammo_truck` | My object
+| | Arguments | Explanation |
+| ---| ------------- | ----------- |
+| 0 | `ammo_truck` | My object |
The remaining supply count of `ammo_truck` will be returned.
@@ -145,11 +145,11 @@ The remaining supply count of `ammo_truck` will be returned.
`ace_rearm_fnc_setSupplyCount`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Ammo Truck | Object | Required
-1 | Supply Count | Boolean | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Ammo Truck | Object | Required |
+| 1 | Supply Count | Boolean | Required |
+| **R** | None | None | Return value |
This function sets the current supply count of the ammo truck. It can be used to replenish the ammo truck on `Limited ammo supply based on caliber` setting.
@@ -157,21 +157,21 @@ This function sets the current supply count of the ammo truck. It can be used to
`[ammo_truck, 1000] call ace_rearm_fnc_setSupplyCount;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `ammo_truck` | My ammo truck object
-1 | `1000`| Supply Count
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `ammo_truck` | My ammo truck object |
+| 1 | `1000`| Supply Count |
### 3.5 Adding specific magazines
`ace_rearm_fnc_addMagazineToSupply`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Ammo Truck | Object | Required
-1 | Magazine Classname | String | Required
-2 | Only add content of one ammo box | Boolean | Optional (default: `false`)
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Ammo Truck | Object | Required |
+| 1 | Magazine Classname | String | Required |
+| 2 | Only add content of one ammo box | Boolean | Optional (default: `false`) |
+| **R** | None | None | Return value |
This function is most useful with the module setting `Only specific Magazines`. Note that this function only adds one magazine of a specific class. Other magazines of the same size are not available on this module setting. It has to be used to replenish the ammo truck on `Only specific Magazines` setting.
@@ -181,10 +181,10 @@ This function can also be used to increase the supply count on setting `Limited
`[ammo_truck, "32Rnd_155mm_Mo_shells"] call ace_rearm_fnc_addMagazineToSupply;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `ammo_truck` | My ammo truck object
-1 | `"32Rnd_155mm_Mo_shells"` | Some magazine class
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `ammo_truck` | My ammo truck object |
+| 1 | `"32Rnd_155mm_Mo_shells"` | Some magazine class |
The 32 artillery shells are added to the supply count or the magazine storage of the specified ammo truck.
@@ -192,11 +192,11 @@ The 32 artillery shells are added to the supply count or the magazine storage of
`ace_rearm_fnc_addVehicleMagazinesToSupply`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Ammo Truck | Object | Required
-1 | Any vehicle object or class name | Object or String | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Ammo Truck | Object | Required |
+| 1 | Any vehicle object or class name | Object or String | Required |
+| **R** | None | None | Return value |
This function wraps `ace_rearm_fnc_addMagazineToSupply` and uses it to add all default magazines of all supported turrets of the vehicle to the ammo truck.
@@ -204,10 +204,10 @@ This function wraps `ace_rearm_fnc_addMagazineToSupply` and uses it to add all d
`[ammo_truck, tank] call ace_rearm_fnc_addVehicleMagazinesToSupply;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `ammo_truck` | My ammo truck object
-1 | `tank`| A vehicle object
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `ammo_truck` | My ammo truck object |
+| 1 | `tank`| A vehicle object |
All magazines found in the class config of the object `tank` are made available.
@@ -215,10 +215,10 @@ All magazines found in the class config of the object `tank` are made available.
`[ammo_truck, "B_MBT_01_arty_F"] call ace_rearm_fnc_addVehicleMagazinesToSupply;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `ammo_truck` | My ammo truck object
-1 | `"B_MBT_01_arty_F"`| Vehicle class name
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `ammo_truck` | My ammo truck object |
+| 1 | `"B_MBT_01_arty_F"`| Vehicle class name |
All magazines found in the config of the vehicle class `B_MBT_01_arty_F` are made available.
@@ -227,21 +227,21 @@ All magazines found in the config of the vehicle class `B_MBT_01_arty_F` are mad
`ace_rearm_fnc_removeMagazineFromSupply`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Ammo Truck | Object | Required
-1 | Magazine Classname | String | Required
-2 | Number of Rounds to withdraw | Number | Optional (default: `-1`)
-**R** | Magazine could be removed successfully | Boolean | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Ammo Truck | Object | Required |
+| 1 | Magazine Classname | String | Required |
+| 2 | Number of Rounds to withdraw | Number | Optional (default: `-1`) |
+| **R** | Magazine could be removed successfully | Boolean | Return value |
#### 3.7.1 Example 1
`[ammo_truck, "500Rnd_127x99_mag_Tracer_Red"] call ace_rearm_fnc_removeMagazineFromSupply;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `ammo_truck` | My ammo truck object
-1 | `"500Rnd_127x99_mag_Tracer_Red"`| Carrying is enabled
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `ammo_truck` | My ammo truck object |
+| 1 | `"500Rnd_127x99_mag_Tracer_Red"`| Carrying is enabled |
Removes one ammo box worth of "500Rnd_127x99_mag_Tracer_Red" from the supply. Depending on the module setting the ammo box does hold an entire magazine or only the caliber based amount of rounds.
@@ -249,16 +249,16 @@ Removes one ammo box worth of "500Rnd_127x99_mag_Tracer_Red" from the supply. De
`[ammo_truck, "500Rnd_127x99_mag_Tracer_Red", 50] call ace_rearm_fnc_removeMagazineFromSupply;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `ammo_truck` | My ammo truck object
-1 | `"500Rnd_127x99_mag_Tracer_Red"`| Carrying is enabled
-2 | `50` | Number of rounds
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `ammo_truck` | My ammo truck object |
+| 1 | `"500Rnd_127x99_mag_Tracer_Red"`| Carrying is enabled |
+| 2 | `50` | Number of rounds |
Removes one ammo box with 50 rounds of 500Rnd_127x99_mag_Tracer_Red from the supply. This is 10% of the supply of an entire magazine.
## 4. Events
-| Name | Arguments | Global? | Added in |
-| ------------- | ------------- | ------------- |
-| ace_rearm_sourceInitalized | Yes | Ammo truck (OBJECT) | 3.16.0 |
+| Name | Arguments | Global? | Added in |
+| ------------- | --------- | ------- | -------- |
+| `ace_rearm_sourceInitalized` | Ammo truck (OBJECT) | Yes | 3.16.0 |
diff --git a/docs/wiki/framework/refuel-framework.md b/docs/wiki/framework/refuel-framework.md
index c91c8cb6e3..3cf10d7205 100644
--- a/docs/wiki/framework/refuel-framework.md
+++ b/docs/wiki/framework/refuel-framework.md
@@ -45,57 +45,57 @@ Meant to be called on server only.
`ace_refuel_fnc_makeSource`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Fuel Source | Object | Required
-1 | Amount (in liters) | Number | Optional (default: `0`)
-2 | Hooks positions | Array | Optional (default: `[[0,0,0]]`)
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Fuel Source | Object | Required |
+| 1 | Amount (in liters) | Number | Optional (default: `0`) |
+| 2 | Hooks positions | Array | Optional (default: `[[0,0,0]]`) |
+| **R** | None | None | Return value |
#### 2.1.1 Example
`[cursorObject, 100] call ace_refuel_fnc_makeSource`
- | Arguments | Explanation
----| --------- | -----------
-0 | `cursorObject` | Fuel source object
-1 | `100` | Fuel amount (in liters)
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `cursorObject` | Fuel source object |
+| 1 | `100` | Fuel amount (in liters) |
### 2.2 Getting the fuel supply
`ace_refuel_fnc_getFuel`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Fuel Truck | Object | Required
-**R** | Fuel amount left (in liters) | Number | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Fuel Truck | Object | Required |
+| **R** | Fuel amount left (in liters) | Number | Return value |
#### 2.2.1 Example
`[fuelTruck] call ace_refuel_fnc_getFuel;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `fuelTruck` | My fuel truck object
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `fuelTruck` | My fuel truck object |
### 2.3 Setting the fuel supply
`ace_refuel_fnc_setFuel`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Fuel Truck | Object | Required
-1 | Amount (in liters) | Number | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+| ---| --------- | ---- | ------------------------ |
+| 0 | Fuel Truck | Object | Required |
+| 1 | Amount (in liters) | Number | Required |
+| **R** | None | None | Return value |
#### 2.3.1 Example
`[fuelTruck, 428] call ace_refuel_fnc_setFuel;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `fuelTruck` | Fuel truck object
-1 | `428` | New fuel amount (in liters)
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `fuelTruck` | Fuel truck object |
+| 1 | `428` | New fuel amount (in liters) |
### 2.4 Make a jerry can
@@ -103,19 +103,19 @@ Meant to be run on all clients and server.
`ace_refuel_fnc_makeJerryCan`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Jerry Can | Object | Required
-1 | Amount (in liters) | Number | Optional (default: `20`)
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Jerry Can | Object | Required |
+| 1 | Amount (in liters) | Number | Optional (default: `20`) |
+| **R** | None | None | Return value |
#### 2.4.1 Example 1
`[can] call ace_refuel_fnc_makeJerryCan;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `can` | Jerry can object
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `can` | Jerry can object |
The jerry can will have the default 20 liters volume.
@@ -123,16 +123,16 @@ The jerry can will have the default 20 liters volume.
`[can, 200] call ace_refuel_fnc_makeJerryCan;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `can` | Jerry can object
-1 | `200` | Amount (in liters)
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `can` | Jerry can object |
+| 1 | `200` | Amount (in liters) |
The jerry can will now have a volume of 200 liters.
## 3. Events
| Name | Arguments | Global? | Added in |
-| ------------- | ------------- | ------------- |
-| ace_refuel_sourceInitialized | Fuel source (OBJECT), items (BOOL or ARRAY) | Yes | 3.16.0 |
+| ------------- | ------------- | ----- | ------------- |
+| ace_refuel_sourceInitialized | Fuel source (OBJECT) | Yes | 3.16.0 |
| ace_refuel_jerryCanInitalized | Jerry can (OBJECT) | Yes | 3.16.0 |
diff --git a/docs/wiki/framework/reloadlaunchers-framework.md b/docs/wiki/framework/reloadlaunchers-framework.md
index d055cc533c..074dc09ff0 100644
--- a/docs/wiki/framework/reloadlaunchers-framework.md
+++ b/docs/wiki/framework/reloadlaunchers-framework.md
@@ -26,6 +26,6 @@ class CfgWeapons {
### 2.1 Listenable
-Event Name | Description | Passed Parameter(s) | Locality
----------- | ----------- | ------------------- | --------
-`ace_reloadlaunchers_reloadLauncher` | Launcher reloaded | `[_unit, _target, _weapon, _magazine]` | Target
+| Event Name | Description | Passed Parameter(s) | Locality |
+| ---------- | ----------- | ------------------- | -------- |
+| `ace_reloadlaunchers_reloadLauncher` | Launcher reloaded | `[_unit, _target, _weapon, _magazine]` | Target |
diff --git a/docs/wiki/framework/slideshow-framework.md b/docs/wiki/framework/slideshow-framework.md
index 0697116039..575a81420c 100644
--- a/docs/wiki/framework/slideshow-framework.md
+++ b/docs/wiki/framework/slideshow-framework.md
@@ -32,16 +32,16 @@ Important notes:
`ace_slideshow_fnc_createSlideshow`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Screen Objects | Array | Required
-1 | Controller Objects | Array | Required (screen objects are used if empty `[]`, none are available with automatic transitions)
-2 | Image Paths | Array | Required (paths must use backslash `\`)
-3 | Action Names | Array | Required
-4 | Slide Duration | Number | Optional (default: `0`, `0` disables automatic transitions)
-5 | Set Name | String | Optional (default: localized `"Slides"`)
-6 | Texture Selection | Number | Optional (default: `0`)
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Screen Objects | Array | Required |
+| 1 | Controller Objects | Array | Required (screen objects are used if empty `[]`, none are available with automatic transitions) |
+| 2 | Image Paths | Array | Required (paths must use backslash `\`) |
+| 3 | Action Names | Array | Required |
+| 4 | Slide Duration | Number | Optional (default: `0`, `0` disables automatic transitions) |
+| 5 | Set Name | String | Optional (default: localized `"Slides"`) |
+| 6 | Texture Selection | Number | Optional (default: `0`) |
+| **R** | None | None | Return value |
_Note: Set Name argument added in 3.9.1._
@@ -49,15 +49,15 @@ _Note: Set Name argument added in 3.9.1._
`[[object1, object2], [controller1], ["images\image1.paa", "images\image2.paa"], ["Action1", "Action2"], 5, "My Slides", 1] call ace_slideshow_fnc_createSlideshow;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `[object1, object2]` | Objects on which images will be projected on
-1 | `[controller1]` | Objects with which slideshow can be controlled
-2 | `["images\image1.paa", "images\image2.paa"]` | Paths to images projected on screen objects
-3 | `["Action1", "Action2"]` | Action names for interaction menu if automatic transitions are not enabled
-4 | `5` | 5s slide duration before change to next image
-5 | `"My Slides"` | Main interaction point name, for easier distinguishing of multiple slideshow sets
-6 | `1` | Uses texture selection 1 for objects with multiple options
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `[object1, object2]` | Objects on which images will be projected on |
+| 1 | `[controller1]` | Objects with which slideshow can be controlled |
+| 2 | `["images\image1.paa", "images\image2.paa"]` | Paths to images projected on screen objects |
+| 3 | `["Action1", "Action2"]` | Action names for interaction menu if automatic transitions are not enabled |
+| 4 | `5` | 5s slide duration before change to next image |
+| 5 | `"My Slides"` | Main interaction point name, for easier distinguishing of multiple slideshow sets |
+| 6 | `1` | Uses texture selection 1 for objects with multiple options |
### 2.2 Create Map Images
@@ -86,7 +86,7 @@ _Note: Set Name argument added in 3.9.1._
tex1 = [] call ace_slideshow_fnc_mapImage;
tex2 = [(getPos aWhiteboard), 0.5, [[getpos aWhiteboard, "you", "mil_start"]], 0] call ace_slideshow_fnc_mapImage;
tex3 = [[4000, 4000], 0.5, [[[5000, 5000], "target", "mil_objective"]], 2] call ace_slideshow_fnc_mapImage;
-[[aWhiteboard], [], [tex1, tex2, tex3], ["Full", "Sat Start", "Sat Objective"]] call ace_slideshow_fnc_createSlideshow;
+[[aWhiteboard], [], [tex1, tex2, tex3], ["Full", "Sat Start", "Sat Objective"]] call ace_slideshow_fnc_createSlideshow;
```
### 2.2.2 Map Slideshow Advanced Example
@@ -105,12 +105,12 @@ private _initCode = {
[{
params ["_displayID","_idPFH"];
private _display = findDisplay _displayID;
- if (isNull _display) exitWith {
+ if (isNull _display) exitWith {
systemChat format ["%1 - removing pfeh", _this];
[_idPFH] call CBA_fnc_removePerFrameHandler;
};
displayUpdate _display;
-
+
private _map = _display displayCtrl 1;
_map ctrlMapAnimAdd [0, 0.3, getpos theUAV];
ctrlMapAnimCommit _map;
diff --git a/docs/wiki/framework/spectator-framework.md b/docs/wiki/framework/spectator-framework.md
index 22bc0c0021..c78285b98b 100644
--- a/docs/wiki/framework/spectator-framework.md
+++ b/docs/wiki/framework/spectator-framework.md
@@ -48,11 +48,11 @@ Note that these settings govern the default spectator behaviour. Through the use
### 3.1 Listenable
-Event Name | Passed Parameter(s) | Locality | Description
----------- | ----------- | ------------------- | --------
-`ace_spectatorSet` | [_isSpectator, _player] | Global | Player's spectator status was changed
-`ace_spectator_displayLoaded` | _display | Local | Spectator display was loaded
-`ace_spectator_displayUnloaded` | _display | Local | Spectator display was unloaded
+| Event Name | Passed Parameter(s) | Locality | Description |
+| ---------- | ----------- | ------------------- | -------- |
+| `ace_spectatorSet` | [_isSpectator, _player] | Global | Player's spectator status was changed |
+| `ace_spectator_displayLoaded` | _display | Local | Spectator display was loaded |
+| `ace_spectator_displayUnloaded` | _display | Local | Spectator display was unloaded |
## 4. Scripting
diff --git a/docs/wiki/framework/tagging-framework.md b/docs/wiki/framework/tagging-framework.md
index e263a2afaa..126971abf5 100644
--- a/docs/wiki/framework/tagging-framework.md
+++ b/docs/wiki/framework/tagging-framework.md
@@ -41,28 +41,28 @@ class ACE_Tags {
`ace_tagging_fnc_addCustomTag`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Unique Identifier | String | Required
-1 | Display Name | String | Required
-2 | Required Item | String | Required
-3 | Textures | Array | Required
-4 | Icon | String | Optional (default: `""` - Default white point)
-5 | Material Paths | Array | Optional (default: `[]] - No custom material)
-6 | Tag Model | String | Optional (default: `"UserTexture1m_F"` - 1x1m texture surface)
-**R** | Successfully Added Tag | Boolean | Return value
+| | Arguments | Type | Optional (default value) |
+| ---| --------- | ---- | ------------------------ |
+| 0 | Unique Identifier | String | Required |
+| 1 | Display Name | String | Required |
+| 2 | Required Item | String | Required |
+| 3 | Textures | Array | Required |
+| 4 | Icon | String | Optional (default: `""` - Default white point) |
+| 5 | Material Paths | Array | Optional (default: `[]` - No custom material) |
+| 6 | Tag Model | String | Optional (default: `"UserTexture1m_F"` - 1x1m texture surface) |
+| **R** | Successfully Added Tag | Boolean | Return value |
#### 2.1.1 Example
`["ace_victoryRed", "Victory Red", "ACE_SpraypaintRed", ["tagTexture1.paa", "tagTexture2.paa"], "icon.paa"] call ace_tagging_fnc_addCustomTag;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `"ace_victoryRed"` | Unique identifier (similar to class name)
-1 | `"Victory Red"` | Name of your tag being displayed in the interaction menu
-2 | `"ACE_SpraypaintRed"` | Required item to have in the inventory to be able to spray your tag
-3 | `["tagTexture1.paa", "tagTexture2.paa"]` | List of texture variants (one is randomly selected when tagging)
-4 | `"icon.paa"` | Icon being displayed in the interaction menu
+| | Arguments | Explanation |
+| ---| --------- | ----------- |
+| 0 | `"ace_victoryRed"` | Unique identifier (similar to class name) |
+| 1 | `"Victory Red"` | Name of your tag being displayed in the interaction menu |
+| 2 | `"ACE_SpraypaintRed"` | Required item to have in the inventory to be able to spray your tag |
+| 3 | `["tagTexture1.paa", "tagTexture2.paa"]` | List of texture variants (one is randomly selected when tagging) |
+| 4 | `"icon.paa"` | Icon being displayed in the interaction menu |
### 2.2 Tags in description.ext
diff --git a/docs/wiki/framework/trenches-framework.md b/docs/wiki/framework/trenches-framework.md
index 5fc2dc636e..40e83689ba 100644
--- a/docs/wiki/framework/trenches-framework.md
+++ b/docs/wiki/framework/trenches-framework.md
@@ -30,7 +30,7 @@ class CfgSurfaces {
```cpp
class CfgWeapons { // same config also works on backpacks (CfgVehicles)
class yourBaseClass;
- class yourEntrenchingToolClass: yourBaseClass
+ class yourEntrenchingToolClass: yourBaseClass {
ace_trenches_entrenchingTool = 1;
};
};
diff --git a/docs/wiki/framework/ui-framework.md b/docs/wiki/framework/ui-framework.md
index af391f36d5..3b6ec08951 100644
--- a/docs/wiki/framework/ui-framework.md
+++ b/docs/wiki/framework/ui-framework.md
@@ -53,21 +53,21 @@ Adding new elements through scripting is currently not possible.
`ace_ui_fnc_setElementVisibility`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Source | String | Required
-1 | Set/Unset | Boolean | Required
-2 | Element Name | String | Required
-3 | Show/Hide | Boolean | Optional (default: `false`)
-**R** | Successfully Modified | Boolean | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Source | String | Required |
+| 1 | Set/Unset | Boolean | Required |
+| 2 | Element Name | String | Required |
+| 3 | Show/Hide | Boolean | Optional (default: `false`) |
+| **R** | Successfully Modified | Boolean | Return value |
#### 2.1.1 Example
`["ace_reload", true, "ammoCount", false] call ace_ui_fnc_setElementVisibility;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `"ace_reload"` | Source displayed in hint when trying to edit this element from in-game settings or in RPT when some other source tries to edit it
-1 | `true` | Set element, preventing others to change it (except config, which always has priority)
-2 | `"ammoCount"` | Element name to modify
-3 | `false` | Hide the element
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `"ace_reload"` | Source displayed in hint when trying to edit this element from in-game settings or in RPT when some other source tries to edit it |
+| 1 | `true` | Set element, preventing others to change it (except config, which always has priority) |
+| 2 | `"ammoCount"` | Element name to modify |
+| 3 | `false` | Hide the element |
diff --git a/docs/wiki/framework/vehicledamage-framework.md b/docs/wiki/framework/vehicledamage-framework.md
index 60d60e9676..0d4268bf5e 100644
--- a/docs/wiki/framework/vehicledamage-framework.md
+++ b/docs/wiki/framework/vehicledamage-framework.md
@@ -126,3 +126,11 @@ Default ARMA config value. We assume that the warheads are vanilla strings, so o
- `TandemHEAT`
If no `ace_vehicle_damage_incendiary` defined, this value will be used to assume a default based on above table of common values (excluding `Incendiary Bullet` which is 0).
+
+## 3. Disabling crew bailing for individual vehicles
+
+Crew bailing when their vehicle is disabled (immobile or can't shoot) can be disabled for a specific vehicle:
+
+```
+_vehicle setVariable ["ace_vehicle_damage_allowCrewInImmobile", true, true];
+```
diff --git a/docs/wiki/framework/vehiclelock-framework.md b/docs/wiki/framework/vehiclelock-framework.md
index 8dc1aea2cf..d882cab971 100644
--- a/docs/wiki/framework/vehiclelock-framework.md
+++ b/docs/wiki/framework/vehiclelock-framework.md
@@ -31,22 +31,22 @@ Sync the module with vehicles and players. Custom keys will be handed to players
`ace_vehiclelock_fnc_addKeyForVehicle`
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Unit | Object | Required
-1 | Vehicle | Object | Required
-2 | Use Custom Key | Boolean | Optional (default: `false`, `false` for side key, `true` for custom key)
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Unit | Object | Required |
+| 1 | Vehicle | Object | Required |
+| 2 | Use Custom Key | Boolean | Optional (default: `false`, `false` for side key, `true` for custom key) |
+| **R** | None | None | Return value |
#### 3.1.1 Example
`[bob, car1, true] call ace_vehiclelock_fnc_addKeyForVehicle;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `bob` | Unit the key will be added to
-1 | `car1` | Vehicle the key will work on
-2 | `true` | Set custom key
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `bob` | Unit the key will be added to |
+| 1 | `car1` | Vehicle the key will work on |
+| 2 | `true` | Set custom key |
### 3.2 Override Side
diff --git a/docs/wiki/framework/vehicles-framework.md b/docs/wiki/framework/vehicles-framework.md
index a1f66e807a..dac52d0cfa 100644
--- a/docs/wiki/framework/vehicles-framework.md
+++ b/docs/wiki/framework/vehicles-framework.md
@@ -38,18 +38,18 @@ class CfgVehicles {
`ace_vehicles_fnc_setVehicleStartDelay`
Has global effects.
- | Arguments | Type | Optional (default value)
----| --------- | ---- | ------------------------
-0 | Vehicle | Object | Required
-1 | Delay (in seconds) | Number | Required
-**R** | None | None | Return value
+| | Arguments | Type | Optional (default value) |
+|----| --------- | ---- | ------------------------ |
+| 0 | Vehicle | Object | Required |
+| 1 | Delay (in seconds) | Number | Required |
+| **R** | None | None | Return value |
#### 1.2.1 Example
`[myCar, 2.2] call ace_vehicles_fnc_setVehicleStartDelay;`
- | Arguments | Explanation
----| --------- | -----------
-0 | `myCar` | My car object
-1 | `2.2` | New startup delay
+| | Arguments | Explanation |
+|----| --------- | ----------- |
+| 0 | `myCar` | My car object |
+| 1 | `2.2` | New startup delay |
diff --git a/docs/wiki/framework/wirecutter-framework.md b/docs/wiki/framework/wirecutter-framework.md
index 3f2a97c0b1..65a4ed1f98 100644
--- a/docs/wiki/framework/wirecutter-framework.md
+++ b/docs/wiki/framework/wirecutter-framework.md
@@ -36,6 +36,6 @@ class CfgVehicles {
### 2.1 Listenable
-Event Name | Description | Passed Parameter(s) | Locality
----------- | ----------- | ------------------- | --------
-`ace_wireCuttingStarted` | Wire cutting started | `[_unit, _fence]` | Global
+| Event Name | Description | Passed Parameter(s) | Locality |
+| ---------- | ----------- | ------------------- | -------- |
+| `ace_wireCuttingStarted` | Wire cutting started | `[_unit, _fence]` | Global |
diff --git a/docs/wiki/framework/xm157-framework.md b/docs/wiki/framework/xm157-framework.md
index 45a2a19c21..d92d4b37e9 100644
--- a/docs/wiki/framework/xm157-framework.md
+++ b/docs/wiki/framework/xm157-framework.md
@@ -52,5 +52,4 @@ class CfgWeapons {
};
};
};
-
```
diff --git a/include/a3/data_f/penetration/hard_ground.rvmat b/include/a3/data_f/penetration/hard_ground.rvmat
new file mode 100644
index 0000000000..1c4d7f82b0
--- /dev/null
+++ b/include/a3/data_f/penetration/hard_ground.rvmat
@@ -0,0 +1,9 @@
+surfaceInfo="A3\data_f\Penetration\hard_ground.bisurf";
+ambient[]={0.48699999,0.32800001,0.249,1};
+diffuse[]={0.48699999,0.32800001,0.249,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={0,0,0,1};
+specularPower=1;
+PixelShaderID="Normal";
+VertexShaderID="Basic";
diff --git a/include/a3/ui_f/hpp/defineResincl.inc b/include/a3/ui_f/hpp/defineResincl.inc
index 2f513642bc..df589bde2d 100644
--- a/include/a3/ui_f/hpp/defineResincl.inc
+++ b/include/a3/ui_f/hpp/defineResincl.inc
@@ -1380,6 +1380,7 @@ enum
#define IDC_OPTIONS_PP_DOF_SLIDER 1317
#define IDC_OPTIONS_PP_DOF_VALUE 1318
#define IDC_OPTIONS_PP_CAUSTICS 1319
+#define IDC_OPTIONS_PP_HAZE 1329
#define IDC_OPTIONS_PP_SHARPEN_SLIDER 1320
#define IDC_OPTIONS_PP_SHARPEN_VALUE 1321
#define IDC_OPTIONS_PP_COLOR_CORRECTIONS 1322
diff --git a/include/a3/weapons_f/acc/data/optics.rvmat b/include/a3/weapons_f/acc/data/optics.rvmat
new file mode 100644
index 0000000000..1183f3e16d
--- /dev/null
+++ b/include/a3/weapons_f/acc/data/optics.rvmat
@@ -0,0 +1,82 @@
+class StageTI
+{
+ texture="a3\data_f\default_ti_ca.paa";
+};
+ambient[]={0,0,0,1};
+diffuse[]={0,0,0,1};
+forcedDiffuse[]={0,0,0,1};
+emmisive[]={0,0,0,1};
+specular[]={1,1,1,1};
+specularPower=500;
+PixelShaderID="Super";
+VertexShaderID="Super";
+class Stage1
+{
+ texture="a3\weapons_f\acc\data\optics_nohq.paa";
+ uvSource="tex1";
+ class uvTransform
+ {
+ aside[]={1,0,0};
+ up[]={0,1,0};
+ dir[]={0,0,0};
+ pos[]={0,0,0};
+ };
+};
+class Stage2
+{
+ texture="#(argb,8,8,3)color(0.5,0.5,0.5,0.5,DT)";
+ uvSource="tex";
+ class uvTransform
+ {
+ aside[]={1,0,0};
+ up[]={0,1,0};
+ dir[]={0,0,0};
+ pos[]={0,0,0};
+ };
+};
+class Stage3
+{
+ texture="#(argb,8,8,3)color(0,0,0,0.0,MC)";
+ uvSource="tex";
+ class uvTransform
+ {
+ aside[]={1,0,0};
+ up[]={0,1,0};
+ dir[]={0,0,0};
+ pos[]={0,0,0};
+ };
+};
+class Stage4
+{
+ texture="a3\weapons_f\acc\data\optics_as.paa";
+ uvSource="tex1";
+ class uvTransform
+ {
+ aside[]={1,0,0};
+ up[]={0,1,0};
+ dir[]={0,0,0};
+ pos[]={0,0,0};
+ };
+};
+class Stage5
+{
+ texture="#(argb,8,8,3)color(1,1,1,0.0,SMDI)";
+ uvSource="tex1";
+ class uvTransform
+ {
+ aside[]={1,0,0};
+ up[]={0,1,0};
+ dir[]={0,0,0};
+ pos[]={0,0,0};
+ };
+};
+class Stage6
+{
+ texture="#(ai,64,64,1)fresnel(0.915,0.38)";
+ uvSource="none";
+};
+class Stage7
+{
+ texture="a3\data_f\env_land_optic_co.paa";
+ uvSource="none";
+};
diff --git a/include/a3/weapons_f/acc/data/scope_view3_ca.paa b/include/a3/weapons_f/acc/data/scope_view3_ca.paa
new file mode 100644
index 0000000000..d7ef93da49
Binary files /dev/null and b/include/a3/weapons_f/acc/data/scope_view3_ca.paa differ
diff --git a/include/a3/weapons_f/acc/data/scope_view_ca.paa b/include/a3/weapons_f/acc/data/scope_view_ca.paa
new file mode 100644
index 0000000000..a8dc6b370a
Binary files /dev/null and b/include/a3/weapons_f/acc/data/scope_view_ca.paa differ
diff --git a/include/a3/weapons_f/data/nightvisiontl.paa b/include/a3/weapons_f/data/nightvisiontl.paa
new file mode 100644
index 0000000000..04bddf8795
Binary files /dev/null and b/include/a3/weapons_f/data/nightvisiontl.paa differ
diff --git a/include/a3/weapons_f/reticle/data/optics_bg_dirt_ca.paa b/include/a3/weapons_f/reticle/data/optics_bg_dirt_ca.paa
new file mode 100644
index 0000000000..d08da9e16d
Binary files /dev/null and b/include/a3/weapons_f/reticle/data/optics_bg_dirt_ca.paa differ
diff --git a/include/vn/characters_f_vietnam/OPFOR/vests/items/vn_mine_satchel_02.p3d b/include/vn/characters_f_vietnam/OPFOR/vests/items/vn_mine_satchel_02.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/objects_f_vietnam/supply/a2_ammo/macv/vn_us_30cal.p3d b/include/vn/objects_f_vietnam/supply/a2_ammo/macv/vn_us_30cal.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/objects_f_vietnam/supply/a2_ammo/macv/vn_us_can_30.p3d b/include/vn/objects_f_vietnam/supply/a2_ammo/macv/vn_us_can_30.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/objects_f_vietnam/supply/a2_ammo/pavn/vn_pavn_50_can.p3d b/include/vn/objects_f_vietnam/supply/a2_ammo/pavn/vn_pavn_50_can.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/objects_f_vietnam/usarmy/furniture/vn_us_fort_common_crate_01.p3d b/include/vn/objects_f_vietnam/usarmy/furniture/vn_us_fort_common_crate_01.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/objects_f_vietnam/usarmy/supply/mortar_m2/vn_prop_60mm_crate_01.p3d b/include/vn/objects_f_vietnam/usarmy/supply/mortar_m2/vn_prop_60mm_crate_01.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/objects_f_vietnam/usarmy/supply/mortar_m29/vn_prop_81mm_crate_02.p3d b/include/vn/objects_f_vietnam/usarmy/supply/mortar_m29/vn_prop_81mm_crate_02.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/static_f_vietnam/mortar_m2/vn_shell_60mm_m302_wp_ammo.p3d b/include/vn/static_f_vietnam/mortar_m2/vn_shell_60mm_m302_wp_ammo.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/static_f_vietnam/mortar_m2/vn_shell_60mm_m49a2_he_ammo.p3d b/include/vn/static_f_vietnam/mortar_m2/vn_shell_60mm_m49a2_he_ammo.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/static_f_vietnam/mortar_m2/vn_shell_60mm_m83_lume_ammo.p3d b/include/vn/static_f_vietnam/mortar_m2/vn_shell_60mm_m83_lume_ammo.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/static_f_vietnam/mortar_m29/vn_shell_81mm_m374_he_ammo.p3d b/include/vn/static_f_vietnam/mortar_m29/vn_shell_81mm_m374_he_ammo.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/static_f_vietnam/mortar_type53/vn_shell_82mm_d832_wp_ammo.p3d b/include/vn/static_f_vietnam/mortar_type53/vn_shell_82mm_d832_wp_ammo.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/static_f_vietnam/mortar_type53/vn_shell_82mm_o832d_he_ammo.p3d b/include/vn/static_f_vietnam/mortar_type53/vn_shell_82mm_o832d_he_ammo.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/static_f_vietnam/mortar_type53/vn_shell_82mm_s832s_lume_ammo.p3d b/include/vn/static_f_vietnam/mortar_type53/vn_shell_82mm_s832s_lume_ammo.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/static_f_vietnam/tow/vn_static_tow_mag.p3d b/include/vn/static_f_vietnam/tow/vn_static_tow_mag.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/m112/vn_mine_m112_mag.p3d b/include/vn/weapons_f_vietnam/mines/m112/vn_mine_m112_mag.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/m14/vn_mine_m14_mag.p3d b/include/vn/weapons_f_vietnam/mines/m14/vn_mine_m14_mag.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/m15/vn_mine_m15_mag.p3d b/include/vn/weapons_f_vietnam/mines/m15/vn_mine_m15_mag.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/m16/vn_mine_m16_mag.p3d b/include/vn/weapons_f_vietnam/mines/m16/vn_mine_m16_mag.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/m16/vn_mine_tripwire_m16_02.p3d b/include/vn/weapons_f_vietnam/mines/m16/vn_mine_tripwire_m16_02.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/m16/vn_mine_tripwire_m16_04.p3d b/include/vn/weapons_f_vietnam/mines/m16/vn_mine_tripwire_m16_04.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/m18/vn_mine_m18.p3d b/include/vn/weapons_f_vietnam/mines/m18/vn_mine_m18.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/m18/vn_mine_m18_x3.p3d b/include/vn/weapons_f_vietnam/mines/m18/vn_mine_m18_x3.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/punji/vn_mine_punji_01_mag.p3d b/include/vn/weapons_f_vietnam/mines/punji/vn_mine_punji_01_mag.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/punji/vn_mine_punji_02_mag.p3d b/include/vn/weapons_f_vietnam/mines/punji/vn_mine_punji_02_mag.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/punji/vn_mine_punji_03_mag.p3d b/include/vn/weapons_f_vietnam/mines/punji/vn_mine_punji_03_mag.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/tm57/vn_mine_tm57_mag.p3d b/include/vn/weapons_f_vietnam/mines/tm57/vn_mine_tm57_mag.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/tripwire_arty/vn_mine_tripwire_arty.p3d b/include/vn/weapons_f_vietnam/mines/tripwire_arty/vn_mine_tripwire_arty.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/tripwire_f1/vn_mine_tripwire_f1_02.p3d b/include/vn/weapons_f_vietnam/mines/tripwire_f1/vn_mine_tripwire_f1_02.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/include/vn/weapons_f_vietnam/mines/tripwire_f1/vn_mine_tripwire_f1_04.p3d b/include/vn/weapons_f_vietnam/mines/tripwire_f1/vn_mine_tripwire_f1_04.p3d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/optionals/tracers/stringtable.xml b/optionals/tracers/stringtable.xml
index 30b6b04d88..f4b1d5a750 100644
--- a/optionals/tracers/stringtable.xml
+++ b/optionals/tracers/stringtable.xml
@@ -8,7 +8,7 @@
Магазин 150 патр. 5.56 мм с послед. трас. (зелёные)
5.56 mm 150 colpi ricarica traccianti (verdi) caricatore
5.56 mm 150 ranný zásobník, stopovka pro přebití (Zelená)
- Recarregar magazine de 150 balas tracejantes (verde)
+ Recarregar magazine de 150 balas tracejantes (Verde)
5.56 mm 150発入り 残通知 曳光弾 (緑) マガジン
Cargador de 150 Cartuchos 5.56 mm Trazadora de recarga (Verde)
5.56mm 150발들이 재장전 알림 예광탄 (초록) 탄창
@@ -32,7 +32,7 @@
Магазин 150 патр. 5.56 мм трассирующих (зелёные)
5.56 mm 150 colpi traccianti (verdi) caricatore
5.56 mm 150 ranný zásobník, stopovka (Zelená)
- Magazine 5.56mm Tracejante (verde)
+ Magazine 5.56mm Tracejante (Verde)
5.56 mm 150発入り 曳光弾 (緑) マガジン
Cargador de 150 Cartuchos 5.56 mm Trazadora (Verde)
5.56mm 150발들이 예광탄 (초록) 탄창
@@ -80,7 +80,7 @@
Короб 200 патр. 5.56 мм с послед. трас. (зелёные)
5.56 mm 200colpi Ricarica traccianti (verdi) scatola
5.56 mm 200 ranný box, stopovka pro přebití (Zelená)
- Recarregar Caixa 5.56mm 200 Balas tracejantes (verdes)
+ Recarregar Caixa 5.56mm 200 Balas tracejantes (Verdes)
5.56 mm 200発入り 残通知 曳光弾 (緑) ボックス
Caja de 200 Cartuchos 5.56 mm Trazadora de recarga (Verde)
5.56mm 150발들이 예광탄 (노랑) 탄창
@@ -92,7 +92,7 @@
Короб 200 патр. 5.56 мм трассирующих (зелёные)
5.56 mm 200colpi Traccianti (verdi) Scatola
5.56 mm 200 ranný box, stopovka (Zelená)
- Caixa 5.56mm 200 balas tracejantes (verdes)
+ Caixa 5.56mm 200 balas tracejantes (Verdes)
5.56 mm 200発入り 曳光弾 (緑) ボックス
Caja de 200 Cartuchos 5.56 mm Trazadora (Verde)
5.56mm 200발들이 예광탄 (초록) 탄상자
@@ -260,7 +260,7 @@
Магазин 30 патр. 6.5 мм с послед. трас. (зелёные)
6.5mm 30Colpi Ricarica Traccianti(verdi) Caricatore
6.5 mm 30 ranný zásobník, stopovka pro přebití (Zelená)
- Recarregar magazine 6.5mm 30 balas tracejantes (verde)
+ Recarregar magazine 6.5mm 30 balas tracejantes (Verde)
6.5 mm 30発入り 残通知 曳光弾 (緑) マガジン
Cargador de 30 Cartuchos 6.5 mm Trazadora de recarga (Verde)
6.5mm 30발들이 재장전 알림 예광탄 (초록) 탄창
@@ -308,7 +308,7 @@
Магазин 30 патр. 6.5 мм трассирующих (зелёные)
6.5mm 30Colpi Traccianti (Verdi) Caricatore
6.5 mm 30 ranný zásobník, stopovka (Zelená)
- Magazine 6.5mm 30 balas tracejantes (verde)
+ Magazine 6.5mm 30 balas tracejantes (Verde)
6.5 mm 30発入り 曳光弾 (緑) マガジン
Cargador de 30 Cartuchos 6.5 mm Trazadora (Verde)
6.5mm 30발들이 예광탄 (초록) 탄창
@@ -352,11 +352,11 @@
6.5mm 100Rnd Mixed Mag (Green)
- 100 Schuss 6.5mm Magazin gemischt (grün)
+ 100 Schuss 6.5mm Magazin gemischt (Grün)
Магазин 100 патр. 6.5 мм TE4 (зелёные)
6.5mm 100Colpi Misti Caricatore (verdi)
6.5 mm 100 ranný zásobník, částečná stopovka (Zelená)
- Magazine 6.5mm 100 balas misturadas (verde)
+ Magazine 6.5mm 100 balas misturadas (Verde)
6.5 mm 100発入り 混合 (緑) マガジン
Cargador de 100 cartuchos 6.5 mm Mezcla (Verde)
6.5mm 100발들이 혼합탄 (초록) 탄창
@@ -378,7 +378,7 @@
6.5mm 100Rnd Mag Tracer (Green)
100 Schuss 6.5mm Magazin Leuchtspur (Grün)
Магазин 100 патр. 6.5 мм трассирующих (зелёные)
- 6.5mm 100Colpi Caricatore Tracciante (verde)
+ 6.5mm 100Colpi Caricatore Tracciante (Verde)
6.5 mm 100 ranný zásobník, stopovka (Zelená)
Magazine 6.5mm 100 balas tracejantes
6.5 mm 100発入り (緑) マガジン
@@ -496,7 +496,7 @@
6.5 mm 200Rnd Belt Case Mixed (Green)
- 6,5 mm 200-Schuss-Gurtkiste Gemischt (grün)
+ 6,5 mm 200-Schuss-Gurtkiste Gemischt (Grün)
Короб 200 патр. 6.5 мм TE4 (зелёные)
6.5mm 200Colpi Caricatore esteso Misti (Verdi)
6.5 mm 200 ranný pás, částečná stopovka (Zelená)
@@ -520,7 +520,7 @@
6.5 mm 200Rnd Belt Case Mixed (Red)
- 6,5 mm 200-Schuss-Gurtkiste Gemischt (grün)
+ 6,5 mm 200-Schuss-Gurtkiste Gemischt (Grün)
Короб 200 патр. 6.5 мм TE4 (красные)
6.5 mm 200Colpi Caritore maggiorato Misti (rossi)
6.5 mm 200 ranný pás, částečná stopovka (Červená)
@@ -544,7 +544,7 @@
6.5 mm 200Rnd Belt Case Tracer (Green)
- 6,5 mm 200-Schuss-Gurtkiste Leuchtspur (grün)
+ 6,5 mm 200-Schuss-Gurtkiste Leuchtspur (Grün)
Короб 200 патр. 6.5 мм трассирующих (зелёные)
6.5 mm 200Colpi Caricatore maggiorato Traccianti (verdi)
6.5 mm 200 ranný pás, částečná stopovka (Zelená)
@@ -600,7 +600,7 @@
7.62 mm 20Colpi Traccianti (verdi) Caricatore
7.62 mm 20 ranný zásobník, stopovka (Zelená)
7.62 mm Magazynek 20szt. Smugowa (Zielona)
- Magazine 7.62 mm 20 Balas Tracejantes (verdes)
+ Magazine 7.62 mm 20 Balas Tracejantes (Verdes)
7.62 mm 20発入り 曳光弾 (緑) マガジン
Cargador de 20 cartuchos 7.62 mm Trazadora (Verde)
7.62mm 20발들이 예광탄 (초록) 탄창
@@ -764,7 +764,7 @@
.338 NM 130Rnd Belt Mixed (Green)
- .338 NM 130 Schuss Gurt gemischt (grün)
+ .338 NM 130 Schuss Gurt gemischt (Grün)
Лента 130 патр. .338 NM TE4 (зелёные)
.338 NM 130Colpi Caricatore a nastro Misto (Verde)
.338 NM 130 ranný pás, částečná stopovka (Zelená)
diff --git a/tools/.vscode/settings.json b/tools/.vscode/settings.json
index 57fcac4d62..490d2309b7 100644
--- a/tools/.vscode/settings.json
+++ b/tools/.vscode/settings.json
@@ -1,6 +1,7 @@
{
"files.exclude": {
"**/.hemttout": true,
- "**/include": true
+ "**/include": true,
+ "**/extras": true
}
}
\ No newline at end of file
diff --git a/tools/.vscode/tasks.json b/tools/.vscode/tasks.json
index 233c20e78c..eb919f5309 100644
--- a/tools/.vscode/tasks.json
+++ b/tools/.vscode/tasks.json
@@ -63,6 +63,16 @@
"--debug"
]
},
+ {
+ "label": "HEMTT check",
+ "command": "hemtt.exe",
+ "options": {
+ "cwd": "${workspaceFolder}"
+ },
+ "args": [
+ "check"
+ ],
+ },
{
"label": "Test All",
"dependsOn": [
@@ -71,7 +81,8 @@
"Validate Stringtables",
"Validate headers",
"Check Strings",
- "SQFVM Checker"
+ "SQFVM Checker",
+ "HEMTT check"
],
"group": {
"kind": "test",
@@ -89,8 +100,7 @@
"ci"
],
"group": {
- "kind": "build",
- "isDefault": true
+ "kind": "build"
}
},
{
@@ -103,7 +113,10 @@
"build",
"-v"
],
- "group": "build"
+ "group": {
+ "kind": "build",
+ "isDefault": true
+ }
}
]
}
\ No newline at end of file