Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed init problem; added mortar ammo boxes

Browse Source
This commit is contained in:
VKing 2015-12-20 20:51:44 +01:00
parent 73720f9313
commit 38fb97aeac
5 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/mk6mortar/CfgVehicles.hpp
View File

@ -139,4 +139,29 @@ class CfgVehicles {
description = CSTRING(Module_Description);
};
};
class Box_NATO_AmmoOrd_F;
class ACE_Box_82mm_Mo_HE: Box_NATO_AmmoOrd_F {
displayName = CSTRING(HEBox_DisplayName);
author = ECSTRING(common,ACETeam);
transportMaxWeapons = 4;
transportMaxmagazines = 8;
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_1Rnd_82mm_Mo_HE,8);
};
class TransportItems {};
class TransportWeapons {};
};
class ACE_Box_82mm_Mo_Smoke: ACE_Box_82mm_Mo_HE {
displayName = CSTRING(SmokeBox_DisplayName);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_1Rnd_82mm_Mo_Smoke,8);
};
};
class ACE_Box_82mm_Mo_Illum: ACE_Box_82mm_Mo_HE {
displayName = CSTRING(IllumBox_DisplayName);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_1Rnd_82mm_Mo_Illum,8);
};
};
};

4
addons/mk6mortar/XEH_getIn.sqf
View File

@ -3,7 +3,7 @@
params ["_mortar","_crewPosition","_unit","_turretPath"];
TRACE_4("",_mortar,_crewPosition,_unit,_turretPath);
if (_unit != player || {_crewPosition != "GUNNER"}) exitWith {LOG("Exit")};
if (_unit != player) exitWith {LOG("Exit")};
if (!EGVAR(common,settingsInitFinished)) exitWith {
EGVAR(common,runAtSettingsInitialized) pushBack [{
@ -13,6 +13,4 @@ if (!EGVAR(common,settingsInitFinished)) exitWith {
}, _mortar];
};
if (!GVAR(useAmmoHandling)) exitWith {};
_mortar call FUNC(mortarInit);

2
addons/mk6mortar/XEH_initPost.sqf
View File

@ -13,6 +13,4 @@ if (!EGVAR(common,settingsInitFinished)) exitWith {
}, _this];
};
if (!GVAR(useAmmoHandling)) exitWith {};
_this call FUNC(mortarInit);

2
addons/mk6mortar/functions/fnc_mortarInit.sqf
View File

@ -15,6 +15,8 @@
*/
#include "script_component.hpp"
if !(GVAR(useAmmoHandling)) exitWith {};
params ["_mortar"];
private ["_newWeapon","_currentWeapon"];

17
addons/mk6mortar/stringtable.xml
View File

@ -135,6 +135,12 @@
<Russian>Модуль настройки миномета MK6.</Russian>
<French>Ce module permet de régler les options du mortier MK6</French>
</Key>
<Key ID="STR_ACE_Mk6Mortar_useAmmoHandling_DisplayName">
<English>Use Ammunition handling</English>
</Key>
<Key ID="STR_ACE_Mk6Mortar_useAmmoHandling_Description">
<English>Removes mortar magazines, requiring individual rounds to be loaded by the gunner or loader. Does not affect AI mortars.</English>
</Key>
<Key ID="STR_ACE_Mk6Mortar_unloadMortar">
<English>Remove Round</English>
</Key>
@ -180,11 +186,14 @@
<Key ID="STR_ACE_Mk6Mortar_magazine_descriptionShort">
<English>Used in Mk6 mortar</English>
</Key>
<Key ID="STR_ACE_Mk6Mortar_useAmmoHandling_DisplayName">
<English>Ammunition handling</English>
<Key ID="STR_ACE_Mk6Mortar_HEBox_DisplayName">
<English>[ACE] 82mm HE Rounds</English>
</Key>
<Key ID="STR_ACE_Mk6Mortar_useAmmoHandling_Description">
<English>Removes mortar magazines, requiring individual rounds to be loaded by the gunner or loader</English>
<Key ID="STR_ACE_Mk6Mortar_SmokeBox_DisplayName">
<English>[ACE] 82mm Smoke Rounds</English>
</Key>
<Key ID="STR_ACE_Mk6Mortar_IllumBox_DisplayName">
<English>[ACE] 82mm Illumination Rounds</English>
</Key>
</Package>
</Project>