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

Use correct TransportX type for ace items (#5168)

Browse Source 
* Use correct TransportX type for ace items

* Fix messing with flare colors
This commit is contained in:
PabstMirror 2017-05-18 17:23:01 -05:00 committed by GitHub
parent f7d9a165f6
commit cd5dcf56fe
6 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
addons/grenades/CfgVehicles.hpp
View File

@ -2,40 +2,40 @@
class CfgVehicles { class CfgVehicles {
class NATO_Box_Base; class NATO_Box_Base;
class Box_NATO_Grenades_F: NATO_Box_Base { class Box_NATO_Grenades_F: NATO_Box_Base {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_HandFlare_White,12); MACRO_ADDMAGAZINE(ACE_HandFlare_White,12);
MACRO_ADDITEM(ACE_HandFlare_Green,12); MACRO_ADDMAGAZINE(ACE_HandFlare_Green,12);
MACRO_ADDITEM(ACE_M84,12); MACRO_ADDMAGAZINE(ACE_M84,12);
}; };
}; };
class EAST_Box_Base; class EAST_Box_Base;
class Box_East_Grenades_F: EAST_Box_Base { class Box_East_Grenades_F: EAST_Box_Base {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_HandFlare_Yellow,12); MACRO_ADDMAGAZINE(ACE_HandFlare_Yellow,12);
MACRO_ADDITEM(ACE_HandFlare_Red,12); MACRO_ADDMAGAZINE(ACE_HandFlare_Red,12);
MACRO_ADDITEM(ACE_M84,12); MACRO_ADDMAGAZINE(ACE_M84,12);
}; };
}; };
class IND_Box_Base; class IND_Box_Base;
class Box_IND_Grenades_F: IND_Box_Base { class Box_IND_Grenades_F: IND_Box_Base {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_HandFlare_Yellow,12); MACRO_ADDMAGAZINE(ACE_HandFlare_Yellow,12);
MACRO_ADDITEM(ACE_HandFlare_Green,12); MACRO_ADDMAGAZINE(ACE_HandFlare_Green,12);
MACRO_ADDITEM(ACE_M84,12); MACRO_ADDMAGAZINE(ACE_M84,12);
}; };
}; };
class Box_NATO_Support_F; class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_HandFlare_White,12); MACRO_ADDMAGAZINE(ACE_HandFlare_White,12);
MACRO_ADDITEM(ACE_HandFlare_Red,12); MACRO_ADDMAGAZINE(ACE_HandFlare_Red,12);
MACRO_ADDITEM(ACE_HandFlare_Green,12); MACRO_ADDMAGAZINE(ACE_HandFlare_Green,12);
MACRO_ADDITEM(ACE_HandFlare_Yellow,12); MACRO_ADDMAGAZINE(ACE_HandFlare_Yellow,12);
MACRO_ADDITEM(ACE_M84,12); MACRO_ADDMAGAZINE(ACE_M84,12);
MACRO_ADDITEM(ACE_M14,12); MACRO_ADDMAGAZINE(ACE_M14,12);
}; };
}; };
}; };

6
addons/minedetector/CfgVehicles.hpp
View File

@ -1,9 +1,9 @@
class CfgVehicles { class CfgVehicles {
class Box_NATO_Support_F; class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportWeapons {
MACRO_ADDITEM(ACE_VMM3,4); MACRO_ADDWEAPON(ACE_VMM3,4);
MACRO_ADDITEM(ACE_VMH3,4); MACRO_ADDWEAPON(ACE_VMH3,4);
}; };
}; };

8
addons/mx2a/CfgVehicles.hpp
View File

@ -6,15 +6,15 @@ class CfgVehicles {
scopeCurator = 2; scopeCurator = 2;
displayName = CSTRING(DisplayName); displayName = CSTRING(DisplayName);
vehicleClass = "Items"; vehicleClass = "Items";
class TransportWeapons { class TransportItems {
MACRO_ADDWEAPON(ACE_MX2A,1); MACRO_ADDITEM(ACE_MX2A,1);
}; };
}; };
class Box_NATO_Support_F; class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportWeapons { class TransportItems {
MACRO_ADDWEAPON(ACE_MX2A,6); MACRO_ADDITEM(ACE_MX2A,6);
}; };
}; };
}; };

40
addons/overheating/CfgVehicles.hpp
View File

@ -68,62 +68,62 @@ class CfgVehicles {
class FIA_Box_Base_F; class FIA_Box_Base_F;
class Box_NATO_Support_F: NATO_Box_Base { class Box_NATO_Support_F: NATO_Box_Base {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_SpareBarrel,2); MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
}; };
}; };
class B_supplyCrate_F: ReammoBox_F { class B_supplyCrate_F: ReammoBox_F {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_SpareBarrel,2); MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
}; };
}; };
class Box_East_Support_F: EAST_Box_Base { class Box_East_Support_F: EAST_Box_Base {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_SpareBarrel,2); MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
}; };
}; };
class O_supplyCrate_F: B_supplyCrate_F { class O_supplyCrate_F: B_supplyCrate_F {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_SpareBarrel,2); MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
}; };
}; };
class Box_IND_Support_F: IND_Box_Base { class Box_IND_Support_F: IND_Box_Base {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_SpareBarrel,2); MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
}; };
}; };
class Box_FIA_Support_F: FIA_Box_Base_F { class Box_FIA_Support_F: FIA_Box_Base_F {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_SpareBarrel,2); MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
}; };
}; };
class I_supplyCrate_F: B_supplyCrate_F { class I_supplyCrate_F: B_supplyCrate_F {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_SpareBarrel,2); MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
}; };
}; };
class IG_supplyCrate_F: ReammoBox_F { class IG_supplyCrate_F: ReammoBox_F {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_SpareBarrel,2); MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
}; };
}; };
class C_supplyCrate_F: ReammoBox_F { class C_supplyCrate_F: ReammoBox_F {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_SpareBarrel,2); MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
}; };
}; };
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportMagazines {
MACRO_ADDITEM(ACE_SpareBarrel,6); MACRO_ADDMAGAZINE(ACE_SpareBarrel,6);
}; };
}; };
}; };

8
addons/vector/CfgVehicles.hpp
View File

@ -6,15 +6,15 @@ class CfgVehicles {
scopeCurator = 2; scopeCurator = 2;
displayName = CSTRING(VectorName); displayName = CSTRING(VectorName);
vehicleClass = "Items"; vehicleClass = "Items";
class TransportWeapons { class TransportItems {
MACRO_ADDWEAPON(ACE_Vector,1); MACRO_ADDITEM(ACE_Vector,1);
}; };
}; };
class Box_NATO_Support_F; class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportWeapons { class TransportItems {
MACRO_ADDWEAPON(ACE_Vector,6); MACRO_ADDITEM(ACE_Vector,6);
}; };
}; };
}; };

8
addons/yardage450/CfgVehicles.hpp
View File

@ -6,15 +6,15 @@ class CfgVehicles {
scopeCurator = 2; scopeCurator = 2;
displayName = CSTRING(DisplayName); displayName = CSTRING(DisplayName);
vehicleClass = "Items"; vehicleClass = "Items";
class TransportWeapons { class TransportItems {
MACRO_ADDWEAPON(ACE_Yardage450,1); MACRO_ADDITEM(ACE_Yardage450,1);
}; };
}; };
class Box_NATO_Support_F; class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportWeapons { class TransportItems {
MACRO_ADDWEAPON(ACE_Yardage450,4); MACRO_ADDITEM(ACE_Yardage450,4);
}; };
}; };
}; };