Skip to content

Commit 0b22c98

Browse files
PabstMirrorPabstMirror
committed
Merge branch 'master' into release-3.16.0
2 parents 03332f0 + 1764823 commit 0b22c98

File tree

167 files changed

+2187
-315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+2187
-315
lines changed

‎.hemtt/project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ exclude = [
2424
"/initsettings.sqf",
2525
"/initkeybinds.sqf",
2626
"/xeh_prep.sqf",
27-
"dev",
27+
"/dev/",
2828
"medical_ai/statemachine.sqf",
2929
"common/functions/fnc_dummy.sqf",
3030
]

‎AUTHORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ havena <silveredenis@gmail.com>
113113
Hawkins
114114
Head <brobergsebastian@gmail.com>
115115
Hybrid V
116+
Hypoxic <martini_a@outlook.com>
116117
JasperRab <jasper@jasperrab.eu>
117118
JDT
118119
john681611 <john681611@hotmail.com>

‎addons/ai/stringtable.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,13 @@
8585
<English>Auto-Equip NVGs</English>
8686
<Polish>Automatyczne zakładanie NVG</Polish>
8787
<German>Automatisch NVGs ausrüsten</German>
88+
<Korean>야투경 자동 창착</Korean>
8889
</Key>
8990
<Key ID="STR_ACE_AI_AssignNVG_Description">
9091
<English>Equips NVG in inventory during night time and unequips it during day time.\nDoes not add NVGs to inventory!</English>
9192
<Polish>Zakłada NVG w nocy i zdejmuje je w ciągu dnia.\nNie dodaje NVG do ekwipunku!</Polish>
9293
<German>Rüstet NVG nachts aus dem Inventar aus und entfernt es tagsüber.\nFügt keine NVGs zum Inventar hinzu!</German>
94+
<Korean>야간에는 야투경을 소지품에 장착하고 주간에는 장착을 해제합니다.\n주의! 소지품에 야투경을 추가하는 것이 아닙니다!</Korean>
9395
</Key>
9496
</Package>
9597
</Project>

‎addons/arsenal/functions/fnc_scanConfig.sqf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -270,16 +270,16 @@ for "_index" from IDX_VIRT_OPTICS_ATTACHMENTS to IDX_VIRT_BIPOD_ATTACHMENTS do {
270270
};
271271

272272
// This contains config case entries only
273-
uiNamespace setVariable [QGVAR(configItems), _configItems];
274-
uiNamespace setVariable [QGVAR(configItemsFlat), _configItemsFlat];
275-
uiNamespace setVariable [QGVAR(faceCache), _faceCache];
276-
uiNamespace setVariable [QGVAR(voiceCache), _voiceCache];
277-
uiNamespace setVariable [QGVAR(insigniaCache), _insigniaCache];
278-
uiNamespace setVariable [QGVAR(grenadeCache), _grenadeList];
279-
uiNamespace setVariable [QGVAR(putCache), _putList];
280-
uiNamespace setVariable [QGVAR(magazineMiscItems), _magazineMiscItems];
281-
uiNamespace setVariable [QGVAR(CBAdisposableLaunchers), _launchers];
282-
uiNamespace setVariable [QGVAR(configItemsTools), _toolList];
273+
uiNamespace setVariable [QGVAR(configItems), compileFinal _configItems];
274+
uiNamespace setVariable [QGVAR(configItemsFlat), compileFinal _configItemsFlat];
275+
uiNamespace setVariable [QGVAR(faceCache), compileFinal _faceCache];
276+
uiNamespace setVariable [QGVAR(voiceCache), compileFinal (_voiceCache createHashMapFromArray [])];
277+
uiNamespace setVariable [QGVAR(insigniaCache), compileFinal (_insigniaCache createHashMapFromArray [])];
278+
uiNamespace setVariable [QGVAR(grenadeCache), compileFinal _grenadeList];
279+
uiNamespace setVariable [QGVAR(putCache), compileFinal _putList];
280+
uiNamespace setVariable [QGVAR(magazineMiscItems), compileFinal _magazineMiscItems];
281+
uiNamespace setVariable [QGVAR(CBAdisposableLaunchers), compileFinal _launchers];
282+
uiNamespace setVariable [QGVAR(configItemsTools), compileFinal _toolList];
283283

284284
// Compatibility: Override baseWeapon for RHS optics
285285
// No good way to do this via script for other attachments, needs manual compat

‎addons/arsenal/stringtable.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1561,12 +1561,14 @@
15611561
<Japanese>下降</Japanese>
15621562
<Polish>Malejąco</Polish>
15631563
<German>Absteigend</German>
1564+
<Korean>내림차순</Korean>
15641565
</Key>
15651566
<Key ID="STR_ACE_Arsenal_sortAscending">
15661567
<English>Ascending</English>
15671568
<Japanese>昇順</Japanese>
15681569
<Polish>Rosnąco</Polish>
15691570
<German>Aufsteigend</German>
1571+
<Korean>오름차순</Korean>
15701572
</Key>
15711573
<Key ID="STR_ACE_Arsenal_toolsTab">
15721574
<English>Tools</English>
@@ -1589,36 +1591,42 @@
15891591
<Japanese>弾薬数</Japanese>
15901592
<Polish>Ilość amunicji</Polish>
15911593
<German>Munitionszahl</German>
1594+
<Korean>장탄 수</Korean>
15921595
</Key>
15931596
<Key ID="STR_ACE_Arsenal_defaultToFavoritesSetting">
15941597
<English>Default to Favorites</English>
15951598
<Japanese>お気に入りをデフォルト</Japanese>
15961599
<Polish>Domyślnie do Ulubionych</Polish>
15971600
<German>Standardmäßig auf Favoriten eingestellt</German>
1601+
<Korean>즐겨찾기 기본값</Korean>
15981602
</Key>
15991603
<Key ID="STR_ACE_Arsenal_defaultToFavoritesTooltip">
16001604
<English>Controls whether the ACE Arsenal defaults to showing all items or favorites.</English>
16011605
<Japanese>ACE Arsenalがデフォルトで全てのアイテムを表示するか、お気に入りを表示するかを制御します。</Japanese>
16021606
<Polish>Kontroluje, czy ACE Arsenal domyślnie wyświetla wszystkie przedmioty, czy tylko ulubione.</Polish>
16031607
<German>Steuert, ob das ACE Arsenal standardmäßig alle Gegenstände oder nur Favoriten anzeigt.</German>
1608+
<Korean>ACE 아스널이 기본적으로 모든 아이템 또는 즐겨찾기를 표시할 지 여부를 조정합니다.</Korean>
16041609
</Key>
16051610
<Key ID="STR_ACE_Arsenal_favoritesColorSetting">
16061611
<English>Favorites Color</English>
16071612
<Japanese>お気に入りの色</Japanese>
16081613
<Polish>Kolor Ulubionych</Polish>
16091614
<German>Favoritenfarbe</German>
1615+
<Korean>즐겨찾기 색상</Korean>
16101616
</Key>
16111617
<Key ID="STR_ACE_Arsenal_favoritesColorTooltip">
16121618
<English>Highlight color for favorited items.</English>
16131619
<Japanese>お気に入りアイテムのハイライト色。</Japanese>
16141620
<Polish>Kolor podświetlenia ulubionych elementów.</Polish>
16151621
<German>Hervorhebungsfarbe für Lieblingsgegenstände.</German>
1622+
<Korean>즐겨찾기한 아이템을 색상으로 강조합니다.</Korean>
16161623
</Key>
16171624
<Key ID="STR_ACE_Arsenal_buttonFavoritesTooltip">
16181625
<English>Switch between displaying all items or your favorites.\nDouble click while holding Shift to add or remove an item.</English>
16191626
<Japanese>Shiftを押しながらダブルクリックするとアイテムを追加・削除できます。</Japanese>
16201627
<Polish>Przełączanie między wyświetlaniem wszystkich przedmiotów lub tylko ulubionych. \nKliknij dwukrotnie, przytrzymując Shift, aby dodać lub usunąć przedmiot.</Polish>
16211628
<German>Wechseln Sie zwischen der Anzeige aller Elemente oder Ihrer Favoriten.\nDoppelklicken Sie bei gedrückter Umschalttaste, um ein Element hinzuzufügen oder zu entfernen.</German>
1629+
<Korean>모든 아이템을 표시하거나 즐겨찾기를 표시할 때 전환합니다\nShift 키를 누른 상태에서 두 번 클릭하여 아이템을 추가하거나 제거합니다.</Korean>
16221630
</Key>
16231631
</Package>
16241632
</Project>

‎addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,43 @@
1313
* Public: No
1414
*/
1515

16-
params ["", "_config"];
16+
params ["", "_configMagazine"];
1717

1818
if (EGVAR(arsenal,currentLeftPanel) == 2002) then {
1919
private _primaryMag = primaryWeaponMagazine EGVAR(arsenal,center);
20-
21-
[primaryWeapon EGVAR(arsenal,center), configName _config]
20+
[primaryWeapon EGVAR(arsenal,center), _primaryMag param [0, ""]]
2221
} else {
2322
private _primaryMag = handgunMagazine EGVAR(arsenal,center);
24-
25-
[handgunWeapon EGVAR(arsenal,center), configName _config]
23+
[handgunWeapon EGVAR(arsenal,center), _primaryMag param [0, ""]]
2624
} params ["_weapon", "_magazine"];
2725

28-
if (_magazine isEqualTo "") then {
29-
localize "str_empty";
30-
} else {
31-
private _weaponCfg = configFile >> "CfgWeapons" >> _weapon;
32-
private _ammoCfg = (configFile >> "CfgAmmo" >> (getText (configFile >> "CfgMagazines" >> _magazine >> "ammo")));
33-
private _barrelLength = getNumber (_weaponCfg >> "ACE_barrelLength");
34-
private _muzzleVelocityTable = getArray (_ammoCfg >> "ACE_muzzleVelocities");
35-
private _barrelLengthTable = getArray (_ammoCfg >> "ACE_barrelLengths");
26+
// we might be looking at random mags not related to our weapon
27+
private _magIsForCurrentWeapon = (configName _configMagazine == _magazine) && {_weapon != ""};
28+
private _configWeapon = configNull;
3629

37-
if (_barrelLength != 0 && {count _muzzleVelocityTable > 0} && {count _barrelLengthTable > 0}) then {
38-
private _muzzleVelocity = if (["ace_advanced_ballistics"] call EFUNC(common,isModLoaded)) then {
39-
[_barrelLength, _muzzleVelocityTable, _barrelLengthTable, 0] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift);
40-
} else {
41-
getNumber (_config >> "initSpeed")
42-
};
30+
private _muzzleVelocity = getNumber (_configMagazine >> "initSpeed");
31+
private _initSpeedCoef = 0;
32+
if (_magIsForCurrentWeapon) then {
33+
_configWeapon = configFile >> "CfgWeapons" >> _weapon;
34+
_initSpeedCoef = getNumber (_configWeapon >> "initSpeed");
35+
};
36+
if (_initSpeedCoef < 0) then {
37+
_muzzleVelocity = _muzzleVelocity * -_initSpeedCoef;
38+
};
39+
if (_initSpeedCoef > 0) then {
40+
_muzzleVelocity = _initSpeedCoef;
41+
};
4342

44-
format ["%1 m/s (%2 ft/s)", _muzzleVelocity toFixed 0, (_muzzleVelocity * 3.28084) toFixed 0]
45-
} else {
46-
localize "str_empty";
43+
private _abAdjustText = "";
44+
if (_magIsForCurrentWeapon && {["ace_advanced_ballistics"] call EFUNC(common,isModLoaded)}) then {
45+
private _configAmmo = (configFile >> "CfgAmmo" >> (getText (_configMagazine >> "ammo")));
46+
private _barrelLength = getNumber (_configWeapon >> "ACE_barrelLength");
47+
private _muzzleVelocityTable = getArray (_configAmmo >> "ACE_muzzleVelocities");
48+
private _barrelLengthTable = getArray (_configAmmo >> "ACE_barrelLengths");
49+
private _abShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, 0] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift);
50+
if (_abShift != 0) then {
51+
_abAdjustText = " [AB]",
52+
_muzzleVelocity = _abShift;
4753
};
4854
};
55+
format ["%1 m/s (%2 ft/s)%3", _muzzleVelocity toFixed 0, (_muzzleVelocity * 3.28084) toFixed 0, _abAdjustText]

‎addons/ballistics/functions/fnc_statTextStatement_weaponMuzzleVelocity.sqf

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,40 @@
1313
* Public: No
1414
*/
1515

16-
params ["", "_config"];
16+
params ["", "_configWeapon"];
1717

1818
if (EGVAR(arsenal,currentLeftPanel) == 2002) then {
1919
private _primaryMag = primaryWeaponMagazine EGVAR(arsenal,center);
20-
2120
[primaryWeapon EGVAR(arsenal,center), _primaryMag param [0, ""]]
2221
} else {
2322
private _primaryMag = handgunMagazine EGVAR(arsenal,center);
24-
2523
[handgunWeapon EGVAR(arsenal,center), _primaryMag param [0, ""]]
2624
} params ["_weapon", "_magazine"];
2725

2826
if (_magazine isEqualTo "") then {
2927
localize "str_empty";
3028
} else {
31-
private _ammoCfg = (configFile >> "CfgAmmo" >> (getText (configFile >> "CfgMagazines" >> _magazine >> "ammo")));
32-
private _barrelLength = getNumber (_config >> "ACE_barrelLength");
33-
private _muzzleVelocityTable = getArray (_ammoCfg >> "ACE_muzzleVelocities");
34-
private _barrelLengthTable = getArray (_ammoCfg >> "ACE_barrelLengths");
29+
private _configMagazine = configFile >> "CfgMagazines" >> _magazine;
30+
private _muzzleVelocity = getNumber (_configMagazine >> "initSpeed");
31+
private _initSpeedCoef = getNumber (_configWeapon >> "initSpeed");
32+
if (_initSpeedCoef < 0) then {
33+
_muzzleVelocity = _muzzleVelocity * -_initSpeedCoef;
34+
};
35+
if (_initSpeedCoef > 0) then {
36+
_muzzleVelocity = _initSpeedCoef;
37+
};
3538

36-
if (_barrelLength != 0 && {count _muzzleVelocityTable > 0} && {count _barrelLengthTable > 0}) then {
37-
private _muzzleVelocity = if (["ace_advanced_ballistics"] call EFUNC(common,isModLoaded)) then {
38-
[_barrelLength, _muzzleVelocityTable, _barrelLengthTable, 0] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift);
39-
} else {
40-
getNumber (configFile >> "CfgMagazines" >> _magazine >> "initSpeed")
39+
private _abAdjustText = "";
40+
if (["ace_advanced_ballistics"] call EFUNC(common,isModLoaded)) then {
41+
private _configAmmo = (configFile >> "CfgAmmo" >> (getText (_configMagazine >> "ammo")));
42+
private _barrelLength = getNumber (_configWeapon >> "ACE_barrelLength");
43+
private _muzzleVelocityTable = getArray (_configAmmo >> "ACE_muzzleVelocities");
44+
private _barrelLengthTable = getArray (_configAmmo >> "ACE_barrelLengths");
45+
private _abShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, 0] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift);
46+
if (_abShift != 0) then {
47+
_abAdjustText = " [AB]",
48+
_muzzleVelocity = _abShift;
4149
};
42-
43-
format ["%1 m/s (%2 ft/s)", _muzzleVelocity toFixed 0, (_muzzleVelocity * 3.28084) toFixed 0]
44-
} else {
45-
localize "str_empty";
4650
};
51+
format ["%1 m/s (%2 ft/s)%3", _muzzleVelocity toFixed 0, (_muzzleVelocity * 3.28084) toFixed 0, _abAdjustText]
4752
};

‎addons/ballistics/stringtable.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3516,42 +3516,49 @@
35163516
<Japanese>AIの使用</Japanese>
35173517
<Polish>Wykorzystanie przez AI</Polish>
35183518
<German>KI Verwendet</German>
3519+
<Korean>인공지능 사용</Korean>
35193520
</Key>
35203521
<Key ID="STR_ACE_Ballistics_ammoUsageShort_illumination">
35213522
<English>Illum</English>
35223523
<Japanese>照明弾</Japanese>
35233524
<Polish>Flary</Polish>
35243525
<German>Leuchtmittel</German>
3526+
<Korean>조명탄</Korean>
35253527
</Key>
35263528
<Key ID="STR_ACE_Ballistics_ammoUsageShort_concealment">
35273529
<English>Smoke</English>
35283530
<Japanese>発煙弾</Japanese>
35293531
<Polish>Granaty dymne</Polish>
35303532
<German>Rauch</German>
3533+
<Korean>연막탄</Korean>
35313534
</Key>
35323535
<Key ID="STR_ACE_Ballistics_ammoUsageShort_infantry">
35333536
<English>Inf</English>
35343537
<Japanese>歩兵</Japanese>
35353538
<Polish>Piechota</Polish>
35363539
<German>Infanterie</German>
3540+
<Korean>보병</Korean>
35373541
</Key>
35383542
<Key ID="STR_ACE_Ballistics_ammoUsageShort_lightVehicle">
35393543
<English>Veh</English>
35403544
<Japanese>車両</Japanese>
35413545
<Polish>Pojazdy</Polish>
35423546
<German>Fahrzeug</German>
3547+
<Korean>차량</Korean>
35433548
</Key>
35443549
<Key ID="STR_ACE_Ballistics_ammoUsageShort_armor">
35453550
<English>Armor</English>
35463551
<Japanese>機甲</Japanese>
35473552
<Polish>Pojazdy opancerzone</Polish>
35483553
<German>Panzerung</German>
3554+
<Korean>기갑</Korean>
35493555
</Key>
35503556
<Key ID="STR_ACE_Ballistics_ammoUsageShort_aircraft">
35513557
<English>Air</English>
35523558
<Japanese>航空</Japanese>
35533559
<Polish>Lotnictwo</Polish>
35543560
<German>Luft</German>
3561+
<Korean>항공</Korean>
35553562
</Key>
35563563
</Package>
35573564
</Project>

‎addons/captives/XEH_preInit.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PREP_RECOMPILE_END;
88

99
GVAR(captivityEnabled) = false;
1010

11-
GVAR(restraints) = call (uiNamespace getVariable QGVAR(restraints));
11+
GVAR(restraints) = keys (uiNamespace getVariable QGVAR(restraints));
1212
GVAR(blindfolds) = keys (uiNamespace getVariable QGVAR(blindfolds));
1313

1414
#include "initSettings.sqf"

‎addons/captives/XEH_preStart.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "XEH_PREP.hpp"
44

55
private _restraints = (QUOTE(getNumber (_x >> QQGVAR(restraint)) > 0) configClasses (configFile >> "CfgWeapons") apply {configName _x});
6-
uiNamespace setVariable [QGVAR(restraints), compileFinal str _restraints];
6+
uiNamespace setVariable [QGVAR(restraints), compileFinal (_restraints createHashMapFromArray [])];
77

88
private _blindfolds = (QUOTE(getNumber (_x >> QQGVAR(blindfold)) > 0) configClasses (configFile >> "CfgGlasses") apply {configName _x});
99
uiNamespace setVariable [QGVAR(blindfolds), compileFinal (_blindfolds createHashMapFromArray [])];

‎addons/captives/functions/fnc_canBlindfoldCaptive.sqf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,5 @@ params ["_unit", "_target"];
2222
(_target getVariable [QGVAR(isHandcuffed), false]) &&
2323
{isNull (attachedTo _target)} &&
2424
{alive _target} &&
25-
{isNull objectParent _unit} &&
26-
{isNull objectParent _target} &&
2725
{(GVAR(blindfolds) findAny (_unit call EFUNC(common,uniqueItems))) != -1} &&
2826
{!((goggles _target) in GVAR(blindfolds))}

‎addons/captives/functions/fnc_canRemoveBlindfoldCaptive.sqf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,4 @@ params ["_unit", "_target"];
2222
(_target getVariable [QGVAR(isHandcuffed), false]) &&
2323
{isNull (attachedTo _target)} &&
2424
{alive _target} &&
25-
{isNull objectParent _unit} &&
26-
{isNull objectParent _target} &&
2725
{(goggles _target) in GVAR(blindfolds)}

‎addons/captives/functions/fnc_doBlindfoldCaptive.sqf

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,16 @@ if (_state) then { // Blindfold target
6666
removeGoggles _target;
6767
};
6868

69-
// Handle for things that need to be dropped to the ground
69+
// Handle for things that need to be dropped to the ground or in a vehicle inventory
7070
if (_dropGoggles) then {
7171
private _weaponHolder = nearestObject [_target, "WeaponHolder"];
72-
if (isNull _weaponHolder || {_target distance _weaponHolder > 2}) then {
72+
// if _target is in a vehicle, use vehicle inventory as container
73+
private _inVehicle = !isNull objectParent _target;
74+
if (_inVehicle) then {
75+
_weaponHolder = objectParent _target;
76+
};
77+
78+
if (!_inVehicle && {isNull _weaponHolder || {_target distance _weaponHolder > 2}}) then {
7379
_weaponHolder = createVehicle ["GroundWeaponHolder", [0, 0, 0], [], 0, "NONE"];
7480
_weaponHolder setPosASL getPosASL _target;
7581
};

‎addons/captives/stringtable.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,16 @@
142142
<French>Bandeau sur les yeux du captif</French>
143143
<Portuguese>Vendar prisioneiro</Portuguese>
144144
<Italian>Benda gli occhi</Italian>
145+
<Polish>Załóż opaskę na oczy</Polish>
146+
<Korean>포로 눈 가리기</Korean>
145147
</Key>
146148
<Key ID="STR_ACE_Captives_RemoveBlindfoldCaptive">
147149
<English>Remove blindfold</English>
148150
<German>Augenbinde entfernen</German>
149151
<French>Enlever bandeau sur les yeux</French>
150152
<Italian>Rimuovi la benda per gli occhi</Italian>
153+
<Polish>Zdejmij opaskę z oczu</Polish>
154+
<Korean>눈가리개 풀기</Korean>
151155
</Key>
152156
<Key ID="STR_ACE_Captives_CableTie">
153157
<English>Cable Tie</English>

‎addons/cargo/XEH_postInit.sqf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ private _objectClassesAddClassEH = call (uiNamespace getVariable [QGVAR(objectCl
153153

154154
if (isServer) then {
155155
["ace_placedInBodyBag", {
156-
params ["_target", "_bodyBag"];
156+
params ["_target", "_bodyBag", "_isGrave"];
157+
if (_isGrave) exitWith {}; // assume graves aren't cargo
157158
_bodyBag setVariable [QGVAR(customName), [_target, false, true] call EFUNC(common,getName), true];
158159
}] call CBA_fnc_addEventHandler;
159160
};

‎addons/compat_sog/CfgAmmo/explosives.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ class vn_mine_m18_x3_ammo: vn_mine_m18_ammo {
1010
EGVAR(explosives,explosive) = "vn_mine_m18_x3_ammo_scripted";
1111
};
1212

13+
class vn_mine_m18_wp_ammo: vn_mine_m18_ammo {
14+
EGVAR(explosives,explosive) = "vn_mine_m18_wp_ammo_scripted";
15+
};
16+
1317
class vn_mine_m16_base;
1418
class vn_mine_tripwire_m16_02_ammo: vn_mine_m16_base {
1519
EGVAR(explosives,defuseObjectPosition)[] = {0, -0.01, 0.088};

‎addons/compat_sog/CfgMagazines/belts.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ class vn_m16_mag_base;
1212
class vn_m63a_100_mag: vn_m16_mag_base {
1313
ACE_isBelt = 1;
1414
};
15+
class vn_mg42_50_mag: vn_lmgmag_base {
16+
ACE_isBelt = 1;
17+
};

0 commit comments

Comments
 (0)