Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use correct TransportX type for ace items #5168

Merged
merged 2 commits into from
May 18, 2017
Merged

Use correct TransportX type for ace items #5168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b1636e
Use correct TransportX type for ace items
PabstMirror May 17, 2017
30a7718
Fix messing with flare colors
PabstMirror May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions addons/grenades/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,40 @@
class CfgVehicles {
class NATO_Box_Base;
class Box_NATO_Grenades_F: NATO_Box_Base {
class TransportItems {
MACRO_ADDITEM(ACE_HandFlare_White,12);
MACRO_ADDITEM(ACE_HandFlare_Green,12);
MACRO_ADDITEM(ACE_M84,12);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_HandFlare_White,12);
MACRO_ADDMAGAZINE(ACE_HandFlare_Green,12);
MACRO_ADDMAGAZINE(ACE_M84,12);
};
};

class EAST_Box_Base;
class Box_East_Grenades_F: EAST_Box_Base {
class TransportItems {
MACRO_ADDITEM(ACE_HandFlare_Yellow,12);
MACRO_ADDITEM(ACE_HandFlare_Red,12);
MACRO_ADDITEM(ACE_M84,12);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_HandFlare_Yellow,12);
MACRO_ADDMAGAZINE(ACE_HandFlare_Red,12);
MACRO_ADDMAGAZINE(ACE_M84,12);
};
};

class IND_Box_Base;
class Box_IND_Grenades_F: IND_Box_Base {
class TransportItems {
MACRO_ADDITEM(ACE_HandFlare_Yellow,12);
MACRO_ADDITEM(ACE_HandFlare_Green,12);
MACRO_ADDITEM(ACE_M84,12);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_HandFlare_Yellow,12);
MACRO_ADDMAGAZINE(ACE_HandFlare_Green,12);
MACRO_ADDMAGAZINE(ACE_M84,12);
};
};

class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems {
MACRO_ADDITEM(ACE_HandFlare_White,12);
MACRO_ADDITEM(ACE_HandFlare_Red,12);
MACRO_ADDITEM(ACE_HandFlare_Green,12);
MACRO_ADDITEM(ACE_HandFlare_Yellow,12);
MACRO_ADDITEM(ACE_M84,12);
MACRO_ADDITEM(ACE_M14,12);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_HandFlare_White,12);
MACRO_ADDMAGAZINE(ACE_HandFlare_Red,12);
MACRO_ADDMAGAZINE(ACE_HandFlare_Green,12);
MACRO_ADDMAGAZINE(ACE_HandFlare_Yellow,12);
MACRO_ADDMAGAZINE(ACE_M84,12);
MACRO_ADDMAGAZINE(ACE_M14,12);
};
};
};
6 changes: 3 additions & 3 deletions addons/minedetector/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
class CfgVehicles {
class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems {
MACRO_ADDITEM(ACE_VMM3,4);
MACRO_ADDITEM(ACE_VMH3,4);
class TransportWeapons {
MACRO_ADDWEAPON(ACE_VMM3,4);
MACRO_ADDWEAPON(ACE_VMH3,4);
};
};

Expand Down
8 changes: 4 additions & 4 deletions addons/mx2a/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ class CfgVehicles {
scopeCurator = 2;
displayName = CSTRING(DisplayName);
vehicleClass = "Items";
class TransportWeapons {
MACRO_ADDWEAPON(ACE_MX2A,1);
class TransportItems {
MACRO_ADDITEM(ACE_MX2A,1);
};
};

class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F {
class TransportWeapons {
MACRO_ADDWEAPON(ACE_MX2A,6);
class TransportItems {
MACRO_ADDITEM(ACE_MX2A,6);
};
};
};
40 changes: 20 additions & 20 deletions addons/overheating/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,62 +68,62 @@ class CfgVehicles {
class FIA_Box_Base_F;

class Box_NATO_Support_F: NATO_Box_Base {
class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
};
};

class B_supplyCrate_F: ReammoBox_F {
class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
};
};

class Box_East_Support_F: EAST_Box_Base {
class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
};
};

class O_supplyCrate_F: B_supplyCrate_F {
class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
};
};

class Box_IND_Support_F: IND_Box_Base {
class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
};
};

class Box_FIA_Support_F: FIA_Box_Base_F {
class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
};
};

class I_supplyCrate_F: B_supplyCrate_F {
class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
};
};

class IG_supplyCrate_F: ReammoBox_F {
class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
};
};

class C_supplyCrate_F: ReammoBox_F {
class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,2);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
};
};

class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems {
MACRO_ADDITEM(ACE_SpareBarrel,6);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_SpareBarrel,6);
};
};
};
8 changes: 4 additions & 4 deletions addons/vector/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ class CfgVehicles {
scopeCurator = 2;
displayName = CSTRING(VectorName);
vehicleClass = "Items";
class TransportWeapons {
MACRO_ADDWEAPON(ACE_Vector,1);
class TransportItems {
MACRO_ADDITEM(ACE_Vector,1);
};
};

class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F {
class TransportWeapons {
MACRO_ADDWEAPON(ACE_Vector,6);
class TransportItems {
MACRO_ADDITEM(ACE_Vector,6);
};
};
};
8 changes: 4 additions & 4 deletions addons/yardage450/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ class CfgVehicles {
scopeCurator = 2;
displayName = CSTRING(DisplayName);
vehicleClass = "Items";
class TransportWeapons {
MACRO_ADDWEAPON(ACE_Yardage450,1);
class TransportItems {
MACRO_ADDITEM(ACE_Yardage450,1);
};
};

class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F {
class TransportWeapons {
MACRO_ADDWEAPON(ACE_Yardage450,4);
class TransportItems {
MACRO_ADDITEM(ACE_Yardage450,4);
};
};
};