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

Arsenal - Add config to force show (mortars) (#6694)

Browse Source 
* Arsenal - Add config to force show (mortars)

* Update CfgMagazines.hpp

* Update arsenal-framework.md
This commit is contained in:
PabstMirror 2018-11-18 23:04:50 -06:00 committed by GitHub
parent e8c3be8016
commit e3421cbf8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/arsenal/functions/fnc_addVirtualItems.sqf
View File

@ -193,7 +193,8 @@ if (_items isEqualType true) then {
switch true do { switch true do {
// Rifle, handgun, secondary weapons mags // Rifle, handgun, secondary weapons mags
case ( case (
(getNumber (configFile >> "CfgMagazines" >> _x >> "type") in [TYPE_MAGAZINE_PRIMARY_AND_THROW,TYPE_MAGAZINE_SECONDARY_AND_PUT,1536,TYPE_MAGAZINE_HANDGUN_AND_GL]) && ((getNumber (_x >> "type") in [TYPE_MAGAZINE_PRIMARY_AND_THROW,TYPE_MAGAZINE_SECONDARY_AND_PUT,1536,TYPE_MAGAZINE_HANDGUN_AND_GL]) ||
{(getNumber (_x >> QGVAR(hide))) == -1}) &&
{!(_x in _grenadeList)} && {!(_x in _grenadeList)} &&
{!(_x in _putList)} {!(_x in _putList)}
): { ): {

3
addons/arsenal/functions/fnc_scanConfig.sqf
View File

@ -142,7 +142,8 @@ private _putList = [];
switch true do { switch true do {
// Rifle, handgun, secondary weapons mags // Rifle, handgun, secondary weapons mags
case ( case (
(getNumber (_x >> "type") in [TYPE_MAGAZINE_PRIMARY_AND_THROW,TYPE_MAGAZINE_SECONDARY_AND_PUT,1536,TYPE_MAGAZINE_HANDGUN_AND_GL]) && ((getNumber (_x >> "type") in [TYPE_MAGAZINE_PRIMARY_AND_THROW,TYPE_MAGAZINE_SECONDARY_AND_PUT,1536,TYPE_MAGAZINE_HANDGUN_AND_GL]) ||
{(getNumber (_x >> QGVAR(hide))) == -1}) &&
{!(_className in _grenadeList)} && {!(_className in _grenadeList)} &&
{!(_className in _putList)} {!(_className in _putList)}
): { ): {

5
addons/mk6mortar/CfgMagazines.hpp
View File

@ -4,6 +4,7 @@ class cfgMagazines {
count = 1; count = 1;
scope = 2; scope = 2;
scopeCurator = 2; scopeCurator = 2;
EGVAR(arsenal,hide) = -1;
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
displayName = CSTRING(magazine_HE_displayName); displayName = CSTRING(magazine_HE_displayName);
displayNameShort = ""; displayNameShort = "";
@ -17,6 +18,7 @@ class cfgMagazines {
count = 1; count = 1;
scope = 2; scope = 2;
scopeCurator = 2; scopeCurator = 2;
EGVAR(arsenal,hide) = -1;
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
displayName = CSTRING(magazine_Smoke_displayName); displayName = CSTRING(magazine_Smoke_displayName);
displayNameShort = ""; displayNameShort = "";
@ -30,6 +32,7 @@ class cfgMagazines {
count = 1; count = 1;
scope = 2; scope = 2;
scopeCurator = 2; scopeCurator = 2;
EGVAR(arsenal,hide) = -1;
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
displayName = CSTRING(magazine_Illum_displayName); displayName = CSTRING(magazine_Illum_displayName);
displayNameShort = ""; displayNameShort = "";
@ -43,6 +46,7 @@ class cfgMagazines {
count = 1; count = 1;
scope = 2; scope = 2;
scopeCurator = 2; scopeCurator = 2;
EGVAR(arsenal,hide) = -1;
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
displayName = CSTRING(magazine_HE_Guided_displayName); displayName = CSTRING(magazine_HE_Guided_displayName);
displayNameShort = ""; displayNameShort = "";
@ -56,6 +60,7 @@ class cfgMagazines {
count = 1; count = 1;
scope = 2; scope = 2;
scopeCurator = 2; scopeCurator = 2;
EGVAR(arsenal,hide) = -1;
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
displayName = CSTRING(magazine_HE_LaserGuided_displayName); displayName = CSTRING(magazine_HE_LaserGuided_displayName);
displayNameShort = ""; displayNameShort = "";

2
docs/wiki/framework/arsenal-framework.md
View File

@ -109,7 +109,7 @@ Example:
ACE Arsenal has 2 new config entries for items: ACE Arsenal has 2 new config entries for items:
- `ace_arsenal_hide`: `0`(shown) or `1` (hidden), used to hide items from ACE Arsenal. - `ace_arsenal_hide`: `0`(shown) or `1` (hidden), used to hide items from ACE Arsenal or `-1` (forced show), for vehicle magazines.
- `ace_arsenal_uniqueBase`: Class name of the item that ACE Arsenal will replace it with when saving a loadout. - `ace_arsenal_uniqueBase`: Class name of the item that ACE Arsenal will replace it with when saving a loadout.
Both of them are optional. Both of them are optional.